AMD Pstate Fixes And Enhancements

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #3 lore raw

PATCH v9 2/8 cpufreq: amd-pstate: Document the units for freq variables in amd_cpudata

From: "Gautham R. Shenoy" <[email protected]>

The min_limit_freq, max_limit_freq, min_freq, max_freq, nominal_freq and the lowest_nominal_freq members of struct cpudata store the frequency value in khz to be consistent with the cpufreq core. Update the comment to document this.

Signed-off-by Gautham R. Shenoy <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 include/linux/amd-pstate.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

include/linux/amd-pstate.h +7 -7

index 212f377d615b..ab7e82533718 100644
@@ -51,15 +51,15 @@ struct amd_aperf_mperf {
  * 		  priority.
  * @min_limit_perf: Cached value of the perf corresponding to policy->min
  * @max_limit_perf: Cached value of the perf corresponding to policy->max
- * @min_limit_freq: Cached value of policy->min
- * @max_limit_freq: Cached value of policy->max
- * @max_freq: the frequency that mapped to highest_perf
- * @min_freq: the frequency that mapped to lowest_perf
- * @nominal_freq: the frequency that mapped to nominal_perf
- * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf
+ * @min_limit_freq: Cached value of policy->min (in khz)
+ * @max_limit_freq: Cached value of policy->max (in khz)
+ * @max_freq: the frequency (in khz) that mapped to highest_perf
+ * @min_freq: the frequency (in khz) that mapped to lowest_perf
+ * @nominal_freq: the frequency (in khz) that mapped to nominal_perf
+ * @lowest_nonlinear_freq: the frequency (in khz) that mapped to lowest_nonlinear_perf
  * @cur: Difference of Aperf/Mperf/tsc count between last and current sample
  * @prev: Last Aperf/Mperf/tsc count value read from register
- * @freq: current cpu frequency value
+ * @freq: current cpu frequency value (in khz)
  * @boost_supported: check whether the Processor or SBIOS supports boost mode
  * @hw_prefcore: check whether HW supports preferred core featue.
  * 		  Only when hw_prefcore and early prefcore param are true,

Signature · 1 line

2.34.1

Meng, Li (Jassmine)

Reviewed-by on v9 2/8

2024-03-22 06:28 UTC #4 lore raw

RE: [PATCH v9 2/8] cpufreq: amd-pstate: Document the units for freq variables in amd_cpudata

[AMD Official Use Only - General]

Quoted 52 lines

-----Original Message-----
From: Yuan, Perry <[email protected]>
Sent: Tuesday, March 19, 2024 4:29 PM
To: [email protected]; Limonciello, Mario <[email protected]>; [email protected]; Shenoy, Gautham Ranjal <[email protected]>; Petkov, Borislav <[email protected]>; Huang, Ray <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Huang, Shimmer <[email protected]>; [email protected]; Du, Xiaojian <[email protected]>; Meng, Li (Jassmine) <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v9 2/8] cpufreq: amd-pstate: Document the units for freq variables in amd_cpudata
From: "Gautham R. Shenoy" <[email protected]>
The min_limit_freq, max_limit_freq, min_freq, max_freq, nominal_freq and the lowest_nominal_freq members of struct cpudata store the frequency value in khz to be consistent with the cpufreq core. Update the comment to document this.
Signed-off-by Gautham R. Shenoy <[email protected]>
Signed-off-by Perry Yuan <[email protected]>
---
 include/linux/amd-pstate.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
