---

yaml --- r: 372095 b: refs/heads/master c: cfe3950 h: refs/heads/master i: 372093: ea181b2 372091: 8220869 372087: c0b010e 372079: f7e2b60 372063: 33ce303 372031: 6290a07 371967: f51e2ca v: v3
git-mirror · Mar 6, 2013 · add6ba4 · add6ba4
1 parent 787a9f9
commit add6ba4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 728d577d357c9caf83f75d0a38f318f343999cc2
+refs/heads/master: cfe3950c2a19c1e1ad85b9dd2622617e309d2845
diff --git a/trunk/arch/arm/kvm/mmu.c b/trunk/arch/arm/kvm/mmu.c
@@ -606,8 +606,13 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
 			goto out_unlock;
 		}
 
-		/* Adjust page offset */
-		fault_ipa |= kvm_vcpu_get_hfar(vcpu) & ~PAGE_MASK;
+		/*
+		 * The IPA is reported as [MAX:12], so we need to
+		 * complement it with the bottom 12 bits from the
+		 * faulting VA. This is always 12 bits, irrespective
+		 * of the page size.
+		 */
+		fault_ipa |= kvm_vcpu_get_hfar(vcpu) & ((1 << 12) - 1);
 		ret = io_mem_abort(vcpu, run, fault_ipa);
 		goto out_unlock;
 	}