Skip to contentSkip to conversation

amd-pstate: Better handling for systems without an MSR

PATCH In review Mario Limonciello 3 participants 5 messages Sep 1, 2024 – Sep 3, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover amd-pstate: Better handling for systems without an MSR

From: Mario Limonciello <[email protected]>

Since the policy changed for amd-pstate to enable on systems with shared memory designs by default too some users have reported that software like power-profiles-daemon fails with an error -524.

This happens because error codes from the CPPC API are ignored during the initial setup so all the sysfs files are created but don't work.

This series does two things:
1. Add a debugging early param to force going into shared memory mode even on a system with a dedicated MSR. This will aid in debugging reported issues.
2. Catch errors in amd_pstate_epp_update_limit() and pass them up. If any errors occurred with CPPC API then amd-pstate won't be setup.

Mario Limonciello (2):
cpufreq/amd-pstate: Add an early param to disable MSR mode cpufreq/amd-pstate: Catch failures for amd_pstate_epp_update_limit()

 .../admin-guide/kernel-parameters.txt         |  5 ++-
 Documentation/admin-guide/pm/amd-pstate.rst   |  5 +++
 drivers/cpufreq/amd-pstate.c                  | 43 +++++++++++++------
 3 files changed, 38 insertions(+), 15 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 cpufreq/amd-pstate: Add an early param to disable MSR mode

From: Mario Limonciello <[email protected]>

This lets a system that supports the MSR run in shared memory mode instead to help replicate and debug issues.

---
 .../admin-guide/kernel-parameters.txt         |  5 +++
 Documentation/admin-guide/pm/amd-pstate.rst   |  5 +++
 drivers/cpufreq/amd-pstate.c                  | 32 +++++++++++++------
 3 files changed, 32 insertions(+), 10 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -0
index 09126bb8cc9ff..041c609ed50ea 100644
@@ -383,6 +383,11 @@
 			disable
 			  Disable amd-pstate preferred core.
 
+	amd_pstate_msr=
+			[X86]
+			disable
+			  Disable amd-pstate CPPC MSR (force shared memory).
+
 	amijoy.map=	[HW,JOY] Amiga joystick support
 			Map of devices attached to JOY0DAT and JOY1DAT
 			Format: <a>,<b>
Documentation/admin-guide/pm/amd-pstate.rst +5 -0
index d0324d44f5482..b06632556102e 100644
@@ -411,6 +411,11 @@ For systems that support ``amd-pstate`` preferred core, the core rankings will
 always be advertised by the platform. But OS can choose to ignore that via the
 kernel parameter ``amd_prefcore=disable``.
 
+``amd_pstate_msr=disable``
+
+For systems that support a dedicated CPPC MSR, ignore it's use and run
+with shared memory instead.
+
 User Space Interface in ``sysfs`` - General
 ===========================================
 
drivers/cpufreq/amd-pstate.c +22 -10
index 93adde45bebce..89438a3654002 100644
@@ -88,6 +88,7 @@ static struct cpufreq_driver amd_pstate_epp_driver;
 static int cppc_state = AMD_PSTATE_UNDEFINED;
 static bool cppc_enabled;
 static bool amd_pstate_prefcore = true;
+static bool amd_pstate_msr = true;
 static struct quirk_entry *quirks;
 
 /*
@@ -187,7 +188,7 @@ static s16 amd_pstate_get_epp(struct amd_cpudata *cpudata, u64 cppc_req_cached)
 	u64 epp;
 	int ret;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		if (!cppc_req_cached) {
 			epp = rdmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ,
 					&cppc_req_cached);
@@ -260,7 +261,7 @@ static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp)
 	int ret;
 	struct cppc_perf_ctrls perf_ctrls;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		u64 value = READ_ONCE(cpudata->cppc_req_cached);
 
 		value &= ~GENMASK_ULL(31, 24);
@@ -813,7 +814,7 @@ static int amd_pstate_get_highest_perf(int cpu, u32 *highest_perf)
 {
 	int ret;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		u64 cap1;
 
 		ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
@@ -1058,7 +1059,7 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 	/* It will be updated by governor */
 	policy->cur = policy->cpuinfo.min_freq;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC))
+	if (amd_pstate_msr)
 		policy->fast_switch_possible = true;
 
 	ret = freq_qos_add_request(&policy->constraints, &cpudata->req[0],
@@ -1288,7 +1289,7 @@ static int amd_pstate_change_mode_without_dvr_change(int mode)
 
 	cppc_state = mode;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC) || cppc_state == AMD_PSTATE_ACTIVE)
+	if (amd_pstate_msr || cppc_state == AMD_PSTATE_ACTIVE)
 		return 0;
 
 	for_each_present_cpu(cpu) {
@@ -1524,7 +1525,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	else
 		policy->policy = CPUFREQ_POLICY_POWERSAVE;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		ret = rdmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, &value);
 		if (ret)
 			return ret;
@@ -1612,7 +1613,7 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 		epp = 0;
 
 	/* Set initial EPP value */
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		value &= ~GENMASK_ULL(31, 24);
 		value |= (u64)epp << 24;
 	}
@@ -1657,7 +1658,7 @@ static void amd_pstate_epp_reenable(struct amd_cpudata *cpudata)
 	value = READ_ONCE(cpudata->cppc_req_cached);
 	max_perf = READ_ONCE(cpudata->highest_perf);
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, value);
 	} else {
 		perf_ctrls.max_perf = max_perf;
@@ -1691,7 +1692,7 @@ static void amd_pstate_epp_offline(struct cpufreq_policy *policy)
 	value = READ_ONCE(cpudata->cppc_req_cached);
 
 	mutex_lock(&amd_pstate_limits_lock);
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
 		cpudata->epp_policy = CPUFREQ_POLICY_UNKNOWN;
 
 		/* Set max perf same as min perf */
@@ -1936,7 +1937,9 @@ static int __init amd_pstate_init(void)
 	}
 
 	/* capability check */
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr)
+		amd_pstate_msr = cpu_feature_enabled(X86_FEATURE_CPPC);
+	if (amd_pstate_msr) {
 		pr_debug("AMD CPPC MSR based functionality is supported\n");
 		if (cppc_state != AMD_PSTATE_ACTIVE)
 			current_pstate_driver->adjust_perf = amd_pstate_adjust_perf;
@@ -2002,8 +2005,17 @@ static int __init amd_prefcore_param(char *str)
 	return 0;
 }
 
+static int __init amd_msr_param(char *str)
+{
+	if (!strcmp(str, "disable"))
+		amd_pstate_msr = false;
+
+	return 0;
+}
+
 early_param("amd_pstate", amd_pstate_param);
 early_param("amd_prefcore", amd_prefcore_param);
+early_param("amd_pstate_msr", amd_msr_param);
 
 MODULE_AUTHOR("Huang Rui <[email protected]>");
 MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver");
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH 1/2] cpufreq/amd-pstate: Add an early param to disable MSR mode

Quoted 6 lines · Mario Limonciello

From: Mario Limonciello <[email protected]>

This lets a system that supports the MSR run in shared memory mode instead to help replicate and debug issues.

After some offline discussion, will drop this patch. Second patch will remain and I will queue it up for -next.

Quoted 160 lines
---
  .../admin-guide/kernel-parameters.txt         |  5 +++
  Documentation/admin-guide/pm/amd-pstate.rst   |  5 +++
  drivers/cpufreq/amd-pstate.c                  | 32 +++++++++++++------
  3 files changed, 32 insertions(+), 10 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -0
index 09126bb8cc9ff..041c609ed50ea 100644
@@ -383,6 +383,11 @@
  			disable
  			  Disable amd-pstate preferred core.
 
+	amd_pstate_msr=
+			[X86]
+			disable
+			  Disable amd-pstate CPPC MSR (force shared memory).
+
  	amijoy.map=	[HW,JOY] Amiga joystick support
  			Map of devices attached to JOY0DAT and JOY1DAT
  			Format: <a>,<b>
Documentation/admin-guide/pm/amd-pstate.rst +5 -0
index d0324d44f5482..b06632556102e 100644
@@ -411,6 +411,11 @@ For systems that support ``amd-pstate`` preferred core, the core rankings will
  always be advertised by the platform. But OS can choose to ignore that via the
  kernel parameter ``amd_prefcore=disable``.
 
+``amd_pstate_msr=disable``
+
+For systems that support a dedicated CPPC MSR, ignore it's use and run
+with shared memory instead.
+
  User Space Interface in ``sysfs`` - General
  ===========================================
 
drivers/cpufreq/amd-pstate.c +22 -10
index 93adde45bebce..89438a3654002 100644
@@ -88,6 +88,7 @@ static struct cpufreq_driver amd_pstate_epp_driver;
  static int cppc_state = AMD_PSTATE_UNDEFINED;
  static bool cppc_enabled;
  static bool amd_pstate_prefcore = true;