include/linux/amd-pstate.h index renamed from include/linux/amd-pstate.h +0 -0
212f377d615b..ab7e82533718 100644
include/linux/amd-pstate.h +0 -6
@@ -51,15 +51,15 @@ struct amd_aperf_mperf {
  *             priority.
  * @min_limit_perf: Cached value of the perf corresponding to policy->min
  * @max_limit_perf: Cached value of the perf corresponding to policy->max
- * @min_limit_freq: Cached value of policy->min
- * @max_limit_freq: Cached value of policy->max
- * @max_freq: the frequency that mapped to highest_perf
- * @min_freq: the frequency that mapped to lowest_perf
- * @nominal_freq: the frequency that mapped to nominal_perf
- * @lowest_nonlinear_freq: the frequency that mapped to
lowest_nonlinear_perf
+ * @min_limit_freq: Cached value of policy->min (in khz)
+ * @max_limit_freq: Cached value of policy->max (in khz)
+ * @max_freq: the frequency (in khz) that mapped to highest_perf
+ * @min_freq: the frequency (in khz) that mapped to lowest_perf
+ * @nominal_freq: the frequency (in khz) that mapped to nominal_perf
+ * @lowest_nonlinear_freq: the frequency (in khz) that mapped to
+ lowest_nonlinear_perf
* @cur: Difference of Aperf/Mperf/tsc count between last and current
sample
* @prev: Last Aperf/Mperf/tsc count value read from register

Quoted 8 lines

- * @freq: current cpu frequency value
+ * @freq: current cpu frequency value (in khz)
* @boost_supported: check whether the Processor or SBIOS supports
boost mode
* @hw_prefcore: check whether HW supports preferred core featue.
* Only when hw_prefcore and early prefcore param are true,
--
2.34.1

[Meng, Li (Jassmine)]

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #5 lore raw

PATCH v9 3/8 cpufreq: amd-pstate: Unify computation of {max,min,nominal,lowest_nonlinear}_freq

Currently the amd_get_{min, max, nominal, lowest_nonlinear}_freq() helpers computes the values of min_freq, max_freq, nominal_freq and lowest_nominal_freq respectively afresh from cppc_get_perf_caps(). This is not necessary as there are fields in cpudata to cache these values.

To simplify this, add a single helper function named amd_pstate_init_freq() which computes all these frequencies at once, and caches it in cpudata.

Use the cached values everywhere else in the code.

Co-developed-by Gautham R. Shenoy <[email protected]>

Signed-off-by Gautham R. Shenoy <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 126 ++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 67 deletions(-)

drivers/cpufreq/amd-pstate.c +59 ~~-67~~

index 2015c9fcc3c9..ba1baa6733e6 100644
@@ -606,74 +606,22 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
 
 static int amd_get_min_freq(struct amd_cpudata *cpudata)
 {
-	struct cppc_perf_caps cppc_perf;
-
-	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-	if (ret)
-		return ret;
-
-	/* Switch to khz */
-	return cppc_perf.lowest_freq * 1000;
+	return READ_ONCE(cpudata->min_freq);
 }
 
 static int amd_get_max_freq(struct amd_cpudata *cpudata)
 {
-	struct cppc_perf_caps cppc_perf;
-	u32 max_perf, max_freq, nominal_freq, nominal_perf;
-	u64 boost_ratio;
-
-	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-	if (ret)
-		return ret;
-
-	nominal_freq = cppc_perf.nominal_freq;
-	nominal_perf = READ_ONCE(cpudata->nominal_perf);
-	max_perf = READ_ONCE(cpudata->highest_perf);
-
-	boost_ratio = div_u64(max_perf << SCHED_CAPACITY_SHIFT,
-			      nominal_perf);
-
-	max_freq = nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT;
-
-	/* Switch to khz */
-	return max_freq * 1000;
+	return READ_ONCE(cpudata->max_freq);
 }
 
 static int amd_get_nominal_freq(struct amd_cpudata *cpudata)
 {
-	struct cppc_perf_caps cppc_perf;
-
-	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-	if (ret)
-		return ret;
-
-	/* Switch to khz */
-	return cppc_perf.nominal_freq * 1000;
+	return READ_ONCE(cpudata->nominal_freq);
 }
 
 static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)
 {
-	struct cppc_perf_caps cppc_perf;
-	u32 lowest_nonlinear_freq, lowest_nonlinear_perf,
-	    nominal_freq, nominal_perf;
-	u64 lowest_nonlinear_ratio;
-
-	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-	if (ret)
-		return ret;
-
-	nominal_freq = cppc_perf.nominal_freq;
-	nominal_perf = READ_ONCE(cpudata->nominal_perf);
-
-	lowest_nonlinear_perf = cppc_perf.lowest_nonlinear_perf;
-
-	lowest_nonlinear_ratio = div_u64(lowest_nonlinear_perf << SCHED_CAPACITY_SHIFT,
-					 nominal_perf);
-
-	lowest_nonlinear_freq = nominal_freq * lowest_nonlinear_ratio >> SCHED_CAPACITY_SHIFT;
-
-	/* Switch to khz */
-	return lowest_nonlinear_freq * 1000;
+	return READ_ONCE(cpudata->lowest_nonlinear_freq);
 }
 
 static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)

@@ -828,6 +776,53 @@ static void amd_pstate_update_limits(unsigned int cpu)
 	mutex_unlock(&amd_pstate_driver_lock);
 }
 
+/**
+ * amd_pstate_init_freq: Initialize the max_freq, min_freq,
+ *                       nominal_freq and lowest_nonlinear_freq for
+ *                       the @cpudata object.
+ *
+ *  Requires: highest_perf, lowest_perf, nominal_perf and
+ *            lowest_nonlinear_perf members of @cpudata to be
+ *            initialized.
+ *
+ *  Returns 0 on success, non-zero value on failure.
+ */
+static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
+{
+	int ret;
+	u32 min_freq;
+	u32 highest_perf, max_freq;
+	u32 nominal_perf, nominal_freq;
+	u32 lowest_nonlinear_perf, lowest_nonlinear_freq;
+	u32 boost_ratio, lowest_nonlinear_ratio;
+	struct cppc_perf_caps cppc_perf;
+
+
+	ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
+	if (ret)
+		return ret;
+
+	min_freq = cppc_perf.lowest_freq * 1000;
+	nominal_freq = cppc_perf.nominal_freq * 1000;
+	nominal_perf = READ_ONCE(cpudata->nominal_perf);
+
+	highest_perf = READ_ONCE(cpudata->highest_perf);
+	boost_ratio = div_u64(highest_perf << SCHED_CAPACITY_SHIFT, nominal_perf);
+	max_freq = nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT;
+
+	lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);
+	lowest_nonlinear_ratio = div_u64(lowest_nonlinear_perf << SCHED_CAPACITY_SHIFT,
+					 nominal_perf);
+	lowest_nonlinear_freq = nominal_freq * lowest_nonlinear_ratio >> SCHED_CAPACITY_SHIFT;
+
+	WRITE_ONCE(cpudata->min_freq, min_freq);
+	WRITE_ONCE(cpudata->lowest_nonlinear_freq, lowest_nonlinear_freq);
+	WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
+	WRITE_ONCE(cpudata->max_freq, max_freq);
+
+	return 0;
+}
+
 static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 {
 	int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;

@@ -855,6 +850,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 	if (ret)
 		goto free_cpudata1;
 
+	ret = amd_pstate_init_freq(cpudata);
+	if (ret)
+		goto free_cpudata1;
+
 	min_freq = amd_get_min_freq(cpudata);
 	max_freq = amd_get_max_freq(cpudata);
 	nominal_freq = amd_get_nominal_freq(cpudata);

@@ -896,13 +895,8 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 		goto free_cpudata2;
 	}
 
