summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2023-02-21 13:24:57 +0000
committerManish Pandey <manish.pandey2@arm.com>2023-05-09 10:19:12 +0200
commit78838693c68f1286987e78de941ca03f123a6776 (patch)
tree34239b577f7be019973f14c5a274e919f9fd64e8
parent6d0e4ab738596eba6a961269e2893fda716c56e6 (diff)
refactor: rename existing RAS related tests
So far in TF-A, RAS meant Firmware first handling of RAS errors. With new changes we have two ways to handle RAS errors, Firmware First and Kernel First.To distinguish between them following changes are done 1. Existing RAS tests are renamed as RAS_FFH 2. The run config for RAS(fvp-aemv8a.fi) applies patches and also generates the run config. For the KFH support we do not need any patch application. Move patch application part to new run config Signed-off-by: Manish Pandey <manish.pandey2@arm.com> Change-Id: I89365cb96a10c04de0ccc5bc477b52a29f9e6200
-rw-r--r--group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-single-fault:fvp-tftf-fip.tftf-ras_ffh.patch-aemv8a.fi-debug (renamed from group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug)0
-rw-r--r--group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-uncontainable:fvp-tftf.fault-fip.tftf-ras_ffh.patch-aemv8a.fi-debug (renamed from group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug)0
-rw-r--r--run_config/fvp-aemv8a.fi7
-rw-r--r--run_config/fvp-ras_ffh.patch13
-rw-r--r--tf_config/fvp-ras-ffh (renamed from tf_config/fvp-ras-fault-inject)0
5 files changed, 13 insertions, 7 deletions
diff --git a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug b/group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-single-fault:fvp-tftf-fip.tftf-ras_ffh.patch-aemv8a.fi-debug
index aab47968..aab47968 100644
--- a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-single-fault:fvp-tftf-fip.tftf-aemv8a.fi-debug
+++ b/group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-single-fault:fvp-tftf-fip.tftf-ras_ffh.patch-aemv8a.fi-debug
diff --git a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug b/group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-uncontainable:fvp-tftf.fault-fip.tftf-ras_ffh.patch-aemv8a.fi-debug
index 180e6b48..180e6b48 100644
--- a/group/tf-l3-boot-tests-ras/fvp-ras-fault-inject,fvp-uncontainable:fvp-tftf.fault-fip.tftf-aemv8a.fi-debug
+++ b/group/tf-l3-boot-tests-ras/fvp-ras-ffh,fvp-uncontainable:fvp-tftf.fault-fip.tftf-ras_ffh.patch-aemv8a.fi-debug
diff --git a/run_config/fvp-aemv8a.fi b/run_config/fvp-aemv8a.fi
index 17059e87..10e627d7 100644
--- a/run_config/fvp-aemv8a.fi
+++ b/run_config/fvp-aemv8a.fi
@@ -5,13 +5,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-pre_tf_build() {
- # Apply fault injection patches
- apply_tf_patch "fault_inject/injected-fault-record-and-handler.patch"
- apply_tf_patch "fault_inject/explicit-events.patch"
- apply_tf_patch "fault_inject/fvp-fault-handlers.patch"
-}
-
generate_lava_job() {
local model="base-aemv8a"
diff --git a/run_config/fvp-ras_ffh.patch b/run_config/fvp-ras_ffh.patch
new file mode 100644
index 00000000..246598e3
--- /dev/null
+++ b/run_config/fvp-ras_ffh.patch
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 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-record-and-handler.patch"
+ apply_tf_patch "fault_inject/explicit-events.patch"
+ apply_tf_patch "fault_inject/fvp-fault-handlers.patch"
+}
diff --git a/tf_config/fvp-ras-fault-inject b/tf_config/fvp-ras-ffh
index b22ac2a6..b22ac2a6 100644
--- a/tf_config/fvp-ras-fault-inject
+++ b/tf_config/fvp-ras-ffh