Apply SMP config to all ARM boards

Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>

Author: Ivan-Velickovic

build_sdk.py

@@ -135,6 +135,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a35",
         loader_link_address=0x80280000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "tqma8xqp1gb",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
@@ -144,6 +145,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x40000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "zynqmp",
             "KernelARMPlatform": "zcu102",
@@ -154,16 +156,17 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x50000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "maaxboard",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
-        smp_cores=4,
     ),
     BoardInfo(
         name="imx8mm_evk",
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x41000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "imx8mm-evk",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
@@ -173,6 +176,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x41000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "imx8mp-evk",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
@@ -182,6 +186,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x41000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "imx8mq-evk",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
@@ -191,6 +196,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x50000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "imx8mp-evk",
             "KernelCustomDTS": "custom_dts/iot-gate.dts",
@@ -202,6 +208,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x20000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "odroidc2",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,
@@ -221,6 +228,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x40000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "zynqmp",
             "KernelARMPlatform": "ultra96v2",
@@ -256,6 +264,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a72",
         loader_link_address=0x10000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "bcm2711",
             "RPI4_MEMORY": 1024,
@@ -266,6 +275,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a72",
         loader_link_address=0x10000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "bcm2711",
             "RPI4_MEMORY": 2048,
@@ -276,6 +286,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a72",
         loader_link_address=0x10000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "bcm2711",
             "RPI4_MEMORY": 4096,
@@ -286,6 +297,7 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a72",
         loader_link_address=0x10000000,
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "bcm2711",
             "RPI4_MEMORY": 8192,
@@ -296,6 +308,9 @@ class ConfigInfo:
         arch=KernelArch.AARCH64,
         gcc_cpu="cortex-a53",
         loader_link_address=0x30000000,
+        # ROCKPRO64 has 4 Cortex-A53 cores and 2 Cortex-A72 cores,
+        # we always run on the Cortex-A53s.
+        smp_cores=4,
         kernel_options={
             "KernelPlatform": "rockpro64",
         } | DEFAULT_KERNEL_OPTIONS_AARCH64,

loader/src/aarch64/cpus.c

@@ -38,10 +38,26 @@ uint64_t plat_get_hw_id(int logical_cpu)
  * from the device tree (cpu's <reg> argument), which is what Linux uses.
  **/
 
-#if defined(CONFIG_PLAT_MAAXBOARD)
+#if defined(CONFIG_PLAT_TQMA8XQP1GB)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_ZYNQMP_ZCU102)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_IMX8MM_EVK)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_IMX8MQ_EVK) || defined(CONFIG_PLAT_MAAXBOARD)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_IMX8MP_EVK)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_ZYNQMP_ULTRA96V2)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_ODROIDC2)
 static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
 #elif defined(CONFIG_PLAT_ODROIDC4)
 static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_BCM2711)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
+#elif defined(CONFIG_PLAT_ROCKPRO64)
+static const size_t psci_target_cpus[4] = {0x00, 0x01, 0x02, 0x03};
 #elif defined(CONFIG_PLAT_QEMU_ARM_VIRT)
 /* QEMU is special and can have arbitrary numbers of cores */
 // TODO.