Commit 853346e4 authored by Yu Zhao's avatar Yu Zhao Committed by Jesse Barnes
Browse files

PCI: fix conflict between SR-IOV and config space sizing 



New pci_cfg_space_size() needs invalid pdev->class, put it in the
right place in the pci_setup_device().

Signed-off-by: default avatarYu Zhao <yu.zhao@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ceb93a9f

drivers/pci/probe.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}