From dec5165be206583d7a4fb285706e8831b5d7aaf2 Mon Sep 17 00:00:00 2001
From: hselasky <hselasky@FreeBSD.org>
Date: Fri, 25 Jan 2019 20:13:28 +0000
Subject: [PATCH] Add full support for PCI_ANY_ID when matching PCI IDs in the
 LinuxKPI.

MFC after:		1 week
Sponsored by:		Mellanox Technologies
---
 sys/compat/linuxkpi/common/include/linux/pci.h |  2 +-
 sys/compat/linuxkpi/common/src/linux_pci.c     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
index a83278923427..60feeeca6001 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -71,7 +71,7 @@ struct pci_device_id {
 #define	PCI_BASE_CLASS_BRIDGE		0x06
 #define	PCI_CLASS_BRIDGE_ISA		0x0601
 
-#define	PCI_ANY_ID		(-1)
+#define	PCI_ANY_ID			-1U
 #define	PCI_VENDOR_ID_APPLE		0x106b
 #define	PCI_VENDOR_ID_ASUSTEK		0x1043
 #define	PCI_VENDOR_ID_ATI		0x1002
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
index 899256bdacc8..72651a238da6 100644
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -82,14 +82,21 @@ linux_pci_find(device_t dev, const struct pci_device_id **idp)
 	struct pci_driver *pdrv;
 	uint16_t vendor;
 	uint16_t device;
+	uint16_t subvendor;
+	uint16_t subdevice;
 
 	vendor = pci_get_vendor(dev);
 	device = pci_get_device(dev);
+	subvendor = pci_get_subvendor(dev);
+	subdevice = pci_get_subdevice(dev);
 
 	spin_lock(&pci_lock);
 	list_for_each_entry(pdrv, &pci_drivers, links) {
 		for (id = pdrv->id_table; id->vendor != 0; id++) {
-			if (vendor == id->vendor && device == id->device) {
+			if (vendor == id->vendor &&
+			    (PCI_ANY_ID == id->device || device == id->device) &&
+			    (PCI_ANY_ID == id->subvendor || subvendor == id->subvendor) &&
+			    (PCI_ANY_ID == id->subdevice || subdevice == id->subdevice)) {
 				*idp = id;
 				spin_unlock(&pci_lock);
 				return (pdrv);
@@ -145,8 +152,8 @@ linux_pci_attach(device_t dev)
 	pdev->dev.bsddev = dev;
 	INIT_LIST_HEAD(&pdev->dev.irqents);
 	pdev->devfn = PCI_DEVFN(pci_get_slot(dev), pci_get_function(dev));
-	pdev->device = id->device;
-	pdev->vendor = id->vendor;
+	pdev->device = dinfo->cfg.device;
+	pdev->vendor = dinfo->cfg.vendor;
 	pdev->subsystem_vendor = dinfo->cfg.subvendor;
 	pdev->subsystem_device = dinfo->cfg.subdevice;
 	pdev->class = pci_get_class(dev);