From: Javier González <javier@javigon.com>
Date: Tue, 9 Oct 2018 11:12:12 +0000 (+0200)
Subject: lightnvm: do no update csecs and sos on 1.2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6fd05cad5ee1290b276dd8ed90a1e019b1fa577a;p=openwrt%2Fstaging%2Fblogic.git

lightnvm: do no update csecs and sos on 1.2

1.2 devices exposes their data and metadata size through the separate
identify command. Make sure that the NVMe LBA format does not override
these values.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 7d0a4d3b0a48..a4f3b263cd6c 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -977,6 +977,9 @@ void nvme_nvm_update_nvm_info(struct nvme_ns *ns)
 	struct nvm_dev *ndev = ns->ndev;
 	struct nvm_geo *geo = &ndev->geo;
 
+	if (geo->version == NVM_OCSSD_SPEC_12)
+		return;
+
 	geo->csecs = 1 << ns->lba_shift;
 	geo->sos = ns->ms;
 }