From: "Javier González" <jg@lightnvm.io>
To: mb@lightnvm.io
Cc: linux-block@vger.kernel.org,
"Javier González" <javier@cnexlabs.com>,
linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org
Subject: [PATCH 02/19] lightnvm: add controller capabilities to 2.0
Date: Mon, 26 Feb 2018 14:17:01 +0100 [thread overview]
Message-ID: <1519651038-16845-3-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519651038-16845-1-git-send-email-javier@cnexlabs.com>
QXNzaWduIG1pc3NpbmcgbWNjYXAgdmFsdWUgb24gMi4wIHBhdGgKClNpZ25lZC1vZmYtYnk6IEph
dmllciBHb256w6FsZXogPGphdmllckBjbmV4bGFicy5jb20+Ci0tLQogZHJpdmVycy9udm1lL2hv
c3QvbGlnaHRudm0uYyB8IDQgKysrLQogaW5jbHVkZS9saW51eC9saWdodG52bS5oICAgICB8IDgg
KysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbnZtZS9ob3N0L2xpZ2h0bnZtLmMgYi9kcml2ZXJzL252
bWUvaG9zdC9saWdodG52bS5jCmluZGV4IDhmNTQxMzMxYjFhOS4uMTAzOTJhNjY0YjUwIDEwMDY0
NAotLS0gYS9kcml2ZXJzL252bWUvaG9zdC9saWdodG52bS5jCisrKyBiL2RyaXZlcnMvbnZtZS9o
b3N0L2xpZ2h0bnZtLmMKQEAgLTMxOCw3ICszMTgsNyBAQCBzdGF0aWMgaW50IG52bWVfbnZtX3Nl
dHVwXzEyKHN0cnVjdCBudm1lX252bV9pZDEyICppZCwKIAlkZXZfZ2VvLT5jLndzX29wdCA9IHNl
Y19wZXJfcGc7CiAJZGV2X2dlby0+Yy5td19jdW5pdHMgPSA4OwkJLyogZGVmYXVsdCB0byBNTEMg
c2FmZSB2YWx1ZXMgKi8KIAotCWRldl9nZW8tPmMubWNjYXAgPSBsZTMyX3RvX2NwdShzcmMtPm1j
Y2FwKTsKKwlkZXZfZ2VvLT5jLmNhcCA9IGxlMzJfdG9fY3B1KHNyYy0+bWNjYXApOwogCiAJZGV2
X2dlby0+Yy50cmR0ID0gbGUzMl90b19jcHUoc3JjLT50cmR0KTsKIAlkZXZfZ2VvLT5jLnRyZG0g
PSBsZTMyX3RvX2NwdShzcmMtPnRyZG0pOwpAQCAtMzk5LDYgKzM5OSw4IEBAIHN0YXRpYyBpbnQg
bnZtZV9udm1fc2V0dXBfMjAoc3RydWN0IG52bWVfbnZtX2lkMjAgKmlkLAogCWRldl9nZW8tPmMu
d3Nfb3B0ID0gbGUzMl90b19jcHUoaWQtPndzX29wdCk7CiAJZGV2X2dlby0+Yy5td19jdW5pdHMg
PSBsZTMyX3RvX2NwdShpZC0+bXdfY3VuaXRzKTsKIAorCWRldl9nZW8tPmMuY2FwID0gbGUzMl90
b19jcHUoaWQtPm1jY2FwKTsKKwogCWRldl9nZW8tPmMudHJkdCA9IGxlMzJfdG9fY3B1KGlkLT50
cmR0KTsKIAlkZXZfZ2VvLT5jLnRyZG0gPSBsZTMyX3RvX2NwdShpZC0+dHJkbSk7CiAJZGV2X2dl
by0+Yy50cHJ0ID0gbGUzMl90b19jcHUoaWQtPnR3cnQpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9s
aW51eC9saWdodG52bS5oIGIvaW5jbHVkZS9saW51eC9saWdodG52bS5oCmluZGV4IDQ1MzdjMDE0
MDM4Ni4uNDI3MDRjNGNhOWFmIDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2xpZ2h0bnZtLmgK
KysrIGIvaW5jbHVkZS9saW51eC9saWdodG52bS5oCkBAIC0yNzMsOCArMjczLDEwIEBAIHN0cnVj
dCBudm1fY29tbW9uX2dlbyB7CiAJdTMyCXdzX29wdDsJCS8qIG9wdGltYWwgd3JpdGUgc2l6ZSAq
LwogCXUzMgltd19jdW5pdHM7CS8qIGRpc3RhbmNlIHJlcXVpcmVkIGZvciBzdWNjZXNzZnVsIHJl
YWQgKi8KIAotCS8qIGRldmljZSBjYXBhYmlsaXRpZXMgKi8KLQl1MzIJbWNjYXA7CisJLyogZGV2
aWNlIGNhcGFiaWxpdGllcy4gTm90ZSB0aGF0IHRoaXMgcmVwcmVzZW50cyBjYXBhYmlsaXRpZXMg
aW4gMS4yCisJICogYW5kIG1lZGlhIGFuZCBjb250cm9sbGVyIGNhcGFiaWxpdGllcyBpbiAyLjAK
KwkgKi8KKwl1MzIJY2FwOwogCiAJLyogZGV2aWNlIHRpbWluZ3MgKi8KIAl1MzIJdHJkdDsJCS8q
IEF2Zy4gVHJlYWQgKG5zKSAqLwpAQCAtMjg5LDcgKzI5MSw3IEBAIHN0cnVjdCBudm1fY29tbW9u
X2dlbyB7CiAKIAkvKiAxLjIgY29tcGF0aWJpbGl0eSAqLwogCXU4CXZtbnQ7Ci0JdTMyCWNhcDsK
Kwl1MzIJbWNjYXA7CiAJdTMyCWRvbTsKIAogCXU4CW10eXBlOwotLSAKMi43LjQKCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1udm1lIG1haWxp
bmcgbGlzdApMaW51eC1udm1lQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJh
ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1udm1lCg==
WARNING: multiple messages have this Message-ID (diff)
From: "Javier González" <jg@lightnvm.io>
To: mb@lightnvm.io
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nvme@lists.infradead.org,
"Javier González" <javier@cnexlabs.com>
Subject: [PATCH 02/19] lightnvm: add controller capabilities to 2.0
Date: Mon, 26 Feb 2018 14:17:01 +0100 [thread overview]
Message-ID: <1519651038-16845-3-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519651038-16845-1-git-send-email-javier@cnexlabs.com>
Assign missing mccap value on 2.0 path
Signed-off-by: Javier González <javier@cnexlabs.com>
---
drivers/nvme/host/lightnvm.c | 4 +++-
include/linux/lightnvm.h | 8 +++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 8f541331b1a9..10392a664b50 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -318,7 +318,7 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id,
dev_geo->c.ws_opt = sec_per_pg;
dev_geo->c.mw_cunits = 8; /* default to MLC safe values */
- dev_geo->c.mccap = le32_to_cpu(src->mccap);
+ dev_geo->c.cap = le32_to_cpu(src->mccap);
dev_geo->c.trdt = le32_to_cpu(src->trdt);
dev_geo->c.trdm = le32_to_cpu(src->trdm);
@@ -399,6 +399,8 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id,
dev_geo->c.ws_opt = le32_to_cpu(id->ws_opt);
dev_geo->c.mw_cunits = le32_to_cpu(id->mw_cunits);
+ dev_geo->c.cap = le32_to_cpu(id->mccap);
+
dev_geo->c.trdt = le32_to_cpu(id->trdt);
dev_geo->c.trdm = le32_to_cpu(id->trdm);
dev_geo->c.tprt = le32_to_cpu(id->twrt);
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index 4537c0140386..42704c4ca9af 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -273,8 +273,10 @@ struct nvm_common_geo {
u32 ws_opt; /* optimal write size */
u32 mw_cunits; /* distance required for successful read */
- /* device capabilities */
- u32 mccap;
+ /* device capabilities. Note that this represents capabilities in 1.2
+ * and media and controller capabilities in 2.0
+ */
+ u32 cap;
/* device timings */
u32 trdt; /* Avg. Tread (ns) */
@@ -289,7 +291,7 @@ struct nvm_common_geo {
/* 1.2 compatibility */
u8 vmnt;
- u32 cap;
+ u32 mccap;
u32 dom;
u8 mtype;
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: jg@lightnvm.io (Javier González)
Subject: [PATCH 02/19] lightnvm: add controller capabilities to 2.0
Date: Mon, 26 Feb 2018 14:17:01 +0100 [thread overview]
Message-ID: <1519651038-16845-3-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519651038-16845-1-git-send-email-javier@cnexlabs.com>
Assign missing mccap value on 2.0 path
Signed-off-by: Javier Gonz?lez <javier at cnexlabs.com>
---
drivers/nvme/host/lightnvm.c | 4 +++-
include/linux/lightnvm.h | 8 +++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 8f541331b1a9..10392a664b50 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -318,7 +318,7 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id,
dev_geo->c.ws_opt = sec_per_pg;
dev_geo->c.mw_cunits = 8; /* default to MLC safe values */
- dev_geo->c.mccap = le32_to_cpu(src->mccap);
+ dev_geo->c.cap = le32_to_cpu(src->mccap);
dev_geo->c.trdt = le32_to_cpu(src->trdt);
dev_geo->c.trdm = le32_to_cpu(src->trdm);
@@ -399,6 +399,8 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id,
dev_geo->c.ws_opt = le32_to_cpu(id->ws_opt);
dev_geo->c.mw_cunits = le32_to_cpu(id->mw_cunits);
+ dev_geo->c.cap = le32_to_cpu(id->mccap);
+
dev_geo->c.trdt = le32_to_cpu(id->trdt);
dev_geo->c.trdm = le32_to_cpu(id->trdm);
dev_geo->c.tprt = le32_to_cpu(id->twrt);
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index 4537c0140386..42704c4ca9af 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -273,8 +273,10 @@ struct nvm_common_geo {
u32 ws_opt; /* optimal write size */
u32 mw_cunits; /* distance required for successful read */
- /* device capabilities */
- u32 mccap;
+ /* device capabilities. Note that this represents capabilities in 1.2
+ * and media and controller capabilities in 2.0
+ */
+ u32 cap;
/* device timings */
u32 trdt; /* Avg. Tread (ns) */
@@ -289,7 +291,7 @@ struct nvm_common_geo {
/* 1.2 compatibility */
u8 vmnt;
- u32 cap;
+ u32 mccap;
u32 dom;
u8 mtype;
--
2.7.4
next prev parent reply other threads:[~2018-02-26 13:17 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 13:16 [PATCH V3 00/19] lightnvm: pblk: implement 2.0 support Javier González
2018-02-26 13:16 ` Javier González
2018-02-26 13:16 ` Javier González
2018-02-26 13:17 ` [PATCH 01/19] lightnvm: simplify geometry structure Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González [this message]
2018-02-26 13:17 ` [PATCH 02/19] lightnvm: add controller capabilities to 2.0 Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 03/19] lightnvm: add minor version to generic geometry Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 04/19] lightnvm: add shorten OCSSD version in geo Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 05/19] lightnvm: complete geo structure with maxoc* Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 06/19] lightnvm: pblk: check for supported version Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 07/19] lightnvm: complete 2.0 values in sysfs Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 08/19] lightnvm: rename number of channels and luns Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 09/19] lightnvm: rename sect_* to sec_* Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 10/19] lightnvm: add support for 2.0 address format Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 11/19] lightnvm: pblk: rename ppaf* to addrf* Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 12/19] lightnvn: pblk: use generic address format Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 13/19] lightnvm: make address conversions depend on generic device Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 14/19] nvme: make nvme_get_log_ext available Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 15/19] lightnvm: implement get log report chunk helpers Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 16/19] lightnvm: define chunk states Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 17/19] lightnvm: pblk: implement get log report chunk Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 19:04 ` Matias Bjørling
2018-02-26 19:04 ` Matias Bjørling
2018-02-27 14:40 ` Javier González
2018-02-27 14:40 ` Javier González
2018-02-27 18:46 ` Matias Bjørling
2018-02-27 18:46 ` Matias Bjørling
2018-02-27 19:50 ` Javier González
2018-02-27 19:50 ` Javier González
2018-02-26 13:17 ` [PATCH 18/19] lightnvm: pblk: refactor init/exit sequences Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 13:17 ` [PATCH 19/19] lightnvm: pblk: implement 2.0 support Javier González
2018-02-26 13:17 ` Javier González
2018-02-26 18:19 ` [PATCH V3 00/19] " Matias Bjørling
2018-02-26 18:19 ` Matias Bjørling
2018-02-26 18:21 ` Javier Gonzalez
2018-02-26 18:21 ` Javier Gonzalez
2018-02-26 18:24 ` Matias Bjørling
2018-02-26 18:24 ` Matias Bjørling
2018-02-26 18:27 ` Javier Gonzalez
2018-02-26 18:27 ` Javier Gonzalez
2018-02-26 18:33 ` Matias Bjørling
2018-02-26 18:33 ` Matias Bjørling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1519651038-16845-3-git-send-email-javier@cnexlabs.com \
--to=jg@lightnvm.io \
--cc=javier@cnexlabs.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mb@lightnvm.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.