patch 'power: enable CPPC' has been queued to stable release 22.11.7

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/25/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/2bb52b6763e360c1811cb0e80967d9eccfd77a1d

Thanks.

Luca Boccassi

---
From 2bb52b6763e360c1811cb0e80967d9eccfd77a1d Mon Sep 17 00:00:00 2001
From: Wathsala Vithanage <wathsala.vithanage@arm.com>
Date: Thu, 10 Oct 2024 14:17:36 +0000
Subject: [PATCH] power: enable CPPC

[ upstream commit 35220c7cb3aff022b3a41919139496326ef6eecc ]

Power library already supports Linux CPPC driver,
but initialization was failing.
Enable its use in the drivers check,
and fix the name of the CPPC driver name.

Fixes: ef1cc88f1837 ("power: support cppc_cpufreq driver")

Signed-off-by: Wathsala Vithanage <wathsala.vithanage@arm.com>
Reviewed-by: Dhruv Tripathi <dhruv.tripathi@arm.com>
---
 lib/power/power_cppc_cpufreq.c |  2 +-
 lib/power/rte_power_pmd_mgmt.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c
index fc9cffef91..d6cc58cb3b 100644
--- a/lib/power/power_cppc_cpufreq.c
+++ b/lib/power/power_cppc_cpufreq.c
@@ -35,7 +35,7 @@
 #define POWER_SYSFILE_SYS_MAX \
 		"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_max_freq"
 
-#define POWER_CPPC_DRIVER "cppc-cpufreq"
+#define POWER_CPPC_DRIVER "cppc_cpufreq"
 #define BUS_FREQ     100000
 
 enum power_state {
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index f9a2606e6c..18a9819289 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -419,10 +419,11 @@ check_scale(unsigned int lcore)
 {
 	enum power_management_env env;
 
-	/* only PSTATE and ACPI modes are supported */
+	/* only PSTATE, ACPI and CPPC modes are supported */
 	if (!rte_power_check_env_supported(PM_ENV_ACPI_CPUFREQ) &&
-	    !rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ)) {
-		RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes are supported\n");
+			!rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ) &&
+			!rte_power_check_env_supported(PM_ENV_CPPC_CPUFREQ)) {
+		RTE_LOG(DEBUG, POWER, "Only ACPI, PSTATE, or CPPC modes are supported\n");
 		return -ENOTSUP;
 	}
 	/* ensure we could initialize the power library */
@@ -431,8 +432,9 @@ check_scale(unsigned int lcore)
 
 	/* ensure we initialized the correct env */
 	env = rte_power_get_env();
-	if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ) {
-		RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes were initialized\n");
+	if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ &&
+			env != PM_ENV_CPPC_CPUFREQ) {
+		RTE_LOG(DEBUG, POWER, "Unable to initialize ACPI, PSTATE, or CPPC modes\n");
 		return -ENOTSUP;
 	}
 
-- 
2.45.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-10-23 22:16:41.306702521 +0100
+++ 0020-power-enable-CPPC.patch	2024-10-23 22:16:40.451940874 +0100
@@ -1 +1 @@
-From 35220c7cb3aff022b3a41919139496326ef6eecc Mon Sep 17 00:00:00 2001
+From 2bb52b6763e360c1811cb0e80967d9eccfd77a1d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 35220c7cb3aff022b3a41919139496326ef6eecc ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- lib/power/rte_power_pmd_mgmt.c | 11 ++++++-----
- 2 files changed, 7 insertions(+), 6 deletions(-)
+ lib/power/rte_power_pmd_mgmt.c | 12 +++++++-----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
@@ -22 +23 @@
-index 32aaacb948..e68b39b424 100644
+index fc9cffef91..d6cc58cb3b 100644
@@ -25 +26 @@
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
@@ -35 +36 @@
-index b1c18a5f56..830a6c7a97 100644
+index f9a2606e6c..18a9819289 100644
@@ -38 +39 @@
-@@ -419,11 +419,12 @@ check_scale(unsigned int lcore)
+@@ -419,10 +419,11 @@ check_scale(unsigned int lcore)
@@ -43 +44 @@
-+	/* only PSTATE, AMD-PSTATE, ACPI and CPPC modes are supported */
++	/* only PSTATE, ACPI and CPPC modes are supported */
@@ -45,4 +46,3 @@
- 			!rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ) &&
--			!rte_power_check_env_supported(PM_ENV_AMD_PSTATE_CPUFREQ)) {
--		POWER_LOG(DEBUG, "Neither ACPI nor PSTATE modes are supported");
-+			!rte_power_check_env_supported(PM_ENV_AMD_PSTATE_CPUFREQ) &&
+-	    !rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ)) {
+-		RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes are supported\n");
++			!rte_power_check_env_supported(PM_ENV_PSTATE_CPUFREQ) &&
@@ -50 +50 @@
-+		POWER_LOG(DEBUG, "Only ACPI, PSTATE, AMD-PSTATE, or CPPC modes are supported");
++		RTE_LOG(DEBUG, POWER, "Only ACPI, PSTATE, or CPPC modes are supported\n");
@@ -54 +54,2 @@
-@@ -433,8 +434,8 @@ check_scale(unsigned int lcore)
+@@ -431,8 +432,9 @@ check_scale(unsigned int lcore)
+ 
@@ -57,5 +58,5 @@
- 	if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ &&
--			env != PM_ENV_AMD_PSTATE_CPUFREQ) {
--		POWER_LOG(DEBUG, "Neither ACPI nor PSTATE modes were initialized");
-+			env != PM_ENV_AMD_PSTATE_CPUFREQ && env != PM_ENV_CPPC_CPUFREQ) {
-+		POWER_LOG(DEBUG, "Unable to initialize ACPI, PSTATE, AMD-PSTATE, or CPPC modes");
+-	if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ) {
+-		RTE_LOG(DEBUG, POWER, "Neither ACPI nor PSTATE modes were initialized\n");
++	if (env != PM_ENV_ACPI_CPUFREQ && env != PM_ENV_PSTATE_CPUFREQ &&
++			env != PM_ENV_CPPC_CPUFREQ) {
++		RTE_LOG(DEBUG, POWER, "Unable to initialize ACPI, PSTATE, or CPPC modes\n");