From a7a0d02d8b889123710dc77c4eff5e0437eee205 Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Mon, 17 Feb 2020 23:57:10 +0100 Subject: [PATCH] nvme: fix command specific status code Given enum was not aligned with spec. This status can be reported when size equals 0. Signed-off-by: Jacek Kalwas Change-Id: If51f6b051c13880c1fd4e6bb0a02f134b28b5a88 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/928 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- include/spdk/nvme_spec.h | 2 +- lib/bdev/scsi_nvme.c | 2 +- lib/nvme/nvme_qpair.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h index cd7c947c3..07b2673be 100644 --- a/include/spdk/nvme_spec.h +++ b/include/spdk/nvme_spec.h @@ -1195,7 +1195,7 @@ enum spdk_nvme_generic_command_status_code { enum spdk_nvme_command_specific_status_code { SPDK_NVME_SC_COMPLETION_QUEUE_INVALID = 0x00, SPDK_NVME_SC_INVALID_QUEUE_IDENTIFIER = 0x01, - SPDK_NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED = 0x02, + SPDK_NVME_SC_INVALID_QUEUE_SIZE = 0x02, SPDK_NVME_SC_ABORT_COMMAND_LIMIT_EXCEEDED = 0x03, /* 0x04 - reserved */ SPDK_NVME_SC_ASYNC_EVENT_REQUEST_LIMIT_EXCEEDED = 0x05, diff --git a/lib/bdev/scsi_nvme.c b/lib/bdev/scsi_nvme.c index 880616145..f9fe319bd 100644 --- a/lib/bdev/scsi_nvme.c +++ b/lib/bdev/scsi_nvme.c @@ -165,7 +165,7 @@ spdk_scsi_nvme_translate(const struct spdk_bdev_io *bdev_io, int *sc, int *sk, *ascq = SPDK_SCSI_ASCQ_CAUSE_NOT_REPORTABLE; break; case SPDK_NVME_SC_INVALID_QUEUE_IDENTIFIER: - case SPDK_NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED: + case SPDK_NVME_SC_INVALID_QUEUE_SIZE: case SPDK_NVME_SC_ASYNC_EVENT_REQUEST_LIMIT_EXCEEDED: case SPDK_NVME_SC_INVALID_FIRMWARE_SLOT: case SPDK_NVME_SC_INVALID_FIRMWARE_IMAGE: diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 88a90e5e7..103f7733c 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -207,7 +207,7 @@ static const struct nvme_string generic_status[] = { static const struct nvme_string command_specific_status[] = { { SPDK_NVME_SC_COMPLETION_QUEUE_INVALID, "INVALID COMPLETION QUEUE" }, { SPDK_NVME_SC_INVALID_QUEUE_IDENTIFIER, "INVALID QUEUE IDENTIFIER" }, - { SPDK_NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED, "MAX QUEUE SIZE EXCEEDED" }, + { SPDK_NVME_SC_INVALID_QUEUE_SIZE, "INVALID QUEUE SIZE" }, { SPDK_NVME_SC_ABORT_COMMAND_LIMIT_EXCEEDED, "ABORT CMD LIMIT EXCEEDED" }, { SPDK_NVME_SC_ASYNC_EVENT_REQUEST_LIMIT_EXCEEDED, "ASYNC LIMIT EXCEEDED" }, { SPDK_NVME_SC_INVALID_FIRMWARE_SLOT, "INVALID FIRMWARE SLOT" },