From 9928e9d98a76f62e87551c1e2503eeb370fc04e5 Mon Sep 17 00:00:00 2001 From: Xiaodong Liu Date: Wed, 16 May 2018 18:42:38 +0800 Subject: [PATCH] ocssd: apply ocssd strings into status arrays Change-Id: If25463ea76e8382c61f10636e1119376a00104dc Signed-off-by: Xiaodong Liu Reviewed-on: https://review.gerrithub.io/411594 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu --- lib/nvme/nvme_qpair.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index 750f4139b..cbb3aa43f 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -32,6 +32,7 @@ */ #include "nvme_internal.h" +#include "spdk/nvme_ocssd.h" static void nvme_qpair_fail(struct spdk_nvme_qpair *qpair); @@ -67,6 +68,7 @@ static const struct nvme_string admin_opcode[] = { { SPDK_NVME_OPC_SECURITY_SEND, "SECURITY SEND" }, { SPDK_NVME_OPC_SECURITY_RECEIVE, "SECURITY RECEIVE" }, { SPDK_NVME_OPC_SANITIZE, "SANITIZE" }, + { SPDK_OCSSD_OPC_GEOMETRY, "OCSSD / GEOMETRY" }, { 0xFFFF, "ADMIN COMMAND" } }; @@ -82,6 +84,10 @@ static const struct nvme_string io_opcode[] = { { SPDK_NVME_OPC_RESERVATION_REPORT, "RESERVATION REPORT" }, { SPDK_NVME_OPC_RESERVATION_ACQUIRE, "RESERVATION ACQUIRE" }, { SPDK_NVME_OPC_RESERVATION_RELEASE, "RESERVATION RELEASE" }, + { SPDK_OCSSD_OPC_VECTOR_RESET, "OCSSD / VECTOR RESET" }, + { SPDK_OCSSD_OPC_VECTOR_WRITE, "OCSSD / VECTOR WRITE" }, + { SPDK_OCSSD_OPC_VECTOR_READ, "OCSSD / VECTOR READ" }, + { SPDK_OCSSD_OPC_VECTOR_COPY, "OCSSD / VECTOR COPY" }, { 0xFFFF, "IO COMMAND" } }; @@ -246,6 +252,12 @@ static const struct nvme_string media_error_status[] = { { SPDK_NVME_SC_COMPARE_FAILURE, "COMPARE FAILURE" }, { SPDK_NVME_SC_ACCESS_DENIED, "ACCESS DENIED" }, { SPDK_NVME_SC_DEALLOCATED_OR_UNWRITTEN_BLOCK, "DEALLOCATED OR UNWRITTEN BLOCK" }, + { SPDK_OCSSD_SC_OFFLINE_CHUNK, "RESET OFFLINE CHUNK" }, + { SPDK_OCSSD_SC_INVALID_RESET, "INVALID RESET" }, + { SPDK_OCSSD_SC_WRITE_FAIL_WRITE_NEXT_UNIT, "WRITE FAIL WRITE NEXT UNIT" }, + { SPDK_OCSSD_SC_WRITE_FAIL_CHUNK_EARLY_CLOSE, "WRITE FAIL CHUNK EARLY CLOSE" }, + { SPDK_OCSSD_SC_OUT_OF_ORDER_WRITE, "OUT OF ORDER WRITE" }, + { SPDK_OCSSD_SC_READ_HIGH_ECC, "READ HIGH ECC" }, { 0xFFFF, "MEDIA ERROR" } };