PCI: try "pci=use_crs" again
Subsystems (7)
v5 cover PCI: try "pci=use_crs" again
Historically, Linux has assumed a single PCI host bridge, with that bridge claiming all the address space left after RAM and legacy devices are taken out.
If the system contains multiple host bridges, we can no longer operate under that assumption. We have to know what parts of the address space are claimed by each bridge so that when we assign resources to a PCI device, we take them from a range claimed by the upstream host bridge.
On x86 and ia64, we use ACPI to enumerate all the PCI host bridges in the system, and part of the host bridge description is the "_CRS" (current resource settings" property, which lists the address space used by the bridge. On x86, we currently ignore most of the _CRS information. This patch series changes this, so we will use _CRS to learn about the host bridge windows.
Since most x86 machines with multiple host bridges are relatively new, this series only turns this on for machines with BIOS dates of 2008 or newer.
Changes from v4 to v5:
- Add EXPORT_SYMBOL_GPL(pci_bus_resource_n) for module builds.
Changes from v3 to v4:
- Keep the bus->resource[] table to avoid having to change all arches at once, but reduce it to size 4 (minimum required for P2P & CardBus bridges).
- Store additional host bridge or subtractive decode windows in a list.
- Add pci_bus_for_each_resource() iterator to hide PCI_BUS_NUM_RESOURCES and the table/list split. This reduces the size of the main patch.
- Remove tidy-up patches completely; they feel like distractions to this series.
Changes from v2 to v3:
- Fix alpha, powerpc, and mn10300 references to pci_bus resource table
- Turn on "pci=use_crs" for 2008 and newer, not 2010 and newer
- Remove Toshiba A355 quirk (BIOS date is 2009, so automatically included)
- Remove IBM x3850 and x3950 quirks (BIOS dates in 2008, so automatically included)
- Leave IBM x3800 quirk (pre-2008 BIOS)
- Use "bool" for pci_use_crs (new to me, but I see akpm suggesting it)
- Reorder so the important patches are first
Changes from v1 to v2:
- Rebase to be6e9f7853e
- Add patch to clean up "disabled window" printk
- Add bugzilla reference comment in use_crs DMI quirk
---
Bjorn Helgaas (5):
PCI: split up pci_read_bridge_bases()
PCI: read bridge windows before filling in subtractive decode resources
PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
PCI: augment bus resource table with a list
x86/PCI: use host bridge _CRS info by default on 2008 and newer machines
Documentation/kernel-parameters.txt | 8 ++- arch/ia64/include/asm/acpi.h | 1 arch/ia64/pci/pci.c | 17 ++----- arch/mn10300/unit-asb2305/pci.c | 6 +- arch/powerpc/kernel/pci-common.c | 11 ++--- arch/powerpc/platforms/fsl_uli1575.c | 12 ++--- arch/x86/include/asm/pci_x86.h | 1 arch/x86/pci/acpi.c | 82 ++++++++++++++++++++-------------- arch/x86/pci/bus_numa.c | 3 + arch/x86/pci/bus_numa.h | 3 - arch/x86/pci/common.c | 3 + drivers/acpi/pci_root.c | 1 drivers/pci/bus.c | 49 +++++++++++++++++++- drivers/pci/hotplug/shpchp_sysfs.c | 9 +--- drivers/pci/pci.c | 5 +- drivers/pci/probe.c | 68 ++++++++++++++++++++++------ drivers/pci/setup-bus.c | 10 ++-- drivers/pcmcia/rsrc_nonstatic.c | 3 - drivers/pcmcia/yenta_socket.c | 5 +- include/acpi/acpi_drivers.h | 1 include/linux/pci.h | 36 +++++++++++++-- 21 files changed, 226 insertions(+), 108 deletions(-)
PATCH v5 1/5 PCI: split up pci_read_bridge_bases()
No functional change; this breaks up pci_read_bridge_bases() into separate pieces for the I/O, memory, and prefetchable memory windows, similar to how Yinghai recently split up pci_setup_bridge() in 68e84ff3bdc.
---
drivers/pci/probe.c | 54 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 39 insertions(+), 15 deletions(-)
drivers/pci/probe.c +39 -15
@@ -281,26 +281,12 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) } } -void __devinit pci_read_bridge_bases (struct pci_bus *child) +static void __devinit pci_read_bridge_io (struct pci_bus *child) {struct pci_dev *dev = child->self;u8 io_base_lo, io_limit_lo; -u16 mem_base_lo, mem_limit_lo;unsigned long base, limit;struct resource *res; -int i; - -if (pci_is_root_bus (child))/* It's a host bus, nothing to read */ -return ; - -dev_info (&dev->dev,"PCI bridge to [bus %02x-%02x]%s\n" , - child->secondary, child->subordinate, - dev->transparent ?" (subtractive decode)" :"" ); - -if (dev->transparent) { -for (i =3 ; i <PCI_BUS_NUM_RESOURCES ; i++) - child->resource[i] = child->parent->resource[i -3 ]; - } res = child->resource[0 ];pci_read_config_byte (dev,PCI_IO_BASE , &io_base_lo);
@@ -328,6 +314,14 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)" bridge window [io %04lx - %04lx] reg reading\n" , base, limit); } +} + +static void __devinit pci_read_bridge_mmio (struct pci_bus *child) +{ +struct pci_dev *dev = child->self; +u16 mem_base_lo, mem_limit_lo; +unsigned long base, limit; +struct resource *res; res = child->resource[1 ];pci_read_config_word (dev,PCI_MEMORY_BASE , &mem_base_lo);
@@ -344,6 +338,14 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)" bridge window [mem 0x%08lx - 0x%08lx] reg reading\n" , base, limit + 0xfffff); } +} + +static void __devinit pci_read_bridge_mmio_pref (struct pci_bus *child) +{ +struct pci_dev *dev = child->self; +u16 mem_base_lo, mem_limit_lo; +unsigned long base, limit; +struct resource *res; res = child->resource[2 ];pci_read_config_word (dev,PCI_PREF_MEMORY_BASE , &mem_base_lo);
@@ -389,6 +391,28 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) } } +void __devinit pci_read_bridge_bases (struct pci_bus *child) +{ +struct pci_dev *dev = child->self; +int i; + +if (pci_is_root_bus (child))/* It's a host bus, nothing to read */ +return ; + +dev_info (&dev->dev,"PCI bridge to [bus %02x-%02x]%s\n" , + child->secondary, child->subordinate, + dev->transparent ?" (subtractive decode)" :"" ); + +if (dev->transparent) { +for (i =3 ; i <PCI_BUS_NUM_RESOURCES ; i++) + child->resource[i] = child->parent->resource[i -3 ]; + } + +pci_read_bridge_io (child); +pci_read_bridge_mmio (child); +pci_read_bridge_mmio_pref (child); +} +static struct pci_bus *pci_alloc_bus (void ) {struct pci_bus *b;
PATCH v5 2/5 PCI: read bridge windows before filling in subtractive decode resources
In reply to Bjorn HelgaasNo functional change; this fills in the bus subtractive decode resources after reading the bridge window information rather than before. Also, print out the subtractive decode resources as we already do for the positive decode windows.
---
drivers/pci/probe.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
drivers/pci/probe.c +10 -5
@@ -403,14 +403,19 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) child->secondary, child->subordinate, dev->transparent ? " (subtractive decode)" : ""); -if (dev->transparent) { -for (i =3 ; i <PCI_BUS_NUM_RESOURCES ; i++) - child->resource[i] = child->parent->resource[i -3 ]; - } -pci_read_bridge_io (child);pci_read_bridge_mmio (child);pci_read_bridge_mmio_pref (child); + +if (dev->transparent) { +for (i =3 ; i <PCI_BUS_NUM_RESOURCES ; i++) { + child->resource[i] = child->parent->resource[i -3 ]; +if (child->resource[i]) +dev_printk (KERN_DEBUG , &dev->dev, +" bridge window %pR (subtractive decode)\n" , + child->resource[i]); + } + } }static struct pci_bus *pci_alloc_bus (void )
PATCH v5 3/5 PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
In reply to Bjorn HelgaasNo functional change; this converts loops that iterate from 0 to PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the pci_bus_for_each_resource() iterator instead.
This doesn't change the way resources are stored; it merely removes dependencies on the fact that they're in a table.
---
arch/ia64/pci/pci.c | 5 ++--- arch/mn10300/unit-asb2305/pci.c | 6 ++---- arch/powerpc/kernel/pci-common.c | 11 ++++------- arch/powerpc/platforms/fsl_uli1575.c | 12 ++++++------ drivers/pci/bus.c | 4 ++-- drivers/pci/hotplug/shpchp_sysfs.c | 9 +++------ drivers/pci/pci.c | 5 ++--- drivers/pci/setup-bus.c | 10 ++++------ drivers/pcmcia/rsrc_nonstatic.c | 3 +-- drivers/pcmcia/yenta_socket.c | 5 +++-- include/linux/pci.h | 3 +++ 11 files changed, 32 insertions(+), 41 deletions(-)
arch/ia64/pci/pci.c +2 -3
@@ -452,13 +452,12 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);static int __devinit is_valid_resource (struct pci_dev *dev,int idx) {unsigned int i, type_mask =IORESOURCE_IO |IORESOURCE_MEM ; -struct resource *devr = &dev->resource[idx]; +struct resource *devr = &dev->resource[idx], *busr;if (!dev->bus)return 0 ; -for (i=0 ; i<PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *busr = dev->bus->resource[i]; +pci_bus_for_each_resource (dev->bus, busr, i) {if (!busr || ((busr->flags ^ devr->flags) & type_mask))continue ; if ((devr->start) && (devr->start >= busr->start) &&
arch/mn10300/unit-asb2305/pci.c +2 -4
@@ -331,12 +331,10 @@ static int __init pci_check_direct(void)static int __devinit is_valid_resource (struct pci_dev *dev,int idx) {unsigned int i, type_mask =IORESOURCE_IO |IORESOURCE_MEM ; -struct resource *devr = &dev->resource[idx]; +struct resource *devr = &dev->resource[idx], *busr;if (dev->bus) { -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *busr = dev->bus->resource[i]; - +pci_bus_for_each_resource (dev->bus, busr, i) {if (!busr || (busr->flags ^ devr->flags) & type_mask)continue ;
arch/powerpc/kernel/pci-common.c +4 -7
@@ -1047,10 +1047,8 @@ static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)struct pci_dev *dev = bus->self; -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; ++i) { -if ((res = bus->resource[i]) ==NULL ) -continue ; -if (!res->flags) +pci_bus_for_each_resource (bus, res, i) { +if (!res || !res->flags)continue ;if (i >=3 && bus->self->transparent)continue ;
@@ -1277,9 +1275,8 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)pr_debug ("PCI: Allocating bus resources for %04x:%02x...\n" ,pci_domain_nr (bus), bus->number); -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; ++i) { -if ((res = bus->resource[i]) ==NULL || !res->flags - || res->start > res->end || res->parent) +pci_bus_for_each_resource (bus, res, i) { +if (!res || !res->flags || res->start > res->end || res->parent)continue ;if (bus->parent ==NULL ) pr = (res->flags & IORESOURCE_IO) ?
arch/powerpc/platforms/fsl_uli1575.c +6 -6
@@ -222,6 +222,7 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev)int i;u8 *dummy;struct pci_bus *bus = dev->bus; +struct resource *res;resource_size_t end =0 ;for (i =PCI_BRIDGE_RESOURCES ; i <PCI_BRIDGE_RESOURCES +3 ; i++) {
@@ -230,13 +231,12 @@ static void __devinit quirk_final_uli5249(struct pci_dev *dev) end =pci_resource_end (dev, i); } -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -if ((bus->resource[i]) && - (bus->resource[i]->flags &IORESOURCE_MEM )) { -if (bus->resource[i]->end == end) - dummy =ioremap (bus->resource[i]->start,0x4 ); +pci_bus_for_each_resource (bus, res, i) { +if (res && res->flags &IORESOURCE_MEM ) { +if (res->end == end) + dummy =ioremap (res->start,0x4 );else - dummy =ioremap (bus->resource[i]->end -3 ,0x4 ); + dummy =ioremap (res->end -3 ,0x4 );if (dummy) {in_8 (dummy);iounmap (dummy);
drivers/pci/bus.c +2 -2
@@ -43,6 +43,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, void *alignf_data) {int i, ret = -ENOMEM ; +struct resource *r;resource_size_t max =-1 ; type_mask |=IORESOURCE_IO |IORESOURCE_MEM ;
@@ -51,8 +52,7 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,if (!(res->flags &IORESOURCE_MEM_64 )) max =PCIBIOS_MAX_MEM_32 ; -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *r = bus->resource[i]; +pci_bus_for_each_resource (bus, r, i) {if (!r)continue ;
drivers/pci/hotplug/shpchp_sysfs.c +3 -6
@@ -47,8 +47,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha bus = pdev->subordinate; out +=sprintf (buf,"Free resources: memory\n" ); -for (index =0 ; index <PCI_BUS_NUM_RESOURCES ; index++) { - res = bus->resource[index]; +pci_bus_for_each_resource (bus, res, index) {if (res && (res->flags &IORESOURCE_MEM ) && !(res->flags &IORESOURCE_PREFETCH )) { out += sprintf(out, "start = %8.8llx, "
@@ -58,8 +57,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha } } out +=sprintf (out,"Free resources: prefetchable memory\n" ); -for (index =0 ; index <PCI_BUS_NUM_RESOURCES ; index++) { - res = bus->resource[index]; +pci_bus_for_each_resource (bus, res, index) {if (res && (res->flags &IORESOURCE_MEM ) && (res->flags &IORESOURCE_PREFETCH )) { out += sprintf(out, "start = %8.8llx, "
@@ -69,8 +67,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha } } out +=sprintf (out,"Free resources: IO\n" ); -for (index =0 ; index <PCI_BUS_NUM_RESOURCES ; index++) { - res = bus->resource[index]; +pci_bus_for_each_resource (bus, res, index) {if (res && (res->flags &IORESOURCE_IO )) { out += sprintf(out, "start = %8.8llx, " "length = %8.8llx\n",
drivers/pci/pci.c +2 -3
@@ -386,10 +386,9 @@ pci_find_parent_resource(const struct pci_dev *dev, struct resource *res) {const struct pci_bus *bus = dev->bus;int i; -struct resource *best =NULL ; +struct resource *best =NULL , *r; -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *r = bus->resource[i]; +pci_bus_for_each_resource (bus, r, i) {if (!r)continue ;if (res->start && !(res->start >= r->start && res->end <= r->end))
drivers/pci/setup-bus.c +4 -6
@@ -387,8 +387,7 @@ static struct resource *find_free_bus_resource(struct pci_bus *bus, unsigned lonunsigned long type_mask =IORESOURCE_IO |IORESOURCE_MEM |IORESOURCE_PREFETCH ; -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { - r = bus->resource[i]; +pci_bus_for_each_resource (bus, r, i) {if (r == &ioport_resource || r == &iomem_resource)continue ;if (r && (r->flags & type_mask) == type && !r->parent)
@@ -803,11 +802,10 @@ static void __ref pci_bus_release_bridge_resources(struct pci_bus *bus,static void pci_bus_dump_res (struct pci_bus *bus) { -int i; - -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *res = bus->resource[i]; +struct resource *res; +int i; +pci_bus_for_each_resource (bus, res, i) {if (!res || !res->end || !res->flags)continue ;
drivers/pcmcia/rsrc_nonstatic.c +1 -2
@@ -803,8 +803,7 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)return -EINVAL ;#endif -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { - res = s->cb_dev->bus->resource[i]; +pci_bus_for_each_resource (s->cb_dev->bus, res, i) {if (!res)continue ;
drivers/pcmcia/yenta_socket.c +3 -2
@@ -649,9 +649,10 @@ static int yenta_search_one_res(struct resource *root, struct resource *res,static int yenta_search_res (struct yenta_socket *socket,struct resource *res,u32 min) { +struct resource *root;int i; -for (i =0 ; i <PCI_BUS_NUM_RESOURCES ; i++) { -struct resource *root = socket->dev->bus->resource[i]; + +pci_bus_for_each_resource (socket->dev->bus, root, i) {if (!root)continue ;
include/linux/pci.h +3 -0
@@ -828,6 +828,9 @@ int pci_request_selected_regions_exclusive(struct pci_dev *, int, const char *);void pci_release_selected_regions (struct pci_dev *,int );/* drivers/pci/bus.c */ +#define pci_bus_for_each_resource (bus, res, i) \ + for (i = 0; res = bus->resource[i], i < PCI_BUS_NUM_RESOURCES; i++) + int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, resource_size_t align, resource_size_t min,
PATCH v5 4/5 PCI: augment bus resource table with a list
In reply to Bjorn HelgaasPreviously we used a table of size PCI_BUS_NUM_RESOURCES (16) for resources forwarded to a bus by its upstream bridge. We've increased this size several times when the table overflowed.
But there's no good limit on the number of resources because host bridges and subtractive decode bridges can forward any number of ranges to their secondary buses.
This patch reduces the table to only PCI_BRIDGE_RESOURCE_NUM (4) entries, which corresponds to the number of windows a PCI-to-PCI (3) or CardBus (4) bridge can positively decode. Any additional resources, e.g., PCI host bridge windows or subtractively-decoded regions, are kept in a list.
I'd prefer a single list rather than this split table/list approach, but that requires simultaneous changes to every architecture. This approach only requires immediate changes where we set up (a) host bridges with more than four windows and (b) subtractive-decode P2P bridges, and we can incrementally change other architectures to use the list.
---
arch/ia64/pci/pci.c | 12 +++--------- arch/x86/pci/acpi.c | 33 ++++----------------------------- arch/x86/pci/bus_numa.c | 3 ++- arch/x86/pci/bus_numa.h | 3 +-- drivers/pci/bus.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 17 +++++++++++++---- include/linux/pci.h | 35 +++++++++++++++++++++++++++++------ 7 files changed, 98 insertions(+), 51 deletions(-)
arch/ia64/pci/pci.c +3 -9
@@ -320,9 +320,9 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)static void __devinit pcibios_setup_root_windows (struct pci_bus *bus,struct pci_controller *ctrl) { -int i, j; +int i; - j =0 ; +pci_bus_remove_resources (bus);for (i =0 ; i < ctrl->windows; i++) {struct resource *res = &ctrl->window[i].resource;/* HP's firmware has a hack to work around a Windows bug.
@@ -330,13 +330,7 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)if ((res->flags &IORESOURCE_MEM ) && (res->end - res->start <16 ))continue ; -if (j >=PCI_BUS_NUM_RESOURCES ) { -dev_warn (&bus->dev, -"ignoring host bridge window %pR (no space)\n" , - res); -continue ; - } - bus->resource[j++] = res; +pci_bus_add_resource (bus, res,0 ); } }
arch/x86/pci/acpi.c +4 -29
@@ -45,20 +45,6 @@ count_resource(struct acpi_resource *acpi_res, void *data)return AE_OK ; } -static int -bus_has_transparent_bridge (struct pci_bus *bus) -{ -struct pci_dev *dev; - -list_for_each_entry (dev, &bus->devices, bus_list) { -u16 class = dev->class >>8 ; - -if (class ==PCI_CLASS_BRIDGE_PCI && dev->transparent) -return true; - } -return false; -} -static void align_resource (struct acpi_device *bridge,struct resource *res) {
@@ -92,12 +78,8 @@ setup_resource(struct acpi_resource *acpi_res, void *data)acpi_status status;unsigned long flags;struct resource *root; -int max_root_bus_resources =PCI_BUS_NUM_RESOURCES ;u64 start, end; -if (bus_has_transparent_bridge (info->bus)) - max_root_bus_resources -=3 ; - status =resource_to_addr (acpi_res, &addr);if (!ACPI_SUCCESS (status))return AE_OK ;
@@ -115,15 +97,6 @@ setup_resource(struct acpi_resource *acpi_res, void *data) start = addr.minimum + addr.translation_offset; end = start + addr.address_length -1 ; -if (info->res_num >= max_root_bus_resources) { -if (pci_probe &PCI_USE__CRS ) -printk (KERN_WARNING "PCI: Failed to allocate " -"0x%lx-0x%lx from %s for %s due to _CRS " -"returning more than %d resource descriptors\n" , - (unsigned long ) start, (unsigned long ) end, - root->name, info->name, max_root_bus_resources); -return AE_OK ; - } res = &info->res[info->res_num]; res->name = info->name;
@@ -143,7 +116,7 @@ setup_resource(struct acpi_resource *acpi_res, void *data)dev_err (&info->bridge->dev,"can't allocate host bridge window %pR\n" , res); }else { - info->bus->resource[info->res_num] = res; +pci_bus_add_resource (info->bus, res,0 ); info->res_num++;if (addr.translation_offset) dev_info(&info->bridge->dev, "host bridge window %pR "
@@ -164,7 +137,9 @@ get_current_resources(struct acpi_device *device, int busnum,struct pci_root_info info;size_t size; -if (!(pci_probe &PCI_USE__CRS )) +if (pci_probe &PCI_USE__CRS ) +pci_bus_remove_resources (bus); +else dev_info (&device->dev,"ignoring host bridge windows from ACPI; " "boot with \"pci=use_crs\" to use them\n" );
arch/x86/pci/bus_numa.c +2 -1
@@ -36,13 +36,14 @@ void x86_pci_root_bus_res_quirks(struct pci_bus *b)printk (KERN_DEBUG "PCI: peer root bus %02x res updated from pci conf\n" , b->number); +pci_bus_remove_resources (b); info = &pci_root_info[i];for (j =0 ; j < info->res_num; j++) {struct resource *res;struct resource *root; res = &info->res[j]; - b->resource[j] = res; +pci_bus_add_resource (b, res,0 );if (res->flags &IORESOURCE_IO ) root = &ioport_resource;else
arch/x86/pci/bus_numa.h +1 -2
@@ -2,8 +2,7 @@/* * sub bus (transparent) will use entres from 3 to store extra from -* root, so need to make sure we have enough slot there, Should we -* increase PCI_BUS_NUM_RESOURCES? +* root, so need to make sure we have enough slot there. */ #define RES_NUM 16struct pci_root_info {
drivers/pci/bus.c +46 -0
52 lines not on this page · raw message
drivers/pci/probe.c +13 -4
@@ -89,6 +89,7 @@ static void release_pcibus_dev(struct device *dev)if (pci_bus->bridge)put_device (pci_bus->bridge); +pci_bus_remove_resources (pci_bus);kfree (pci_bus); }
@@ -394,6 +395,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)void __devinit pci_read_bridge_bases (struct pci_bus *child) {struct pci_dev *dev = child->self; +struct resource *res;int i;if (pci_is_root_bus (child))/* It's a host bus, nothing to read */
@@ -403,17 +405,23 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) child->secondary, child->subordinate, dev->transparent ? " (subtractive decode)" : ""); +pci_bus_remove_resources (child); +for (i =0 ; i <PCI_BRIDGE_RESOURCE_NUM ; i++) + child->resource[i] = &dev->resource[PCI_BRIDGE_RESOURCES +i]; +pci_read_bridge_io (child);pci_read_bridge_mmio (child);pci_read_bridge_mmio_pref (child);if (dev->transparent) { -for (i =3 ; i <PCI_BUS_NUM_RESOURCES ; i++) { - child->resource[i] = child->parent->resource[i -3 ]; -if (child->resource[i]) +pci_bus_for_each_resource (child->parent, res, i) { +if (res) { +pci_bus_add_resource (child, res, +PCI_SUBTRACTIVE_DECODE );dev_printk (KERN_DEBUG , &dev->dev," bridge window %pR (subtractive decode)\n" , - child->resource[i]); + res); + } } } }
@@ -428,6 +436,7 @@ static struct pci_bus * pci_alloc_bus(void)INIT_LIST_HEAD (&b->children);INIT_LIST_HEAD (&b->devices);INIT_LIST_HEAD (&b->slots); +INIT_LIST_HEAD (&b->resources); b->max_bus_speed =PCI_SPEED_UNKNOWN ; b->cur_bus_speed =PCI_SPEED_UNKNOWN ; }
include/linux/pci.h +29 -6
@@ -363,9 +363,26 @@ static inline void pci_add_saved_cap(struct pci_dev *pci_dev,hlist_add_head (&new_cap->next, &pci_dev->saved_cap_space); } -#ifndef PCI_BUS_NUM_RESOURCES -#define PCI_BUS_NUM_RESOURCES 16 -#endif +/* +* The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond +* to P2P or CardBus bridge windows) go in a table. Additional ones (for +* buses below host bridges or subtractive decode bridges) go in the list. +* Use pci_bus_for_each_resource() to iterate through all the resources. +*/ + +/* +* PCI_SUBTRACTIVE_DECODE means the bridge forwards the window implicitly +* and there's no way to program the bridge with the details of the window. +* This does not apply to ACPI _CRS windows, even with the _DEC subtractive- +* decode bit set, because they are explicit and can be programmed with _SRS. +*/ +#define PCI_SUBTRACTIVE_DECODE 0x1 + +struct pci_bus_resource { +struct list_head list; +struct resource *res; +unsigned int flags; +};#define PCI_REGION_FLAG_MASK 0x0fU/* These bits of resource flags tell us the PCI region flags */
@@ -376,8 +393,8 @@ struct pci_bus {struct list_head devices;/* list of devices on this bus */ struct pci_dev *self;/* bridge device as seen by parent */ struct list_head slots;/* list of slots on this bus */ -struct resource *resource[PCI_BUS_NUM_RESOURCES ]; -/* address space routed to this bus */ +struct resource *resource[PCI_BRIDGE_RESOURCE_NUM ]; +struct list_head resources;/* address space routed to this bus */ struct pci_ops *ops;/* configuration access functions */ void *sysdata;/* hook for sys-specific extension */
@@ -828,8 +845,14 @@ int pci_request_selected_regions_exclusive(struct pci_dev *, int, const char *);void pci_release_selected_regions (struct pci_dev *,int );/* drivers/pci/bus.c */ +void pci_bus_add_resource (struct pci_bus *bus,struct resource *res,unsigned int flags); +struct resource *pci_bus_resource_n (const struct pci_bus *bus,int n); +void pci_bus_remove_resources (struct pci_bus *bus); +#define pci_bus_for_each_resource (bus, res, i) \ - for (i = 0; res = bus->resource[i], i < PCI_BUS_NUM_RESOURCES; i++) + for (i = 0; \ + (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ + i++) int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size,
PATCH v5 5/5 x86/PCI: use host bridge _CRS info by default on 2008 and newer machines
In reply to Bjorn HelgaasThe main benefit of using ACPI host bridge window information is that we can do better resource allocation in systems with multiple host bridges, e.g., http://bugzilla.kernel.org/show_bug.cgi?id=14183
Sometimes we need _CRS information even if we only have one host bridge, e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/341681
Most of these systems are relatively new, so this patch turns on "pci=use_crs" only on machines with a BIOS date of 2008 or newer.
---
Documentation/kernel-parameters.txt | 8 ++++- arch/ia64/include/asm/acpi.h | 1 + arch/x86/include/asm/pci_x86.h | 1 + arch/x86/pci/acpi.c | 53 +++++++++++++++++++++++++++++++---- arch/x86/pci/common.c | 3 ++ drivers/acpi/pci_root.c | 1 + include/acpi/acpi_drivers.h | 1 + 7 files changed, 60 insertions(+), 8 deletions(-)
Documentation/kernel-parameters.txt +6 -2
@@ -1939,8 +1939,12 @@ and is between 256 and 4096 characters. It is defined in the file IRQ routing is enabled. noacpi [X86] Do not use ACPI for IRQ routing or for PCI scanning. - use_crs [X86] Use _CRS for PCI resource - allocation. + use_crs [X86] Use PCI host bridge window information + from ACPI. On BIOSes from 2008 or later, this + is enabled by default. If you need to use this, + please report a bug. + nocrs [X86] Ignore PCI host bridge windows from ACPI. + If you need to use this, please report a bug. routeirq Do IRQ routing for all PCI devices. This is normally done in pci_enable_device(), so this option is a temporary workaround
arch/ia64/include/asm/acpi.h +1 -0
@@ -97,6 +97,7 @@ ia64_acpi_release_global_lock (unsigned int *lock)#endif #define acpi_processor_cstate_check (x) (x)/* no idle limits on IA64 :) */ static inline void disable_acpi (void ) { } +static inline void pci_acpi_crs_quirks (void ) { }const char *acpi_get_sysname (void );int acpi_request_vector (u32 int_type);
arch/x86/include/asm/pci_x86.h +1 -0
@@ -29,6 +29,7 @@#define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000#define PCI_HAS_IO_ECS 0x40000#define PCI_NOASSIGN_ROMS 0x80000 +#define PCI_ROOT_NO_CRS 0x100000extern unsigned int pci_probe;extern unsigned long pirq_table_addr;
arch/x86/pci/acpi.c +47 -6
72 lines not on this page · raw message
arch/x86/pci/common.c +3 -0
@@ -520,6 +520,9 @@ char * __devinit pcibios_setup(char *str) }else if (!strcmp (str,"use_crs" )) { pci_probe |=PCI_USE__CRS ;return NULL ; + }else if (!strcmp (str,"nocrs" )) { + pci_probe |=PCI_ROOT_NO_CRS ; +return NULL ; }else if (!strcmp (str,"earlydump" )) { pci_early_dump_regs =1 ;return NULL ;
drivers/acpi/pci_root.c +1 -0
@@ -566,6 +566,7 @@ static int __init acpi_pci_root_init(void)if (acpi_pci_disabled)return 0 ; +pci_acpi_crs_quirks ();if (acpi_bus_register_driver (&acpi_pci_root_driver) <0 )return -ENODEV ;
include/acpi/acpi_drivers.h +1 -0
@@ -104,6 +104,7 @@ int acpi_pci_bind_root(struct acpi_device *device);struct pci_bus *pci_acpi_scan_root (struct acpi_device *device,int domain,int bus); +void pci_acpi_crs_quirks (void );/* -------------------------------------------------------------------------- Processor
Quoted 17 lines · On Tue, 23 Feb 2010 10:24:15 -0700 Bjorn Helgaas <[email protected]> wrote:
Historically, Linux has assumed a single PCI host bridge, with that bridge claiming all the address space left after RAM and legacy devices are taken out.
If the system contains multiple host bridges, we can no longer operate under that assumption. We have to know what parts of the address space are claimed by each bridge so that when we assign resources to a PCI device, we take them from a range claimed by the upstream host bridge.
On x86 and ia64, we use ACPI to enumerate all the PCI host bridges in the system, and part of the host bridge description is the "
_CRS" (current resource settings" property, which lists the address space used by the bridge. On x86, we currently ignore most of the_CRSinformation. This patch series changes this, so we will use_CRSto learn about the host bridge windows.
Quoted 6 lines
Since most x86 machines with multiple host bridges are relatively new, this series only turns this on for machines with BIOS dates of 2008 or newer.
Changes from v4 to v5:
- AddEXPORT_SYMBOL_GPL(pci_bus_resource_n)for module builds.
Thanks, it built this time. Pushed to my linux-next branch.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center