KVM: arm64: Use defined value for SCTLR_ELx_EE

Fuad Tabba · Marc Zyngier · commit 500ca5241bf8 · 2021-12-20T13:55:48.000Z
Replace the hardcoded value with the existing definition. No functional change intended. Signed-off-by: Fuad Tabba <tabba@google.com> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20211208192810.657360-1-tabba@google.com
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
@@ -386,7 +386,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
 		*vcpu_cpsr(vcpu) |= PSR_AA32_E_BIT;
 	} else {
 		u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);
-		sctlr |= (1 << 25);
+		sctlr |= SCTLR_ELx_EE;
 		vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)`
`386`	`386`	`*vcpu_cpsr(vcpu) \|= PSR_AA32_E_BIT;`
`387`	`387`	`} else {`
`388`	`388`	`u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);`
`389`		`- sctlr \|= (1 << 25);`
	`389`	`+ sctlr \|= SCTLR_ELx_EE;`
`390`	`390`	`vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);`
`391`	`391`	`}`
`392`	`392`	`}`