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: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240620164653.1130714-13-oliver.upton@linux.dev
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/kvm_nested.h
index 5e0ab059624685d77683de046300beb4e76e2916..a11ed921d4e0aa3c45fca040c6e282c1b8b810ec 100644 (file)
--- a/arch/arm64/include/asm/kvm_nested.h
+++ b/arch/arm64/include/asm/kvm_nested.h
@@ -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;
 }