PCI fix
The following changes since commitf469461df6ff822f71b8737bda86eea20f16ff93:
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2010-07-16 11:26:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus
This one hasn't gone through linux-next yet, but it has been tested by the reporter and seems reasonably safe. As always, the pull decision is yours; I don't think this will make anything worse though...
Thanks,
Jesse
Bjorn Helgaas (1):
PCI: fall back to original BIOS BAR addresses
arch/x86/pci/i386.c | 1 + drivers/pci/setup-res.c | 32 ++++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 3 files changed, 34 insertions(+), 0 deletions(-)
arch/x86/pci/i386.c +1 -0
@@ -184,6 +184,7 @@ static void __init pcibios_allocate_resources(int pass) idx, r, disabled, pass);if (pci_claim_resource (dev, idx) <0 ) {/* We'll assign a new address later */ + dev->fw_addr[idx] = r->start; r->end -= r->start; r->start =0 ; }
drivers/pci/setup-res.c +32 -0
@@ -156,6 +156,38 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev, pcibios_align_resource, dev); } +if (ret <0 && dev->fw_addr[resno]) { +struct resource *root, *conflict; +resource_size_t start, end; + +/* +* If we failed to assign anything, let's try the address +* where firmware left it. That at least has a chance of +* working, which is better than just leaving it disabled. +*/ + +if (res->flags &IORESOURCE_IO ) + root = &ioport_resource; +else + root = &iomem_resource; + + start = res->start; + end = res->end; + res->start = dev->fw_addr[resno]; + res->end = res->start + size -1 ; +dev_info (&dev->dev,"BAR %d: trying firmware assignment %pR\n" , + resno, res); + conflict =request_resource_conflict (root, res); +if (conflict) { +dev_info (&dev->dev, +"BAR %d: %pR conflicts with %s %pR\n" , resno, + res, conflict->name, conflict); + res->start = start; + res->end = end; + }else + ret =0 ; + } +if (!ret) { res->flags &= ~IORESOURCE_STARTALIGN ;dev_info (&dev->dev,"BAR %d: assigned %pR\n" , resno, res);
include/linux/pci.h +1 -0
@@ -288,6 +288,7 @@ struct pci_dev {*/ unsigned int irq;struct resource resource[DEVICE_COUNT_RESOURCE ];/* I/O and memory regions + expansion ROMs */ +resource_size_t fw_addr[DEVICE_COUNT_RESOURCE ];/* FW-assigned addr */ /* These fields are used by common fixups */ unsigned int transparent:1; /* Transparent PCI bridge */