+static bool amd_pstate_msr = true;
  static struct quirk_entry *quirks;
 
  /*
@@ -187,7 +188,7 @@ static s16 amd_pstate_get_epp(struct amd_cpudata *cpudata, u64 cppc_req_cached)
  	u64 epp;
  	int ret;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		if (!cppc_req_cached) {
  			epp = rdmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ,
  					&cppc_req_cached);
@@ -260,7 +261,7 @@ static int amd_pstate_set_epp(struct amd_cpudata *cpudata, u32 epp)
  	int ret;
  	struct cppc_perf_ctrls perf_ctrls;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		u64 value = READ_ONCE(cpudata->cppc_req_cached);
 
  		value &= ~GENMASK_ULL(31, 24);
@@ -813,7 +814,7 @@ static int amd_pstate_get_highest_perf(int cpu, u32 *highest_perf)
  {
  	int ret;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		u64 cap1;
 
  		ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
@@ -1058,7 +1059,7 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
  	/* It will be updated by governor */
  	policy->cur = policy->cpuinfo.min_freq;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC))
+	if (amd_pstate_msr)
  		policy->fast_switch_possible = true;
 
  	ret = freq_qos_add_request(&policy->constraints, &cpudata->req[0],
@@ -1288,7 +1289,7 @@ static int amd_pstate_change_mode_without_dvr_change(int mode)
 
  	cppc_state = mode;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC) || cppc_state == AMD_PSTATE_ACTIVE)
+	if (amd_pstate_msr || cppc_state == AMD_PSTATE_ACTIVE)
  		return 0;
 
  	for_each_present_cpu(cpu) {
@@ -1524,7 +1525,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
  	else
  		policy->policy = CPUFREQ_POLICY_POWERSAVE;
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		ret = rdmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, &value);
  		if (ret)
  			return ret;
@@ -1612,7 +1613,7 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
  		epp = 0;
 
  	/* Set initial EPP value */
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		value &= ~GENMASK_ULL(31, 24);
  		value |= (u64)epp << 24;
  	}
@@ -1657,7 +1658,7 @@ static void amd_pstate_epp_reenable(struct amd_cpudata *cpudata)
  	value = READ_ONCE(cpudata->cppc_req_cached);
  	max_perf = READ_ONCE(cpudata->highest_perf);
 
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, value);
  	} else {
  		perf_ctrls.max_perf = max_perf;
@@ -1691,7 +1692,7 @@ static void amd_pstate_epp_offline(struct cpufreq_policy *policy)
  	value = READ_ONCE(cpudata->cppc_req_cached);
 
  	mutex_lock(&amd_pstate_limits_lock);
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr) {
  		cpudata->epp_policy = CPUFREQ_POLICY_UNKNOWN;
 
  		/* Set max perf same as min perf */
@@ -1936,7 +1937,9 @@ static int __init amd_pstate_init(void)
  	}
 
  	/* capability check */
-	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
+	if (amd_pstate_msr)
+		amd_pstate_msr = cpu_feature_enabled(X86_FEATURE_CPPC);
+	if (amd_pstate_msr) {
  		pr_debug("AMD CPPC MSR based functionality is supported\n");
  		if (cppc_state != AMD_PSTATE_ACTIVE)
  			current_pstate_driver->adjust_perf = amd_pstate_adjust_perf;
@@ -2002,8 +2005,17 @@ static int __init amd_prefcore_param(char *str)
  	return 0;
  }
 
+static int __init amd_msr_param(char *str)
+{
+	if (!strcmp(str, "disable"))
+		amd_pstate_msr = false;
+
+	return 0;
+}
+
  early_param("amd_pstate", amd_pstate_param);
  early_param("amd_prefcore", amd_prefcore_param);
+early_param("amd_pstate_msr", amd_msr_param);
 
  MODULE_AUTHOR("Huang Rui <[email protected]>");
  MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver");
#3 lore raw

PATCH 2/2 cpufreq/amd-pstate: Catch failures for amd_pstate_epp_update_limit()

In reply to Mario Limonciello

From: Mario Limonciello <[email protected]>

amd_pstate_set_epp() calls cppc_set_epp_perf() which can fail for a variety of reasons but this is ignored. Change the return flow to allow failures.

---
 drivers/cpufreq/amd-pstate.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/cpufreq/amd-pstate.c +7 -4
