| From a0bcbe969f564d1ec08658170dda72a1b7e9053a Mon Sep 17 00:00:00 2001 |
| From: Pawel Moll <pawel.moll@arm.com> |
| Date: Thu, 15 Oct 2015 14:32:46 +0100 |
| Subject: bus: arm-ccn: Fix irq affinity setting on CPU migration |
| |
| From: Pawel Moll <pawel.moll@arm.com> |
| |
| commit a0bcbe969f564d1ec08658170dda72a1b7e9053a upstream. |
| |
| When PMU context is migrating between CPUs, interrupt affinity is set as |
| well. Only this should not happen when the CCN interrupt is not being |
| used at all (the driver is using a hrtimer tick instead). |
| |
| Fixed now. |
| |
| Signed-off-by: Pawel Moll <pawel.moll@arm.com> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/bus/arm-ccn.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/bus/arm-ccn.c |
| +++ b/drivers/bus/arm-ccn.c |
| @@ -1188,7 +1188,8 @@ static int arm_ccn_pmu_cpu_notifier(stru |
| break; |
| perf_pmu_migrate_context(&dt->pmu, cpu, target); |
| cpumask_set_cpu(target, &dt->cpu); |
| - WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0); |
| + if (ccn->irq) |
| + WARN_ON(irq_set_affinity(ccn->irq, &dt->cpu) != 0); |
| default: |
| break; |
| } |
