fix: spm fvp remove speculative execution option
Remove those FVP options for SPM test runs:
-C cluster0.restriction_on_speculative_execution=2
-C cluster0.restriction_on_speculative_execution_aarch32=2
The reason to force those FVP options was because of using
ARCH_ARM_MINOR=5 build option (to support BTI in particular).
The side effect was to save/restore this register [1].
(FEAT_CSV2 was Armv8.5 at the time of developing the el2
save/restore routine).
Since then, FEAT_CSV2 has been retrofitted into Armv8.0.
Context management changes made it a separate TF-A feature build
option (for the good) [2].
Eventually FVP options are no longer needed unless specifying
ENABLE_FEAT_CSV2_2 TF-A build option, and implementing the
required support at the various ELs.
[1] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/lib/el3_runtime/aarch64/context.S?h=v2.6#n191
[2] https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/lib/el3_runtime/aarch64/context.S#n207
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I24449581b283e8df753f35339cf19a2f2750a65c
diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index 7d13362..53d735e 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -30,7 +30,6 @@
arch_version="8.5" \
has_smmuv3_params="1" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
memory_tagging_support_level="2" \
gen_model_params
diff --git a/run_config/fvp-spm+romlib b/run_config/fvp-spm+romlib
index 2a4e4ad..22a62f6 100644
--- a/run_config/fvp-spm+romlib
+++ b/run_config/fvp-spm+romlib
@@ -31,7 +31,6 @@
arch_version="8.5" \
has_smmuv3_params="1" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
memory_tagging_support_level="2" \
gen_model_params
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 20b8552..6910d4f 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -34,7 +34,6 @@
model="$model" \
arch_version="8.5" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
kernel_addr=0x88000000 \
kernel_bin="$archive/hafnium.bin" \
has_smmuv3_params="1" \
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 65e6fa0..8078b68 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -38,7 +38,6 @@
arch_version="8.5" \
has_smmuv3_params="1" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
memory_tagging_support_level="2" \
gen_model_params
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index ccc1330..64130f1 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -54,7 +54,6 @@
model="$model" \
arch_version="8.5" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
reset_to_bl31="1" \
kernel_addr=0x88000000 \
kernel_bin="$archive/hafnium.bin" \
diff --git a/run_config/fvp-spm.sve+amu b/run_config/fvp-spm.sve+amu
index 9ab697f..bdfc61b 100644
--- a/run_config/fvp-spm.sve+amu
+++ b/run_config/fvp-spm.sve+amu
@@ -32,7 +32,6 @@
arch_version="8.5" \
has_smmuv3_params="1" \
has_branch_target_exception="1" \
- restriction_on_speculative_execution="2" \
memory_tagging_support_level="2" \
gen_model_params