-	/* Initial processor data capability frequencies */
-	cpudata->max_freq = max_freq;
-	cpudata->min_freq = min_freq;
 	cpudata->max_limit_freq = max_freq;
 	cpudata->min_limit_freq = min_freq;
-	cpudata->nominal_freq = nominal_freq;
-	cpudata->lowest_nonlinear_freq = lowest_nonlinear_freq;
 
 	policy->driver_data = cpudata;

@@ -1317,6 +1311,10 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	if (ret)
 		goto free_cpudata1;
 
+	ret = amd_pstate_init_freq(cpudata);
+	if (ret)
+		goto free_cpudata1;
+
 	min_freq = amd_get_min_freq(cpudata);
 	max_freq = amd_get_max_freq(cpudata);
 	nominal_freq = amd_get_nominal_freq(cpudata);

@@ -1333,12 +1331,6 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	/* It will be updated by governor */
 	policy->cur = policy->cpuinfo.min_freq;
 
-	/* Initial processor data capability frequencies */
-	cpudata->max_freq = max_freq;
-	cpudata->min_freq = min_freq;
-	cpudata->nominal_freq = nominal_freq;
-	cpudata->lowest_nonlinear_freq = lowest_nonlinear_freq;
-
 	policy->driver_data = cpudata;
 
 	cpudata->epp_cached = amd_pstate_get_epp(cpudata, 0);

Signature · 1 line

2.34.1

Meng, Li (Jassmine)

Reviewed-by on v9 3/8

2024-03-25 02:45 UTC #6 lore raw

RE: [PATCH v9 3/8] cpufreq: amd-pstate: Unify computation of {max,min,nominal,lowest_nonlinear}_freq

[AMD Official Use Only - General]

Quoted 225 lines

-----Original Message-----
From: Yuan, Perry <[email protected]>
Sent: Tuesday, March 19, 2024 4:29 PM
To: [email protected]; Limonciello, Mario <[email protected]>; [email protected]; Shenoy, Gautham Ranjal <[email protected]>; Petkov, Borislav <[email protected]>; Huang, Ray <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Huang, Shimmer <[email protected]>; [email protected]; Du, Xiaojian <[email protected]>; Meng, Li (Jassmine) <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v9 3/8] cpufreq: amd-pstate: Unify computation of {max,min,nominal,lowest_nonlinear}_freq

To simplify this, add a single helper function named amd_pstate_init_freq() which computes all these frequencies at once, and caches it in cpudata.

Use the cached values everywhere else in the code.

Co-developed-by Gautham R. Shenoy <[email protected]>

Signed-off-by Gautham R. Shenoy <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 126 ++++++++++++++++-------------------
 1 file changed, 59 insertions(+), 67 deletions(-)

drivers/cpufreq/amd-pstate.c +39 ~~-56~~

index 2015c9fcc3c9..ba1baa6733e6 100644
@@ -606,74 +606,22 @@ static void amd_pstate_adjust_perf(unsigned int
 cpu,
 
 static int amd_get_min_freq(struct amd_cpudata *cpudata)  {
-     struct cppc_perf_caps cppc_perf;
-
-     int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-     if (ret)
-             return ret;
-
-     /* Switch to khz */
-     return cppc_perf.lowest_freq * 1000;
+     return READ_ONCE(cpudata->min_freq);
 }
 
 static int amd_get_max_freq(struct amd_cpudata *cpudata)  {
-     struct cppc_perf_caps cppc_perf;
-     u32 max_perf, max_freq, nominal_freq, nominal_perf;
-     u64 boost_ratio;
-
-     int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-     if (ret)
-             return ret;
-
-     nominal_freq = cppc_perf.nominal_freq;
-     nominal_perf = READ_ONCE(cpudata->nominal_perf);
-     max_perf = READ_ONCE(cpudata->highest_perf);
-
-     boost_ratio = div_u64(max_perf << SCHED_CAPACITY_SHIFT,
-                           nominal_perf);
-
-     max_freq = nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT;
-
-     /* Switch to khz */
-     return max_freq * 1000;
+     return READ_ONCE(cpudata->max_freq);
 }
 
 static int amd_get_nominal_freq(struct amd_cpudata *cpudata)  {
-     struct cppc_perf_caps cppc_perf;
-
-     int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-     if (ret)
-             return ret;
-
-     /* Switch to khz */
-     return cppc_perf.nominal_freq * 1000;
+     return READ_ONCE(cpudata->nominal_freq);
 }
 
 static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)  {
-     struct cppc_perf_caps cppc_perf;
-     u32 lowest_nonlinear_freq, lowest_nonlinear_perf,
-         nominal_freq, nominal_perf;
-     u64 lowest_nonlinear_ratio;
-
-     int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
-     if (ret)
-             return ret;
-
-     nominal_freq = cppc_perf.nominal_freq;
-     nominal_perf = READ_ONCE(cpudata->nominal_perf);
-
-     lowest_nonlinear_perf = cppc_perf.lowest_nonlinear_perf;
-
-     lowest_nonlinear_ratio = div_u64(lowest_nonlinear_perf <<
 SCHED_CAPACITY_SHIFT,
-                                      nominal_perf);
-
-     lowest_nonlinear_freq = nominal_freq * lowest_nonlinear_ratio >>
 SCHED_CAPACITY_SHIFT;
-
-     /* Switch to khz */
-     return lowest_nonlinear_freq * 1000;
+     return READ_ONCE(cpudata->lowest_nonlinear_freq);
 }
 
 static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)

