xen: microcode: support AMD fam >= 15h.
svn path=/dists/sid/linux/; revision=19574
This commit is contained in:
parent
f39275cf2e
commit
b171676431
|
@ -0,0 +1,39 @@
|
|||
From a47f7cb2f0dbe097b7c848aea05c3224bde07e3c Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ijc@hellion.org.uk>
|
||||
Date: Mon, 26 Nov 2012 09:41:02 +0000
|
||||
Subject: [PATCH] microcode_xen: Add support for AMD family >= 15h
|
||||
|
||||
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
|
||||
---
|
||||
arch/x86/kernel/microcode_xen.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/microcode_xen.c b/arch/x86/kernel/microcode_xen.c
|
||||
index 9d2a06b..5fe87a6 100644
|
||||
--- a/arch/x86/kernel/microcode_xen.c
|
||||
+++ b/arch/x86/kernel/microcode_xen.c
|
||||
@@ -58,7 +58,7 @@ static int xen_microcode_update(int cpu)
|
||||
|
||||
static enum ucode_state xen_request_microcode_fw(int cpu, struct device *device)
|
||||
{
|
||||
- char name[30];
|
||||
+ char name[36];
|
||||
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
||||
const struct firmware *firmware;
|
||||
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
|
||||
@@ -74,7 +74,11 @@ static enum ucode_state xen_request_microcode_fw(int cpu, struct device *device)
|
||||
break;
|
||||
|
||||
case X86_VENDOR_AMD:
|
||||
- snprintf(name, sizeof(name), "amd-ucode/microcode_amd.bin");
|
||||
+ /* Beginning with family 15h AMD uses family-specific firmware files. */
|
||||
+ if (c->x86 >= 0x15)
|
||||
+ snprintf(name, sizeof(name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
|
||||
+ else
|
||||
+ snprintf(name, sizeof(name), "amd-ucode/microcode_amd.bin");
|
||||
break;
|
||||
|
||||
default:
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -416,3 +416,4 @@ features/all/ipv6-Treat-ND-option-31-as-userland-DNSSL-support.patch
|
|||
bugfix/x86/Input-i8042-also-perform-controller-reset-when-suspe.patch
|
||||
features/all/wireless-rt2x00-rt2800pci-add-more-RT539x-ids.patch
|
||||
features/all/rt2x00-Add-RT539b-chipset-support.patch
|
||||
features/all/xen/microcode-amd-fam15plus.patch
|
||||
|
|
Loading…
Reference in New Issue