From nobody Thu Jan 19 03:52:24 2023 X-Original-To: dev-commits-src-all@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 4Ny7xP272Rz2svhc; Thu, 19 Jan 2023 03:52:25 +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 4Ny7xP1f9lz3jDT; Thu, 19 Jan 2023 03:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100345; 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=61J0aNzy4EelEy5svob1BOrO/FtoqWlfR6pkAcNWGww=; b=FRByYHMQYmCGGyOS2zJABPZzHCgpUaPbuR7P6bnlOfjsKHZfEYPQSYcS8GeIOW5KdSp4Sa +DBeogUvaQVd5Skp97WvqgeoxVLFEmX7/VQeeMJIEQSFYPv7jLcGTjHsPufADaqNYn4Nq+ 5/woZzRyX9gExYsXqLtaHIDbSCmelyLfrKITYsdM0DqSrG1fi+qN8v1HWpIg0wxkLrshwH 86o0d0ndlNe7DB6zvZUV/R8M70juAXrSQIj5gc6ir2CImdrCxUjDSB/FMgF4hOeJzumO8d RbATMQox3UaUa9mEUxHM1xlVCRl0k8PtJs7ECXvzjZaDESq9rLR+cWkYzKmIOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100345; 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=61J0aNzy4EelEy5svob1BOrO/FtoqWlfR6pkAcNWGww=; b=TaEHVwww9alNTTiEQeWlZVd1os7TNsGIzUfqAbMYoH158dN4x8IbT9BZs7EwxmuFTJwoP5 go7uQzTLMPGFBnuOiUoa5NImM7TnPYhJ5lvANh8PYxA4X0vXHIiljm2V9tczSxCtVgvm51 Hu28mBxqxCrFhmIocFt+GLUTaDBrAqFc1SBBjx3qn2KCynrt1Bc9P/RapFDpIjTA+z3m6O mnaYxTVX/yspeiBRVb3mpaiQEVsRGmay5Ge5oLKzgcQe7QTvtbQG3NZsn1gBzoEl4HbQkv SfrMGnRUMqbJILv/fVZA2gcHx3+C6eFabI4VrtfNY+4RY8Rb7iRHNYZFdILktA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674100345; a=rsa-sha256; cv=none; b=i1lvke2hEmpASJzI3bJgkQMh1VCg5xxJXoCXfs2FxnLfNkuWKeK5qjGoX5atXCjTb52mJ9 uHBjoEgQBkdq9IN1v25nkGsmVCj4ZetX13I8Uavv5vZoscVEbXIu/fJTYiRIChI3MFdH4b OcIhCt/tp4y3GQFswvPop8JL0577iI3hid5eWlf27BBBfOxD+TrLGOQxyVdKZviEeWzXn/ YCZp4BCc3WkAtY2a+M088AO+6HtB5CdfpbHv7HmoYYEr1tTGLBYU/nxXa1IWdCg7eznG8P L/fm8kPZq4nuBNKxWxWa+k6si9KjHOBkB4C/sZxBNrsOkfYW3a31yF3neWwprQ== 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 4Ny7xP0YFTzcPc; Thu, 19 Jan 2023 03:52:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30J3qOiE025807; Thu, 19 Jan 2023 03:52:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30J3qOSc025806; Thu, 19 Jan 2023 03:52:24 GMT (envelope-from git) Date: Thu, 19 Jan 2023 03:52:24 GMT Message-Id: <202301190352.30J3qOSc025806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 05410bd672c7 - stable/13 - bnxt: Only filter out i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05410bd672c74eaa348ffd481ac5ad2a995ce184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05410bd672c74eaa348ffd481ac5ad2a995ce184 commit 05410bd672c74eaa348ffd481ac5ad2a995ce184 Author: Warner Losh AuthorDate: 2022-11-05 04:35:37 +0000 Commit: Warner Losh 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