From nobody Fri Feb 14 06:39:04 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 4YvMpJ5y4rz5ntMy; Fri, 14 Feb 2025 06:39:04 +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 4YvMpJ2t6dz3dCP; Fri, 14 Feb 2025 06:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515144; 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=nvHSMo6xw0KJpWfYJ6aqGEjEvgwN4ZucoDzol+h5dzc=; b=sCY5pxgGbDQdZGXb8QzioGaJ+IuChTpsMnsfpZCUDltlidCFOPNQR89gfZZu4tifQZayR4 AD701OjmwFq10tFQ68Edwsl+Ot+AK4E/skG+XpcziDSehzd39nkWXxryrMJssYeCRyTcFw 5ku6hdO6xAgfo6UDUEohe9Xy5OoUWPIN9YaQWx4+BloATJ2n/cn57koBWHDX5EcwZ4+xx/ SHrrbHCgWrqP5qgb0A4OkkRmKTxNvroKoOZd6qkdAEwKADhBySM/r8vq2xSO/op8r/Mas+ 1FnAsCgd+CvEI1fA7wx5Lg+rXCgZm0txzgqvrRpiO6fnujDkFEnRpV1h2LiwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515144; 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=nvHSMo6xw0KJpWfYJ6aqGEjEvgwN4ZucoDzol+h5dzc=; b=bZPy+MTRpNjPQzveZPzK9mS2qScNV/oXna3Ct/BZ9/NEYxx8/XkQYhoxeIed/FZh+UuIkT I/ZFFWO8L7XyqJ8FMwF7ImfC58kswA9E51dnPxdaBRw7E+jpgcGtflhcR1XXPGDKoFybEX 3WI35oY64J5aFo6exItaO8KqfJuKovuFpFuU2X+X0dBuRb5vg6wKzH4khOlDXTkHubF2y4 q6Jg2kbzb0fbF+DmXM16NmCErQf5lgw7l08ChL4y3xtEmqhaBZtpwcsvRuu+4pK4YrXf2V 5lkdpNWdKSK+BiRemASx6Iiih0wRgBUCZxUyrsfBH9wQr0wlKNDRg5YmZM2C0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739515144; a=rsa-sha256; cv=none; b=NTyV+l1eHF0arV9ydkgsE2FCNUMKSo9ZoN4oyWDBlOAnbDYWVi2rpqG/yp3kH0YaL1zMX9 +zKrbbtXSmjVTdvEPd+TvyxvKSAwF0ERvlrchWuSYXW6uIZBLG95BzXv0RiYJqrAynu87l 4y527QCsEitBRebUvsG9bGesK7s9Ee9ZvBxQIpLwQZQGLO1JzPa13/NRX1YE07LEfLAq+T LA/2QVcgdjOiV10IwikUIYG+2LK7t//UNkuuXD/AORmBG0xGuPUpDBozyPY6ATmA5nAfWZ 5zBGLs2oP++KHZk8fmwbBSG/RiKAljOZJ62fAVTWGAgBt2ygoZyFL1iztzlbkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YvMpJ2LpNz4NJ; Fri, 14 Feb 2025 06:39:04 +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 51E6d4tC097759; Fri, 14 Feb 2025 06:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E6d4LH097756; Fri, 14 Feb 2025 06:39:04 GMT (envelope-from git) Date: Fri, 14 Feb 2025 06:39:04 GMT Message-Id: <202502140639.51E6d4LH097756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: f4ab14044c1d - main - 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/main X-Git-Reftype: branch X-Git-Commit: f4ab14044c1de35b1aefad5449bddc5a1272f8d9 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=f4ab14044c1de35b1aefad5449bddc5a1272f8d9 commit f4ab14044c1de35b1aefad5449bddc5a1272f8d9 Author: Navdeep Parhar AuthorDate: 2025-02-14 00:17:54 +0000 Commit: Navdeep Parhar CommitDate: 2025-02-14 00:41:50 +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 MFC after: 1 week Sponsored by: Chelsio Communications --- 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 e4120e76000c..435e6fd19c9a 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1924,6 +1924,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) { /* @@ -2035,6 +2037,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; @@ -4013,6 +4017,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); @@ -4023,6 +4029,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));