diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:25:33 -0700 |
---|---|---|
committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:25:33 -0700 |
commit | b72e0b86de15db007b31ea2b79a8a4ca873d8aa8 (patch) | |
tree | a1a3c26594f6a590a0b189334f93bc280d0d6373 | |
parent | 6756093252d7e9971da15460205285a7dcd8222c (diff) | |
download | linux-yinghai-b72e0b86de15db007b31ea2b79a8a4ca873d8aa8.tar.gz |
PCI: Try to allocate mem64 above 4G at first
Will fall back to below 4g if it can not find any above 4g.
x86 32bit without X86_PAE support will have bottom set to 0, because
resource_size_t is 32bit.
Also for 32bit with resource_size_t 64bit kernel on machine with pae support
we are safe because iomem_resource is limited to 32bit according to
x86_phys_bits.
-v2: update bottom assigning to make it clear for non-pae support machine.
-v3: Bjorn's change:
use MAX_REOURCE instead of -1
use start/end instead of bottom/max
for all arch instead of just x86_64
-v4: updated after PCI_MAX_RESOURCE_32 change.
-v5: restore io handling to use PCI_MAX_RESOURCE_32 as limit.
-v6: checking pcibios_resource_to_bus return for every bus res, to decide it
if we need to try high at first.
It supports all arches instead of just x86_64.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r-- | arch/x86/include/asm/pci.h | 1 | ||||
-rw-r--r-- | drivers/pci/bus.c | 42 | ||||
-rw-r--r-- | drivers/pci/pci.h | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 4 |
4 files changed, 36 insertions, 13 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index df75d07571ceac..27aa0d58ffe034 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -149,7 +149,6 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq); /* generic pci stuff */ #include <asm-generic/pci.h> -#define PCIBIOS_MAX_MEM_32 0xffffffff #ifdef CONFIG_NUMA /* Returns the node based on pci bus */ diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index a85247d05efd6f..b4aae0f086ccff 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -125,15 +125,13 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, { int i, ret = -ENOMEM; struct resource *r; - resource_size_t max = -1; type_mask |= IORESOURCE_IO | IORESOURCE_MEM; - /* don't allocate too high if the pref mem doesn't support 64bit*/ - if (!(res->flags & IORESOURCE_MEM_64)) - max = PCIBIOS_MAX_MEM_32; - pci_bus_for_each_resource(bus, r, i) { + resource_size_t start, end, middle; + struct pci_bus_region region; + if (!r) continue; @@ -147,14 +145,42 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, !(res->flags & IORESOURCE_PREFETCH)) continue; + start = 0; + end = MAX_RESOURCE; + /* + * don't allocate too high if the pref mem doesn't + * support 64bit, also if this is a 64-bit mem + * resource, try above 4GB first + */ + __pcibios_resource_to_bus(bus, ®ion, r); + if (region.start <= PCI_MAX_ADDR_32 && + region.end > PCI_MAX_ADDR_32) { + middle = pcibios_bus_addr_to_res(bus, res->flags, + PCI_MAX_ADDR_32); + if (res->flags & IORESOURCE_MEM_64) + start = middle + 1; + else + end = middle; + } else if (region.start > PCI_MAX_ADDR_32 && + !(res->flags & IORESOURCE_MEM_64)) + continue; + +again: /* Ok, try it out.. */ ret = allocate_resource(r, res, size, - r->start ? : min, - max, align, + max(start, r->start ? : min), + end, align, alignf, alignf_data); if (ret == 0) - break; + return 0; + + if (start != 0) { + start = 0; + goto again; + } } + + return ret; } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index bacbcba69cf386..0697604c71b6ca 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -203,6 +203,8 @@ enum pci_bar_type { pci_bar_mem64, /* A 64-bit memory BAR */ }; +#define PCI_MAX_ADDR_32 ((resource_size_t)0xffffffff) + bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *pl, int crs_timeout); extern int pci_setup_device(struct pci_dev *dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index ae020d48351dd9..f3181a2bd0fc27 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1505,10 +1505,6 @@ static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) #include <asm/pci.h> -#ifndef PCIBIOS_MAX_MEM_32 -#define PCIBIOS_MAX_MEM_32 (-1) -#endif - /* these helpers provide future and backwards compatibility * for accessing popular PCI BAR info */ #define pci_resource_start(dev, bar) (pci_dev_resource_n(dev, (bar))->start) |