4.9-stable patches

added patches:
	x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index b87551b20fbb2afd47a628ea0ffc0fc9b7714dac..6049923240ee1f8389acd819c1ff2278f2b29425 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -13,3 +13,4 @@ iommu-arm-smmu-v3-don-t-free-page-table-ops-twice.patch
 iommu-arm-smmu-v3-cope-with-duplicated-stream-ids.patch
 arc-uaccess-dont-use-l-gcc-inline-asm-constraint-modifier.patch
 input-elantech-add-new-icbody-type-15.patch
+x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch

diff --git a/queue-4.9/x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch b/queue-4.9/x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch
new file mode 100644 (file)
index 0000000..28642c7
--- /dev/null
+++ b/queue-4.9/x86-microcode-amd-add-support-for-fam17h-microcode-loading.patch
@@ -0,0 +1,45 @@
+From f4e9b7af0cd58dd039a0fb2cd67d57cea4889abf Mon Sep 17 00:00:00 2001
+From: Tom Lendacky <thomas.lendacky@amd.com>
+Date: Thu, 30 Nov 2017 16:46:40 -0600
+Subject: x86/microcode/AMD: Add support for fam17h microcode loading
+
+From: Tom Lendacky <thomas.lendacky@amd.com>
+
+commit f4e9b7af0cd58dd039a0fb2cd67d57cea4889abf upstream.
+
+The size for the Microcode Patch Block (MPB) for an AMD family 17h
+processor is 3200 bytes.  Add a #define for fam17h so that it does
+not default to 2048 bytes and fail a microcode load/update.
+
+Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Borislav Petkov <bp@alien8.de>
+Link: https://lkml.kernel.org/r/20171130224640.15391.40247.stgit@tlendack-t1.amdoffice.net
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Alice Ferrazzi <alicef@gentoo.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/cpu/microcode/amd.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/x86/kernel/cpu/microcode/amd.c
++++ b/arch/x86/kernel/cpu/microcode/amd.c
+@@ -592,6 +592,7 @@ static unsigned int verify_patch_size(u8
+ #define F14H_MPB_MAX_SIZE 1824
+ #define F15H_MPB_MAX_SIZE 4096
+ #define F16H_MPB_MAX_SIZE 3458
++#define F17H_MPB_MAX_SIZE 3200
+ 
+       switch (family) {
+       case 0x14:
+@@ -603,6 +604,9 @@ static unsigned int verify_patch_size(u8
+       case 0x16:
+               max_size = F16H_MPB_MAX_SIZE;
+               break;
++      case 0x17:
++              max_size = F17H_MPB_MAX_SIZE;
++              break;
+       default:
+               max_size = F1XH_MPB_MAX_SIZE;
+               break;