Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d5be959 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

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: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent df414b33

drivers/lightnvm/core.c

+8 −8
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd) 
{

	int i;



	if (rqd->nr_pages > 1) {

		for (i = 0; i < rqd->nr_pages; i++)

	if (rqd->nr_ppas > 1) {

		for (i = 0; i < rqd->nr_ppas; i++)

			rqd->ppa_list[i] = dev_to_generic_addr(dev,

							rqd->ppa_list[i]);

	} else {
@@ -240,8 +240,8 @@ void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd) 
{

	int i;



	if (rqd->nr_pages > 1) {

		for (i = 0; i < rqd->nr_pages; i++)

	if (rqd->nr_ppas > 1) {

		for (i = 0; i < rqd->nr_ppas; i++)

			rqd->ppa_list[i] = generic_to_dev_addr(dev,

							rqd->ppa_list[i]);

	} else {
@@ -256,13 +256,13 @@ int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd, 
	int i, plane_cnt, pl_idx;



	if ((!vblk || dev->plane_mode == NVM_PLANE_SINGLE) && nr_ppas == 1) {

		rqd->nr_pages = nr_ppas;

		rqd->nr_ppas = nr_ppas;

		rqd->ppa_addr = ppas[0];



		return 0;

	}



	rqd->nr_pages = nr_ppas;

	rqd->nr_ppas = nr_ppas;

	rqd->ppa_list = nvm_dev_dma_alloc(dev, GFP_KERNEL, &rqd->dma_ppa_list);

	if (!rqd->ppa_list) {

		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, 
			rqd->ppa_list[i] = ppas[i];

	} else {

		plane_cnt = dev->plane_mode;

		rqd->nr_pages *= plane_cnt;

		rqd->nr_ppas *= plane_cnt;



		for (i = 0; i < nr_ppas; i++) {

			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, 


	memset(&rqd, 0, sizeof(struct nvm_rq));



	rqd.nr_pages = nr_ppas;

	rqd.nr_ppas = nr_ppas;

	if (nr_ppas > 1)

		rqd.ppa_list = ppa_list;

	else

drivers/lightnvm/gennvm.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static void gennvm_mark_blk_bad(struct nvm_dev *dev, struct nvm_rq *rqd) 
	nvm_addr_to_generic_mode(dev, rqd);



	/* look up blocks and mark them as bad */

	if (rqd->nr_pages == 1) {

	if (rqd->nr_ppas == 1) {

		gennvm_mark_blk(dev, rqd->ppa_addr, NVM_BLK_ST_BAD);

		return;

	}

drivers/lightnvm/rrpc.c

+3 −3
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static void rrpc_end_io(struct nvm_rq *rqd) 
{

	struct rrpc *rrpc = container_of(rqd->ins, struct rrpc, instance);

	struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);

	uint8_t npages = rqd->nr_pages;

	uint8_t npages = rqd->nr_ppas;

	sector_t laddr = rrpc_get_laddr(rqd->bio) - npages;



	if (bio_data_dir(rqd->bio) == WRITE)
@@ -883,7 +883,7 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio, 
	bio_get(bio);

	rqd->bio = bio;

	rqd->ins = &rrpc->instance;

	rqd->nr_pages = nr_pages;

	rqd->nr_ppas = nr_pages;

	rrq->flags = flags;



	err = nvm_submit_io(rrpc->dev, rqd);
@@ -892,7 +892,7 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio, 
		bio_put(bio);

		if (!(flags & NVM_IOTYPE_GC)) {

			rrpc_unlock_rq(rrpc, rqd);

			if (rqd->nr_pages > 1)

			if (rqd->nr_ppas > 1)

				nvm_dev_dma_free(rrpc->dev,

			rqd->ppa_list, rqd->dma_ppa_list);

		}

drivers/lightnvm/rrpc.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static inline void rrpc_unlock_laddr(struct rrpc *rrpc, 
static inline void rrpc_unlock_rq(struct rrpc *rrpc, struct nvm_rq *rqd)

{

	struct rrpc_inflight_rq *r = rrpc_get_inflight_rq(rqd);

	uint8_t pages = rqd->nr_pages;

	uint8_t pages = rqd->nr_ppas;



	BUG_ON((r->l_start + pages) > rrpc->nr_sects);

drivers/lightnvm/sysblk.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int nvm_set_bb_tbl(struct nvm_dev *dev, struct sysblk_scan *s, int type) 
	nvm_set_rqd_ppalist(dev, &rqd, s->ppas, s->nr_ppas, 1);

	nvm_generic_to_addr_mode(dev, &rqd);



	ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_pages, type);

	ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type);

	nvm_free_rqd_ppalist(dev, &rqd);

	if (ret) {

		pr_err("nvm: sysblk failed bb mark\n");