Skip to content

arch: arm: cortex_a_r: use correct name for TLB Conflict Abort #90597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

mathieuchopstm
Copy link
Collaborator

Commit 8771982 introduced FSR definitions for ARMv7-A/R; however, the value 16 which is documented in the ARMv7-A/R Architecture Reference Manual 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.

(Follow-up of #87687)

Commit 8771982 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 <[email protected]>
Copy link

@nashif nashif merged commit c8c0c29 into zephyrproject-rtos:main May 31, 2025
31 checks passed
@mathieuchopstm mathieuchopstm deleted the arm_fault_name_cleanup branch June 2, 2025 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants