From nobody Wed Jul 17 14:24:35 2024 X-Original-To: dev-commits-src-branches@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 4WPJ9J2Qncz5RQ1d; Wed, 17 Jul 2024 14:24:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPJ9J0f0yz40ct; Wed, 17 Jul 2024 14:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721226276; 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=nJ1kazdEVXNf2XMqe5F7w9jGeBBJJmN+lnHnALgTigs=; b=fEhEGtIAJd8OP8K2bc4835JB0VQ8Q1jlLk3YOaQn4gIJ96UWosOiBW25pO7hSpveMIocKH GeiFddzXfbdQw3qC556b7robQoqwZkxqh1EHUq3kvwaKv3/zdNCzhsa1vFOWHhrJ9SUiQT DAfimNdh15sy4Ob4Vjc1uco5yxvMFrWQyUkXwXKZ/3v63R5BfyMmwVwVvF8fh1TLfouNAZ KRXT2C/oIUtEfNlDCQqgFfEDwcdS0v3oeLoKcDWEP9sn20nEJJsDGtf9UkzMl6Fxtv3juD rWgAHKpuLmfUpXgG1lwXw1TPsqD9YMs6TX8hYtewMsVXN08e8HIA2gJHoda1Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721226276; a=rsa-sha256; cv=none; b=L/eZ164F8dcHFJwQ3F4LBxK9ITKWbAawFGxNB0Okakr/my1HI7i5rvZcd33wqhzpthFFSV Vlcl+CSC2FApxZE50Gu3b/WVaKAQ3pNCShJgG+uDvlJOylQqxTe9GhvDdk8PtNqKrHWSuv STew8wMkD4xSuGUKlgGe4UpziK0wm54bm/t/iz6IZDn6GkVPuUzO7Nien8AQjzzchD6eam eW7srDpx6TRDhmCfwWSTrKeTB7Z490Gov46CGL7NFDl6yy2DpmyunbTu9zP8+qjgcILSOV TDXTo3uKWHtBJQ6aBNLFdHG561cjX+slPBTjpsu/du996bELpv4r8RFLL9HfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721226276; 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=nJ1kazdEVXNf2XMqe5F7w9jGeBBJJmN+lnHnALgTigs=; b=Vbi0Vo4BsOiy041LSQl5j1xXC6ckw/519kMUC6GF9g9robL2URsUoikTtbol36ZVI/FfLK 4dghvDHoYp1Bm/ri2EckMTnjdmE+ZUeCQLnRTp2yWN/YSUIwMPEuyQWEMlRkgNilLVYsD1 k+Yu7uvtxb43cgM2Jlb3dLkmY7Dj/Xtd5ePC8Oy7kJdfV9RvWh9fviOzUjJ3beTj9vCZA0 tce+Y7zlbvn+kXnU9ZP/qf6ESHSYz1q85V3wYmVpIfgDiVqDwlQA3FNVkOhSncWRP4iwfc oDSgHouoPlIdwGC1GIifSW26quG6eGQ1UbJTRbiJE1nktNCzE8u3I3aGogZbMQ== 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 4WPJ9H75m4z1MnJ; Wed, 17 Jul 2024 14:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46HEOZw8033001; Wed, 17 Jul 2024 14:24:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HEOZ3I032998; Wed, 17 Jul 2024 14:24:35 GMT (envelope-from git) Date: Wed, 17 Jul 2024 14:24:35 GMT Message-Id: <202407171424.46HEOZ3I032998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: 4c07c994d4ef - stable/13 - cxgbe(4): Reword the comment explaining the atid/cookie split. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c07c994d4ef65c83ccf257207873a3925a8c089 Auto-Submitted: auto-generated The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4c07c994d4ef65c83ccf257207873a3925a8c089 commit 4c07c994d4ef65c83ccf257207873a3925a8c089 Author: Navdeep Parhar AuthorDate: 2023-04-01 23:07:36 +0000 Commit: Navdeep Parhar CommitDate: 2024-07-17 07:14:00 +0000 cxgbe(4): Reword the comment explaining the atid/cookie split. Avoid a magic constant while here. No functional change intended. Sponsored by: Chelsio Communications (cherry picked from commit 43f6f08488046788b0ad66e9a5119f36e5de71ab) --- sys/dev/cxgbe/offload.h | 6 +++--- sys/dev/cxgbe/t4_main.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h index 04bf3995a7b8..e600314ea503 100644 --- a/sys/dev/cxgbe/offload.h +++ b/sys/dev/cxgbe/offload.h @@ -67,10 +67,10 @@ struct stid_region { }; /* - * Max # of ATIDs. The absolute HW max is 14b (enough for 16K) but we reserve - * the upper 3b for use as a cookie to demux the reply. + * Max # of ATIDs. The absolute HW max is larger than this but we reserve a few + * of the upper bits for use as a cookie to demux the reply. */ -#define MAX_ATIDS 2048U +#define MAX_ATIDS (M_TID_TID + 1) union aopen_entry { void *data; diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index b9b9b3150caf..dd7552a50e4f 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3984,6 +3984,9 @@ rw_via_memwin(struct adapter *sc, int idx, uint32_t addr, uint32_t *val, return (0); } +CTASSERT(M_TID_COOKIE == M_COOKIE); +CTASSERT(MAX_ATIDS <= (M_TID_TID + 1)); + static void t4_init_atid_table(struct adapter *sc) {