139 lines
4.3 KiB
Diff
139 lines
4.3 KiB
Diff
From 952e7bdc4cf67603f230f8eb91818ad4676e5a83 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 5 Sep 2024 11:30:02 -0500
|
|
Subject: x86/amd: Move amd_get_highest_perf() out of amd-pstate
|
|
|
|
amd_pstate_get_highest_perf() is a helper used to get the highest perf
|
|
value on AMD systems. It's used in amd-pstate as part of preferred
|
|
core handling, but applicable for acpi-cpufreq as well.
|
|
|
|
Move it out to cppc handling code as amd_get_highest_perf().
|
|
|
|
Reviewed-by: Perry Yuan <perry.yuan@amd.com>
|
|
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
Reviewed-by: Gautham R. Shenoy <gautham.sheoy@amd.com>
|
|
---
|
|
arch/x86/kernel/acpi/cppc.c | 30 ++++++++++++++++++++++++++++++
|
|
drivers/cpufreq/amd-pstate.c | 34 ++--------------------------------
|
|
include/acpi/cppc_acpi.h | 5 +++++
|
|
3 files changed, 37 insertions(+), 32 deletions(-)
|
|
|
|
--- a/arch/x86/kernel/acpi/cppc.c
|
|
+++ b/arch/x86/kernel/acpi/cppc.c
|
|
@@ -116,6 +116,36 @@ void init_freq_invariance_cppc(void)
|
|
mutex_unlock(&freq_invariance_lock);
|
|
}
|
|
|
|
+/*
|
|
+ * Get the highest performance register value.
|
|
+ * @cpu: CPU from which to get highest performance.
|
|
+ * @highest_perf: Return address for highest performance value.
|
|
+ *
|
|
+ * Return: 0 for success, negative error code otherwise.
|
|
+ */
|
|
+int amd_get_highest_perf(unsigned int cpu, u32 *highest_perf)
|
|
+{
|
|
+ u64 val;
|
|
+ int ret;
|
|
+
|
|
+ if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
|
|
+ ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &val);
|
|
+ if (ret)
|
|
+ goto out;
|
|
+
|
|
+ val = AMD_CPPC_HIGHEST_PERF(val);
|
|
+ } else {
|
|
+ ret = cppc_get_highest_perf(cpu, &val);
|
|
+ if (ret)
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ WRITE_ONCE(*highest_perf, (u32)val);
|
|
+out:
|
|
+ return ret;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(amd_get_highest_perf);
|
|
+
|
|
/**
|
|
* amd_get_boost_ratio_numerator: Get the numerator to use for boost ratio calculation
|
|
* @cpu: CPU to get numerator for.
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
|
@@ -815,36 +815,6 @@ static void amd_pstste_sched_prefcore_wo
|
|
}
|
|
static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn);
|
|
|
|
-/*
|
|
- * Get the highest performance register value.
|
|
- * @cpu: CPU from which to get highest performance.
|
|
- * @highest_perf: Return address.
|
|
- *
|
|
- * Return: 0 for success, -EIO otherwise.
|
|
- */
|
|
-static int amd_pstate_get_highest_perf(int cpu, u32 *highest_perf)
|
|
-{
|
|
- int ret;
|
|
-
|
|
- if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
|
|
- u64 cap1;
|
|
-
|
|
- ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
|
|
- if (ret)
|
|
- return ret;
|
|
- WRITE_ONCE(*highest_perf, AMD_CPPC_HIGHEST_PERF(cap1));
|
|
- } else {
|
|
- u64 cppc_highest_perf;
|
|
-
|
|
- ret = cppc_get_highest_perf(cpu, &cppc_highest_perf);
|
|
- if (ret)
|
|
- return ret;
|
|
- WRITE_ONCE(*highest_perf, cppc_highest_perf);
|
|
- }
|
|
-
|
|
- return (ret);
|
|
-}
|
|
-
|
|
#define CPPC_MAX_PERF U8_MAX
|
|
|
|
static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
|
|
@@ -852,7 +822,7 @@ static void amd_pstate_init_prefcore(str
|
|
int ret, prio;
|
|
u32 highest_perf;
|
|
|
|
- ret = amd_pstate_get_highest_perf(cpudata->cpu, &highest_perf);
|
|
+ ret = amd_get_highest_perf(cpudata->cpu, &highest_perf);
|
|
if (ret)
|
|
return;
|
|
|
|
@@ -896,7 +866,7 @@ static void amd_pstate_update_limits(uns
|
|
if ((!amd_pstate_prefcore) || (!cpudata->hw_prefcore))
|
|
goto free_cpufreq_put;
|
|
|
|
- ret = amd_pstate_get_highest_perf(cpu, &cur_high);
|
|
+ ret = amd_get_highest_perf(cpu, &cur_high);
|
|
if (ret)
|
|
goto free_cpufreq_put;
|
|
|
|
--- a/include/acpi/cppc_acpi.h
|
|
+++ b/include/acpi/cppc_acpi.h
|
|
@@ -161,6 +161,7 @@ extern int cppc_get_epp_perf(int cpunum,
|
|
extern int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable);
|
|
extern int cppc_get_auto_sel_caps(int cpunum, struct cppc_perf_caps *perf_caps);
|
|
extern int cppc_set_auto_sel(int cpu, bool enable);
|
|
+extern int amd_get_highest_perf(unsigned int cpu, u32 *highest_perf);
|
|
extern int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator);
|
|
#else /* !CONFIG_ACPI_CPPC_LIB */
|
|
static inline int cppc_get_desired_perf(int cpunum, u64 *desired_perf)
|
|
@@ -235,6 +236,10 @@ static inline int cppc_get_auto_sel_caps
|
|
{
|
|
return -EOPNOTSUPP;
|
|
}
|
|
+static inline int amd_get_highest_perf(unsigned int cpu, u32 *highest_perf)
|
|
+{
|
|
+ return -ENODEV;
|
|
+}
|
|
static inline int amd_get_boost_ratio_numerator(unsigned int cpu, u64 *numerator)
|
|
{
|
|
return -EOPNOTSUPP;
|