Commit 7a5e9c8f authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

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.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230112154803.1808559-1-maz@kernel.org


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

arch/arm64/include/asm/kvm_arm.h

+0 −1
Original line number Diff line number Diff line
@@ -361,7 +361,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
Original line number Diff line number Diff line
@@ -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);