From nobody Fri Aug 18 23:18:44 2023 X-Original-To: dev-commits-src-branches@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 4RSHqn19rkz4fs0W; Fri, 18 Aug 2023 23:18:45 +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 4RSHqn0ZBmz4nGt; Fri, 18 Aug 2023 23:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400725; 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=orVgJWChtTOcFozdwFyzQPQb4fXMPE6+W6yCWY5Wenw=; b=ZxYjP2lmjYseYjPiEeL5tlLwPbUvLNS725EReJdVaUDIewrd4z9cPX6l09Ea0zFZDQC698 rTtIjxXNK7VoIjjIoNQsgWK919br3n/IlADZfECWLYVkFE7YS4uKD3hsyjYpxX3xp+n2ek b3WR8bjI0QZQ7v2Cxx7M1znxlpKuTiLBZnayScikfXGCIEjvgP/6o3QEi8keGxfvqVOlbg hErsvaO4ms7lb9B/oWbACJwJH81Bp+JTJMi2OFBKP3Fo4YLHSTWwhl1/Y/29hDeQ6pikHa oZuzrdknDD93zTB/Zi1J+cBvWdZ9nymjwEPUUJ38WuoiURB8Rih0Ko3+vGFNmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400725; 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=orVgJWChtTOcFozdwFyzQPQb4fXMPE6+W6yCWY5Wenw=; b=AYtJTgxw+09zVKixk3FJN3eeQkDzFFfko6+QiCcV1TMBwtPkquiNuBR0CX08Sknx398ppo JH4eOSa/7o1ruQ6eaPda6QmhwklPowW8nfSmJ1NdsttCFhRUpBisFyKgm8r9+63Ppm9yWf kxypVfxkReX3I8KcYgTfaIhj8irlhtglWz3rcp/SJzR+YmGCQVvKDUMdbOYBWpDC6TwpiW bQQmLmi1XUjpVwu1V3mE0hzvDrtQbANCIf9CdRFhODM3WzOoM9DDGWoV0+AwFWEXZFpQUw Nv5TQuj2A8PgP2lkSGTUzPHCR3WkKhmiLbi5hAN3g8oPsO2Xm+BHHDeM2seqPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400725; a=rsa-sha256; cv=none; b=I5z5Que3tkAYAmS5PKOxEM0k6DBOI5jrG3bRN/giL73XXqTFj4pDACA472JhvpwEXiuI6s /rf4f7mxNBn6Mb6pP8fz0rdysWAGdnEffSTtHYoGfTe+mhvYUPoFLFYd7phEL10eipMC4T h8NGCMyDaZU7nHS3wkt24wmjkNJi1LQ0fVlIjEhIYNQxxnNC+SyekOHIh4zJyMC/HfHyqq 537O+hBe1OZ7JykRdfRyFnLxh/Vi16gpq+pq4L4f/BCSBxAgB4gygeeqJrhxuhfksGPDbo BvjQKUxQunEd6MSzPtBW0ks4fGcT5vB4h5Pg1HvJHsLlBz1ddXNU5gncDsiBjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RSHqm64FKzb40; Fri, 18 Aug 2023 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INIixP018560; Fri, 18 Aug 2023 23:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIipR018557; Fri, 18 Aug 2023 23:18:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:44 GMT Message-Id: <202308182318.37INIipR018557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 78f491c86d04 - stable/13 - gve: Fix build on i386 and enable LINT builds. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 78f491c86d04b8938ff7b26481268b8f223d86e0 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=78f491c86d04b8938ff7b26481268b8f223d86e0 commit 78f491c86d04b8938ff7b26481268b8f223d86e0 Author: Xin LI AuthorDate: 2023-06-04 23:35:00 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:15 +0000 gve: Fix build on i386 and enable LINT builds. Reviewed-by: imp Differential Revision: https://reviews.freebsd.org/D40419 (cherry picked from commit 4d779448adb32ef6424abb781dab87065964d42f) --- 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/LINT-NOIP | 1 + sys/i386/conf/NOTES | 3 +++ sys/modules/Makefile | 5 +---- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b7372ac63c2e..46437362dd90 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -918,15 +918,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 544893cf1332..c99462fce081 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 msk nodevice mxge diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index a72e9f2623bb..eacfd77fd7e1 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -506,6 +506,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 0d275c0fdd2c..aa69035f291f 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -63,6 +63,9 @@ device virtio_mmio device virtio_blk device vtnet +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + # CPU frequency control device cpufreq 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/LINT-NOIP b/sys/i386/conf/LINT-NOIP index 1c91dae98baa..32c5af163381 100644 --- a/sys/i386/conf/LINT-NOIP +++ b/sys/i386/conf/LINT-NOIP @@ -12,6 +12,7 @@ nodevice ale nodevice bxe nodevice em nodevice fxp +nodevice gve nodevice jme nodevice lio nodevice msk diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2c069e1c52b8..07255ff81165 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -723,6 +723,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 079638c2f6cd..48d6328835e0 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -534,6 +534,7 @@ SUBDIR+= linux_common .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" _ena= ena +_gve= gve .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ibcore= ibcore _ipoib= ipoib @@ -557,10 +558,6 @@ _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" -_gve= gve -.endif - _ossl= ossl _rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no"