| Message ID | 20220104140913.29699-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] pinctrl: at91-pio4: Use platform_get_irq() to get the interrupt | expand |
On Tue, Jan 4, 2022 at 3:10 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypasses the hierarchical setup and messes up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq(). > > While at it, replace the dev_err() with dev_dbg() as platform_get_irq() > prints an error message upon error. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > v1->v2 > * Switched using platform_get_irq() > * Replaced dev_err() with dev_dbg() Looks good to me but I'd like some ACK from a Microchip person before I merge this (for v5.18). Yours, Linus Walleij
On 1/4/22 4:09 PM, Lad Prabhakar wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypasses the hierarchical setup and messes up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq(). > > While at it, replace the dev_err() with dev_dbg() as platform_get_irq() > prints an error message upon error. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Tested-by: Tudor Ambarus <tudor.ambarus@microchip.com> thanks, ta > --- > v1->v2 > * Switched using platform_get_irq() > * Replaced dev_err() with dev_dbg() > > v1: https://lore.kernel.org/lkml/20211224145748.18754-3-prabhakar.mahadev-lad.rj@bp.renesas.com/ > --- > drivers/pinctrl/pinctrl-at91-pio4.c | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c > index fafd1f55cba7..517f2a6330ad 100644 > --- a/drivers/pinctrl/pinctrl-at91-pio4.c > +++ b/drivers/pinctrl/pinctrl-at91-pio4.c > @@ -1045,7 +1045,6 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) > const char **group_names; > const struct of_device_id *match; > int i, ret; > - struct resource *res; > struct atmel_pioctrl *atmel_pioctrl; > const struct atmel_pioctrl_data *atmel_pioctrl_data; > > @@ -1164,16 +1163,15 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) > > /* There is one controller but each bank has its own irq line. */ > for (i = 0; i < atmel_pioctrl->nbanks; i++) { > - res = platform_get_resource(pdev, IORESOURCE_IRQ, i); > - if (!res) { > - dev_err(dev, "missing irq resource for group %c\n", > + ret = platform_get_irq(pdev, i); > + if (ret < 0) { > + dev_dbg(dev, "missing irq resource for group %c\n", > 'A' + i); > - return -EINVAL; > + return ret; > } > - atmel_pioctrl->irqs[i] = res->start; > - irq_set_chained_handler_and_data(res->start, > - atmel_gpio_irq_handler, atmel_pioctrl); > - dev_dbg(dev, "bank %i: irq=%pr\n", i, res); > + atmel_pioctrl->irqs[i] = ret; > + irq_set_chained_handler_and_data(ret, atmel_gpio_irq_handler, atmel_pioctrl); > + dev_dbg(dev, "bank %i: irq=%d\n", i, ret); > } > > atmel_pioctrl->irq_domain = irq_domain_add_linear(dev->of_node, > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On Tue, Jan 4, 2022 at 3:10 PM Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> wrote: > platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static > allocation of IRQ resources in DT core code, this causes an issue > when using hierarchical interrupt domains using "interrupts" property > in the node as this bypasses the hierarchical setup and messes up the > irq chaining. > > In preparation for removal of static setup of IRQ resource from DT core > code use platform_get_irq(). > > While at it, replace the dev_err() with dev_dbg() as platform_get_irq() > prints an error message upon error. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index fafd1f55cba7..517f2a6330ad 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -1045,7 +1045,6 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) const char **group_names; const struct of_device_id *match; int i, ret; - struct resource *res; struct atmel_pioctrl *atmel_pioctrl; const struct atmel_pioctrl_data *atmel_pioctrl_data; @@ -1164,16 +1163,15 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) /* There is one controller but each bank has its own irq line. */ for (i = 0; i < atmel_pioctrl->nbanks; i++) { - res = platform_get_resource(pdev, IORESOURCE_IRQ, i); - if (!res) { - dev_err(dev, "missing irq resource for group %c\n", + ret = platform_get_irq(pdev, i); + if (ret < 0) { + dev_dbg(dev, "missing irq resource for group %c\n", 'A' + i); - return -EINVAL; + return ret; } - atmel_pioctrl->irqs[i] = res->start; - irq_set_chained_handler_and_data(res->start, - atmel_gpio_irq_handler, atmel_pioctrl); - dev_dbg(dev, "bank %i: irq=%pr\n", i, res); + atmel_pioctrl->irqs[i] = ret; + irq_set_chained_handler_and_data(ret, atmel_gpio_irq_handler, atmel_pioctrl); + dev_dbg(dev, "bank %i: irq=%d\n", i, ret); } atmel_pioctrl->irq_domain = irq_domain_add_linear(dev->of_node,
platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static allocation of IRQ resources in DT core code, this causes an issue when using hierarchical interrupt domains using "interrupts" property in the node as this bypasses the hierarchical setup and messes up the irq chaining. In preparation for removal of static setup of IRQ resource from DT core code use platform_get_irq(). While at it, replace the dev_err() with dev_dbg() as platform_get_irq() prints an error message upon error. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- v1->v2 * Switched using platform_get_irq() * Replaced dev_err() with dev_dbg() v1: https://lore.kernel.org/lkml/20211224145748.18754-3-prabhakar.mahadev-lad.rj@bp.renesas.com/ --- drivers/pinctrl/pinctrl-at91-pio4.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)