From nobody Tue Sep 15 14:48:02 2026 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 4hklHk6qCNz6sKlr for ; Tue, 15 Sep 2026 14:48:02 +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 4hklHk5zC3z4PFs for ; Tue, 15 Sep 2026 14:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789483682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xFl9vdev1GwrOLpYvbpRs9sfVPiMoC6h/P0Gxawt2A=; b=r2CNtCCD1XxBucHkKRorJchelLgxBhPfyIlTJscqim2hGmSH9fB9sq+JuxT0GJrpHlSSGg IEBt2PVB1RqPkrztGyA6a+4q+jUdfDcz4C5Am55ixkJzy18ubuuB02p8ycJIE6WggREaLd G3zt5cpDetDF6CA9l2vNgREJAg982VyLngmooS0WZYQSekVIVAzjlbCQ/z5u9teiK8Glxe duFUm5kyo6sNV+NQuD84d1W5+tUxDKH6cTogXqZ2PDuC/c4DkrCgotSvIX8WIVD5weGt2C s9MtdFICkCm83WC8mDbNRacLWdelzhw1vdhBKYYmAzTN5a3iWR4Un2slRGNo/g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789483682; b=uFUa/9Gy310lmaO6FUtCMBgM8FsQWPvITQOcqoqs2d0o5axwAliJm+DHUG2VSuHfgep1d3 LNFLlYPy1LkEN4EJp7/KdzdGe2MMHqzwiVOvOkzNOcU5okeKtm5bOXVO6uHbrGom5ha6Fc oEm/gVTV1EEGiLKFUw5S+m56xv8b45SuqxVD7pZVVdmvG5t/wyR7cAVxKjAr2U6Iovm452 YsxX3zpKw1aTbNkU5hLRQ+nkOsRODEa8WgDonD5SHQ1NsNJ50sERhQ1UN0n0isxxLP9hHA TPSuNB2n3egq2JXqahA25yrn6bLGfh9FDfQMhf5GPzfwbPfRHOIZCSLtZi2ckw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789483682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xFl9vdev1GwrOLpYvbpRs9sfVPiMoC6h/P0Gxawt2A=; b=TwQF66mZhOFWFtDoqR0A3bFcoHCdXJB7B8lgho1uPdnPVd711GndpHtzagtb9mBkn+RmE9 Rz49KfY5M1QQQhZP2vyZ4S3QFW2V0DKoDLi9272pwypm0D9yan8xhtlTlWjPjmuI9am9nJ T1RIeHSrkbCG8SxTppXzZicUB9aPQOkMXj04CKtEKjKuQMOkrApCLj9O3WVrfZVagBzwye UCBC4CetOPD7IpRwhtrCOtFei+ZsFzwxSGFfpMThHJgn4mCZNweBgqF0YET7PkaqzNVvNh vQxqZLcSeS7B0lSLjfL07bbmQzb4Ljl4VYijtHPNF/YH/6dRZ/ipoGr0ajkbSA== 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 4hklHk4ldFz14bb for ; Tue, 15 Sep 2026 14:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38c53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 15 Sep 2026 14:48:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Potnuri Bharat Teja From: John Baldwin Subject: git: 3968a8759027 - main - iw_cxgbe/libcxgb4: Pass ftid_base to libcxgb4 through status page 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3968a8759027b9bb225b439e47f077b3f5b1171f Auto-Submitted: auto-generated Date: Tue, 15 Sep 2026 14:48:02 +0000 Message-Id: <6aa95aa2.38c53.682cecee@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3968a8759027b9bb225b439e47f077b3f5b1171f commit 3968a8759027b9bb225b439e47f077b3f5b1171f Author: Potnuri Bharat Teja AuthorDate: 2021-02-22 05:57:54 +0000 Commit: John Baldwin CommitDate: 2026-09-15 14:22:40 +0000 iw_cxgbe/libcxgb4: Pass ftid_base to libcxgb4 through status page While here, fix incorrect frees in error paths in c4iw_alloc_context(). Sponsored by: Chelsio Communications --- contrib/ofed/libcxgb4/dev.c | 4 ++-- contrib/ofed/libcxgb4/t4.h | 2 +- sys/dev/cxgbe/iw_cxgbe/device.c | 1 + sys/dev/cxgbe/iw_cxgbe/t4.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/ofed/libcxgb4/dev.c b/contrib/ofed/libcxgb4/dev.c index a5e4d04f78ab..fc2f4c9934a5 100644 --- a/contrib/ofed/libcxgb4/dev.c +++ b/contrib/ofed/libcxgb4/dev.c @@ -217,9 +217,9 @@ err_free: if (rhp->cqid2ptr) free(rhp->cqid2ptr); if (rhp->qpid2ptr) - free(rhp->cqid2ptr); + free(rhp->qpid2ptr); if (rhp->mmid2ptr) - free(rhp->cqid2ptr); + free(rhp->mmid2ptr); free(context); return NULL; } diff --git a/contrib/ofed/libcxgb4/t4.h b/contrib/ofed/libcxgb4/t4.h index 34f8db74e4e9..45b5b34ceab2 100644 --- a/contrib/ofed/libcxgb4/t4.h +++ b/contrib/ofed/libcxgb4/t4.h @@ -753,7 +753,7 @@ struct t4_dev_status_page u8 wc_supported; u8 write_cmpl_supported; u8 pad2; - u32 pad3; + u32 fid_base; u64 qp_start; u64 qp_size; u64 cq_start; diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c index c467eea7534d..4cd47bd4ad02 100644 --- a/sys/dev/cxgbe/iw_cxgbe/device.c +++ b/sys/dev/cxgbe/iw_cxgbe/device.c @@ -151,6 +151,7 @@ c4iw_rdev_open(struct c4iw_rdev *rdev) rdev->status_page->qp_size = sc->vres.qp.size; rdev->status_page->cq_start = sc->vres.cq.start; rdev->status_page->cq_size = sc->vres.cq.size; + rdev->status_page->fid_base = sc->tids.ftid_base; /* T5 and above devices don't need Doorbell recovery logic, * so db_off is always set to '0'. diff --git a/sys/dev/cxgbe/iw_cxgbe/t4.h b/sys/dev/cxgbe/iw_cxgbe/t4.h index 742956ff772c..e9ecdd4617ca 100644 --- a/sys/dev/cxgbe/iw_cxgbe/t4.h +++ b/sys/dev/cxgbe/iw_cxgbe/t4.h @@ -726,7 +726,7 @@ struct t4_dev_status_page { u8 wc_supported; u8 write_cmpl_supported; u8 pad2; - u32 pad3; + u32 fid_base; u64 qp_start; u64 qp_size; u64 cq_start;