diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-09-17 15:29:33 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-10-28 15:05:48 -0700 |
| commit | b44598531b1a9e26f7bc62f0c7b25034883d7bed (patch) | |
| tree | e100ac71ccbf60d374de2b9880118c41027af144 /drivers | |
| parent | 6c83d9e3baca9a3a67a392f37e9c605623452fbb (diff) | |
drivers: CCI: Disable probing when PSCI is being used.
When booting with boottime selection of PSCI the device-tree still
contains a CCI device, even though this isn't accessible in the
non-secure world. We therefore need to detect this situation, otherwise
cci_pmu_probe will call probe_cci_revision and crash the system on boot.
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/arm-cci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index bb5b90e8e768..896519f98a34 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -26,6 +26,7 @@ #include <asm/cacheflush.h> #include <asm/irq_regs.h> +#include <asm/psci.h> #include <asm/pmu.h> #include <asm/smp_plat.h> @@ -967,6 +968,11 @@ static int cci_probe(void) const char *match_str; bool is_ace; + if (psci_probe() == 0) { + pr_debug("psci found. Aborting cci probe\n"); + return -ENODEV; + } + np = of_find_matching_node(NULL, arm_cci_matches); if (!np) return -ENODEV; |