x86/cpu/topology: Get rid of cpuinfo::x86_max_cores

Now that __num_cores_per_package and __num_threads_per_package are
available, cpuinfo::x86_max_cores and the related math all over the place
can be replaced with the ready to consume data.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240213210253.176147806@linutronix.de

diff --git a/Documentation/arch/x86/topology.rst b/Documentation/arch/x86/topology.rst
index 08ebf9edbfc1ed4982e550c283a03bc00e6af345..7352ab89a55ae4fc79dfe7cee997e2345576d2fe 100644 (file)
--- a/Documentation/arch/x86/topology.rst
+++ b/Documentation/arch/x86/topology.rst
@@ -47,17 +47,21 @@ AMD nomenclature for package is 'Node'.
 
 Package-related topology information in the kernel:
 
-  - cpuinfo_x86.x86_max_cores:
+  - topology_num_threads_per_package()
 
-    The number of cores in a package. This information is retrieved via CPUID.
+    The number of threads in a package.
 
-  - cpuinfo_x86.x86_max_dies:
+  - topology_num_cores_per_package()
 
-    The number of dies in a package. This information is retrieved via CPUID.
+    The number of cores in a package.
+
+  - topology_max_dies_per_package()
+
+    The maximum number of dies in a package.
 
   - cpuinfo_x86.topo.die_id:
 
-    The physical ID of the die. This information is retrieved via CPUID.
+    The physical ID of the die.
 
   - cpuinfo_x86.topo.pkg_id:
 
@@ -96,16 +100,6 @@ are SMT- or CMT-type threads.
 AMDs nomenclature for a CMT core is "Compute Unit". The kernel always uses
 "core".
 
-Core-related topology information in the kernel:
-
-  - smp_num_siblings:
-
-    The number of threads in a core. The number of threads in a package can be
-    calculated by::
-
-       threads_per_package = cpuinfo_x86.x86_max_cores * smp_num_siblings
-
-
 Threads
 =======
 A thread is a single scheduling unit. It's the equivalent to a logical Linux

diff --git a/arch/x86/events/intel/uncore_nhmex.c b/arch/x86/events/intel/uncore_nhmex.c
index 56eea2c66cfb8cc7d9cc395e58c24a7319afc944..92da8aaa59660e2097423eee0f018bb1f195efd7 100644 (file)
--- a/arch/x86/events/intel/uncore_nhmex.c
+++ b/arch/x86/events/intel/uncore_nhmex.c
@@ -1221,8 +1221,8 @@ void nhmex_uncore_cpu_init(void)
                uncore_nhmex = true;
        else
                nhmex_uncore_mbox.event_descs = wsmex_uncore_mbox_events;
