[PATCH v2 5/8] cpupower: Update family checks when decoding HW pstates

[Nathan Fontenot]

The family checks in get_cof() and get_did() need to use the
correct MSR format depending on the family. Add a cpupower
capability for using the pstatedef (family 17h and newer) to
control this instead of direct family checks.

Signed-off-by: Nathan Fontenot <nathan.fonte...@amd.com>
---
 tools/power/cpupower/utils/helpers/amd.c     |    8 ++++----
 tools/power/cpupower/utils/helpers/cpuid.c   |    6 +++++-
 tools/power/cpupower/utils/helpers/helpers.h |    1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/power/cpupower/utils/helpers/amd.c 
b/tools/power/cpupower/utils/helpers/amd.c
index fc2ac1e6bfb2..b4731daa6820 100644
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -45,10 +45,10 @@ static int get_did(int family, union core_pstate pstate)
 {
        int t;
 
-       if (family == 0x12)
-               t = pstate.val & 0xf;
-       else if (family == 0x17 || family == 0x18)
+       if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF)
                t = pstate.pstatedef.did;
+       else if (family == 0x12)
+               t = pstate.val & 0xf;
        else
                t = pstate.pstate.did;
 
@@ -61,7 +61,7 @@ static int get_cof(int family, union core_pstate pstate)
        int fid, did, cof;
 
        did = get_did(family, pstate);
-       if (family == 0x17 || family == 0x18) {
+       if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF) {
                fid = pstate.pstatedef.fid;
                cof = 200 * fid / did;
        } else {
diff --git a/tools/power/cpupower/utils/helpers/cpuid.c 
b/tools/power/cpupower/utils/helpers/cpuid.c
index d577220a193b..db2e88ceb67b 100644
--- a/tools/power/cpupower/utils/helpers/cpuid.c
+++ b/tools/power/cpupower/utils/helpers/cpuid.c
@@ -133,9 +133,13 @@ int get_cpu_info(struct cpupower_cpu_info *cpu_info)
                                cpu_info->caps |= CPUPOWER_CAP_AMD_CPB;
 
                        if ((cpuid_edx(0x80000007) & (1 << 7)) &&
-                           cpu_info->family != 0x14)
+                           cpu_info->family != 0x14) {
                                /* HW pstate was not implemented in family 0x14 
*/
                                cpu_info->caps |= CPUPOWER_CAP_AMD_HW_PSTATE;
+
+                               if (cpu_info->family >= 0x17)
+                                       cpu_info->caps |= 
CPUPOWER_CAP_AMD_PSTATEDEF;
+                       }
                }
 
                if (ext_cpuid_level >= 0x80000008 &&
diff --git a/tools/power/cpupower/utils/helpers/helpers.h 
b/tools/power/cpupower/utils/helpers/helpers.h
index 5f61eefff5b2..e4dc44ced770 100644
--- a/tools/power/cpupower/utils/helpers/helpers.h
+++ b/tools/power/cpupower/utils/helpers/helpers.h
@@ -71,6 +71,7 @@ enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN = 0, 
X86_VENDOR_INTEL,
 #define CPUPOWER_CAP_INTEL_IDA         0x00000040
 #define CPUPOWER_CAP_AMD_RDPRU         0x00000080
 #define CPUPOWER_CAP_AMD_HW_PSTATE     0x00000100
+#define CPUPOWER_CAP_AMD_PSTATEDEF     0x00000200
 
 #define CPUPOWER_AMD_CPBDIS            0x02000000