]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ACPI: CPPC: Rename cppc_get_perf() to cppc_get_reg_val()
authorLifeng Zheng <zhenglifeng1@huawei.com>
Fri, 11 Apr 2025 09:38:50 +0000 (17:38 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Apr 2025 20:01:30 +0000 (22:01 +0200)
Rename cppc_get_perf() to cppc_get_reg_val() as a generic function to
read CPPC registers.

Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20250411093855.982491-4-zhenglifeng1@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/cppc_acpi.c

index a0774517642f2ce239c21c2da585188d3caf75d3..c460272b86c3d9448ed00088922e69afbb5898da 100644 (file)
@@ -1179,16 +1179,16 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val)
        return ret_val;
 }
 
-static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
+static int cppc_get_reg_val(int cpu, enum cppc_regs reg_idx, u64 *val)
 {
-       struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);
+       struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu);
        struct cpc_register_resource *reg;
 
-       if (perf == NULL)
+       if (val == NULL)
                return -EINVAL;
 
        if (!cpc_desc) {
-               pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
+               pr_debug("No CPC descriptor for CPU:%d\n", cpu);
                return -ENODEV;
        }
 
@@ -1202,7 +1202,7 @@ static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
        }
 
        if (CPC_IN_PCC(reg)) {
-               int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
+               int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
                struct cppc_pcc_data *pcc_ss_data = NULL;
                int ret;
 
@@ -1216,7 +1216,7 @@ static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
                down_write(&pcc_ss_data->pcc_lock);
 
                if (send_pcc_cmd(pcc_ss_id, CMD_READ) >= 0)
-                       ret = cpc_read(cpunum, reg, perf);
+                       ret = cpc_read(cpu, reg, val);
                else
                        ret = -EIO;
 
@@ -1225,7 +1225,7 @@ static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
                return ret;
        }
 
-       return cpc_read(cpunum, reg, perf);
+       return cpc_read(cpu, reg, val);
 }
 
 /**
@@ -1237,7 +1237,7 @@ static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
  */
 int cppc_get_desired_perf(int cpunum, u64 *desired_perf)
 {
-       return cppc_get_perf(cpunum, DESIRED_PERF, desired_perf);
+       return cppc_get_reg_val(cpunum, DESIRED_PERF, desired_perf);
 }
 EXPORT_SYMBOL_GPL(cppc_get_desired_perf);
 
@@ -1250,7 +1250,7 @@ EXPORT_SYMBOL_GPL(cppc_get_desired_perf);
  */
 int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)
 {
-       return cppc_get_perf(cpunum, NOMINAL_PERF, nominal_perf);
+       return cppc_get_reg_val(cpunum, NOMINAL_PERF, nominal_perf);
 }
 
 /**
@@ -1262,7 +1262,7 @@ int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)
  */
 int cppc_get_highest_perf(int cpunum, u64 *highest_perf)
 {
-       return cppc_get_perf(cpunum, HIGHEST_PERF, highest_perf);
+       return cppc_get_reg_val(cpunum, HIGHEST_PERF, highest_perf);
 }
 EXPORT_SYMBOL_GPL(cppc_get_highest_perf);
 
@@ -1275,7 +1275,7 @@ EXPORT_SYMBOL_GPL(cppc_get_highest_perf);
  */
 int cppc_get_epp_perf(int cpunum, u64 *epp_perf)
 {
-       return cppc_get_perf(cpunum, ENERGY_PERF, epp_perf);
+       return cppc_get_reg_val(cpunum, ENERGY_PERF, epp_perf);
 }
 EXPORT_SYMBOL_GPL(cppc_get_epp_perf);