ARM: vexpress: Ensure SPC driver is loaded before using it in PSCI init

Otherwise we get a nullptr dereference calling vexpress_spc_get_nb_cpus.

Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/arch/arm/mach-vexpress/tc2_pm_psci.c b/arch/arm/mach-vexpress/tc2_pm_psci.c
index 5a5e4f568497c9e7763e94661370ac487a6f3c40..c2fdc22e4c0686a81a7bf4205fc66d32b0024754 100644 (file)
--- a/arch/arm/mach-vexpress/tc2_pm_psci.c
+++ b/arch/arm/mach-vexpress/tc2_pm_psci.c
@@ -155,6 +155,11 @@ static int __init tc2_pm_psci_init(void)
                return -ENODEV;
        }
 
+       if (!vexpress_spc_check_loaded()) {
+               pr_debug("spc not found. Aborting psci init\n");
+               return -ENODEV;
+       }
+
        tc2_pm_usage_count_init();
 
        ret = mcpm_platform_register(&tc2_pm_power_ops);