nvme: use command set independent id ns if available

The NVMe 2.0 specification adds an independent identify namespace
data structure that contains generic attributes that apply to all
namespace types. Some attributes carry over from the NVM command set
identify namespace data structure, and others are new.

Currently, the data structure only considered when CRIMS is enabled or
when the namespace type is key-value.

However, the independent namespace data structure is mandatory for
devices that implement features from the 2.0+ specification. Therefore,
we can check this data structure first. If unavailable, retrieve the
generic attributes from the NVM command set identify namespace data
structure.

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

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 279b0f445904dff14399bdd1d0547fb837002546..162889b6382aa54256a6b160513b9e622982aa04 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3988,7 +3988,7 @@ static void nvme_scan_ns(struct nvme_ctrl *ctrl, unsigned nsid)
 {
        struct nvme_ns_info info = { .nsid = nsid };
        struct nvme_ns *ns;
-       int ret;
+       int ret = 1;
 
        if (nvme_identify_ns_descs(ctrl, &info))
                return;
@@ -4005,9 +4005,10 @@ static void nvme_scan_ns(struct nvme_ctrl *ctrl, unsigned nsid)
         * set up a namespace.  If not fall back to the legacy version.
         */
        if ((ctrl->cap & NVME_CAP_CRMS_CRIMS) ||
-           (info.ids.csi != NVME_CSI_NVM && info.ids.csi != NVME_CSI_ZNS))
+           (info.ids.csi != NVME_CSI_NVM && info.ids.csi != NVME_CSI_ZNS) ||
+           ctrl->vs >= NVME_VS(2, 0, 0))
                ret = nvme_ns_info_from_id_cs_indep(ctrl, &info);
-       else
+       if (ret > 0)
                ret = nvme_ns_info_from_identify(ctrl, &info);
 
        if (info.is_removed)