@@ -828,6 +776,53 @@ static void amd_pstate_update_limits(unsigned int
 cpu)
      mutex_unlock(&amd_pstate_driver_lock);
 }
 
+/**
+ * amd_pstate_init_freq: Initialize the max_freq, min_freq,
+ *                       nominal_freq and lowest_nonlinear_freq for
+ *                       the @cpudata object.
+ *
+ *  Requires: highest_perf, lowest_perf, nominal_perf and
+ *            lowest_nonlinear_perf members of @cpudata to be
+ *            initialized.
+ *
+ *  Returns 0 on success, non-zero value on failure.
+ */
+static int amd_pstate_init_freq(struct amd_cpudata *cpudata) {
+     int ret;
+     u32 min_freq;
+     u32 highest_perf, max_freq;
+     u32 nominal_perf, nominal_freq;
+     u32 lowest_nonlinear_perf, lowest_nonlinear_freq;
+     u32 boost_ratio, lowest_nonlinear_ratio;
+     struct cppc_perf_caps cppc_perf;
+
+
+     ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
+     if (ret)
+             return ret;
+
+     min_freq = cppc_perf.lowest_freq * 1000;
+     nominal_freq = cppc_perf.nominal_freq * 1000;
+     nominal_perf = READ_ONCE(cpudata->nominal_perf);
+
+     highest_perf = READ_ONCE(cpudata->highest_perf);
+     boost_ratio = div_u64(highest_perf << SCHED_CAPACITY_SHIFT,
 nominal_perf);
+     max_freq = nominal_freq * boost_ratio >> SCHED_CAPACITY_SHIFT;
+
+     lowest_nonlinear_perf = READ_ONCE(cpudata-
 >lowest_nonlinear_perf);
+     lowest_nonlinear_ratio = div_u64(lowest_nonlinear_perf <<

SCHED_CAPACITY_SHIFT,

drivers/cpufreq/amd-pstate.c +6 -0

+                                      nominal_perf);
+     lowest_nonlinear_freq = nominal_freq * lowest_nonlinear_ratio >>
+SCHED_CAPACITY_SHIFT;
+
+     WRITE_ONCE(cpudata->min_freq, min_freq);
+     WRITE_ONCE(cpudata->lowest_nonlinear_freq,

lowest_nonlinear_freq);

drivers/cpufreq/amd-pstate.c +10 -0

+     WRITE_ONCE(cpudata->nominal_freq, nominal_freq);
+     WRITE_ONCE(cpudata->max_freq, max_freq);
+
+     return 0;
+}
+
 static int amd_pstate_cpu_init(struct cpufreq_policy *policy)  {
      int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;

@@ -855,6 +850,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy
 *policy)
      if (ret)
              goto free_cpudata1;
 
+     ret = amd_pstate_init_freq(cpudata);
+     if (ret)
+             goto free_cpudata1;
+
      min_freq = amd_get_min_freq(cpudata);
      max_freq = amd_get_max_freq(cpudata);

      nominal_freq = amd_get_nominal_freq(cpudata); @@ -896,13
+895,8 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
              goto free_cpudata2;
      }

drivers/cpufreq/amd-pstate.c +4 -5

-     /* Initial processor data capability frequencies */
-     cpudata->max_freq = max_freq;
-     cpudata->min_freq = min_freq;
      cpudata->max_limit_freq = max_freq;
      cpudata->min_limit_freq = min_freq;
-     cpudata->nominal_freq = nominal_freq;
-     cpudata->lowest_nonlinear_freq = lowest_nonlinear_freq;
 
      policy->driver_data = cpudata;

@@ -1317,6 +1311,10 @@ static int amd_pstate_epp_cpu_init(struct
 cpufreq_policy *policy)
      if (ret)
              goto free_cpudata1;
 
+     ret = amd_pstate_init_freq(cpudata);
+     if (ret)
+             goto free_cpudata1;
+
      min_freq = amd_get_min_freq(cpudata);
      max_freq = amd_get_max_freq(cpudata);

      nominal_freq = amd_get_nominal_freq(cpudata); @@ -1333,12
