From c8c0c294b1e50ded4e306b0e0cb43039ff6ecab0 Mon Sep 17 00:00:00 2001 From: Mathieu Choplain Date: Mon, 26 May 2025 13:43:18 +0200 Subject: [PATCH] arch: arm: cortex_a_r: use correct name for TLB Conflict Abort Commit 87719828ac830de9097c33a8e4433d80994dae90 introduced FSR definitions for ARMv7-A/R; however, the value 16 which is documented in the ARM[1] as a "TLB Conflict Abort", was introduced as "TLB Conflict Fault" instead and described as a "Table Conflict Fault". Update all affected files to use the ARM's naming for this error instead. [1] Architecture Reference Manual (Document ID: ARM DDI 0406C.d) "ARM Architecture Reference Manual for ARMv7-A and ARMv7-R Edition" Signed-off-by: Mathieu Choplain --- arch/arm/core/cortex_a_r/fault.c | 6 +++--- include/zephyr/arch/arm/arch.h | 2 +- modules/cmsis/cmsis_core_a_r_ext.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/core/cortex_a_r/fault.c b/arch/arm/core/cortex_a_r/fault.c index eac07cbf9b2..b6916706d6f 100644 --- a/arch/arm/core/cortex_a_r/fault.c +++ b/arch/arm/core/cortex_a_r/fault.c @@ -141,9 +141,9 @@ static uint32_t dump_fault(uint32_t status, uint32_t addr) reason = K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL; LOG_ERR("2nd Level Synchronous External Abort Translation Table @ 0x%08x", addr); break; - case FSR_FS_TLB_CONFLICT_FAULT: - reason = K_ERR_ARM_TLB_CONFLICT_FAULT; - LOG_ERR("Table Conflict Fault @ 0x%08x", addr); + case FSR_FS_TLB_CONFLICT_ABORT: + reason = K_ERR_ARM_TLB_CONFLICT_ABORT; + LOG_ERR("TLB Conflict Abort @ 0x%08x", addr); break; case FSR_FS_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL: reason = K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL; diff --git a/include/zephyr/arch/arm/arch.h b/include/zephyr/arch/arm/arch.h index 1a33196b15e..7bf385a0219 100644 --- a/include/zephyr/arch/arm/arch.h +++ b/include/zephyr/arch/arm/arch.h @@ -115,7 +115,7 @@ enum k_fatal_error_reason_arch { K_ERR_ARM_DOMAIN_FAULT_2ND_LEVEL, K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_1ST_LEVEL, K_ERR_ARM_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL, - K_ERR_ARM_TLB_CONFLICT_FAULT, + K_ERR_ARM_TLB_CONFLICT_ABORT, K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_1ST_LEVEL, K_ERR_ARM_SYNC_PARITY_ERROR_TRANSLATION_TABLE_2ND_LEVEL, }; diff --git a/modules/cmsis/cmsis_core_a_r_ext.h b/modules/cmsis/cmsis_core_a_r_ext.h index e1ddce4c066..d79f47a3687 100644 --- a/modules/cmsis/cmsis_core_a_r_ext.h +++ b/modules/cmsis/cmsis_core_a_r_ext.h @@ -50,7 +50,7 @@ #define FSR_FS_PERMISSION_FAULT (13) #define FSR_FS_SYNC_EXTERNAL_ABORT_TRANSLATION_TABLE_2ND_LEVEL (14) #define FSR_FS_PERMISSION_FAULT_2ND_LEVEL (15) -#define FSR_FS_TLB_CONFLICT_FAULT (16) +#define FSR_FS_TLB_CONFLICT_ABORT (16) #define FSR_FS_ASYNC_EXTERNAL_ABORT (22) #define FSR_FS_ASYNC_PARITY_ERROR (24) #define FSR_FS_SYNC_PARITY_ERROR (25)