Skip to contentSkip to conversation

KVM: arm64: Kill CPACR_EL1_TTA definition

PATCH Applied Marc Zyngier 2 participants 2 messages Jan 12, 2023 – Jan 23, 2023

Subsystems (3)
lore
Share & tools
lore

Marc Zyngier

author maintainer
#0 lore raw

PATCH 1/1 KVM: arm64: Kill CPACR_EL1_TTA definition

Since the One True Way is to use the new generated definition, kill the KVM-specific definition of CPACR_EL1_TTA, and move over to CPACR_ELx_TTA, hopefully for the same result.

---
 arch/arm64/include/asm/kvm_arm.h | 1 -
 arch/arm64/kvm/hyp/vhe/switch.c  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm64/include/asm/kvm_arm.h +0 -1
index 26b0c97df986..8a6b5ca2cfc6 100644
@@ -346,7 +346,6 @@
 	ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \
 	ECN(BKPT32), ECN(VECTOR32), ECN(BRK64)
 
-#define CPACR_EL1_TTA		(1 << 28)
 #define CPACR_EL1_DEFAULT	(CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN |\
 				 CPACR_EL1_ZEN_EL1EN)
 
arch/arm64/kvm/hyp/vhe/switch.c +1 -1
index 1a97391fedd2..81bf236d9c27 100644
@@ -40,7 +40,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu)
 	___activate_traps(vcpu);
 
 	val = read_sysreg(cpacr_el1);
-	val |= CPACR_EL1_TTA;
+	val |= CPACR_ELx_TTA;
 	val &= ~(CPACR_EL1_ZEN_EL0EN | CPACR_EL1_ZEN_EL1EN |
 		 CPACR_EL1_SMEN_EL0EN | CPACR_EL1_SMEN_EL1EN);
 
Signature · 1 line
2.34.1
Applied
#1 lore raw
Quoted 5 lines · Marc Zyngier

Since the One True Way is to use the new generated definition, kill the KVM-specific definition of CPACR_EL1_TTA, and move over to CPACR_ELx_TTA, hopefully for the same result.

Applied to kvmarm/next, thanks!

[1/1] KVM: arm64: Kill CPACR_EL1_TTA definition

      https://git.kernel.org/kvmarm/kvmarm/c/7a5e9c8f0b2d

--
Best,
Oliver