Date: Tue, 24 Mar 2020 19:20:10 +0000 (UTC) From: Conrad Meyer <cem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359283 - head/sys/net Message-ID: <202003241920.02OJKAIE040251@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cem Date: Tue Mar 24 19:20:10 2020 New Revision: 359283 URL: https://svnweb.freebsd.org/changeset/base/359283 Log: Fix PNP matching for iflib NIC drivers The previous descriptor string specified that all fields were significant for match. However, the only significant fields for in-tree drivers are vendor:devid, and the fictitious zero values constructed by PVID() did not match real subvendor, subdevice, revision, and/or class values, resulting in no automatic probe. If a future iflib driver needs to match on other criteria, the descriptor string can be updated accordingly. (E.g., "V32" and ~0 for unspecified values in PVID().) Reported by: mav Sponsored by: Dell EMC Isilon Modified: head/sys/net/iflib.h Modified: head/sys/net/iflib.h ============================================================================== --- head/sys/net/iflib.h Tue Mar 24 19:12:28 2020 (r359282) +++ head/sys/net/iflib.h Tue Mar 24 19:20:10 2020 (r359283) @@ -173,8 +173,9 @@ typedef struct pci_vendor_info { #define PVID_OEM(vendor, devid, svid, sdevid, revid, name) {vendor, devid, svid, sdevid, revid, 0, name} #define PVID_END {0, 0, 0, 0, 0, 0, NULL} -#define IFLIB_PNP_DESCR "U32:vendor;U32:device;U32:subvendor;U32:subdevice;" \ - "U32:revision;U32:class;D:#" +/* No drivers in tree currently match on anything except vendor:device. */ +#define IFLIB_PNP_DESCR "U32:vendor;U32:device;U32:#;U32:#;" \ + "U32:#;U32:#;D:#" #define IFLIB_PNP_INFO(b, u, t) \ MODULE_PNP_INFO(IFLIB_PNP_DESCR, b, u, t, nitems(t) - 1)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003241920.02OJKAIE040251>