arm64: head.S: initialise mdcr_el2 in el2_setup
PATCH 1/1 arm64: head.S: initialise mdcr_el2 in el2_setup
When entering the kernel at EL2, we fail to initialise the MDCR_EL2 register which controls debug access and PMU capabilities at EL1.
This patch ensures that the register is initialised so that all traps are disabled and all the PMU counters are available to the host. When a guest is scheduled, KVM takes care to configure trapping appropriately.
--- arch/arm64/kernel/head.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/kernel/head.S +5 -0
@@ -523,6 +523,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 + /* 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
Signature · 1 line
2.1.4
PATCH 1/1 arm64: head.S: initialise mdcr_el2 in el2_setup
Quoted 20 lines · Will Deacon
When entering the kernel at EL2, we fail to initialise the
MDCR_EL2register which controls debug access and PMU capabilities at EL1.This patch ensures that the register is initialised so that all traps are disabled and all the PMU counters are available to the host. When a guest is scheduled, KVM takes care to configure trapping appropriately.
Cc Marc Zyngier <[email protected]>Signed-off-by Will Deacon <[email protected]>--- arch/arm64/kernel/head.S | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/kernel/head.S +0
-0@@ -523,6 +523,11 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems msr hstr_el2, xzr // Disable CP15 traps to EL2
arch/arm64/kernel/head.S CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems · line 533
Quoted 10 lines
arch/arm64/kernel/head.S +5
-0#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
Ah! I guess we've been quite lucky so far... FWIW:
I guess you'll merge this via the arm64 tree?
M.
Signature · 1 line
Jazz is not dead. It just smells funny...