summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2023-04-24 10:29:52 +0100
committerManish Pandey <manish.pandey2@arm.com>2023-04-28 18:03:20 +0200
commitfd4c6b7d0d9f1fb833eecef259a6034bf9169a6c (patch)
tree658c7062cdaf1a4b35be7c7afaf4b87b293e6085
parent52b8d439d543ae96669c2dc227e20589cf86895f (diff)
feat: unify lower EL EA tests
Lower EL External Abort tests were implemented in such a way that after triggering EA in tftf it gets trapped in EL3 and causing a crash in EL3 Because of the tests ending up in crash there are few problems: - Need to have to seperate tests one each for sync EA and Serror. - Unable to test the behaviour of system had the lower EL EA's been properly handled in EL3 This patch removes two separate configurations into a single test under Firmware first handling(FFH). TF-A build macro PLATFORM_TEST_EA_FFH allows fvp to have a proper handling. This test configuration tests FFH(SCR_EL3.EA = 1) without RAS. No need to create a new lower el panic test as they are tested in other scenarios also. Signed-off-by: Manish Pandey <manish.pandey2@arm.com> Change-Id: If31ca9ad5f859e219d7cd2482397c52f84587a32
-rw-r--r--group/tftf-l2-fvp/fvp-ea-ffh,fvp-ea-ffh:fvp-tftf-fip.tftf-aemv8a-debug (renamed from group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug)0
-rw-r--r--group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-syncEA:fvp-tftf-fip.tftf-aemv8a.crash-debug5
-rwxr-xr-xscript/tf-coverity/tf-cov-make3
-rw-r--r--tf_config/fvp-ea-ffh (renamed from tf_config/fvp-lower-el-ea)4
-rw-r--r--tftf_config/fvp-ea-ffh (renamed from tftf_config/fvp-inject-syncEA)2
-rw-r--r--tftf_config/fvp-inject-serror3
6 files changed, 5 insertions, 12 deletions
diff --git a/group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tftf-l2-fvp/fvp-ea-ffh,fvp-ea-ffh:fvp-tftf-fip.tftf-aemv8a-debug
index 8c2d6473..8c2d6473 100644
--- a/group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-serror:fvp-tftf-fip.tftf-aemv8a.crash-debug
+++ b/group/tftf-l2-fvp/fvp-ea-ffh,fvp-ea-ffh:fvp-tftf-fip.tftf-aemv8a-debug
diff --git a/group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-syncEA:fvp-tftf-fip.tftf-aemv8a.crash-debug b/group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-syncEA:fvp-tftf-fip.tftf-aemv8a.crash-debug
deleted file mode 100644
index 8c2d6473..00000000
--- a/group/tftf-l2-fvp/fvp-lower-el-ea,fvp-inject-syncEA:fvp-tftf-fip.tftf-aemv8a.crash-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 2b34065f..a3f790e6 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -150,6 +150,9 @@ clean_build $fvp_common_flags EL3_EXCEPTION_HANDLING=1 \
FAULT_INJECTION_SUPPORT=1 HANDLE_EA_EL3_FIRST_NS=1 RAS_EXTENSION=1 \
SDEI_SUPPORT=1
+# EA handled in EL3 first
+clean_build $fvp_common_flags HANDLE_EA_EL3_FIRST_NS=1 PLATFORM_TEST_EA_FFH=1
+
# Hardware Assisted Coherency(DynamIQ)
clean_build $fvp_common_flags FVP_CLUSTER_COUNT=1 FVP_MAX_CPUS_PER_CLUSTER=8 \
HW_ASSISTED_COHERENCY=1 USE_COHERENT_MEM=0
diff --git a/tf_config/fvp-lower-el-ea b/tf_config/fvp-ea-ffh
index c4d6a5d9..e7a71d15 100644
--- a/tf_config/fvp-lower-el-ea
+++ b/tf_config/fvp-ea-ffh
@@ -1,6 +1,4 @@
-CRASH_REPORTING=1
CROSS_COMPILE=aarch64-none-elf-
-EL3_EXCEPTION_HANDLING=1
-ENABLE_BACKTRACE=1
HANDLE_EA_EL3_FIRST_NS=1
+PLATFORM_TEST_EA_FFH=1
PLAT=fvp
diff --git a/tftf_config/fvp-inject-syncEA b/tftf_config/fvp-ea-ffh
index 174a8b0c..61c07774 100644
--- a/tftf_config/fvp-inject-syncEA
+++ b/tftf_config/fvp-ea-ffh
@@ -1,3 +1,3 @@
CROSS_COMPILE=aarch64-none-elf-
PLAT=fvp
-TESTS=inject-syncEA
+TESTS=ea-ffh
diff --git a/tftf_config/fvp-inject-serror b/tftf_config/fvp-inject-serror
deleted file mode 100644
index f1721f08..00000000
--- a/tftf_config/fvp-inject-serror
+++ /dev/null
@@ -1,3 +0,0 @@
-CROSS_COMPILE=aarch64-none-elf-
-PLAT=fvp
-TESTS=inject-serror