fix(tftf): remove invalid_access test from standard tests
Invalid_access test suite performs negative tests by accessing invalid
memory and catching it in custom exception handler.
This test suite was made part of standard tests which is called for all
platforms and each EL3 configuration. This test was failing for the
case when EL3 was build with "HANDLE_EA_EL3_FIRST = 1" causing
exceptions to be trapped in EL3 and not forwarded to EL2 to be handled
by custom exception handler.
To avoid this problem, remove this suite from standard test and
introduce a new test configuration.
This patch also fixes a minor compilation error in file
cactus_test_memory_sharing.c
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: I8a13617a01411be45c623dde2ccfc7d950f05f9a
diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index 21c738d..c628ee8 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -290,15 +290,6 @@
} \
} while (false)
-#define SKIP_TEST_IF_INVALID_ADDRESS(address) \
- do { \
- if (address == U(0xFFFFFFFF)) { \
- tftf_testcase_printf("Platform has not provided " \
- "valid address to access EL3\n"); \
- return TEST_RESULT_SKIPPED; \
- } \
- } while (false)
-
/* Helper macro to verify if system suspend API is supported */
#define is_psci_sys_susp_supported() \
(tftf_get_psci_feature_info(SMC_PSCI_SYSTEM_SUSPEND) \
diff --git a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
index 051208e..872cb41 100644
--- a/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
+++ b/spm/cactus/cactus_tests/cactus_test_memory_sharing.c
@@ -22,7 +22,7 @@
{
uint64_t esr_el1 = read_esr_el1();
- VERBOSE("%s count %u esr_el1 %llx elr_el1 %llx\n",
+ VERBOSE("%s count %u esr_el1 %llx elr_el1 %lx\n",
__func__, data_abort_gpf_triggered, esr_el1,
read_elr_el1());
diff --git a/tftf/tests/misc_tests/test_invalid_access.c b/tftf/tests/misc_tests/test_invalid_access.c
index 2fb6542..18b68fb 100644
--- a/tftf/tests/misc_tests/test_invalid_access.c
+++ b/tftf/tests/misc_tests/test_invalid_access.c
@@ -28,10 +28,6 @@
*/
#ifdef __aarch64__
-#ifndef EL3_MEMORY_ACCESS_ADDR
-#define EL3_MEMORY_ACCESS_ADDR U(0xFFFFFFFF)
-#endif
-
static volatile bool sync_exception_triggered;
static volatile bool data_abort_triggered;
@@ -71,8 +67,6 @@
{
const uintptr_t test_address = EL3_MEMORY_ACCESS_ADDR;
- SKIP_TEST_IF_INVALID_ADDRESS(test_address);
-
VERBOSE("Attempt to access el3 memory (0x%lx)\n", test_address);
data_abort_triggered = false;
diff --git a/tftf/tests/tests-standard.mk b/tftf/tests/tests-standard.mk
index fac3fd9..a722077 100644
--- a/tftf/tests/tests-standard.mk
+++ b/tftf/tests/tests-standard.mk
@@ -24,7 +24,6 @@
tests-uncontainable.mk \
tests-debugfs.mk \
tests-realm-payload.mk \
- tests-invalid-access.mk \
)
include ${TESTS_MAKEFILE}
diff --git a/tftf/tests/tests-standard.xml b/tftf/tests/tests-standard.xml
index 1e8ed27..384a5f4 100644
--- a/tftf/tests/tests-standard.xml
+++ b/tftf/tests/tests-standard.xml
@@ -25,7 +25,6 @@
<!ENTITY tests-pmu-leakage SYSTEM "tests-pmu-leakage.xml">
<!ENTITY tests-debugfs SYSTEM "tests-debugfs.xml">
<!ENTITY tests-realm-payload SYSTEM "tests-realm-payload.xml">
- <!ENTITY tests-invalid-access SYSTEM "tests-invalid-access.xml">
]>
<testsuites>
@@ -46,6 +45,5 @@
&tests-pmu-leakage;
&tests-debugfs;
&tests-realm-payload;
- &tests-invalid-access;
</testsuites>