arch: arm: cortex_a_r: use correct name for TLB Conflict Abort
Commit 87719828ac
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 <mathieu.choplain@st.com>
This commit is contained in:
parent
5ab74ff1de
commit
c8c0c294b1
3 changed files with 5 additions and 5 deletions
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue