From 06b1501694e4a730abef08eeda32213186857757 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Wed, 25 Aug 2021 03:17:46 +0900 Subject: [PATCH] tests: arch: arm_thread_swap: Fix FPSCR validation for ARMv8.1-M This commit fixes the FPSCR register initialisation validation test for the ARMv8.1-M architecture. For ARMv8.1-M, the newly added LTPSIZE field in the FPSCR may always read the value of 4 when the M-Profile Vector Extension (MVE) is not implemented or FP context is not active, so we must ignore its value when validating the FPSCR register initialisation. Signed-off-by: Stephanos Ioannidis --- .../arch/arm/arm_thread_swap/src/arm_thread_arch.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c index 58eecac8000..4cd92606422 100644 --- a/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c +++ b/tests/arch/arm/arm_thread_swap/src/arm_thread_arch.c @@ -30,6 +30,16 @@ #define EXC_RETURN_FTYPE (0x00000010UL) #endif +#if defined(CONFIG_ARMV8_1_M_MAINLINE) +/* + * For ARMv8.1-M, the FPSCR[18:16] LTPSIZE field may always read 0b010 if MVE + * is not implemented, so mask it when validating the value of the FPSCR. + */ +#define FPSCR_MASK (~FPU_FPDSCR_LTPSIZE_Msk) +#else +#define FPSCR_MASK (0xffffffffU) +#endif + extern void z_move_thread_to_end_of_prio_q(struct k_thread *thread); static struct k_thread alt_thread; @@ -278,7 +288,7 @@ static void alt_thread_entry(void) /* Verify that the _current_ (alt) thread is initialized with FPSCR cleared. */ - zassert_true(__get_FPSCR() == 0, + zassert_true((__get_FPSCR() & FPSCR_MASK) == 0, "(Alt thread) FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR()); zassert_true((p_ztest_thread->arch.mode_exc_return & EXC_RETURN_FTYPE) == 0, @@ -461,7 +471,7 @@ void test_arm_thread_swap(void) "CONTROL.FPCA is not cleared at initialization: 0x%x\n", __get_CONTROL()); /* Verify that the main test thread is initialized with FPSCR cleared. */ - zassert_true(__get_FPSCR() == 0, + zassert_true((__get_FPSCR() & FPSCR_MASK) == 0, "FPSCR is not cleared at initialization: 0x%x\n", __get_FPSCR()); /* Clear the thread's floating-point callee-saved registers' container.