diff options
| author | Julien Thierry <julien.thierry@arm.com> | 2017-10-13 12:26:45 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-10-24 16:04:05 +0100 |
| commit | 611479c79a94e6713bc044b0410aa8b867375d17 (patch) | |
| tree | 4e6b947230cafaa7e10c47bdfc5ca30d0e066f41 /drivers/perf/arm_pmu_platform.c | |
| parent | 08395c7f4d9f5808b5754a0dbed969f378bde0c3 (diff) | |
| download | talos-obmc-linux-611479c79a94e6713bc044b0410aa8b867375d17.tar.gz talos-obmc-linux-611479c79a94e6713bc044b0410aa8b867375d17.zip | |
arm/arm64: pmu: Distinguish percpu irq and percpu_devid irq
arm_pmu interrupts are maked as PERCPU even when these are not local
physical interrupts to a single CPU. When using non-local interrupts,
interrupts marked as PERCPU will not get freed not disabled properly
by the PMU driver.
Check if interrupts are local to a single CPU with PERCPU_DEVID since
this is what the PMU driver really needs to know.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf/arm_pmu_platform.c')
| -rw-r--r-- | drivers/perf/arm_pmu_platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c index 4eafa7a42e52..bbc64ee6dd96 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c @@ -126,7 +126,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) if (num_irqs == 1) { int irq = platform_get_irq(pdev, 0); - if (irq && irq_is_percpu(irq)) + if (irq && irq_is_percpu_devid(irq)) return pmu_parse_percpu_irq(pmu, irq); } @@ -149,7 +149,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) if (WARN_ON(irq <= 0)) continue; - if (irq_is_percpu(irq)) { + if (irq_is_percpu_devid(irq)) { pr_warn("multiple PPIs or mismatched SPI/PPI detected\n"); return -EINVAL; } |
