| Message ID | 20250302-04-gpio-irq-threecell-v2-2-34f13ad37ea4@gentoo.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: irq: support describing three-cell interrupts | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | success | Success |
| bjorn/build-rv32-defconfig | fail | build-rv32-defconfig |
| bjorn/build-rv64-clang-allmodconfig | fail | build-rv64-clang-allmodconfig |
| bjorn/build-rv64-gcc-allmodconfig | fail | build-rv64-gcc-allmodconfig |
| bjorn/build-rv64-nommu-k210-defconfig | fail | build-rv64-nommu-k210-defconfig |
| bjorn/build-rv64-nommu-k210-virt | success | build-rv64-nommu-k210-virt |
| bjorn/checkpatch | warning | checkpatch |
| bjorn/dtb-warn-rv64 | success | dtb-warn-rv64 |
| bjorn/header-inline | success | header-inline |
| bjorn/kdoc | success | kdoc |
| bjorn/module-param | success | module-param |
| bjorn/verify-fixes | success | verify-fixes |
| bjorn/verify-signedoff | success | verify-signedoff |
Hi Linus, Thomas: On 07:15 Sun 02 Mar , Yixun Lan wrote: > gpio irq which using three-cell scheme should always call > instance_match() function to find the correct irqdomain. > > The select() function will be called with !DOMAIN_BUS_ANY, > so for specific gpio irq driver, it need to set bus token > explicitly, something like: > irq_domain_update_bus_token(girq->domain, DOMAIN_BUS_WIRED); > > Signed-off-by: Yixun Lan <dlan@gentoo.org> > --- > drivers/gpio/gpiolib-of.c | 8 ++++++++ > drivers/gpio/gpiolib-of.h | 6 ++++++ > drivers/gpio/gpiolib.c | 23 +++++++++++++++++++---- > 3 files changed, 33 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 2e537ee979f3e2b6e8d5f86f3e121a66f2a8e083..e19904569fb1b71c1fff237132d17050ef02b074 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -1187,3 +1187,11 @@ void of_gpiochip_remove(struct gpio_chip *chip) > { > of_node_put(dev_of_node(&chip->gpiodev->dev)); > } > + > +bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index) > +{ > + if (gc->of_node_instance_match) > + return gc->of_node_instance_match(gc, index); > + > + return false; > +} > diff --git a/drivers/gpio/gpiolib-of.h b/drivers/gpio/gpiolib-of.h > index 16d6ac8cb156c02232ea868b755bbdc46c78e3c7..3eebfac290c571e3b90e4437295db8eaacb021a3 100644 > --- a/drivers/gpio/gpiolib-of.h > +++ b/drivers/gpio/gpiolib-of.h > @@ -22,6 +22,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np, > unsigned long *lookupflags); > int of_gpiochip_add(struct gpio_chip *gc); > void of_gpiochip_remove(struct gpio_chip *gc); > +bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index); > int of_gpio_count(const struct fwnode_handle *fwnode, const char *con_id); > #else > static inline struct gpio_desc *of_find_gpio(struct device_node *np, > @@ -33,6 +34,11 @@ static inline struct gpio_desc *of_find_gpio(struct device_node *np, > } > static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } > static inline void of_gpiochip_remove(struct gpio_chip *gc) { } > +static inline bool of_gpiochip_instance_match(struct gpio_chip *gc, > + unsigned int index) > +{ > + return false; > +} > static inline int of_gpio_count(const struct fwnode_handle *fwnode, > const char *con_id) > { > diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c > index 679ed764cb143c4b3357106de1570e8d38441372..266be465b9103c17861a0d76f2dfbf1f1de3a073 100644 > --- a/drivers/gpio/gpiolib.c > +++ b/drivers/gpio/gpiolib.c > @@ -1449,10 +1449,9 @@ static int gpiochip_hierarchy_irq_domain_translate(struct irq_domain *d, > unsigned long *hwirq, > unsigned int *type) > { > - /* We support standard DT translation */ > - if (is_of_node(fwspec->fwnode) && fwspec->param_count == 2) { > - return irq_domain_translate_twocell(d, fwspec, hwirq, type); > - } > + /* We support standard DT translation up to three cells */ > + if (is_of_node(fwspec->fwnode)) > + return irq_domain_translate_cells(d, fwspec, hwirq, type); I'm not sure if you like this way for calling generic cells parser here, as it should work for 1, 2, 3 cells model, which save a few lines meanwhile otherwise we end something like if (is_of_node(fwspec->fwnode) { if (fwspec->param_count == 2) { return irq_domain_translate_twocell(d, fwspec, hwirq, type); if (fwspec->param_count == 3) { return irq_domain_translate_threecell(d, fwspec, hwirq, type); } > > /* This is for board files and others not using DT */ > if (is_fwnode_irqchip(fwspec->fwnode)) { > @@ -1754,9 +1753,25 @@ static void gpiochip_irq_unmap(struct irq_domain *d, unsigned int irq) > irq_set_chip_data(irq, NULL); > } > > +static int gpiochip_irq_select(struct irq_domain *d, struct irq_fwspec *fwspec, > + enum irq_domain_bus_token bus_token) > +{ > + struct fwnode_handle *fwnode = fwspec->fwnode; > + struct gpio_chip *gc = d->host_data; > + unsigned int index = fwspec->param[0]; > + > + if (fwspec->param_count == 3 && is_of_node(fwnode)) > + return of_gpiochip_instance_match(gc, index); > + > + /* Fallback for twocells */ > + return ((fwnode != NULL) && (d->fwnode == fwnode) && > + (d->bus_token == bus_token)); > +} > + > static const struct irq_domain_ops gpiochip_domain_ops = { > .map = gpiochip_irq_map, > .unmap = gpiochip_irq_unmap, > + .select = gpiochip_irq_select, > /* Virtually all GPIO irqchips are twocell:ed */ > .xlate = irq_domain_xlate_twocell, > }; > > -- > 2.48.1 >
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 2e537ee979f3e2b6e8d5f86f3e121a66f2a8e083..e19904569fb1b71c1fff237132d17050ef02b074 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -1187,3 +1187,11 @@ void of_gpiochip_remove(struct gpio_chip *chip) { of_node_put(dev_of_node(&chip->gpiodev->dev)); } + +bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index) +{ + if (gc->of_node_instance_match) + return gc->of_node_instance_match(gc, index); + + return false; +} diff --git a/drivers/gpio/gpiolib-of.h b/drivers/gpio/gpiolib-of.h index 16d6ac8cb156c02232ea868b755bbdc46c78e3c7..3eebfac290c571e3b90e4437295db8eaacb021a3 100644 --- a/drivers/gpio/gpiolib-of.h +++ b/drivers/gpio/gpiolib-of.h @@ -22,6 +22,7 @@ struct gpio_desc *of_find_gpio(struct device_node *np, unsigned long *lookupflags); int of_gpiochip_add(struct gpio_chip *gc); void of_gpiochip_remove(struct gpio_chip *gc); +bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index); int of_gpio_count(const struct fwnode_handle *fwnode, const char *con_id); #else static inline struct gpio_desc *of_find_gpio(struct device_node *np, @@ -33,6 +34,11 @@ static inline struct gpio_desc *of_find_gpio(struct device_node *np, } static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } static inline void of_gpiochip_remove(struct gpio_chip *gc) { } +static inline bool of_gpiochip_instance_match(struct gpio_chip *gc, + unsigned int index) +{ + return false; +} static inline int of_gpio_count(const struct fwnode_handle *fwnode, const char *con_id) { diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 679ed764cb143c4b3357106de1570e8d38441372..266be465b9103c17861a0d76f2dfbf1f1de3a073 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1449,10 +1449,9 @@ static int gpiochip_hierarchy_irq_domain_translate(struct irq_domain *d, unsigned long *hwirq, unsigned int *type) { - /* We support standard DT translation */ - if (is_of_node(fwspec->fwnode) && fwspec->param_count == 2) { - return irq_domain_translate_twocell(d, fwspec, hwirq, type); - } + /* We support standard DT translation up to three cells */ + if (is_of_node(fwspec->fwnode)) + return irq_domain_translate_cells(d, fwspec, hwirq, type); /* This is for board files and others not using DT */ if (is_fwnode_irqchip(fwspec->fwnode)) { @@ -1754,9 +1753,25 @@ static void gpiochip_irq_unmap(struct irq_domain *d, unsigned int irq) irq_set_chip_data(irq, NULL); } +static int gpiochip_irq_select(struct irq_domain *d, struct irq_fwspec *fwspec, + enum irq_domain_bus_token bus_token) +{ + struct fwnode_handle *fwnode = fwspec->fwnode; + struct gpio_chip *gc = d->host_data; + unsigned int index = fwspec->param[0]; + + if (fwspec->param_count == 3 && is_of_node(fwnode)) + return of_gpiochip_instance_match(gc, index); + + /* Fallback for twocells */ + return ((fwnode != NULL) && (d->fwnode == fwnode) && + (d->bus_token == bus_token)); +} + static const struct irq_domain_ops gpiochip_domain_ops = { .map = gpiochip_irq_map, .unmap = gpiochip_irq_unmap, + .select = gpiochip_irq_select, /* Virtually all GPIO irqchips are twocell:ed */ .xlate = irq_domain_xlate_twocell, };
gpio irq which using three-cell scheme should always call instance_match() function to find the correct irqdomain. The select() function will be called with !DOMAIN_BUS_ANY, so for specific gpio irq driver, it need to set bus token explicitly, something like: irq_domain_update_bus_token(girq->domain, DOMAIN_BUS_WIRED); Signed-off-by: Yixun Lan <dlan@gentoo.org> --- drivers/gpio/gpiolib-of.c | 8 ++++++++ drivers/gpio/gpiolib-of.h | 6 ++++++ drivers/gpio/gpiolib.c | 23 +++++++++++++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-)