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

Commit 00ee6cc3 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: refactor set_bb_tbl for accepting ppa list 



The set_bb_tbl takes struct nvm_rq and only uses its ppa_list and
nr_pages internally. Instead, make these two variables explicit.
This allows a user to call it without initializing a struct nvm_rq
first.

Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a63d5cf2

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, type);

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

	nvm_free_rqd_ppalist(dev, &rqd);

	if (ret) {

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

drivers/nvme/host/lightnvm.c

+4 −4
Original line number Diff line number Diff line
@@ -441,8 +441,8 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa, 
	return ret;

}



static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd,

								int type)

static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr *ppas,

							int nr_ppas, int type)

{

	struct nvme_ns *ns = nvmdev->q->queuedata;

	struct nvme_nvm_command c = {};
@@ -450,8 +450,8 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, 


	c.set_bb.opcode = nvme_nvm_admin_set_bb_tbl;

	c.set_bb.nsid = cpu_to_le32(ns->ns_id);

	c.set_bb.spba = cpu_to_le64(rqd->ppa_addr.ppa);

	c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1);

	c.set_bb.spba = cpu_to_le64(ppas->ppa);

	c.set_bb.nlb = cpu_to_le16(nr_ppas - 1);

	c.set_bb.value = type;



	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,

include/linux/lightnvm.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *); 
typedef int (nvm_get_l2p_tbl_fn)(struct nvm_dev *, u64, u32,

				nvm_l2p_update_fn *, void *);

typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, u8 *);

typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct nvm_rq *, int);

typedef int (nvm_op_set_bb_fn)(struct nvm_dev *, struct ppa_addr *, int, int);

typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *);

typedef int (nvm_erase_blk_fn)(struct nvm_dev *, struct nvm_rq *);

typedef void *(nvm_create_dma_pool_fn)(struct nvm_dev *, char *);