Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 12:36:54 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:35 +0100
commitbc37ee8d93416db4cae7401217bceb7dd7f0921f (patch)
tree6a59aaee2eb843eb482dd2da37b884e16da89435
parent602b4b726ef5cca33a09efed1d023971933f6a0e (diff)
KVM: PPC: Book3S HV: Check DR not IR to chose real vs virt
mode MMIOs (bsc#1061840).
-rw-r--r--patches.arch/KVM-PPC-Book3S-HV-Check-DR-not-IR-to-chose-real-vs-v.patch33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.arch/KVM-PPC-Book3S-HV-Check-DR-not-IR-to-chose-real-vs-v.patch b/patches.arch/KVM-PPC-Book3S-HV-Check-DR-not-IR-to-chose-real-vs-v.patch
new file mode 100644
index 0000000000..1aa3fcd8c8
--- /dev/null
+++ b/patches.arch/KVM-PPC-Book3S-HV-Check-DR-not-IR-to-chose-real-vs-v.patch
@@ -0,0 +1,33 @@
+From 2662efd050953824de5c9b24449d6b5b342db10b Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Fri, 12 Jan 2018 13:37:14 +1100
+Subject: [PATCH] KVM: PPC: Book3S HV: Check DR not IR to chose real vs virt
+ mode MMIOs
+
+References: bsc#1061840
+Patch-mainline: v4.16-rc1
+Git-commit: 2662efd050953824de5c9b24449d6b5b342db10b
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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:
+ li r7, TM_SPC_PULL_OS_CTX
+ li r6, TM_QW1_OS
+ mfmsr r0
+- andi. r0, r0, MSR_IR /* in real mode? */
++ andi. r0, r0, MSR_DR /* in real mode? */
+ beq 2f
+ ld r10, HSTATE_XIVE_TIMA_VIRT(r13)
+ cmpldi cr0, r10, 0
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index ba0e6acca8..93b0e215f3 100644
--- a/series.conf
+++ b/series.conf
@@ -13233,6 +13233,7 @@
patches.arch/KVM-PPC-Book3S-HV-Allow-HPT-and-radix-on-the-same-co.patch
patches.arch/KVM-PPC-Book3S-HV-Enable-use-of-the-new-XIVE-single-.patch
patches.arch/KVM-PPC-Book3S-HV-Don-t-use-existing-prodded-flag-fo.patch
+ patches.arch/KVM-PPC-Book3S-HV-Check-DR-not-IR-to-chose-real-vs-v.patch
patches.arch/KVM-PPC-Book3S-HV-Drop-locks-before-reading-guest-me.patch
patches.fixes/KVM-PPC-Book3S-PR-Fix-svcpu-copying-with-preemption-.patch
patches.arch/KVM-PPC-Book3S-PR-Fix-broken-select-due-to-misspelli.patch