From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760956AbZEMRXj (ORCPT ); Wed, 13 May 2009 13:23:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757541AbZEMRX3 (ORCPT ); Wed, 13 May 2009 13:23:29 -0400 Received: from outbound-mail-36.bluehost.com ([69.89.20.190]:58489 "HELO outbound-mail-36.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754906AbZEMRX2 (ORCPT ); Wed, 13 May 2009 13:23:28 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=JsP3uL56Qb/N22RWDfAimHFNegHbFGfuzOKXJ+48Pgo3P4Djr2T0w5LdRe1safmLkeJRm5SiLUd66gndZr5KyROWCJTc/AJR/beCQuuJ7Ek6v5Rh3yUkCggWSLLSj0zk; Date: Wed, 13 May 2009 10:23:16 -0700 From: Jesse Barnes To: Jeremy Fitzhardinge Cc: Ingo Molnar , the arch/x86 maintainers , Matthew Wilcox , Joerg Roedel , FUJITA Tomonori , Linux Kernel Mailing List , Xen-devel , Alex Nixon , Jeremy Fitzhardinge Subject: Re: [PATCH 06/10] x86/PCI: Enable scanning of all pci functions Message-ID: <20090513102316.5ef3ce4e@jbarnes-g45> In-Reply-To: <4A0AFE84.2040805@goop.org> References: <1242164891-3859-1-git-send-email-jeremy@goop.org> <1242164891-3859-7-git-send-email-jeremy@goop.org> <20090513095535.140134e1@jbarnes-g45> <4A0AFE84.2040805@goop.org> X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.28.251 authed with jbarnes@virtuousgeek.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 13 May 2009 10:08:20 -0700 Jeremy Fitzhardinge wrote: > Jesse Barnes wrote: > > On Tue, 12 May 2009 14:48:07 -0700 > > Jeremy Fitzhardinge wrote: > > > > > >> From: Alex Nixon > >> > >> Xen may want to enable scanning of all pci functions - if for > >> example the device at function 0 is not passed through to the > >> guest, but the device at function 1 is. > >> > >> [Impact: allow passthrough of just some PCI functions.] > >> Signed-off-by: Alex Nixon > >> Signed-off-by: Jeremy Fitzhardinge > >> Reviewed-by: "H. Peter Anvin" > >> Reviewed-by: Matthew Wilcox > >> --- > >> arch/x86/include/asm/pci.h | 8 +++++++- > >> arch/x86/pci/common.c | 1 + > >> 2 files changed, 8 insertions(+), 1 deletions(-) > >> > >> diff --git a/arch/x86/include/asm/pci.h > >> b/arch/x86/include/asm/pci.h index b51a1e8..092706e 100644 > >> --- a/arch/x86/include/asm/pci.h > >> +++ b/arch/x86/include/asm/pci.h > >> @@ -21,6 +21,7 @@ struct pci_sysdata { > >> extern int pci_routeirq; > >> extern int noioapicquirk; > >> extern int noioapicreroute; > >> +extern int pci_scan_all_fns; > >> > >> /* scan a bus after allocating a pci_sysdata for it */ > >> extern struct pci_bus *pci_scan_bus_on_node(int busno, struct > >> pci_ops *ops, @@ -48,7 +49,11 @@ extern unsigned int > >> pcibios_assign_all_busses(void); #else > >> #define pcibios_assign_all_busses() 0 > >> #endif > >> -#define pcibios_scan_all_fns(a, b) 0 > >> + > >> +static inline int pcibios_scan_all_fns(struct pci_bus *bus, int > >> devfn) +{ > >> + return pci_scan_all_fns; > >> +} > >> > >> extern unsigned long pci_mem_start; > >> #define PCIBIOS_MIN_IO 0x1000 > >> @@ -130,6 +135,7 @@ extern void pci_iommu_alloc(void); > >> > >> /* generic pci stuff */ > >> #include > >> +#undef pcibios_scan_all_fns > >> > > > > This is a little gross... But then I don't see any places where it's > > actually defined to something true either. > > I've got some code to set it in a series I haven't posted yet. > > > Maybe it should be a weak > > function or a new HAVE_FOO define instead. > > > > I'd probably go the weak function path if I were to do either of > those, but do you think it would be significantly better? Well it would avoid the #undef, which is the gross part. But since it's just a boolean, you could also do #ifndef PCI_SCAN_ALL_FNS #define PCI_SCAN_ALL_FNS 0 #endif in the generic code, then just set it to 1 before asm-generic/pci.h gets included. That would mean updating arch code though. Anyway it's not a big deal, this code is already ugly (a 0 define for all arches? why?) so you shouldn't have to spend too much time cleaning it up. -- Jesse Barnes, Intel Open Source Technology Center