Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f925ce authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpu: Unify CPU family, model, stepping calculation 



Add generic functions which calc family, model and stepping from
the CPUID_1.EAX leaf and stick them into the library we have.

Rename those which do call CPUID with the prefix "x86_cpuid" as
suggested by Paolo Bonzini.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1448273546-2567-2-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1ec21837

arch/x86/include/asm/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -36,4 +36,7 @@ extern int _debug_hotplug_cpu(int cpu, int action); 


int mwait_usable(const struct cpuinfo_x86 *);



unsigned int x86_family(unsigned int sig);

unsigned int x86_model(unsigned int sig);

unsigned int x86_stepping(unsigned int sig);

#endif /* _ASM_X86_CPU_H */

arch/x86/include/asm/microcode.h

+7 −32
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MICROCODE_H

#define _ASM_X86_MICROCODE_H



#include <asm/cpu.h>

#include <linux/earlycpio.h>



#define native_rdmsr(msr, val1, val2)			\
@@ -95,14 +96,14 @@ static inline void __exit exit_amd_microcode(void) {} 


/*

 * In early loading microcode phase on BSP, boot_cpu_data is not set up yet.

 * x86_vendor() gets vendor id for BSP.

 * x86_cpuid_vendor() gets vendor id for BSP.

 *

 * In 32 bit AP case, accessing boot_cpu_data needs linear address. To simplify

 * coding, we still use x86_vendor() to get vendor id for AP.

 * coding, we still use x86_cpuid_vendor() to get vendor id for AP.

 *

 * x86_vendor() gets vendor information directly from CPUID.

 * x86_cpuid_vendor() gets vendor information directly from CPUID.

 */

static inline int x86_vendor(void)

static inline int x86_cpuid_vendor(void)

{

	u32 eax = 0x00000000;

	u32 ebx, ecx = 0, edx;
@@ -118,40 +119,14 @@ static inline int x86_vendor(void) 
	return X86_VENDOR_UNKNOWN;

}



static inline unsigned int __x86_family(unsigned int sig)

{

	unsigned int x86;



	x86 = (sig >> 8) & 0xf;



	if (x86 == 0xf)

		x86 += (sig >> 20) & 0xff;



	return x86;

}



static inline unsigned int x86_family(void)

static inline unsigned int x86_cpuid_family(void)

{

	u32 eax = 0x00000001;

	u32 ebx, ecx = 0, edx;



	native_cpuid(&eax, &ebx, &ecx, &edx);



	return __x86_family(eax);

}



static inline unsigned int x86_model(unsigned int sig)

{

	unsigned int x86, model;



	x86 = __x86_family(sig);



	model = (sig >> 4) & 0xf;



	if (x86 == 0x6 || x86 == 0xf)

		model += ((sig >> 16) & 0xf) << 4;



	return model;

	return x86_family(eax);

}



#ifdef CONFIG_MICROCODE

arch/x86/kernel/cpu/common.c

+3 −8
Original line number Diff line number Diff line
@@ -581,14 +581,9 @@ void cpu_detect(struct cpuinfo_x86 *c) 
		u32 junk, tfms, cap0, misc;



		cpuid(0x00000001, &tfms, &misc, &junk, &cap0);

		c->x86 = (tfms >> 8) & 0xf;

		c->x86_model = (tfms >> 4) & 0xf;

		c->x86_mask = tfms & 0xf;



		if (c->x86 == 0xf)

			c->x86 += (tfms >> 20) & 0xff;

		if (c->x86 >= 0x6)

			c->x86_model += ((tfms >> 16) & 0xf) << 4;

		c->x86		= x86_family(tfms);

		c->x86_model	= x86_model(tfms);

		c->x86_mask	= x86_stepping(tfms);



		if (cap0 & (1<<19)) {

			c->x86_clflush_size = ((misc >> 8) & 0xff) * 8;

arch/x86/kernel/cpu/microcode/core.c

+6 −6
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ void __init load_ucode_bsp(void) 
	if (!have_cpuid_p())

		return;



	vendor = x86_vendor();

	family = x86_family();

	vendor = x86_cpuid_vendor();

	family = x86_cpuid_family();



	switch (vendor) {

	case X86_VENDOR_INTEL:
@@ -165,8 +165,8 @@ void load_ucode_ap(void) 
	if (!have_cpuid_p())

		return;



	vendor = x86_vendor();

	family = x86_family();

	vendor = x86_cpuid_vendor();

	family = x86_cpuid_family();



	switch (vendor) {

	case X86_VENDOR_INTEL:
@@ -206,8 +206,8 @@ void reload_early_microcode(void) 
{

	int vendor, family;



	vendor = x86_vendor();

	family = x86_family();

	vendor = x86_cpuid_vendor();

	family = x86_cpuid_family();



	switch (vendor) {

	case X86_VENDOR_INTEL:

arch/x86/kernel/cpu/microcode/intel.c

+6 −10
Original line number Diff line number Diff line
@@ -145,10 +145,10 @@ matching_model_microcode(struct microcode_header_intel *mc_header, 
	int ext_sigcount, i;

	struct extended_signature *ext_sig;



	fam   = __x86_family(sig);

	fam   = x86_family(sig);

	model = x86_model(sig);



	fam_ucode   = __x86_family(mc_header->sig);

	fam_ucode   = x86_family(mc_header->sig);

	model_ucode = x86_model(mc_header->sig);



	if (fam == fam_ucode && model == model_ucode)
@@ -163,7 +163,7 @@ matching_model_microcode(struct microcode_header_intel *mc_header, 
	ext_sigcount = ext_header->count;



	for (i = 0; i < ext_sigcount; i++) {

		fam_ucode   = __x86_family(ext_sig->sig);

		fam_ucode   = x86_family(ext_sig->sig);

		model_ucode = x86_model(ext_sig->sig);



		if (fam == fam_ucode && model == model_ucode)
@@ -365,7 +365,7 @@ static int collect_cpu_info_early(struct ucode_cpu_info *uci) 
	native_cpuid(&eax, &ebx, &ecx, &edx);

	csig.sig = eax;



	family = __x86_family(csig.sig);

	family = x86_family(csig.sig);

	model  = x86_model(csig.sig);



	if ((model >= 5) || (family > 6)) {
@@ -521,16 +521,12 @@ static bool __init load_builtin_intel_microcode(struct cpio_data *cp) 
{

#ifdef CONFIG_X86_64

	unsigned int eax = 0x00000001, ebx, ecx = 0, edx;

	unsigned int family, model, stepping;

	char name[30];



	native_cpuid(&eax, &ebx, &ecx, &edx);



	family   = __x86_family(eax);

	model    = x86_model(eax);

	stepping = eax & 0xf;



	sprintf(name, "intel-ucode/%02x-%02x-%02x", family, model, stepping);

	sprintf(name, "intel-ucode/%02x-%02x-%02x",

		      x86_family(eax), x86_model(eax), x86_stepping(eax));



	return get_builtin_firmware(cp, name);

#else