5.0-stable patches

added patches:
	powerpc-fsl-fix-the-flush-of-branch-predictor.patch

diff --git a/queue-5.0/powerpc-fsl-fix-the-flush-of-branch-predictor.patch b/queue-5.0/powerpc-fsl-fix-the-flush-of-branch-predictor.patch
new file mode 100644 (file)
index 0000000..9d6f930
--- /dev/null
+++ b/queue-5.0/powerpc-fsl-fix-the-flush-of-branch-predictor.patch
@@ -0,0 +1,43 @@
+From 27da80719ef132cf8c80eb406d5aeb37dddf78cc Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Tue, 26 Feb 2019 18:18:48 +0000
+Subject: powerpc/fsl: Fix the flush of branch predictor.
+
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+
+commit 27da80719ef132cf8c80eb406d5aeb37dddf78cc upstream.
+
+The commit identified below adds MC_BTB_FLUSH macro only when
+CONFIG_PPC_FSL_BOOK3E is defined. This results in the following error
+on some configs (seen several times with kisskb randconfig_defconfig)
+
+arch/powerpc/kernel/exceptions-64e.S:576: Error: Unrecognized opcode: `mc_btb_flush'
+make[3]: *** [scripts/Makefile.build:367: arch/powerpc/kernel/exceptions-64e.o] Error 1
+make[2]: *** [scripts/Makefile.build:492: arch/powerpc/kernel] Error 2
+make[1]: *** [Makefile:1043: arch/powerpc] Error 2
+make: *** [Makefile:152: sub-make] Error 2
+
+This patch adds a blank definition of MC_BTB_FLUSH for other cases.
+
+Fixes: 10c5e83afd4a ("powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)")
+Cc: Diana Craciun <diana.craciun@nxp.com>
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Reviewed-by: Daniel Axtens <dja@axtens.net>
+Reviewed-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>
+
+---
+ arch/powerpc/kernel/exceptions-64e.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/kernel/exceptions-64e.S
++++ b/arch/powerpc/kernel/exceptions-64e.S
+@@ -349,6 +349,7 @@ ret_from_mc_except:
+ #define GEN_BTB_FLUSH
+ #define CRIT_BTB_FLUSH
+ #define DBG_BTB_FLUSH
++#define MC_BTB_FLUSH
+ #define GDBELL_BTB_FLUSH
+ #endif
+ 

diff --git a/queue-5.0/series b/queue-5.0/series
index 35c66188fa462c820f8bbad516845aa913b6ac10..11a62bb40452a1bec0dcb74139e73e27cbdba11c 100644 (file)
--- a/queue-5.0/series
+++ b/queue-5.0/series
@@ -34,3 +34,4 @@ net-phy-don-t-clear-bmcr-in-genphy_soft_reset.patch
 r8169-fix-cable-re-plugging-issue.patch
 ila-fix-rhashtable-walker-list-corruption.patch
 tun-add-a-missing-rcu_read_unlock-in-error-path.patch
+powerpc-fsl-fix-the-flush-of-branch-predictor.patch