gve: Fix build on i386 and enable LINT builds.

Reviewed-by:	imp
Differential Revision: https://reviews.freebsd.org/D40419

(cherry picked from commit 4d779448adb32ef6424abb781dab87065964d42f)

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"