aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier González <jg@lightnvm.io>2016-05-06 14:03:20 -0400
committerJens Axboe <axboe@fb.com>2016-05-06 14:51:10 -0400
commit6d5be9590b5e15124e3c8b319c8d7ce01abcf07d (patch)
tree7d3203bb0aa3a59de19f4cbb4de1c8b4502dd63c
parentdf414b33bb1eb3a0ae52ccd4ecfec9323a4f89dc (diff)
lightnvm: rename nr_pages to nr_ppas on nvm_rq
The number of ppas contained on a request is not necessarily the number of pages that it maps to neither on the target nor on the device side. In order to avoid confusion, rename nr_pages to nr_ppas since it is what the variable actually contains. Signed-off-by: Javier González <javier@cnexlabs.com> Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/lightnvm/core.c16
-rw-r--r--drivers/lightnvm/gennvm.c2
-rw-r--r--drivers/lightnvm/rrpc.c6
-rw-r--r--drivers/lightnvm/rrpc.h2
-rw-r--r--drivers/lightnvm/sysblk.c2
-rw-r--r--drivers/nvme/host/lightnvm.c4
-rw-r--r--include/linux/lightnvm.h2
7 files changed, 17 insertions, 17 deletions
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index d3af77102e47..160c1a6838e1 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -226,8 +226,8 @@ void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
226{ 226{
227 int i; 227 int i;
228 228
229 if (rqd->nr_pages > 1) { 229 if (rqd->nr_ppas > 1) {
230 for (i = 0; i < rqd->nr_pages; i++) 230 for (i = 0; i < rqd->nr_ppas; i++)
231 rqd->ppa_list[i] = dev_to_generic_addr(dev, 231 rqd->ppa_list[i] = dev_to_generic_addr(dev,
232 rqd->ppa_list[i]); 232 rqd->ppa_list[i]);
233 } else { 233 } else {
@@ -240,8 +240,8 @@ void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
240{ 240{
241 int i; 241 int i;
242 242
243 if (rqd->nr_pages > 1) { 243 if (rqd->nr_ppas > 1) {
244 for (i = 0; i < rqd->nr_pages; i++) 244 for (i = 0; i < rqd->nr_ppas; i++)
245 rqd->ppa_list[i] = generic_to_dev_addr(dev, 245 rqd->ppa_list[i] = generic_to_dev_addr(dev,
246 rqd->ppa_list[i]); 246 rqd->ppa_list[i]);
247 } else { 247 } else {
@@ -256,13 +256,13 @@ int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
256 int i, plane_cnt, pl_idx; 256 int i, plane_cnt, pl_idx;
257 257
258 if ((!vblk || dev->plane_mode == NVM_PLANE_SINGLE) && nr_ppas == 1) { 258 if ((!vblk || dev->plane_mode == NVM_PLANE_SINGLE) && nr_ppas == 1) {
259 rqd->nr_pages = nr_ppas; 259 rqd->nr_ppas = nr_ppas;
260 rqd->ppa_addr = ppas[0]; 260 rqd->ppa_addr = ppas[0];
261 261
262 return 0; 262 return 0;
263 } 263 }
264 264
265 rqd->nr_pages = nr_ppas; 265 rqd->nr_ppas = nr_ppas;
266 rqd->ppa_list = nvm_dev_dma_alloc(dev, GFP_KERNEL, &rqd->dma_ppa_list); 266 rqd->ppa_list = nvm_dev_dma_alloc(dev, GFP_KERNEL, &rqd->dma_ppa_list);
267 if (!rqd->ppa_list) { 267 if (!rqd->ppa_list) {
268 pr_err("nvm: failed to allocate dma memory\n"); 268 pr_err("nvm: failed to allocate dma memory\n");
@@ -274,7 +274,7 @@ int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
274 rqd->ppa_list[i] = ppas[i]; 274 rqd->ppa_list[i] = ppas[i];
275 } else { 275 } else {
276 plane_cnt = dev->plane_mode; 276 plane_cnt = dev->plane_mode;
277 rqd->nr_pages *= plane_cnt; 277 rqd->nr_ppas *= plane_cnt;
278 278
279 for (i = 0; i < nr_ppas; i++) { 279 for (i = 0; i < nr_ppas; i++) {
280 for (pl_idx = 0; pl_idx < plane_cnt; pl_idx++) { 280 for (pl_idx = 0; pl_idx < plane_cnt; pl_idx++) {
@@ -395,7 +395,7 @@ int nvm_submit_ppa_list(struct nvm_dev *dev, struct ppa_addr *ppa_list,
395 395
396 memset(&rqd, 0, sizeof(struct nvm_rq)); 396 memset(&rqd, 0, sizeof(struct nvm_rq));
397 397
398 rqd.nr_pages = nr_ppas; 398 rqd.nr_ppas = nr_ppas;
399 if (nr_ppas > 1) 399 if (nr_ppas > 1)
400 rqd.ppa_list = ppa_list; 400 rqd.ppa_list = ppa_list;
401 else 401 else
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c
index 33a66d8c039d..ec9fb6876e38 100644
--- a/drivers/lightnvm/gennvm.c
+++ b/drivers/lightnvm/gennvm.c
@@ -446,7 +446,7 @@ static void gennvm_mark_blk_bad(struct nvm_dev *dev, struct nvm_rq *rqd)
446 nvm_addr_to_generic_mode(dev, rqd); 446 nvm_addr_to_generic_mode(dev, rqd);
447 447
448 /* look up blocks and mark them as bad */ 448 /* look up blocks and mark them as bad */
449 if (rqd->nr_pages == 1) { 449 if (rqd->nr_ppas == 1) {
450 gennvm_mark_blk(dev, rqd->ppa_addr, NVM_BLK_ST_BAD); 450 gennvm_mark_blk(dev, rqd->ppa_addr, NVM_BLK_ST_BAD);
451 return; 451 return;
452 } 452 }
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index 48862ead7c99..72aca96f467b 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -695,7 +695,7 @@ static void rrpc_end_io(struct nvm_rq *rqd)
695{ 695{
696 struct rrpc *rrpc = container_of(rqd->ins, struct rrpc, instance); 696 struct rrpc *rrpc = container_of(rqd->ins, struct rrpc, instance);
697 struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd); 697 struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);
698 uint8_t npages = rqd->nr_pages; 698 uint8_t npages = rqd->nr_ppas;
699 sector_t laddr = rrpc_get_laddr(rqd->bio) - npages; 699 sector_t laddr = rrpc_get_laddr(rqd->bio) - npages;
700 700
701 if (bio_data_dir(rqd->bio) == WRITE) 701 if (bio_data_dir(rqd->bio) == WRITE)
@@ -883,7 +883,7 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
883 bio_get(bio); 883 bio_get(bio);
884 rqd->bio = bio; 884 rqd->bio = bio;
885 rqd->ins = &rrpc->instance; 885 rqd->ins = &rrpc->instance;
886 rqd->nr_pages = nr_pages; 886 rqd->nr_ppas = nr_pages;
887 rrq->flags = flags; 887 rrq->flags = flags;
888 888
889 err = nvm_submit_io(rrpc->dev, rqd); 889 err = nvm_submit_io(rrpc->dev, rqd);
@@ -892,7 +892,7 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio,
892 bio_put(bio); 892 bio_put(bio);
893 if (!(flags & NVM_IOTYPE_GC)) { 893 if (!(flags & NVM_IOTYPE_GC)) {
894 rrpc_unlock_rq(rrpc, rqd); 894 rrpc_unlock_rq(rrpc, rqd);
895 if (rqd->nr_pages > 1) 895 if (rqd->nr_ppas > 1)
896 nvm_dev_dma_free(rrpc->dev, 896 nvm_dev_dma_free(rrpc->dev,
897 rqd->ppa_list, rqd->dma_ppa_list); 897 rqd->ppa_list, rqd->dma_ppa_list);
898 } 898 }
diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h
index 2653484a3b40..87e84b5fc1cc 100644
--- a/drivers/lightnvm/rrpc.h
+++ b/drivers/lightnvm/rrpc.h
@@ -251,7 +251,7 @@ static inline void rrpc_unlock_laddr(struct rrpc *rrpc,
251static inline void rrpc_unlock_rq(struct rrpc *rrpc, struct nvm_rq *rqd) 251static inline void rrpc_unlock_rq(struct rrpc *rrpc, struct nvm_rq *rqd)
252{ 252{
253 struct rrpc_inflight_rq *r = rrpc_get_inflight_rq(rqd); 253 struct rrpc_inflight_rq *r = rrpc_get_inflight_rq(rqd);
254 uint8_t pages = rqd->nr_pages; 254 uint8_t pages = rqd->nr_ppas;
255 255
256 BUG_ON((r->l_start + pages) > rrpc->nr_sects); 256 BUG_ON((r->l_start + pages) > rrpc->nr_sects);
257 257
diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c
index b98ca1998da5..994697ac786e 100644
--- a/drivers/lightnvm/sysblk.c
+++ b/drivers/lightnvm/sysblk.c
@@ -280,7 +280,7 @@ static int nvm_set_bb_tbl(struct nvm_dev *dev, struct sysblk_scan *s, int type)
280 nvm_set_rqd_ppalist(dev, &rqd, s->ppas, s->nr_ppas, 1); 280 nvm_set_rqd_ppalist(dev, &rqd, s->ppas, s->nr_ppas, 1);
281 nvm_generic_to_addr_mode(dev, &rqd); 281 nvm_generic_to_addr_mode(dev, &rqd);
282 282
283 ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_pages, type); 283 ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type);
284 nvm_free_rqd_ppalist(dev, &rqd); 284 nvm_free_rqd_ppalist(dev, &rqd);
285 if (ret) { 285 if (ret) {
286 pr_err("nvm: sysblk failed bb mark\n"); 286 pr_err("nvm: sysblk failed bb mark\n");
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 65de1e56e59a..a0af0558354c 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -471,7 +471,7 @@ static inline void nvme_nvm_rqtocmd(struct request *rq, struct nvm_rq *rqd,
471 c->ph_rw.spba = cpu_to_le64(rqd->ppa_addr.ppa); 471 c->ph_rw.spba = cpu_to_le64(rqd->ppa_addr.ppa);
472 c->ph_rw.metadata = cpu_to_le64(rqd->dma_meta_list); 472 c->ph_rw.metadata = cpu_to_le64(rqd->dma_meta_list);
473 c->ph_rw.control = cpu_to_le16(rqd->flags); 473 c->ph_rw.control = cpu_to_le16(rqd->flags);
474 c->ph_rw.length = cpu_to_le16(rqd->nr_pages - 1); 474 c->ph_rw.length = cpu_to_le16(rqd->nr_ppas - 1);
475 475
476 if (rqd->opcode == NVM_OP_HBWRITE || rqd->opcode == NVM_OP_HBREAD) 476 if (rqd->opcode == NVM_OP_HBWRITE || rqd->opcode == NVM_OP_HBREAD)
477 c->hb_rw.slba = cpu_to_le64(nvme_block_nr(ns, 477 c->hb_rw.slba = cpu_to_le64(nvme_block_nr(ns,
@@ -542,7 +542,7 @@ static int nvme_nvm_erase_block(struct nvm_dev *dev, struct nvm_rq *rqd)
542 c.erase.opcode = NVM_OP_ERASE; 542 c.erase.opcode = NVM_OP_ERASE;
543 c.erase.nsid = cpu_to_le32(ns->ns_id); 543 c.erase.nsid = cpu_to_le32(ns->ns_id);
544 c.erase.spba = cpu_to_le64(rqd->ppa_addr.ppa); 544 c.erase.spba = cpu_to_le64(rqd->ppa_addr.ppa);
545 c.erase.length = cpu_to_le16(rqd->nr_pages - 1); 545 c.erase.length = cpu_to_le16(rqd->nr_ppas - 1);
546 546
547 return nvme_submit_sync_cmd(q, (struct nvme_command *)&c, NULL, 0); 547 return nvme_submit_sync_cmd(q, (struct nvme_command *)&c, NULL, 0);
548} 548}
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index 3a810d7bd25e..b2991c724640 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -244,7 +244,7 @@ struct nvm_rq {
244 nvm_end_io_fn *end_io; 244 nvm_end_io_fn *end_io;
245 245
246 uint8_t opcode; 246 uint8_t opcode;
247 uint16_t nr_pages; 247 uint16_t nr_ppas;
248 uint16_t flags; 248 uint16_t flags;
249 249
250 u64 ppa_status; /* ppa media status */ 250 u64 ppa_status; /* ppa media status */