From owner-svn-src-head@freebsd.org Sun Jul 8 20:39:49 2018 Return-Path: Delivered-To: svn-src-head@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 F4041102E254; Sun, 8 Jul 2018 20:39:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A65AF88D2A; Sun, 8 Jul 2018 20:39:48 +0000 (UTC) (envelope-from imp@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 6FF1E2F94; Sun, 8 Jul 2018 20:39:48 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w68KdmXi089920; Sun, 8 Jul 2018 20:39:48 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w68KdmjA089919; Sun, 8 Jul 2018 20:39:48 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807082039.w68KdmjA089919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 8 Jul 2018 20:39:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336101 - head/sys/dev/gem X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/gem X-SVN-Commit-Revision: 336101 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2018 20:39:49 -0000 Author: imp Date: Sun Jul 8 20:39:48 2018 New Revision: 336101 URL: https://svnweb.freebsd.org/changeset/base/336101 Log: Add PNP info to PCI attachment of gem driver Move device table earlier in the file so we can reference it in the PNP_INFO macro. Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy Sponsored by: Google, Inc. (GSoC 2018) Pull Request: https://github.com/bsdimp/freebsd/pull/5 Modified: head/sys/dev/gem/if_gem_pci.c Modified: head/sys/dev/gem/if_gem_pci.c ============================================================================== --- head/sys/dev/gem/if_gem_pci.c Sun Jul 8 20:39:43 2018 (r336100) +++ head/sys/dev/gem/if_gem_pci.c Sun Jul 8 20:39:48 2018 (r336101) @@ -74,6 +74,22 @@ static int gem_pci_probe(device_t dev); static int gem_pci_resume(device_t dev); static int gem_pci_suspend(device_t dev); +static const struct gem_pci_dev { + uint32_t gpd_devid; + int gpd_variant; + const char *gpd_desc; +} gem_pci_devlist[] = { + { 0x1101108e, GEM_SUN_ERI, "Sun ERI 10/100 Ethernet" }, + { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet" }, + { 0x0021106b, GEM_APPLE_GMAC, "Apple UniNorth GMAC Ethernet" }, + { 0x0024106b, GEM_APPLE_GMAC, "Apple Pangea GMAC Ethernet" }, + { 0x0032106b, GEM_APPLE_GMAC, "Apple UniNorth2 GMAC Ethernet" }, + { 0x004c106b, GEM_APPLE_K2_GMAC,"Apple K2 GMAC Ethernet" }, + { 0x0051106b, GEM_APPLE_GMAC, "Apple Shasta GMAC Ethernet" }, + { 0x006b106b, GEM_APPLE_GMAC, "Apple Intrepid 2 GMAC Ethernet" }, + { 0, 0, NULL } +}; + static device_method_t gem_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gem_pci_probe), @@ -99,24 +115,10 @@ static driver_t gem_pci_driver = { }; DRIVER_MODULE(gem, pci, gem_pci_driver, gem_devclass, 0, 0); +MODULE_PNP_INFO("W32:vendor/device", pci, gem, gem_pci_devlist, + sizeof(gem_pci_devlist[0]), nitems(gem_pci_devlist) - 1); MODULE_DEPEND(gem, pci, 1, 1, 1); MODULE_DEPEND(gem, ether, 1, 1, 1); - -static const struct gem_pci_dev { - uint32_t gpd_devid; - int gpd_variant; - const char *gpd_desc; -} gem_pci_devlist[] = { - { 0x1101108e, GEM_SUN_ERI, "Sun ERI 10/100 Ethernet" }, - { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet" }, - { 0x0021106b, GEM_APPLE_GMAC, "Apple UniNorth GMAC Ethernet" }, - { 0x0024106b, GEM_APPLE_GMAC, "Apple Pangea GMAC Ethernet" }, - { 0x0032106b, GEM_APPLE_GMAC, "Apple UniNorth2 GMAC Ethernet" }, - { 0x004c106b, GEM_APPLE_K2_GMAC,"Apple K2 GMAC Ethernet" }, - { 0x0051106b, GEM_APPLE_GMAC, "Apple Shasta GMAC Ethernet" }, - { 0x006b106b, GEM_APPLE_GMAC, "Apple Intrepid 2 GMAC Ethernet" }, - { 0, 0, NULL } -}; static int gem_pci_probe(device_t dev)