| Message ID | 20220104134512.18498-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4] soc: ti: smartreflex: Use platform_get_irq_optional() to get the interrupt | expand |
On Tue, Jan 4, 2022 at 3:45 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_optional(). > > While at it return 0 instead of returning ret in the probe success path. ... > + ret = platform_get_irq_optional(pdev, 0); > + if (ret < 0 && ret != -ENXIO) { > + dev_err_probe(&pdev->dev, ret, "%s: failed to get IRQ resource\n", __func__); > + return ret; return dev_err_probe(...); ? > + }
On Tue, Jan 4, 2022 at 2:50 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Tue, Jan 4, 2022 at 3:45 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_optional(). > > > > While at it return 0 instead of returning ret in the probe success path. > > ... > > > + ret = platform_get_irq_optional(pdev, 0); > > + if (ret < 0 && ret != -ENXIO) { > > > + dev_err_probe(&pdev->dev, ret, "%s: failed to get IRQ resource\n", __func__); > > + return ret; > > return dev_err_probe(...); ? > Argh my bad. Cheers, Prabhakar
diff --git a/drivers/soc/ti/smartreflex.c b/drivers/soc/ti/smartreflex.c index b5b2fa538d5c..a219c003a63f 100644 --- a/drivers/soc/ti/smartreflex.c +++ b/drivers/soc/ti/smartreflex.c @@ -819,7 +819,7 @@ static int omap_sr_probe(struct platform_device *pdev) { struct omap_sr *sr_info; struct omap_sr_data *pdata = pdev->dev.platform_data; - struct resource *mem, *irq; + struct resource *mem; struct dentry *nvalue_dir; int i, ret = 0; @@ -844,7 +844,13 @@ static int omap_sr_probe(struct platform_device *pdev) if (IS_ERR(sr_info->base)) return PTR_ERR(sr_info->base); - irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + ret = platform_get_irq_optional(pdev, 0); + if (ret < 0 && ret != -ENXIO) { + dev_err_probe(&pdev->dev, ret, "%s: failed to get IRQ resource\n", __func__); + return ret; + } + if (ret > 0) + sr_info->irq = ret; sr_info->fck = devm_clk_get(pdev->dev.parent, "fck"); if (IS_ERR(sr_info->fck)) @@ -870,9 +876,6 @@ static int omap_sr_probe(struct platform_device *pdev) sr_info->autocomp_active = false; sr_info->ip_type = pdata->ip_type; - if (irq) - sr_info->irq = irq->start; - sr_set_clk_length(sr_info); list_add(&sr_info->node, &sr_list); @@ -926,7 +929,7 @@ static int omap_sr_probe(struct platform_device *pdev) } - return ret; + return 0; err_debugfs: debugfs_remove_recursive(sr_info->dbg_dir);
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_optional(). While at it return 0 instead of returning ret in the probe success path. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> --- v3->v4: * Used dev_err_probe() to print error message * Returning 0 in probe success path. v2->v3 * Switch back to platform_get_irq_optional() * Only print error in case of error, and not when interrupt is missing. v1->v2 * Updated commit message * Drop check for IRQ0 * Switched to using platform_get_irq() so that the probe won't fail silently as requested by Nishanth. v1: * https://www.spinics.net/lists/arm-kernel/msg942549.html --- drivers/soc/ti/smartreflex.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)