+1331,6 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy
*policy)
      /* It will be updated by governor */
      policy->cur = policy->cpuinfo.min_freq;

drivers/cpufreq/amd-pstate.c +0 -7

-     /* Initial processor data capability frequencies */
-     cpudata->max_freq = max_freq;
-     cpudata->min_freq = min_freq;
-     cpudata->nominal_freq = nominal_freq;
-     cpudata->lowest_nonlinear_freq = lowest_nonlinear_freq;
-
      policy->driver_data = cpudata;
 
      cpudata->epp_cached = amd_pstate_get_epp(cpudata, 0);
--

Quoted 1 line

2.34.1

[Meng, Li (Jassmine)]

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #7 lore raw

PATCH v9 4/8 cpufreq: amd-pstate: Remove amd_get_{min,max,nominal,lowest_nonlinear}_freq()

From: "Gautham R. Shenoy" <[email protected]>

amd_get_{min,max,nominal,lowest_nonlinear}_freq() functions merely return cpudata->{min,max,nominal,lowest_nonlinear}_freq values.

There is no loss in readability in replacing their invocations by accesses to the corresponding members of cpudata.

Do so and remove these helper functions.

Signed-off-by Gautham R. Shenoy <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 40 +++++++++---------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

drivers/cpufreq/amd-pstate.c +10 ~~-30~~

index ba1baa6733e6..132330b4942f 100644
@@ -604,26 +604,6 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
 	cpufreq_cpu_put(policy);
 }
 
-static int amd_get_min_freq(struct amd_cpudata *cpudata)
-{
-	return READ_ONCE(cpudata->min_freq);
-}
-
-static int amd_get_max_freq(struct amd_cpudata *cpudata)
-{
-	return READ_ONCE(cpudata->max_freq);
-}
-
-static int amd_get_nominal_freq(struct amd_cpudata *cpudata)
-{
-	return READ_ONCE(cpudata->nominal_freq);
-}
-
-static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)
-{
-	return READ_ONCE(cpudata->lowest_nonlinear_freq);
-}
-
 static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
 {
 	struct amd_cpudata *cpudata = policy->driver_data;

@@ -854,10 +834,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 	if (ret)
 		goto free_cpudata1;
 
-	min_freq = amd_get_min_freq(cpudata);
-	max_freq = amd_get_max_freq(cpudata);
-	nominal_freq = amd_get_nominal_freq(cpudata);
-	lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
+	min_freq = READ_ONCE(cpudata->min_freq);
+	max_freq = READ_ONCE(cpudata->max_freq);
+	nominal_freq = READ_ONCE(cpudata->nominal_freq);
+	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
 
 	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
 		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",

@@ -960,7 +940,7 @@ static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy,
 	int max_freq;
 	struct amd_cpudata *cpudata = policy->driver_data;
 
-	max_freq = amd_get_max_freq(cpudata);
+	max_freq = READ_ONCE(cpudata->max_freq);
 	if (max_freq < 0)
 		return max_freq;

@@ -973,7 +953,7 @@ static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *poli
 	int freq;
 	struct amd_cpudata *cpudata = policy->driver_data;
 
-	freq = amd_get_lowest_nonlinear_freq(cpudata);
+	freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
 	if (freq < 0)
 		return freq;

@@ -1315,10 +1295,10 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	if (ret)
 		goto free_cpudata1;
 
-	min_freq = amd_get_min_freq(cpudata);
-	max_freq = amd_get_max_freq(cpudata);
-	nominal_freq = amd_get_nominal_freq(cpudata);
-	lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
+	min_freq = READ_ONCE(cpudata->min_freq);
+	max_freq = READ_ONCE(cpudata->max_freq);
+	nominal_freq = READ_ONCE(cpudata->nominal_freq);
+	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
 	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
 		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
 				min_freq, max_freq);

Signature · 1 line

2.34.1

Meng, Li (Jassmine)

Reviewed-by on v9 4/8

2024-03-22 06:41 UTC #8 lore raw

RE: [PATCH v9 4/8] cpufreq: amd-pstate: Remove amd_get_{min,max,nominal,lowest_nonlinear}_freq()

[AMD Official Use Only - General]

Quoted 110 lines

-----Original Message-----
From: Yuan, Perry <[email protected]>
Sent: Tuesday, March 19, 2024 4:29 PM
To: [email protected]; Limonciello, Mario <[email protected]>; [email protected]; Shenoy, Gautham Ranjal <[email protected]>; Petkov, Borislav <[email protected]>; Huang, Ray <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Huang, Shimmer <[email protected]>; [email protected]; Du, Xiaojian <[email protected]>; Meng, Li (Jassmine) <[email protected]>; linux- [email protected]; [email protected]
Subject: [PATCH v9 4/8] cpufreq: amd-pstate: Remove amd_get_{min,max,nominal,lowest_nonlinear}_freq()
From: "Gautham R. Shenoy" <[email protected]>
amd_get_{min,max,nominal,lowest_nonlinear}_freq() functions merely return cpudata->{min,max,nominal,lowest_nonlinear}_freq values.
There is no loss in readability in replacing their invocations by accesses to the corresponding members of cpudata.
Do so and remove these helper functions.
Signed-off-by Gautham R. Shenoy <[email protected]>
Signed-off-by Perry Yuan <[email protected]>
---
 drivers/cpufreq/amd-pstate.c | 40 +++++++++---------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)
