x86/cpu: Merge Intel and AMD ppin_init() functions

[linux-2.6-microblaze.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 4edb6f0..bad0fa4 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -394,35 +394,6 @@ static void amd_detect_cmp(struct cpuinfo_x86 *c)
        per_cpu(cpu_llc_id, cpu) = c->cpu_die_id = c->phys_proc_id;
 }
 
-static void amd_detect_ppin(struct cpuinfo_x86 *c)
-{
-       unsigned long long val;
-
-       if (!cpu_has(c, X86_FEATURE_AMD_PPIN))
-               return;
-
-       /* When PPIN is defined in CPUID, still need to check PPIN_CTL MSR */
-       if (rdmsrl_safe(MSR_AMD_PPIN_CTL, &val))
-               goto clear_ppin;
-
-       /* PPIN is locked in disabled mode, clear feature bit */
-       if ((val & 3UL) == 1UL)
-               goto clear_ppin;
-
-       /* If PPIN is disabled, try to enable it */
-       if (!(val & 2UL)) {
-               wrmsrl_safe(MSR_AMD_PPIN_CTL,  val | 2UL);
-               rdmsrl_safe(MSR_AMD_PPIN_CTL, &val);
-       }
-
-       /* If PPIN_EN bit is 1, return from here; otherwise fall through */
-       if (val & 2UL)
-               return;
-
-clear_ppin:
-       clear_cpu_cap(c, X86_FEATURE_AMD_PPIN);
-}
-
 u32 amd_get_nodes_per_socket(void)
 {
        return nodes_per_socket;
@@ -947,7 +918,6 @@ static void init_amd(struct cpuinfo_x86 *c)
        amd_detect_cmp(c);
        amd_get_topology(c);
        srat_detect_node(c);
-       amd_detect_ppin(c);
 
        init_amd_cacheinfo(c);