Merge branch 'pci/resource' into next

* pci/resource:
  PCI: Allocate 64-bit BARs above 4G when possible
  PCI: Enforce bus address limits in resource allocation
  PCI: Split out bridge window override of minimum allocation address
  agp/ati: Use PCI_COMMAND instead of hard-coded 4
  agp/intel: Use CPU physical address, not bus address, for ioremap()
  agp/intel: Use pci_bus_address() to get GTTADR bus address
  agp/intel: Use pci_bus_address() to get MMADR bus address
  agp/intel: Support 64-bit GMADR
  agp/intel: Rename gtt_bus_addr to gtt_phys_addr
  drm/i915: Rename gtt_bus_addr to gtt_phys_addr
  agp: Use pci_resource_start() to get CPU physical address for BAR
  agp: Support 64-bit APBASE
  PCI: Add pci_bus_address() to get bus address of a BAR
  PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_dev
  PCI: Change pci_bus_region addresses to dma_addr_t

diff --cc arch/x86/include/asm/pci.h
Simple merge

diff --cc drivers/pci/bus.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/setup-bus.c
index 2e344a5581ae0416054a934aba274802947a99c7,79339822d80ec7507892a3fc9341da8d2bcd00d0..138bdd6393be87b2ebc63ba35b1b4edaa228b8ad
--- 1/drivers/pci/setup-bus.c
--- 2/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@@ -547,12 -546,13 +547,12 @@@ static void pci_setup_bridge_io(struct 
  
        /* Set up the top and bottom of the PCI I/O segment for this bus. */
        res = bus->resource[0];
-       pcibios_resource_to_bus(bridge, &region, res);
+       pcibios_resource_to_bus(bridge->bus, &region, res);
        if (res->flags & IORESOURCE_IO) {
 -              pci_read_config_dword(bridge, PCI_IO_BASE, &l);
 -              l &= 0xffff0000;
 +              pci_read_config_word(bridge, PCI_IO_BASE, &l);
                io_base_lo = (region.start >> 8) & io_mask;
                io_limit_lo = (region.end >> 8) & io_mask;
 -              l |= ((u32) io_limit_lo << 8) | io_base_lo;
 +              l = ((u16) io_limit_lo << 8) | io_base_lo;
                /* Set up upper 16 bits of I/O base/limit. */
                io_upper16 = (region.end & 0xffff0000) | (region.start >> 16);
                dev_info(&bridge->dev, "  bridge window %pR\n", res);

diff --cc include/linux/pci.h
Simple merge