refactor(ras): rename ras related tests
RAS related tests implicitly use SError name and as there are plans to
introduce non-RAS SError test, rename RAS related tests to be explicit.
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
Change-Id: Ifc56157271e491e1b7c5eeac7b0e1e08bf138b8f
diff --git a/tftf/tests/misc_tests/inject_serror.S b/tftf/tests/misc_tests/inject_ras_error.S
similarity index 82%
rename from tftf/tests/misc_tests/inject_serror.S
rename to tftf/tests/misc_tests/inject_ras_error.S
index fd51f85..07b8ba1 100644
--- a/tftf/tests/misc_tests/inject_serror.S
+++ b/tftf/tests/misc_tests/inject_ras_error.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -10,8 +10,8 @@
#ifdef __aarch64__
- .globl inject_serror
- .globl inject_uncontainable
+ .globl inject_unrecoverable_ras_error
+ .globl inject_uncontainable_ras_error
.globl serror_sdei_event_handler
/*
@@ -23,7 +23,7 @@
* x2: Type of error to be generated
* x3: Memory location to wait for, or 0 if no waiting is required
*/
-func inject_serror_record
+func inject_ras_error_record
/* Clear SError received flag if necessary */
cbz x3, 1f
str xzr, [x3, #0]
@@ -59,13 +59,13 @@
3:
ret
-endfunc inject_serror_record
+endfunc inject_ras_error_record
/*
* Inject Unrecoverable error through fault record 0. Wait until serror_received
* is set by the SDEI handler in response to receving the event.
*/
-func inject_serror
+func inject_unrecoverable_ras_error
/* Inject fault into record 0 */
mov x0, #0
@@ -80,14 +80,14 @@
adrp x3, serror_received
add x3, x3, :lo12:serror_received
- b inject_serror_record
-endfunc inject_serror
+ b inject_ras_error_record
+endfunc inject_unrecoverable_ras_error
/*
* Inject Uncontainable error through fault record 0. This function doesn't wait
* as the handling is terminal in EL3.
*/
-func inject_uncontainable
+func inject_uncontainable_ras_error
/* Inject fault into record 0 */
mov x0, #0
@@ -99,8 +99,8 @@
/* Nothing to wait for */
mov x3, xzr
- b inject_serror_record
-endfunc inject_uncontainable
+ b inject_ras_error_record
+endfunc inject_uncontainable_ras_error
/*
* SDEI event handler for SErrors.
diff --git a/tftf/tests/misc_tests/test_single_fault.c b/tftf/tests/misc_tests/test_single_fault.c
index f55d8de..474bf2e 100644
--- a/tftf/tests/misc_tests/test_single_fault.c
+++ b/tftf/tests/misc_tests/test_single_fault.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -13,7 +13,7 @@
uint64_t serror_received;
-extern void inject_serror(void);
+extern void inject_unrecoverable_ras_error(void);
int serror_handler(int ev, uint64_t arg)
{
@@ -51,7 +51,7 @@
return TEST_RESULT_FAIL;
}
- inject_serror();
+ inject_unrecoverable_ras_error();
return TEST_RESULT_SUCCESS;
}
diff --git a/tftf/tests/misc_tests/test_uncontainable.c b/tftf/tests/misc_tests/test_uncontainable.c
index 231e5e8..5250f0a 100644
--- a/tftf/tests/misc_tests/test_uncontainable.c
+++ b/tftf/tests/misc_tests/test_uncontainable.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -8,11 +8,11 @@
#ifdef __aarch64__
-extern void inject_uncontainable(void);
+extern void inject_uncontainable_ras_error(void);
test_result_t test_uncontainable(void)
{
- inject_uncontainable();
+ inject_uncontainable_ras_error();
return TEST_RESULT_SUCCESS;
}
diff --git a/tftf/tests/tests-single-fault.mk b/tftf/tests/tests-single-fault.mk
index 0641865..86a23c3 100644
--- a/tftf/tests/tests-single-fault.mk
+++ b/tftf/tests/tests-single-fault.mk
@@ -1,10 +1,10 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
TESTS_SOURCES += $(addprefix tftf/tests/misc_tests/, \
- inject_serror.S \
+ inject_ras_error.S \
test_single_fault.c \
)
diff --git a/tftf/tests/tests-uncontainable.mk b/tftf/tests/tests-uncontainable.mk
index 7a47300..873b439 100644
--- a/tftf/tests/tests-uncontainable.mk
+++ b/tftf/tests/tests-uncontainable.mk
@@ -1,10 +1,10 @@
#
-# Copyright (c) 2018, Arm Limited. All rights reserved.
+# Copyright (c) 2023, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
TESTS_SOURCES += $(addprefix tftf/tests/misc_tests/, \
- inject_serror.S \
+ inject_ras_error.S \
test_uncontainable.c \
)