Skip to contentSkip to conversation

pinctrl: renesas: rzg2l: Replace of_node_to_fwnode() with more suitable API

PATCH In review Andy Shevchenko 3 participants 5 messages Aug 22, 2024 – Aug 29, 2024

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

PATCH 1/1 pinctrl: renesas: rzg2l: Replace of_node_to_fwnode() with more suitable API

of_node_to_fwnode() is a IRQ domain specific implementation of of_fwnode_handle(). Replace the former with more suitable API.

---
 drivers/pinctrl/renesas/pinctrl-rzg2l.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/renesas/pinctrl-rzg2l.c +2 -1
index 5e3d735a8570..73b55e096106 100644
@@ -16,6 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 
@@ -2624,7 +2625,7 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl)
 
 	girq = &chip->irq;
 	gpio_irq_chip_set_chip(girq, &rzg2l_gpio_irqchip);
-	girq->fwnode = of_node_to_fwnode(np);
+	girq->fwnode = dev_fwnode(pctrl->dev);
 	girq->parent_domain = parent_domain;
 	girq->child_to_parent_hwirq = rzg2l_gpio_child_to_parent_hwirq;
 	girq->populate_parent_alloc_arg = rzg2l_gpio_populate_parent_fwspec;
Signature · 1 line
2.46.0
#1 lore raw

Hi Andy,

Quoted 4 lines · Andy Shevchenko

of_node_to_fwnode() is a IRQ domain specific implementation of of_fwnode_handle(). Replace the former with more suitable API.

Thanks for your patch!

Quoted 11 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +1 -0
@@ -16,6 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 

drivers/pinctrl/renesas/pinctrl-rzg2l.c static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) · line 2628

Quoted 5 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +1 -1
@@ -2624,7 +2625,7 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl)
 
        girq = &chip->irq;
        gpio_irq_chip_set_chip(girq, &rzg2l_gpio_irqchip);
-       girq->fwnode = of_node_to_fwnode(np);
+       girq->fwnode = dev_fwnode(pctrl->dev);

While this looks correct, the new call goes through many more hoops, and is not a simple inline function.

Perhaps just &np->fwnode? ;-)

drivers/pinctrl/renesas/pinctrl-rzg2l.c static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) · line 2631

Quoted 3 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +0 -0
        girq->parent_domain = parent_domain;
        girq->child_to_parent_hwirq = rzg2l_gpio_child_to_parent_hwirq;
        girq->populate_parent_alloc_arg = rzg2l_gpio_populate_parent_fwspec;

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
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
#2 lore raw
Quoted 4 lines · Geert Uytterhoeven
Quoted 2 lines · Andy Shevchenko

of_node_to_fwnode() is a IRQ domain specific implementation of of_fwnode_handle(). Replace the former with more suitable API.

...

Quoted 5 lines

drivers/pinctrl/renesas/pinctrl-rzg2l.c static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) · line 2628

Quoted 2 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +1 -1
-       girq->fwnode = of_node_to_fwnode(np);
+       girq->fwnode = dev_fwnode(pctrl->dev);

While this looks correct, the new call goes through many more hoops, and is not a simple inline function.

Maybe, but it's not a hot path anyway.

Quoted 1 line

Perhaps just &np->fwnode? ;-)

Definitely not for a couple of reasons:
- the explicit dereferencing may prevent from easier cleaning up and moving the fwnode members around in the driver core
- the GPIO library internally doesn't use OF node directly, so the code that call GPIO library would be better to follow that

Additionally one can call of_fwnode_handle(), but going here and there with it makes no sense as it much cleaner to see that this fwnode comes directly from the device. This is not obvious from the original or any code that uses np.

After all the idea at minimum to isolate of_node_to_fwnode() from all, but native IRQ chips (basically there are two big users: native IRQ chips and PCI MSI).

P.S. Also note, it's _the only_ pin control driver that uses that API.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
Reviewed-by
#3 lore raw

Hi Andy,

Quoted 14 lines · Andy Shevchenko
Quoted 4 lines · Geert Uytterhoeven
Quoted 2 lines · Andy Shevchenko

of_node_to_fwnode() is a IRQ domain specific implementation of of_fwnode_handle(). Replace the former with more suitable API.

...

Quoted 5 lines

drivers/pinctrl/renesas/pinctrl-rzg2l.c static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl) · line 2628

Quoted 2 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +1 -1
-       girq->fwnode = of_node_to_fwnode(np);
+       girq->fwnode = dev_fwnode(pctrl->dev);

While this looks correct, the new call goes through many more hoops, and is not a simple inline function.

[...]

Quoted 1 line

P.S. Also note, it's _the only_ pin control driver that uses that API.

Thanks for the explanation!

i.e. will queue in renesas-pinctrl for v6.12.

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
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
Tested-by Lad Prabhakar on v1 1/1
#4 lore raw
In reply to Andy Shevchenko
Quoted 9 lines · Andy Shevchenko

of_node_to_fwnode() is a IRQ domain specific implementation of of_fwnode_handle(). Replace the former with more suitable API.

---
 drivers/pinctrl/renesas/pinctrl-rzg2l.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Cheers,
Prabhakar

Quoted 25 lines
drivers/pinctrl/renesas/pinctrl-rzg2l.c +2 -2
index 5e3d735a8570..73b55e096106 100644
@@ -16,6 +16,7 @@
 #include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 
@@ -2624,7 +2625,7 @@ static int rzg2l_gpio_register(struct rzg2l_pinctrl *pctrl)
 
        girq = &chip->irq;
        gpio_irq_chip_set_chip(girq, &rzg2l_gpio_irqchip);
-       girq->fwnode = of_node_to_fwnode(np);
+       girq->fwnode = dev_fwnode(pctrl->dev);
        girq->parent_domain = parent_domain;
        girq->child_to_parent_hwirq = rzg2l_gpio_child_to_parent_hwirq;
        girq->populate_parent_alloc_arg = rzg2l_gpio_populate_parent_fwspec;
--

2.46.0