x86/cpu/topology: Rename topology_max_die_per_package()

The plural of die is dies.

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.065874205@linutronix.de

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 4b50a3a9818aec676d44da4db29fc5d4448757e1..326c8cd5aa2d2e587277207ee3f225ef7b0512a6 100644 (file)
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -834,7 +834,7 @@ static int __init cstate_init(void)
        }
 
        if (has_cstate_pkg) {
-               if (topology_max_die_per_package() > 1) {
+               if (topology_max_dies_per_package() > 1) {
                        err = perf_pmu_register(&cstate_pkg_pmu,
                                                "cstate_die", -1);
                } else {

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 7927c0b832faa4eec31f53d3330c98b858cba249..258e2cdf28fadc8d84a0574b38c000de09df802d 100644 (file)
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1893,7 +1893,7 @@ static int __init intel_uncore_init(void)
                return -ENODEV;
 
        __uncore_max_dies =
-               topology_max_packages() * topology_max_die_per_package();
+               topology_max_packages() * topology_max_dies_per_package();
 
        id = x86_match_cpu(intel_uncore_match);
        if (!id) {

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index a96496bef678bb5cc562092811e4a919340c3bf3..3f6bd3e4a763a7c067439ac941e70b2562c2b8b6 100644 (file)
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1406,7 +1406,7 @@ static int topology_gidnid_map(int nodeid, u32 gidnid)
         */
        for (i = 0; i < 8; i++) {
                if (nodeid == GIDNIDMAP(gidnid, i)) {
-                       if (topology_max_die_per_package() > 1)
+                       if (topology_max_dies_per_package() > 1)
                                die_id = i;
                        else
                                die_id = topology_phys_to_logical_pkg(i);

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 8d98d468b97618b2646f43dd2a922db7677eb4b1..fb2b1961e5a33a190ab21ce6ea7d27026ffbc18e 100644 (file)
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -674,7 +674,7 @@ static const struct attribute_group *rapl_attr_update[] = {
 
 static int __init init_rapl_pmus(void)
 {
-       int maxdie = topology_max_packages() * topology_max_die_per_package();
+       int maxdie = topology_max_packages() * topology_max_dies_per_package();
        size_t size;
 
        size = sizeof(*rapl_pmus) + maxdie * sizeof(struct rapl_pmu *);

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index f9eb7a7831f0dda56bd200e4219f6b873079cf54..6a71794bd4e234b4a3aecf0e681fba0c38d3937f 100644 (file)
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -152,7 +152,7 @@ static inline unsigned int topology_max_packages(void)
        return __max_logical_packages;
 }
 
-static inline unsigned int topology_max_die_per_package(void)
+static inline unsigned int topology_max_dies_per_package(void)
 {
        return __max_dies_per_package;
 }

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index b8fc8d1ef20dfcb6132a168425df2d7e2653afa4..b0991dde2e59d2a80b23ecdc8d2e9a10dd9547cb 100644 (file)
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -782,7 +782,7 @@ static int __init coretemp_init(void)
        if (!x86_match_cpu(coretemp_ids))
                return -ENODEV;
 
-       max_zones = topology_max_packages() * topology_max_die_per_package();
+       max_zones = topology_max_packages() * topology_max_dies_per_package();
        zone_devices = kcalloc(max_zones, sizeof(struct platform_device *),
                              GFP_KERNEL);
        if (!zone_devices)

diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
index a5e0f5c22179ff71479ae11bf6d2e5b7b387638b..b89c0dda9e5ddd46d7456e21273be2db93c9eb2e 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
@@ -242,7 +242,7 @@ static int __init intel_uncore_init(void)
                return -ENODEV;
 
        uncore_max_entries = topology_max_packages() *
-                                       topology_max_die_per_package();
+                                       topology_max_dies_per_package();
        uncore_instances = kcalloc(uncore_max_entries,
                                   sizeof(*uncore_instances), GFP_KERNEL);
        if (!uncore_instances)

diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 2feed036c1cd415ef98a7ea3437ebd5bc7429b10..00c861899a47ea9860a225befe267a4d629c1ce2 100644 (file)
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -1564,7 +1564,7 @@ struct rapl_package *rapl_add_package(int id, struct rapl_if_priv *priv, bool id
        if (id_is_cpu) {
                rp->id = topology_logical_die_id(id);
                rp->lead_cpu = id;
-               if (topology_max_die_per_package() > 1)
+               if (topology_max_dies_per_package() > 1)
                        snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d-die-%d",
                                 topology_physical_package_id(id), topology_die_id(id));
                else

diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c
index 3b04c6ec4fca0762c9508e7450fad4af989e71d6..40d664a66cdcb33f65736b4bfc933382ba01e7ca 100644 (file)
--- a/drivers/thermal/intel/intel_hfi.c
+++ b/drivers/thermal/intel/intel_hfi.c
@@ -607,7 +607,7 @@ void __init intel_hfi_init(void)
 
        /* There is one HFI instance per die/package. */
        max_hfi_instances = topology_max_packages() *
-                           topology_max_die_per_package();
+                           topology_max_dies_per_package();
 
        /*
         * This allocation may fail. CPU hotplug callbacks must check

diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c
index bc6eb0dd66a495f04ae5d0c398611895351c9b2f..4ba649370aa1a7f8a687c476c4470178541b8baf 100644 (file)
--- a/drivers/thermal/intel/intel_powerclamp.c
+++ b/drivers/thermal/intel/intel_powerclamp.c
@@ -587,7 +587,7 @@ static int powerclamp_idle_injection_register(void)
        poll_pkg_cstate_enable = false;
        if (cpumask_equal(cpu_present_mask, idle_injection_cpu_mask)) {
                ii_dev = idle_inject_register_full(idle_injection_cpu_mask, idle_inject_update);
-               if (topology_max_packages() == 1 && topology_max_die_per_package() == 1)
+               if (topology_max_packages() == 1 && topology_max_dies_per_package() == 1)
                        poll_pkg_cstate_enable = true;
        } else {
                ii_dev = idle_inject_register(idle_injection_cpu_mask);

diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index 11a7f8108bbbfeb5a92e054f203b242c340ebaf4..f6c2e5964b8f2e7ec0823097749013853b3e8016 100644 (file)
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -494,7 +494,7 @@ static int __init pkg_temp_thermal_init(void)
        if (!x86_match_cpu(pkg_temp_thermal_ids))
                return -ENODEV;
 
-       max_id = topology_max_packages() * topology_max_die_per_package();
+       max_id = topology_max_packages() * topology_max_dies_per_package();
        zones = kcalloc(max_id, sizeof(struct zone_device *),
                           GFP_KERNEL);
        if (!zones)