iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/cpu/topology: Rename topology_max_die_per_package()

Browse Source 
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
This commit is contained in:
Thomas Gleixner 2024-02-13 22:06:13 +01:00
parent 8078f4d610
commit bd745d1c41
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/events/intel/cstate.c
View File

@ -834,7 +834,7 @@ static int __init cstate_init(void)
} }
if (has_cstate_pkg) { 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, err = perf_pmu_register(&cstate_pkg_pmu,
"cstate_die", -1); "cstate_die", -1);
} else { } else {

2
arch/x86/events/intel/uncore.c
View File

@ -1893,7 +1893,7 @@ static int __init intel_uncore_init(void)
return -ENODEV; return -ENODEV;
__uncore_max_dies = __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); id = x86_match_cpu(intel_uncore_match);
if (!id) { if (!id) {

2
arch/x86/events/intel/uncore_snbep.c
View File

@ -1406,7 +1406,7 @@ static int topology_gidnid_map(int nodeid, u32 gidnid)
*/ */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (nodeid == GIDNIDMAP(gidnid, i)) { if (nodeid == GIDNIDMAP(gidnid, i)) {
if (topology_max_die_per_package() > 1) if (topology_max_dies_per_package() > 1)
die_id = i; die_id = i;
else else
die_id = topology_phys_to_logical_pkg(i); die_id = topology_phys_to_logical_pkg(i);

2
arch/x86/events/rapl.c
View File

@ -674,7 +674,7 @@ static const struct attribute_group *rapl_attr_update[] = {
static int __init init_rapl_pmus(void) 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_t size;
size = sizeof(*rapl_pmus) + maxdie * sizeof(struct rapl_pmu *); size = sizeof(*rapl_pmus) + maxdie * sizeof(struct rapl_pmu *);

2
arch/x86/include/asm/topology.h
View File

@ -152,7 +152,7 @@ static inline unsigned int topology_max_packages(void)
return __max_logical_packages; 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; return __max_dies_per_package;
} }

2
drivers/hwmon/coretemp.c
View File

@ -782,7 +782,7 @@ static int __init coretemp_init(void)
if (!x86_match_cpu(coretemp_ids)) if (!x86_match_cpu(coretemp_ids))
return -ENODEV; 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 *), zone_devices = kcalloc(max_zones, sizeof(struct platform_device *),
GFP_KERNEL); GFP_KERNEL);
if (!zone_devices) if (!zone_devices)

2
drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c
View File

@ -242,7 +242,7 @@ static int __init intel_uncore_init(void)
return -ENODEV; return -ENODEV;
uncore_max_entries = topology_max_packages() * uncore_max_entries = topology_max_packages() *
topology_max_die_per_package(); topology_max_dies_per_package();
uncore_instances = kcalloc(uncore_max_entries, uncore_instances = kcalloc(uncore_max_entries,
sizeof(*uncore_instances), GFP_KERNEL); sizeof(*uncore_instances), GFP_KERNEL);
if (!uncore_instances) if (!uncore_instances)

2
drivers/powercap/intel_rapl_common.c
View File

@ -1564,7 +1564,7 @@ struct rapl_package *rapl_add_package(int id, struct rapl_if_priv *priv, bool id
if (id_is_cpu) { if (id_is_cpu) {
rp->id = topology_logical_die_id(id); rp->id = topology_logical_die_id(id);
rp->lead_cpu = 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", snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d-die-%d",
topology_physical_package_id(id), topology_die_id(id)); topology_physical_package_id(id), topology_die_id(id));
else else

2
drivers/thermal/intel/intel_hfi.c
View File

@ -607,7 +607,7 @@ void __init intel_hfi_init(void)
/* There is one HFI instance per die/package. */ /* There is one HFI instance per die/package. */
max_hfi_instances = topology_max_packages() * 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 * This allocation may fail. CPU hotplug callbacks must check

2
drivers/thermal/intel/intel_powerclamp.c
View File

@ -587,7 +587,7 @@ static int powerclamp_idle_injection_register(void)
poll_pkg_cstate_enable = false; poll_pkg_cstate_enable = false;
if (cpumask_equal(cpu_present_mask, idle_injection_cpu_mask)) { if (cpumask_equal(cpu_present_mask, idle_injection_cpu_mask)) {
ii_dev = idle_inject_register_full(idle_injection_cpu_mask, idle_inject_update); 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; poll_pkg_cstate_enable = true;
} else { } else {
ii_dev = idle_inject_register(idle_injection_cpu_mask); ii_dev = idle_inject_register(idle_injection_cpu_mask);

2
drivers/thermal/intel/x86_pkg_temp_thermal.c
View File

@ -494,7 +494,7 @@ static int __init pkg_temp_thermal_init(void)
if (!x86_match_cpu(pkg_temp_thermal_ids)) if (!x86_match_cpu(pkg_temp_thermal_ids))
return -ENODEV; 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 *), zones = kcalloc(max_id, sizeof(struct zone_device *),
GFP_KERNEL); GFP_KERNEL);
if (!zones) if (!zones)