From nobody Tue Oct 10 22:26:16 2023 X-Original-To: dev-commits-src-main@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 4S4r8n0jSHz4wQYh; Tue, 10 Oct 2023 22:26:17 +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 4S4r8n03s5z4Gg2; Tue, 10 Oct 2023 22:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696976777; 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=HlvglJdD+xIU/jvgssEg/8YaOSYWYpcfMAaoAUAgF+I=; b=TVVv4BJj0rC2lbdXd+biHiiatY+vl5/1CABNrtb7nFNDViQSMXk+VT/uou5HOksmshZhC9 NSjuhCq607h+fCD9eOngZbt4JPtRPfmxXwNkjSvY8ylrH5ZjWFyBS7eUcMtTAc3QLiW5+o F4rJtQH67k3vJCtkK6lQSZ8y+/pPLiSL9ITqM7Ir+vgVYheMfk9PLYow+AWWrzPZLnttf9 SzhZmnaMH/h82V8FXOfifp0qiRjpN99SfuSnQY0Vv4bzk0mJZ3qbHXuIsYpmcnZY9677xq RBe6yUdKncngrLw8JrDe2Obhq+9CzPGUv+YncWebiC0tqrN2GfTXcCMBX3ijjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696976777; a=rsa-sha256; cv=none; b=IcrD/gRQJCpcGxfB8eUQmuMahFYcBjxQvCXDaerZ1V7Wjs9rOl8veZ0t8X5XlABm3VAlPV swtgL4n9aqqSbWXtLpUDclfnsZfQB6gYnCvda8xFEciPDwfznJr077D3RHDr/yoTBLWfKU 9s+XqNF8RsKIfq4q7QegMz4e8Cw/cuOQXSPzvFjpk8BoTi+qAaWQpdgK1PZJG6K0CTg6oN zfKt7SWYL92oKzyNwbr35QYGiT6Ikm2pG+5gqeeo5v03UY3QXW//FSP9+Za8eN9fFFXMuJ Gc0P/uynvm4KGJRqjHoegVGd93wXa46KXt0Bc1Xqy6iHdALVA3rsM40N5T2WUw== 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=1696976777; 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=HlvglJdD+xIU/jvgssEg/8YaOSYWYpcfMAaoAUAgF+I=; b=jhL7iDAMKeOtYzpK6CK9eQuS29JNqQcyduVDQRNgI6dslf86Yefb1DjEWpXNWprWKHNzXO vLrRZi4TUNsXjw46CXxHqUPpY57Db9lG4mv0RJcgvDnL9iayD72zoEHFmbui2TK35FuqcO B6n1800HgsNC8juAWM8Fbwg2+y8NkxEC/tTA6ULpbUaWZgPB22P8VbsGG+5QhgOFrMdgqr W9wjlWJ0BkmATMK9Rbo/NY9hV2YONSkKGdVzpnfxe6iQ03pUs9Yu1IAeFZmEPTjlFDdLTP MCMOeVuQzJ7bhNbeCfXMqS+bXRForiYTqUcV1/JyciYtQ79FkxHL+mrg9GwJRQ== 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 4S4r8m60flzwPQ; Tue, 10 Oct 2023 22:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39AMQGKc085411; Tue, 10 Oct 2023 22:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AMQGch085408; Tue, 10 Oct 2023 22:26:16 GMT (envelope-from git) Date: Tue, 10 Oct 2023 22:26:16 GMT Message-Id: <202310102226.39AMQGch085408@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: 4026128983ed - main - nvme: Really remove NVME_2X_RESET List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 4026128983ed93df89e1e800ee1404a57aa749a7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4026128983ed93df89e1e800ee1404a57aa749a7 commit 4026128983ed93df89e1e800ee1404a57aa749a7 Author: Warner Losh AuthorDate: 2023-10-10 17:12:59 +0000 Commit: Warner Losh CommitDate: 2023-10-10 22:13:56 +0000 nvme: Really remove NVME_2X_RESET da8324a9258f removed one of the two instances of NVME_2X_RESET. It failed to snag the other one, and remove it from the options file. Remove from both of those here. Sponsored by: Netflix Reviewed by: chuck, gallatin, jhb Differential Revision: https://reviews.freebsd.org/D42049 --- sys/conf/options | 1 - sys/dev/nvme/nvme_ctrlr.c | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 2f5aa8ae55c1..b6cce3b17ebb 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -999,7 +999,6 @@ EKCD opt_ekcd.h # NVME options NVME_USE_NVD opt_nvme.h -NVME_2X_RESET opt_nvme.h # amdsbwd options AMDSBWD_DEBUG opt_amdsbwd.h diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 968c873fe06c..e5a548b6f6b2 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1145,18 +1145,6 @@ fail: return; } -#ifdef NVME_2X_RESET - /* - * Reset controller twice to ensure we do a transition from cc.en==1 to - * cc.en==0. This is because we don't really know what status the - * controller was left in when boot handed off to OS. Linux doesn't do - * this, however, and when the controller is in state cc.en == 0, no - * I/O can happen. - */ - if (nvme_ctrlr_hw_reset(ctrlr) != 0) - goto fail; -#endif - nvme_qpair_reset(&ctrlr->adminq); nvme_admin_qpair_enable(&ctrlr->adminq);