The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: bdf89df3c54518eed879d8fac7577fcfb220c67e Gitweb: https://git.kernel.org/tip/bdf89df3c54518eed879d8fac7577fcfb220c67e Author: John Allen john.allen@amd.com AuthorDate: Thu, 09 Apr 2020 10:34:29 -05:00 Committer: Borislav Petkov bp@suse.de CommitterDate: Tue, 14 Apr 2020 17:34:46 +02:00

x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE

Future AMD CPUs will have microcode patches that exceed the default 4K patch size. Raise our limit.

Signed-off-by: John Allen john.allen@amd.com Signed-off-by: Borislav Petkov bp@suse.de Cc: stable@vger.kernel.org # v4.14.. Link: https://lkml.kernel.org/r/20200409152931.GA685273@mojo.amd.com --- arch/x86/include/asm/microcode_amd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index 6685e12..7063b5a 100644 --- 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);