Commit b0c57e10 authored by Will Deacon's avatar Will Deacon
Browse files

arm64: head: Init PMSCR_EL2.{PA,PCT} when entered at EL2 without VHE 



When booting at EL2, ensure that we permit the EL1 host to sample
physical addresses and physical counter values using SPE.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent a173c390

arch/arm64/kernel/head.S

+12 −5
Original line number Diff line number Diff line
@@ -480,14 +480,21 @@ set_hcr: 


	/* Statistical profiling */

	ubfx	x0, x1, #32, #4			// Check ID_AA64DFR0_EL1 PMSVer

	cbz	x0, 6f				// Skip if SPE not present

	cbnz	x2, 5f				// VHE?

	cbz	x0, 7f				// Skip if SPE not present

	cbnz	x2, 6f				// VHE?

	mrs_s	x4, SYS_PMBIDR_EL1		// If SPE available at EL2,

	and	x4, x4, #(1 << SYS_PMBIDR_EL1_P_SHIFT)

	cbnz	x4, 5f				// then permit sampling of physical

	mov	x4, #(1 << SYS_PMSCR_EL2_PCT_SHIFT | \

		      1 << SYS_PMSCR_EL2_PA_SHIFT)

	msr_s	SYS_PMSCR_EL2, x4		// addresses and physical counter

5:

	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

	b	7f				// use EL1&0 translation.

6:						// For VHE, use EL2 translation

	orr	x3, x3, #MDCR_EL2_TPMS		// and disable access from EL1

6:

7:

	msr	mdcr_el2, x3			// Configure debug traps



	/* Stage-2 translation */