svn commit: r326940 - head/sys/dev/nvme

[Warner Losh]

Author: imp
Date: Mon Dec 18 20:11:21 2017
New Revision: 326940
URL: https://svnweb.freebsd.org/changeset/base/326940

Log:
  Although we only have one quirk at the moment, guard against the day
  we have more than one by checking the actual quirk bit before delaying
  the reset.
  
  Noticed by: rpokala@

Modified:
  head/sys/dev/nvme/nvme_ctrlr.c

Modified: head/sys/dev/nvme/nvme_ctrlr.c
==============================================================================
--- head/sys/dev/nvme/nvme_ctrlr.c	Mon Dec 18 20:11:15 2017	(r326939)
+++ head/sys/dev/nvme/nvme_ctrlr.c	Mon Dec 18 20:11:21 2017	(r326940)
@@ -299,7 +299,7 @@ nvme_ctrlr_disable(struct nvme_controller *ctrlr)
 	 * disable, so delay for a bit after we write the bit to
 	 * cope with these issues.
 	 */
-	if (ctrlr->quirks)
+	if (ctrlr->quirks & QUIRK_DELAY_B4_CHK_RDY)
 		pause("nvmeR", B4_CHK_RDY_DELAY_MS * hz / 1000);
 	return (nvme_ctrlr_wait_for_ready(ctrlr, 0));
 }