diff options
| author | Val Packett <val@packett.cool> | 2023-02-06 21:50:13 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2023-02-06 21:56:39 +0000 |
| commit | 393b0ba25f1a54dcc3f94244933c665f1c471d1a (patch) | |
| tree | 5bf718431f161a438b9224a1d9a77a534c507b19 | |
| parent | f374ba41f55c1a127303d92d830dd58eef2f5243 (diff) | |
| download | src-393b0ba25f1a54dcc3f94244933c665f1c471d1a.tar.gz src-393b0ba25f1a54dcc3f94244933c665f1c471d1a.zip | |
LinuxKPI: return an address string in pci_name()
amdgpu's virtual display feature uses pci_name() to match a module parameter
string, and the documentation shows an example of `0000:26:00.0` for the name.
In our case the name was just `drmn`, which is not actually unique across
devices.
The other consumers are wireless drivers, which will benefit from this
change.
Generate the expected string for pci_name() to return.
Related to: https://github.com/freebsd/drm-kmod/issues/134
Sponsored by: https://www.patreon.com/valpackett
Reviewed by: bz, hselasky, manu (earlier)
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D34248
| -rw-r--r-- | sys/compat/linuxkpi/common/include/linux/pci.h | 4 | ||||
| -rw-r--r-- | sys/compat/linuxkpi/common/src/linux_pci.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 596241525904..c9ebdf546696 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -334,6 +334,7 @@ struct pci_dev { phys_addr_t rom; size_t romlen; struct msi_desc **msi_desc; + char *path_name; TAILQ_HEAD(, pci_mmio_region) mmio; }; @@ -454,8 +455,7 @@ pci_resource_flags(struct pci_dev *pdev, int bar) 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 index 9db95e1f337d..0d9b2827365f 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -307,6 +307,9 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) 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() @@ -350,6 +353,7 @@ lkpinew_pci_dev_release(struct device *dev) free(pdev->msi_desc[i], M_DEVBUF); free(pdev->msi_desc, M_DEVBUF); } + kfree(pdev->path_name); free(pdev, M_DEVBUF); } |