fvp: move a710 to 8 core test
With 11.26.11 FVP models a710 is a 8 core FVP, so move tests
to use 8 cores rather than 4 cores.
If we setup as 4 cores from FVP kernel still recognises as 8 core system.
[...]
rcu: RCU restricting CPUs from NR_CPUS=256 to nr_cpu_ids=8.
[...]
This means kernel can schedule init.sh on any of the core ids.
But since we fail to bring up core4 to 7 and we schedule on any of
these cores will eventually lead to a hang with init.sh
not mounting the rootfs, if init.sh is run on core4 to 7.
Also in ci scripts we wait for shell prompt "#" for test to pass
which may not happen when init.sh fails.
Change-Id: Iadd87cbbe8bbb2d456496b9ce65e785f686b66af
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
(cherry picked from commit 268a2befdb6d55a6e6b8347357b2b12cac580947)
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 9888b7b..9be2176 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -92,7 +92,7 @@
[cortex-a78aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A78AE"
[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
-[cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
+[cortex-a710x8]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
[neoverse_e1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x8-debug
similarity index 100%
rename from group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x4-debug
rename to group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-cortexa710x8-debug
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
similarity index 100%
rename from group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
rename to group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
diff --git a/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug b/group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
similarity index 100%
rename from group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x4-debug
rename to group/tftf-l2-fvp/fvp-errata-abi-a710,fvp-errata-abi:fvp-dtb.dyn-tftf-fip.tftf-cortexa710x8-debug
diff --git a/model/cortex-a710.sh b/model/cortex-a710.sh
index 05cc49d..3e11d1e 100644
--- a/model/cortex-a710.sh
+++ b/model/cortex-a710.sh
@@ -15,7 +15,7 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
--C cluster0.NUM_CORES=4
+-C cluster0.NUM_CORES=8
-C pctl.use_in_cluster_ppu=true
-C cluster0.core_power_on_by_default=false
diff --git a/run_config/fvp-cortexa710x4 b/run_config/fvp-cortexa710x8
similarity index 85%
rename from run_config/fvp-cortexa710x4
rename to run_config/fvp-cortexa710x8
index 1eea3e8..7d111e2 100644
--- a/run_config/fvp-cortexa710x4
+++ b/run_config/fvp-cortexa710x8
@@ -8,7 +8,7 @@
generate_lava_job() {
local model="cortex-a710"
- uart="0" set_expect_variable "num_cpus" "4"
+ uart="0" set_expect_variable "num_cpus" "8"
model="$model" cache_state_modelled="0" gen_model_params
model="$model" gen_fvp_yaml