Skip to contentSkip to conversation

gpiolib: of: Use correct fwnode for DT-probed chips

PATCH Applied Thierry Reding 9 participants 15 messages Nov 11, 2022 – Nov 16, 2022 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpiolib: of: Use correct fwnode for DT-probed chips

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
---
 drivers/gpio/gpiolib-of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +1 -1
index 4be3c21aa718..55c3712592db 100644
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
 	struct device_node *np;
 	int ret;
 
-	np = to_of_node(chip->fwnode);
+	np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
 	if (!np)
 		return 0;
 
Signature · 1 line
2.38.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Thank you!

P.S.
It's good we have this report, which means I have to reconsider the followup I'm cooking. In any case I will send it after v6.2-rc1 for broader testing.

Quoted 23 lines
Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
---
 drivers/gpio/gpiolib-of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +1 -1
index 4be3c21aa718..55c3712592db 100644
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
 	struct device_node *np;
 	int ret;
 
-	np = to_of_node(chip->fwnode);
+	np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
 	if (!np)
 		return 0;
 
Signature · 1 line
2.38.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 11 lines · Andy Shevchenko
Quoted 9 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Quoted 8 lines

Thank you!

P.S.
It's good we have this report, which means I have to reconsider the followup I'm cooking. In any case I will send it after v6.2-rc1 for broader testing.

Feel free to add me on Cc if you need the patches tested on OF systems.

Thierry

Reviewed-by on v1 1/1
#3 lore raw
In reply to Thierry Reding
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")

Yours,
Linus Walleij

Tested-by on v1 1/1
#4 lore raw
In reply to Thierry Reding
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")

Hi, I can confirm this fixes the blamed commit on Qualcomm IPQ8074.

Quoted 17 lines
---
  drivers/gpio/gpiolib-of.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +1 -1
index 4be3c21aa718..55c3712592db 100644
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
  	struct device_node *np;
  	int ret;
 
-	np = to_of_node(chip->fwnode);
+	np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
  	if (!np)
  		return 0;
 
Tested-by on v1 1/1
#5 lore raw
In reply to Thierry Reding
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")

This fixes issues I ran into today on my sa8540p-ride board.

Thanks,
Andrew

Quoted 20 lines
---
 drivers/gpio/gpiolib-of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +1 -1
index 4be3c21aa718..55c3712592db 100644
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
 	struct device_node *np;
 	int ret;
 
-	np = to_of_node(chip->fwnode);
+	np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
 	if (!np)
 		return 0;
 
Signature · 1 line
2.38.1
Reviewed-by Tested-by on v1 1/1
#6 lore raw
In reply to Thierry Reding
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

I'm still not sure what caused this breakage in linux-next.

Brian

#7 lore raw
Quoted 15 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 5 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

- Marijn

#8 lore raw
Quoted 19 lines · Marijn Suijten
Quoted 18 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 8 lines
Quoted 2 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

Thierry's patch fixes the issue that I encountered in of_gpiochip_match_node_and_xlate() on the Qualcomm sa8540p automotive board. I don't get the stack dump that you encountered. I am having issues with probe deferrals on UFS when trying to acquire the reset-gpio.

The patch I posted feels hacky (hence the RFC) but if the maintainers agree with it then I can clean up the commit message and post a v2.

Brian

#9 lore raw
In reply to Marijn Suijten
Quoted 19 lines · Marijn Suijten
Quoted 18 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 8 lines
Quoted 2 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

Can you check if the below fixes the MSM issue that you're seeing (applied on top of my earlier patch, though with Brian's reverted temporarily)?

Thanks,
Thierry

--- >8 ---

