From owner-svn-src-head@freebsd.org Sun Jul 8 20:39:39 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 8DAF9102E1CF; Sun, 8 Jul 2018 20:39:39 +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 3B6EE88C1F; Sun, 8 Jul 2018 20:39:39 +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 1C7432F92; Sun, 8 Jul 2018 20:39:39 +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 w68KdcqY089815; Sun, 8 Jul 2018 20:39:38 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w68Kdcwo089814; Sun, 8 Jul 2018 20:39:38 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807082039.w68Kdcwo089814@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:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336099 - head/sys/dev/ena X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/ena X-SVN-Commit-Revision: 336099 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:39 -0000 Author: imp Date: Sun Jul 8 20:39:38 2018 New Revision: 336099 URL: https://svnweb.freebsd.org/changeset/base/336099 Log: Add PNP info to PCI attachment of ena driver Make unsigned values uint16_t for pnp table. They are properly uint16_t befause they are 16-bit PCI IDs. The PNP_INFO language has no type for bare unsigned. 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/ena/ena.c head/sys/dev/ena/ena.h Modified: head/sys/dev/ena/ena.c ============================================================================== --- head/sys/dev/ena/ena.c Sun Jul 8 20:39:23 2018 (r336098) +++ head/sys/dev/ena/ena.c Sun Jul 8 20:39:38 2018 (r336099) @@ -3947,6 +3947,8 @@ static driver_t ena_driver = { devclass_t ena_devclass; DRIVER_MODULE(ena, pci, ena_driver, ena_devclass, 0, 0); +MODULE_PNP_INFO("U16:vendor; U16:device", pci, ena, ena_vendor_info_array, + sizeof(ena_vendor_info_array[0]), nitems(ena_vendor_info_array) - 1); MODULE_DEPEND(ena, pci, 1, 1, 1); MODULE_DEPEND(ena, ether, 1, 1, 1); Modified: head/sys/dev/ena/ena.h ============================================================================== --- head/sys/dev/ena/ena.h Sun Jul 8 20:39:23 2018 (r336098) +++ head/sys/dev/ena/ena.h Sun Jul 8 20:39:38 2018 (r336099) @@ -151,8 +151,8 @@ struct msix_entry { }; typedef struct _ena_vendor_info_t { - unsigned int vendor_id; - unsigned int device_id; + uint16_t vendor_id; + uint16_t device_id; unsigned int index; } ena_vendor_info_t;