Skip to content

Commit

Permalink
cpupower: fix breakage from libpci API change
Browse files Browse the repository at this point in the history
libpci 3.3.0 introduced an additional member in the pci_filter struct
which needs to be initialized to -1 to get the same behavior as before
the API change. The libpci internal helpers got updated accordingly,
but as the cpupower pci helpers initialized the struct themselves the
behavior changed.

Use the libpci helper pci_filter_init() to fix this and guard against
similar breakages in the future.

This fixes probing of the AMD fam12h/14h cpuidle monitor on systems
with libpci >= 3.3.0.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Lucas Stach authored and Rafael J. Wysocki committed Apr 15, 2015
1 parent 39a8804 commit 06b230e
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions tools/power/cpupower/utils/helpers/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,21 @@
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 = { domain, bus, slot, func,
vendor, dev };
struct pci_filter filter_nb_link;
struct pci_dev *device;

*pacc = pci_alloc();
if (*pacc == NULL)
return NULL;

pci_filter_init(*pacc, &filter_nb_link);
filter_nb_link.domain = domain;
filter_nb_link.bus = bus;
filter_nb_link.slot = slot;
filter_nb_link.func = func;
filter_nb_link.vendor = vendor;
filter_nb_link.device = dev;

pci_init(*pacc);
pci_scan_bus(*pacc);

Expand Down

0 comments on commit 06b230e

Please sign in to comment.