Commit 0edc60fd authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: nv: Add TCPAC/TTA to CPTR->CPACR conversion helper 



We are missing the propagation of CPTR_EL2.{TCPAC,TTA} into
the CPACR format. Make sure we preserve these bits.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240620164653.1130714-13-oliver.upton@linux.dev


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

arch/arm64/include/asm/kvm_nested.h

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline u64 translate_tcr_el2_to_tcr_el1(u64 tcr) 


static inline u64 translate_cptr_el2_to_cpacr_el1(u64 cptr_el2)

{

	u64 cpacr_el1 = 0;

	u64 cpacr_el1 = CPACR_ELx_RES1;



	if (cptr_el2 & CPTR_EL2_TTA)

		cpacr_el1 |= CPACR_ELx_TTA;
@@ -41,6 +41,8 @@ static inline u64 translate_cptr_el2_to_cpacr_el1(u64 cptr_el2) 
	if (!(cptr_el2 & CPTR_EL2_TZ))

		cpacr_el1 |= CPACR_ELx_ZEN;



	cpacr_el1 |= cptr_el2 & (CPTR_EL2_TCPAC | CPTR_EL2_TAM);



	return cpacr_el1;

}