Skip to content

Commit 658fa7b

Browse files
Sumit Guptarafaeljw
authored andcommitted
ACPI: CPPC: Add cppc_get_perf() API to read performance controls
Add cppc_get_perf() function to read values of performance control registers including desired_perf, min_perf, max_perf, energy_perf, and auto_sel. This provides a read interface to complement the existing cppc_set_perf() write interface for performance control registers. Note that auto_sel is read by cppc_get_perf() but not written by cppc_set_perf() to avoid unintended mode changes during performance updates. It can be updated with existing dedicated cppc_set_auto_sel() API. Use cppc_get_perf() in cppc_cpufreq_get_cpu_data() to initialize perf_ctrls with current hardware register values during cpufreq policy initialization. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-2-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 6de23f8 commit 658fa7b

3 files changed

Lines changed: 91 additions & 0 deletions

File tree

drivers/acpi/cppc_acpi.c

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,6 +1738,86 @@ int cppc_set_enable(int cpu, bool enable)
17381738
}
17391739
EXPORT_SYMBOL_GPL(cppc_set_enable);
17401740

1741+
/**
1742+
* cppc_get_perf - Get a CPU's performance controls.
1743+
* @cpu: CPU for which to get performance controls.
1744+
* @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h
1745+
*
1746+
* Return: 0 for success with perf_ctrls, -ERRNO otherwise.
1747+
*/
1748+
int cppc_get_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls)
1749+
{
1750+
struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu);
1751+
struct cpc_register_resource *desired_perf_reg,
1752+
*min_perf_reg, *max_perf_reg,
1753+
*energy_perf_reg, *auto_sel_reg;
1754+
u64 desired_perf = 0, min = 0, max = 0, energy_perf = 0, auto_sel = 0;
1755+
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
1756+
struct cppc_pcc_data *pcc_ss_data = NULL;
1757+
int ret = 0, regs_in_pcc = 0;
1758+
1759+
if (!cpc_desc) {
1760+
pr_debug("No CPC descriptor for CPU:%d\n", cpu);
1761+
return -ENODEV;
1762+
}
1763+
1764+
if (!perf_ctrls) {
1765+
pr_debug("Invalid perf_ctrls pointer\n");
1766+
return -EINVAL;
1767+
}
1768+
1769+
desired_perf_reg = &cpc_desc->cpc_regs[DESIRED_PERF];
1770+
min_perf_reg = &cpc_desc->cpc_regs[MIN_PERF];
1771+
max_perf_reg = &cpc_desc->cpc_regs[MAX_PERF];
1772+
energy_perf_reg = &cpc_desc->cpc_regs[ENERGY_PERF];
1773+
auto_sel_reg = &cpc_desc->cpc_regs[AUTO_SEL_ENABLE];
1774+
1775+
/* Are any of the regs PCC ?*/
1776+
if (CPC_IN_PCC(desired_perf_reg) || CPC_IN_PCC(min_perf_reg) ||
1777+
CPC_IN_PCC(max_perf_reg) || CPC_IN_PCC(energy_perf_reg) ||
1778+
CPC_IN_PCC(auto_sel_reg)) {
1779+
if (pcc_ss_id < 0) {
1780+
pr_debug("Invalid pcc_ss_id for CPU:%d\n", cpu);
1781+
return -ENODEV;
1782+
}
1783+
pcc_ss_data = pcc_data[pcc_ss_id];
1784+
regs_in_pcc = 1;
1785+
down_write(&pcc_ss_data->pcc_lock);
1786+
/* Ring doorbell once to update PCC subspace */
1787+
if (send_pcc_cmd(pcc_ss_id, CMD_READ) < 0) {
1788+
ret = -EIO;
1789+
goto out_err;
1790+
}
1791+
}
1792+
1793+
/* Read optional elements if present */
1794+
if (CPC_SUPPORTED(max_perf_reg))
1795+
cpc_read(cpu, max_perf_reg, &max);
1796+
perf_ctrls->max_perf = max;
1797+
1798+
if (CPC_SUPPORTED(min_perf_reg))
1799+
cpc_read(cpu, min_perf_reg, &min);
1800+
perf_ctrls->min_perf = min;
1801+
1802+
if (CPC_SUPPORTED(desired_perf_reg))
1803+
cpc_read(cpu, desired_perf_reg, &desired_perf);
1804+
perf_ctrls->desired_perf = desired_perf;
1805+
1806+
if (CPC_SUPPORTED(energy_perf_reg))
1807+
cpc_read(cpu, energy_perf_reg, &energy_perf);
1808+
perf_ctrls->energy_perf = energy_perf;
1809+
1810+
if (CPC_SUPPORTED(auto_sel_reg))
1811+
cpc_read(cpu, auto_sel_reg, &auto_sel);
1812+
perf_ctrls->auto_sel = (bool)auto_sel;
1813+
1814+
out_err:
1815+
if (regs_in_pcc)
1816+
up_write(&pcc_ss_data->pcc_lock);
1817+
return ret;
1818+
}
1819+
EXPORT_SYMBOL_GPL(cppc_get_perf);
1820+
17411821
/**
17421822
* cppc_set_perf - Set a CPU's performance controls.
17431823
* @cpu: CPU for which to set performance controls.

drivers/cpufreq/cppc_cpufreq.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,12 @@ static struct cppc_cpudata *cppc_cpufreq_get_cpu_data(unsigned int cpu)
594594
goto free_mask;
595595
}
596596

597+
ret = cppc_get_perf(cpu, &cpu_data->perf_ctrls);
598+
if (ret) {
599+
pr_debug("Err reading CPU%d perf ctrls: ret:%d\n", cpu, ret);
600+
goto free_mask;
601+
}
602+
597603
return cpu_data;
598604

599605
free_mask:

include/acpi/cppc_acpi.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ extern int cppc_get_desired_perf(int cpunum, u64 *desired_perf);
151151
extern int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf);
152152
extern int cppc_get_highest_perf(int cpunum, u64 *highest_perf);
153153
extern int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs);
154+
extern int cppc_get_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls);
154155
extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls);
155156
extern int cppc_set_enable(int cpu, bool enable);
156157
extern int cppc_get_perf_caps(int cpu, struct cppc_perf_caps *caps);
@@ -193,6 +194,10 @@ static inline int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_
193194
{
194195
return -EOPNOTSUPP;
195196
}
197+
static inline int cppc_get_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls)
198+
{
199+
return -EOPNOTSUPP;
200+
}
196201
static inline int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls)
197202
{
198203
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)