From owner-svn-src-head@freebsd.org Wed Sep 27 13:44:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B44BE0484A for ; Wed, 27 Sep 2017 13:44:54 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9A7473A70 for ; Wed, 27 Sep 2017 13:44:53 +0000 (UTC) (envelope-from oliver.pinter@balabit.com) Received: by mail-wm0-x22c.google.com with SMTP id m127so20474669wmm.1 for ; Wed, 27 Sep 2017 06:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=balabit-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Rfw9iSnDNJk2KqCAc4RzKexBzDcEue63uThnzOL4IcA=; b=gFy5qxtJfiqZa6A6Wq/NnEFJXhWZqqr9Q43UiWFfiGEUvDTuqO3X5yMWJPjRy6thlV +4C6rZ4Ah4BdGWmeJHnek67nbBgOJ1UTFR80P1nEi1iaJwcMfjOgkOznxOSyqAvxSFav Gb/EbfK7u5HIKtcYkc8XzYlPGOw0o7YEtXK687KqtQQEDDxT4SGJamwjhNXH/QY0+dw5 3KA79ghZzt8sz9bLMy9sqqqYFlemXQPj12CluXkLJx130knHVkpcq1YDudb7WXwKzEzs Ep9lD0OJ0qMz/BV2F/wLhUuJ8rGqJTnpmSBGlHg/aUBSOoWJlDtZD6RRfgMhTrsSWGD0 BC3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Rfw9iSnDNJk2KqCAc4RzKexBzDcEue63uThnzOL4IcA=; b=AJriZU1Dh0tm/YUh1SRvVysrifmY7W+jf8OszfmGoqqNfqmZ/fiVmgNv5lqEbPFqUs wtrOAv2lr2TNG8fcy3Irx1JNwm2Dfup+bR15aTVm60LUEhKF2KQJ84LLLcxrXTfRVWQj VZV/Q/3TiIvHgfh7Hl0DSBO7Px9fguVpCFSgk5BozSc3mgy0EMOt+I5yuGvpg/eV2uMk p9GyFhy1Bs4jo3t9Uz4SwdzNobqVJWQ4pfD1X/rACc+957z2JuuSKDuS7wPt7jr9wzG3 2qKvTgLJ6Kqw/g5Vk+6poh0wWcgzusRNw3SdrzpnlGOVbSvojnOwhXIolIH2Q/L84HTU jaGQ== X-Gm-Message-State: AHPjjUhJrjPR634HU1tJ6zh/ggYSOqyfBsx6uS/UD1dwRSWZttJiQcX8 SMopOAS5+8cgFU0m6HbBkFxvJV0DaJm63SKsORnN1w== X-Google-Smtp-Source: AOwi7QA18rIsolEFZuKWjHe+n69hQq6S4gnrcb65nnM6oeQ/0AxNxRCiLBuEt/nEzvrSna4elQdVF59SAHjFED1oEFU= X-Received: by 10.80.170.217 with SMTP id r25mr2008759edc.220.1506519891954; Wed, 27 Sep 2017 06:44:51 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.182.110 with HTTP; Wed, 27 Sep 2017 06:44:51 -0700 (PDT) In-Reply-To: <201709262323.v8QNNw34009531@repo.freebsd.org> References: <201709262323.v8QNNw34009531@repo.freebsd.org> From: =?UTF-8?B?UGludMOpciwgT2xpdsOpcg==?= Date: Wed, 27 Sep 2017 15:44:51 +0200 Message-ID: Subject: Re: svn commit: r324038 - in head/sys: dev/bnxt dev/drm dev/drm2/i915 dev/drm2/radeon dev/e1000 net To: Conrad Meyer Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 27 Sep 2017 13:44:54 -0000 On Wed, Sep 27, 2017 at 1:23 AM, Conrad Meyer wrote: > Author: cem > Date: Tue Sep 26 23:23:58 2017 > New Revision: 324038 > URL: https://svnweb.freebsd.org/changeset/base/324038 > > Log: > Add PNP metadata to more drivers > > GPUs: radeonkms, i915kms > NICs: if_em, if_igb, if_bnxt > > This metadata isn't used yet, but it will be handy to have later to > implement automatic module loading. > > Reviewed by: imp, mmacy > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D12488 > > Modified: > head/sys/dev/bnxt/if_bnxt.c > head/sys/dev/drm/drmP.h > head/sys/dev/drm2/i915/i915_drv.c > head/sys/dev/drm2/radeon/radeon_drv.c > head/sys/dev/e1000/if_em.c > head/sys/net/iflib.h > > Modified: head/sys/dev/bnxt/if_bnxt.c > ============================================================ > ================== > --- head/sys/dev/bnxt/if_bnxt.c Tue Sep 26 23:12:32 2017 (r324037) > +++ head/sys/dev/bnxt/if_bnxt.c Tue Sep 26 23:23:58 2017 (r324038) > @@ -243,6 +243,8 @@ MODULE_DEPEND(bnxt, pci, 1, 1, 1); > MODULE_DEPEND(bnxt, ether, 1, 1, 1); > MODULE_DEPEND(bnxt, iflib, 1, 1, 1); > > +IFLIB_PNP_INFO(pci, bnxt, bnxt_vendor_info_array); > + > static device_method_t bnxt_iflib_methods[] = { > DEVMETHOD(ifdi_tx_queues_alloc, bnxt_tx_queues_alloc), > DEVMETHOD(ifdi_rx_queues_alloc, bnxt_rx_queues_alloc), > > Modified: head/sys/dev/drm/drmP.h > ============================================================ > ================== > --- head/sys/dev/drm/drmP.h Tue Sep 26 23:12:32 2017 (r324037) > +++ head/sys/dev/drm/drmP.h Tue Sep 26 23:23:58 2017 (r324038) > @@ -321,7 +321,7 @@ typedef struct drm_pci_id_list > { > int vendor; > int device; > - long driver_private; > + intptr_t driver_private; > char *name; > } drm_pci_id_list_t; > > > Modified: head/sys/dev/drm2/i915/i915_drv.c > ============================================================ > ================== > --- head/sys/dev/drm2/i915/i915_drv.c Tue Sep 26 23:12:32 2017 > (r324037) > +++ head/sys/dev/drm2/i915/i915_drv.c Tue Sep 26 23:23:58 2017 > (r324038) > @@ -1236,6 +1236,8 @@ MODULE_DEPEND(i915kms, agp, 1, 1, 1); > MODULE_DEPEND(i915kms, iicbus, 1, 1, 1); > MODULE_DEPEND(i915kms, iic, 1, 1, 1); > MODULE_DEPEND(i915kms, iicbb, 1, 1, 1); > +MODULE_PNP_INFO("U32:vendor;U32:device;P;D:human", vgapci, i915, > pciidlist, > + sizeof(pciidlist[0]), nitems(pciidlist)); > > /* We give fast paths for the really cool registers */ > #define NEEDS_FORCE_WAKE(dev_priv, reg) \ > > Modified: head/sys/dev/drm2/radeon/radeon_drv.c > ============================================================ > ================== > --- head/sys/dev/drm2/radeon/radeon_drv.c Tue Sep 26 23:12:32 2017 > (r324037) > +++ head/sys/dev/drm2/radeon/radeon_drv.c Tue Sep 26 23:23:58 2017 > (r324038) > @@ -401,3 +401,5 @@ MODULE_DEPEND(radeonkms, iicbus, 1, 1, 1); > MODULE_DEPEND(radeonkms, iic, 1, 1, 1); > MODULE_DEPEND(radeonkms, iicbb, 1, 1, 1); > MODULE_DEPEND(radeonkms, firmware, 1, 1, 1); > +MODULE_PNP_INFO("U32:vendor;U32:device;P;D:human", vgapci, radeonkms, > + pciidlist, sizeof(pciidlist[0]), nitems(pciidlist)); > > Modified: head/sys/dev/e1000/if_em.c > ============================================================ > ================== > --- head/sys/dev/e1000/if_em.c Tue Sep 26 23:12:32 2017 (r324037) > +++ head/sys/dev/e1000/if_em.c Tue Sep 26 23:23:58 2017 (r324038) > @@ -339,6 +339,8 @@ MODULE_DEPEND(em, pci, 1, 1, 1); > MODULE_DEPEND(em, ether, 1, 1, 1); > MODULE_DEPEND(em, iflib, 1, 1, 1); > > +IFLIB_PNP_INFO(pci, em, em_vendor_info_array); > + > static driver_t igb_driver = { > "igb", igb_methods, sizeof(struct adapter), > }; > @@ -350,6 +352,7 @@ MODULE_DEPEND(igb, pci, 1, 1, 1); > MODULE_DEPEND(igb, ether, 1, 1, 1); > MODULE_DEPEND(igb, iflib, 1, 1, 1); > > +IFLIB_PNP_INFO(pci, igb, igb_vendor_info_array); > > static device_method_t em_if_methods[] = { > DEVMETHOD(ifdi_attach_pre, em_if_attach_pre), > > Modified: head/sys/net/iflib.h > ============================================================ > ================== > --- head/sys/net/iflib.h Tue Sep 26 23:12:32 2017 (r324037) > +++ head/sys/net/iflib.h Tue Sep 26 23:23:58 2017 (r324038) > @@ -173,6 +173,11 @@ 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:human" > This will be MODULE_PNP_INFO. > +#define IFLIB_PNP_INFO(b, u, t) \ > + MODULE_PNP_INFO(IFLIB_PNP_DESCR, b, u, t, sizeof(t[0]), nitems(t)) > And this IFLIB_PNP_DESCR. > + > typedef struct if_txrx { > int (*ift_txd_encap) (void *, if_pkt_info_t); > void (*ift_txd_flush) (void *, uint16_t, qidx_t pidx); > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >