1 files changed, 19 insertions, 4 deletions

diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
index 1609243f5c64..601d719d4e60 100644
--- a/tools/power/cpupower/utils/helpers/misc.c
+++ b/tools/power/cpupower/utils/helpers/misc.c
@@ -2,11 +2,14 @@
 
 #include "helpers/helpers.h"
 
+#define MSR_AMD_HWCR    0xc0010015
+
 int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
                         int *states)
 {
         struct cpupower_cpu_info cpu_info;
         int ret;
+        unsigned long long val;
 
         *support = *active = *states = 0;
 
@@ -16,10 +19,22 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,
 
         if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_CBP) {
                 *support = 1;
-                amd_pci_get_num_boost_states(active, states);
-                if (ret <= 0)
-                        return ret;
-                *support = 1;
+
+                /* AMD Family 0x17 does not utilize PCI D18F4 like prior
+                 * families and has no fixed discrete boost states but
+                 * has Hardware determined variable increments instead.
+                 */
+
+                if (cpu_info.family == 0x17) {
+                        if (!read_msr(cpu, MSR_AMD_HWCR, &val)) {
+                                if (!(val & CPUPOWER_AMD_CPBDIS))
+                                        *active = 1;
+                        }
+                } else {
+                        ret = amd_pci_get_num_boost_states(active, states);
+                        if (ret)
+                                return ret;
+                }
         } else if (cpupower_cpu_info.caps & CPUPOWER_CAP_INTEL_IDA)
                 *support = *active = 1;
         return 0;