ci: add an all config with SPM
Copies the feature enables from the other all configs to the maximal
(sve+sme+fa64) SPM config. Don't touch the partial configs. We can then
replace the coverage job with the same run for more coverage
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I5ea95c37f46d3bb9a99ef64eb303777cd1ec6d66
diff --git a/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme+fa64 b/group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.all
similarity index 100%
rename from group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.sve+sme+fa64
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-sve+sme,fvp-default:fvp-spm.all
diff --git a/group/tf-l3-code-coverage/fvp-spm-sve,fvp-default,fvp-default:fvp-spm.sve.bmcov-debug b/group/tf-l3-code-coverage/fvp-spm-sve+sme,fvp-default,fvp-default:fvp-spm.all.bmcov-debug
similarity index 100%
rename from group/tf-l3-code-coverage/fvp-spm-sve,fvp-default,fvp-default:fvp-spm.sve.bmcov-debug
rename to group/tf-l3-code-coverage/fvp-spm-sve+sme,fvp-default,fvp-default:fvp-spm.all.bmcov-debug
diff --git a/run_config/fvp-spm.all b/run_config/fvp-spm.all
new file mode 100644
index 0000000..85e8336
--- /dev/null
+++ b/run_config/fvp-spm.all
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+post_tf_build() {
+ build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
+}
+
+generate_lava_job_template() {
+ payload_type="tftf" gen_yaml_template
+}
+
+generate_lava_job() {
+ local model="base-aemv8a"
+
+ uart="0" file="tftf.exp" track_expect
+ uart="1" file="hold_uart.exp" track_expect
+
+ # SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
+ # enabled to help with stage-2 translation and virtualization of
+ # upstream peripheral devices. Hence, enable the SMMUv3 IP in FVP
+ # by configuring the appropriate parameters of the SMMUv3 AEM.
+
+ model="$model" \
+ etm_plugin="1" \
+ has_ete="1" \
+ has_sve="1" \
+ etm_present="1" \
+ amu_present="1" \
+ has_sme="1" has_sme2="1" \
+ has_sme_fa64="1" \
+ has_mpam="1" \
+ has_ecv="1" \
+ has_fpmr="1" \
+ has_translation_hardening="1" \
+ has_d128="1" \
+ has_brbe="1" \
+ has_trbe="1" \
+ has_fgt2="1" \
+ has_csv2_2="1" \
+ has_s1pie="1" \
+ has_s1poe="1" \
+ has_s2poe="1" \
+ has_gcs="1" \
+ has_pmuv3p7="1" \
+ has_v8_9_debug_extension="1" \
+ memory_tagging_support_level="3" \
+ supports_branch_record_buffer_control_regs="1" \
+ has_branch_target_exception="1" \
+ supports_trace_buffer_control_regs="1" \
+ supports_trace_filter_regs="2" \
+ supports_system_trace_filter_regs="1" \
+ accelerator_support_level="3" \
+ has_mops="1" \
+ arch_version="9.4" \
+ has_smmuv3_params="1" \
+ gicd_are_fixed_one="1" \
+ gicv3_ext_interrupt_range="1" \
+ gicd_ext_ppi_count="64" \
+ gicd_ext_spi_count="1024" \
+ gen_model_params
+
+ model="$model" gen_fvp_yaml
+}
diff --git a/run_config/fvp-spm.sve.bmcov b/run_config/fvp-spm.all.bmcov
similarity index 62%
rename from run_config/fvp-spm.sve.bmcov
rename to run_config/fvp-spm.all.bmcov
index 5e79aab..ff018cf 100644
--- a/run_config/fvp-spm.sve.bmcov
+++ b/run_config/fvp-spm.all.bmcov
@@ -29,12 +29,38 @@
fi
model="$model" \
- amu_present="1" \
- arch_version="8.5" \
- has_branch_target_exception="1" \
- has_smmuv3_params="1" \
- memory_tagging_support_level="2" \
+ etm_plugin="1" \
+ has_ete="1" \
has_sve="1" \
+ etm_present="1" \
+ amu_present="1" \
+ has_sme="1" has_sme2="1" \
+ has_sme_fa64="1" \
+ has_mpam="1" \
+ has_ecv="1" \
+ has_fpmr="1" \
+ has_translation_hardening="1" \
+ has_d128="1" \
+ has_brbe="1" \
+ has_trbe="1" \
+ has_fgt2="1" \
+ has_csv2_2="1" \
+ has_s1pie="1" \
+ has_s1poe="1" \
+ has_s2poe="1" \
+ has_gcs="1" \
+ has_pmuv3p7="1" \
+ has_v8_9_debug_extension="1" \
+ memory_tagging_support_level="3" \
+ supports_branch_record_buffer_control_regs="1" \
+ has_branch_target_exception="1" \
+ supports_trace_buffer_control_regs="1" \
+ supports_trace_filter_regs="2" \
+ supports_system_trace_filter_regs="1" \
+ accelerator_support_level="3" \
+ has_mops="1" \
+ arch_version="9.4" \
+ has_smmuv3_params="1" \
gicd_are_fixed_one="1" \
gicv3_ext_interrupt_range="1" \
gicd_ext_ppi_count="64" \
diff --git a/run_config/fvp-spm.sve+sme+fa64 b/run_config/fvp-spm.sve+sme+fa64
deleted file mode 100644
index 089ed3a..0000000
--- a/run_config/fvp-spm.sve+sme+fa64
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"
-}
-
-generate_lava_job_template() {
- payload_type="tftf" gen_yaml_template
-}
-
-generate_lava_job() {
- local model="base-aemv8a"
-
- uart="0" file="tftf.exp" track_expect
- uart="1" file="hold_uart.exp" track_expect
-
- # SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver
- # enabled to help with stage-2 translation and virtualization of
- # upstream peripheral devices. Hence, enable the SMMUv3 IP in FVP
- # by configuring the appropriate parameters of the SMMUv3 AEM.
-
- model="$model" \
- arch_version="8.5" \
- has_branch_target_exception="1" \
- has_smmuv3_params="1" \
- memory_tagging_support_level="2" \
- has_sve="1" \
- has_sme="1" \
- has_sme_fa64="1" \
- gicd_are_fixed_one="1" \
- gicv3_ext_interrupt_range="1" \
- gicd_ext_ppi_count="64" \
- gicd_ext_spi_count="1024" \
- gen_model_params
-
- model="$model" gen_fvp_yaml
-}
diff --git a/tf_config/fvp-spm-sve+sme b/tf_config/fvp-spm-sve+sme
index e7b9713..3834d98 100644
--- a/tf_config/fvp-spm-sve+sme
+++ b/tf_config/fvp-spm-sve+sme
@@ -1,12 +1,12 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-SPD=spmd
-ARM_ARCH_MAJOR=8
-ARM_ARCH_MINOR=5
+ARM_ARCH_MAJOR=9
+ARM_ARCH_MINOR=4
BRANCH_PROTECTION=1
-ENABLE_FEAT_MTE2=1
+CROSS_COMPILE=aarch64-none-elf-
+CTX_INCLUDE_AARCH32_REGS=0
ENABLE_SVE_FOR_SWD=1
ENABLE_SME_FOR_SWD=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
+PLAT=fvp
PLAT_TEST_SPM=1
+SPD=spmd
+SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json