aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanna Farley <joanna.farley@arm.com>2022-03-08 19:52:16 +0100
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2022-03-08 19:52:16 +0100
commit800468edcb175e367ec33707b34bef92d34a62b7 (patch)
treea917503f7b79fe7badd9e1b2dd84bef73f3ee590
parent0c2a132bb2be5c1feb4a967952123f427ff0bcda (diff)
parent6888feeb8e873b311b19b805990e3b2f25f7becf (diff)
downloadtf-a-tests-800468edcb175e367ec33707b34bef92d34a62b7.tar.gz
Merge "fix(tftf): remove invalid_access test from standard tests"
-rw-r--r--include/common/test_helpers.h9
-rw-r--r--spm/cactus/cactus_tests/cactus_test_memory_sharing.c2
-rw-r--r--tftf/tests/misc_tests/test_invalid_access.c6
-rw-r--r--tftf/tests/tests-standard.mk1
-rw-r--r--tftf/tests/tests-standard.xml2
5 files changed, 1 insertions, 19 deletions
diff --git a/include/common/test_helpers.h b/include/common/test_helpers.h
index 21c738d18..c628ee821 100644
--- a/include/common/test_helpers.h
+++ b/include/common/test_helpers.h
@@ -290,15 +290,6 @@ typedef test_result_t (*test_function_arg_t)(void *arg);
} \
} 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 051208e65..872cb41ec 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 @@ static bool data_abort_gpf_handler(void)
{
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 2fb65421f..18b68fb2c 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 @@ test_result_t access_el3_memory_from_ns(void)
{
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 fac3fd902..a72207722 100644
--- a/tftf/tests/tests-standard.mk
+++ b/tftf/tests/tests-standard.mk
@@ -24,7 +24,6 @@ TESTS_MAKEFILE := $(addprefix tftf/tests/, \
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 1e8ed2762..384a5f4e0 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>