diff mbox series

[v4] pinctrl: core: print gpio in pins debugfs file

Message ID 20200721222851.2075891-1-drew@beagleboard.org (mailing list archive)
State New, archived
Headers show
Series [v4] pinctrl: core: print gpio in pins debugfs file | expand

Commit Message

Drew Fustini July 21, 2020, 10:28 p.m. UTC 
If there is a gpio range mapping for the pin, then print out the gpio
chip and line index for the pin in the debugfs 'pins' file with the
format: "[line-index]:[gpio-label]"

Here is an example output on the BeagleBoard.org PocketBeagle (AM3358):
/sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single/pins

pin 25 (PIN25) 25:gpio-32-63 44e10864 00000037 pinctrl-single 
pin 26 (PIN26) 26:gpio-32-63 44e10868 00000037 pinctrl-single 
pin 27 (PIN27) 27:gpio-32-63 44e1086c 00000037 pinctrl-single 
pin 28 (PIN28) 0:N/A 44e10870 00000036 pinctrl-single 
pin 29 (PIN29) 0:N/A 44e10874 00000006 pinctrl-single 
pin 30 (PIN30) 28:gpio-32-63 44e10878 00000027 pinctrl-single 
pin 31 (PIN31) 29:gpio-32-63 44e1087c 00000037 pinctrl-single 
pin 32 (PIN32) 30:gpio-32-63 44e10880 00000037 pinctrl-single 
pin 33 (PIN33) 31:gpio-32-63 44e10884 00000037 pinctrl-single 
pin 34 (PIN34) 0:gpio-64-95 44e10888 00000037 pinctrl-single 
pin 35 (PIN35) 1:gpio-64-95 44e1088c 00000037 pinctrl-single 

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Suggested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Drew Fustini <drew@beagleboard.org>
---
 drivers/pinctrl/core.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

v4 change:
- can format to be integer first as Andy suggested it will make parsing
  easier

v3 change:
- gpio column is now gpiochip label and line index

v2 changes:
- print 'NA' if pin does not have a GPIO number
- change gpio_num from unsigned to unsigned int per checkpatch

Comments

Andy Shevchenko July 22, 2020, 8:48 a.m. UTC | #1 
On Wed, Jul 22, 2020 at 1:29 AM Drew Fustini <drew@beagleboard.org> wrote:
>
> If there is a gpio range mapping for the pin, then print out the gpio
> chip and line index for the pin in the debugfs 'pins' file with the
> format: "[line-index]:[gpio-label]"
>
> Here is an example output on the BeagleBoard.org PocketBeagle (AM3358):
> /sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single/pins
>
> pin 25 (PIN25) 25:gpio-32-63 44e10864 00000037 pinctrl-single
> pin 26 (PIN26) 26:gpio-32-63 44e10868 00000037 pinctrl-single
> pin 27 (PIN27) 27:gpio-32-63 44e1086c 00000037 pinctrl-single
> pin 28 (PIN28) 0:N/A 44e10870 00000036 pinctrl-single
> pin 29 (PIN29) 0:N/A 44e10874 00000006 pinctrl-single
> pin 30 (PIN30) 28:gpio-32-63 44e10878 00000027 pinctrl-single
> pin 31 (PIN31) 29:gpio-32-63 44e1087c 00000037 pinctrl-single
> pin 32 (PIN32) 30:gpio-32-63 44e10880 00000037 pinctrl-single
> pin 33 (PIN33) 31:gpio-32-63 44e10884 00000037 pinctrl-single
> pin 34 (PIN34) 0:gpio-64-95 44e10888 00000037 pinctrl-single
> pin 35 (PIN35) 1:gpio-64-95 44e1088c 00000037 pinctrl-single
>