drivers/cpufreq/amd-pstate.c +5 ~~-20~~
index ba1baa6733e6..132330b4942f 100644
@@ -604,26 +604,6 @@ static void amd_pstate_adjust_perf(unsigned int
 cpu,
      cpufreq_cpu_put(policy);
 }
 
-static int amd_get_min_freq(struct amd_cpudata *cpudata) -{
-     return READ_ONCE(cpudata->min_freq);
-}
-
-static int amd_get_max_freq(struct amd_cpudata *cpudata) -{
-     return READ_ONCE(cpudata->max_freq);
-}
-
-static int amd_get_nominal_freq(struct amd_cpudata *cpudata) -{
-     return READ_ONCE(cpudata->nominal_freq);
-}
-
-static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata) -{
-     return READ_ONCE(cpudata->lowest_nonlinear_freq);
-}
-
 static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)  {
      struct amd_cpudata *cpudata = policy->driver_data; @@ -854,10
+834,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
      if (ret)
              goto free_cpudata1;
 
-     min_freq = amd_get_min_freq(cpudata);
-     max_freq = amd_get_max_freq(cpudata);
-     nominal_freq = amd_get_nominal_freq(cpudata);
-     lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
+     min_freq = READ_ONCE(cpudata->min_freq);
+     max_freq = READ_ONCE(cpudata->max_freq);
+     nominal_freq = READ_ONCE(cpudata->nominal_freq);
+     lowest_nonlinear_freq = READ_ONCE(cpudata-
Quoted 1 line
lowest_nonlinear_freq);
if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
dev_err(dev, "min_freq(%d) or max_freq(%d) value is
incorrect\n", @@ -960,7 +940,7 @@ static ssize_t show_amd_pstate_max_freq(struct cpufreq_policy *policy,
      int max_freq;
      struct amd_cpudata *cpudata = policy->driver_data;
drivers/cpufreq/amd-pstate.c +1 -1
-     max_freq = amd_get_max_freq(cpudata);
+     max_freq = READ_ONCE(cpudata->max_freq);
      if (max_freq < 0)
              return max_freq;
@@ -973,7 +953,7 @@ static ssize_t
show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *poli
      int freq;
      struct amd_cpudata *cpudata = policy->driver_data;
drivers/cpufreq/amd-pstate.c +5 -5
-     freq = amd_get_lowest_nonlinear_freq(cpudata);
+     freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
      if (freq < 0)
              return freq;
@@ -1315,10 +1295,10 @@ static int amd_pstate_epp_cpu_init(struct
 cpufreq_policy *policy)
      if (ret)
              goto free_cpudata1;
 
-     min_freq = amd_get_min_freq(cpudata);
-     max_freq = amd_get_max_freq(cpudata);
-     nominal_freq = amd_get_nominal_freq(cpudata);
-     lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
+     min_freq = READ_ONCE(cpudata->min_freq);
+     max_freq = READ_ONCE(cpudata->max_freq);
+     nominal_freq = READ_ONCE(cpudata->nominal_freq);
+     lowest_nonlinear_freq = READ_ONCE(cpudata-
 >lowest_nonlinear_freq);
      if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
dev_err(dev, "min_freq(%d) or max_freq(%d) value is
incorrect\n",

Quoted 3 lines

                              min_freq, max_freq);

--
2.34.1

[Meng, Li (Jassmine)]

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #9 lore raw

PATCH v9 5/8 cpufreq: amd-pstate: Bail out if min/max/nominal_freq is 0

The amd-pstate driver cannot work when the min_freq, nominal_freq or the max_freq is zero. When this happens it is prudent to error out early on rather than waiting failing at the time of the governor initialization.

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

drivers/cpufreq/amd-pstate.c +10 -6

index 132330b4942f..6708c436e1a2 100644
@@ -839,9 +839,11 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
 	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
 
-	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
-		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
-			min_freq, max_freq);
+	if (min_freq <= 0 || max_freq <= 0 ||
+	    nominal_freq <= 0 || min_freq > max_freq) {
+		dev_err(dev,
+			"min_freq(%d) or max_freq(%d) or nominal_freq (%d) value is incorrect\n",
+			min_freq, max_freq, nominal_freq);
 		ret = -EINVAL;
 		goto free_cpudata1;
 	}

@@ -1299,9 +1301,11 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	max_freq = READ_ONCE(cpudata->max_freq);
 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
 	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
-	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
-		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
-				min_freq, max_freq);
+	if (min_freq <= 0 || max_freq <= 0 ||
+	    nominal_freq <= 0 || min_freq > max_freq) {
+		dev_err(dev,
+			"min_freq(%d) or max_freq(%d) or nominal_freq(%d) value is incorrect\n",
+			min_freq, max_freq, nominal_freq);
 		ret = -EINVAL;
 		goto free_cpudata1;
 	}

Signature · 1 line

2.34.1

Gautham R. Shenoy

Reviewed-by on v9 5/8

