5 files changed, 44 insertions, 43 deletions

diff --git a/tools/power/cpupower/utils/cpuidle-info.c b/tools/power/cpupower/utils/cpuidle-info.c
index b028267c1376..8145af5f93a6 100644
--- a/tools/power/cpupower/utils/cpuidle-info.c
+++ b/tools/power/cpupower/utils/cpuidle-info.c
@@ -35,17 +35,9 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose)
                 printf(_("CPU %u: Can't read idle state info\n"), cpu);
                 return;
         }
-        tmp = sysfs_get_idlestate_name(cpu, idlestates - 1);
-        if (!tmp) {
-                printf(_("Could not determine max idle state %u\n"),
-                       idlestates - 1);
-                return;
-        }
-
         printf(_("Number of idle states: %d\n"), idlestates);
-
         printf(_("Available idle states:"));
-        for (idlestate = 1; idlestate < idlestates; idlestate++) {
+        for (idlestate = 0; idlestate < idlestates; idlestate++) {
                 tmp = sysfs_get_idlestate_name(cpu, idlestate);
                 if (!tmp)
                         continue;
@@ -57,7 +49,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose)
         if (!verbose)
                 return;
 
-        for (idlestate = 1; idlestate < idlestates; idlestate++) {
+        for (idlestate = 0; idlestate < idlestates; idlestate++) {
                 tmp = sysfs_get_idlestate_name(cpu, idlestate);
                 if (!tmp)
                         continue;
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
index 87d5605bdda8..6437ef39aeea 100644
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -112,14 +112,12 @@ int decode_pstates(unsigned int cpu, unsigned int cpu_family,
 int amd_pci_get_num_boost_states(int *active, int *states)
 {
         struct pci_access *pci_acc;
-        int vendor_id = 0x1022;
-        int boost_dev_ids[4] = {0x1204, 0x1604, 0x1704, 0};
         struct pci_dev *device;
         uint8_t val = 0;
 
         *active = *states = 0;
 
-        device = pci_acc_init(&pci_acc, vendor_id, boost_dev_ids);
+        device = pci_slot_func_init(&pci_acc, 0x18, 4);
 
         if (device == NULL)
                 return -ENODEV;
diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
index 2747e738efb0..2eb584cf2f55 100644
--- a/tools/power/cpupower/utils/helpers/helpers.h
+++ b/tools/power/cpupower/utils/helpers/helpers.h
@@ -66,8 +66,8 @@ enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN = 0, X86_VENDOR_INTEL,
 #define CPUPOWER_CAP_AMD_CBP            0x00000004
 #define CPUPOWER_CAP_PERF_BIAS          0x00000008
 #define CPUPOWER_CAP_HAS_TURBO_RATIO    0x00000010
-#define CPUPOWER_CAP_IS_SNB             0x00000011
-#define CPUPOWER_CAP_INTEL_IDA          0x00000012
+#define CPUPOWER_CAP_IS_SNB             0x00000020
+#define CPUPOWER_CAP_INTEL_IDA          0x00000040
 
 #define MAX_HW_PSTATES 10
 
@@ -132,8 +132,11 @@ extern unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu);
 
 /* PCI stuff ****************************/
 extern int amd_pci_get_num_boost_states(int *active, int *states);
-extern struct pci_dev *pci_acc_init(struct pci_access **pacc, int vendor_id,
-                                    int *dev_ids);
+extern struct pci_dev *pci_acc_init(struct pci_access **pacc, int domain,
+                                    int bus, int slot, int func, int vendor,
+                                    int dev);
+extern struct pci_dev *pci_slot_func_init(struct pci_access **pacc,
+                                              int slot, int func);
 
 /* PCI stuff ****************************/
 
diff --git a/tools/power/cpupower/utils/helpers/pci.c b/tools/power/cpupower/utils/helpers/pci.c
index cd2eb6fe41c4..9690798e6446 100644
--- a/tools/power/cpupower/utils/helpers/pci.c
+++ b/tools/power/cpupower/utils/helpers/pci.c
@@ -10,19 +10,24 @@
  * **pacc : if a valid pci_dev is returned
  *         *pacc must be passed to pci_acc_cleanup to free it
  *
- * vendor_id : the pci vendor id matching the pci device to access
- * dev_ids :   device ids matching the pci device to access
+ * domain: domain
+ * bus:    bus
+ * slot:   slot
+ * func:   func
+ * vendor: vendor
+ * device: device
+ * Pass -1 for one of the six above to match any
  *
  * Returns :
  * struct pci_dev which can be used with pci_{read,write}_* functions
  *                to access the PCI config space of matching pci devices
  */
-struct pci_dev *pci_acc_init(struct pci_access **pacc, int vendor_id,
-                                    int *dev_ids)
+struct pci_dev *pci_acc_init(struct pci_access **pacc, int domain, int bus,
+                             int slot, int func, int vendor, int dev)
 {
-        struct pci_filter filter_nb_link = { -1, -1, -1, -1, vendor_id, 0};
+        struct pci_filter filter_nb_link = { domain, bus, slot, func,
+                                             vendor, dev };
         struct pci_dev *device;
-        unsigned int i;
 
         *pacc = pci_alloc();
         if (*pacc == NULL)
@@ -31,14 +36,20 @@ struct pci_dev *pci_acc_init(struct pci_access **pacc, int vendor_id,
         pci_init(*pacc);
         pci_scan_bus(*pacc);
 
-        for (i = 0; dev_ids[i] != 0; i++) {
-                filter_nb_link.device = dev_ids[i];
-                for (device = (*pacc)->devices; device; device = device->next) {
-                        if (pci_filter_match(&filter_nb_link, device))
-                                return device;
-                }
+        for (device = (*pacc)->devices; device; device = device->next) {
+                if (pci_filter_match(&filter_nb_link, device))
+                        return device;
         }
         pci_cleanup(*pacc);
         return NULL;
 }
+
+/* Typically one wants to get a specific slot(device)/func of the root domain
+   and bus */
+struct pci_dev *pci_slot_func_init(struct pci_access **pacc, int slot,
+                                       int func)
+{
+        return pci_acc_init(pacc, 0, 0, slot, func, -1, -1);
+}
+
 #endif /* defined(__i386__) || defined(__x86_64__) */
diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
index 202e555988be..2116df9ad832 100644
--- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
@@ -20,8 +20,6 @@
 #include "idle_monitor/cpupower-monitor.h"
 #include "helpers/helpers.h"
 
-/******** PCI parts could go into own file and get shared ***************/
-
 #define PCI_NON_PC0_OFFSET      0xb0
 #define PCI_PC1_OFFSET          0xb4
 #define PCI_PC6_OFFSET          0xb8
@@ -82,10 +80,7 @@ static cstate_t amd_fam14h_cstates[AMD_FAM14H_STATE_NUM] = {
 };
 
 static struct pci_access *pci_acc;
-static int pci_vendor_id = 0x1022;
-static int pci_dev_ids[2] = {0x1716, 0};
 static struct pci_dev *amd_fam14h_pci_dev;
-
 static int nbp1_entered;
 
 struct timespec start_time;
@@ -286,13 +281,13 @@ struct cpuidle_monitor *amd_fam14h_register(void)
         if (cpupower_cpu_info.vendor != X86_VENDOR_AMD)
                 return NULL;
 
-        if (cpupower_cpu_info.family == 0x14) {
-                if (cpu_count <= 0 || cpu_count > 2) {
-                        fprintf(stderr, "AMD fam14h: Invalid cpu count: %d\n",
-                                cpu_count);
-                        return NULL;
-                }
-        } else
+        if (cpupower_cpu_info.family == 0x14)
+                strncpy(amd_fam14h_monitor.name, "Fam_14h",
+                        MONITOR_NAME_LEN - 1);
+        else if (cpupower_cpu_info.family == 0x12)
+                strncpy(amd_fam14h_monitor.name, "Fam_12h",
+                        MONITOR_NAME_LEN - 1);
+        else
                 return NULL;
 
         /* We do not alloc for nbp1 machine wide counter */
@@ -303,7 +298,9 @@ struct cpuidle_monitor *amd_fam14h_register(void)
                                               sizeof(unsigned long long));
         }
 
-        amd_fam14h_pci_dev = pci_acc_init(&pci_acc, pci_vendor_id, pci_dev_ids);
+        /* We need PCI device: Slot 18, Func 6, compare with BKDG
+           for fam 12h/14h */
+        amd_fam14h_pci_dev = pci_slot_func_init(&pci_acc, 0x18, 6);
         if (amd_fam14h_pci_dev == NULL || pci_acc == NULL)
                 return NULL;
 
@@ -325,7 +322,7 @@ static void amd_fam14h_unregister(void)
 }
 
 struct cpuidle_monitor amd_fam14h_monitor = {
-        .name                   = "Ontario",
+        .name                   = "",
         .hw_states              = amd_fam14h_cstates,
         .hw_states_num          = AMD_FAM14H_STATE_NUM,
         .start                  = amd_fam14h_start,