git: 13b711e8c829 - stable/13 - nvme: Restore hotplug warning
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Jan 2022 02:27:03 UTC
The branch stable/13 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=13b711e8c82953b729399d6be4f029019f548b4c
commit 13b711e8c82953b729399d6be4f029019f548b4c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-10-12 20:25:16 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2022-01-21 02:07:31 +0000
nvme: Restore hotplug warning
Restore hotplug warning in recovery state machine. No functional change
other than what message gets printed.
Sponsored by: Netflix
(cherry picked from commit 18dc12bfd2e23ad2ea97db54cb8ee499f6f014da)
---
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);