[PATCH v2 1/2] power: enable CPPC support in power library

[Wathsala Vithanage]

Power library already supports Linux CPPC driver. Enable its use
and fix the name of the CPPC driver name.

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

diff --git a/.mailmap b/.mailmap
index 8aef1c59a4..a6e99234d1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -343,6 +343,7 @@ Dexia Li <dexia...@jaguarmicro.com>
 Dexuan Cui <de...@microsoft.com>
 Dharmik Thakkar <dharmikjayesh.thak...@arm.com> <dharmik.thak...@arm.com>
 Dheemanth Mallikarjun <dheeman...@vmware.com>
+Dhruv Tripathi <dhruv.tripa...@arm.com>
 Diana Wang <na.w...@corigine.com>
 Didier Pallard <didier.pall...@6wind.com>
 Dilshod Urazov <dilshod.ura...@oktetlabs.ru>
diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c
index 32aaacb948..e68b39b424 100644
--- a/lib/power/power_cppc_cpufreq.c
+++ b/lib/power/power_cppc_cpufreq.c
@@ -36,7 +36,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 b1c18a5f56..830a6c7a97 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -419,11 +419,12 @@ check_scale(unsigned int lcore)
 {
        enum power_management_env env;
 
-       /* only PSTATE and ACPI modes are supported */
+       /* only PSTATE, AMD-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_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_CPPC_CPUFREQ)) {
+               POWER_LOG(DEBUG, "Only ACPI, PSTATE, AMD-PSTATE, or CPPC modes 
are supported");
                return -ENOTSUP;
        }
        /* ensure we could initialize the power library */
@@ -433,8 +434,8 @@ 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 &&
-                       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");
                return -ENOTSUP;
        }
 
-- 
2.34.1