lkml.org 
[lkml]   [2009]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 005/100] PCI/x86: detect host bridge config space size w/o using quirks
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Yinghai Lu <yinghai@kernel.org>

    upstream commit: dfadd9edff498d767008edc6b2a6e86a7a19934d

    Many host bridges support a 4k config space, so check them directy
    instead of using quirks to add them.

    We only need to do this extra check for host bridges at this point,
    because only host bridges are known to have extended address space
    without also having a PCI-X/PCI-E caps. Other devices with this
    property could be done with quirks (if there are any).

    As a bonus, we can remove the quirks for AMD host bridges with family
    10h and 11h since they're not needed any more.

    With this patch, we can get correct pci cfg size of new Intel CPUs/IOHs
    with host bridges.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    arch/x86/pci/fixup.c | 20 --------------------
    drivers/pci/probe.c | 9 ++++++++-
    2 files changed, 8 insertions(+), 21 deletions(-)

    --- a/arch/x86/pci/fixup.c
    +++ b/arch/x86/pci/fixup.c
    @@ -495,26 +495,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
    pci_siemens_interrupt_controller);

    /*
    - * Regular PCI devices have 256 bytes, but AMD Family 10h/11h CPUs have
    - * 4096 bytes configuration space for each function of their processor
    - * configuration space.
    - */
    -static void amd_cpu_pci_cfg_space_size(struct pci_dev *dev)
    -{
    - dev->cfg_size = pci_cfg_space_size_ext(dev);
    -}
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1300, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1301, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1302, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1303, amd_cpu_pci_cfg_space_size);
    -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1304, amd_cpu_pci_cfg_space_size);
    -
    -/*
    * SB600: Disable BAR1 on device 14.0 to avoid HPET resources from
    * confusing the PCI engine:
    */
    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -847,6 +847,11 @@ int pci_cfg_space_size(struct pci_dev *d
    {
    int pos;
    u32 status;
    + u16 class;
    +
    + class = dev->class >> 8;
    + if (class == PCI_CLASS_BRIDGE_HOST)
    + return pci_cfg_space_size_ext(dev);

    pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
    if (!pos) {
    @@ -936,7 +941,6 @@ static struct pci_dev *pci_scan_device(s
    dev->multifunction = !!(hdr_type & 0x80);
    dev->vendor = l & 0xffff;
    dev->device = (l >> 16) & 0xffff;
    - dev->cfg_size = pci_cfg_space_size(dev);
    dev->error_state = pci_channel_io_normal;
    set_pcie_port_type(dev);

    @@ -952,6 +956,9 @@ static struct pci_dev *pci_scan_device(s
    return NULL;
    }

    + /* need to have dev->class ready */
    + dev->cfg_size = pci_cfg_space_size(dev);
    +
    return dev;
    }



    \
     
     \ /
      Last update: 2009-04-23 09:31    [W:2.066 / U:0.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site