index 89438a3654002..b07be4d945e4d 100644
@@ -1556,7 +1556,7 @@ static void amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)
 	pr_debug("CPU %d exiting\n", policy->cpu);
 }
 
-static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
+static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 {
 	struct amd_cpudata *cpudata = policy->driver_data;
 	u32 max_perf, min_perf, min_limit_perf, max_limit_perf;
@@ -1606,7 +1606,7 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 		 * This return value can only be negative for shared_memory
 		 * systems where EPP register read/write not supported.
 		 */
-		return;
+		return epp;
 	}
 
 	if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE)
@@ -1619,12 +1619,13 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 	}
 
 	WRITE_ONCE(cpudata->cppc_req_cached, value);
-	amd_pstate_set_epp(cpudata, epp);
+	return amd_pstate_set_epp(cpudata, epp);
 }
 
 static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy)
 {
 	struct amd_cpudata *cpudata = policy->driver_data;
+	int ret;
 
 	if (!policy->cpuinfo.max_freq)
 		return -ENODEV;
@@ -1634,7 +1635,9 @@ static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy)
 
 	cpudata->policy = policy->policy;
 
-	amd_pstate_epp_update_limit(policy);
+	ret = amd_pstate_epp_update_limit(policy);
+	if (ret)
+		return ret;
 
 	/*
 	 * policy->cur is never updated with the amd_pstate_epp driver, but it
Signature · 1 line
2.43.0
reviewer Reviewed-by on v1 2/2
#4 lore raw

RE: [PATCH 2/2] cpufreq/amd-pstate: Catch failures for amd_pstate_epp_update_limit()

[AMD Official Use Only - AMD Internal Distribution Only]

Quoted 12 lines

-----Original Message-----
From: Mario Limonciello <[email protected]>
Sent: Sunday, September 1, 2024 1:01 PM
To: Shenoy, Gautham Ranjal <[email protected]>; Yuan, Perry <[email protected]>
Cc: open list:X86 ARCHITECTURE (32-BIT AND 64-BIT) <linux- [email protected]>; open list:CPU FREQUENCY SCALING FRAMEWORK <[email protected]>; Limonciello, Mario <[email protected]>
Subject: [PATCH 2/2] cpufreq/amd-pstate: Catch failures for amd_pstate_epp_update_limit()

Quoted 6 lines

From: Mario Limonciello <[email protected]>

amd_pstate_set_epp() calls cppc_set_epp_perf() which can fail for a variety of reasons but this is ignored. Change the return flow to allow failures.

LGTM,

Quoted 56 lines
---
 drivers/cpufreq/amd-pstate.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/cpufreq/amd-pstate.c +2 -1
index 89438a3654002..b07be4d945e4d 100644
@@ -1556,7 +1556,7 @@ static void amd_pstate_epp_cpu_exit(struct
 cpufreq_policy *policy)
      pr_debug("CPU %d exiting\n", policy->cpu);  }
 
-static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
+static int amd_pstate_epp_update_limit(struct cpufreq_policy *policy)
 {
      struct amd_cpudata *cpudata = policy->driver_data;
      u32 max_perf, min_perf, min_limit_perf, max_limit_perf; @@ -1606,7
+1606,7 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy

*policy)
* This return value can only be negative for shared_memory
* systems where EPP register read/write not supported. */

drivers/cpufreq/amd-pstate.c +1 -1
-             return;
+             return epp;
      }
 
      if (cpudata->policy == CPUFREQ_POLICY_PERFORMANCE) @@ -

1619,12 +1619,13 @@ static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)

      }

      WRITE_ONCE(cpudata->cppc_req_cached, value);
drivers/cpufreq/amd-pstate.c +5 -2
-     amd_pstate_set_epp(cpudata, epp);
+     return amd_pstate_set_epp(cpudata, epp);
 }
 
 static int amd_pstate_epp_set_policy(struct cpufreq_policy *policy)  {
      struct amd_cpudata *cpudata = policy->driver_data;
+     int ret;
 
      if (!policy->cpuinfo.max_freq)
              return -ENODEV;
@@ -1634,7 +1635,9 @@ static int amd_pstate_epp_set_policy(struct
 cpufreq_policy *policy)
 
      cpudata->policy = policy->policy;
 
-     amd_pstate_epp_update_limit(policy);
+     ret = amd_pstate_epp_update_limit(policy);
+     if (ret)
+             return ret;
 
      /*

* policy->cur is never updated with the amd_pstate_epp driver, but it
--
2.43.0