x86/cpu: Remove pointless evaluation of x86_coreid_bits

cpuinfo_x86::x86_coreid_bits is only used by the AMD numa topology code. No
point in evaluating it on non AMD systems.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Juergen Gross <jgross@suse.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230814085112.687588373@linutronix.de

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index be4045628fd33be064edcf68f3b19238cba238bf..55efadb0e9986a9e2b66bd848d1c24a6aca90b2e 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -314,19 +314,6 @@ static void early_init_intel(struct cpuinfo_x86 *c)
                setup_clear_cpu_cap(X86_FEATURE_PGE);
        }
 
-       if (c->cpuid_level >= 0x00000001) {
-               u32 eax, ebx, ecx, edx;
-
-               cpuid(0x00000001, &eax, &ebx, &ecx, &edx);
-               /*
-                * If HTT (EDX[28]) is set EBX[16:23] contain the number of
-                * apicids which are reserved per package. Store the resulting
-                * shift value for the package management code.
-                */
-               if (edx & (1U << 28))
-                       c->x86_coreid_bits = get_count_order((ebx >> 16) & 0xff);
-       }
-
        check_memory_type_self_snoop_errata(c);
 
        /*

diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
index 05fa4ef634902293e3286705134168b40d812932..415564a6523b6e601bd4e51ae7e66aa5906a72be 100644 (file)
--- a/arch/x86/kernel/cpu/zhaoxin.c
+++ b/arch/x86/kernel/cpu/zhaoxin.c
@@ -65,20 +65,6 @@ static void early_init_zhaoxin(struct cpuinfo_x86 *c)
                set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
                set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
        }
-
-       if (c->cpuid_level >= 0x00000001) {
-               u32 eax, ebx, ecx, edx;
-
-               cpuid(0x00000001, &eax, &ebx, &ecx, &edx);
-               /*
-                * If HTT (EDX[28]) is set EBX[16:23] contain the number of
-                * apicids which are reserved per package. Store the resulting
-                * shift value for the package management code.
-                */
-               if (edx & (1U << 28))
-                       c->x86_coreid_bits = get_count_order((ebx >> 16) & 0xff);
-       }
-
 }
 
 static void init_zhaoxin(struct cpuinfo_x86 *c)