From 14b4d10bf2e9f23f5d39f2a82f95e96c7b7fb3bf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Apr 2020 13:25:41 +0200 Subject: [PATCH] 5.5-stable patches added patches: x86-microcode-amd-increase-microcode-patch_max_size.patch --- queue-5.5/series | 1 + ...md-increase-microcode-patch_max_size.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 queue-5.5/x86-microcode-amd-increase-microcode-patch_max_size.patch diff --git a/queue-5.5/series b/queue-5.5/series index c5c0ee0979e..1865d6ef5c8 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -62,3 +62,4 @@ x86-resctrl-preserve-cdp-enable-over-cpu-hotplug.patch x86-resctrl-fix-invalid-attempt-at-removing-the-default-resource-group.patch scsi-target-remove-boilerplate-code.patch scsi-target-fix-hang-when-multiple-threads-try-to-de.patch +x86-microcode-amd-increase-microcode-patch_max_size.patch diff --git a/queue-5.5/x86-microcode-amd-increase-microcode-patch_max_size.patch b/queue-5.5/x86-microcode-amd-increase-microcode-patch_max_size.patch new file mode 100644 index 00000000000..69248ef066a --- /dev/null +++ b/queue-5.5/x86-microcode-amd-increase-microcode-patch_max_size.patch @@ -0,0 +1,33 @@ +From bdf89df3c54518eed879d8fac7577fcfb220c67e Mon Sep 17 00:00:00 2001 +From: John Allen +Date: Thu, 9 Apr 2020 10:34:29 -0500 +Subject: x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE + +From: John Allen + +commit bdf89df3c54518eed879d8fac7577fcfb220c67e upstream. + +Future AMD CPUs will have microcode patches that exceed the default 4K +patch size. Raise our limit. + +Signed-off-by: John Allen +Signed-off-by: Borislav Petkov +Cc: stable@vger.kernel.org # v4.14.. +Link: https://lkml.kernel.org/r/20200409152931.GA685273@mojo.amd.com +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/include/asm/microcode_amd.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/include/asm/microcode_amd.h ++++ b/arch/x86/include/asm/microcode_amd.h +@@ -41,7 +41,7 @@ struct microcode_amd { + unsigned int mpb[0]; + }; + +-#define PATCH_MAX_SIZE PAGE_SIZE ++#define PATCH_MAX_SIZE (3 * PAGE_SIZE) + + #ifdef CONFIG_MICROCODE_AMD + extern void __init load_ucode_amd_bsp(unsigned int family); -- 2.47.3