Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6edbbf3 authored by Pranavkumar Sawargaonkar's avatar Pranavkumar Sawargaonkar Committed by Christoffer Dall
Browse files

ARM/ARM64: KVM: Nuke Hyp-mode tlbs before enabling MMU 



X-Gene u-boot runs in EL2 mode with MMU enabled hence we might
have stale EL2 tlb enteris when we enable EL2 MMU on each host CPU.

This can happen on any ARM/ARM64 board running bootloader in
Hyp-mode (or EL2-mode) with MMU enabled.

This patch ensures that we flush all Hyp-mode (or EL2-mode) TLBs
on each host CPU before enabling Hyp-mode (or EL2-mode) MMU.

Cc: <stable@vger.kernel.org>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarPranavkumar Sawargaonkar <pranavkumar@linaro.org>
Signed-off-by: default avatarAnup Patel <anup.patel@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 30d1e0e8

arch/arm/kvm/init.S

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ __do_hyp_init: 
	mrc	p15, 0, r0, c10, c2, 1

	mcr	p15, 4, r0, c10, c2, 1



	@ Invalidate the stale TLBs from Bootloader

	mcr	p15, 4, r0, c8, c7, 0	@ TLBIALLH

	dsb	ish



	@ Set the HSCTLR to:

	@  - ARM/THUMB exceptions: Kernel config (Thumb-2 kernel)

	@  - Endianness: Kernel config

arch/arm64/kvm/hyp-init.S

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ __do_hyp_init: 
	msr	mair_el2, x4

	isb



	/* Invalidate the stale TLBs from Bootloader */

	tlbi	alle2

	dsb	sy



	mrs	x4, sctlr_el2

	and	x4, x4, #SCTLR_EL2_EE	// preserve endianness of EL2

	ldr	x5, =SCTLR_EL2_FLAGS