From nobody Tue Oct 13 14:29:37 2026 X-Original-To: dev-commits-src-main@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 4j3xYZ0vsyz6vNk2 for ; Tue, 13 Oct 2026 14:29:38 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j3xYZ0Hlrz3QlC for ; Tue, 13 Oct 2026 14:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791901778; 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=IW/tx5FgtPJpBbIl7o9fYYPjSXsAwv3fb83iJ5Gr6kY=; b=pZpbkfhWdtJbeY2EEP2xR2ZNUB8SfsLA8Dn9lGARgde80PlXNxF/qM/bUR4xtmzK5Eki7Q VSiI/P/j0Y1MZH6dnEWCy+ciVelJsOpaRHMm4vAJURjIPrWrilv69D9NqTQtlDSpXQ8vSF TOTZdv/o7CxJ8YG1XzRxXZcGlg4139Ib+v7x+QovX1MHwEP0gsvJ+Pva1zLppBH+4CJctD MuoUwmFL/l5X8GjkKIUSPQZdNM+WkAzfJ4yxJ+bByCVaQzCkY5DFRuzcqHkfR+GP08fzqW kJhBLo9PrwvDV/MHpbbYWJT9UXZfeWsDxD/PswbwjSnjnwmdZW5L4AhWpk8Xgw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791901778; b=cMcJA3kULd4DEv5OU5Jfp6bticegJVdaeDW7jwNOfxHyVPdv3acjh9tF3kcZK2aLduJYtk 6ixJ4sUujT6ljE1NA8/OhxzXaYT1gK+DR85Kz9LBRbfHHPjfI2XPsn+YLxGAlVGogxw2a8 sP4fHFNed2NYxRs5x60s78XKgiKh3elkm4ILI1/YO7TvL1LLRpNq5Oz5IFb/fsQoEFLJPX T/ndvdUfY+G5uuojRiXBAX3v/zmF4F8ICxUCeR8s6HcEI95oUtzEckbBmfEY0HdYhQUfRt SW1FYbDgDJ5V+tUnpDGfC3UmWvGJN1wSsEoqKSCRd9DldUsi7RJKM3SkbSdK8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791901778; 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=IW/tx5FgtPJpBbIl7o9fYYPjSXsAwv3fb83iJ5Gr6kY=; b=JUi5yiLYi35+qH6KHlnqgHWPrOjMswyYJTMXoNoHCkf6TOjUrz6THcG1ZwHfXcaCDPhkdj rQgwFw8LpSsYb6HJhbgRxUXYuTn1vSJD6BGaNHa4P+6aPSvxjMp51L3kInxjjgDluflpAB kKDu2GjytFBO0TIKb1KvKL9EK5FUKTL8R6v23ZQgseGKJcFd1H2Lne8FDj2Xs4wl7+ZDPw wk35nO4lgC6ERf12NBS/tye9g+fYmmgcCuc3pm010fJSlmdrBnBRjQoAb3vwMtKjuZU1UQ bpHDvNvtASImBpV2dKrJ8qPK+wpvqVvoyJiZbP7mPPhje3Ed78C3d0ukQDpZjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j3xYY6QnwzJSK for ; Tue, 13 Oct 2026 14:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47d0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 14:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: b43c4d84c8d1 - main - if_bnxt: fix powerpc build of the MPC ring code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b43c4d84c8d172858fc4bbf59e07888bfb8ac472 Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 14:29:37 +0000 Message-Id: <6ace4051.47d0e.402b1b80@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=b43c4d84c8d172858fc4bbf59e07888bfb8ac472 commit b43c4d84c8d172858fc4bbf59e07888bfb8ac472 Author: Sumit Saxena AuthorDate: 2026-10-13 08:28:03 +0000 Commit: Sumit Saxena CommitDate: 2026-10-13 14:28:51 +0000 if_bnxt: fix powerpc build of the MPC ring code powerpc has no 16-bit acquire/release atomics, so the atomic_load_acq_16() and atomic_store_rel_16() calls on the MPC TX ring indices fail to build there. Make the producer and consumer indices 32 bits wide and use the 32-bit primitives. Reviewed by: gallatin, chandrakanth.patil_broadcom.com Sponsored by: Broadcom Inc MFC after: 1 week Fixes: 088a42c0ff76 ("if_bnxt: add MPC (Mid-Path Channel) ring infrastructure") Differential Revision: https://reviews.freebsd.org/D60698 --- sys/dev/bnxt/bnxt_en/bnxt.h | 4 ++-- sys/dev/bnxt/bnxt_en/bnxt_mpc.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/bnxt.h b/sys/dev/bnxt/bnxt_en/bnxt.h index 7c5b357ec7ac..847967853cd3 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt.h +++ b/sys/dev/bnxt/bnxt_en/bnxt.h @@ -672,8 +672,8 @@ struct bnxt_ring { uint8_t mpc_chnl_type; /* valid when queue_id == BNXT_MPC_QUEUE_ID */ struct iflib_dma_info ring_mem; /* manual DMA alloc for driver-private rings (MPC) */ struct bnxt_cp_ring *cp_ring; /* completion ring this TX ring reports to (MPC) */ - uint16_t prod; /* MPC TX ring producer index */ - uint16_t cons; /* MPC TX ring consumer index */ + uint32_t prod; /* MPC TX ring producer index */ + uint32_t cons; /* MPC TX ring consumer index */ struct mtx tx_lock; /* MPC TX ring lock */ union { struct bnxt_sw_tx_bd *tx_buf_ring; diff --git a/sys/dev/bnxt/bnxt_en/bnxt_mpc.c b/sys/dev/bnxt/bnxt_en/bnxt_mpc.c index 1182a5baede5..3a3e6f519c9b 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_mpc.c +++ b/sys/dev/bnxt/bnxt_en/bnxt_mpc.c @@ -844,8 +844,8 @@ static inline uint32_t bnxt_tx_avail(struct bnxt_softc *softc, { uint32_t used, prod, cons; - prod = atomic_load_acq_16(&txr->prod); - cons = atomic_load_acq_16(&txr->cons); + prod = atomic_load_acq_32(&txr->prod); + cons = atomic_load_acq_32(&txr->cons); if (prod >= cons) used = prod - cons; @@ -907,9 +907,8 @@ int bnxt_start_xmit_mpc(struct bnxt_softc *softc, struct bnxt_ring *txr, } memcpy(txbd, data, len); prod = ADVANCE_TX_BY(txr, prod, bds); - /* Release-store pairs with the atomic_load_acq_16(&txr->prod) in - * bnxt_tx_avail() and bnxt_adv_mpc_cons(). */ - atomic_store_rel_16(&txr->prod, prod); + /* Pairs with the acquire load of prod in bnxt_tx_avail(). */ + atomic_store_rel_32(&txr->prod, prod); softc->db_ops.bnxt_db_tx(txr, prod); @@ -952,9 +951,9 @@ static void bnxt_adv_mpc_cons(struct bnxt_softc *softc, struct bnxt_ring *txr) } } tx_cons = ADVANCE_TX_BY(txr, tx_cons, mpc_buf->inline_bds); - /* Pairs with bnxt_tx_avail()'s atomic_load_acq_16(&txr->cons). */ - atomic_store_rel_16(&txr->cons, tx_cons); - if (tx_cons == atomic_load_acq_16(&txr->prod)) + /* Pairs with the acquire load in bnxt_tx_avail(). */ + atomic_store_rel_32(&txr->cons, tx_cons); + if (tx_cons == atomic_load_acq_32(&txr->prod)) break; mpc_buf = &txr->tx_mpc_buf_ring[tx_cons]; } while (mpc_buf->handle == BNXT_INV_MPC_HDL);