The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=18dc12bfd2e23ad2ea97db54cb8ee499f6f014da
commit 18dc12bfd2e23ad2ea97db54cb8ee499f6f014da
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-10-12 20:25:16 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2021-10-12 20:26:54 +0000
nvme: Restore hotplug warning
Restore hotplug warning in recovery state machine. No functional change
other than what message gets printed.
Sponsored by: Netflix
---
sys/dev/nvme/nvme_qpair.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
index 8041731099df..6669eeee6613 100644
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -1010,7 +1010,8 @@ again:
* controller.
*/
nvme_printf(ctrlr, "Resetting controller due to a timeout%s.\n",
- cfs ? " and fatal error status" : "");
+ (csts == 0xffffffff) ? " and possible hot unplug" :
+ (cfs ? " and fatal error status" : ""));
nvme_printf(ctrlr, "RECOVERY_WAITING\n");
qpair->recovery_state = RECOVERY_WAITING;
nvme_ctrlr_reset(ctrlr);
