From fd5e781afc74020466a5511a861df32e89d8165b Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 10 Sep 2020 10:27:45 +0800 Subject: [PATCH] nvme: don't loop MMIO reads if the controller is already in failed state This may happen when resetting a controller, if the ADMIN queue failed to reconnect, the controller is set to failed state, so for this case we don't need to loop until timeout, just exit. Change-Id: I2b37af5453086cd64f3609c41eb8f6475da55fd4 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4143 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Reviewed-by: Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: JinYu --- lib/nvme/nvme_ctrlr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index 653bd002d..c2c8884b0 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -2526,11 +2526,11 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) if (nvme_ctrlr_get_cc(ctrlr, &cc) || nvme_ctrlr_get_csts(ctrlr, &csts)) { - if (ctrlr->state_timeout_tsc != NVME_TIMEOUT_INFINITE) { + if (!ctrlr->is_failed && ctrlr->state_timeout_tsc != NVME_TIMEOUT_INFINITE) { /* While a device is resetting, it may be unable to service MMIO reads * temporarily. Allow for this case. */ - SPDK_ERRLOG("Get registers failed while waiting for CSTS.RDY == 0\n"); + SPDK_DEBUGLOG(SPDK_LOG_NVME, "Get registers failed while waiting for CSTS.RDY == 0\n"); goto init_timeout; } SPDK_ERRLOG("Failed to read CC and CSTS in state %d\n", ctrlr->state);