From 26089992fecf4c9fccf892854962435956c242e0 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 31 Aug 2017 23:34:26 -0400 Subject: [PATCH] nvme: print the error message when error happened Users don't need to provide nvme debug flag for the error cases. Change-Id: I00c29e2b8ab470b0233d94acec52b4bec129728c Signed-off-by: Changpeng Liu Reviewed-on: https://review.gerrithub.io/376708 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: John Kariuki Reviewed-by: Jim Harris --- lib/nvme/nvme_ctrlr.c | 2 +- lib/nvme/nvme_pcie.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c index a8394f74b..ea14be93e 100644 --- a/lib/nvme/nvme_ctrlr.c +++ b/lib/nvme/nvme_ctrlr.c @@ -1234,7 +1234,7 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) /* While a device is resetting, it may be unable to service MMIO reads * temporarily. Allow for this case. */ - SPDK_DEBUGLOG(SPDK_TRACE_NVME, "Get registers failed while waiting for CSTS.RDY == 0\n"); + SPDK_ERRLOG("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); diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index dec7bdc1d..ce2945b1c 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -1534,7 +1534,7 @@ nvme_pcie_prp_list_append(struct nvme_tracker *tr, uint32_t *prp_index, void *vi *prp_index, virt_addr, (uint32_t)len); if (spdk_unlikely(((uintptr_t)virt_addr & 3) != 0)) { - SPDK_DEBUGLOG(SPDK_TRACE_NVME, "virt_addr %p not dword aligned\n", virt_addr); + SPDK_ERRLOG("virt_addr %p not dword aligned\n", virt_addr); return -EINVAL; } @@ -1547,13 +1547,13 @@ nvme_pcie_prp_list_append(struct nvme_tracker *tr, uint32_t *prp_index, void *vi * so prp_index == count is valid. */ if (spdk_unlikely(i > SPDK_COUNTOF(tr->u.prp))) { - SPDK_DEBUGLOG(SPDK_TRACE_NVME, "out of PRP entries\n"); + SPDK_ERRLOG("out of PRP entries\n"); return -EINVAL; } phys_addr = spdk_vtophys(virt_addr); if (spdk_unlikely(phys_addr == SPDK_VTOPHYS_ERROR)) { - SPDK_DEBUGLOG(SPDK_TRACE_NVME, "vtophys(%p) failed\n", virt_addr); + SPDK_ERRLOG("vtophys(%p) failed\n", virt_addr); return -EINVAL; } @@ -1563,8 +1563,7 @@ nvme_pcie_prp_list_append(struct nvme_tracker *tr, uint32_t *prp_index, void *vi seg_len = page_size - ((uintptr_t)virt_addr & page_mask); } else { if ((phys_addr & page_mask) != 0) { - SPDK_DEBUGLOG(SPDK_TRACE_NVME, "PRP %u not page aligned (%p)\n", - i, virt_addr); + SPDK_ERRLOG("PRP %u not page aligned (%p)\n", i, virt_addr); return -EINVAL; }