D34248.id116544.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34248.id116544.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
	@@ -340,6 +340,7 @@
	struct msi_desc *msi_desc;

	TAILQ_HEAD(, pci_mmio_region) mmio;
	+ char *path_name;
	};

	/* We need some meta-struct to keep track of these for devres. */
	@@ -458,8 +459,7 @@
	static inline const char *
	pci_name(struct pci_dev *d)
	{
	-
	- return device_get_desc(d->dev.bsddev);
	+ return d->path_name;
	}

	static inline void *
	diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
	--- a/sys/compat/linuxkpi/common/src/linux_pci.c
	+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
	@@ -307,6 +307,8 @@
	pdev->subsystem_device = pci_get_subdevice(dev);
	pdev->class = pci_get_class(dev);
	pdev->revision = pci_get_revid(dev);
	+ pdev->path_name = kasprintf(GFP_KERNEL, "%04d:%02d:%02d.%d",
	+ pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev));
	pdev->bus = malloc(sizeof(*pdev->bus), M_DEVBUF, M_WAITOK \| M_ZERO);
	/*
	* This should be the upstream bridge; pci_upstream_bridge()
	@@ -341,6 +343,7 @@
	free(pdev->bus, M_DEVBUF);
	if (pdev->msi_desc != NULL)
	free(pdev->msi_desc, M_DEVBUF);
	+ kfree(pdev->path_name);
	free(pdev, M_DEVBUF);
	}