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: Borislav Petkov <bp@suse.de>
Reviewed-by: Paolo 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: Ingo Molnar <mingo@kernel.org>

2 files changed, 12 insertions, 16 deletions

diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 7fc27f1cca58..3aaffb601c91 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -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:
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index ce47402eb2f9..ee81c544ee0d 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -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