2024-03-19 09:57 UTC #10 lore raw

Re: [PATCH v9 5/8] cpufreq: amd-pstate: Bail out if min/max/nominal_freq is 0

Hello Perry,

Quoted 5 lines · Perry Yuan

The amd-pstate driver cannot work when the min_freq, nominal_freq or the max_freq is zero. When this happens it is prudent to error out early on rather than waiting failing at the time of the governor initialization.

This patch looks good to me.

Quoted 42 lines

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

drivers/cpufreq/amd-pstate.c +10 -6

index 132330b4942f..6708c436e1a2 100644
@@ -839,9 +839,11 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
 	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
 
-	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
-		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
-			min_freq, max_freq);
+	if (min_freq <= 0 || max_freq <= 0 ||
+	    nominal_freq <= 0 || min_freq > max_freq) {
+		dev_err(dev,
+			"min_freq(%d) or max_freq(%d) or nominal_freq (%d) value is incorrect\n",
+			min_freq, max_freq, nominal_freq);
 		ret = -EINVAL;
 		goto free_cpudata1;
 	}

@@ -1299,9 +1301,11 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
 	max_freq = READ_ONCE(cpudata->max_freq);
 	nominal_freq = READ_ONCE(cpudata->nominal_freq);
 	lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
-	if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
-		dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
-				min_freq, max_freq);
+	if (min_freq <= 0 || max_freq <= 0 ||
+	    nominal_freq <= 0 || min_freq > max_freq) {
+		dev_err(dev,
+			"min_freq(%d) or max_freq(%d) or nominal_freq(%d) value is incorrect\n",
+			min_freq, max_freq, nominal_freq);
 		ret = -EINVAL;
 		goto free_cpudata1;
 	}

Signature · 1 line

2.34.1

--
Thanks and Regards
gautham.

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #11 lore raw

PATCH v9 6/8 cpufreq: amd-pstate: get transition delay and latency value from ACPI tables

Make pstate driver initially retrieve the P-state transition delay and latency values from the BIOS ACPI tables which has more reasonable delay and latency values according to the platform design and requirements.

Previously there values were hardcoded at specific value which may have conflicted with platform and it might not reflect the most accurate or optimized setting for the processor.

[054h 0084   8]                Preserve Mask : FFFFFFFF00000000
[05Ch 0092   8]                   Write Mask : 0000000000000001
[064h 0100   4]              Command Latency : 00000FA0
[068h 0104   4]          Maximum Access Rate : 0000EA60
[06Ch 0108   2]      Minimum Turnaround Time : 0000

Reviewed-by Mario Limonciello <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

drivers/cpufreq/amd-pstate.c +32 -2

index 6708c436e1a2..ec049b62b366 100644
@@ -756,6 +756,36 @@ static void amd_pstate_update_limits(unsigned int cpu)
 	mutex_unlock(&amd_pstate_driver_lock);
 }
 
+/**
+ * Get pstate transition delay time from ACPI tables that firmware set
+ * instead of using hardcode value directly.
+ */
+static u32 amd_pstate_get_transition_delay_us(unsigned int cpu)
+{
+	u32 transition_delay_ns;
+
+	transition_delay_ns = cppc_get_transition_latency(cpu);
+	if (transition_delay_ns == CPUFREQ_ETERNAL)
+		return AMD_PSTATE_TRANSITION_DELAY;
+
+	return transition_delay_ns / NSEC_PER_USEC;
+}
+
+/**
+ * Get pstate transition latency value from ACPI tables that firmware
+ * set instead of using hardcode value directly.
+ */
+static u32 amd_pstate_get_transition_latency(unsigned int cpu)
+{
+	u32 transition_latency;
+
+	transition_latency = cppc_get_transition_latency(cpu);
+	if (transition_latency  == CPUFREQ_ETERNAL)
+		return AMD_PSTATE_TRANSITION_LATENCY;
+
+	return transition_latency;
+}
+
 /**
  * amd_pstate_init_freq: Initialize the max_freq, min_freq,
  *                       nominal_freq and lowest_nonlinear_freq for

@@ -848,8 +878,8 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
 		goto free_cpudata1;
 	}
 
-	policy->cpuinfo.transition_latency = AMD_PSTATE_TRANSITION_LATENCY;
-	policy->transition_delay_us = AMD_PSTATE_TRANSITION_DELAY;
+	policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
+	policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
 
 	policy->min = min_freq;
 	policy->max = max_freq;

Signature · 1 line

2.34.1

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #12 lore raw

PATCH v9 7/8 cppc_acpi: print error message if CPPC is unsupported

The amd-pstate driver can fail when _CPC objects are not supported by the CPU. However, the current error message is ambiguous (see below) and there is no clear way for attributing the failure of the amd-pstate driver to the lack of CPPC support.

[    0.477523] amd_pstate: the _CPC object is not present in SBIOS or ACPI disabled

Fix this by adding an debug message to notify the user if the amd-pstate driver failed to load due to CPPC not be supported by the CPU

Reviewed-by Mario Limonciello <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/acpi/cppc_acpi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

drivers/acpi/cppc_acpi.c +3 -1

index 4bfbe55553f4..3134101f31b6 100644
@@ -686,8 +686,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)
 
 	if (!osc_sb_cppc2_support_acked) {
 		pr_debug("CPPC v2 _OSC not acked\n");
-		if (!cpc_supported_by_cpu())
+		if (!cpc_supported_by_cpu()) {
+			pr_debug("CPPC is not supported by the CPU\n");
 			return -ENODEV;
+		}
 	}
 
 	/* Parse the ACPI _CPC table for this CPU. */

