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 10/20] lightnvm: pblk: rename ppaf* to addrf*
Date: Wed, 21 Feb 2018 10:26:48 +0100 [thread overview]
Message-ID: <1519205218-26994-11-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519205218-26994-1-git-send-email-javier@cnexlabs.com>
SW4gcHJlcGFyYXRpb24gZm9yIDIuMCBzdXBwb3J0IGluIHBibGssIHJlbmFtZSB2YXJpYWJsZXMg
cmVmZXJyaW5nIHRvCnRoZSBhZGRyZXNzIGZvcm1hdCB0byBhZGRyZiBhbmQgcmVzZXJ2ZSBwcGFm
IGZvciB0aGUgMS4yIHBhdGguCgpTaWduZWQtb2ZmLWJ5OiBKYXZpZXIgR29uesOhbGV6IDxqYXZp
ZXJAY25leGxhYnMuY29tPgotLS0KIGRyaXZlcnMvbGlnaHRudm0vcGJsay1pbml0LmMgIHwgIDgg
KysrKy0tLS0KIGRyaXZlcnMvbGlnaHRudm0vcGJsay1zeXNmcy5jIHwgIDQgKystLQogZHJpdmVy
cy9saWdodG52bS9wYmxrLmggICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNo
YW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvbGlnaHRudm0vcGJsay1pbml0LmMgYi9kcml2ZXJzL2xpZ2h0bnZtL3BibGstaW5pdC5j
CmluZGV4IDZiZjUxZWY4ZjUxNi4uNTZiNGFmYzI3YWRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2xp
Z2h0bnZtL3BibGstaW5pdC5jCisrKyBiL2RyaXZlcnMvbGlnaHRudm0vcGJsay1pbml0LmMKQEAg
LTgwLDcgKzgwLDcgQEAgc3RhdGljIHNpemVfdCBwYmxrX3RyYW5zX21hcF9zaXplKHN0cnVjdCBw
YmxrICpwYmxrKQogewogCWludCBlbnRyeV9zaXplID0gODsKIAotCWlmIChwYmxrLT5wcGFmX2Jp
dHNpemUgPCAzMikKKwlpZiAocGJsay0+YWRkcmZfbGVuIDwgMzIpCiAJCWVudHJ5X3NpemUgPSA0
OwogCiAJcmV0dXJuIGVudHJ5X3NpemUgKiBwYmxrLT5ybC5ucl9zZWNzOwpAQCAtMTk4LDcgKzE5
OCw3IEBAIHN0YXRpYyBpbnQgcGJsa19zZXRfYWRkcmZfMTIoc3RydWN0IG52bV9nZW8gKmdlbywK
IAlyZXR1cm4gZHN0LT5ibGtfb2Zmc2V0ICsgc3JjLT5ibGtfbGVuOwogfQogCi1zdGF0aWMgaW50
IHBibGtfc2V0X3BwYWYoc3RydWN0IHBibGsgKnBibGspCitzdGF0aWMgaW50IHBibGtfc2V0X2Fk
ZHJmKHN0cnVjdCBwYmxrICpwYmxrKQogewogCXN0cnVjdCBudm1fdGd0X2RldiAqZGV2ID0gcGJs
ay0+ZGV2OwogCXN0cnVjdCBudm1fZ2VvICpnZW8gPSAmZGV2LT5nZW87CkBAIC0yMTAsNyArMjEw
LDcgQEAgc3RhdGljIGludCBwYmxrX3NldF9wcGFmKHN0cnVjdCBwYmxrICpwYmxrKQogCQlyZXR1
cm4gLUVJTlZBTDsKIAl9CiAKLQlwYmxrLT5wcGFmX2JpdHNpemUgPSBwYmxrX3NldF9hZGRyZl8x
MihnZW8sICh2b2lkICopJnBibGstPnBwYWYpOworCXBibGstPmFkZHJmX2xlbiA9IHBibGtfc2V0
X2FkZHJmXzEyKGdlbywgKHZvaWQgKikmcGJsay0+YWRkcmYpOwogCiAJcmV0dXJuIDA7CiB9CkBA
IC0zMTksNyArMzE5LDcgQEAgc3RhdGljIGludCBwYmxrX2NvcmVfaW5pdChzdHJ1Y3QgcGJsayAq
cGJsaykKIAlpZiAoIXBibGstPnJfZW5kX3dxKQogCQlnb3RvIGZyZWVfYmJfd3E7CiAKLQlpZiAo
cGJsa19zZXRfcHBhZihwYmxrKSkKKwlpZiAocGJsa19zZXRfYWRkcmYocGJsaykpCiAJCWdvdG8g
ZnJlZV9yX2VuZF93cTsKIAogCWlmIChwYmxrX3J3Yl9pbml0KHBibGspKQpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9saWdodG52bS9wYmxrLXN5c2ZzLmMgYi9kcml2ZXJzL2xpZ2h0bnZtL3BibGstc3lz
ZnMuYwppbmRleCA4MTI4OGFhOTE2MmEuLmQzYjUwNzQxYjY5MSAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9saWdodG52bS9wYmxrLXN5c2ZzLmMKKysrIGIvZHJpdmVycy9saWdodG52bS9wYmxrLXN5c2Zz
LmMKQEAgLTExNywxMiArMTE3LDEyIEBAIHN0YXRpYyBzc2l6ZV90IHBibGtfc3lzZnNfcHBhZihz
dHJ1Y3QgcGJsayAqcGJsaywgY2hhciAqcGFnZSkKIAlzdHJ1Y3QgbnZtX2FkZHJfZm9ybWF0XzEy
ICpnZW9fcHBhZjsKIAlzc2l6ZV90IHN6ID0gMDsKIAotCXBwYWYgPSAoc3RydWN0IG52bV9hZGRy
X2Zvcm1hdF8xMiAqKSZwYmxrLT5wcGFmOworCXBwYWYgPSAoc3RydWN0IG52bV9hZGRyX2Zvcm1h
dF8xMiAqKSZwYmxrLT5hZGRyZjsKIAlnZW9fcHBhZiA9IChzdHJ1Y3QgbnZtX2FkZHJfZm9ybWF0
XzEyICopJmdlby0+Yy5hZGRyZjsKIAogCXN6ID0gc25wcmludGYocGFnZSwgUEFHRV9TSVpFLAog
CQkicGJsazooczolZCljaDolZC8lZCxsdW46JWQvJWQsYmxrOiVkLyVkLHBnOiVkLyVkLHBsOiVk
LyVkLHNlYzolZC8lZFxuIiwKLQkJCXBibGstPnBwYWZfYml0c2l6ZSwKKwkJCXBibGstPmFkZHJm
X2xlbiwKIAkJCXBwYWYtPmNoX29mZnNldCwgcHBhZi0+Y2hfbGVuLAogCQkJcHBhZi0+bHVuX29m
ZnNldCwgcHBhZi0+bHVuX2xlbiwKIAkJCXBwYWYtPmJsa19vZmZzZXQsIHBwYWYtPmJsa19sZW4s
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2xpZ2h0bnZtL3BibGsuaCBiL2RyaXZlcnMvbGlnaHRudm0v
cGJsay5oCmluZGV4IDRmN2EzNjU0MzZmMS4uNDZiMjlhNDkyZjc0IDEwMDY0NAotLS0gYS9kcml2
ZXJzL2xpZ2h0bnZtL3BibGsuaAorKysgYi9kcml2ZXJzL2xpZ2h0bnZtL3BibGsuaApAQCAtNTcw
LDggKzU3MCw4IEBAIHN0cnVjdCBwYmxrIHsKIAlzdHJ1Y3QgcGJsa19saW5lX21nbXQgbF9tZzsJ
CS8qIExpbmUgbWFuYWdlbWVudCAqLwogCXN0cnVjdCBwYmxrX2xpbmVfbWV0YSBsbTsJCS8qIExp
bmUgbWV0YWRhdGEgKi8KIAotCXN0cnVjdCBudm1fYWRkcl9mb3JtYXQgcHBhZjsKLQlpbnQgcHBh
Zl9iaXRzaXplOworCXN0cnVjdCBudm1fYWRkcl9mb3JtYXQgYWRkcmY7CisJaW50IGFkZHJmX2xl
bjsKIAogCXN0cnVjdCBwYmxrX3JiIHJ3YjsKIApAQCAtOTQ4LDcgKzk0OCw3IEBAIHN0YXRpYyBp
bmxpbmUgc3RydWN0IHBwYV9hZGRyIGFkZHJfdG9fZ2VuX3BwYShzdHJ1Y3QgcGJsayAqcGJsaywg
dTY0IHBhZGRyLAogCQkJCQkgICAgICB1NjQgbGluZV9pZCkKIHsKIAlzdHJ1Y3QgbnZtX2FkZHJf
Zm9ybWF0XzEyICpwcGFmID0KLQkJCQkoc3RydWN0IG52bV9hZGRyX2Zvcm1hdF8xMiAqKSZwYmxr
LT5wcGFmOworCQkJCShzdHJ1Y3QgbnZtX2FkZHJfZm9ybWF0XzEyICopJnBibGstPmFkZHJmOwog
CXN0cnVjdCBwcGFfYWRkciBwcGE7CiAKIAlwcGEucHBhID0gMDsKQEAgLTk2Niw3ICs5NjYsNyBA
QCBzdGF0aWMgaW5saW5lIHU2NCBwYmxrX2Rldl9wcGFfdG9fbGluZV9hZGRyKHN0cnVjdCBwYmxr
ICpwYmxrLAogCQkJCQkJCXN0cnVjdCBwcGFfYWRkciBwKQogewogCXN0cnVjdCBudm1fYWRkcl9m
b3JtYXRfMTIgKnBwYWYgPQotCQkJCShzdHJ1Y3QgbnZtX2FkZHJfZm9ybWF0XzEyICopJnBibGst
PnBwYWY7CisJCQkJKHN0cnVjdCBudm1fYWRkcl9mb3JtYXRfMTIgKikmcGJsay0+YWRkcmY7CiAJ
dTY0IHBhZGRyOwogCiAJcGFkZHIgPSAodTY0KXAuZy5jaCA8PCBwcGFmLT5jaF9vZmZzZXQ7CkBA
IC05OTEsNyArOTkxLDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgcHBhX2FkZHIgcGJsa19wcGEz
Ml90b19wcGE2NChzdHJ1Y3QgcGJsayAqcGJsaywgdTMyIHBwYTMyKQogCQlwcGE2NC5jLmlzX2Nh
Y2hlZCA9IDE7CiAJfSBlbHNlIHsKIAkJc3RydWN0IG52bV9hZGRyX2Zvcm1hdF8xMiAqcHBhZiA9
Ci0JCQkJKHN0cnVjdCBudm1fYWRkcl9mb3JtYXRfMTIgKikmcGJsay0+cHBhZjsKKwkJCQkoc3Ry
dWN0IG52bV9hZGRyX2Zvcm1hdF8xMiAqKSZwYmxrLT5hZGRyZjsKIAogCQlwcGE2NC5nLmNoID0g
KHBwYTMyICYgcHBhZi0+Y2hfbWFzaykgPj4gcHBhZi0+Y2hfb2Zmc2V0OwogCQlwcGE2NC5nLmx1
biA9IChwcGEzMiAmIHBwYWYtPmx1bl9tYXNrKSA+PiBwcGFmLT5sdW5fb2Zmc2V0OwpAQCAtMTAx
NSw3ICsxMDE1LDcgQEAgc3RhdGljIGlubGluZSB1MzIgcGJsa19wcGE2NF90b19wcGEzMihzdHJ1
Y3QgcGJsayAqcGJsaywgc3RydWN0IHBwYV9hZGRyIHBwYTY0KQogCQlwcGEzMiB8PSAxVSA8PCAz
MTsKIAl9IGVsc2UgewogCQlzdHJ1Y3QgbnZtX2FkZHJfZm9ybWF0XzEyICpwcGFmID0KLQkJCQko
c3RydWN0IG52bV9hZGRyX2Zvcm1hdF8xMiAqKSZwYmxrLT5wcGFmOworCQkJCShzdHJ1Y3QgbnZt
X2FkZHJfZm9ybWF0XzEyICopJnBibGstPmFkZHJmOwogCiAJCXBwYTMyIHw9IHBwYTY0LmcuY2gg
PDwgcHBhZi0+Y2hfb2Zmc2V0OwogCQlwcGEzMiB8PSBwcGE2NC5nLmx1biA8PCBwcGFmLT5sdW5f
b2Zmc2V0OwpAQCAtMTAzMyw3ICsxMDMzLDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgcHBhX2Fk
ZHIgcGJsa190cmFuc19tYXBfZ2V0KHN0cnVjdCBwYmxrICpwYmxrLAogewogCXN0cnVjdCBwcGFf
YWRkciBwcGE7CiAKLQlpZiAocGJsay0+cHBhZl9iaXRzaXplIDwgMzIpIHsKKwlpZiAocGJsay0+
YWRkcmZfbGVuIDwgMzIpIHsKIAkJdTMyICptYXAgPSAodTMyICopcGJsay0+dHJhbnNfbWFwOwog
CiAJCXBwYSA9IHBibGtfcHBhMzJfdG9fcHBhNjQocGJsaywgbWFwW2xiYV0pOwpAQCAtMTA0OSw3
ICsxMDQ5LDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3QgcHBhX2FkZHIgcGJsa190cmFuc19tYXBf
Z2V0KHN0cnVjdCBwYmxrICpwYmxrLAogc3RhdGljIGlubGluZSB2b2lkIHBibGtfdHJhbnNfbWFw
X3NldChzdHJ1Y3QgcGJsayAqcGJsaywgc2VjdG9yX3QgbGJhLAogCQkJCQkJc3RydWN0IHBwYV9h
ZGRyIHBwYSkKIHsKLQlpZiAocGJsay0+cHBhZl9iaXRzaXplIDwgMzIpIHsKKwlpZiAocGJsay0+
YWRkcmZfbGVuIDwgMzIpIHsKIAkJdTMyICptYXAgPSAodTMyICopcGJsay0+dHJhbnNfbWFwOwog
CiAJCW1hcFtsYmFdID0gcGJsa19wcGE2NF90b19wcGEzMihwYmxrLCBwcGEpOwotLSAKMi43LjQK
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1u
dm1lIG1haWxpbmcgbGlzdApMaW51eC1udm1lQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xp
c3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1udm1lCg==
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 10/20] lightnvm: pblk: rename ppaf* to addrf*
Date: Wed, 21 Feb 2018 10:26:48 +0100 [thread overview]
Message-ID: <1519205218-26994-11-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519205218-26994-1-git-send-email-javier@cnexlabs.com>
In preparation for 2.0 support in pblk, rename variables referring to
the address format to addrf and reserve ppaf for the 1.2 path.
Signed-off-by: Javier González <javier@cnexlabs.com>
---
drivers/lightnvm/pblk-init.c | 8 ++++----
drivers/lightnvm/pblk-sysfs.c | 4 ++--
drivers/lightnvm/pblk.h | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 6bf51ef8f516..56b4afc27add 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -80,7 +80,7 @@ static size_t pblk_trans_map_size(struct pblk *pblk)
{
int entry_size = 8;
- if (pblk->ppaf_bitsize < 32)
+ if (pblk->addrf_len < 32)
entry_size = 4;
return entry_size * pblk->rl.nr_secs;
@@ -198,7 +198,7 @@ static int pblk_set_addrf_12(struct nvm_geo *geo,
return dst->blk_offset + src->blk_len;
}
-static int pblk_set_ppaf(struct pblk *pblk)
+static int pblk_set_addrf(struct pblk *pblk)
{
struct nvm_tgt_dev *dev = pblk->dev;
struct nvm_geo *geo = &dev->geo;
@@ -210,7 +210,7 @@ static int pblk_set_ppaf(struct pblk *pblk)
return -EINVAL;
}
- pblk->ppaf_bitsize = pblk_set_addrf_12(geo, (void *)&pblk->ppaf);
+ pblk->addrf_len = pblk_set_addrf_12(geo, (void *)&pblk->addrf);
return 0;
}
@@ -319,7 +319,7 @@ static int pblk_core_init(struct pblk *pblk)
if (!pblk->r_end_wq)
goto free_bb_wq;
- if (pblk_set_ppaf(pblk))
+ if (pblk_set_addrf(pblk))
goto free_r_end_wq;
if (pblk_rwb_init(pblk))
diff --git a/drivers/lightnvm/pblk-sysfs.c b/drivers/lightnvm/pblk-sysfs.c
index 81288aa9162a..d3b50741b691 100644
--- a/drivers/lightnvm/pblk-sysfs.c
+++ b/drivers/lightnvm/pblk-sysfs.c
@@ -117,12 +117,12 @@ static ssize_t pblk_sysfs_ppaf(struct pblk *pblk, char *page)
struct nvm_addr_format_12 *geo_ppaf;
ssize_t sz = 0;
- ppaf = (struct nvm_addr_format_12 *)&pblk->ppaf;
+ ppaf = (struct nvm_addr_format_12 *)&pblk->addrf;
geo_ppaf = (struct nvm_addr_format_12 *)&geo->c.addrf;
sz = snprintf(page, PAGE_SIZE,
"pblk:(s:%d)ch:%d/%d,lun:%d/%d,blk:%d/%d,pg:%d/%d,pl:%d/%d,sec:%d/%d\n",
- pblk->ppaf_bitsize,
+ pblk->addrf_len,
ppaf->ch_offset, ppaf->ch_len,
ppaf->lun_offset, ppaf->lun_len,
ppaf->blk_offset, ppaf->blk_len,
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 4f7a365436f1..46b29a492f74 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -570,8 +570,8 @@ struct pblk {
struct pblk_line_mgmt l_mg; /* Line management */
struct pblk_line_meta lm; /* Line metadata */
- struct nvm_addr_format ppaf;
- int ppaf_bitsize;
+ struct nvm_addr_format addrf;
+ int addrf_len;
struct pblk_rb rwb;
@@ -948,7 +948,7 @@ static inline struct ppa_addr addr_to_gen_ppa(struct pblk *pblk, u64 paddr,
u64 line_id)
{
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
struct ppa_addr ppa;
ppa.ppa = 0;
@@ -966,7 +966,7 @@ static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk,
struct ppa_addr p)
{
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
u64 paddr;
paddr = (u64)p.g.ch << ppaf->ch_offset;
@@ -991,7 +991,7 @@ static inline struct ppa_addr pblk_ppa32_to_ppa64(struct pblk *pblk, u32 ppa32)
ppa64.c.is_cached = 1;
} else {
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
ppa64.g.ch = (ppa32 & ppaf->ch_mask) >> ppaf->ch_offset;
ppa64.g.lun = (ppa32 & ppaf->lun_mask) >> ppaf->lun_offset;
@@ -1015,7 +1015,7 @@ static inline u32 pblk_ppa64_to_ppa32(struct pblk *pblk, struct ppa_addr ppa64)
ppa32 |= 1U << 31;
} else {
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
ppa32 |= ppa64.g.ch << ppaf->ch_offset;
ppa32 |= ppa64.g.lun << ppaf->lun_offset;
@@ -1033,7 +1033,7 @@ static inline struct ppa_addr pblk_trans_map_get(struct pblk *pblk,
{
struct ppa_addr ppa;
- if (pblk->ppaf_bitsize < 32) {
+ if (pblk->addrf_len < 32) {
u32 *map = (u32 *)pblk->trans_map;
ppa = pblk_ppa32_to_ppa64(pblk, map[lba]);
@@ -1049,7 +1049,7 @@ static inline struct ppa_addr pblk_trans_map_get(struct pblk *pblk,
static inline void pblk_trans_map_set(struct pblk *pblk, sector_t lba,
struct ppa_addr ppa)
{
- if (pblk->ppaf_bitsize < 32) {
+ if (pblk->addrf_len < 32) {
u32 *map = (u32 *)pblk->trans_map;
map[lba] = pblk_ppa64_to_ppa32(pblk, ppa);
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: jg@lightnvm.io (Javier González)
Subject: [PATCH 10/20] lightnvm: pblk: rename ppaf* to addrf*
Date: Wed, 21 Feb 2018 10:26:48 +0100 [thread overview]
Message-ID: <1519205218-26994-11-git-send-email-javier@cnexlabs.com> (raw)
In-Reply-To: <1519205218-26994-1-git-send-email-javier@cnexlabs.com>
In preparation for 2.0 support in pblk, rename variables referring to
the address format to addrf and reserve ppaf for the 1.2 path.
Signed-off-by: Javier Gonz?lez <javier at cnexlabs.com>
---
drivers/lightnvm/pblk-init.c | 8 ++++----
drivers/lightnvm/pblk-sysfs.c | 4 ++--
drivers/lightnvm/pblk.h | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 6bf51ef8f516..56b4afc27add 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -80,7 +80,7 @@ static size_t pblk_trans_map_size(struct pblk *pblk)
{
int entry_size = 8;
- if (pblk->ppaf_bitsize < 32)
+ if (pblk->addrf_len < 32)
entry_size = 4;
return entry_size * pblk->rl.nr_secs;
@@ -198,7 +198,7 @@ static int pblk_set_addrf_12(struct nvm_geo *geo,
return dst->blk_offset + src->blk_len;
}
-static int pblk_set_ppaf(struct pblk *pblk)
+static int pblk_set_addrf(struct pblk *pblk)
{
struct nvm_tgt_dev *dev = pblk->dev;
struct nvm_geo *geo = &dev->geo;
@@ -210,7 +210,7 @@ static int pblk_set_ppaf(struct pblk *pblk)
return -EINVAL;
}
- pblk->ppaf_bitsize = pblk_set_addrf_12(geo, (void *)&pblk->ppaf);
+ pblk->addrf_len = pblk_set_addrf_12(geo, (void *)&pblk->addrf);
return 0;
}
@@ -319,7 +319,7 @@ static int pblk_core_init(struct pblk *pblk)
if (!pblk->r_end_wq)
goto free_bb_wq;
- if (pblk_set_ppaf(pblk))
+ if (pblk_set_addrf(pblk))
goto free_r_end_wq;
if (pblk_rwb_init(pblk))
diff --git a/drivers/lightnvm/pblk-sysfs.c b/drivers/lightnvm/pblk-sysfs.c
index 81288aa9162a..d3b50741b691 100644
--- a/drivers/lightnvm/pblk-sysfs.c
+++ b/drivers/lightnvm/pblk-sysfs.c
@@ -117,12 +117,12 @@ static ssize_t pblk_sysfs_ppaf(struct pblk *pblk, char *page)
struct nvm_addr_format_12 *geo_ppaf;
ssize_t sz = 0;
- ppaf = (struct nvm_addr_format_12 *)&pblk->ppaf;
+ ppaf = (struct nvm_addr_format_12 *)&pblk->addrf;
geo_ppaf = (struct nvm_addr_format_12 *)&geo->c.addrf;
sz = snprintf(page, PAGE_SIZE,
"pblk:(s:%d)ch:%d/%d,lun:%d/%d,blk:%d/%d,pg:%d/%d,pl:%d/%d,sec:%d/%d\n",
- pblk->ppaf_bitsize,
+ pblk->addrf_len,
ppaf->ch_offset, ppaf->ch_len,
ppaf->lun_offset, ppaf->lun_len,
ppaf->blk_offset, ppaf->blk_len,
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 4f7a365436f1..46b29a492f74 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -570,8 +570,8 @@ struct pblk {
struct pblk_line_mgmt l_mg; /* Line management */
struct pblk_line_meta lm; /* Line metadata */
- struct nvm_addr_format ppaf;
- int ppaf_bitsize;
+ struct nvm_addr_format addrf;
+ int addrf_len;
struct pblk_rb rwb;
@@ -948,7 +948,7 @@ static inline struct ppa_addr addr_to_gen_ppa(struct pblk *pblk, u64 paddr,
u64 line_id)
{
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
struct ppa_addr ppa;
ppa.ppa = 0;
@@ -966,7 +966,7 @@ static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk,
struct ppa_addr p)
{
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
u64 paddr;
paddr = (u64)p.g.ch << ppaf->ch_offset;
@@ -991,7 +991,7 @@ static inline struct ppa_addr pblk_ppa32_to_ppa64(struct pblk *pblk, u32 ppa32)
ppa64.c.is_cached = 1;
} else {
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
ppa64.g.ch = (ppa32 & ppaf->ch_mask) >> ppaf->ch_offset;
ppa64.g.lun = (ppa32 & ppaf->lun_mask) >> ppaf->lun_offset;
@@ -1015,7 +1015,7 @@ static inline u32 pblk_ppa64_to_ppa32(struct pblk *pblk, struct ppa_addr ppa64)
ppa32 |= 1U << 31;
} else {
struct nvm_addr_format_12 *ppaf =
- (struct nvm_addr_format_12 *)&pblk->ppaf;
+ (struct nvm_addr_format_12 *)&pblk->addrf;
ppa32 |= ppa64.g.ch << ppaf->ch_offset;
ppa32 |= ppa64.g.lun << ppaf->lun_offset;
@@ -1033,7 +1033,7 @@ static inline struct ppa_addr pblk_trans_map_get(struct pblk *pblk,
{
struct ppa_addr ppa;
- if (pblk->ppaf_bitsize < 32) {
+ if (pblk->addrf_len < 32) {
u32 *map = (u32 *)pblk->trans_map;
ppa = pblk_ppa32_to_ppa64(pblk, map[lba]);
@@ -1049,7 +1049,7 @@ static inline struct ppa_addr pblk_trans_map_get(struct pblk *pblk,
static inline void pblk_trans_map_set(struct pblk *pblk, sector_t lba,
struct ppa_addr ppa)
{
- if (pblk->ppaf_bitsize < 32) {
+ if (pblk->addrf_len < 32) {
u32 *map = (u32 *)pblk->trans_map;
map[lba] = pblk_ppa64_to_ppa32(pblk, ppa);
--
2.7.4
next prev parent reply other threads:[~2018-02-21 9:26 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-21 9:26 [PATCH V2 00/20] lightnvm: pblk: implement 2.0 support Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 01/20] lightnvm: simplify geometry structure Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:25 ` Matias Bjørling
2018-02-22 7:25 ` Matias Bjørling
2018-02-22 7:44 ` Javier Gonzalez
2018-02-22 7:44 ` Javier Gonzalez
2018-02-22 12:22 ` Matias Bjørling
2018-02-22 12:22 ` Matias Bjørling
2018-02-22 14:13 ` Javier Gonzalez
2018-02-22 14:13 ` Javier Gonzalez
2018-02-21 9:26 ` [PATCH 02/20] lightnvm: add controller capabilities to 2.0 Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:26 ` Matias Bjørling
2018-02-22 7:26 ` Matias Bjørling
2018-02-21 9:26 ` [PATCH 03/20] lightnvm: fix capabilities for 2.0 sysfs Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:28 ` Matias Bjørling
2018-02-22 7:28 ` Matias Bjørling
2018-02-22 7:47 ` Javier Gonzalez
2018-02-22 7:47 ` Javier Gonzalez
2018-02-22 9:39 ` Matias Bjørling
2018-02-22 9:39 ` Matias Bjørling
2018-02-22 10:25 ` Javier Gonzalez
2018-02-22 10:25 ` Javier Gonzalez
2018-02-22 10:25 ` Javier Gonzalez
2018-02-22 11:10 ` Matias Bjørling
2018-02-22 11:10 ` Matias Bjørling
2018-02-22 11:12 ` Javier Gonzalez
2018-02-22 11:12 ` Javier Gonzalez
2018-02-21 9:26 ` [PATCH 04/20] lightnvm: add minor version to generic geometry Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:34 ` Matias Bjørling
2018-02-22 7:34 ` Matias Bjørling
2018-02-22 7:53 ` Javier González
2018-02-22 7:53 ` Javier González
2018-02-21 9:26 ` [PATCH 05/20] lightnvm: rename number of channels and luns Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 06/20] lightnvm: add shorten OCSSD version in geo Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 07/20] lightnvm: rename sect_* to sec_* Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:43 ` Matias Bjørling
2018-02-22 7:43 ` Matias Bjørling
2018-02-21 9:26 ` [PATCH 08/20] lightnvm: complete geo structure with maxoc* Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:45 ` Matias Bjørling
2018-02-22 7:45 ` Matias Bjørling
2018-02-22 7:55 ` Javier Gonzalez
2018-02-22 7:55 ` Javier Gonzalez
2018-02-22 9:45 ` Matias Bjørling
2018-02-22 9:45 ` Matias Bjørling
2018-02-22 9:52 ` Javier Gonzalez
2018-02-22 9:52 ` Javier Gonzalez
2018-02-22 10:00 ` Matias Bjørling
2018-02-22 10:00 ` Matias Bjørling
2018-02-22 10:03 ` Javier Gonzalez
2018-02-22 10:03 ` Javier Gonzalez
2018-02-21 9:26 ` [PATCH 09/20] lightnvm: use generic identify structure Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:47 ` Matias Bjørling
2018-02-22 7:47 ` Matias Bjørling
2018-02-22 7:49 ` Javier González
2018-02-22 7:49 ` Javier González
2018-02-22 9:41 ` Matias Bjørling
2018-02-22 9:41 ` Matias Bjørling
2018-02-21 9:26 ` Javier González [this message]
2018-02-21 9:26 ` [PATCH 10/20] lightnvm: pblk: rename ppaf* to addrf* Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:47 ` Matias Bjørling
2018-02-22 7:47 ` Matias Bjørling
2018-02-22 7:47 ` Matias Bjørling
2018-02-21 9:26 ` [PATCH 11/20] lightnvm: pblk: check for supported version Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 7:48 ` Matias Bjørling
2018-02-22 7:48 ` Matias Bjørling
2018-02-21 9:26 ` [PATCH 12/20] lightnvm: complete 2.0 values in sysfs Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 13/20] lightnvm: add support for 2.0 address format Javier González
2018-02-21 9:26 ` Javier González
2018-02-22 9:24 ` Matias Bjørling
2018-02-22 9:24 ` Matias Bjørling
2018-02-21 9:26 ` [PATCH 14/20] lightnvm: make address conversions depend on generic device Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 15/20] nvme: make nvme_get_log_ext available Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 16/20] lightnvm: implement get log report chunk helpers Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 17/20] lightnvm: define chunk states Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 18/20] lightnvm: pblk: implement get log report chunk Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 19/20] lightnvm: pblk: refactor init/exit sequences Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 9:26 ` [PATCH 20/20] lightnvm: pblk: implement 2.0 support Javier González
2018-02-21 9:26 ` Javier González
2018-02-21 14:30 ` Javier González
2018-02-21 14:30 ` Javier González
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=1519205218-26994-11-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.