Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 05:26:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: intel: int340x: processor: Remove MMIO RAPL CPU hotplug support

Browse Source 
CPU0/package0 is always online and the MMIO RAPL driver runs on single
package systems only, so there is no need to handle CPU hotplug in it.

Always register a RAPL package device for package 0 and remove the
unnecessary CPU hotplug support.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://patch.msgid.link/20240930081801.28502-6-rui.zhang@intel.com
[ rjw: Subject edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Zhang Rui 2024-09-30 16:18:00 +08:00 committed by Rafael J. Wysocki
parent f517ff174a
commit bfc6819e4b
1 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c
View File

@ -19,42 +19,6 @@ static const struct rapl_mmio_regs rapl_mmio_default = {
.limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2), .limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2),
}; };
static int rapl_mmio_cpu_online(unsigned int cpu)
{
struct rapl_package *rp;
/* mmio rapl supports package 0 only for now */
if (topology_physical_package_id(cpu))
return 0;
rp = rapl_find_package_domain_cpuslocked(cpu, &rapl_mmio_priv, true);
if (!rp) {
rp = rapl_add_package_cpuslocked(cpu, &rapl_mmio_priv, true);
if (IS_ERR(rp))
return PTR_ERR(rp);
}
cpumask_set_cpu(cpu, &rp->cpumask);
return 0;
}
static int rapl_mmio_cpu_down_prep(unsigned int cpu)
{
struct rapl_package *rp;
int lead_cpu;
rp = rapl_find_package_domain_cpuslocked(cpu, &rapl_mmio_priv, true);
if (!rp)
return 0;
cpumask_clear_cpu(cpu, &rp->cpumask);
lead_cpu = cpumask_first(&rp->cpumask);
if (lead_cpu >= nr_cpu_ids)
rapl_remove_package_cpuslocked(rp);
else if (rp->lead_cpu == cpu)
rp->lead_cpu = lead_cpu;
return 0;
}
static int rapl_mmio_read_raw(int cpu, struct reg_action *ra) static int rapl_mmio_read_raw(int cpu, struct reg_action *ra)
{ {
if (!ra->reg.mmio) if (!ra->reg.mmio)
@ -82,6 +46,7 @@ static int rapl_mmio_write_raw(int cpu, struct reg_action *ra)
int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc_priv) int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc_priv)
{ {
const struct rapl_mmio_regs *rapl_regs = &rapl_mmio_default; const struct rapl_mmio_regs *rapl_regs = &rapl_mmio_default;
struct rapl_package *rp;
enum rapl_domain_reg_id reg; enum rapl_domain_reg_id reg;
enum rapl_domain_type domain; enum rapl_domain_type domain;
int ret; int ret;
@ -109,25 +74,38 @@ int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc
return PTR_ERR(rapl_mmio_priv.control_type); return PTR_ERR(rapl_mmio_priv.control_type);
} }
ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powercap/rapl:online", /* Register a RAPL package device for package 0 which is always online */
rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep); rp = rapl_find_package_domain(0, &rapl_mmio_priv, false);
if (ret < 0) { if (rp) {
powercap_unregister_control_type(rapl_mmio_priv.control_type); ret = -EEXIST;
rapl_mmio_priv.control_type = NULL; goto err;
return ret; }
rp = rapl_add_package(0, &rapl_mmio_priv, false);
if (IS_ERR(rp)) {
ret = PTR_ERR(rp);
goto err;
} }
rapl_mmio_priv.pcap_rapl_online = ret;
return 0; return 0;
err:
powercap_unregister_control_type(rapl_mmio_priv.control_type);
rapl_mmio_priv.control_type = NULL;
return ret;
} }
EXPORT_SYMBOL_GPL(proc_thermal_rapl_add); EXPORT_SYMBOL_GPL(proc_thermal_rapl_add);
void proc_thermal_rapl_remove(void) void proc_thermal_rapl_remove(void)
{ {
struct rapl_package *rp;
if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type)) if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
return; return;
cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online); rp = rapl_find_package_domain(0, &rapl_mmio_priv, false);
if (rp)
rapl_remove_package(rp);
powercap_unregister_control_type(rapl_mmio_priv.control_type); powercap_unregister_control_type(rapl_mmio_priv.control_type);
} }
EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove); EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove);