feat: simplify crash reporting test
Crash reporting test was unnecessarily using RAS to generate SError and
printing lower ELs crash report. This can be easily achieved by simply
causing an SError in lower EL and trap it to EL3.
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: Idec626060ed672e7a5036883e7a3529cfd50c769
diff --git a/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-crash-report,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.crash-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-lower-el-serror,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tftf-l2-fvp/fvp-lower-el-serror,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug
new file mode 100644
index 0000000..8c2d647
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-lower-el-serror,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/patch/fault_inject/injected-fault-in-absence-of-ras.patch b/patch/fault_inject/injected-fault-in-absence-of-ras.patch
deleted file mode 100644
index f50b04d..0000000
--- a/patch/fault_inject/injected-fault-in-absence-of-ras.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -533,13 +533,6 @@ ifeq ($(RAS_EXTENSION),1)
- endif
- endif
-
--# When FAULT_INJECTION_SUPPORT is used, require that RAS_EXTENSION is enabled
--ifeq ($(FAULT_INJECTION_SUPPORT),1)
-- ifneq ($(RAS_EXTENSION),1)
-- $(error For FAULT_INJECTION_SUPPORT, RAS_EXTENSION must also be 1)
-- endif
--endif
--
- # DYN_DISABLE_AUTH can be set only when TRUSTED_BOARD_BOOT=1
- ifeq ($(DYN_DISABLE_AUTH), 1)
- ifeq (${TRUSTED_BOARD_BOOT}, 0)
diff --git a/run_config/fvp-aemv8a.crash b/run_config/fvp-aemv8a.crash
index fa46a57..c822cc2 100644
--- a/run_config/fvp-aemv8a.crash
+++ b/run_config/fvp-aemv8a.crash
@@ -1,22 +1,16 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-pre_tf_build() {
- # Apply fault injection patches
- apply_tf_patch "fault_inject/injected-fault-in-absence-of-ras.patch"
- apply_tf_patch "fault_inject/explicit-events.patch"
-}
-
generate_lava_job() {
local model="base-aemv8a"
uart="0" timeout="60" file="timeout_test.exp" track_expect
uart="1" timeout="60" file="crash_test.exp" set_primary="1" track_expect
- model="$model" arch_version="8.4" fault_inject="1" gen_model_params
+ model="$model" gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/tf_config/fvp-lower-el-serror b/tf_config/fvp-lower-el-serror
new file mode 100644
index 0000000..c4d6a5d
--- /dev/null
+++ b/tf_config/fvp-lower-el-serror
@@ -0,0 +1,6 @@
+CRASH_REPORTING=1
+CROSS_COMPILE=aarch64-none-elf-
+EL3_EXCEPTION_HANDLING=1
+ENABLE_BACKTRACE=1
+HANDLE_EA_EL3_FIRST_NS=1
+PLAT=fvp
diff --git a/tftf_config/fvp-inject-serror b/tftf_config/fvp-inject-serror
new file mode 100644
index 0000000..f1721f0
--- /dev/null
+++ b/tftf_config/fvp-inject-serror
@@ -0,0 +1,3 @@
+CROSS_COMPILE=aarch64-none-elf-
+PLAT=fvp
+TESTS=inject-serror