lkml.org 
[lkml]   [2021]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 20/21] cpupower: print amd-pstate information on cpupower
    Date
    amd-pstate kernel module is using the fine grain frequency instead of
    acpi hardware pstate. So the performance and frequency values should be
    printed in frequency-info.

    Signed-off-by: Huang Rui <ray.huang@amd.com>
    ---
    tools/power/cpupower/utils/cpufreq-info.c | 9 ++++---
    tools/power/cpupower/utils/helpers/amd.c | 25 ++++++++++++++++++++
    tools/power/cpupower/utils/helpers/helpers.h | 5 ++++
    3 files changed, 36 insertions(+), 3 deletions(-)

    diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
    index b429454bf3ae..f828f3c35a6f 100644
    --- 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) {
    + amd_pstate_show_perf_and_freq(cpu, no_rounding);
    + } 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 de68c14574c0..d68d052ee4cb 100644
    --- a/tools/power/cpupower/utils/helpers/amd.c
    +++ b/tools/power/cpupower/utils/helpers/amd.c
    @@ -202,5 +202,30 @@ 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));
    + print_speed(amd_pstate_get_data(cpu, AMD_PSTATE_MAX_FREQ), no_rounding);
    + printf(".\n");
    +
    + printf(_(" AMD PSTATE Nominal Performance: %lu. Nominal Frequency: "),
    + amd_pstate_get_data(cpu, AMD_PSTATE_NOMINAL_PERF));
    + print_speed(amd_pstate_get_data(cpu, AMD_PSTATE_NOMINAL_FREQ),
    + no_rounding);
    + printf(".\n");
    +
    + printf(_(" AMD PSTATE Lowest Non-linear Performance: %lu. Lowest Non-linear Frequency: "),
    + amd_pstate_get_data(cpu, AMD_PSTATE_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: "),
    + amd_pstate_get_data(cpu, AMD_PSTATE_LOWEST_PERF));
    + print_speed(amd_pstate_get_data(cpu, AMD_PSTATE_MIN_FREQ), no_rounding);
    + printf(".\n");
    +}
    +
    /* AMD P-States 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 0b0f6a55354e..80755568afc4 100644
    --- a/tools/power/cpupower/utils/helpers/helpers.h
    +++ b/tools/power/cpupower/utils/helpers/helpers.h
    @@ -141,6 +141,8 @@ extern int cpufreq_has_boost_support(unsigned int cpu, int *support,
    extern unsigned long cpupower_amd_pstate_enabled(void);
    extern void amd_pstate_boost_init(unsigned int cpu,
    int *support, int *active);
    +extern void amd_pstate_show_perf_and_freq(unsigned int cpu,
    + int no_rounding);

    /* AMD P-States stuff **************************/

    @@ -181,6 +183,9 @@ static inline unsigned long cpupower_amd_pstate_enabled(void)
    static void amd_pstate_boost_init(unsigned int cpu,
    int *support, int *active)
    { return; }
    +static inline void amd_pstate_show_perf_and_freq(unsigned int cpu,
    + int no_rounding)
    +{ return; }

    /* cpuid and cpuinfo helpers **************************/

    --
    2.25.1
    \
     
     \ /
      Last update: 2021-09-26 11:09    [W:2.726 / U:2.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site