aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2018-01-11 21:37:14 -0500
committerPaul Mackerras <paulus@ozlabs.org>2018-01-18 20:10:21 -0500
commit2662efd050953824de5c9b24449d6b5b342db10b (patch)
treeef3776278e7a61d22d51160fdaa552c42106353d
parent2267ea7661798a42f0da648a2970e2a03f4bc370 (diff)
KVM: PPC: Book3S HV: Check DR not IR to chose real vs virt mode MMIOs
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
-rw-r--r--arch/powerpc/kvm/book3s_hv_rmhandlers.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 34dbab7deb39..948f21cf84d5 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1464,7 +1464,7 @@ mc_cont:
1464 li r7, TM_SPC_PULL_OS_CTX 1464 li r7, TM_SPC_PULL_OS_CTX
1465 li r6, TM_QW1_OS 1465 li r6, TM_QW1_OS
1466 mfmsr r0 1466 mfmsr r0
1467 andi. r0, r0, MSR_IR /* in real mode? */ 1467 andi. r0, r0, MSR_DR /* in real mode? */
1468 beq 2f 1468 beq 2f
1469 ld r10, HSTATE_XIVE_TIMA_VIRT(r13) 1469 ld r10, HSTATE_XIVE_TIMA_VIRT(r13)
1470 cmpldi cr0, r10, 0 1470 cmpldi cr0, r10, 0