From nobody Wed Apr 06 16:27:28 2022 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 030ED1A9187C; Wed, 6 Apr 2022 16:27:29 +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 4KYVKX6Cmcz4dDy; Wed, 6 Apr 2022 16:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649262448; 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=jyxI4tRaKwYPNr/A6tIaiFQZsqJpNjuRrL+XkNuqAJA=; b=nPmKLHYervPYGwW+Bejm7wWZ0LqNT+ArE7iv/YbjWW7OjtpbPGx8E0E+KJ8zt+HbKjVwHc gcxeBw56pOa2keB17HFGkZmePnewOtwr2bV587816/3aRjMBMhOB8JKLNUGULcKr7HKB8g RuQ14oQUkG9WHxF9RFS0f/tcRc1vDFlBBXABlgpWBa1nR9IRyHEZ8D+B3a6i34kW/WUFBd 7lBwxJ4Rbc+bWGnUdNvFE20/w2LWFZPci/ToARb9xZHtHnIPPXVbBFUoJsG48PWRMeTXce 886EqyqH2D7Oi4VELr4L5HJb1xMp0q15IxwPtbMOO391XlwPovXoiL5qrA27Ig== 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 87F421E8B1; Wed, 6 Apr 2022 16:27:28 +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 236GRSvr014856; Wed, 6 Apr 2022 16:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236GRS3L014855; Wed, 6 Apr 2022 16:27:28 GMT (envelope-from git) Date: Wed, 6 Apr 2022 16:27:28 GMT Message-Id: <202204061627.236GRS3L014855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 09e161a29ee5 - stable/13 - mrsas: if controller reset is in progress, refrain from firing DCMDs to firmware in shutdown 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 09e161a29ee5b0e52494c861f451de35b286e327 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649262448; 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=jyxI4tRaKwYPNr/A6tIaiFQZsqJpNjuRrL+XkNuqAJA=; b=szPJJD7tofT8x2wflpPTRTphu9HLq0zUWLAkCnulH9Eo+ZpXk4+hmrs7kmM8xxfyJnEVSv ed6mZw7LMCbywdUmxRmtt1N+mIRvKm4aIf9UWFzRQFPmUoz2oosXwg1orQeKUcA3NTsDvF o2PWh19HpSvTMhg8YrvIINNX6hKSTwrcU2tRfAZ4h4jooXxDQd58qSmVHBH4G05UdokGE9 jy0IlT02M0cjCiPb4N6ysDlgx0+ZtguvYLcAFQeiA6xxS4PbwYkycoyIgTJkwXbCMQ71Ot N9BMDKXM3psdnrDLWbu0rI3ZwbCv+LTYzyfRUn2DbfB3s4FP4+eBu7RNbObQ7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649262448; a=rsa-sha256; cv=none; b=cYP/ILStDX/IkXfgeQa3uUPPv/e5d/u/4yZioalR1iiZGLhkSmfffZ4WL82FVITGaXmrgu FNaE3Bt2c+OysNu2zqvcmn6H65zG3+hfJyGMTUB/M+mwHLYqpDDYip4FcJKd/SkIQ89/Hr Ec2p98Tmz8BnjCsP+2/qd6v4w0Bb3lLkq/ZAhKYul6/MJDrORhXAACXGVVMKpRLTZhmzpe 0WMwSDDkB0mcoeeYXbiQuUMT/rEfWUNVtP/Y64Mx5O7k44gi0+wxyt32KQnrkkb1Zg6k1G GrP9RyDQdfMQ8+wRmpXhCeD/xyPA0DPGp3TCHQMkEfDY0MKRVCHAca07WX6OqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=09e161a29ee5b0e52494c861f451de35b286e327 commit 09e161a29ee5b0e52494c861f451de35b286e327 Author: Chandrakanth Patil AuthorDate: 2022-01-21 09:24:37 +0000 Commit: Warner Losh CommitDate: 2022-04-06 16:27:25 +0000 mrsas: if controller reset is in progress, refrain from firing DCMDs to firmware in shutdown If controller reset is in progress, at same time if system shutdown is issued then corresponding shutdown function in driver will be invoked where driver is waiting 15 seconds to complete the controller reset. If the reset is not complteted within that time frame driver will go ahead and fire cache flush and shutdown DCMDs which will end up accessing the the queues which are not initialized due to undergoing reset leads to FMU error in firmware. Fix: In shutdown function, if controller reset is not finished within 15 seconds than driver will return to the OS without firing any DCMDs. Reviewed by: imp PR: 261375 (cherry picked from commit 79c4c4be9618470711480f46ef2cd3a15c00cdd2) --- sys/dev/mrsas/mrsas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 8814642fccd0..0055ddda8ce9 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -1198,6 +1198,7 @@ mrsas_shutdown(device_t dev) if (sc->reset_in_progress) { mrsas_dprint(sc, MRSAS_INFO, "gave up waiting for OCR to be finished\n"); + return (0); } }