remove x86-microcode-update-bsps-microcode-on-resume.patch

diff --git a/queue-3.14/series b/queue-3.14/series
index a103ad471d45ad215dcfe506a18c1aade0e40fc9..a3c0c2b5cfefa01e0572d8183f0916777c84b09b 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -6,5 +6,4 @@ x86_64-traps-rework-bad_iret.patch
 x86-require-exact-match-for-noxsave-command-line-option.patch
 x86-mm-set-nx-across-entire-pmd-at-boot.patch
 x86-kaslr-handle-gold-linker-for-finding-bss-brk.patch
-x86-microcode-update-bsps-microcode-on-resume.patch
 uprobes-x86-fix-_tif_uprobe-vs-_tif_notify_resume.patch

diff --git a/queue-3.14/x86-microcode-update-bsps-microcode-on-resume.patch b/queue-3.14/x86-microcode-update-bsps-microcode-on-resume.patch
deleted file mode 100644 (file)
index 2c62258..0000000
--- a/queue-3.14/x86-microcode-update-bsps-microcode-on-resume.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fb86b97300d930b57471068720c52bfa8622eab7 Mon Sep 17 00:00:00 2001
-From: Borislav Petkov <bp@suse.de>
-Date: Tue, 18 Nov 2014 10:46:57 +0100
-Subject: x86, microcode: Update BSPs microcode on resume
-
-From: Borislav Petkov <bp@suse.de>
-
-commit fb86b97300d930b57471068720c52bfa8622eab7 upstream.
-
-In the situation when we apply early microcode but do *not* apply late
-microcode, we fail to update the BSP's microcode on resume because we
-haven't initialized the uci->mc microcode pointer. So, in order to
-alleviate that, we go and dig out the stashed microcode patch during
-early boot. It is basically the same thing that is done on the APs early
-during boot so do that too here.
-
-Tested-by: alex.schnaidt@gmail.com
-Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=88001
-Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
-Cc: Fenghua Yu <fenghua.yu@intel.com>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Link: http://lkml.kernel.org/r/20141118094657.GA6635@pd.tnic
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/kernel/cpu/microcode/core.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/arch/x86/kernel/cpu/microcode/core.c
-+++ b/arch/x86/kernel/cpu/microcode/core.c
-@@ -462,6 +462,14 @@ static void mc_bp_resume(void)
- 
-       if (uci->valid && uci->mc)
-               microcode_ops->apply_microcode(cpu);
-+      else if (!uci->mc)
-+              /*
-+               * We might resume and not have applied late microcode but still
-+               * have a newer patch stashed from the early loader. We don't
-+               * have it in uci->mc so we have to load it the same way we're
-+               * applying patches early on the APs.
-+               */
-+              load_ucode_ap();
- }
- 
- static struct syscore_ops mc_syscore_ops = {

diff --git a/queue-3.17/series b/queue-3.17/series
index 0f7ea7534405dd9a5ad62c1aa4ec8e74cdb0ce41..be241ca6b019833b9e887f5e791fc434498f05fa 100644 (file)
--- a/queue-3.17/series
+++ b/queue-3.17/series
@@ -15,5 +15,4 @@ x86_64-traps-rework-bad_iret.patch
 x86-require-exact-match-for-noxsave-command-line-option.patch
 x86-mm-set-nx-across-entire-pmd-at-boot.patch
 x86-kaslr-handle-gold-linker-for-finding-bss-brk.patch
-x86-microcode-update-bsps-microcode-on-resume.patch
 uprobes-x86-fix-_tif_uprobe-vs-_tif_notify_resume.patch

diff --git a/queue-3.17/x86-microcode-update-bsps-microcode-on-resume.patch b/queue-3.17/x86-microcode-update-bsps-microcode-on-resume.patch
deleted file mode 100644 (file)
index 6bf6e01..0000000
--- a/queue-3.17/x86-microcode-update-bsps-microcode-on-resume.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From fb86b97300d930b57471068720c52bfa8622eab7 Mon Sep 17 00:00:00 2001
-From: Borislav Petkov <bp@suse.de>
-Date: Tue, 18 Nov 2014 10:46:57 +0100
-Subject: x86, microcode: Update BSPs microcode on resume
-
-From: Borislav Petkov <bp@suse.de>
-
-commit fb86b97300d930b57471068720c52bfa8622eab7 upstream.
-
-In the situation when we apply early microcode but do *not* apply late
-microcode, we fail to update the BSP's microcode on resume because we
-haven't initialized the uci->mc microcode pointer. So, in order to
-alleviate that, we go and dig out the stashed microcode patch during
-early boot. It is basically the same thing that is done on the APs early
-during boot so do that too here.
-
-Tested-by: alex.schnaidt@gmail.com
-Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=88001
-Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
-Cc: Fenghua Yu <fenghua.yu@intel.com>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Link: http://lkml.kernel.org/r/20141118094657.GA6635@pd.tnic
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/x86/kernel/cpu/microcode/core.c |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/arch/x86/kernel/cpu/microcode/core.c
-+++ b/arch/x86/kernel/cpu/microcode/core.c
-@@ -465,6 +465,14 @@ static void mc_bp_resume(void)
- 
-       if (uci->valid && uci->mc)
-               microcode_ops->apply_microcode(cpu);
-+      else if (!uci->mc)
-+              /*
-+               * We might resume and not have applied late microcode but still
-+               * have a newer patch stashed from the early loader. We don't
-+               * have it in uci->mc so we have to load it the same way we're
-+               * applying patches early on the APs.
-+               */
-+              load_ucode_ap();
- }
- 
- static struct syscore_ops mc_syscore_ops = {