Commit 380624d4 authored by Fuad Tabba's avatar Fuad Tabba Committed by Oliver Upton
Browse files

KVM: arm64: Disable SME traps for (h)VHE at setup 



Ensure that SME traps are disabled for (h)VHE when setting up
EL2, as they are for nVHE.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230724123829.2929609-5-tabba@google.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 45a3681a

arch/arm64/include/asm/el2_setup.h

+10 −0
Original line number Diff line number Diff line
@@ -293,9 +293,19 @@ 
	check_override id_aa64pfr1, ID_AA64PFR1_EL1_SME_SHIFT, .Linit_sme_\@, .Lskip_sme_\@, x1, x2



.Linit_sme_\@:	/* SME register access and priority mapping */

	__check_hvhe .Lcptr_nvhe_sme_\@, x1



	// (h)VHE case

	mrs	x0, cpacr_el1			// Disable SME traps

	orr	x0, x0, #(CPACR_EL1_SMEN_EL0EN | CPACR_EL1_SMEN_EL1EN)

	msr	cpacr_el1, x0

	b	.Lskip_set_cptr_sme_\@



.Lcptr_nvhe_sme_\@: // nVHE case

	mrs	x0, cptr_el2			// Disable SME traps

	bic	x0, x0, #CPTR_EL2_TSM

	msr	cptr_el2, x0

.Lskip_set_cptr_sme_\@:

	isb



	mrs	x1, sctlr_el2