cpupower: Add function to print AMD P-State performance capabilities

AMD P-State kernel module is using the fine grain frequency instead of
acpi hardware pstate. So add a function to print performance and
frequency values.

Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
index b429454..235243e 100644 (file)
--- a/tools/power/cpupower/utils/cpufreq-info.c
+++ b/tools/power/cpupower/utils/cpufreq-info.c
@@ -146,9 +146,12 @@ static int get_boost_mode_x86(unsigned int cpu)
        printf(_("    Supported: %s\n"), support ? _("yes") : _("no"));
        printf(_("    Active: %s\n"), active ? _("yes") : _("no"));
 
-       if ((cpupower_cpu_info.vendor == X86_VENDOR_AMD &&
-            cpupower_cpu_info.family >= 0x10) ||
-            cpupower_cpu_info.vendor == X86_VENDOR_HYGON) {
+       if (cpupower_cpu_info.vendor == X86_VENDOR_AMD &&
+           cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATE) {
+               return 0;
+       } else if ((cpupower_cpu_info.vendor == X86_VENDOR_AMD &&
+                   cpupower_cpu_info.family >= 0x10) ||
+                  cpupower_cpu_info.vendor == X86_VENDOR_HYGON) {
                ret = decode_pstates(cpu, b_states, pstates, &pstate_no);
                if (ret)
                        return ret;

diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
index f5ba528..c519cc8 100644 (file)
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -193,5 +193,34 @@ void amd_pstate_boost_init(unsigned int cpu, int *support, int *active)
        *active = cpuinfo_max == amd_pstate_max ? 1 : 0;
 }
 
+void amd_pstate_show_perf_and_freq(unsigned int cpu, int no_rounding)
+{
+       printf(_("    AMD PSTATE Highest Performance: %lu. Maximum Frequency: "),
+              amd_pstate_get_data(cpu, AMD_PSTATE_HIGHEST_PERF));
+       /*
+        * If boost isn't active, the cpuinfo_max doesn't indicate real max
+        * frequency. So we read it back from amd-pstate sysfs entry.
+        */
+       print_speed(amd_pstate_get_data(cpu, AMD_PSTATE_MAX_FREQ), no_rounding);
+       printf(".\n");
+
+       printf(_("    AMD PSTATE Nominal Performance: %lu. Nominal Frequency: "),
+              acpi_cppc_get_data(cpu, NOMINAL_PERF));
+       print_speed(acpi_cppc_get_data(cpu, NOMINAL_FREQ) * 1000,
+                   no_rounding);
+       printf(".\n");
+
+       printf(_("    AMD PSTATE Lowest Non-linear Performance: %lu. Lowest Non-linear Frequency: "),
+              acpi_cppc_get_data(cpu, LOWEST_NONLINEAR_PERF));
+       print_speed(amd_pstate_get_data(cpu, AMD_PSTATE_LOWEST_NONLINEAR_FREQ),
+                   no_rounding);
+       printf(".\n");
+
+       printf(_("    AMD PSTATE Lowest Performance: %lu. Lowest Frequency: "),
+              acpi_cppc_get_data(cpu, LOWEST_PERF));
+       print_speed(acpi_cppc_get_data(cpu, LOWEST_FREQ) * 1000, no_rounding);
+       printf(".\n");
+}
+
 /* AMD P-State Helper Functions ************************************/
 #endif /* defined(__i386__) || defined(__x86_64__) */

diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
index fa2a8c1..96e4bed 100644 (file)
--- a/tools/power/cpupower/utils/helpers/helpers.h
+++ b/tools/power/cpupower/utils/helpers/helpers.h
@@ -142,6 +142,8 @@ extern int cpufreq_has_boost_support(unsigned int cpu, int *support,
 bool cpupower_amd_pstate_enabled(void);
 void amd_pstate_boost_init(unsigned int cpu,
                           int *support, int *active);
+void amd_pstate_show_perf_and_freq(unsigned int cpu,
+                                  int no_rounding);
 
 /* AMD P-State stuff **************************/
 
@@ -182,6 +184,9 @@ static inline bool cpupower_amd_pstate_enabled(void)
 static inline void amd_pstate_boost_init(unsigned int cpu, int *support,
                                         int *active)
 {}
+static inline void amd_pstate_show_perf_and_freq(unsigned int cpu,
+                                                int no_rounding)
+{}
 
 /* cpuid and cpuinfo helpers  **************************/