Skip to contentSkip to conversation

gpiolib: get rid of exessive ->of_gpio_ranges_fallback()

PATCH In review Andy Shevchenko 5 participants 13 messages Jan 13, 2023 – Jan 26, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover gpiolib: get rid of exessive ->of_gpio_ranges_fallback()

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

Changelog v3:
- moved check of the property presense to GPIO library
- split out the refcount fix in a separate patch
- added cover letter

Andy Shevchenko (4):
gpiolib: Check "gpio-ranges" before calling ->add_pin_ranges()
pinctrl: bcm2835: Remove of_node_put() in

    bcm2835_of_gpio_ranges_fallback()

pinctrl: bcm2835: Switch to use ->add_pin_ranges() Revert "gpiolib: of: Introduce hook for missing gpio-ranges"

 drivers/gpio/gpiolib-of.c             |  5 -----
 drivers/gpio/gpiolib.c                |  8 ++++++++
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 ++++------
 include/linux/gpio/driver.h           | 12 ------------
 4 files changed, 12 insertions(+), 23 deletions(-)
Signature · 1 line
2.39.0
#7 lore raw

PATCH v3 4/4 Revert "gpiolib: of: Introduce hook for missing gpio-ranges"

This reverts commit 3550bba25d5587a701e6edf20e20984d2ee72c78.

No users for this one, revert it for good.
The ->add_pin_ranges() can be used instead.

---
 drivers/gpio/gpiolib-of.c   |  5 -----
 include/linux/gpio/driver.h | 12 ------------
 2 files changed, 17 deletions(-)
drivers/gpio/gpiolib-of.c +0 -5
index 72d8a3da31e3..266352b1a966 100644
@@ -980,11 +980,6 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip)
 	if (!np)
 		return 0;
 
