diff options
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/amd.c')
-rw-r--r-- | arch/x86/kernel/cpu/microcode/amd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 8fffd845e22b..bfbbe6195e2d 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c | |||
@@ -376,7 +376,7 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data, | |||
376 | return UCODE_OK; | 376 | return UCODE_OK; |
377 | } | 377 | } |
378 | 378 | ||
379 | enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size) | 379 | enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size) |
380 | { | 380 | { |
381 | enum ucode_state ret; | 381 | enum ucode_state ret; |
382 | 382 | ||
@@ -390,8 +390,8 @@ enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size) | |||
390 | 390 | ||
391 | #if defined(CONFIG_MICROCODE_AMD_EARLY) && defined(CONFIG_X86_32) | 391 | #if defined(CONFIG_MICROCODE_AMD_EARLY) && defined(CONFIG_X86_32) |
392 | /* save BSP's matching patch for early load */ | 392 | /* save BSP's matching patch for early load */ |
393 | if (cpu_data(smp_processor_id()).cpu_index == boot_cpu_data.cpu_index) { | 393 | if (cpu_data(cpu).cpu_index == boot_cpu_data.cpu_index) { |
394 | struct ucode_patch *p = find_patch(smp_processor_id()); | 394 | struct ucode_patch *p = find_patch(cpu); |
395 | if (p) { | 395 | if (p) { |
396 | memset(amd_ucode_patch, 0, PATCH_MAX_SIZE); | 396 | memset(amd_ucode_patch, 0, PATCH_MAX_SIZE); |
397 | memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data), | 397 | memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data), |
@@ -444,7 +444,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, | |||
444 | goto fw_release; | 444 | goto fw_release; |
445 | } | 445 | } |
446 | 446 | ||
447 | ret = load_microcode_amd(c->x86, fw->data, fw->size); | 447 | ret = load_microcode_amd(cpu, c->x86, fw->data, fw->size); |
448 | 448 | ||
449 | fw_release: | 449 | fw_release: |
450 | release_firmware(fw); | 450 | release_firmware(fw); |