ARMv8/PSCI: Fixup the device tree for PSCI

Set the enable-method in the cpu node to PSCI, and create device
node for PSCI, when PSCI was enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c
index 32c368f1455343ac26c2ec8ac24709ff8b2d4899..707dad4829a983d4023acc3aee71abe0d1ced948 100644 (file)
--- a/arch/arm/cpu/armv7/virt-dt.c
+++ b/arch/arm/cpu/armv7/virt-dt.c
@@ -26,69 +26,6 @@
 #include <asm/armv7.h>
 #include <asm/psci.h>
 
-static int fdt_psci(void *fdt)
-{
-#ifdef CONFIG_ARMV7_PSCI
-       int nodeoff;
-       int tmp;
-
-       nodeoff = fdt_path_offset(fdt, "/cpus");
-       if (nodeoff < 0) {
-               printf("couldn't find /cpus\n");
-               return nodeoff;
-       }
-
-       /* add 'enable-method = "psci"' to each cpu node */
-       for (tmp = fdt_first_subnode(fdt, nodeoff);
-            tmp >= 0;
-            tmp = fdt_next_subnode(fdt, tmp)) {
-               const struct fdt_property *prop;
-               int len;
-
-               prop = fdt_get_property(fdt, tmp, "device_type", &len);
-               if (!prop)
-                       continue;
-               if (len < 4)
-                       continue;
-               if (strcmp(prop->data, "cpu"))
-                       continue;
-
-               fdt_setprop_string(fdt, tmp, "enable-method", "psci");
-       }
-
-       nodeoff = fdt_path_offset(fdt, "/psci");
-       if (nodeoff < 0) {
-               nodeoff = fdt_path_offset(fdt, "/");
-               if (nodeoff < 0)
-                       return nodeoff;
-
-               nodeoff = fdt_add_subnode(fdt, nodeoff, "psci");
-               if (nodeoff < 0)
-                       return nodeoff;
-       }
-
-       tmp = fdt_setprop_string(fdt, nodeoff, "compatible", "arm,psci");
-       if (tmp)
-               return tmp;
-       tmp = fdt_setprop_string(fdt, nodeoff, "method", "smc");
-       if (tmp)
-               return tmp;
-       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_suspend", ARM_PSCI_FN_CPU_SUSPEND);
-       if (tmp)
-               return tmp;
-       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_off", ARM_PSCI_FN_CPU_OFF);
-       if (tmp)
-               return tmp;
-       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_on", ARM_PSCI_FN_CPU_ON);
-       if (tmp)
-               return tmp;
-       tmp = fdt_setprop_u32(fdt, nodeoff, "migrate", ARM_PSCI_FN_MIGRATE);
-       if (tmp)
-               return tmp;
-#endif
-       return 0;
-}
-
 int armv7_apply_memory_carveout(u64 *start, u64 *size)
 {
 #ifdef CONFIG_ARMV7_SECURE_RESERVE_SIZE

diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile
index ee9e0091a4f8fdbfc27494cf69e627ec3e25bba0..33e6db0cc5246b740f7e4d36fcc814f422570182 100644 (file)
--- a/arch/arm/cpu/armv8/Makefile
+++ b/arch/arm/cpu/armv8/Makefile
@@ -15,6 +15,7 @@ obj-y += cache.o
 obj-y  += tlb.o
 obj-y  += transition.o
 obj-y  += fwcall.o
+obj-y  += cpu-dt.o
 obj-$(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_asm.o
 
 obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/

diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c
new file mode 100644 (file)
index 0000000..9ffb49c
--- /dev/null
+++ b/arch/arm/cpu/armv8/cpu-dt.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 NXP Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/psci.h>
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#include <asm/armv8/sec_firmware.h>
+#endif
+
+int psci_update_dt(void *fdt)
+{
+#ifdef CONFIG_MP
+#if defined(CONFIG_ARMV8_PSCI)
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+       /*
+        * If the PSCI in SEC Firmware didn't work, avoid to update the
+        * device node of PSCI. But still return 0 instead of an error
+        * number to support detecting PSCI dynamically and then switching
+        * the SMP boot method between PSCI and spin-table.
+        */
+       if (sec_firmware_support_psci_version() == 0xffffffff)
+               return 0;
+#endif
+       fdt_psci(fdt);
+#endif
+#endif
+       return 0;
+}

diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index bc5edda73f0076a670214b348bdbc41f976ba720..f92633b13f80499a8a325410c68c50efa733df6b 100644 (file)
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -57,6 +57,7 @@ void psci_cpu_off_common(void);
 
 int psci_update_dt(void *fdt);
 void psci_board_init(void);
+int fdt_psci(void *fdt);
 #endif /* ! __ASSEMBLY__ */
 
 #endif /* __ARM_PSCI_H__ */

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 0e05e87deafcb7581a6cc1c8def80fd2ec98fa6b..f406419d88f4af45a2ff9bb4c06800fb2bd2550b 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -55,6 +55,8 @@ ifndef CONFIG_ARM64
 obj-y  += cache-cp15.o
 endif
 
+obj-y  += psci-dt.o
+
 obj-$(CONFIG_DEBUG_LL) += debug.o
 
 # For EABI conformant tool chains, provide eabi_compat()

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 76b75d8e4643ee9a018c216c15301de2ae15f3d4..fe5b4883391d6d26f6ed3368d3e57f55652ded49 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -45,7 +45,7 @@ int arch_fixup_fdt(void *blob)
        if (ret)
                return ret;
 
-#ifdef CONFIG_ARMV7_NONSEC
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
        ret = psci_update_dt(blob);
        if (ret)
                return ret;

diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
new file mode 100644 (file)
index 0000000..8dc31d4
--- /dev/null
+++ b/arch/arm/lib/psci-dt.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016 NXP Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <libfdt.h>
+#include <fdt_support.h>
+#include <linux/sizes.h>
+#include <linux/kernel.h>
+#include <asm/psci.h>
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#include <asm/armv8/sec_firmware.h>
+#endif
+
+int fdt_psci(void *fdt)
+{
+#if defined(CONFIG_ARMV8_PSCI) || defined(CONFIG_ARMV7_PSCI)
+       int nodeoff;
+       unsigned int psci_ver = 0;
+       char *psci_compt;
+       int tmp;
+
+       nodeoff = fdt_path_offset(fdt, "/cpus");
+       if (nodeoff < 0) {
+               printf("couldn't find /cpus\n");
+               return nodeoff;
+       }
+
+       /* add 'enable-method = "psci"' to each cpu node */
+       for (tmp = fdt_first_subnode(fdt, nodeoff);
+            tmp >= 0;
+            tmp = fdt_next_subnode(fdt, tmp)) {
+               const struct fdt_property *prop;
+               int len;
+
+               prop = fdt_get_property(fdt, tmp, "device_type", &len);
+               if (!prop)
+                       continue;
+               if (len < 4)
+                       continue;
+               if (strcmp(prop->data, "cpu"))
+                       continue;
+
+               /*
+                * Not checking rv here, our approach is to skip over errors in
+                * individual cpu nodes, hopefully some of the nodes are
+                * processed correctly and those will boot
+                */
+               fdt_setprop_string(fdt, tmp, "enable-method", "psci");
+       }
+
+       /*
+        * The PSCI node might be called "/psci" or might be called something
+        * else but contain either of the compatible strings
+        * "arm,psci"/"arm,psci-0.2"
+        */
+       nodeoff = fdt_path_offset(fdt, "/psci");
+       if (nodeoff >= 0)
+               goto init_psci_node;
+
+       nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci");
+       if (nodeoff >= 0)
+               goto init_psci_node;
+
+       nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci-0.2");
+       if (nodeoff >= 0)
+               goto init_psci_node;
+
+       nodeoff = fdt_node_offset_by_compatible(fdt, -1, "arm,psci-1.0");
+       if (nodeoff >= 0)
+               goto init_psci_node;
+
+       nodeoff = fdt_path_offset(fdt, "/");
+       if (nodeoff < 0)
+               return nodeoff;
+
+       nodeoff = fdt_add_subnode(fdt, nodeoff, "psci");
+       if (nodeoff < 0)
+               return nodeoff;
+
+init_psci_node:
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+       psci_ver = sec_firmware_support_psci_version();
+#endif
+       switch (psci_ver) {
+       case 0x00010000:
+               psci_compt = "arm,psci-1.0";
+               break;
+       case 0x00000002:
+               psci_compt = "arm,psci-0.2";
+               break;
+       default:
+               psci_compt = "arm,psci";
+               break;
+       }
+
+       tmp = fdt_setprop_string(fdt, nodeoff, "compatible", psci_compt);
+       if (tmp)
+               return tmp;
+       tmp = fdt_setprop_string(fdt, nodeoff, "method", "smc");
+       if (tmp)
+               return tmp;
+
+#ifdef CONFIG_ARMV7_PSCI
+       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_suspend",
+                               ARM_PSCI_FN_CPU_SUSPEND);
+       if (tmp)
+               return tmp;
+       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_off", ARM_PSCI_FN_CPU_OFF);
+       if (tmp)
+               return tmp;
+       tmp = fdt_setprop_u32(fdt, nodeoff, "cpu_on", ARM_PSCI_FN_CPU_ON);
+       if (tmp)
+               return tmp;
+       tmp = fdt_setprop_u32(fdt, nodeoff, "migrate", ARM_PSCI_FN_MIGRATE);
+       if (tmp)
+               return tmp;
+#endif
+#endif
+       return 0;
+}