nvme: always issue I/O Command Set specific Identify Namespace

Currently, the I/O Command Set specific Identify Namespace structure is
only fetched for controllers that support extended LBA formats. This is
because struct nvme_id_ns_nvm is only used by nvme_configure_pi_elbas(),
which is only called when the ELBAS bit is set in the CTRATT field of
the Identify Controller structure.

However, the I/O Command Set specific Identify Namespace structure will
soon be used in nvme_update_disk_info(), so always try to obtain it in
nvme_update_ns_info_block(). This Identify structure is first defined in
NVMe spec version 2.0, but controllers reporting older versions could
still implement it.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.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 04a8dae123333285af76a277f5cdcad28a094f25..6e108086fb763bcdf32b63117d7a191ee5f8e5db 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2356,7 +2356,7 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns,
        }
        lbaf = nvme_lbaf_index(id->flbas);
 
-       if (ns->ctrl->ctratt & NVME_CTRL_ATTR_ELBAS) {
+       if (nvme_id_cns_ok(ns->ctrl, NVME_ID_CNS_CS_NS)) {
                ret = nvme_identify_ns_nvm(ns->ctrl, info->nsid, &nvm);
                if (ret < 0)
                        goto out;