Signature · 1 line

2.34.1

Perry Yuan

author reviewer

2024-03-19 08:29 UTC #13 lore raw

PATCH v9 8/8 cpufreq: amd-pstate: Add quirk for the pstate CPPC capabilities missing

Add quirks table to get CPPC capabilities issue fixed by providing correct perf or frequency values while driver loading.

If CPPC capabilities are not defined in the ACPI tables or wrongly defined by platform firmware, it needs to use quick to get those issues fixed with correct workaround values to make pstate driver can be loaded even though there are CPPC capabilities errors.

The workaround will match the broken BIOS which lack of CPPC capabilities nominal_freq and lowest_freq definition in the ACPI table.

$ cat /sys/devices/system/cpu/cpu0/acpi_cppc/lowest_freq
0
$ cat /sys/devices/system/cpu/cpu0/acpi_cppc/nominal_freq
0

Reviewed-by Mario Limonciello <[email protected]>

Signed-off-by Perry Yuan <[email protected]>

---
 drivers/cpufreq/amd-pstate.c | 53 ++++++++++++++++++++++++++++++++++--
 include/linux/amd-pstate.h   |  6 ++++
 2 files changed, 57 insertions(+), 2 deletions(-)

drivers/cpufreq/amd-pstate.c +51 -2

index ec049b62b366..59a2db225d98 100644
@@ -67,6 +67,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 struct quirk_entry *quirks;
 
 /*
  * AMD Energy Preference Performance (EPP)

@@ -111,6 +112,41 @@ static unsigned int epp_values[] = {
 
 typedef int (*cppc_mode_transition_fn)(int);
 
+static struct quirk_entry quirk_amd_7k62 = {
+	.nominal_freq = 2600,
+	.lowest_freq = 550,
+};
+
+static int __init dmi_matched_7k62_bios_bug(const struct dmi_system_id *dmi)
+{
+	/**
+	 * match the broken bios for family 17h processor support CPPC V2
+	 * broken BIOS lack of nominal_freq and lowest_freq capabilities
+	 * definition in ACPI tables
+	 */
+	if (boot_cpu_has(X86_FEATURE_ZEN2)) {
+		quirks = dmi->driver_data;
+		pr_info("Overriding nominal and lowest frequencies for %s\n", dmi->ident);
+		return 1;
+	}
+
+	return 0;
+}
+
+static const struct dmi_system_id amd_pstate_quirks_table[] __initconst = {
+	{
+		.callback = dmi_matched_7k62_bios_bug,
+		.ident = "AMD EPYC 7K62",
+		.matches = {
+			DMI_MATCH(DMI_BIOS_VERSION, "5.14"),
+			DMI_MATCH(DMI_BIOS_RELEASE, "12/12/2019"),
+		},
+		.driver_data = &quirk_amd_7k62,
+	},
+	{}
+};
+MODULE_DEVICE_TABLE(dmi, amd_pstate_quirks_table);
+
 static inline int get_mode_idx_from_str(const char *str, size_t size)
 {
 	int i;

@@ -812,8 +848,16 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
 	if (ret)
 		return ret;
 
-	min_freq = cppc_perf.lowest_freq * 1000;
-	nominal_freq = cppc_perf.nominal_freq * 1000;
+	if (quirks && quirks->lowest_freq)
+		min_freq = quirks->lowest_freq * 1000;
+	else
+		min_freq = cppc_perf.lowest_freq * 1000;
+
+	if (quirks && quirks->nominal_freq)
+		nominal_freq = quirks->nominal_freq * 1000;
+	else
+		nominal_freq = cppc_perf.nominal_freq * 1000;
+
 	nominal_perf = READ_ONCE(cpudata->nominal_perf);
 
 	highest_perf = READ_ONCE(cpudata->highest_perf);

@@ -1662,6 +1706,11 @@ static int __init amd_pstate_init(void)
 	if (cpufreq_get_current_driver())
 		return -EEXIST;
 
+	quirks = NULL;
+
+	/* check if this machine need CPPC quirks */
+	dmi_check_system(amd_pstate_quirks_table);
+
 	switch (cppc_state) {
 	case AMD_PSTATE_UNDEFINED:
 		/* Disable on the following configs by default:

include/linux/amd-pstate.h +6 -0

index ab7e82533718..6b832153a126 100644
@@ -128,4 +128,10 @@ static const char * const amd_pstate_mode_string[] = {
 	[AMD_PSTATE_GUIDED]      = "guided",
 	NULL,
 };
+
+struct quirk_entry {
+	u32 nominal_freq;
+	u32 lowest_freq;
+};
+
 #endif /* _LINUX_AMD_PSTATE_H */

Signature · 1 line

2.34.1

Ugwekar, Dhananjay

Tested-by on the v9 series

2024-03-20 10:48 UTC #14 lore raw