drop queue-5.10/powerpc-32s-fix-rtas-machine-check-with-vmap-stack.patch

diff --git a/queue-5.10/net-usb-qmi_wwan-add-quectel-em160r-gl.patch b/queue-5.10/net-usb-qmi_wwan-add-quectel-em160r-gl.patch
index 9aa84642dba8d6347e1dfdbc22705c5ed171db4c..375b93a2080a15ed5899a7b62a8480c4ac65ba9d 100644 (file)
--- a/queue-5.10/net-usb-qmi_wwan-add-quectel-em160r-gl.patch
+++ b/queue-5.10/net-usb-qmi_wwan-add-quectel-em160r-gl.patch
@@ -1,9 +1,9 @@
 From foo@baz Sun Jan 10 11:18:59 AM CET 2021
-From: "Bjørn Mork" <bjorn@mork.no>
+From: "Bjørn Mork" <bjorn@mork.no>
 Date: Wed, 30 Dec 2020 16:24:51 +0100
 Subject: net: usb: qmi_wwan: add Quectel EM160R-GL
 
-From: "Bjørn Mork" <bjorn@mork.no>
+From: "Bjørn Mork" <bjorn@mork.no>
 
 [ Upstream commit cfd82dfc9799c53ef109343a23af006a0f6860a9 ]
 

diff --git a/queue-5.10/powerpc-32s-fix-rtas-machine-check-with-vmap-stack.patch b/queue-5.10/powerpc-32s-fix-rtas-machine-check-with-vmap-stack.patch
deleted file mode 100644 (file)
index 953ece6..0000000
--- a/queue-5.10/powerpc-32s-fix-rtas-machine-check-with-vmap-stack.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 98bf2d3f4970179c702ef64db658e0553bc6ef3a Mon Sep 17 00:00:00 2001
-From: Christophe Leroy <christophe.leroy@csgroup.eu>
-Date: Tue, 22 Dec 2020 07:11:18 +0000
-Subject: powerpc/32s: Fix RTAS machine check with VMAP stack
-
-From: Christophe Leroy <christophe.leroy@csgroup.eu>
-
-commit 98bf2d3f4970179c702ef64db658e0553bc6ef3a upstream.
-
-When we have VMAP stack, exception prolog 1 sets r1, not r11.
-
-When it is not an RTAS machine check, don't trash r1 because it is
-needed by prolog 1.
-
-Fixes: da7bb43ab9da ("powerpc/32: Fix vmap stack - Properly set r1 before activating MMU")
-Fixes: d2e006036082 ("powerpc/32: Use SPRN_SPRG_SCRATCH2 in exception prologs")
-Cc: stable@vger.kernel.org # v5.10+
-Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
-[mpe: Squash in fixup for RTAS machine check from Christophe]
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-Link: https://lore.kernel.org/r/bc77d61d1c18940e456a2dee464f1e2eda65a3f0.1608621048.git.christophe.leroy@csgroup.eu
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/powerpc/kernel/head_book3s_32.S |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/arch/powerpc/kernel/head_book3s_32.S
-+++ b/arch/powerpc/kernel/head_book3s_32.S
-@@ -262,10 +262,19 @@ __secondary_hold_acknowledge:
- MachineCheck:
-       EXCEPTION_PROLOG_0
- #ifdef CONFIG_PPC_CHRP
-+#ifdef CONFIG_VMAP_STACK
-+      mtspr   SPRN_SPRG_SCRATCH2,r1
-+      mfspr   r1, SPRN_SPRG_THREAD
-+      lwz     r1, RTAS_SP(r1)
-+      cmpwi   cr1, r1, 0
-+      bne     cr1, 7f
-+      mfspr   r1, SPRN_SPRG_SCRATCH2
-+#else
-       mfspr   r11, SPRN_SPRG_THREAD
-       lwz     r11, RTAS_SP(r11)
-       cmpwi   cr1, r11, 0
-       bne     cr1, 7f
-+#endif
- #endif /* CONFIG_PPC_CHRP */
-       EXCEPTION_PROLOG_1 for_rtas=1
- 7:    EXCEPTION_PROLOG_2

diff --git a/queue-5.10/series b/queue-5.10/series
index f2e7249d02df82aaf5b4d0442ee4b5c8eec5ba15..1d01a717bfac65850e6396216c079eb1ee56e3f8 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -71,7 +71,6 @@ scsi-block-remove-rqf_preempt-and-blk_mq_req_preempt.patch
 scsi-block-do-not-accept-any-requests-while-suspende.patch
 crypto-ecdh-avoid-buffer-overflow-in-ecdh_set_secret.patch
 crypto-asym_tpm-correct-zero-out-potential-secrets.patch
-powerpc-32s-fix-rtas-machine-check-with-vmap-stack.patch
 powerpc-handle-.text.-hot-unlikely-.-in-linker-script.patch
 staging-comedi-return-efault-if-copy_to_user-fails.patch
 staging-mt7621-dma-fix-a-resource-leak-in-an-error-handling-path.patch