From nobody Sun Jun 4 23:35:08 2023 X-Original-To: dev-commits-src-main@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 4QZClK2ZGyz4Zc9d; Sun, 4 Jun 2023 23:35:09 +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 4QZClK1WJWz3spm; Sun, 4 Jun 2023 23:35:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685921709; 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=OuJd66LnZYrw1sFkaeWN2zPxNViiV254c3bpcOtbojM=; b=Pd0VcDHWe1qQRBtUSHlVj7OWpOeuC2+55SnjraEblCc46OTjbbUDQxQCuaS3M2pXKehSmb J2VYJdIIy5yzqbBk8tJi0v7klsIpMOUVBLHNmJOQz4qP2BjDHtGaqvHH93yt7OJCv7lmlQ pOPUqjhg27wt8BtlNyLGqAHmOhtT6PA6EGRNKH1HrmY0jbLtVfepdMbJBU9PYZV41ERr0D 5WY4CvNdCT20EOFkw/D/f8OBpdQrxYQinMX8pmEnMGh8EmSzwYs4uasVrOLNRxPT/RaCAe j829li55OjnUYmBO0nQeJAddrKkOUk1sh+oJZfIc7xyvKiPIMavTc2QjB6j31g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685921709; 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=OuJd66LnZYrw1sFkaeWN2zPxNViiV254c3bpcOtbojM=; b=xKHcIcPNTpn9Rp+HUpA7DUEuDyIdGyByNOwhpTsLHnFuUyMIRElYt1EpdFDySyfkofRvUs Cuut+POpn0uZ/SrtvNuD74Q58CdvArWkdaqaX3AE+w56dM/PXY8d5D4jfG13U/vp7Oiy3V yUFy3Gst5/KIkccCvC24U+owOc4btHFnQ1B1Otqf7nz+6fH9lCtdeajg1lqW083sBVwJ4W o1KMaiicSfVAxlIRLGo/XXc7MhfhypoDVwgPI7HleYabcWuuJ4pec0KDIrTkgADhfpJ0U3 +6yWwg4DV3/RAkmWL12yLNaaLtFWbLw5kzELZm9iZ0Htq/Dt9TlSdVMjcqQ0ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685921709; a=rsa-sha256; cv=none; b=DPAj3XUGSPlovcNCn+UQdcfaFJEmkoKZsvHF7Qi5NgMNAD81r3/xkgB2yhtnP9PS1t/Quo gDGz6Rxeer1zrQ84s62SkcJ3aQciCjuQW7aZpc6pgdtmr1LkevxLvxw68+Y1HsvQc8Apeg FAtfT7kS4rBCfKF8tJwpFqDL7BEGXglkbKpavlh0v/Yl/Pd/1LH/1Fpfs3xIMF0h6rOIfB fzvqOW3Xv4PoupXlq6uxxzgfaaOccI+06qPGcOK1A04uhjwaFtyLcnPsarcg/+zhcVI8gN +KHMZnIbuRSs4LS+ZtPq7/WqSbcEkbJb6Qx03bplYltWDx+SthR5SahiG+qp9A== 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 4QZClK0YvvzQZt; Sun, 4 Jun 2023 23:35:09 +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 354NZ8SV034610; Sun, 4 Jun 2023 23:35:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 354NZ8cX034609; Sun, 4 Jun 2023 23:35:08 GMT (envelope-from git) Date: Sun, 4 Jun 2023 23:35:08 GMT Message-Id: <202306042335.354NZ8cX034609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 4d779448adb3 - main - gve: Fix build on i386 and enable LINT builds. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d779448adb32ef6424abb781dab87065964d42f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4d779448adb32ef6424abb781dab87065964d42f commit 4d779448adb32ef6424abb781dab87065964d42f Author: Xin LI AuthorDate: 2023-06-04 23:35:00 +0000 Commit: Xin LI CommitDate: 2023-06-04 23:35:00 +0000 gve: Fix build on i386 and enable LINT builds. Reviewed-by: imp Differential Revision: https://reviews.freebsd.org/D40419 --- share/man/man4/Makefile | 5 +---- sys/amd64/conf/LINT-NOIP | 1 + sys/amd64/conf/NOTES | 3 +++ sys/arm64/conf/NOTES | 3 +++ sys/dev/gve/gve_qpl.c | 6 +++--- sys/i386/conf/NOTES | 3 +++ sys/modules/Makefile | 5 +---- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 9149a562383f..2567cde793ee 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -891,15 +891,12 @@ _nvme.4= nvme.4 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" +_gve.4= gve.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" -_gve.4= gve.4 -.endif - .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "riscv" _cgem.4= cgem.4 diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP index 0d4ec1e8c1ac..05b1ce75f57f 100644 --- a/sys/amd64/conf/LINT-NOIP +++ b/sys/amd64/conf/LINT-NOIP @@ -13,6 +13,7 @@ nodevice ale nodevice bxe nodevice em nodevice fxp +nodevice gve nodevice jme nodevice lio nodevice msk diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index ef0f7076633f..3ae61c8ac922 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -499,6 +499,9 @@ device virtio_console # VirtIO Console device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + # Microsoft Hyper-V enhancement support device hyperv # HyperV drivers device hvhid # HyperV HID device diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index ce5b071e5ab5..d309ee346b67 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -68,6 +68,9 @@ device virtio_mmio device virtio_blk device vtnet +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + # Microsoft Hyper-V device hyperv diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 891d132d2f10..3c6d9af6feee 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -101,9 +101,9 @@ gve_alloc_qpl(struct gve_priv *priv, uint32_t id, int npages, bool single_kva) int i; if (npages + priv->num_registered_pages > priv->max_registered_pages) { - device_printf(priv->dev, "Reached max number of registered pages %lu > %lu\n", - npages + priv->num_registered_pages, - priv->max_registered_pages); + device_printf(priv->dev, "Reached max number of registered pages %ju > %ju\n", + (uintmax_t)npages + priv->num_registered_pages, + (uintmax_t)priv->max_registered_pages); return (EINVAL); } diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 4e4c6193ebab..65218529e565 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -701,6 +701,9 @@ device virtio_console # VirtIO Console device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + options HYPERV device hyperv # HyperV drivers device hvhid # HyperV HID device diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 8e91e20720ca..67b95a8db6f7 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -555,13 +555,10 @@ _mlx5ib= mlx5ib .endif .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" -_gve= gve -.endif - .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" _ena= ena +_gve= gve _iwlwifi= iwlwifi .if ${MK_SOURCELESS_UCODE} != "no" _iwlwififw= iwlwififw