projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[cascardo/linux.git]
/
arch
/
arm64
/
mm
/
proc.S
diff --git
a/arch/arm64/mm/proc.S
b/arch/arm64/mm/proc.S
index
9d37e96
..
352c73b
100644
(file)
--- a/
arch/arm64/mm/proc.S
+++ b/
arch/arm64/mm/proc.S
@@
-83,6
+83,7
@@
ENDPROC(cpu_do_suspend)
*
* x0: Address of context pointer
*/
*
* x0: Address of context pointer
*/
+ .pushsection ".idmap.text", "ax"
ENTRY(cpu_do_resume)
ldp x2, x3, [x0]
ldp x4, x5, [x0, #16]
ENTRY(cpu_do_resume)
ldp x2, x3, [x0]
ldp x4, x5, [x0, #16]
@@
-120,6
+121,7
@@
ENTRY(cpu_do_resume)
isb
ret
ENDPROC(cpu_do_resume)
isb
ret
ENDPROC(cpu_do_resume)
+ .popsection
#endif
/*
#endif
/*
@@
-134,17
+136,12
@@
ENTRY(cpu_do_switch_mm)
bfi x0, x1, #48, #16 // set the ASID
msr ttbr0_el1, x0 // set TTBR0
isb
bfi x0, x1, #48, #16 // set the ASID
msr ttbr0_el1, x0 // set TTBR0
isb
-alternative_if_not ARM64_WORKAROUND_CAVIUM_27456
- ret
- nop
- nop
- nop
-alternative_else
+alternative_if ARM64_WORKAROUND_CAVIUM_27456
ic iallu
dsb nsh
isb
ic iallu
dsb nsh
isb
+alternative_else_nop_endif
ret
ret
-alternative_endif
ENDPROC(cpu_do_switch_mm)
.pushsection ".idmap.text", "ax"
ENDPROC(cpu_do_switch_mm)
.pushsection ".idmap.text", "ax"
@@
-181,6
+178,7
@@
ENDPROC(idmap_cpu_replace_ttbr1)
* Initialise the processor for turning the MMU on. Return in x0 the
* value of the SCTLR_EL1 register.
*/
* Initialise the processor for turning the MMU on. Return in x0 the
* value of the SCTLR_EL1 register.
*/
+ .pushsection ".idmap.text", "ax"
ENTRY(__cpu_setup)
tlbi vmalle1 // Invalidate local TLB
dsb nsh
ENTRY(__cpu_setup)
tlbi vmalle1 // Invalidate local TLB
dsb nsh
@@
-266,3
+264,4
@@
ENDPROC(__cpu_setup)
crval:
.word 0xfcffffff // clear
.word 0x34d5d91d // set
crval:
.word 0xfcffffff // clear
.word 0x34d5d91d // set
+ .popsection