From e83a62bf09b5ce5070253270e47d5402262ea4a9 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 5 Jun 2018 09:56:50 -0700 Subject: [PATCH] nvme: rename quirk from LIGHTNVM to OCSSD This is consistent with the Open Channel naming we are using elsewhere. Change-Id: Ib088359bed29a958f8b50e41cf34143a23429f54 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/413840 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu --- lib/nvme/nvme_internal.h | 4 ++-- lib/nvme/nvme_quirks.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/nvme/nvme_internal.h b/lib/nvme/nvme_internal.h index 6930bc63e..5282f9a93 100644 --- a/lib/nvme/nvme_internal.h +++ b/lib/nvme/nvme_internal.h @@ -100,11 +100,11 @@ extern pid_t g_spdk_nvme_pid; #define NVME_QUIRK_IDENTIFY_CNS 0x40 /* - * The controller supports LightNVM command set if matching additional + * The controller supports Open Channel command set if matching additional * condition, like the first byte (value 0x1) in the vendor specific * bits of the namespace identify structure is set. */ -#define NVME_QUIRK_LIGHTNVM 0x80 +#define NVME_QUIRK_OCSSD 0x80 #define NVME_MAX_ASYNC_EVENTS (8) diff --git a/lib/nvme/nvme_quirks.c b/lib/nvme/nvme_quirks.c index 09f87d8c1..65f0d3d5c 100644 --- a/lib/nvme/nvme_quirks.c +++ b/lib/nvme/nvme_quirks.c @@ -74,7 +74,7 @@ static const struct nvme_quirk nvme_quirks[] = { }, { {SPDK_PCI_VID_CNEXLABS, 0x1f1f, SPDK_PCI_ANY_ID, SPDK_PCI_ANY_ID}, NVME_QUIRK_IDENTIFY_CNS | - NVME_QUIRK_LIGHTNVM + NVME_QUIRK_OCSSD }, { {0x0000, 0x0000, 0x0000, 0x0000}, 0} }; @@ -121,7 +121,7 @@ nvme_get_quirks(const struct spdk_pci_id *id) PRINT_QUIRK(NVME_QUIRK_DELAY_AFTER_QUEUE_ALLOC); PRINT_QUIRK(NVME_QUIRK_READ_ZERO_AFTER_DEALLOCATE); PRINT_QUIRK(NVME_QUIRK_IDENTIFY_CNS); - PRINT_QUIRK(NVME_QUIRK_LIGHTNVM); + PRINT_QUIRK(NVME_QUIRK_OCSSD); return quirk->flags; }