Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1508149

[PATCH 06/12] x86/microcode/AMD: Hand down the CPU family

Show all headers | View raw

From: Borislav Petkov <bp@suse.de>

Will be needed in a following patch.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 arch/x86/include/asm/microcode_amd.h | 9 +++++----
 arch/x86/kernel/cpu/microcode/amd.c  | 6 +++---
 arch/x86/kernel/cpu/microcode/core.c | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h
index 15eb75484cc0..ad6a7be3b1f8 100644
--- a/arch/x86/include/asm/microcode_amd.h
+++ b/arch/x86/include/asm/microcode_amd.h
@@ -65,13 +65,14 @@ extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, s
 
 #ifdef CONFIG_MICROCODE_AMD
 extern void __init load_ucode_amd_bsp(unsigned int family);
-extern void load_ucode_amd_ap(void);
-extern int __init save_microcode_in_initrd_amd(void);
+extern void load_ucode_amd_ap(unsigned int family);
+extern int __init save_microcode_in_initrd_amd(unsigned int family);
 void reload_ucode_amd(void);
 #else
 static inline void __init load_ucode_amd_bsp(unsigned int family) {}
-static inline void load_ucode_amd_ap(void) {}
-static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }
+static inline void load_ucode_amd_ap(unsigned int family) {}
+static inline int __init
+save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; }
 void reload_ucode_amd(void) {}
 #endif
 
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 8cb20e3e9436..bb16418ecaa9 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -308,7 +308,7 @@ void __init load_ucode_amd_bsp(unsigned int family)
  * In save_microcode_in_initrd_amd() BSP's patch is copied to amd_ucode_patch,
  * which is used upon resume from suspend.
  */
-void load_ucode_amd_ap(void)
+void load_ucode_amd_ap(unsigned int family)
 {
 	struct microcode_amd *mc;
 	size_t *usize;
@@ -346,7 +346,7 @@ static void __init get_bsp_sig(void)
 		smp_call_function_single(bsp, collect_cpu_sig_on_bsp, NULL, 1);
 }
 #else
-void load_ucode_amd_ap(void)
+void load_ucode_amd_ap(unsigned int family)
 {
 	struct equiv_cpu_entry *eq;
 	struct microcode_amd *mc;
@@ -395,7 +395,7 @@ void load_ucode_amd_ap(void)
 }
 #endif
 
-int __init save_microcode_in_initrd_amd(void)
+int __init save_microcode_in_initrd_amd(unsigned int family)
 {
 	unsigned long cont;
 	int retval = 0;
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 55a2b24b2bdd..b67145dcfdaf 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -169,7 +169,7 @@ void load_ucode_ap(void)
 		break;
 	case X86_VENDOR_AMD:
 		if (family >= 0x10)
-			load_ucode_amd_ap();
+			load_ucode_amd_ap(family);
 		break;
 	default:
 		break;
@@ -187,7 +187,7 @@ static int __init save_microcode_in_initrd(void)
 		break;
 	case X86_VENDOR_AMD:
 		if (c->x86 >= 0x10)
-			return save_microcode_in_initrd_amd();
+			return save_microcode_in_initrd_amd(c->x86);
 		break;
 	default:
 		break;
-- 
2.10.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] x86/microcode: Rework microcode loading Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
  [PATCH 07/12] x86/microcode: Issue the debug printk on resume only on success Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode: Issue the debug printk on resume  only on success tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
  [PATCH 01/12] x86/microcode: Run the AP-loading routine only on the application processors Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode: Run the AP-loading routine only  on the application processors tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:30 +0200
  [PATCH 09/12] x86/microcode/AMD: Retract functions Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode/amd: Move private inlines to .c  and mark local functions static tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
  [PATCH 08/12] x86/microcode: Collect CPU info on resume Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode: Collect CPU info on resume tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
  [PATCH 10/12] x86/microcode/intel: Remove intel_lib.c Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode/intel: Remove intel_lib.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
  [PATCH 06/12] x86/microcode/AMD: Hand down the CPU family Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode/amd: Hand down the CPU family tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200
  [PATCH 02/12] x86/microcode: Move driver authors to CREDITS Borislav Petkov <bp@alien8.de> - 2016-10-25 12:00 +0200
    [tip:x86/microcode] x86/microcode: Move driver authors to CREDITS tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-10-25 18:40 +0200

csiph-web