Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
arch
/
arm64
/
kernel
/
head.S
diff --git
a/kernel/arch/arm64/kernel/head.S
b/kernel/arch/arm64/kernel/head.S
index
19f915e
..
36aa31f
100644
(file)
--- a/
kernel/arch/arm64/kernel/head.S
+++ b/
kernel/arch/arm64/kernel/head.S
@@
-565,6
+565,11
@@
CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems
msr hstr_el2, xzr // Disable CP15 traps to EL2
#endif
msr hstr_el2, xzr // Disable CP15 traps to EL2
#endif
+ /* EL2 debug */
+ mrs x0, pmcr_el0 // Disable debug access traps
+ ubfx x0, x0, #11, #5 // to EL2 and allow access to
+ msr mdcr_el2, x0 // all PMU counters from EL1
+
/* Stage-2 translation */
msr vttbr_el2, xzr
/* Stage-2 translation */
msr vttbr_el2, xzr