nvmet: implement supported features log

This log is required for nvme 2.1.

Reviewed-by: Matias Bjørling <matias.bjorling@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index cbbf911c5cc0d1380a6a6816d2922c0db9978de4..f832661a4913e03f33505efcdc371bdf31b021f2 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -89,6 +89,7 @@ static void nvmet_execute_get_supported_log_pages(struct nvmet_req *req)
        logs->lids[NVME_LOG_CHANGED_NS] = cpu_to_le32(NVME_LIDS_LSUPP);
        logs->lids[NVME_LOG_CMD_EFFECTS] = cpu_to_le32(NVME_LIDS_LSUPP);
        logs->lids[NVME_LOG_ANA] = cpu_to_le32(NVME_LIDS_LSUPP);
+       logs->lids[NVME_LOG_FEATURES] = cpu_to_le32(NVME_LIDS_LSUPP);
        logs->lids[NVME_LOG_RESERVATION] = cpu_to_le32(NVME_LIDS_LSUPP);
 
        status = nvmet_copy_to_sgl(req, 0, logs, sizeof(*logs));
@@ -347,6 +348,36 @@ out:
        nvmet_req_complete(req, status);
 }
 
+static void nvmet_execute_get_log_page_features(struct nvmet_req *req)
+{
+       struct nvme_supported_features_log *features;
+       u16 status;
+
+       features = kzalloc(sizeof(*features), GFP_KERNEL);
+       if (!features) {
+               status = NVME_SC_INTERNAL;
+               goto out;
+       }
+
+       features->fis[NVME_FEAT_NUM_QUEUES] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_CSCPE);
+       features->fis[NVME_FEAT_KATO] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_CSCPE);
+       features->fis[NVME_FEAT_ASYNC_EVENT] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_CSCPE);
+       features->fis[NVME_FEAT_HOST_ID] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_CSCPE);
+       features->fis[NVME_FEAT_WRITE_PROTECT] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_NSCPE);
+       features->fis[NVME_FEAT_RESV_MASK] =
+               cpu_to_le32(NVME_FIS_FSUPP | NVME_FIS_NSCPE);
+
+       status = nvmet_copy_to_sgl(req, 0, features, sizeof(*features));
+       kfree(features);
+out:
+       nvmet_req_complete(req, status);
+}
+
 static void nvmet_execute_get_log_page(struct nvmet_req *req)
 {
        if (!nvmet_check_transfer_len(req, nvmet_get_log_page_len(req->cmd)))
@@ -372,6 +403,8 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)
                return nvmet_execute_get_log_cmd_effects_ns(req);
        case NVME_LOG_ANA:
                return nvmet_execute_get_log_page_ana(req);
+       case NVME_LOG_FEATURES:
+               return nvmet_execute_get_log_page_features(req);
        case NVME_LOG_RESERVATION:
                return nvmet_execute_get_log_page_resv(req);
        }

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index e9e508bca60f0024cdf399ea720e9f266239fdef..31d7ec6d8b93511469026367f748c2546b39e4ea 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -1256,6 +1256,7 @@ enum {
        NVME_LOG_TELEMETRY_CTRL = 0x08,
        NVME_LOG_ENDURANCE_GROUP = 0x09,
        NVME_LOG_ANA            = 0x0c,
+       NVME_LOG_FEATURES       = 0x12,
        NVME_LOG_DISC           = 0x70,
        NVME_LOG_RESERVATION    = 0x80,
        NVME_FWACT_REPL         = (0 << 3),
@@ -1271,6 +1272,16 @@ enum {
        NVME_LIDS_LSUPP = 1 << 0,
 };
 
+struct nvme_supported_features_log {
+       __le32  fis[256];
+};
+
+enum {
+       NVME_FIS_FSUPP  = 1 << 0,
+       NVME_FIS_NSCPE  = 1 << 20,
+       NVME_FIS_CSCPE  = 1 << 21,
+};
+
 /* NVMe Namespace Write Protect State */
 enum {
        NVME_NS_NO_WRITE_PROTECT = 0,