nvme: implement log page low/high offset and dwords

NVMe 1.2.1 extends the get log page interface to include 64 bit
offset and increases the number of dwords to 32 bits. Implement
for future use.

Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ea99265..5c729ab 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -100,11 +100,6 @@ static struct class *nvme_subsys_class;
 static void nvme_ns_remove(struct nvme_ns *ns);
 static int nvme_revalidate_disk(struct gendisk *disk);
 
-static __le32 nvme_get_log_dw10(u8 lid, size_t size)
-{
-       return cpu_to_le32((((size / 4) - 1) << 16) | lid);
-}
-
 int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
 {
        if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
@@ -2218,18 +2213,35 @@ out_unlock:
        return ret;
 }
 
-static int nvme_get_log(struct nvme_ctrl *ctrl, u8 log_page, void *log,
-                       size_t size)
+static int nvme_get_log_ext(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
+                           u8 log_page, void *log,
+                           size_t size, size_t offset)
 {
        struct nvme_command c = { };
+       unsigned long dwlen = size / 4 - 1;
+
+       c.get_log_page.opcode = nvme_admin_get_log_page;
+
+       if (ns)
+               c.get_log_page.nsid = cpu_to_le32(ns->head->ns_id);
+       else
+               c.get_log_page.nsid = cpu_to_le32(NVME_NSID_ALL);
 
-       c.common.opcode = nvme_admin_get_log_page;
-       c.common.nsid = cpu_to_le32(NVME_NSID_ALL);
-       c.common.cdw10[0] = nvme_get_log_dw10(log_page, size);
+       c.get_log_page.lid = log_page;
+       c.get_log_page.numdl = cpu_to_le16(dwlen & ((1 << 16) - 1));
+       c.get_log_page.numdu = cpu_to_le16(dwlen >> 16);
+       c.get_log_page.lpol = cpu_to_le32(offset & ((1ULL << 32) - 1));
+       c.get_log_page.lpou = cpu_to_le32(offset >> 32ULL);
 
        return nvme_submit_sync_cmd(ctrl->admin_q, &c, log, size);
 }
 
+static int nvme_get_log(struct nvme_ctrl *ctrl, u8 log_page, void *log,
+                       size_t size)
+{
+       return nvme_get_log_ext(ctrl, NULL, log_page, log, size, 0);
+}
+
 static int nvme_get_effects_log(struct nvme_ctrl *ctrl)
 {
        int ret;