From 64efe20b9ad067dd23bf98ef0881593c623a347c Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Tue, 18 Sep 2012 11:43:30 +0100
Subject: [PATCH] --- yaml --- r: 372080 b: refs/heads/master c:
 a7123377e7107a5f4f7ae198aa5b5000c9362871 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/include/asm/kvm_emulate.h | 16 ++++++++++++++++
 trunk/arch/arm/kvm/mmio.c                | 17 +++--------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 7271f30cd970..0699c86cf0d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b37670b0f37d8015d0d428e6a63bd07397430a2f
+refs/heads/master: a7123377e7107a5f4f7ae198aa5b5000c9362871
diff --git a/trunk/arch/arm/include/asm/kvm_emulate.h b/trunk/arch/arm/include/asm/kvm_emulate.h
index 6b43653865fb..e4a4fc2f9156 100644
--- a/trunk/arch/arm/include/asm/kvm_emulate.h
+++ b/trunk/arch/arm/include/asm/kvm_emulate.h
@@ -120,4 +120,20 @@ static inline bool kvm_vcpu_dabt_iss1tw(struct kvm_vcpu *vcpu)
 	return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_S1PTW;
 }
 
+/* Get Access Size from a data abort */
+static inline int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu)
+{
+	switch ((kvm_vcpu_get_hsr(vcpu) >> 22) & 0x3) {
+	case 0:
+		return 1;
+	case 1:
+		return 2;
+	case 2:
+		return 4;
+	default:
+		kvm_err("Hardware is weird: SAS 0b11 is reserved\n");
+		return -EFAULT;
+	}
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/trunk/arch/arm/kvm/mmio.c b/trunk/arch/arm/kvm/mmio.c
index 6495c1ca7bfa..0b8f49985b70 100644
--- a/trunk/arch/arm/kvm/mmio.c
+++ b/trunk/arch/arm/kvm/mmio.c
@@ -77,20 +77,9 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 		return 1;
 	}
 
-	switch ((kvm_vcpu_get_hsr(vcpu) >> 22) & 0x3) {
-	case 0:
-		len = 1;
-		break;
-	case 1:
-		len = 2;
-		break;
-	case 2:
-		len = 4;
-		break;
-	default:
-		kvm_err("Hardware is weird: SAS 0b11 is reserved\n");
-		return -EFAULT;
-	}
+	len = kvm_vcpu_dabt_get_as(vcpu);
+	if (unlikely(len < 0))
+		return len;
 
 	is_write = kvm_vcpu_dabt_iswrite(vcpu);
 	sign_extend = kvm_vcpu_dabt_issext(vcpu);