4.9-stable patches

added patches:
	documentation-add-nospectre_v1-parameter.patch
	powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch

diff --git a/queue-4.9/documentation-add-nospectre_v1-parameter.patch b/queue-4.9/documentation-add-nospectre_v1-parameter.patch
new file mode 100644 (file)
index 0000000..dbe42e5
--- /dev/null
+++ b/queue-4.9/documentation-add-nospectre_v1-parameter.patch
@@ -0,0 +1,32 @@
+From 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 Mon Sep 17 00:00:00 2001
+From: Diana Craciun <diana.craciun@nxp.com>
+Date: Sat, 28 Jul 2018 09:06:39 +1000
+Subject: Documentation: Add nospectre_v1 parameter
+
+From: Diana Craciun <diana.craciun@nxp.com>
+
+commit 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 upstream.
+
+Currently only supported on powerpc.
+
+Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/kernel-parameters.txt |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -2758,6 +2758,10 @@ bytes respectively. Such letter suffixes
+ 
+       nohugeiomap     [KNL,x86] Disable kernel huge I/O mappings.
+ 
++      nospectre_v1    [PPC] Disable mitigations for Spectre Variant 1 (bounds
++                      check bypass). With this option data leaks are possible
++                      in the system.
++
+       nosmt           [KNL,S390] Disable symmetric multithreading (SMT).
+                       Equivalent to smt=1.
+ 

diff --git a/queue-4.9/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch b/queue-4.9/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
new file mode 100644 (file)
index 0000000..65bbfc7
--- /dev/null
+++ b/queue-4.9/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
@@ -0,0 +1,28 @@
+From e59f5bd759b7dee57593c5b6c0441609bda5d530 Mon Sep 17 00:00:00 2001
+From: Diana Craciun <diana.craciun@nxp.com>
+Date: Wed, 12 Dec 2018 16:03:10 +0200
+Subject: powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg
+
+From: Diana Craciun <diana.craciun@nxp.com>
+
+commit e59f5bd759b7dee57593c5b6c0441609bda5d530 upstream.
+
+Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/kernel-parameters.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -2765,7 +2765,7 @@ bytes respectively. Such letter suffixes
+                       nosmt=force: Force disable SMT, cannot be undone
+                                    via the sysfs control file.
+ 
+-      nospectre_v2    [X86] Disable all mitigations for the Spectre variant 2
++      nospectre_v2    [X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
+                       (indirect branch prediction) vulnerability. System may
+                       allow data leaks with this option, which is equivalent
+                       to spectre_v2=off.

diff --git a/queue-4.9/series b/queue-4.9/series
index 5790b670f1d1b048031af8ef0459ee6894a7fb48..786ad053c632baca30010a788bdd019446ba265a 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -39,3 +39,5 @@ net-ip-defrag-encapsulate-rbtree-defrag-code-into-callable-functions.patch
 ipv6-remove-dependency-of-nf_defrag_ipv6-on-ipv6-module.patch
 net-ip6-defrag-use-rbtrees-for-ipv6-defrag.patch
 net-ip6-defrag-use-rbtrees-in-nf_conntrack_reasm.c.patch
+powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
+documentation-add-nospectre_v1-parameter.patch