Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:43 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:53 +0200
commit9e0d11f77f505937001de6c388bdd13816019ee0 (patch)
tree70281c84e6aa310e7b08792a3ccfc39b83cddf57
parent64be51d08624dd18de498a0d34cb916db972a7a9 (diff)
powerpc/booke64: set RI in default MSR (bnc#1012628).
-rw-r--r--patches.kernel.org/5.1.3-038-powerpc-booke64-set-RI-in-default-MSR.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.kernel.org/5.1.3-038-powerpc-booke64-set-RI-in-default-MSR.patch b/patches.kernel.org/5.1.3-038-powerpc-booke64-set-RI-in-default-MSR.patch
new file mode 100644
index 0000000000..3f18598232
--- /dev/null
+++ b/patches.kernel.org/5.1.3-038-powerpc-booke64-set-RI-in-default-MSR.patch
@@ -0,0 +1,39 @@
+From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+Date: Mon, 15 Apr 2019 14:52:11 +0300
+Subject: [PATCH] powerpc/booke64: set RI in default MSR
+References: bnc#1012628
+Patch-mainline: 5.1.3
+Git-commit: 5266e58d6cd90ac85c187d673093ad9cb649e16d
+
+commit 5266e58d6cd90ac85c187d673093ad9cb649e16d upstream.
+
+Set RI in the default kernel's MSR so that the architected way of
+detecting unrecoverable machine check interrupts has a chance to work.
+This is inline with the MSR setup of the rest of booke powerpc
+architectures configured here.
+
+Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/powerpc/include/asm/reg_booke.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
+index eb2a33d5df26..e382bd6ede84 100644
+--- a/arch/powerpc/include/asm/reg_booke.h
++++ b/arch/powerpc/include/asm/reg_booke.h
+@@ -41,7 +41,7 @@
+ #if defined(CONFIG_PPC_BOOK3E_64)
+ #define MSR_64BIT MSR_CM
+
+-#define MSR_ (MSR_ME | MSR_CE)
++#define MSR_ (MSR_ME | MSR_RI | MSR_CE)
+ #define MSR_KERNEL (MSR_ | MSR_64BIT)
+ #define MSR_USER32 (MSR_ | MSR_PR | MSR_EE)
+ #define MSR_USER64 (MSR_USER32 | MSR_64BIT)
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index 6a3d794eb7..b7f1e0fa0b 100644
--- a/series.conf
+++ b/series.conf
@@ -123,6 +123,7 @@
patches.kernel.org/5.1.3-035-drivers-virt-fsl_hypervisor.c-prevent-integer-o.patch
patches.kernel.org/5.1.3-036-powerpc-book3s-64-check-for-NULL-pointer-in-pgd.patch
patches.kernel.org/5.1.3-037-powerpc-powernv-idle-Restore-IAMR-after-idle.patch
+ patches.kernel.org/5.1.3-038-powerpc-booke64-set-RI-in-default-MSR.patch
########################################################
# Build fixes that apply to the vanilla kernel too.