This variant looks good enough to me, thanks! FWIW,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Suggested-by: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Drew Fustini <drew@beagleboard.org>
> ---
>  drivers/pinctrl/core.c | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> v4 change:
> - can format to be integer first as Andy suggested it will make parsing
>   easier
>
> v3 change:
> - gpio column is now gpiochip label and line index
>
> v2 changes:
> - print 'NA' if pin does not have a GPIO number
> - change gpio_num from unsigned to unsigned int per checkpatch
>
>
> diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
> index 821242bb4b16..39e74cdf5c7d 100644
> --- a/drivers/pinctrl/core.c
> +++ b/drivers/pinctrl/core.c
> @@ -27,6 +27,7 @@
>  #include <linux/pinctrl/machine.h>
>
>  #ifdef CONFIG_GPIOLIB
> +#include "../gpio/gpiolib.h"
>  #include <asm-generic/gpio.h>
>  #endif
>
> @@ -1601,6 +1602,9 @@ static int pinctrl_pins_show(struct seq_file *s, void *what)
>         struct pinctrl_dev *pctldev = s->private;
>         const struct pinctrl_ops *ops = pctldev->desc->pctlops;
>         unsigned i, pin;
> +       struct pinctrl_gpio_range *range;
> +       unsigned int gpio_num;
> +       struct gpio_chip *chip;
>
>         seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
>
> @@ -1618,6 +1622,23 @@ 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;
> +               list_for_each_entry(range, &pctldev->gpio_ranges, node) {
> +                       if ((pin >= range->pin_base) &&
> +                           (pin < (range->pin_base + range->npins))) {
> +                               gpio_num = range->base + (pin - range->pin_base);
> +                               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);
> +               else
> +                       seq_puts(s, "0:N/A ");
> +#endif
> +
>                 /* Driver-specific info per pin */
>                 if (ops->pin_dbg_show)
>                         ops->pin_dbg_show(pctldev, s, pin);
> --
> 2.25.1
>
Andy Shevchenko July 22, 2020, 8:50 a.m. UTC | #2 
On Wed, Jul 22, 2020 at 11:48 AM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Wed, Jul 22, 2020 at 1:29 AM Drew Fustini <drew@beagleboard.org> wrote:
> >
> > If there is a gpio range mapping for the pin, then print out the gpio
> > chip and line index for the pin in the debugfs 'pins' file with the
> > format: "[line-index]:[gpio-label]"
> >
> > Here is an example output on the BeagleBoard.org PocketBeagle (AM3358):
> > /sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single/pins
> >
> > pin 25 (PIN25) 25:gpio-32-63 44e10864 00000037 pinctrl-single
> > pin 26 (PIN26) 26:gpio-32-63 44e10868 00000037 pinctrl-single
> > pin 27 (PIN27) 27:gpio-32-63 44e1086c 00000037 pinctrl-single
> > pin 28 (PIN28) 0:N/A 44e10870 00000036 pinctrl-single
> > pin 29 (PIN29) 0:N/A 44e10874 00000006 pinctrl-single

Though one more nit, I have just realized, perhaps '0:?' would be
better, because GPIO library uses '?' in cases of unknown labels or
so.
I guess no need to resend (but if you wish you may do, with my tag
included) and we may wait for Linus and Bart to comment.

> > pin 30 (PIN30) 28:gpio-32-63 44e10878 00000027 pinctrl-single
> > pin 31 (PIN31) 29:gpio-32-63 44e1087c 00000037 pinctrl-single
> > pin 32 (PIN32) 30:gpio-32-63 44e10880 00000037 pinctrl-single
> > pin 33 (PIN33) 31:gpio-32-63 44e10884 00000037 pinctrl-single
> > pin 34 (PIN34) 0:gpio-64-95 44e10888 00000037 pinctrl-single
> > pin 35 (PIN35) 1:gpio-64-95 44e1088c 00000037 pinctrl-single
> >
>
> This variant looks good enough to me, thanks! FWIW,
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
diff mbox series

Patch

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 821242bb4b16..39e74cdf5c7d 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -27,6 +27,7 @@ 
 #include <linux/pinctrl/machine.h>
 
 #ifdef CONFIG_GPIOLIB
+#include "../gpio/gpiolib.h"
 #include <asm-generic/gpio.h>
 #endif
 
@@ -1601,6 +1602,9 @@  static int pinctrl_pins_show(struct seq_file *s, void *what)
 	struct pinctrl_dev *pctldev = s->private;
 	const struct pinctrl_ops *ops = pctldev->desc->pctlops;
 	unsigned i, pin;
+	struct pinctrl_gpio_range *range;
+	unsigned int gpio_num;
+	struct gpio_chip *chip;
 
 	seq_printf(s, "registered pins: %d\n", pctldev->desc->npins);
 
@@ -1618,6 +1622,23 @@  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;
+		list_for_each_entry(range, &pctldev->gpio_ranges, node) {
+			if ((pin >= range->pin_base) &&
+			    (pin < (range->pin_base + range->npins))) {
+				gpio_num = range->base + (pin - range->pin_base);
+				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);
+		else
+			seq_puts(s, "0:N/A ");
+#endif
+
 		/* Driver-specific info per pin */
 		if (ops->pin_dbg_show)
 			ops->pin_dbg_show(pctldev, s, pin);