From nobody Sat Nov 02 14:16:42 2024 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 4XgftL2RbHz5c5ph; Sat, 02 Nov 2024 14:16:42 +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 4XgftL1t2vz439R; Sat, 2 Nov 2024 14:16:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730557002; 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=XXYOb6K6YImwaKhkeZqciWOprWFOaJ9pGhNkSh/M+ww=; b=dU6BnciaBXhzw3PxG4Z9DZgG81aeyYyr09zdU4VY+07M0tpqeR1U5JFvDOD4PLwuiDDnqN 93vMp/jHrNkyUcXlgUHt47QEpWVBRIIgjfKzgQFg1xEXDXCCwcCO9EoelNaMs9vfuU4XNq QBCWiDp9ORTlK3w7LxWLzAx55bHy9/F4qqRP7s/ADFg5N+QfsOcqwcGnpKPllph8tMs2UR qSr9lKm01mu4fKVvRA955RCVmUmJVbMjV5YuNesqDx5rtUZ+XpmUnlxnNJ1X2rCdXsw9Ct Bh4z4uoAieQ1dbcpJR96S6+kQO/+RoExVKMIV+KKowOCNzfHNGcponchmN2m3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730557002; 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=XXYOb6K6YImwaKhkeZqciWOprWFOaJ9pGhNkSh/M+ww=; b=e3YojGULMxicLqLYhLN2tuOi+6/ExEEBHfdkiX3bOb36bBxzijRoy8g+bcJfe6euU5DxcI QBBc8q52NU6aSRZ0U/LoBeQepTaaG1+ac+VvWc+cnF89rlXQlPGNSV5N4EaUNtJlQAqevz zJolWbE8sEI5vrnDpq4H8sB8mbm3anQNDOt2SRW9ink6q0zePKk4QwVi8gnzmU2WuTwkXU 6hWH2Nzq3FMVXrupvhR26S0nqIEEbJWaqtkLlOeUK8lpd1I69goUsXK3gAq/Zdyyl4NgN4 eWQrUWB+3DYrsA5dlZ3nFQIofUDthtEDRoSsN+xA+scSYLxolR4ROmZe25Z0rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730557002; a=rsa-sha256; cv=none; b=k/CG5xytywNAg0UmryqJ3dy4TBiWl+5EJ6nlj9zoyp9qa0vIs96DPbLgya6nNyV2Y+0BmX Ogu2jgB+qk6BgJQ/uFNT04LINBz4C0cE48g1r/K7CwsZcEYy20npXhjSUEbrZD61+9FRJj 5LTR7VLXmuD51akehMH3sdQejSh8iNdb7wkYmmHLKB+IBwgVxtmwgmsN2CxcuADYNL6UF6 DdWwdoLVuRbuIFuesTn9SHSOtW+o0S+8yGNoSqPrwD7wt65tpaHz1D9t6hJGchzqQiHd6Z i6eh2qmUWRQ8DyHVujetfOhV/BoS9Izc1E1r6pNqJbpPEMNFVcvlwewLBtV5dw== 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 4XgftL1Dxhz17bH; Sat, 2 Nov 2024 14:16:42 +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 4A2EGgRQ037985; Sat, 2 Nov 2024 14:16:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2EGgGI037982; Sat, 2 Nov 2024 14:16:42 GMT (envelope-from git) Date: Sat, 2 Nov 2024 14:16:42 GMT Message-Id: <202411021416.4A2EGgGI037982@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: 3aac51cbb99a - main - nvme: Clarify a comment 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aac51cbb99a22723803329ce9d241f2419e1dec Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3aac51cbb99a22723803329ce9d241f2419e1dec commit 3aac51cbb99a22723803329ce9d241f2419e1dec Author: Warner Losh AuthorDate: 2024-11-02 14:11:27 +0000 Commit: Warner Losh CommitDate: 2024-11-02 14:14:33 +0000 nvme: Clarify a comment Expand the comment a little to make it clearer: Once we've restarted, we're out of the resetting phase in our state machine. The controller has actually been out of reset since we started issuing commands to it earlier in the resetting phase. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index d8ad12fc9982..994994c3643f 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1804,7 +1804,8 @@ nvme_ctrlr_resume(struct nvme_controller *ctrlr) /* * Now that we've reset the hardware, we can restart the controller. Any * I/O that was pending is requeued. Any admin commands are aborted with - * an error. Once we've restarted, take the controller out of reset. + * an error. Once we've restarted, stop flagging the controller as being + * in the reset phase. */ nvme_ctrlr_start(ctrlr, true); (void)atomic_cmpset_32(&ctrlr->is_resetting, 1, 0);