diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-27 10:00:28 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-05-10 15:12:25 +0200 |
| commit | be1c2bb3ba5a39c20b1d54e01ffbcb2b1ca7e46c (patch) | |
| tree | b0188864403a5aa1883d8d4977fd8329aaf89da6 | |
| parent | Linux 5.13-rc1 (diff) | |
| download | linux-be1c2bb3ba5a39c20b1d54e01ffbcb2b1ca7e46c.tar.xz linux-be1c2bb3ba5a39c20b1d54e01ffbcb2b1ca7e46c.zip | |
ARM: PXA: Fix cplds irqdesc allocation when using legacy mode
The Mainstone PXA platform uses CONFIG_SPARSE_IRQ, and thus we
cannot rely on the irq descriptors to be readilly allocated
before creating the irqdomain in legacy mode. The kernel then
complains loudly about not being able to associate the interrupt
in the domain -- can't blame it.
Fix it by allocating the irqdescs upfront in the legacy case.
Fixes: b68761da0111 ("ARM: PXA: Kill use of irq_create_strict_mappings()")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210426223942.GA213931@roeck-us.net
| -rw-r--r-- | arch/arm/mach-pxa/pxa_cplds_irqs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa_cplds_irqs.c b/arch/arm/mach-pxa/pxa_cplds_irqs.c index ec0d9b094744..bddfc7cd5d40 100644 --- a/arch/arm/mach-pxa/pxa_cplds_irqs.c +++ b/arch/arm/mach-pxa/pxa_cplds_irqs.c @@ -121,8 +121,13 @@ static int cplds_probe(struct platform_device *pdev) return fpga->irq; base_irq = platform_get_irq(pdev, 1); - if (base_irq < 0) + if (base_irq < 0) { base_irq = 0; + } else { + ret = devm_irq_alloc_descs(&pdev->dev, base_irq, base_irq, CPLDS_NB_IRQ, 0); + if (ret < 0) + return ret; + } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); fpga->base = devm_ioremap_resource(&pdev->dev, res); |