arm64: head.S: Enable EL1 (host) access to SPE when entered at EL2

The SPE architecture requires each exception level to enable access
to the SPE controls for the exception level below it, since additional
context-switch logic may be required to handle the buffer safely.

This patch allows EL1 (host) access to the SPE controls when entered at
EL2.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index c6cc82ec190b5ccd2970b6133bd29c6c0878bf7a..4fb6ccd886d11ef219efe411b1f712e31167d943 100644 (file)
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -637,15 +637,26 @@ CPU_LE(   movk    x0, #0x30d0, lsl #16    )       // Clear EE and E0E on LE systems
 #endif
 
        /* EL2 debug */
-       mrs     x0, id_aa64dfr0_el1             // Check ID_AA64DFR0_EL1 PMUVer
-       sbfx    x0, x0, #8, #4
+       mrs     x1, id_aa64dfr0_el1             // Check ID_AA64DFR0_EL1 PMUVer
+       sbfx    x0, x1, #8, #4
        cmp     x0, #1
        b.lt    4f                              // Skip if no PMU present
        mrs     x0, pmcr_el0                    // Disable debug access traps
        ubfx    x0, x0, #11, #5                 // to EL2 and allow access to
 4:
-       csel    x0, xzr, x0, lt                 // all PMU counters from EL1
-       msr     mdcr_el2, x0                    // (if they exist)
+       csel    x3, xzr, x0, lt                 // all PMU counters from EL1
+
+       /* Statistical profiling */
+       ubfx    x0, x1, #32, #4                 // Check ID_AA64DFR0_EL1 PMSVer
+       cbz     x0, 6f                          // Skip if SPE not present
+       cbnz    x2, 5f                          // VHE?
+       mov     x1, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)
+       orr     x3, x3, x1                      // If we don't have VHE, then
+       b       6f                              // use EL1&0 translation.
+5:                                             // For VHE, use EL2 translation
+       orr     x3, x3, #MDCR_EL2_TPMS          // and disable access from EL1
+6:
+       msr     mdcr_el2, x3                    // Configure debug traps
 
        /* Stage-2 translation */
        msr     vttbr_el2, xzr