From nobody Fri Mar 04 00:39:53 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 91B7419F3E68; Fri, 4 Mar 2022 00:39:53 +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 4K8psP3KN1z4crm; Fri, 4 Mar 2022 00:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646354393; 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=U1pgOLpCkke0ptpqyZNt9caySBZhyHeFqjLSWVhwloE=; b=A7+x34SZ5nMfwEuTYn52x91qaxel7RV/BQ2s2c56HJYrfI0tHO/ZF9+F5HGjgvIPWfNPmD +yRS0fUz8OpJEzgdirCNpulkBg8600qJoIrNoR0XmSXnC3E7d3NfnTbQ2cuILtyVM0cpha JTVz02GNCzidJF8uSpYJuVhc+3CLKK7B9D7s1drULq1ELn/MHUvNHlBlb6E3ui8QNTCOyM vT4rXcs0/PVKHQqYUq6bq5rSkhbK2+Zac/jCKbVMYXhDltrdz6tNK5J6YXqfm/g0qFXzlk c3l87bSQJ8tzPVcJP623eQ6wgCyxoNrnpGGmzgnrs0bqoI9bnfasrEG1lRiJ6g== 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 47250220C3; Fri, 4 Mar 2022 00:39:53 +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 2240dr0j021733; Fri, 4 Mar 2022 00:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2240drZX021732; Fri, 4 Mar 2022 00:39:53 GMT (envelope-from git) Date: Fri, 4 Mar 2022 00:39:53 GMT Message-Id: <202203040039.2240drZX021732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5493c6277a26 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5493c6277a264e91ea4bdc7e2d4ee69fe4210918 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646354393; 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=U1pgOLpCkke0ptpqyZNt9caySBZhyHeFqjLSWVhwloE=; b=FWAQozFLPzp2f/AA/YBUn2OEB3fNXQM05FEXhE6yz1Xppr5PRQkIDMof7LNolNPJiOebB9 ReFY2YOeORgddAOZ+a+HRBVlKa2brV0ieb0d3m75RD7xtxdjMMU77wBX6GsjS4pzEvSuC4 Pdwn60/ybWebIFThgeax0LXJuMfFZvfh+ZC2widDk3W71bFSOXMGR3dkZD7Ebcd+DjLcN0 a3W0vZezTgCRhV8g1JleQEhdtol38SGsqrPGkekoROOEFf1b4AEoPmgpI+OmYXfqBX63rz KtVAX0l+5MzYIDdVX7B5BfGt6iolcJIcf+fBJ1RjzfTS9bjHVg3ColYqhP0kQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646354393; a=rsa-sha256; cv=none; b=lvA+zjkZdsjSXplNf9YLFOwxV9friAUpIqyqHYl/UC+I41yvfMi8aiyPdeG1R8vhQnjGw6 vZ26IGgLEo44WPMOWR9/Rox78nxngiobFQHLDQ0IpTKH5jyrkseFAQq4uWlgut7NO015HB gwRkiygwh+pZWkPosUH+9TLTwnJVXj8TEJQlXSuQ+pn5mI7XrbMLpeg/baM7vf63t34z6o kYLnH6QlX4CrXaskcNbn+vevp/NcuVruQ+3MpqNryo1k+31kBZtSChSPEx57AM3aavundn HllxDVt+wssrBzgs+SL8aftY8ryBcIX789nQ5rpQWPlE52U0yCjx4OwqU7VVyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5493c6277a264e91ea4bdc7e2d4ee69fe4210918 commit 5493c6277a264e91ea4bdc7e2d4ee69fe4210918 Author: Bjoern A. Zeeb AuthorDate: 2022-03-04 00:06:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-04 00:12:45 +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). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: imp, hselasky, manu Differential Revision: https://reviews.freebsd.org/D26651 --- 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 995a073c2b40..7bf785fb209a 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