On Sat, Mar 21, 2009 at 01:54:09AM +0800, Jesse Barnes wrote: > On Fri, 20 Mar 2009 11:25:11 +0800 > Yu Zhao <yu.zhao@xxxxxxxxx> wrote: > > > If a device has the SR-IOV capability, initialize it (set the ARI > > Capable Hierarchy in the lowest numbered PF if necessary; calculate > > the System Page Size for the VF MMIO, probe the VF Offset, Stride > > and BARs). A lock for the VF bus allocation is also initialized if > > a PF is the lowest numbered PF. > > > > Reviewed-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> > > Signed-off-by: Yu Zhao <yu.zhao@xxxxxxxxx> > > I applied this series to my linux-next branch, but there were a few > conflicts here and there, so please check it out. Looks like from > start to finish this took about 6 months to get banged into shape, > thanks for staying on it, Yu! Yes, I checked them and found there is conflict between the SR-IOV changes and Yinghai's 'PCI/x86: detect host bridge config space size w/o using quirks'. Following is the fix, thanks! New pci_cfg_space_size() needs invalid pdev->class, put it in the right place in the pci_setup_device(). Signed-off-by: Yu Zhao <yu.zhao@xxxxxxxxx> --- drivers/pci/probe.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 56c71e5..e2f3dd0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -713,7 +713,6 @@ int pci_setup_device(struct pci_dev *dev) dev->dev.bus = &pci_bus_type; dev->hdr_type = hdr_type & 0x7f; dev->multifunction = !!(hdr_type & 0x80); - dev->cfg_size = pci_cfg_space_size(dev); dev->error_state = pci_channel_io_normal; set_pcie_port_type(dev); @@ -738,6 +737,9 @@ int pci_setup_device(struct pci_dev *dev) dev_dbg(&dev->dev, "found [%04x:%04x] class %06x header type %02x\n", dev->vendor, dev->device, class, dev->hdr_type); + /* need to have dev->class ready */ + dev->cfg_size = pci_cfg_space_size(dev); + /* "Unknown power state" */ dev->current_state = PCI_UNKNOWN; @@ -959,9 +961,6 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn) return NULL; } - /* need to have dev->class ready */ - dev->cfg_size = pci_cfg_space_size(dev); - return dev; } -- 1.5.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
