Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpu updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Improved CPU ID handling code and related enhancements (Borislav
     Petkov)

   - RDRAND fix (Len Brown)"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Replace RDRAND forced-reseed with simple sanity check
  x86/MSR: Chop off lower 32-bit value
  x86/cpu: Fix MSR value truncation issue
  x86/cpu/amd, kvm: Satisfy guest kernel reads of IC_CFG MSR
  kvm: Add accessors for guest CPU's family, model, stepping
  x86/cpu: Unify CPU family, model, stepping calculation

1 files changed, 6 insertions, 10 deletions

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