|
@@ -153,7 +153,7 @@ ENDPROC(cpu_do_resume)
|
|
|
ENTRY(cpu_do_switch_mm)
|
|
|
mrs x2, ttbr1_el1
|
|
|
mmid x1, x1 // get mm->context.id
|
|
|
- phys_to_ttbr x0, x3
|
|
|
+ phys_to_ttbr x3, x0
|
|
|
#ifdef CONFIG_ARM64_SW_TTBR0_PAN
|
|
|
bfi x3, x1, #48, #16 // set the ASID field in TTBR0
|
|
|
#endif
|
|
@@ -169,7 +169,7 @@ ENDPROC(cpu_do_switch_mm)
|
|
|
|
|
|
.macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2
|
|
|
adrp \tmp1, empty_zero_page
|
|
|
- phys_to_ttbr \tmp1, \tmp2
|
|
|
+ phys_to_ttbr \tmp2, \tmp1
|
|
|
msr ttbr1_el1, \tmp2
|
|
|
isb
|
|
|
tlbi vmalle1
|
|
@@ -188,7 +188,7 @@ ENTRY(idmap_cpu_replace_ttbr1)
|
|
|
|
|
|
__idmap_cpu_set_reserved_ttbr1 x1, x3
|
|
|
|
|
|
- phys_to_ttbr x0, x3
|
|
|
+ phys_to_ttbr x3, x0
|
|
|
msr ttbr1_el1, x3
|
|
|
isb
|
|
|
|