mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH RESEND] reset: core: honour optional resets when the GPIO fallback is unusable
@ 2026-11-17  9:20 Yang Siyuan
  2026-11-17  9:49 ` Philipp Zabel
  2026-11-17  9:55 ` [PATCH v2] reset: core: honour optional resets when the GPIO fallback returns -ENOENT Yang Siyuan
  0 siblings, 2 replies; 3+ messages in thread
From: Yang Siyuan @ 2026-11-17  9:20 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: linux-kernel, stable

__fwnode_reset_control_get() honours RESET_CONTROL_FLAGS_BIT_OPTIONAL for
every failure source except the reset-gpio fallback: when
__reset_add_reset_gpio_device() fails, the error is returned even for an
optional reset.

This is reachable on Allwinner SoCs, whose pinctrl uses three-cell GPIO
specifiers. The reset-gpio fallback only supports two cells, so it
returns -ENOENT and a consumer asking for an optional reset fails to
probe instead of falling back to its own GPIO handling. mmc-pwrseq-simple
on the Anbernic RG35XX family hits this: its wifi_pwrseq node has
reset-gpios but no resets, so the SDIO WiFi adapter never probes.

Keep propagating -EPROBE_DEFER, since the GPIO provider may be available
later, but treat any other failure as "no reset" when the request is
optional.

Fixes: c721f189e89c ("reset: Instantiate reset GPIO controller for shared reset-gpios")
Cc: stable@vger.kernel.org
Signed-off-by: Yang Siyuan <hsyysy@163.com>
---
 drivers/reset/core.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 38e189d04..f2375dd17 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -1181,7 +1181,17 @@ __fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int ind
 		ret = __reset_add_reset_gpio_device(fwnode, &args);
 		if (ret) {
 			fwnode_handle_put(args.fwnode);
-			return ERR_PTR(ret);
+
+			/*
+			 * The GPIO provider may just not be available yet, so
+			 * EPROBE_DEFER must always be propagated. Any other
+			 * failure means that the fallback cannot be used,
+			 * which is not an error for an optional reset.
+			 */
+			if (ret == -EPROBE_DEFER || !optional)
+				return ERR_PTR(ret);
+
+			return NULL;
 		}
 	}
 
base-commit: 091b06388b117fefdcb63336ac09956a4914b961
-- 
2.56.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH RESEND] reset: core: honour optional resets when the GPIO fallback is unusable
  2026-11-17  9:20 [PATCH RESEND] reset: core: honour optional resets when the GPIO fallback is unusable Yang Siyuan
@ 2026-11-17  9:49 ` Philipp Zabel
  2026-11-17  9:55 ` [PATCH v2] reset: core: honour optional resets when the GPIO fallback returns -ENOENT Yang Siyuan
  1 sibling, 0 replies; 3+ messages in thread
From: Philipp Zabel @ 2026-11-17  9:49 UTC (permalink / raw)
  To: Yang Siyuan; +Cc: linux-kernel, stable

On Di, 2026-11-17 at 17:20 +0800, Yang Siyuan wrote:
> __fwnode_reset_control_get() honours RESET_CONTROL_FLAGS_BIT_OPTIONAL for
> every failure source except the reset-gpio fallback: when
> __reset_add_reset_gpio_device() fails, the error is returned even for an
> optional reset.

RESET_CONTROL_FLAGS_BIT_OPTIONAL is only meant to replace -ENOENT with
NULL, not other error codes. See the kerneldoc of
reset_control_get_optional_exclusive():

  "If the requested reset is not specified in the device tree, this
   function returns NULL instead of an error."

> This is reachable on Allwinner SoCs, whose pinctrl uses three-cell GPIO
> specifiers. The reset-gpio fallback only supports two cells, so it
> returns -ENOENT and a consumer asking for an optional reset fails to
> probe instead of falling back to its own GPIO handling. mmc-pwrseq-simple
> on the Anbernic RG35XX family hits this: its wifi_pwrseq node has
> reset-gpios but no resets, so the SDIO WiFi adapter never probes.
> 
> Keep propagating -EPROBE_DEFER, since the GPIO provider may be available
> later, but treat any other failure as "no reset" when the request is
> optional.
> 
> Fixes: c721f189e89c ("reset: Instantiate reset GPIO controller for shared reset-gpios")
> Cc: stable@vger.kernel.org
> Signed-off-by: Yang Siyuan <hsyysy@163.com>
> ---
>  drivers/reset/core.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/reset/core.c b/drivers/reset/core.c
> index 38e189d04..f2375dd17 100644
> --- a/drivers/reset/core.c
> +++ b/drivers/reset/core.c
> @@ -1181,7 +1181,17 @@ __fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int ind
>  		ret = __reset_add_reset_gpio_device(fwnode, &args);
>  		if (ret) {
>  			fwnode_handle_put(args.fwnode);
> -			return ERR_PTR(ret);
> +
> +			/*
> +			 * The GPIO provider may just not be available yet, so
> +			 * EPROBE_DEFER must always be propagated. Any other
> +			 * failure means that the fallback cannot be used,
> +			 * which is not an error for an optional reset.

No, it is very much an error if an optional reset is specified in the
device tree but can't be used.

The /*TODO*/-marked -ENOENT return in __reset_add_reset_gpio_device()
is already papering over the issue.

> +			 */
> +			if (ret == -EPROBE_DEFER || !optional)
> +				return ERR_PTR(ret);
> +
> +			return NULL;

I think instead this could be replaced with:

 		if (ret) {
 			fwnode_handle_put(args.fwnode);
+			if (ret == -ENOENT && optional)
+				return NULL;
			return ERR_PTR(ret);

regards
Philipp

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] reset: core: honour optional resets when the GPIO fallback returns -ENOENT
  2026-11-17  9:20 [PATCH RESEND] reset: core: honour optional resets when the GPIO fallback is unusable Yang Siyuan
  2026-11-17  9:49 ` Philipp Zabel
@ 2026-11-17  9:55 ` Yang Siyuan
  1 sibling, 0 replies; 3+ messages in thread
From: Yang Siyuan @ 2026-11-17  9:55 UTC (permalink / raw)
  To: Philipp Zabel; +Cc: linux-kernel, stable

__fwnode_reset_control_get() honours RESET_CONTROL_FLAGS_BIT_OPTIONAL by
returning NULL when the requested reset is not described in the device
tree.  The reset-gpio fallback breaks this: when
__reset_add_reset_gpio_device() fails with -ENOENT, the error is returned
even for an optional reset.

This is reachable on Allwinner SoCs, whose pinctrl uses three-cell GPIO
specifiers.  The reset-gpio fallback only supports two cells, so it
returns -ENOENT and a consumer asking for an optional reset fails to
probe instead of falling back to its own GPIO handling.  mmc-pwrseq-simple
on the Anbernic RG35XX family hits this: its wifi_pwrseq node has
reset-gpios but no resets, so the SDIO WiFi adapter never probes.

Return NULL only for -ENOENT when the reset was requested as optional.
A reset that is described but cannot be used is still an error, so
-EPROBE_DEFER and all other failures are propagated.

Fixes: c721f189e89c ("reset: Instantiate reset GPIO controller for shared reset-gpios")
Cc: stable@vger.kernel.org
Signed-off-by: Yang Siyuan <hsyysy@163.com>
---
Changes in v2:
- Only translate -ENOENT to NULL for an optional reset; propagate all
  other errors, as suggested by Philipp Zabel.

 drivers/reset/core.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 38e189d..daa4038 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -1181,6 +1181,8 @@ __fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int ind
 		ret = __reset_add_reset_gpio_device(fwnode, &args);
 		if (ret) {
 			fwnode_handle_put(args.fwnode);
+			if (ret == -ENOENT && optional)
+				return NULL;
 			return ERR_PTR(ret);
 		}
 	}

base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
-- 
2.56.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-17  9:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17  9:20 [PATCH RESEND] reset: core: honour optional resets when the GPIO fallback is unusable Yang Siyuan
2026-11-17  9:49 ` Philipp Zabel
2026-11-17  9:55 ` [PATCH v2] reset: core: honour optional resets when the GPIO fallback returns -ENOENT Yang Siyuan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®