OSDN Git Service

ARM: 8401/1: perf: Set affinity for PPI based PMUs
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 7 Jul 2015 17:16:15 +0000 (18:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 10 Jul 2015 10:08:42 +0000 (11:08 +0100)
For PPI based PMUs, we bail out early in of_pmu_irq_cfg() without
setting the PMU's supported_cpus bitmap. This causes the
smp_call_function_any() in armv7_probe_num_events() to fail. Set
the bitmap to be all CPUs so that we properly probe PMUs that use
PPIs.

Fixes: cc88116da0d1 ("arm: perf: treat PMUs as CPU affine")
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/perf_event.c

index 357f57e..f3ddd0f 100644 (file)
@@ -795,8 +795,10 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
 
        /* Don't bother with PPIs; they're already affine */
        irq = platform_get_irq(pdev, 0);
-       if (irq >= 0 && irq_is_percpu(irq))
+       if (irq >= 0 && irq_is_percpu(irq)) {
+               cpumask_setall(&pmu->supported_cpus);
                return 0;
+       }
 
        irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL);
        if (!irqs)