lkml.org 
[lkml]   [2009]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/11] x86/PCI: Enable scanning of all pci functions
    Date
    From: Alex Nixon <alex.nixon@citrix.com>

    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 <alex.nixon@citrix.com>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Reviewed-by: "H. Peter Anvin" <hpa@zytor.com>
    ---
    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 <asm-generic/pci.h>
    +#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


    \
     
     \ /
      Last update: 2009-05-08 02:23    [W:0.027 / U:29.668 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site