git: 05410bd672c7 - stable/13 - bnxt: Only filter out i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 Jan 2023 03:52:24 UTC
The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05410bd672c74eaa348ffd481ac5ad2a995ce184 commit 05410bd672c74eaa348ffd481ac5ad2a995ce184 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-11-05 04:35:37 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-01-19 01:02:26 +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 (cherry picked from commit eb40e3e757a7eb80c2b5c38ce05fc4b411b369f9) --- sys/dev/bnxt/bnxt_hwrm.c | 2 +- sys/modules/Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 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 a1521c48a1f7..53936d77d6ff 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -69,7 +69,7 @@ SUBDIR= \ ${_bxe} \ ${_bios} \ ${_blake2} \ - bnxt \ + ${_bnxt} \ bridgestp \ bwi \ bwn \ @@ -428,6 +428,11 @@ SUBDIR+= dtrace SUBDIR+= opensolaris .endif +# Requires bus_space_read_8 +.if ${MACHINE_ARCH} != "i386" +_bnxt= bnxt +.endif + .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${SRCTOP}/sys/opencrypto) _crypto= crypto