Skip to content

Commit

Permalink
PCI: read bridge windows before filling in subtractive decode resources
Browse files Browse the repository at this point in the history
No 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.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Bjorn Helgaas authored and Jesse Barnes committed Feb 23, 2010
1 parent fa27b2d commit 2adf751
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2adf751

Please sign in to comment.