Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-09-14 01:16:42 +0200
committerAlexander Graf <agraf@suse.de>2011-09-14 01:19:26 +0200
commit2be41bdb019b306f294d91edc3e43343d09d0d40 (patch)
tree587d8f7059df77111ec095a5808eb779a9d3be3a
parentfe60c70be2a0dd9b4239837753fda593ad82e1a4 (diff)
KVM: PPC: Fix incorrect CBE KVM hooks.
There is another issue with KVM_HV and CBE that I only saw building this tree, so the patch is on its way to the kvm tree now.
-rw-r--r--patches.arch/ppc-kvm-fix-cbe.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.arch/ppc-kvm-fix-cbe.patch b/patches.arch/ppc-kvm-fix-cbe.patch
new file mode 100644
index 0000000000..b0298b27ef
--- /dev/null
+++ b/patches.arch/ppc-kvm-fix-cbe.patch
@@ -0,0 +1,37 @@
+From: Alexander Graf <agraf@suse.de>
+Subject: KVM: PPC: Fix incorrect CBE KVM hooks
+Patch-Mainline: not yet
+
+This patch fixes incorrect CBE hooks for KVM and makes the build work again.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+
+--- a/arch/powerpc/kernel/exceptions-64s.S.orig 2011-09-13 13:56:43.870005204 +0000
++++ b/arch/powerpc/kernel/exceptions-64s.S 2011-09-13 13:53:28.620004545 +0000
+@@ -267,7 +267,7 @@
+
+ #ifdef CONFIG_CBE_RAS
+ STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
+- KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
++ KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1202)
+ #endif /* CONFIG_CBE_RAS */
+
+ STD_EXCEPTION_PSERIES(0x1300, 0x1300, instruction_breakpoint)
+@@ -275,7 +275,7 @@
+
+ #ifdef CONFIG_CBE_RAS
+ STD_EXCEPTION_HV(0x1600, 0x1602, cbe_maintenance)
+- KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1602)
++ KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1602)
+ #endif /* CONFIG_CBE_RAS */
+
+ STD_EXCEPTION_PSERIES(0x1700, 0x1700, altivec_assist)
+@@ -283,7 +283,7 @@
+
+ #ifdef CONFIG_CBE_RAS
+ STD_EXCEPTION_HV(0x1800, 0x1802, cbe_thermal)
+- KVM_HANDLER_PR_SKIP(PACA_EXGEN, EXC_HV, 0x1802)
++ KVM_HANDLER_SKIP(PACA_EXGEN, EXC_HV, 0x1802)
+ #endif /* CONFIG_CBE_RAS */
+
+ . = 0x3000
diff --git a/series.conf b/series.conf
index b95193bf50..1ae603a539 100644
--- a/series.conf
+++ b/series.conf
@@ -149,6 +149,7 @@
patches.arch/ppc-prom-nodisplay.patch
patches.fixes/ptrace-getsiginfo
patches.arch/ppc-kvm-fix-big-section.patch
+ patches.arch/ppc-kvm-fix-cbe.patch
########################################################
# PS3