From nobody Fri Nov 4 22:55:54 2022 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 4N3wvv12QBz4gywV; Fri, 4 Nov 2022 22:55:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N3wvv09f7z40gD; Fri, 4 Nov 2022 22:55:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667602555; 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=u41O2cVbPFDngxK2p+9T3cPGzqX0kYy0WSq/GMMz6vo=; b=N/JkAz9Um+UtOeZfvtXfxUT2fMF2HjGLSjIbvpYh/EiyMxC/+v0O8V7AlO19sfm0S5Faqd 2qSD4lKUM/E9mJXPATKOh6LtyzKRPjT5m49hGvSZP8ZkoOZt4+eg8mwZ2NMZ7g9JdZsWMd SXKfhnMeiLd8Bof5ElWZFlmjwaUtc3cEAkTDRPtSHdIYl1DotnEfBSieb/yQnJKgDJ2lSt Q/zCBPGVnC4/UomEIZaY/vNi6iWuk//Dq97OTd1GtDlRkYGVyg9vcHOaYnEBPeGsM7kmar 6oSiWCaUHrNYYAe+DIQMdH2q0ohVSqarUpHh+WtVnL3VJ16iXVkSM2E+hUz4xw== 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 4N3wvt5rlFzKDC; Fri, 4 Nov 2022 22:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A4MtsdI032742; Fri, 4 Nov 2022 22:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A4Mts6B032741; Fri, 4 Nov 2022 22:55:54 GMT (envelope-from git) Date: Fri, 4 Nov 2022 22:55:54 GMT Message-Id: <202211042255.2A4Mts6B032741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: baef1301a2bc - main - if_bnxt: Fix the issue when kernel invokes _init() again without _stop() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: baef1301a2bc60be3908f44dff1f83dbbd8f812a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667602555; 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=u41O2cVbPFDngxK2p+9T3cPGzqX0kYy0WSq/GMMz6vo=; b=p/lq/qQm3ey9FnQ0/41Um6jWk556WHTAr3oGM7tGLep6QrhZsX6q8qBvtG8Pkx/b5i3vi3 Fl9TC8kSOO8CjxaP/1b8W6XN6OwIMoKPjNKVFf72Fp816qaK3upwhv4XT3xXk1ZvW8CJJv 3UFtgMYNFNjvFx7Zp+P5dcFFpTdTTd6ca5RbiB9uRsifx1gBHNR1BazumLYy/MfPx4ra87 wWn2ah93oD0iMuFoUWfnbtX1mjP/lDYqNbupIrv8QNlh4Wxpi4z7SraxkKQuEhRsUnbcte PXGrjUNRDbQ9DcAk3rmOegDrf4zNwx0GWo9SI5g/NSRrGeSFzGnmegBsOzdbIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667602555; a=rsa-sha256; cv=none; b=ietAjDBgzxvvFoqSnDIv7iwSgVwzmWzAzjl6Ss29OxCjGSl08stPYIlo1CZyfRzMYb6q3/ t8bsKyMt0f16OujsjiKTNxjGS4SVrY6r5hsUAZEqmrM5h8Hyi61tLMgU1DvR96Mm0M20LF xEZOfPJ2uWT+Wmh/amcVdMj75vAKPJScCvK5gPl3MINn9ccWUL0ylLIlrMJV4+E5ycOgAK ALt4Fitz4V7i5RqWlq2ARloaWVcgegAeN7pT96fwwC0fFIqO/HtVdGjtoabVmsfMp7Aq4r UW0LgxQTdHbl67CZtbpDtth/A4QRRazo0wgJrRO+t3vhJ3RPEsEkwf5ZlbMMaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=baef1301a2bc60be3908f44dff1f83dbbd8f812a commit baef1301a2bc60be3908f44dff1f83dbbd8f812a Author: Sumit Saxena AuthorDate: 2022-11-04 22:28:51 +0000 Commit: Warner Losh CommitDate: 2022-11-04 22:28:51 +0000 if_bnxt: Fix the issue when kernel invokes _init() again without _stop() Fixed the issue when kernel invokes _init() when it is already in _init() state by invoking _stop() in such case. Reviewed by: imp Differential Revsion: https://reviews.freebsd.org/D36445 --- sys/dev/bnxt/bnxt.h | 1 + sys/dev/bnxt/if_bnxt.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index f8f3f4ccc2f5..0d5824722b41 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -738,6 +738,7 @@ struct bnxt_softc { struct bnxt_ver_info *ver_info; struct bnxt_nvram_info *nvm_info; bool wol; + bool is_dev_init; struct bnxt_hw_lro hw_lro; uint8_t wol_filter_id; uint16_t rx_coal_usecs; diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index bc6dd1c2b1c5..8b26b4d64436 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -1749,7 +1749,11 @@ bnxt_init(if_ctx_t ctx) rc = bnxt_hwrm_func_reset(softc); if (rc) return; + } else if (softc->is_dev_init) { + bnxt_stop(ctx); } + + softc->is_dev_init = true; bnxt_clear_ids(softc); // TBD -- Check if it is needed for Thor as well @@ -1909,8 +1913,8 @@ bnxt_stop(if_ctx_t ctx) { struct bnxt_softc *softc = iflib_get_softc(ctx); + softc->is_dev_init = false; bnxt_do_disable_intr(&softc->def_cp_ring); - bnxt_hwrm_func_reset(softc); bnxt_func_reset(softc); bnxt_clear_ids(softc); return;