-       if (nhmex_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               nhmex_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (nhmex_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               nhmex_uncore_cbox.num_boxes = topology_num_cores_per_package();
        uncore_msr_uncores = nhmex_msr_uncores;
 }
 /* end of Nehalem-EX uncore support */

diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index 7fd4334e12a172d495bdf9353ac678f2a19f86f6..9462fd9f3b7abc2263c203651a89f01230bd3b51 100644 (file)
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -364,8 +364,8 @@ static struct intel_uncore_type *snb_msr_uncores[] = {
 void snb_uncore_cpu_init(void)
 {
        uncore_msr_uncores = snb_msr_uncores;
-       if (snb_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               snb_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (snb_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               snb_uncore_cbox.num_boxes = topology_num_cores_per_package();
 }
 
 static void skl_uncore_msr_init_box(struct intel_uncore_box *box)
@@ -428,8 +428,8 @@ static struct intel_uncore_type *skl_msr_uncores[] = {
 void skl_uncore_cpu_init(void)
 {
        uncore_msr_uncores = skl_msr_uncores;
-       if (skl_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               skl_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (skl_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               skl_uncore_cbox.num_boxes = topology_num_cores_per_package();
        snb_uncore_arb.ops = &skl_uncore_msr_ops;
 }
 

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 3f6bd3e4a763a7c067439ac941e70b2562c2b8b6..2eaf0f339849b66d0d8cc7800ed9e63e85ce4bbc 100644 (file)
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1172,8 +1172,8 @@ static struct intel_uncore_type *snbep_msr_uncores[] = {
 
 void snbep_uncore_cpu_init(void)
 {
-       if (snbep_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               snbep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (snbep_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               snbep_uncore_cbox.num_boxes = topology_num_cores_per_package();
        uncore_msr_uncores = snbep_msr_uncores;
 }
 
@@ -1845,8 +1845,8 @@ static struct intel_uncore_type *ivbep_msr_uncores[] = {
 
 void ivbep_uncore_cpu_init(void)
 {
-       if (ivbep_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               ivbep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (ivbep_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               ivbep_uncore_cbox.num_boxes = topology_num_cores_per_package();
        uncore_msr_uncores = ivbep_msr_uncores;
 }
 
@@ -2917,8 +2917,8 @@ static bool hswep_has_limit_sbox(unsigned int device)
 
 void hswep_uncore_cpu_init(void)
 {
-       if (hswep_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               hswep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (hswep_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               hswep_uncore_cbox.num_boxes = topology_num_cores_per_package();
 
        /* Detect 6-8 core systems with only two SBOXes */
        if (hswep_has_limit_sbox(HSWEP_PCU_DID))
@@ -3280,8 +3280,8 @@ static struct event_constraint bdx_uncore_pcu_constraints[] = {
 
 void bdx_uncore_cpu_init(void)
 {
-       if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (bdx_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               bdx_uncore_cbox.num_boxes = topology_num_cores_per_package();
        uncore_msr_uncores = bdx_msr_uncores;
 
        /* Detect systems with no SBOXes */

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index de1648ee2b9eeb50a85efca9344d632fef6808ef..326581df48463a030dfa570803ea98d41d19394b 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -149,8 +149,6 @@ struct cpuinfo_x86 {
        unsigned long           loops_per_jiffy;
        /* protected processor identification number */
        u64                     ppin;
-       /* cpuid returned max cores value: */
-       u16                     x86_max_cores;
        u16                     x86_clflush_size;
        /* number of cores as seen by the OS: */
        u16                     booted_cores;

diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c
index e1d118e6926e10ea443580facd492984b7fa3e99..f2241e7e96fde12e5e73d3b58fc599bbf54fa892 100644 (file)
--- a/arch/x86/kernel/cpu/cacheinfo.c
+++ b/arch/x86/kernel/cpu/cacheinfo.c
@@ -301,7 +301,7 @@ amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
        eax->split.type = types[leaf];
        eax->split.level = levels[leaf];
        eax->split.num_threads_sharing = 0;
-       eax->split.num_cores_on_die = __this_cpu_read(cpu_info.x86_max_cores) - 1;
+       eax->split.num_cores_on_die = topology_num_cores_per_package();
 
 
        if (assoc == 0xffff)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c9a1014386a93d9e1ab959272d97a0394cdf1246..05e0b31f75e9b4a18d4ad45332f1bc92f66b81fb 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1738,7 +1738,6 @@ static void identify_cpu(struct cpuinfo_x86 *c)
        c->x86_model = c->x86_stepping = 0;     /* So far unknown... */
        c->x86_vendor_id[0] = '\0'; /* Unset */
        c->x86_model_id[0] = '\0';  /* Unset */
-       c->x86_max_cores = 1;
 #ifdef CONFIG_X86_64
        c->x86_clflush_size = 64;
        c->x86_phys_bits = 36;

diff --git a/arch/x86/kernel/cpu/debugfs.c b/arch/x86/kernel/cpu/debugfs.c
index f40f3eecebc60a82088069e12d261dac53f64c80..3baf3e43583472e9d6b9ee931d91acf48303b42e 100644 (file)
--- a/arch/x86/kernel/cpu/debugfs.c
+++ b/arch/x86/kernel/cpu/debugfs.c
@@ -28,7 +28,8 @@ static int cpu_debug_show(struct seq_file *m, void *p)
        seq_printf(m, "l2c_id:              %u\n", c->topo.l2c_id);
        seq_printf(m, "amd_node_id:         %u\n", c->topo.amd_node_id);
        seq_printf(m, "amd_nodes_per_pkg:   %u\n", topology_amd_nodes_per_pkg());
-       seq_printf(m, "max_cores:           %u\n", c->x86_max_cores);
+       seq_printf(m, "num_threads:         %u\n", __num_threads_per_package);
+       seq_printf(m, "num_cores:           %u\n", __num_cores_per_package);
        seq_printf(m, "max_dies_per_pkg:    %u\n", __max_dies_per_package);
        seq_printf(m, "max_threads_per_core:%u\n", __max_threads_per_core);
        return 0;

diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
index 1e327881073f5c1574013f0e192614e0e0861186..94953d749475d025dd64efe5414a4cdbf83a63e4 100644 (file)
--- a/arch/x86/kernel/cpu/mce/inject.c
+++ b/arch/x86/kernel/cpu/mce/inject.c
@@ -430,10 +430,9 @@ static void trigger_thr_int(void *info)
 
 static u32 get_nbc_for_node(int node_id)
 {
-       struct cpuinfo_x86 *c = &boot_cpu_data;
        u32 cores_per_node;
 
-       cores_per_node = (c->x86_max_cores * __max_threads_per_core) / topology_amd_nodes_per_pkg();
+       cores_per_node = topology_num_threads_per_package() / topology_amd_nodes_per_pkg();
        return cores_per_node * node_id;
 }
 

diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 857e608af641ad88f956a687a1c789f012c0c95b..5f0414452b67e298aa6c330c79a38dd4b05d7290 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -641,7 +641,7 @@ static __init void calc_llc_size_per_core(struct cpuinfo_x86 *c)
 {
        u64 llc_size = c->x86_cache_size * 1024ULL;
 
-       do_div(llc_size, c->x86_max_cores);
+       do_div(llc_size, topology_num_cores_per_package());
        llc_size_per_core = (unsigned int)llc_size;
 }
 

diff --git a/arch/x86/kernel/cpu/topology_common.c b/arch/x86/kernel/cpu/topology_common.c
index a2c3f8f5886d73ef1eedeca269dc9f22f4c02597..a50ae8d63d1c87997e2332f00781895f9e3afc65 100644 (file)
--- a/arch/x86/kernel/cpu/topology_common.c
+++ b/arch/x86/kernel/cpu/topology_common.c
@@ -155,9 +155,6 @@ static void topo_set_ids(struct topo_scan *tscan)
        c->topo.core_id = (apicid & topo_domain_mask(TOPO_PKG_DOMAIN)) >>
                x86_topo_system.dom_shifts[TOPO_SMT_DOMAIN];
 
-       /* Maximum number of cores on this package */
-       c->x86_max_cores = topology_unit_count(apicid, TOPO_CORE_DOMAIN, TOPO_PKG_DOMAIN);
-
        c->topo.amd_node_id = tscan->amd_node_id;
 
        if (c->x86_vendor == X86_VENDOR_AMD)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 35c272cb45fb28558791ec53ccf413d7efa29b18..9c1e1219c28f9e2315cb1d89ff4efbfbe66ec068 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -564,7 +564,7 @@ static void __init build_sched_topology(void)
 void set_cpu_sibling_map(int cpu)
 {
        bool has_smt = __max_threads_per_core > 1;
-       bool has_mp = has_smt || boot_cpu_data.x86_max_cores > 1;
+       bool has_mp = has_smt || topology_num_cores_per_package() > 1;
        struct cpuinfo_x86 *c = &cpu_data(cpu);
        struct cpuinfo_x86 *o;
        int i, threads;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 2ff6deedef955ec3a77cc4f2edf0884ed518c535..da1f43999d0947d0c57246414d300b0aff5c415e 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -451,7 +451,7 @@ static int vangogh_init_smc_tables(struct smu_context *smu)
 
 #ifdef CONFIG_X86
        /* AMD x86 APU only */
-       smu->cpu_core_num = boot_cpu_data.x86_max_cores;
+       smu->cpu_core_num = topology_num_cores_per_package();
 #else
        smu->cpu_core_num = 4;
 #endif

diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 6307112c2c0c61528cd5d6af929c7b85144792ba..9ed2c4b6734edb154cdc5180e0054fb2a123e37b 100644 (file)
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -209,7 +209,7 @@ static ssize_t power1_average_show(struct device *dev,
         * With the new x86 topology modelling, x86_max_cores is the
         * compute unit number.
         */
-       cu_num = boot_cpu_data.x86_max_cores;
+       cu_num = topology_num_cores_per_package();
 
        ret = read_registers(data);
        if (ret)