From: Pawel Moll <pawel.moll@arm.com>
Date: Thu, 15 Oct 2015 13:32:46 +0000 (+0100)
Subject: bus: arm-ccn: Fix irq affinity setting on CPU migration
X-Git-Tag: MMI-PSA29.97-13-9~9166^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a0bcbe969f564d1ec08658170dda72a1b7e9053a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

bus: arm-ccn: Fix irq affinity setting on CPU migration

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.

Cc: <stable@vger.kernel.org> # 4.2+
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index cc322fbde9af..7082c7268845 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -1188,7 +1188,8 @@ static int arm_ccn_pmu_cpu_notifier(struct notifier_block *nb,
 			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;
 	}