Skip to contentSkip to conversation

pinctrl: core: Show pin numbers for the controllers with base = 0

PATCH In review Andy Shevchenko 4 participants 6 messages Apr 15, 2021 – Apr 22, 2021

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

PATCH 1/1 pinctrl: core: Show pin numbers for the controllers with base = 0

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where base is positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

Fixes f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file")
Cc Drew Fustini <[email protected]>
---
 drivers/pinctrl/core.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/pinctrl/core.c +8 -6
index df7f5f049139..8ef24af88b75 100644
@@ -1604,8 +1604,8 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 	unsigned i, pin;
 #ifdef CONFIG_GPIOLIB
 	struct pinctrl_gpio_range *range;
-	unsigned int gpio_num;
 	struct gpio_chip *chip;
+	int gpio_num;
 #endif
 
 	seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
@@ -1625,7 +1625,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 		seq_printf(s, "pin %d (%s) ", pin, desc->name);
 
 #ifdef CONFIG_GPIOLIB
-		gpio_num = 0;
+		gpio_num = -1;
 		list_for_each_entry(range, &pctldev->gpio_ranges, node) {
 			if ((pin >= range->pin_base) &&
 			    (pin < (range->pin_base + range->npins))) {
@@ -1633,10 +1633,12 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 				break;
 			}
 		}
-		chip = gpio_to_chip(gpio_num);
-		if (chip && chip->gpiodev && chip->gpiodev->base)
-			seq_printf(s, "%u:%s ", gpio_num -
-				chip->gpiodev->base, chip->label);
+		if (gpio_num >= 0)
+			chip = gpio_to_chip(gpio_num);
+		else
+			chip = NULL;
+		if (chip)
+			seq_printf(s, "%u:%s ", gpio_num - chip->gpiodev->base, chip->label);
 		else
 			seq_puts(s, "0:? ");
 #endif
Signature · 1 line
2.30.2
#1 lore raw
Quoted 6 lines · Andy Shevchenko

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where the base is a positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

Linus, since we got one more week, can you consider applying this one and the other one against kernel doc for the final release?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 4 lines · Andy Shevchenko
Quoted 1 line · Andy Shevchenko
Quoted 8 lines
Quoted 5 lines

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where the base is a positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

Linus, since we got one more week, can you consider applying this one and the other one against kernel doc for the final release?

Thank you for the reminder. I will test today.

-Drew

Tested-by Reviewed-by on v1 1/1
#3 lore raw
In reply to Andy Shevchenko
Quoted 55 lines · Andy Shevchenko

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where base is positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

Fixes f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file")
Cc Drew Fustini <[email protected]>
---
 drivers/pinctrl/core.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/pinctrl/core.c +8 -6
index df7f5f049139..8ef24af88b75 100644
@@ -1604,8 +1604,8 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 	unsigned i, pin;
 #ifdef CONFIG_GPIOLIB
 	struct pinctrl_gpio_range *range;
-	unsigned int gpio_num;
 	struct gpio_chip *chip;
+	int gpio_num;
 #endif
 
 	seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
@@ -1625,7 +1625,7 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 		seq_printf(s, "pin %d (%s) ", pin, desc->name);
 
 #ifdef CONFIG_GPIOLIB
-		gpio_num = 0;
+		gpio_num = -1;
 		list_for_each_entry(range, &pctldev->gpio_ranges, node) {
 			if ((pin >= range->pin_base) &&
 			    (pin < (range->pin_base + range->npins))) {
@@ -1633,10 +1633,12 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
 				break;
 			}
 		}
-		chip = gpio_to_chip(gpio_num);
-		if (chip && chip->gpiodev && chip->gpiodev->base)
-			seq_printf(s, "%u:%s ", gpio_num -
-				chip->gpiodev->base, chip->label);
+		if (gpio_num >= 0)
+			chip = gpio_to_chip(gpio_num);
+		else
+			chip = NULL;
+		if (chip)
+			seq_printf(s, "%u:%s ", gpio_num - chip->gpiodev->base, chip->label);
 		else
 			seq_puts(s, "0:? ");
 #endif
Signature · 1 line
2.30.2

Thank you, this makes sense to me. I had failed to consider what would happen when chip->gpiodev->base == 0. I have tested on the BeagleBone (AM3358) and the output works as expected.

/sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single# more pins registered pins: 142
pin 0 (PIN0) 0:gpio-0-31 44e10800 00000027 pinctrl-single pin 1 (PIN1) 1:gpio-0-31 44e10804 00000027 pinctrl-single pin 2 (PIN2) 2:gpio-0-31 44e10808 00000027 pinctrl-single pin 3 (PIN3) 3:gpio-0-31 44e1080c 00000027 pinctrl-single pin 4 (PIN4) 4:gpio-0-31 44e10810 00000027 pinctrl-single pin 5 (PIN5) 5:gpio-0-31 44e10814 00000027 pinctrl-single pin 6 (PIN6) 6:gpio-0-31 44e10818 00000027 pinctrl-single pin 7 (PIN7) 7:gpio-0-31 44e1081c 00000027 pinctrl-single pin 8 (PIN8) 22:gpio-96-127 44e10820 00000027 pinctrl-single pin 9 (PIN9) 23:gpio-96-127 44e10824 00000037 pinctrl-single pin 10 (PIN10) 26:gpio-96-127 44e10828 00000037 pinctrl-single pin 11 (PIN11) 27:gpio-96-127 44e1082c 00000037 pinctrl-single pin 12 (PIN12) 12:gpio-0-31 44e10830 00000037 pinctrl-single pin 13 (PIN13) 13:gpio-0-31 44e10834 00000037 pinctrl-single pin 14 (PIN14) 14:gpio-0-31 44e10838 00000037 pinctrl-single pin 15 (PIN15) 15:gpio-0-31 44e1083c 00000037 pinctrl-single pin 16 (PIN16) 16:gpio-0-31 44e10840 00000027 pinctrl-single <snip>

#4 lore raw
Quoted 6 lines · Drew Fustini
Quoted 5 lines · Andy Shevchenko

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where base is positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

...

Quoted 7 lines
Quoted 7 lines
drivers/pinctrl/core.c +3 -4
-		chip = gpio_to_chip(gpio_num);
-		if (chip && chip->gpiodev && chip->gpiodev->base)
-			seq_printf(s, "%u:%s ", gpio_num -
-				chip->gpiodev->base, chip->label);
+		if (gpio_num >= 0)
+			chip = gpio_to_chip(gpio_num);
+		else
Quoted 8 lines

drivers/pinctrl/core.c static int pinctrl_pins_show(struct seq_file *s, void *what) · line 1643

Quoted 5 lines
drivers/pinctrl/core.c +3 -0
+			chip = NULL;
+		if (chip)
+			seq_printf(s, "%u:%s ", gpio_num - chip->gpiodev->base, chip->label);
 		else
 			seq_puts(s, "0:? ");

Thank you, this makes sense to me. I had failed to consider what would happen when chip->gpiodev->base == 0.

If gpiodev->base == 0 it can happen only when
1) either base is 0 by the driver request
2) or it's a GPIO device which fits the (last) free slot in the number space

It can't be negative at all. So, it means whatever value is there it is always valid.

Quoted 2 lines

I have tested on the BeagleBone
(AM3358) and the output works as expected.

Cool!

Quoted 21 lines

/sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single# more pins registered pins: 142
pin 0 (PIN0) 0:gpio-0-31 44e10800 00000027 pinctrl-single pin 1 (PIN1) 1:gpio-0-31 44e10804 00000027 pinctrl-single pin 2 (PIN2) 2:gpio-0-31 44e10808 00000027 pinctrl-single pin 3 (PIN3) 3:gpio-0-31 44e1080c 00000027 pinctrl-single pin 4 (PIN4) 4:gpio-0-31 44e10810 00000027 pinctrl-single pin 5 (PIN5) 5:gpio-0-31 44e10814 00000027 pinctrl-single pin 6 (PIN6) 6:gpio-0-31 44e10818 00000027 pinctrl-single pin 7 (PIN7) 7:gpio-0-31 44e1081c 00000027 pinctrl-single pin 8 (PIN8) 22:gpio-96-127 44e10820 00000027 pinctrl-single pin 9 (PIN9) 23:gpio-96-127 44e10824 00000037 pinctrl-single pin 10 (PIN10) 26:gpio-96-127 44e10828 00000037 pinctrl-single pin 11 (PIN11) 27:gpio-96-127 44e1082c 00000037 pinctrl-single pin 12 (PIN12) 12:gpio-0-31 44e10830 00000037 pinctrl-single pin 13 (PIN13) 13:gpio-0-31 44e10834 00000037 pinctrl-single pin 14 (PIN14) 14:gpio-0-31 44e10838 00000037 pinctrl-single pin 15 (PIN15) 15:gpio-0-31 44e1083c 00000037 pinctrl-single pin 16 (PIN16) 16:gpio-0-31 44e10840 00000027 pinctrl-single <snip>

Quoted 2 lines

Thank you!

Linus, can it be applied now?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#5 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

The commit f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file") enabled GPIO pin number and label in debugfs for pin controller. However, it limited that feature to the chips where base is positive number. This, in particular, excluded chips where base is 0 for the historical or backward compatibility reasons. Refactor the code to include the latter as well.

Fixes f1b206cf7c57 ("pinctrl: core: print gpio in pins debugfs file")
Cc Drew Fustini <[email protected]>

Patch applied for fixes!

Yours,
Linus Walleij