From nobody Tue Apr 22 11:22:44 2025 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 4Zhfwh5Gfpz5sTyj; Tue, 22 Apr 2025 11:22:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zhfwh4X7Jz3C1C; Tue, 22 Apr 2025 11:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320964; 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=4QE/XYzgGPajvZxMPfbG5V+TMlVwvfjQsdgxOOZRQ80=; b=o4vRg8guuzERj7xGiH0m+EBwXIw5xazHYgyCHlPNXfQRtFyuPuTKWaKpGlWYKzC4IRkHmB yHPxMeWx3J+i0SHKKb5uRYPo0unAgtNbm419RDjh62DwiiMJKjTkhYdcIrZRj2Ly2Jv/WA UvlzKQ9f+7bKBZAgdaBKzPdi8TYeWs8NOMOUAJYblVmZVvlFqlTyXcjFm8h7XiNF2vLmZY WBpdfJKo4aj9bTpFuBbpQ4iFmkuTehzZKSdCaqp5yLgFmaKG6cMGBRukOaK8o7dYHm3m8P Jek4QXAzWOMa1CM7UX+OU+5ZyES0lBG0MwqmHRFqRgu2A0c7EDpCe1P4KjFbeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745320964; a=rsa-sha256; cv=none; b=vt0dg64EM1wGstS3hwYYR3/CJLLX61NnjnxJGcVU+NrilTw1+emjIzGVv+Y9E6jbMCeed1 jklSHYTiLe2+6uzYIPrQ4/ubEsCNZUKfBWnafkr8UyCXwdrXQmeCfvcqBRbBSRbwdy9eFN XztstsVyUQnAX4DhtOOPj/blFxVPzL5Q32YKXFDdSh5P+j5MDL7p7MPuUKs+s4Bro8Kv5Z r7/wc2CuZzU4JakYxoyI/uC4jic7hy7G3Pn+oTbbl8Ny5vSTIQ7DIpM76Wqa+0uM1xUSJN VVqi7NoCVtdq4HKEP/W/8NZy+efnURZfI2y9h652aUdxDnfCR4ZMbnIE0CK9oA== 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=1745320964; 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=4QE/XYzgGPajvZxMPfbG5V+TMlVwvfjQsdgxOOZRQ80=; b=lEIOni65MoinZ1llFY8y/xNDAcNQccU5Jmlxo1wxzgzKJdZQLLr6cVeEYN0cUNNlUAHvPl AeqEYK5DT3eL9b4KdQ77HzI67bsQtXACWWQRRIjoaImJQxYJ6CZNjeEonGh4jlQaWYt0// 88PnDJs/uI4Ve2nbnDBgA1o/iI0EdFFybilDPWSBkBXOhhbVa7nFwm3cLw1dFwsqS9B02C m4N27KnI4kqJW5MJPwaqr7T7nuARJKs7diPQUPhEhmpYpBsYKTgBYncpp5q1e7WsF7LDRJ U3d2bqlWBCPZYTq3OwV9+yZK5wjsGW5zJ6yTZ0uJge3eT2AdLn21RKPCLOjRWw== 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 4Zhfwh40vSz2Vd; Tue, 22 Apr 2025 11:22:44 +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 53MBMi3o026011; Tue, 22 Apr 2025 11:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MBMi1S026008; Tue, 22 Apr 2025 11:22:44 GMT (envelope-from git) Date: Tue, 22 Apr 2025 11:22:44 GMT Message-Id: <202504221122.53MBMi1S026008@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: 4599a3c0b8e2 - stable/14 - cxgbe(4): Make sure suspend/resume works in recovery mode. 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 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/14 X-Git-Reftype: branch X-Git-Commit: 4599a3c0b8e2278e8400f0dc2ff54f02836b063f Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=4599a3c0b8e2278e8400f0dc2ff54f02836b063f commit 4599a3c0b8e2278e8400f0dc2ff54f02836b063f Author: Navdeep Parhar AuthorDate: 2025-02-14 00:17:54 +0000 Commit: Navdeep Parhar CommitDate: 2025-04-22 11:12:45 +0000 cxgbe(4): Make sure suspend/resume works in recovery mode. The driver does minimal initialization in this mode and suspend/resume should ignore resources that aren't setup. This is for debug only. kenv hw.cxgbe.sos="1" kldload if_cxgbe devctl suspend t6nex0 devctl resume t6nex0 Sponsored by: Chelsio Communications (cherry picked from commit f4ab14044c1de35b1aefad5449bddc5a1272f8d9) --- sys/dev/cxgbe/t4_l2t.c | 4 ++++ sys/dev/cxgbe/t4_main.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c index b210003cfac0..b1307bf2ace5 100644 --- a/sys/dev/cxgbe/t4_l2t.c +++ b/sys/dev/cxgbe/t4_l2t.c @@ -376,6 +376,8 @@ t4_stop_l2t(struct adapter *sc) { struct l2t_data *d = sc->l2t; + if (d == NULL) + return (0); rw_wlock(&d->lock); d->l2t_stopped = true; rw_wunlock(&d->lock); @@ -388,6 +390,8 @@ t4_restart_l2t(struct adapter *sc) { struct l2t_data *d = sc->l2t; + if (d == NULL) + return (0); rw_wlock(&d->lock); d->l2t_stopped = false; rw_wunlock(&d->lock); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 6b3a68b352ad..222f58d056ad 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1935,6 +1935,8 @@ stop_adapter(struct adapter *sc) t4_shutdown_adapter(sc); for_each_port(sc, i) { pi = sc->port[i]; + if (pi == NULL) + continue; PORT_LOCK(pi); if (pi->up_vis > 0 && pi->link_cfg.link_ok) { /* @@ -2046,6 +2048,8 @@ stop_lld(struct adapter *sc) /* Quiesce all activity. */ for_each_port(sc, i) { pi = sc->port[i]; + if (pi == NULL) + continue; pi->vxlan_tcam_entry = false; for_each_vi(pi, j, vi) { vi->xact_addr_filt = -1; @@ -4025,6 +4029,8 @@ stop_atid_allocator(struct adapter *sc) { struct tid_info *t = &sc->tids; + if (t->natids == 0) + return; mtx_lock(&t->atid_lock); t->atid_alloc_stopped = true; mtx_unlock(&t->atid_lock); @@ -4035,6 +4041,8 @@ restart_atid_allocator(struct adapter *sc) { struct tid_info *t = &sc->tids; + if (t->natids == 0) + return; mtx_lock(&t->atid_lock); KASSERT(t->atids_in_use == 0, ("%s: %d atids still in use.", __func__, t->atids_in_use));