From owner-svn-src-stable-12@freebsd.org Fri Feb 1 10:05:52 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id A782414CEA78;
Fri, 1 Feb 2019 10:05:52 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 0D6768564E;
Fri, 1 Feb 2019 10:05:52 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83BBE1D698;
Fri, 1 Feb 2019 10:05:51 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x11A5pBq042701;
Fri, 1 Feb 2019 10:05:51 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x11A5pZq042700;
Fri, 1 Feb 2019 10:05:51 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201902011005.x11A5pZq042700@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 1 Feb 2019 10:05:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r343654 - in stable/12/sys/compat/linuxkpi/common:
include/linux src
X-SVN-Group: stable-12
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: in stable/12/sys/compat/linuxkpi/common: include/linux src
X-SVN-Commit-Revision: 343654
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 0D6768564E
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.94 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
NEURAL_HAM_LONG(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.94)[-0.941,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
<svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>,
<mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2019 10:05:53 -0000
Author: hselasky
Date: Fri Feb 1 10:05:50 2019
New Revision: 343654
URL: https://svnweb.freebsd.org/changeset/base/343654
Log:
MFC r343451:
Add full support for PCI_ANY_ID when matching PCI IDs in the LinuxKPI.
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/compat/linuxkpi/common/include/linux/pci.h
stable/12/sys/compat/linuxkpi/common/src/linux_pci.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/compat/linuxkpi/common/include/linux/pci.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/pci.h Fri Feb 1 10:04:54 2019 (r343653)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/pci.h Fri Feb 1 10:05:50 2019 (r343654)
@@ -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
Modified: stable/12/sys/compat/linuxkpi/common/src/linux_pci.c
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/src/linux_pci.c Fri Feb 1 10:04:54 2019 (r343653)
+++ stable/12/sys/compat/linuxkpi/common/src/linux_pci.c Fri Feb 1 10:05:50 2019 (r343654)
@@ -82,14 +82,21 @@ linux_pci_find(device_t dev, const struct pci_device_i
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);