The branch main has been updated by delphij:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4d779448adb32ef6424abb781dab87065964d42f
commit 4d779448adb32ef6424abb781dab87065964d42f
Author: Xin LI <delp...@freebsd.org>
AuthorDate: 2023-06-04 23:35:00 +0000
Commit: Xin LI <delp...@freebsd.org>
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
