test: exercise support for extended SPI/PPI in Hafnium
Multiple run fragments related to SPM have been updated to support
extended range of interrupts. Moreover, the corresponding build
configs has been updated to enable support for extended interrupt
range.
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: Iaa945a45b1f910c0e4f12709267ff1cb5e68749b
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 1d697c9..3ffc784 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -29,6 +29,10 @@
has_branch_target_exception="1" \
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
+ 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+romlib b/run_config/fvp-spm+romlib
index ef86d0e..9cb2283 100644
--- a/run_config/fvp-spm+romlib
+++ b/run_config/fvp-spm+romlib
@@ -34,6 +34,10 @@
has_branch_target_exception="1" \
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
+ 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.48bit_pa b/run_config/fvp-spm.48bit_pa
index 6c3f37a..6debe68 100644
--- a/run_config/fvp-spm.48bit_pa
+++ b/run_config/fvp-spm.48bit_pa
@@ -30,6 +30,10 @@
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
pa_size="48" \
+ 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.linux b/run_config/fvp-spm.linux
index f9d5e30..cd06dee 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -39,6 +39,10 @@
kernel_addr="0x88000000" \
kernel_bin="$archive/hafnium.bin" \
memory_tagging_support_level="2" \
+ 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" model_dtb="manifest.dtb" gen_fvp_yaml
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index 28fe783..5172097 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -23,6 +23,12 @@
uart="0" file="tftf.exp" track_expect
uart="1" file="hold_uart.exp" track_expect
- model="$model" has_smmuv3_params="1" gen_model_params
+ model="$model" 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.optee.sp b/run_config/fvp-spm.optee.sp
index d93e9da..6f423ad 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -38,6 +38,10 @@
has_branch_target_exception="1" \
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
+ 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.rstbl31 b/run_config/fvp-spm.rstbl31
index 2b6064f..3fe1ddf 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -66,6 +66,10 @@
sp4_pkg="ivy.pkg" \
spm_bin="$archive/secure_hafnium.bin" \
spmc_manifest="fvp_spmc_manifest.dtb" \
+ 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+amu b/run_config/fvp-spm.sve+amu
index e2a18c1..a121bc3 100644
--- a/run_config/fvp-spm.sve+amu
+++ b/run_config/fvp-spm.sve+amu
@@ -32,6 +32,10 @@
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
sve_plugin="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-tftf.rme b/run_config/fvp-tftf.rme
index fac0a60..a9505ef 100644
--- a/run_config/fvp-tftf.rme
+++ b/run_config/fvp-tftf.rme
@@ -32,6 +32,10 @@
has_smmuv3_params="1" \
memory_tagging_support_level="2" \
restriction_on_speculative_execution="2" \
+ 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 b/tf_config/fvp-spm
index 39cd1d1..f370e60 100644
--- a/tf_config/fvp-spm
+++ b/tf_config/fvp-spm
@@ -8,3 +8,5 @@
CTX_INCLUDE_MTE_REGS=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-hyp b/tf_config/fvp-spm-hyp
index ed57c1f..01de164 100644
--- a/tf_config/fvp-spm-hyp
+++ b/tf_config/fvp-spm-hyp
@@ -10,3 +10,5 @@
CTX_INCLUDE_MTE_REGS=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-measured-boot b/tf_config/fvp-spm-measured-boot
index 5336a8f..1ae2511 100644
--- a/tf_config/fvp-spm-measured-boot
+++ b/tf_config/fvp-spm-measured-boot
@@ -11,3 +11,5 @@
MEASURED_BOOT=1
USE_ROMLIB=1
FVP_TRUSTED_SRAM_SIZE=384
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-optee-sp b/tf_config/fvp-spm-optee-sp
index caed5fb..790d1d7 100644
--- a/tf_config/fvp-spm-optee-sp
+++ b/tf_config/fvp-spm-optee-sp
@@ -9,3 +9,5 @@
SPD=spmd
SP_LAYOUT_FILE=${tf_root}/build/fvp/${bin_mode}/optee_sp_layout.json
SPMD_SPM_AT_SEL2=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-rme b/tf_config/fvp-spm-rme
index 3dbf23a..7b92352 100644
--- a/tf_config/fvp-spm-rme
+++ b/tf_config/fvp-spm-rme
@@ -8,3 +8,5 @@
CTX_INCLUDE_PAUTH_REGS=1
CTX_INCLUDE_MTE_REGS=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-rst-bl31 b/tf_config/fvp-spm-rst-bl31
index 1ec49d2..7f29d8d 100644
--- a/tf_config/fvp-spm-rst-bl31
+++ b/tf_config/fvp-spm-rst-bl31
@@ -12,3 +12,5 @@
CTX_INCLUDE_MTE_REGS=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-spmd-lsp b/tf_config/fvp-spm-spmd-lsp
index 1a7a9a9..737eb29 100644
--- a/tf_config/fvp-spm-spmd-lsp
+++ b/tf_config/fvp-spm-spmd-lsp
@@ -7,3 +7,5 @@
CTX_INCLUDE_MTE_REGS=1
BRANCH_PROTECTION=1
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index 2b732b9..dd44042 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -10,3 +10,5 @@
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
SPD=spmd
SPMD_SPM_AT_SEL2=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
index 6b875a1..4bdc0c3 100644
--- a/tf_config/fvp-spm-tbb
+++ b/tf_config/fvp-spm-tbb
@@ -13,3 +13,5 @@
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1
USE_ROMLIB=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
index 17f982c..fd25f05 100644
--- a/tf_config/fvp-spm-tbb-dualroot
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -14,3 +14,5 @@
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
TRUSTED_BOARD_BOOT=1
USE_ROMLIB=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-tbb-mbedtls-mb-spm-rme b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
index 0f434cc..9e4d39a 100644
--- a/tf_config/fvp-tbb-mbedtls-mb-spm-rme
+++ b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
@@ -12,3 +12,5 @@
SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
SPD=spmd
TRUSTED_BOARD_BOOT=1
+GIC_EXT_INTID=1
+PLAT_TEST_SPM=1