Commit 71efb063 authored by Will Deacon's avatar Will Deacon Committed by Russell King

ARM: 6742/1: pmu: avoid setting IRQ affinity on UP systems

Now that we can execute a CONFIG_SMP kernel on a uniprocessor system,
extra care has to be taken in the PMU IRQ affinity setting code to
ensure that we don't always fail to initialise.

This patch changes the CPU PMU initialisation code so that when we
only have a single IRQ, whose affinity can not be changed at the
controller, we report success (0) rather than -EINVAL.
Reported-by: default avatarAvik Sil <avik.sil@linaro.org>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 885028e4
...@@ -97,28 +97,34 @@ set_irq_affinity(int irq, ...@@ -97,28 +97,34 @@ set_irq_affinity(int irq,
irq, cpu); irq, cpu);
return err; return err;
#else #else
return 0; return -EINVAL;
#endif #endif
} }
static int static int
init_cpu_pmu(void) init_cpu_pmu(void)
{ {
int i, err = 0; int i, irqs, err = 0;
struct platform_device *pdev = pmu_devices[ARM_PMU_DEVICE_CPU]; struct platform_device *pdev = pmu_devices[ARM_PMU_DEVICE_CPU];
if (!pdev) { if (!pdev)
err = -ENODEV; return -ENODEV;
goto out;
} irqs = pdev->num_resources;
/*
* If we have a single PMU interrupt that we can't shift, assume that
* we're running on a uniprocessor machine and continue.
*/
if (irqs == 1 && !irq_can_set_affinity(platform_get_irq(pdev, 0)))
return 0;
for (i = 0; i < pdev->num_resources; ++i) { for (i = 0; i < irqs; ++i) {
err = set_irq_affinity(platform_get_irq(pdev, i), i); err = set_irq_affinity(platform_get_irq(pdev, i), i);
if (err) if (err)
break; break;
} }
out:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment