| Message ID | 20250211103737.447704-2-sumitg@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support Autonomous Selection mode in cppc_cpufreq | expand |
Hi Sumit,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20250210]
[also build test ERROR on linus/master v6.14-rc2]
[cannot apply to rafael-pm/linux-next rafael-pm/bleeding-edge v6.14-rc2 v6.14-rc1 v6.13]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sumit-Gupta/ACPI-CPPC-add-read-perf-ctrls-api-and-rename-few-existing/20250211-184154
base: next-20250210
patch link: https://lore.kernel.org/r/20250211103737.447704-2-sumitg%40nvidia.com
patch subject: [Patch 1/5] ACPI: CPPC: add read perf ctrls api and rename few existing
config: x86_64-buildonly-randconfig-005-20250212 (https://download.01.org/0day-ci/archive/20250212/202502121512.r83JqnGm-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/202502121512.r83JqnGm-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502121512.r83JqnGm-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/cpufreq/amd-pstate.c: In function 'shmem_cppc_enable':
>> drivers/cpufreq/amd-pstate.c:395:31: error: implicit declaration of function 'cppc_set_perf'; did you mean 'cppc_set_epp_perf'? [-Werror=implicit-function-declaration]
395 | ret = cppc_set_perf(cpu, &perf_ctrls);
| ^~~~~~~~~~~~~
| cppc_set_epp_perf
cc1: some warnings being treated as errors
vim +395 drivers/cpufreq/amd-pstate.c
ec437d71db77a1 Huang Rui 2021-12-24 377
7fb463aac84577 Dhananjay Ugwekar 2024-10-23 378 static int shmem_cppc_enable(bool enable)
e059c184da47e9 Huang Rui 2021-12-24 379 {
e059c184da47e9 Huang Rui 2021-12-24 380 int cpu, ret = 0;
ffa5096a7c3386 Perry Yuan 2023-01-31 381 struct cppc_perf_ctrls perf_ctrls;
e059c184da47e9 Huang Rui 2021-12-24 382
217e67784eab30 Wyes Karny 2023-05-30 383 if (enable == cppc_enabled)
217e67784eab30 Wyes Karny 2023-05-30 384 return 0;
217e67784eab30 Wyes Karny 2023-05-30 385
e059c184da47e9 Huang Rui 2021-12-24 386 for_each_present_cpu(cpu) {
e059c184da47e9 Huang Rui 2021-12-24 387 ret = cppc_set_enable(cpu, enable);
e059c184da47e9 Huang Rui 2021-12-24 388 if (ret)
e059c184da47e9 Huang Rui 2021-12-24 389 return ret;
ffa5096a7c3386 Perry Yuan 2023-01-31 390
ffa5096a7c3386 Perry Yuan 2023-01-31 391 /* Enable autonomous mode for EPP */
ffa5096a7c3386 Perry Yuan 2023-01-31 392 if (cppc_state == AMD_PSTATE_ACTIVE) {
ffa5096a7c3386 Perry Yuan 2023-01-31 393 /* Set desired perf as zero to allow EPP firmware control */
ffa5096a7c3386 Perry Yuan 2023-01-31 394 perf_ctrls.desired_perf = 0;
ffa5096a7c3386 Perry Yuan 2023-01-31 @395 ret = cppc_set_perf(cpu, &perf_ctrls);
ffa5096a7c3386 Perry Yuan 2023-01-31 396 if (ret)
ffa5096a7c3386 Perry Yuan 2023-01-31 397 return ret;
ffa5096a7c3386 Perry Yuan 2023-01-31 398 }
e059c184da47e9 Huang Rui 2021-12-24 399 }
e059c184da47e9 Huang Rui 2021-12-24 400
217e67784eab30 Wyes Karny 2023-05-30 401 cppc_enabled = enable;
e059c184da47e9 Huang Rui 2021-12-24 402 return ret;
e059c184da47e9 Huang Rui 2021-12-24 403 }
e059c184da47e9 Huang Rui 2021-12-24 404
Hi Sumit, kernel test robot noticed the following build errors: [auto build test ERROR on next-20250210] [also build test ERROR on linus/master v6.14-rc2] [cannot apply to rafael-pm/linux-next rafael-pm/bleeding-edge v6.14-rc2 v6.14-rc1 v6.13] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Sumit-Gupta/ACPI-CPPC-add-read-perf-ctrls-api-and-rename-few-existing/20250211-184154 base: next-20250210 patch link: https://lore.kernel.org/r/20250211103737.447704-2-sumitg%40nvidia.com patch subject: [Patch 1/5] ACPI: CPPC: add read perf ctrls api and rename few existing config: x86_64-buildonly-randconfig-002-20250212 (https://download.01.org/0day-ci/archive/20250212/202502121658.IcwbwB0y-lkp@intel.com/config) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250212/202502121658.IcwbwB0y-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202502121658.IcwbwB0y-lkp@intel.com/ All error/warnings (new ones prefixed by >>): >> drivers/cpufreq/amd-pstate.c:395:10: error: call to undeclared function 'cppc_set_perf'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 395 | ret = cppc_set_perf(cpu, &perf_ctrls); | ^ drivers/cpufreq/amd-pstate.c:395:10: note: did you mean 'cppc_set_epp_perf'? include/acpi/cppc_acpi.h:161:12: note: 'cppc_set_epp_perf' declared here 161 | extern int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable); | ^ drivers/cpufreq/amd-pstate.c:498:9: error: call to undeclared function 'cppc_set_perf'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 498 | return cppc_set_perf(cpudata->cpu, &perf_ctrls); | ^ 2 errors generated. -- >> drivers/acpi/cppc_acpi.c:1734:6: warning: variable 'energy_perf' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] 1734 | if (CPC_SUPPORTED(energy_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:129:28: note: expanded from macro 'CPC_SUPPORTED' 129 | #define CPC_SUPPORTED(cpc) ((cpc)->type == ACPI_TYPE_INTEGER ? \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 130 | !!(cpc)->cpc_entry.int_value : \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 131 | !IS_NULL_REG(&(cpc)->cpc_entry.reg)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1736:28: note: uninitialized use occurs here 1736 | perf_ctrls->energy_perf = energy_perf; | ^~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1734:2: note: remove the 'if' if its condition is always true 1734 | if (CPC_SUPPORTED(energy_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1735 | cpc_read(cpu, energy_perf_reg, &energy_perf); drivers/acpi/cppc_acpi.c:1689:41: note: initialize the variable 'energy_perf' to silence this warning 1689 | u64 max, min, desired_perf, energy_perf; | ^ | = 0 >> drivers/acpi/cppc_acpi.c:1730:6: warning: variable 'desired_perf' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] 1730 | if (CPC_SUPPORTED(desired_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:129:28: note: expanded from macro 'CPC_SUPPORTED' 129 | #define CPC_SUPPORTED(cpc) ((cpc)->type == ACPI_TYPE_INTEGER ? \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 130 | !!(cpc)->cpc_entry.int_value : \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 131 | !IS_NULL_REG(&(cpc)->cpc_entry.reg)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1732:29: note: uninitialized use occurs here 1732 | perf_ctrls->desired_perf = desired_perf; | ^~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1730:2: note: remove the 'if' if its condition is always true 1730 | if (CPC_SUPPORTED(desired_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1731 | cpc_read(cpu, desired_perf_reg, &desired_perf); drivers/acpi/cppc_acpi.c:1689:28: note: initialize the variable 'desired_perf' to silence this warning 1689 | u64 max, min, desired_perf, energy_perf; | ^ | = 0 >> drivers/acpi/cppc_acpi.c:1726:6: warning: variable 'min' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] 1726 | if (CPC_SUPPORTED(min_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:129:28: note: expanded from macro 'CPC_SUPPORTED' 129 | #define CPC_SUPPORTED(cpc) ((cpc)->type == ACPI_TYPE_INTEGER ? \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 130 | !!(cpc)->cpc_entry.int_value : \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 131 | !IS_NULL_REG(&(cpc)->cpc_entry.reg)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1728:25: note: uninitialized use occurs here 1728 | perf_ctrls->min_perf = min; | ^~~ drivers/acpi/cppc_acpi.c:1726:2: note: remove the 'if' if its condition is always true 1726 | if (CPC_SUPPORTED(min_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1727 | cpc_read(cpu, min_perf_reg, &min); drivers/acpi/cppc_acpi.c:1689:14: note: initialize the variable 'min' to silence this warning 1689 | u64 max, min, desired_perf, energy_perf; | ^ | = 0 >> drivers/acpi/cppc_acpi.c:1722:6: warning: variable 'max' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] 1722 | if (CPC_SUPPORTED(max_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:129:28: note: expanded from macro 'CPC_SUPPORTED' 129 | #define CPC_SUPPORTED(cpc) ((cpc)->type == ACPI_TYPE_INTEGER ? \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 130 | !!(cpc)->cpc_entry.int_value : \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 131 | !IS_NULL_REG(&(cpc)->cpc_entry.reg)) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/acpi/cppc_acpi.c:1724:25: note: uninitialized use occurs here 1724 | perf_ctrls->max_perf = max; | ^~~ drivers/acpi/cppc_acpi.c:1722:2: note: remove the 'if' if its condition is always true 1722 | if (CPC_SUPPORTED(max_perf_reg)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1723 | cpc_read(cpu, max_perf_reg, &max); drivers/acpi/cppc_acpi.c:1689:9: note: initialize the variable 'max' to silence this warning 1689 | u64 max, min, desired_perf, energy_perf; | ^ | = 0 4 warnings generated. -- >> drivers/acpi/cppc_acpi.c:1685: warning: expecting prototype for cppc_get_perf(). Prototype was for cppc_get_perf_ctrls() instead vim +/cppc_set_perf +395 drivers/cpufreq/amd-pstate.c ec437d71db77a1 Huang Rui 2021-12-24 377 7fb463aac84577 Dhananjay Ugwekar 2024-10-23 378 static int shmem_cppc_enable(bool enable) e059c184da47e9 Huang Rui 2021-12-24 379 { e059c184da47e9 Huang Rui 2021-12-24 380 int cpu, ret = 0; ffa5096a7c3386 Perry Yuan 2023-01-31 381 struct cppc_perf_ctrls perf_ctrls; e059c184da47e9 Huang Rui 2021-12-24 382 217e67784eab30 Wyes Karny 2023-05-30 383 if (enable == cppc_enabled) 217e67784eab30 Wyes Karny 2023-05-30 384 return 0; 217e67784eab30 Wyes Karny 2023-05-30 385 e059c184da47e9 Huang Rui 2021-12-24 386 for_each_present_cpu(cpu) { e059c184da47e9 Huang Rui 2021-12-24 387 ret = cppc_set_enable(cpu, enable); e059c184da47e9 Huang Rui 2021-12-24 388 if (ret) e059c184da47e9 Huang Rui 2021-12-24 389 return ret; ffa5096a7c3386 Perry Yuan 2023-01-31 390 ffa5096a7c3386 Perry Yuan 2023-01-31 391 /* Enable autonomous mode for EPP */ ffa5096a7c3386 Perry Yuan 2023-01-31 392 if (cppc_state == AMD_PSTATE_ACTIVE) { ffa5096a7c3386 Perry Yuan 2023-01-31 393 /* Set desired perf as zero to allow EPP firmware control */ ffa5096a7c3386 Perry Yuan 2023-01-31 394 perf_ctrls.desired_perf = 0; ffa5096a7c3386 Perry Yuan 2023-01-31 @395 ret = cppc_set_perf(cpu, &perf_ctrls); ffa5096a7c3386 Perry Yuan 2023-01-31 396 if (ret) ffa5096a7c3386 Perry Yuan 2023-01-31 397 return ret; ffa5096a7c3386 Perry Yuan 2023-01-31 398 } e059c184da47e9 Huang Rui 2021-12-24 399 } e059c184da47e9 Huang Rui 2021-12-24 400 217e67784eab30 Wyes Karny 2023-05-30 401 cppc_enabled = enable; e059c184da47e9 Huang Rui 2021-12-24 402 return ret; e059c184da47e9 Huang Rui 2021-12-24 403 } e059c184da47e9 Huang Rui 2021-12-24 404
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index f193e713825a..297e689f8214 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -59,7 +59,7 @@ struct cppc_pcc_data { /* * Lock to provide controlled access to the PCC channel. * - * For performance critical usecases(currently cppc_set_perf) + * For performance critical usecases(currently cppc_set_perf_ctrls) * We need to take read_lock and check if channel belongs to OSPM * before reading or writing to PCC subspace * We need to take write_lock before transferring the channel @@ -169,8 +169,8 @@ show_cppc_data(cppc_get_perf_caps, cppc_perf_caps, guaranteed_perf); show_cppc_data(cppc_get_perf_caps, cppc_perf_caps, lowest_freq); show_cppc_data(cppc_get_perf_caps, cppc_perf_caps, nominal_freq); -show_cppc_data(cppc_get_perf_ctrs, cppc_perf_fb_ctrs, reference_perf); -show_cppc_data(cppc_get_perf_ctrs, cppc_perf_fb_ctrs, wraparound_time); +show_cppc_data(cppc_get_perf_fb_ctrs, cppc_perf_fb_ctrs, reference_perf); +show_cppc_data(cppc_get_perf_fb_ctrs, cppc_perf_fb_ctrs, wraparound_time); /* Check for valid access_width, otherwise, fallback to using bit_width */ #define GET_BIT_WIDTH(reg) ((reg)->access_width ? (8 << ((reg)->access_width - 1)) : (reg)->bit_width) @@ -189,7 +189,7 @@ static ssize_t show_feedback_ctrs(struct kobject *kobj, struct cppc_perf_fb_ctrs fb_ctrs = {0}; int ret; - ret = cppc_get_perf_ctrs(cpc_ptr->cpu_id, &fb_ctrs); + ret = cppc_get_perf_fb_ctrs(cpc_ptr->cpu_id, &fb_ctrs); if (ret) return ret; @@ -1360,7 +1360,7 @@ EXPORT_SYMBOL_GPL(cppc_get_perf_caps); * * CPPC has flexibility about how CPU performance counters are accessed. * One of the choices is PCC regions, which can have a high access latency. This - * routine allows callers of cppc_get_perf_ctrs() to know this ahead of time. + * routine allows callers of cppc_get_perf_fb_ctrs() to know this ahead of time. * * Return: true if any of the counters are in PCC regions, false otherwise */ @@ -1398,13 +1398,13 @@ bool cppc_perf_ctrs_in_pcc(void) EXPORT_SYMBOL_GPL(cppc_perf_ctrs_in_pcc); /** - * cppc_get_perf_ctrs - Read a CPU's performance feedback counters. + * cppc_get_perf_fb_ctrs - Read a CPU's performance feedback counters. * @cpunum: CPU from which to read counters. * @perf_fb_ctrs: ptr to cppc_perf_fb_ctrs. See cppc_acpi.h * * Return: 0 for success with perf_fb_ctrs populated else -ERRNO. */ -int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) +int cppc_get_perf_fb_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) { struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum); struct cpc_register_resource *delivered_reg, *reference_reg, @@ -1475,7 +1475,7 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) up_write(&pcc_ss_data->pcc_lock); return ret; } -EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs); +EXPORT_SYMBOL_GPL(cppc_get_perf_fb_ctrs); /* * Set Energy Performance Preference Register value through @@ -1674,15 +1674,82 @@ int cppc_set_enable(int cpu, bool enable) return cpc_write(cpu, enable_reg, enable); } EXPORT_SYMBOL_GPL(cppc_set_enable); +/** + * cppc_get_perf - Get a CPU's performance controls. + * @cpu: CPU for which to get performance controls. + * @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h + * + * Return: 0 for success with perf_ctrls, -ERRNO otherwise. + */ +int cppc_get_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls) +{ + struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu); + struct cpc_register_resource *desired_perf_reg, *min_perf_reg, *max_perf_reg, + *energy_perf_reg; + u64 max, min, desired_perf, energy_perf; + int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu); + struct cppc_pcc_data *pcc_ss_data = NULL; + int ret = 0, regs_in_pcc = 0; + + if (!cpc_desc) { + pr_debug("No CPC descriptor for CPU:%d\n", cpu); + return -ENODEV; + } + + desired_perf_reg = &cpc_desc->cpc_regs[DESIRED_PERF]; + min_perf_reg = &cpc_desc->cpc_regs[MIN_PERF]; + max_perf_reg = &cpc_desc->cpc_regs[MAX_PERF]; + energy_perf_reg = &cpc_desc->cpc_regs[ENERGY_PERF]; + + /* Are any of the regs PCC ?*/ + if (CPC_IN_PCC(desired_perf_reg) || CPC_IN_PCC(min_perf_reg) || + CPC_IN_PCC(max_perf_reg) || CPC_IN_PCC(energy_perf_reg)) { + if (pcc_ss_id < 0) { + pr_debug("Invalid pcc_ss_id\n"); + return -ENODEV; + } + pcc_ss_data = pcc_data[pcc_ss_id]; + regs_in_pcc = 1; + down_write(&pcc_ss_data->pcc_lock); + /* Ring doorbell once to update PCC subspace */ + if (send_pcc_cmd(pcc_ss_id, CMD_READ) < 0) { + ret = -EIO; + goto out_err; + } + } + + /* Read optional elements if present */ + if (CPC_SUPPORTED(max_perf_reg)) + cpc_read(cpu, max_perf_reg, &max); + perf_ctrls->max_perf = max; + + if (CPC_SUPPORTED(min_perf_reg)) + cpc_read(cpu, min_perf_reg, &min); + perf_ctrls->min_perf = min; + + if (CPC_SUPPORTED(desired_perf_reg)) + cpc_read(cpu, desired_perf_reg, &desired_perf); + perf_ctrls->desired_perf = desired_perf; + + if (CPC_SUPPORTED(energy_perf_reg)) + cpc_read(cpu, energy_perf_reg, &energy_perf); + perf_ctrls->energy_perf = energy_perf; + +out_err: + if (regs_in_pcc) + up_write(&pcc_ss_data->pcc_lock); + return ret; +} +EXPORT_SYMBOL_GPL(cppc_get_perf_ctrls); /** - * cppc_set_perf - Set a CPU's performance controls. + * cppc_set_perf_ctrls - Set a CPU's performance controls. * @cpu: CPU for which to set performance controls. * @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h * * Return: 0 for success, -ERRNO otherwise. */ -int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls) +int cppc_set_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls) { struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu); struct cpc_register_resource *desired_reg, *min_perf_reg, *max_perf_reg; @@ -1746,7 +1813,7 @@ int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls) /* * This is Phase-II where we transfer the ownership of PCC to Platform * - * Short Summary: Basically if we think of a group of cppc_set_perf + * Short Summary: Basically if we think of a group of cppc_set_perf_ctrls * requests that happened in short overlapping interval. The last CPU to * come out of Phase-I will enter Phase-II and ring the doorbell. * @@ -1805,7 +1872,7 @@ int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls) } return ret; } -EXPORT_SYMBOL_GPL(cppc_set_perf); +EXPORT_SYMBOL_GPL(cppc_set_perf_ctrls); /** * cppc_get_transition_latency - returns frequency transition latency in ns diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index b3d74f9adcf0..17c49653a3c4 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -90,7 +90,7 @@ static void cppc_scale_freq_workfn(struct kthread_work *work) cppc_fi = container_of(work, struct cppc_freq_invariance, work); cpu_data = cppc_fi->cpu_data; - if (cppc_get_perf_ctrs(cppc_fi->cpu, &fb_ctrs)) { + if (cppc_get_perf_fb_ctrs(cppc_fi->cpu, &fb_ctrs)) { pr_warn("%s: failed to read perf counters\n", __func__); return; } @@ -125,7 +125,7 @@ static void cppc_scale_freq_tick(void) struct cppc_freq_invariance *cppc_fi = &per_cpu(cppc_freq_inv, smp_processor_id()); /* - * cppc_get_perf_ctrs() can potentially sleep, call that from the right + * cppc_get_perf_fb_ctrs() can potentially sleep, call that from the right * context. */ irq_work_queue(&cppc_fi->irq_work); @@ -151,7 +151,7 @@ static void cppc_cpufreq_cpu_fie_init(struct cpufreq_policy *policy) kthread_init_work(&cppc_fi->work, cppc_scale_freq_workfn); init_irq_work(&cppc_fi->irq_work, cppc_irq_work); - ret = cppc_get_perf_ctrs(cpu, &cppc_fi->prev_perf_fb_ctrs); + ret = cppc_get_perf_fb_ctrs(cpu, &cppc_fi->prev_perf_fb_ctrs); if (ret) { pr_warn("%s: failed to read perf counters for cpu:%d: %d\n", __func__, cpu, ret); @@ -281,7 +281,7 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, freqs.new = target_freq; cpufreq_freq_transition_begin(policy, &freqs); - ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); + ret = cppc_set_perf_ctrls(cpu, &cpu_data->perf_ctrls); cpufreq_freq_transition_end(policy, &freqs, ret != 0); if (ret) @@ -301,7 +301,7 @@ static unsigned int cppc_cpufreq_fast_switch(struct cpufreq_policy *policy, desired_perf = cppc_khz_to_perf(&cpu_data->perf_caps, target_freq); cpu_data->perf_ctrls.desired_perf = desired_perf; - ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); + ret = cppc_set_perf_ctrls(cpu, &cpu_data->perf_ctrls); if (ret) { pr_debug("Failed to set target on CPU:%d. ret:%d\n", @@ -657,7 +657,7 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cur = cppc_perf_to_khz(caps, caps->highest_perf); cpu_data->perf_ctrls.desired_perf = caps->highest_perf; - ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); + ret = cppc_set_perf_ctrls(cpu, &cpu_data->perf_ctrls); if (ret) { pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", caps->highest_perf, cpu, ret); @@ -683,7 +683,7 @@ static void cppc_cpufreq_cpu_exit(struct cpufreq_policy *policy) cpu_data->perf_ctrls.desired_perf = caps->lowest_perf; - ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); + ret = cppc_set_perf_ctrls(cpu, &cpu_data->perf_ctrls); if (ret) pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", caps->lowest_perf, cpu, ret); @@ -723,19 +723,19 @@ static int cppc_perf_from_fbctrs(struct cppc_cpudata *cpu_data, return (reference_perf * delta_delivered) / delta_reference; } -static int cppc_get_perf_ctrs_sample(int cpu, - struct cppc_perf_fb_ctrs *fb_ctrs_t0, - struct cppc_perf_fb_ctrs *fb_ctrs_t1) +static int cppc_get_perf_fb_ctrs_sample(int cpu, + struct cppc_perf_fb_ctrs *fb_ctrs_t0, + struct cppc_perf_fb_ctrs *fb_ctrs_t1) { int ret; - ret = cppc_get_perf_ctrs(cpu, fb_ctrs_t0); + ret = cppc_get_perf_fb_ctrs(cpu, fb_ctrs_t0); if (ret) return ret; udelay(2); /* 2usec delay between sampling */ - return cppc_get_perf_ctrs(cpu, fb_ctrs_t1); + return cppc_get_perf_fb_ctrs(cpu, fb_ctrs_t1); } static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) @@ -753,7 +753,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) cpufreq_cpu_put(policy); - ret = cppc_get_perf_ctrs_sample(cpu, &fb_ctrs_t0, &fb_ctrs_t1); + ret = cppc_get_perf_fb_ctrs_sample(cpu, &fb_ctrs_t0, &fb_ctrs_t1); if (ret) { if (ret == -EFAULT) /* Any of the associated CPPC regs is 0. */ diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h index 62d368bcd9ec..31f4fd288b65 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h @@ -110,7 +110,6 @@ struct cppc_perf_caps { u32 lowest_nonlinear_perf; u32 lowest_freq; u32 nominal_freq; - u32 energy_perf; bool auto_sel; }; @@ -142,8 +141,9 @@ struct cppc_cpudata { extern int cppc_get_desired_perf(int cpunum, u64 *desired_perf); extern int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf); extern int cppc_get_highest_perf(int cpunum, u64 *highest_perf); -extern int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs); -extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls); +extern int cppc_get_perf_fb_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs); +extern int cppc_get_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls); +extern int cppc_set_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls); extern int cppc_set_enable(int cpu, bool enable); extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps); extern bool cppc_perf_ctrs_in_pcc(void); @@ -177,11 +177,15 @@ static inline int cppc_get_highest_perf(int cpunum, u64 *highest_perf) { return -EOPNOTSUPP; } -static inline int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs) +static inline int cppc_get_perf_fb_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs) +{ + return -EOPNOTSUPP; +} +static inline int cppc_get_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls) { return -EOPNOTSUPP; } -static inline int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls) +static inline int cppc_set_perf_ctrls(int cpu, struct cppc_perf_ctrls *perf_ctrls) { return -EOPNOTSUPP; }
Add new API cppc_get_perf_ctrls() to read the performance controls. Rename the following existing API's for more clarity. - cppc_set_perf() to cppc_set_perf_ctrls(). - cppc_get_perf_ctrs() to cppc_get_perf_fb_ctrs(). - cppc_get_perf_ctrs_sample() to cppc_get_perf_fb_ctrs_sample(). Also, remove redundant energy_perf field from 'struct cppc_perf_caps'. It is also present in 'struct cppc_perf_ctrls' which is being used. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> --- drivers/acpi/cppc_acpi.c | 91 +++++++++++++++++++++++++++++----- drivers/cpufreq/cppc_cpufreq.c | 26 +++++----- include/acpi/cppc_acpi.h | 14 ++++-- 3 files changed, 101 insertions(+), 30 deletions(-)