D53862.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53862.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
	--- a/sys/compat/linuxkpi/common/include/linux/pci.h
	+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
	@@ -1122,19 +1122,28 @@
	static inline enum pci_bus_speed
	pcie_get_speed_cap(struct pci_dev *dev)
	{
	+ struct pci_dev *pbus;
	device_t root;
	uint32_t lnkcap, lnkcap2;
	int error, pos;

	- root = device_get_parent(dev->dev.bsddev);
	- if (root == NULL)
	- return (PCI_SPEED_UNKNOWN);
	- root = device_get_parent(root);
	- if (root == NULL)
	- return (PCI_SPEED_UNKNOWN);
	- root = device_get_parent(root);
	- if (root == NULL)
	- return (PCI_SPEED_UNKNOWN);
	+ /*
	+ * We should always be called on a PCI device.
	+ * The only current consumer I could find was amdgpu which either
	+ * calls us directly on a pdev(drmn?) or with the result of
	+ * pci_upstream_bridge().
	+ *
	+ * Treat "drmn" as special again as it is not a PCI device.
	+ */
	+ if (dev->pdrv != NULL && dev->pdrv->isdrm) {
	+ pbus = pci_upstream_bridge(dev);
	+ if (pbus == NULL)
	+ return (PCI_SPEED_UNKNOWN);
	+ } else
	+ pbus = dev;
	+
	+ /* Root is a very misleading name as it is not the Host-PCI bridge. */
	+ root = pbus->dev.bsddev;

	if (pci_get_vendor(root) == PCI_VENDOR_ID_VIA \|\|
	pci_get_vendor(root) == PCI_VENDOR_ID_SERVERWORKS)