ARM: vexpress: refine MCPM smp operations override criteria

Current vexpress smp init code detects whether to override the
default smp ops with MCPM smp ops by matching the "cci-400"
compatible string, in that MCPM requires control over CCI ports
to manage low-power states entry/exit.

The "cci-400" compatible string check is a necessary but not
sufficient condition for MCPM to work, because the cci-400
can be made visible to the kernel, but firmware can nonetheless
disable non-secure CCI ports control, while still allowing PMU
access; if booted in non-secure world, the kernel would still
blindly override smp operations with MCPM operations, resulting
in kernel faults when the CCI ports programming interface is
accessed from non-secure world.

This means that the "cci-400" compatible string check would
result in a false positive in systems that eg boot in HYP mode,
where CCI ports non-secure access is explicitly not allowed,
and it is reported in the respective device tree nodes with
CCI ports marked as disabled.

Refactor the smp operations initialization to make sure that
the kernel is actually allowed to take control over CCI ports
(by enabling MCPM smp operations) before overriding default
vexpress smp operations.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Tested-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c
index 8b8d0724f6c6db3663bb02b3cfad3c93e0670479..98e29dee91e865f7c76408c845e99ff2af14ca92 100644 (file)
--- a/arch/arm/mach-vexpress/platsmp.c
+++ b/arch/arm/mach-vexpress/platsmp.c
@@ -26,19 +26,37 @@
 bool __init vexpress_smp_init_ops(void)
 {
 #ifdef CONFIG_MCPM
+       int cpu;
+       struct device_node *cpu_node, *cci_node;
+
        /*
-        * The best way to detect a multi-cluster configuration at the moment
-        * is to look for the presence of a CCI in the system.
+        * The best way to detect a multi-cluster configuration
+        * is to detect if the kernel can take over CCI ports
+        * control. Loop over possible CPUs and check if CCI
+        * port control is available.
         * Override the default vexpress_smp_ops if so.
         */
-       struct device_node *node;
-       node = of_find_compatible_node(NULL, NULL, "arm,cci-400");
-       if (node && of_device_is_available(node)) {
-               mcpm_smp_set_ops();
-               return true;
+       for_each_possible_cpu(cpu) {
+               bool available;
+
+               cpu_node = of_get_cpu_node(cpu, NULL);
+               if (WARN(!cpu_node, "Missing cpu device node!"))
+                       return false;
+
+               cci_node = of_parse_phandle(cpu_node, "cci-control-port", 0);
+               available = cci_node && of_device_is_available(cci_node);
+               of_node_put(cci_node);
+               of_node_put(cpu_node);
+
+               if (!available)
+                       return false;
        }
-#endif
+
+       mcpm_smp_set_ops();
+       return true;
+#else
        return false;
+#endif
 }
 
 static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {