gpiolib: Unify the checks on fwnode type
Subsystems (3)
Andy Shevchenko
maintainerPATCH 1/4 gpiolib: Unify the checks on fwnode type
We have (historically) different approaches how we identify the type of a given fwnode. Let's standardize them across the library code.
--- drivers/gpio/gpiolib.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/gpio/gpiolib.c +13 -15
@@ -3678,11 +3678,12 @@ EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index);*/ int gpiod_count (struct device *dev,const char *con_id) { +const struct fwnode_handle *fwnode =dev_fwnode (dev);int count = -ENOENT ; -if (IS_ENABLED (CONFIG_OF ) && dev && dev->of_node) +if (is_of_node (fwnode)) count =of_gpio_get_count (dev, con_id); -else if (IS_ENABLED (CONFIG_ACPI ) && dev &&ACPI_HANDLE (dev)) +else if (is_acpi_node (fwnode)) count =acpi_gpio_count (dev, con_id);if (count <0 )
@@ -3820,18 +3821,17 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,int ret;/* Maybe we have a device name, maybe not */ const char *devname = dev ?dev_name (dev) :"?" ; +const struct fwnode_handle *fwnode = dev ?dev_fwnode (dev) :NULL ;dev_dbg (dev,"GPIO lookup for consumer %s\n" , con_id); -if (dev) { -/* Using device tree? */ -if (IS_ENABLED (CONFIG_OF ) && dev->of_node) { -dev_dbg (dev,"using device tree for GPIO lookup\n" ); - desc =of_find_gpio (dev, con_id, idx, &lookupflags); - }else if (ACPI_COMPANION (dev)) { -dev_dbg (dev,"using ACPI for GPIO lookup\n" ); - desc =acpi_find_gpio (dev, con_id, idx, &flags, &lookupflags); - } +/* Using device tree? */ +if (is_of_node (fwnode)) { +dev_dbg (dev,"using device tree for GPIO lookup\n" ); + desc =of_find_gpio (dev, con_id, idx, &lookupflags); + }else if (is_acpi_node (fwnode)) { +dev_dbg (dev,"using ACPI for GPIO lookup\n" ); + desc =acpi_find_gpio (dev, con_id, idx, &flags, &lookupflags); }/*
@@ -3915,9 +3915,6 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,struct gpio_desc *desc =ERR_PTR (-ENODEV );int ret; -if (!fwnode) -return ERR_PTR (-EINVAL ); -if (is_of_node (fwnode)) { desc = gpiod_get_from_of_node(to_of_node(fwnode), propname, index,
@@ -3933,7 +3930,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,acpi_gpio_update_gpiod_flags (&dflags, &info);acpi_gpio_update_gpiod_lookup_flags (&lflags, &info); - } + }else +return ERR_PTR (-EINVAL );/* Currently only ACPI takes this path */ ret =gpiod_request (desc, label);
Signature · 1 line
2.30.1
Andy Shevchenko
maintainerPATCH 2/4 gpiolib: Move of_node operations to gpiolib-of and correct fwnode use
The initial value of the OF node based on presence of parent, but at the same time this operation somehow appeared separately from others that handle the OF case. On the other hand there is no need to assign dev->fwnode in the OF case if code properly retrieves fwnode, i.e. via dev_fwnode() helper.
Amend gpiolib.c and gpiolib-of.c code in order to group OF operations.
--- drivers/gpio/gpiolib-of.c | 6 ++++-- drivers/gpio/gpiolib.c | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpio/gpiolib-of.c +4 -2
@@ -1042,11 +1042,13 @@ void of_gpiochip_remove(struct gpio_chip *chip)void of_gpio_dev_init (struct gpio_chip *gc,struct gpio_device *gdev) { +/* Set default OF node to parent's one if present */ +if (gc->parent) + gdev->dev.of_node = gc->parent->of_node; +/* If the gpiochip has an assigned OF node this takes precedence */ if (gc->of_node) gdev->dev.of_node = gc->of_node;else gc->of_node = gdev->dev.of_node; -if (gdev->dev.of_node) - gdev->dev.fwnode =of_fwnode_handle (gdev->dev.of_node); }
drivers/gpio/gpiolib.c +4 -5
@@ -585,12 +585,9 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,if (!gdev)return -ENOMEM ; gdev->dev.bus = &gpio_bus_type; + gdev->dev.parent = gc->parent; gdev->chip = gc; gc->gpiodev = gdev; -if (gc->parent) { - gdev->dev.parent = gc->parent; - gdev->dev.of_node = gc->parent->of_node; - }of_gpio_dev_init (gc, gdev);
@@ -4212,11 +4209,13 @@ EXPORT_SYMBOL_GPL(gpiod_put_array);static int gpio_bus_match (struct device *dev,struct device_driver *drv) { +struct fwnode_handle *fwnode =dev_fwnode (dev); +/* * Only match if the fwnode doesn't already have a proper struct device * created for it. */ -if (dev->fwnode && dev->fwnode->dev != dev) +if (fwnode && fwnode->dev != dev)return 0 ;return 1 ; }
Signature · 1 line
2.30.1
Re: [PATCH v1 2/4] gpiolib: Move of_node operations to gpiolib-of and correct fwnode use
Quoted 9 lines · Andy Shevchenko
The initial value of the OF node based on presence of parent, but at the same time this operation somehow appeared separately from others that handle the OF case. On the other hand there is no need to assign
dev->fwnodein the OF case if code properly retrieves fwnode, i.e. viadev_fwnode()helper.Amend
gpiolib.candgpiolib-of.ccode in order to group OF operations.Signed-off-by Andy Shevchenko <[email protected]>
I parsed it in my head a few times and it looks like it will end up working the same, so:
Yours,
Linus Walleij
Andy Shevchenko
maintainerPATCH 3/4 gpiolib: Introduce acpi_gpio_dev_init() and call it from core
In reply to Andy ShevchenkoIn the ACPI case we may use the firmware node in the similar way as it's done for OF case. We may use that fwnode for other purposes in the future.
--- drivers/gpio/gpiolib-acpi.c | 7 +++++++ drivers/gpio/gpiolib-acpi.h | 4 ++++ drivers/gpio/gpiolib.c | 1 + 3 files changed, 12 insertions(+)
drivers/gpio/gpiolib-acpi.c +7 -0
@@ -1291,6 +1291,13 @@ void acpi_gpiochip_remove(struct gpio_chip *chip)kfree (acpi_gpio); } +void acpi_gpio_dev_init (struct gpio_chip *gc,struct gpio_device *gdev) +{ +/* Set default fwnode to parent's one if present */ +if (gc->parent) +ACPI_COMPANION_SET (&gdev->dev,ACPI_COMPANION (gc->parent)); +} +static int acpi_gpio_package_count (const union acpi_object *obj) {const union acpi_object *element = obj->package.elements;
drivers/gpio/gpiolib-acpi.h +4 -0
@@ -36,6 +36,8 @@ struct acpi_gpio_info {void acpi_gpiochip_add (struct gpio_chip *chip);void acpi_gpiochip_remove (struct gpio_chip *chip); +void acpi_gpio_dev_init (struct gpio_chip *gc,struct gpio_device *gdev); +void acpi_gpiochip_request_interrupts (struct gpio_chip *chip);void acpi_gpiochip_free_interrupts (struct gpio_chip *chip);
@@ -58,6 +60,8 @@ int acpi_gpio_count(struct device *dev, const char *con_id);static inline void acpi_gpiochip_add (struct gpio_chip *chip) { }static inline void acpi_gpiochip_remove (struct gpio_chip *chip) { } +static inline void acpi_gpio_dev_init (struct gpio_chip *gc,struct gpio_device *gdev) { } +static inline void acpi_gpiochip_request_interrupts (struct gpio_chip *chip) { }
drivers/gpio/gpiolib.c +1 -0
@@ -590,6 +590,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, gc->gpiodev = gdev;of_gpio_dev_init (gc, gdev); +acpi_gpio_dev_init (gc, gdev); gdev->id =ida_alloc (&gpio_ida,GFP_KERNEL );if (gdev->id <0 ) {
Signature · 1 line
2.30.1
Re: [PATCH v1 3/4] gpiolib: Introduce acpi_gpio_dev_init() and call it from core
Quoted 5 lines · Andy Shevchenko
In the ACPI case we may use the firmware node in the similar way as it's done for OF case. We may use that fwnode for other purposes in the future.
Signed-off-by Andy Shevchenko <[email protected]>
Yours,
Linus Walleij
Andy Shevchenko
maintainerPATCH 4/4 gpiolib: Reuse device's fwnode to create IRQ domain
In reply to Andy ShevchenkoWhen IRQ domain is created for an ACPI case, the name of it becomes unknown-%d since for now it utilizes of_node member only and doesn't consider fwnode case. Convert IRQ domain creation code to utilize fwnode instead.
Before/After the change on Intel Galileo Gen 2 with two GPIO (IRQ) controllers:
unknown-1 ==> \_SB.PCI0.GIP0.GPO
unknown-2 ==> \_SB.NIO3
--- drivers/gpio/gpiolib.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-)
drivers/gpio/gpiolib.c +12 -20
@@ -1457,9 +1457,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,struct lock_class_key *lock_key, struct lock_class_key *request_key) { + struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);struct irq_chip *irqchip = gc->irq.chip; -const struct irq_domain_ops *ops =NULL ; -struct device_node *np; +const struct irq_domain_ops *ops;unsigned int type;unsigned int i;
@@ -1471,7 +1471,6 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return -EINVAL ; } - np = gc->gpiodev->dev.of_node; type = gc->irq.default_type;/*
@@ -1479,16 +1478,10 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,* used to configure the interrupts, as you may end up with * conflicting triggers. Tell the user, and reset to NONE. */ -if (WARN (np && type !=IRQ_TYPE_NONE , -"%s: Ignoring %u default trigger\n" , np->full_name, type)) +if (WARN (fwnode && type !=IRQ_TYPE_NONE , +"%pfw: Ignoring %u default trigger\n" , fwnode, type)) type =IRQ_TYPE_NONE ; -if (has_acpi_companion (gc->parent) && type !=IRQ_TYPE_NONE ) { -acpi_handle_warn (ACPI_HANDLE (gc->parent), -"Ignoring %u default trigger\n" , type); - type =IRQ_TYPE_NONE ; - } -if (gc->to_irq)chip_warn (gc,"to_irq is redefined in %s and you shouldn't rely on it\n" , __func__);
@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first) + gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); +else + gc->irq.domain =irq_domain_create_linear (fwnode, gc->ngpio, + ops, gc);if (!gc->irq.domain)return -EINVAL ; }
Signature · 1 line
2.30.1
Re: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 10 lines · Andy Shevchenko
When IRQ domain is created for an ACPI case, the name of it becomes unknown-%d since for now it utilizes
of_nodemember only and doesn't consider fwnode case. Convert IRQ domain creation code to utilize fwnode instead.Before/After the change on Intel Galileo Gen 2 with two GPIO (IRQ) controllers:
unknown-1 ==> \_SB.PCI0.GIP0.GPO unknown-2 ==> \_SB.NIO3Signed-off-by Andy Shevchenko <[email protected]>
This first part seems to do what you want,
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1460
Quoted 5 lines
drivers/gpio/gpiolib.c +1
-0@@ -1457,9 +1457,9 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,struct lock_class_key *lock_key, struct lock_class_key *request_key) { + struct fwnode_handle *fwnode = dev_fwnode(&gc->gpiodev->dev);
(...)
But this:
Quoted 11 lines
drivers/gpio/gpiolib.c +0
-7@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain = irq_domain_add_simple(np, - gc->ngpio,
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 10 lines
drivers/gpio/gpiolib.c +8
-2- gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first) + gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); +else + gc->irq.domain =irq_domain_create_linear (fwnode, gc->ngpio, + ops, gc);
This looks like a refactoring and reimplementation of irq_domain_add_simple()?
Why, and should it rather be a separate patch?
Yours,
Linus Walleij
Andy Shevchenko
maintainerRe: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 15 lines · Linus Walleij
Quoted 10 lines · Andy Shevchenko
When IRQ domain is created for an ACPI case, the name of it becomes unknown-%d since for now it utilizes
of_nodemember only and doesn't consider fwnode case. Convert IRQ domain creation code to utilize fwnode instead.Before/After the change on Intel Galileo Gen 2 with two GPIO (IRQ) controllers:
unknown-1 ==> \_SB.PCI0.GIP0.GPO unknown-2 ==> \_SB.NIO3Signed-off-by Andy Shevchenko <[email protected]>This first part seems to do what you want,
...
Quoted 17 lines
But this:
Quoted 15 lines
drivers/gpio/gpiolib.c +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first)
Quoted 8 lines
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
drivers/gpio/gpiolib.c +6
-0+ gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?
If you named it as irq_domain_create_simple(), then yes, but the problem is that we don't have irq_domain_create_simple() API right now.
Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 28 lines · Andy Shevchenko
Quoted 17 lines · Linus Walleij
But this:
Quoted 15 lines
drivers/gpio/gpiolib.c +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first)Quoted 8 lines
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
drivers/gpio/gpiolib.c +6
-0+ gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?
Quoted 6 lines
If you named it as
irq_domain_create_simple(), then yes, but the problem is that we don't haveirq_domain_create_simple()API right now.Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
OK I looked closer at irq_domain_add_simple(), and what it does different is to call irq_alloc_descs() for all lines if using sparse IRQs and then associate them. irq_domain_create_linear|legacy() does not allocate IRQ descriptors because it assumes something like DT or ACPI will do that on-demand when drivers request IRQs.
This may be dangerous because some old platforms do not resolve IRQs at runtime and you will get NULL pointer exceptions.
We then need to make sure all callers do what is done in e.g. drivers/gpio/gpio-omap.c in the #ifdef CONFIG_ARCH_OMAP1 clause:
they need to be augmented to call irq_alloc_descs() explicitly, and I don't think all of them do it as nicely for us as OMAP1.
I might be overly cautious though, however that is why this code uses irq_domain_add_simple(), came in commit
commit 2854d167cc545d0642277bf8b77f972a91146fc6
Yours,
Linus Walleij
Andy Shevchenko
maintainerRe: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 46 lines · Linus Walleij
Quoted 28 lines · Andy Shevchenko
Quoted 17 lines · Linus Walleij
But this:
Quoted 15 lines
drivers/gpio/gpiolib.c +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first)Quoted 8 lines
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
drivers/gpio/gpiolib.c +6
-0+ gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?Quoted 6 lines
If you named it as
irq_domain_create_simple(), then yes, but the problem is that we don't haveirq_domain_create_simple()API right now.Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
OK I looked closer at
irq_domain_add_simple(), and what it does different is to callirq_alloc_descs()for all lines if using sparse IRQs and then associate them. irq_domain_create_linear|legacy() does not allocate IRQ descriptors because it assumes something like DT or ACPI will do that on-demand when drivers request IRQs.This may be dangerous because some old platforms do not resolve IRQs at runtime and you will get NULL pointer exceptions.
Quoted 8 lines
We then need to make sure all callers do what is done in e.g.
drivers/gpio/gpio-omap.cin the #ifdefCONFIG_ARCH_OMAP1clause:
they need to be augmented to callirq_alloc_descs()explicitly, and I don't think all of them do it as nicely for us as OMAP1.I might be overly cautious though, however that is why this code uses
irq_domain_add_simple(), came in commit
commit2854d167cc545d0642277bf8b77f972a91146fc6
Ah, thanks! I was puzzled how and why the approach above had been extended like now. This explains it. Okay, I will introduce irq_domain_create_simple().
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rafael J. Wysocki
maintainerRe: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 53 lines · Andy Shevchenko
Quoted 51 lines · Linus Walleij
Quoted 28 lines · Andy Shevchenko
Quoted 17 lines · Linus Walleij
But this:
Quoted 15 lines
drivers/gpio/gpiolib.c +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first)Quoted 8 lines
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
drivers/gpio/gpiolib.c +6
-0+ gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?Quoted 6 lines
If you named it as
irq_domain_create_simple(), then yes, but the problem is that we don't haveirq_domain_create_simple()API right now.Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
OK I looked closer at
irq_domain_add_simple(), and what it does different is to callirq_alloc_descs()for all lines if using sparse IRQs and then associate them. irq_domain_create_linear|legacy() does not allocate IRQ descriptors because it assumes something like DT or ACPI will do that on-demand when drivers request IRQs.This may be dangerous because some old platforms do not resolve IRQs at runtime and you will get NULL pointer exceptions.
We then need to make sure all callers do what is done in e.g.
drivers/gpio/gpio-omap.cin the #ifdefCONFIG_ARCH_OMAP1clause:
they need to be augmented to callirq_alloc_descs()explicitly, and I don't think all of them do it as nicely for us as OMAP1.
Quoted 6 lines
Quoted 3 lines
I might be overly cautious though, however that is why this code uses
irq_domain_add_simple(), came in commit
commit2854d167cc545d0642277bf8b77f972a91146fc6Ah, thanks! I was puzzled how and why the approach above had been extended like now. This explains it. Okay, I will introduce
irq_domain_create_simple().
OK
So please resend the series with that done and with the R-bys from Linus added. I'll apply it from Patchwork.
Thanks!
Andy Shevchenko
maintainerRe: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 59 lines · Rafael J. Wysocki
Quoted 57 lines · Andy Shevchenko
Quoted 54 lines · Linus Walleij
Quoted 28 lines · Andy Shevchenko
Quoted 17 lines · Linus Walleij
But this:
Quoted 15 lines
drivers/gpio/gpiolib.c +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc,return ret; }else {/* Some drivers provide custom irqdomain ops */ -if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - -if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain =irq_domain_add_simple (np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; +if (gc->irq.first)Quoted 8 lines
drivers/gpio/gpiolib.c static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
drivers/gpio/gpiolib.c +6
-0+ gc->irq.domain =irq_domain_create_legacy (fwnode, gc->ngpio, + gc->irq.first,0 , + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?Quoted 6 lines
If you named it as
irq_domain_create_simple(), then yes, but the problem is that we don't haveirq_domain_create_simple()API right now.Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
OK I looked closer at
irq_domain_add_simple(), and what it does different is to callirq_alloc_descs()for all lines if using sparse IRQs and then associate them. irq_domain_create_linear|legacy() does not allocate IRQ descriptors because it assumes something like DT or ACPI will do that on-demand when drivers request IRQs.This may be dangerous because some old platforms do not resolve IRQs at runtime and you will get NULL pointer exceptions.
We then need to make sure all callers do what is done in e.g.
drivers/gpio/gpio-omap.cin the #ifdefCONFIG_ARCH_OMAP1clause:
they need to be augmented to callirq_alloc_descs()explicitly, and I don't think all of them do it as nicely for us as OMAP1.I might be overly cautious though, however that is why this code uses
irq_domain_add_simple(), came in commit
commit2854d167cc545d0642277bf8b77f972a91146fc6
Quoted 7 lines
Quoted 2 lines
Ah, thanks! I was puzzled how and why the approach above had been extended like now. This explains it. Okay, I will introduce
irq_domain_create_simple().OK
So please resend the series with that done and with the R-bys from Linus added. I'll apply it from Patchwork.
Done!
https://lore.kernel.org/linux-gpio/[email protected]/T/#u
P.S. you seems haven't switched yet to b4 :-)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rafael J. Wysocki
maintainerRe: [PATCH v1 4/4] gpiolib: Reuse device's fwnode to create IRQ domain
Quoted 64 lines · Andy Shevchenko
Quoted 62 lines · Rafael J. Wysocki
Quoted 59 lines · Andy Shevchenko
Quoted 46 lines · Linus Walleij
Quoted 28 lines · Andy Shevchenko
Quoted 17 lines · Linus Walleij
But this:
Quoted 15 lines
(quoted diff) +2
-9@@ -1504,15 +1497,14 @@ static int gpiochip_add_irqchip(struct gpio_chip *gc, return ret; } else { /* Some drivers provide custom irqdomain ops */ - if (gc->irq.domain_ops) - ops = gc->irq.domain_ops; - - if (!ops) - ops = &gpiochip_domain_ops; - gc->irq.domain = irq_domain_add_simple(np, - gc->ngpio, - gc->irq.first, - ops, gc); + ops = gc->irq.domain_ops ?: &gpiochip_domain_ops; + if (gc->irq.first)Quoted 8 lines
Review static int gpiochip_add_irqchip(struct gpio_chip *gc, · line 1507
Quoted 6 lines
(quoted diff) +6
-0+ gc->irq.domain = irq_domain_create_legacy(fwnode, gc->ngpio, + gc->irq.first, 0, + ops, gc); + else + gc->irq.domain = irq_domain_create_linear(fwnode, gc->ngpio, + ops, gc);This looks like a refactoring and reimplementation of
irq_domain_add_simple()?Quoted 6 lines
If you named it as
irq_domain_create_simple(), then yes, but the problem is that we don't haveirq_domain_create_simple()API right now.Quoted 1 line
Why, and should it rather be a separate patch?
Nope.
OK I looked closer at
irq_domain_add_simple(), and what it does different is to callirq_alloc_descs()for all lines if using sparse IRQs and then associate them. irq_domain_create_linear|legacy() does not allocate IRQ descriptors because it assumes something like DT or ACPI will do that on-demand when drivers request IRQs.This may be dangerous because some old platforms do not resolve IRQs at runtime and you will get NULL pointer exceptions.
Quoted 8 lines
We then need to make sure all callers do what is done in e.g.
drivers/gpio/gpio-omap.cin the #ifdefCONFIG_ARCH_OMAP1clause:
they need to be augmented to callirq_alloc_descs()explicitly, and I don't think all of them do it as nicely for us as OMAP1.I might be overly cautious though, however that is why this code uses
irq_domain_add_simple(), came in commit
commit2854d167cc545d0642277bf8b77f972a91146fc6Ah, thanks! I was puzzled how and why the approach above had been extended like now. This explains it. Okay, I will introduce
irq_domain_create_simple().
Quoted 6 lines
Quoted 4 lines
OK
So please resend the series with that done and with the R-bys from Linus added. I'll apply it from Patchwork.
Done!
Thanks.
Quoted 3 lines
https://lore.kernel.org/linux-gpio/[email protected]/T/#u
P.S. you seems haven't switched yet to b4 :-)
Nope.
Andy Shevchenko
maintainerQuoted 2 lines · Andy Shevchenko
We have (historically) different approaches how we identify the type of a given fwnode. Let's standardize them across the library code.
This patch has one functional mistake (see below), otherwise I will anyway wait for people to comment on the series.
Quoted 10 lines
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/gpio/gpiolib.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)drivers/gpio/gpiolib.c +0
-0
drivers/gpio/gpiolib.c EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index); · line 3681
Quoted 4 lines
drivers/gpio/gpiolib.c +1
-0@@ -3678,11 +3678,12 @@ EXPORT_SYMBOL_GPL(fwnode_gpiod_get_index);*/ int gpiod_count (struct device *dev,const char *con_id) { +const struct fwnode_handle *fwnode =dev_fwnode (dev);
It should be
const struct fwnode_handle *fwnode = dev ? dev_fwnode(dev) : NULL;
Quoted 60 lines
drivers/gpio/gpiolib.c +12
-15int count = -ENOENT ; -if (IS_ENABLED (CONFIG_OF ) && dev && dev->of_node) +if (is_of_node (fwnode)) count =of_gpio_get_count (dev, con_id); -else if (IS_ENABLED (CONFIG_ACPI ) && dev &&ACPI_HANDLE (dev)) +else if (is_acpi_node (fwnode)) count =acpi_gpio_count (dev, con_id);if (count <0 )@@ -3820,18 +3821,17 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,int ret;/* Maybe we have a device name, maybe not */ const char *devname = dev ?dev_name (dev) :"?" ; +const struct fwnode_handle *fwnode = dev ?dev_fwnode (dev) :NULL ;dev_dbg (dev,"GPIO lookup for consumer %s\n" , con_id); -if (dev) { -/* Using device tree? */ -if (IS_ENABLED (CONFIG_OF ) && dev->of_node) { -dev_dbg (dev,"using device tree for GPIO lookup\n" ); - desc =of_find_gpio (dev, con_id, idx, &lookupflags); - }else if (ACPI_COMPANION (dev)) { -dev_dbg (dev,"using ACPI for GPIO lookup\n" ); - desc =acpi_find_gpio (dev, con_id, idx, &flags, &lookupflags); - } +/* Using device tree? */ +if (is_of_node (fwnode)) { +dev_dbg (dev,"using device tree for GPIO lookup\n" ); + desc =of_find_gpio (dev, con_id, idx, &lookupflags); + }else if (is_acpi_node (fwnode)) { +dev_dbg (dev,"using ACPI for GPIO lookup\n" ); + desc =acpi_find_gpio (dev, con_id, idx, &flags, &lookupflags); }/* @@ -3915,9 +3915,6 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,struct gpio_desc *desc =ERR_PTR (-ENODEV );int ret; -if (!fwnode) -return ERR_PTR (-EINVAL ); -if (is_of_node (fwnode)) { desc = gpiod_get_from_of_node(to_of_node(fwnode), propname, index,@@ -3933,7 +3930,8 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode,acpi_gpio_update_gpiod_flags (&dflags, &info);acpi_gpio_update_gpiod_lookup_flags (&lflags, &info); - } + }else +return ERR_PTR (-EINVAL );/* Currently only ACPI takes this path */ ret =gpiod_request (desc, label);Signature · 1 line
2.30.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 4 lines · Andy Shevchenko
We have (historically) different approaches how we identify the type of a given fwnode. Let's standardize them across the library code.
Signed-off-by Andy Shevchenko <[email protected]>
Looks way better like this, with your follow-up fix folded in:
Yours,
Linus Walleij