diff options
| author |   Marc Zyngier <maz@kernel.org> | 2024-06-20 16:46:49 +0000 |
|---|---|---|
| committer |   Oliver Upton <oliver.upton@linux.dev> | 2024-06-20 19:04:49 +0000 |
| commit | 0edc60fd6e9ec1843d968370e0a3fa26cd73f3c3 (patch) | |
| tree | 6b89c62df89be5acd33a2a7a36f5d089eb90a1db | |
| parent | KVM: arm64: nv: Honor guest hypervisor's FP/SVE traps in CPTR_EL2 (diff) | |
| download | wireguard-linux-0edc60fd6e9ec1843d968370e0a3fa26cd73f3c3.tar.xz wireguard-linux-0edc60fd6e9ec1843d968370e0a3fa26cd73f3c3.zip | |
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>
| -rw-r--r-- | arch/arm64/include/asm/kvm_nested.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/kvm_nested.h index 5e0ab0596246..a11ed921d4e0 100644 --- 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; } |