drivers/gpio/gpiolib.c +4 -2
index 11fb7ec883e9..d692ad5c5a27 100644
@@ -447,10 +447,11 @@ static unsigned long *gpiochip_allocate_mask(struct gpio_chip *gc)
 
 static unsigned int gpiochip_count_reserved_ranges(struct gpio_chip *gc)
 {
+	struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
 	int size;
 
 	/* Format is "start, count, ..." */
-	size = fwnode_property_count_u32(gc->fwnode, "gpio-reserved-ranges");
+	size = fwnode_property_count_u32(fwnode, "gpio-reserved-ranges");
 	if (size > 0 && size % 2 == 0)
 		return size;
 
@@ -471,6 +472,7 @@ static int gpiochip_alloc_valid_mask(struct gpio_chip *gc)
 
 static int gpiochip_apply_reserved_ranges(struct gpio_chip *gc)
 {
+	struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
 	unsigned int size;
 	u32 *ranges;
 	int ret;
@@ -483,7 +485,7 @@ static int gpiochip_apply_reserved_ranges(struct gpio_chip *gc)
 	if (!ranges)
 		return -ENOMEM;
 
-	ret = fwnode_property_read_u32_array(gc->fwnode, "gpio-reserved-ranges", ranges, size);
+	ret = fwnode_property_read_u32_array(fwnode, "gpio-reserved-ranges", ranges, size);
 	if (ret) {
 		kfree(ranges);
 		return ret;

--- >8 ---

#10 lore raw
Quoted 20 lines · Thierry Reding
Quoted 19 lines · Marijn Suijten
Quoted 18 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

Yes, they fix the same issue.

Quoted 5 lines
Quoted 1 line

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

Can you check if the below fixes the MSM issue that you're seeing (applied on top of my earlier patch, though with Brian's reverted temporarily)?

I don't know why we would need this. Brian's patch (already applied into GPIO tree) is correct, no? (Moreover, it makes yours unneeded, but I'm fine with having it anyway.)

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#11 lore raw
Quoted 32 lines · Andy Shevchenko
Quoted 20 lines · Thierry Reding
Quoted 19 lines · Marijn Suijten
Quoted 18 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

Yes, they fix the same issue.

Quoted 2 lines
Quoted 1 line

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

Quoted 7 lines
Quoted 3 lines

Can you check if the below fixes the MSM issue that you're seeing (applied on top of my earlier patch, though with Brian's reverted temporarily)?

I don't know why we would need this. Brian's patch (already applied into GPIO tree) is correct, no? (Moreover, it makes yours unneeded, but I'm fine with having it anyway.)

I've explained this in the reply to Brian's patch, but I don't think we want to use gc->fwnode other than initially to override the fwnode that the GPIO chip uses. It might even be worth turning it into a parameter to gpiochip_add() to avoid the ambiguity we have right now where we store the same fwnode in two different places and end up using either depending on whoever wrote the patch and what mood they were in. There really should only be one place to store this pointer to avoid this sort of ambiguity.

Thierry

#12 lore raw
In reply to Thierry Reding
Quoted 27 lines · Thierry Reding
Quoted 26 lines · Marijn Suijten
Quoted 15 lines · Brian Masney
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Quoted 6 lines

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
Quoted 5 lines

I separately sent a similar type of patch to fix the same issue today:
https://lore.kernel.org/linux-arm-msm/[email protected]/T/#u

For completeness, your linked patch fixes a synchronous external abort on multiple Qualcomm platforms pointed out in [1]. This patch however does not, are you sure they fix the exact same issue?

Quoted 5 lines
Quoted 1 line

[1]: https://lore.kernel.org/linux-arm-msm/[email protected]/

Can you check if the below fixes the MSM issue that you're seeing (applied on top of my earlier patch, though with Brian's reverted temporarily)?

Yes that solves it too, thanks!

- Marijn

Tested-by on v1 1/1
#13 lore raw
In reply to Thierry Reding

Hi Thierry,

Quoted 11 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")

Thank you, I bisected boot failures on Renesas platforms to that commit, and then found your patch.

Quoted 2 lines
Quoted 9 lines
---
 drivers/gpio/gpiolib-of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +0 -0
index 4be3c21aa718..55c3712592db 100644

drivers/gpio/gpiolib-of.c int of_gpiochip_add(struct gpio_chip *chip) · line 1073

Quoted 8 lines
drivers/gpio/gpiolib-of.c +1 -1
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
        struct device_node *np;
        int ret;
 
-       np = to_of_node(chip->fwnode);
+       np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
        if (!np)
                return 0;
 

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#14 lore raw
In reply to Thierry Reding
Quoted 32 lines · Thierry Reding

From: Thierry Reding <[email protected]>

The OF node store in chip->fwnode is used to explicitly override the FW node for a GPIO chip. For chips that use the default FW node (i.e. that of their parent device), this will be NULL and cause the chip not to be fully registered.

Instead, use the GPIO device's FW node, which is set to either the node of the parent device or the explicit override in chip->fwnode.

Fixes 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode")
---
 drivers/gpio/gpiolib-of.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +1 -2
index 4be3c21aa718..55c3712592db 100644
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
        struct device_node *np;
        int ret;
 
-       np = to_of_node(chip->fwnode);
+       np = to_of_node(dev_fwnode(&chip->gpiodev->dev));
        if (!np)
                return 0;
 
--
Quoted 2 lines

2.38.1

Applied, thanks!

Bart