-	if (!of_property_read_bool(np, "gpio-ranges") &&
-	    chip->of_gpio_ranges_fallback) {
-		return chip->of_gpio_ranges_fallback(chip, np);
-	}
-
 	group_names = of_find_property(np, group_names_propname, NULL);
 
 	for (;; index++) {
include/linux/gpio/driver.h +0 -12
index ddc7a14a274f..5ab50ba3c309 100644
@@ -521,18 +521,6 @@ struct gpio_chip {
 	 */
 	int (*of_xlate)(struct gpio_chip *gc,
 			const struct of_phandle_args *gpiospec, u32 *flags);
-
-	/**
-	 * @of_gpio_ranges_fallback:
-	 *
-	 * Optional hook for the case that no gpio-ranges property is defined
-	 * within the device tree node "np" (usually DT before introduction
-	 * of gpio-ranges). So this callback is helpful to provide the
-	 * necessary backward compatibility for the pin ranges.
-	 */
-	int (*of_gpio_ranges_fallback)(struct gpio_chip *gc,
-				       struct device_node *np);
-
 #endif /* CONFIG_OF_GPIO */
 };
 
Signature · 1 line
2.39.0
#1 lore raw

PATCH v3 1/4 gpiolib: Check "gpio-ranges" before calling ->add_pin_ranges()

In reply to Andy Shevchenko

The ->add_pin_ranges() is supposed to be called for the backward compatiblity on Device Tree platforms or non-DT ones. Ensure that by checking presense of the "gpio-ranges" property.

This allows to clean up a few existing drivers to avoid duplication of the check.

---
 drivers/gpio/gpiolib.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/gpio/gpiolib.c +8 -0
index 16858ef4dac1..49cfcc7510e1 100644
@@ -533,6 +533,14 @@ static void gpiochip_free_valid_mask(struct gpio_chip *gc)
 
 static int gpiochip_add_pin_ranges(struct gpio_chip *gc)
 {
+	/*
+	 * Device Tree platforms are supposed to use "gpio-ranges"
+	 * property. This check ensures that the ->add_pin_ranges()
+	 * won't be called for them.
+	 */
+	if (device_property_present(&gc->gpiodev->dev, "gpio-ranges"))
+		return 0;
+
 	if (gc->add_pin_ranges)
 		return gc->add_pin_ranges(gc);
 
Signature · 1 line
2.39.0
#2 lore raw

PATCH v3 2/4 pinctrl: bcm2835: Remove of_node_put() in bcm2835_of_gpio_ranges_fallback()

In reply to Andy Shevchenko

Remove wrong of_node_put() in bcm2835_of_gpio_ranges_fallback(), there is no counterpart of_node_get() for it.

Fixes d2b67744fd99 ("pinctrl: bcm2835: implement hook for missing gpio-ranges")
---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 --
 1 file changed, 2 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +0 -2
index 7857e612a100..c7cdccdb4332 100644
@@ -363,8 +363,6 @@ static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,
 {
 	struct pinctrl_dev *pctldev = of_pinctrl_get(np);
 
-	of_node_put(np);
-
 	if (!pctldev)
 		return 0;
 
Signature · 1 line
2.39.0
#6 lore raw

PATCH v3 3/4 pinctrl: bcm2835: Switch to use ->add_pin_ranges()

In reply to Andy Shevchenko

Yeah, while the ->add_pin_ranges() shouldn't be used by DT drivers, this one requires it to support quite old firmware descriptions that do not have gpio-ranges property.

The change allows to clean up GPIO library from OF specifics. There is no functional change intended.

---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +4 -4
index c7cdccdb4332..8e2551a08c37 100644
@@ -358,9 +358,9 @@ static int bcm2835_gpio_direction_output(struct gpio_chip *chip,
 	return 0;
 }
 
-static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,
-					   struct device_node *np)
+static int bcm2835_add_pin_ranges_fallback(struct gpio_chip *gc)
 {
+	struct device_node *np = dev_of_node(gc->parent);
 	struct pinctrl_dev *pctldev = of_pinctrl_get(np);
 
 	if (!pctldev)
@@ -386,7 +386,7 @@ static const struct gpio_chip bcm2835_gpio_chip = {
 	.base = -1,
 	.ngpio = BCM2835_NUM_GPIOS,
 	.can_sleep = false,
-	.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
+	.add_pin_ranges = bcm2835_add_pin_ranges_fallback,
 };
 
 static const struct gpio_chip bcm2711_gpio_chip = {
@@ -403,7 +403,7 @@ static const struct gpio_chip bcm2711_gpio_chip = {
 	.base = -1,
 	.ngpio = BCM2711_NUM_GPIOS,
 	.can_sleep = false,
-	.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
+	.add_pin_ranges = bcm2835_add_pin_ranges_fallback,
 };
 
 static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,
Signature · 1 line
2.39.0
Reviewed-by on v3 2/4
#3 lore raw

Re: [PATCH v3 2/4] pinctrl: bcm2835: Remove of_node_put() in bcm2835_of_gpio_ranges_fallback()

In reply to Andy Shevchenko

Hi Andy,

Am 13.01.23 um 22:53 schrieb Andy Shevchenko:

Quoted 5 lines

Remove wrong of_node_put() in bcm2835_of_gpio_ranges_fallback(), there is no counterpart of_node_get() for it.

Fixes d2b67744fd99 ("pinctrl: bcm2835: implement hook for missing gpio-ranges")

thanks for fixing. It seems that i got confused by function name and usage in other driver.

Quoted 9 lines
---
  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 --
  1 file changed, 2 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +0 -0
index 7857e612a100..c7cdccdb4332 100644

drivers/pinctrl/bcm/pinctrl-bcm2835.c static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc, · line 368

Quoted 8 lines
drivers/pinctrl/bcm/pinctrl-bcm2835.c +0 -2
@@ -363,8 +363,6 @@ static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,
  {
  	struct pinctrl_dev *pctldev = of_pinctrl_get(np);
 
-	of_node_put(np);
-
  	if (!pctldev)
  		return 0;
 

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

Re: [PATCH v3 2/4] pinctrl: bcm2835: Remove of_node_put() in bcm2835_of_gpio_ranges_fallback()

Quoted 9 lines · Stefan Wahren

Am 13.01.23 um 22:53 schrieb Andy Shevchenko:

Quoted 5 lines

Remove wrong of_node_put() in bcm2835_of_gpio_ranges_fallback(), there is no counterpart of_node_get() for it.

Fixes d2b67744fd99 ("pinctrl: bcm2835: implement hook for missing gpio-ranges")

thanks for fixing. It seems that i got confused by function name and usage in other driver.

You're welcome! Would be nice if you or somebody else have a chance to test the series.

Quoted 1 line

Thank you!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw

Re: [PATCH v3 2/4] pinctrl: bcm2835: Remove of_node_put() in bcm2835_of_gpio_ranges_fallback()

Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Stefan Wahren

Am 13.01.23 um 22:53 schrieb Andy Shevchenko:

Quoted 3 lines

Remove wrong of_node_put() in bcm2835_of_gpio_ranges_fallback(), there is no counterpart of_node_get() for it.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Fixes d2b67744fd99 ("pinctrl: bcm2835: implement hook for missing gpio-ranges")

thanks for fixing. It seems that i got confused by function name and usage in other driver.

You're welcome! Would be nice if you or somebody else have a chance to test the series.

Yes I should be able to do that in the next few days.

Signature · 1 line
Florian
Acked-by on the v3 series
#8 lore raw
In reply to Andy Shevchenko
Quoted 17 lines · Andy Shevchenko

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

Changelog v3:
- moved check of the property presense to GPIO library
- split out the refcount fix in a separate patch
- added cover letter

Andy Shevchenko (4):
gpiolib: Check "gpio-ranges" before calling ->add_pin_ranges()
pinctrl: bcm2835: Remove of_node_put() in

    bcm2835_of_gpio_ranges_fallback()

pinctrl: bcm2835: Switch to use ->add_pin_ranges() Revert "gpiolib: of: Introduce hook for missing gpio-ranges"

Quoted 9 lines
 drivers/gpio/gpiolib-of.c             |  5 -----
 drivers/gpio/gpiolib.c                |  8 ++++++++
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 ++++------
 include/linux/gpio/driver.h           | 12 ------------
 4 files changed, 12 insertions(+), 23 deletions(-)

--
2.39.0

For GPIO part:

Tested-by on the v3 series
#9 lore raw
In reply to Andy Shevchenko

Hi Andy,

Am 13.01.23 um 22:53 schrieb Andy Shevchenko:

Quoted 3 lines

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

i successful tested booting of this series with multi_v7_defconfig on Raspberry Pi 4 (with and without gpio-ranges in DTB):

Quoted 19 lines

Changelog v3:
- moved check of the property presense to GPIO library
- split out the refcount fix in a separate patch
- added cover letter

Andy Shevchenko (4):

   gpiolib: Check "gpio-ranges" before calling ->add_pin_ranges()
   pinctrl: bcm2835: Remove of_node_put() in
     bcm2835_of_gpio_ranges_fallback()
   pinctrl: bcm2835: Switch to use ->add_pin_ranges()
   Revert "gpiolib: of: Introduce hook for missing gpio-ranges"
  drivers/gpio/gpiolib-of.c             |  5 -----
  drivers/gpio/gpiolib.c                |  8 ++++++++
  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 ++++------
  include/linux/gpio/driver.h           | 12 ------------
  4 files changed, 12 insertions(+), 23 deletions(-)
#10 lore raw
Quoted 11 lines · Stefan Wahren

Hi Andy,

Am 13.01.23 um 22:53 schrieb Andy Shevchenko:

Quoted 3 lines

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

i successful tested booting of this series with multi_v7_defconfig on Raspberry Pi 4 (with and without gpio-ranges in DTB):

Thank you!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
Tested-by Reviewed-by on the v3 series
#11 lore raw
In reply to Andy Shevchenko
Quoted 8 lines · Andy Shevchenko

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

Changelog v3:
- moved check of the property presense to GPIO library
- split out the refcount fix in a separate patch
- added cover letter

Thanks!

Signature · 1 line
Florian
#12 lore raw
In reply to Andy Shevchenko
Quoted 8 lines · Andy Shevchenko

The ->of_gpio_ranges_fallback() repeats the idea that lies behind ->add_pin_ranges(), while the latter covers more cases that the former hook. Drop the former one for good.

Changelog v3:
- moved check of the property presense to GPIO library
- split out the refcount fix in a separate patch
- added cover letter

Patches applied! Sorry for taking almost 2 weeks :/

Yours,
Linus Walleij