Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932780AbbDNQ3F (ORCPT ); Tue, 14 Apr 2015 12:29:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:43685 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755518AbbDNQ3B (ORCPT ); Tue, 14 Apr 2015 12:29:01 -0400 From: Thomas Renninger To: Lucas Stach Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rjw@rjwysocki.net Subject: Re: [PATCH] cpupower: fix breakage from libpci API change Date: Tue, 14 Apr 2015 18:28:59 +0200 Message-ID: <6742910.A5LcpWTI3L@skinner> User-Agent: KMail/4.14.6 (Linux/3.16.7-7-desktop; KDE/4.14.6; x86_64; ; ) In-Reply-To: <1428956641-7765-1-git-send-email-dev@lynxeye.de> References: <1428956641-7765-1-git-send-email-dev@lynxeye.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2111 Lines: 62 Hi, On Monday, April 13, 2015 10:24:01 PM Lucas Stach wrote: > 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. Sounds not that clever, but there probably is a reason for this... I am not that familiar with the pci lib and its recent changes, but below patch looks reasonable. Acked-by: Thomas Renninger > 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 > --- > tools/power/cpupower/utils/helpers/pci.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/tools/power/cpupower/utils/helpers/pci.c > b/tools/power/cpupower/utils/helpers/pci.c index 9690798..8b27898 100644 > --- a/tools/power/cpupower/utils/helpers/pci.c > +++ b/tools/power/cpupower/utils/helpers/pci.c > @@ -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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/