git: 4026128983ed - main - nvme: Really remove NVME_2X_RESET

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=4026128983ed93df89e1e800ee1404a57aa749a7

commit 4026128983ed93df89e1e800ee1404a57aa749a7
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-10-10 17:12:59 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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);