summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@amd.com>2012-11-15 13:41:50 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 11:46:38 -0800
commit82c0abae22f37f93655b8adfa304e207f2ffbfa3 (patch)
treecc35a1720f62ec71e0d0f99897ddf01ce413583d /arch
parent8433fcce61cd330b1096e2e4d7601d5251d95b6c (diff)
downloadlinux-3.10-82c0abae22f37f93655b8adfa304e207f2ffbfa3.tar.gz
linux-3.10-82c0abae22f37f93655b8adfa304e207f2ffbfa3.tar.bz2
linux-3.10-82c0abae22f37f93655b8adfa304e207f2ffbfa3.zip
x86, microcode, AMD: Add support for family 16h processors
commit 36c46ca4f322a7bf89aad5462a3a1f61713edce7 upstream. Add valid patch size for family 16h processors. [ hpa: promoting to urgent/stable since it is hw enabling and trivial ] Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com> Acked-by: Andreas Herrmann <herrmann.der.user@googlemail.com> Link: http://lkml.kernel.org/r/1353004910-2204-1-git-send-email-boris.ostrovsky@amd.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/microcode_amd.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 82746f942cd..5d8cf0d6796 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -97,6 +97,7 @@ static unsigned int verify_ucode_size(int cpu, u32 patch_size,
#define F1XH_MPB_MAX_SIZE 2048
#define F14H_MPB_MAX_SIZE 1824
#define F15H_MPB_MAX_SIZE 4096
+#define F16H_MPB_MAX_SIZE 3458
switch (c->x86) {
case 0x14:
@@ -105,6 +106,9 @@ static unsigned int verify_ucode_size(int cpu, u32 patch_size,
case 0x15:
max_size = F15H_MPB_MAX_SIZE;
break;
+ case 0x16:
+ max_size = F16H_MPB_MAX_SIZE;
+ break;
default:
max_size = F1XH_MPB_MAX_SIZE;
break;