From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763559AbZEHAUP (ORCPT ); Thu, 7 May 2009 20:20:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758974AbZEHAKX (ORCPT ); Thu, 7 May 2009 20:10:23 -0400 Received: from adsl-76-233-236-102.dsl.pltn13.sbcglobal.net ([76.233.236.102]:52722 "EHLO abulafia.goop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753554AbZEHAJ6 (ORCPT ); Thu, 7 May 2009 20:09:58 -0400 From: Jeremy Fitzhardinge To: Ingo Molnar Cc: the arch/x86 maintainers , Linux Kernel Mailing List , Xen-devel , Alex Nixon , Jeremy Fitzhardinge Subject: [PATCH 06/11] x86/PCI: Enable scanning of all pci functions Date: Thu, 7 May 2009 14:45:32 -0700 Message-Id: <1241732737-7669-7-git-send-email-jeremy@goop.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241732737-7669-1-git-send-email-jeremy@goop.org> References: <1241732737-7669-1-git-send-email-jeremy@goop.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Nixon Impact: prep for pcifront 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. Signed-off-by: Alex Nixon Signed-off-by: Jeremy Fitzhardinge Reviewed-by: "H. Peter Anvin" --- 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 #ifdef CONFIG_NUMA /* Returns the node based on pci bus */ diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 6e736e2..171accb 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -22,6 +22,7 @@ unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 | unsigned int pci_early_dump_regs; static int pci_bf_sort; int pci_routeirq; +int pci_scan_all_fns = 0; int noioapicquirk; #ifdef CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS int noioapicreroute = 0; -- 1.6.0.6