KVM: arm64: Remove S1PTW check from kvm_vcpu_dabt_iswrite()

Now that kvm_vcpu_trap_is_write_fault() checks for S1PTW, there
is no need for kvm_vcpu_dabt_iswrite() to do the same thing, as
we already check for this condition on all existing paths.

Drop the check and add a comment instead.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200915104218.1284701-3-maz@kernel.org

Changed files
+2 -2
arch
arm64
include
+2 -2
arch/arm64/include/asm/kvm_emulate.h
··· 303 303 return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_S1PTW); 304 304 } 305 305 306 + /* Always check for S1PTW *before* using this. */ 306 307 static __always_inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu) 307 308 { 308 - return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR) || 309 - kvm_vcpu_abt_iss1tw(vcpu); /* AF/DBM update */ 309 + return kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR; 310 310 } 311 311 312 312 static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)