From nobody Wed Mar 30 15:49:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0870C1A541CA; Wed, 30 Mar 2022 15:49:43 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KT9qB0cgyz3kSh; Wed, 30 Mar 2022 15:49:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOHanyV3yR0HNJoyj4QBdWp+3FepaP6EZuWvQJKwCJU=; b=co+ilsk2X3d4b9StQc19BOb5Hy7pyU+2fH1JkiNiwnE9osUVrNNip+MstMlmw7UfFksEqz VyRkshyhbkVHWrMfkQCgwaSMYpQ4J80dv5gvWawA6CWu2mkM/bhWogfl3sULaHty+jV710 AcADdC6JFHkKMxjHFD78yl3/R8PQHGOJ4Il0zVPoPTuRmqegbi9soZtAcs0/UOiPlW8XP+ NZaZSv11lBQef/Rcn7ziY8jExQ7t9ogmYcyLlUZM+0j3oXNDRe6DfD9MmtJwXgMUQXL7HU EAbSAD9R5SxTpghEMBkONOXwuWsanqKdh4MD7SOXERhDQ9XOslbqP6D1/y6K6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA0E416117; Wed, 30 Mar 2022 15:49:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UFnf1n019204; Wed, 30 Mar 2022 15:49:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UFnfcC019203; Wed, 30 Mar 2022 15:49:41 GMT (envelope-from git) Date: Wed, 30 Mar 2022 15:49:41 GMT Message-Id: <202203301549.22UFnfcC019203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7380d82b53d6 - releng/13.1 - LinuxKPI: pci.h MODULE_DEVICE_TABLE to MODULE_PNP_INFO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 7380d82b53d664c4bc1ff9eb853ee26787cb3b89 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOHanyV3yR0HNJoyj4QBdWp+3FepaP6EZuWvQJKwCJU=; b=VlgnowaOr98oDsHTEiWkMhbD3mAYdRQrT3xys1dqCS6U0GmweYkxOeMrBqYOuK61/T801g YpFFHeP3ks3duJ2tpBRmCX1SiF0GGMw0vj92ihDGMQsTmDsYQnpEIwSh+DbrRz5Ub6zEjd KX/dVrfde64cNhc/oybiv20ZOj5Z7ZBMRSDu1HW9o8GxgNLeCdpvfHF2OaX3gh3cQuqh7q aM22cYVuTzODLjHIewgM7mhpdCRf7wZ/cENGmhTrt+euuXfoN/V5jyz3Tm0C/hIHRa1JfM 0CgDodRq9ok5/rKiDVcU6syr7q0HRJkwZ5lHMHTcSYjkeJjPQI3upAJBso7klQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648655382; a=rsa-sha256; cv=none; b=TRwKUV0OVmbEdCiqxGSViw5mNpar1FYLAOEIpKtl6tpOOK4ZQ0JbQlAbiuPA7keaYepGkm lkrWTFL736s3eekMxu1XLhQP4KLhHXlnJ4UhIpMv48cPdiw6oySODfYuPtHtrDjINJ0Emh ywUOG7+3n/MVFIzba9Q47eInrhIUHwOA0xRuQ8GQnDSEitogMt0nDFZ0YORmG5mKeVdtNN BHCYhLOCc1lk77Gyx/oms5xq9B7qQudevrBig4zdIIBh8IpqIwadpV0wzBRiQ7Q48vPXhS t4PgDcQSGFR2o0h6P9boQx2v+vIUHwhtbAWUaAe79kJ2o1rlJnAZLct+VWPR4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7380d82b53d664c4bc1ff9eb853ee26787cb3b89 commit 7380d82b53d664c4bc1ff9eb853ee26787cb3b89 Author: Bjoern A. Zeeb AuthorDate: 2022-03-04 00:06:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-30 15:46:17 +0000 LinuxKPI: pci.h MODULE_DEVICE_TABLE to MODULE_PNP_INFO Implement MODULE_PNP_INFO() support in LinuxKPI for the Linux MODULE_DEVICE_TABLE. This will allow us to auto-load LinuxKPI PCI drivers (drm-kmod do not currently as they attach to vgapci0 which in turn grabs the PCI to my understanding) and make any loading from loader or kld_list in rc.conf unnecessary; see devmatch(8) for more information. We need to ensure there is a DRIVER_MODULE() (or probably just a DECLARE_MODULE but that makes not much difference) before the MODULE_PNP_INFO (which we otherwise would not need). Approved by: re (gjb) Sponsored by: The FreeBSD Foundation Reviewed by: imp, hselasky, manu Differential Revision: https://reviews.freebsd.org/D26651 (cherry picked from commit 5493c6277a264e91ea4bdc7e2d4ee69fe4210918) (cherry picked from commit a94b233d5d718258e2e57e114aab00714441a79f) --- sys/compat/linuxkpi/common/include/linux/pci.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index df18c98a6278..361600a55397 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -69,7 +70,26 @@ struct pci_device_id { uintptr_t driver_data; }; -#define MODULE_DEVICE_TABLE(bus, table) +/* Linux has an empty element at the end of the ID table -> nitems() - 1. */ +#define MODULE_DEVICE_TABLE(_bus, _table) \ + \ +static device_method_t _ ## _bus ## _ ## _table ## _methods[] = { \ + DEVMETHOD_END \ +}; \ + \ +static driver_t _ ## _bus ## _ ## _table ## _driver = { \ + "lkpi_" #_bus #_table, \ + _ ## _bus ## _ ## _table ## _methods, \ + 0 \ +}; \ + \ +static devclass_t _ ## _bus ## _ ## _table ## _devclass; \ + \ +DRIVER_MODULE(lkpi_ ## _table, pci, _ ## _bus ## _ ## _table ## _driver,\ + _ ## _bus ## _ ## _table ## _devclass, 0, 0); \ + \ +MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ + _bus, lkpi_ ## _table, _table, nitems(_table) - 1) #define PCI_ANY_ID -1U