nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

kern: fix EL0 TLB conflict handler

Browse source
This commit is contained in:
Michael Scire 2020-07-30 02:11:11 -07:00 committed by SciresM
parent f866f37cdc
commit 1ffe08672d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mesosphere/kernel/source/arch/arm64/kern_exception_handlers_asm.s
View file

@ -158,12 +158,12 @@ _ZN3ams4kern4arch5arm6430EL0SynchronousExceptionHandlerEv:
cmp x17, #0x7 cmp x17, #0x7
b.eq 4f b.eq 4f
/* Is this an instruction abort? */ /* Is this a data abort? */
cmp x17, #0x21 cmp x17, #0x24
b.eq 5f b.eq 5f
/* Is this a data abort? */ /* Is this an instruction abort? */
cmp x17, #0x25 cmp x17, #0x20
b.eq 5f b.eq 5f
1: /* The exception is not a data abort or instruction abort caused by a TLB conflict. */ 1: /* The exception is not a data abort or instruction abort caused by a TLB conflict. */
@ -259,12 +259,12 @@ _ZN3ams4kern4arch5arm6430EL0SynchronousExceptionHandlerEv:
mrs x16, far_el1 mrs x16, far_el1
lsr x16, x16, #12 lsr x16, x16, #12
orr x17, x16, x17 orr x17, x16, x17
tlbi vaae1, x17 tlbi vae1, x17
b 7f b 7f
6: /* There's a TLB conflict and FAR isn't valid. */ 6: /* There's a TLB conflict and FAR isn't valid. */
/* Invalidate the entire TLB. */ /* Invalidate the entire TLB. */
tlbi vmalle1 tlbi aside1, x17
7: /* Return from a TLB conflict. */ 7: /* Return from a TLB conflict. */
/* Ensure instruction consistency. */ /* Ensure instruction consistency. */