git: eb40e3e757a7 - main - bnxt: Only filter out i386

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sat, 05 Nov 2022 04:41:11 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=eb40e3e757a7eb80c2b5c38ce05fc4b411b369f9

commit eb40e3e757a7eb80c2b5c38ce05fc4b411b369f9
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-11-05 04:35:37 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-11-05 04:40:00 +0000

    bnxt: Only filter out i386
    
    Only i386 is missing bus_read_8. The other 32-bit platforms can be fixed
    with a cast to a printf.
    
    Suggested by:   kevans
    Sponsored by:   Netflix
---
 sys/dev/bnxt/bnxt_hwrm.c | 2 +-
 sys/modules/Makefile     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c
index c362e01a1f8b..efea33327dc7 100644
--- a/sys/dev/bnxt/bnxt_hwrm.c
+++ b/sys/dev/bnxt/bnxt_hwrm.c
@@ -1483,7 +1483,7 @@ bnxt_hwrm_l2_filter_alloc(struct bnxt_softc *softc, uint16_t vlan_tag,
 
 	if (*filter_id != -1) {
 		device_printf(softc->dev, "Attempt to re-allocate l2 ctx "
-				"filter (fid: 0x%lx)\n", *filter_id);
+		    "filter (fid: 0x%jx)\n", (uintmax_t)*filter_id);
 		return EDOOFUS;
 	}
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 091fa7543164..7655260e8e46 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -425,8 +425,7 @@ SUBDIR+=	opensolaris
 .endif
 
 # Requires bus_space_read_8
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || \
-	${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
+.if ${MACHINE_ARCH} != "i386"
 _bnxt=		bnxt
 .endif