From 628f9adb392d423f8026abb02361edb7145f74e8 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 19 Jan 2021 13:32:54 +0000 Subject: [PATCH] nvme/spec: completion queue entry Dword1 is now command specific The ratified NVME TP4056 changes the completion queue entry Dword1 from reserved to command specific. Update spdk_nvme_cpl to reflect this. Signed-off-by: Niklas Cassel Change-Id: I6a21eb1355f6ca69770ea7eb4ccc8fe1c5a0d737 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6011 Reviewed-by: Paul Luse Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: sunshihao Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins --- include/spdk/nvme_spec.h | 2 +- lib/nvmf/fc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h index 71e130425..f51440405 100644 --- a/include/spdk/nvme_spec.h +++ b/include/spdk/nvme_spec.h @@ -1124,7 +1124,7 @@ struct spdk_nvme_cpl { uint32_t cdw0; /* command-specific */ /* dword 1 */ - uint32_t rsvd1; + uint32_t cdw1; /* command-specific */ /* dword 2 */ uint16_t sqhd; /* submission queue head pointer */ diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c index e5df6eade..eba03c72b 100644 --- a/lib/nvmf/fc.c +++ b/lib/nvmf/fc.c @@ -1881,7 +1881,7 @@ nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req, if (!(rsp_cnt % fc_conn->esrp_ratio) || (cmd->opc == SPDK_NVME_OPC_FABRIC) || - (status & 0xFFFE) || rsp->cdw0 || rsp->rsvd1 || + (status & 0xFFFE) || rsp->cdw0 || rsp->cdw1 || (req->length != xfer_len)) { return true; }