From: Marc Zyngier <maz@kernel.org>

Date: Tue, 15 Sep 2020 11:42:18 +0100

Subject: KVM: arm64: Remove S1PTW check from kvm_vcpu_dabt_iswrite()

Git-commit: 620cf45f7a516bf5fe9e5dce675a652e935c8bde

Patch-mainline: v5.9-rc7

References: bsc#1181818

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

Signed-off-by: Matthias Brugger <mbrugger@suse.com>

---

 arch/arm64/include/asm/kvm_emulate.h |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/arch/arm64/include/asm/kvm_emulate.h

+++ b/arch/arm64/include/asm/kvm_emulate.h

@@ -307,8 +307,7 @@ static inline bool kvm_vcpu_abt_iss1tw(c

 static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)

 {

-	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR) ||

-		kvm_vcpu_abt_iss1tw(vcpu); /* AF/DBM update */

+	return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR;

 }

 static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)