Commit 19bd6fe7 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: reduce number of nvm_id groups to one 



The number of configuration groups has been limited to one in current
code, even if there is support for up to four. With the introduction
of the open-channel SSD 1.3 specification, only a single
group is exposed onwards. Reflect this in the nvm_id structure.

Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent dab8ee9e

drivers/block/null_blk.c

+1 −2
Original line number Diff line number Diff line
@@ -460,7 +460,6 @@ static int null_lnvm_id(struct nvm_dev *dev, struct nvm_id *id) 


	id->ver_id = 0x1;

	id->vmnt = 0;

	id->cgrps = 1;

	id->cap = 0x2;

	id->dom = 0x1;
@@ -479,7 +478,7 @@ static int null_lnvm_id(struct nvm_dev *dev, struct nvm_id *id) 


	sector_div(size, bs); /* convert size to pages */

	size >>= 8; /* concert size to pgs pr blk */

	grp = &id->groups[0];

	grp = &id->grp;

	grp->mtype = 0;

	grp->fmtype = 0;

	grp->num_ch = 1;

drivers/lightnvm/core.c

+3 −9
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static int nvm_init_mlc_tbl(struct nvm_dev *dev, struct nvm_id_group *grp) 
static int nvm_core_init(struct nvm_dev *dev)

{

	struct nvm_id *id = &dev->identity;

	struct nvm_id_group *grp = &id->groups[0];

	struct nvm_id_group *grp = &id->grp;

	struct nvm_geo *geo = &dev->geo;

	int ret;
@@ -988,20 +988,14 @@ static int nvm_init(struct nvm_dev *dev) 
		goto err;

	}



	pr_debug("nvm: ver:%x nvm_vendor:%x groups:%u\n",

			dev->identity.ver_id, dev->identity.vmnt,

							dev->identity.cgrps);

	pr_debug("nvm: ver:%x nvm_vendor:%x\n",

			dev->identity.ver_id, dev->identity.vmnt);



	if (dev->identity.ver_id != 1) {

		pr_err("nvm: device not supported by kernel.");

		goto err;

	}



	if (dev->identity.cgrps != 1) {

		pr_err("nvm: only one group configuration supported.");

		goto err;

	}



	ret = nvm_core_init(dev);

	if (ret) {

		pr_err("nvm: could not initialize core structures.\n");

drivers/nvme/host/lightnvm.c

+42 −45
Original line number Diff line number Diff line
@@ -248,13 +248,12 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) 
{

	struct nvme_nvm_id_group *src;

	struct nvm_id_group *dst;

	int i, end;



	end = min_t(u32, 4, nvm_id->cgrps);

	if (nvme_nvm_id->cgrps != 1)

		return -EINVAL;



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

		src = &nvme_nvm_id->groups[i];

		dst = &nvm_id->groups[i];

	src = &nvme_nvm_id->groups[0];

	dst = &nvm_id->grp;



	dst->mtype = src->mtype;

	dst->fmtype = src->fmtype;
@@ -292,7 +291,6 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) 
		memcpy(dst->lptbl.mlc.pairs, src->lptbl.mlc.pairs,

					dst->lptbl.mlc.num_pairs);

	}

	}



	return 0;

}
@@ -321,7 +319,6 @@ static int nvme_nvm_identity(struct nvm_dev *nvmdev, struct nvm_id *nvm_id) 


	nvm_id->ver_id = nvme_nvm_id->ver_id;

	nvm_id->vmnt = nvme_nvm_id->vmnt;

	nvm_id->cgrps = nvme_nvm_id->cgrps;

	nvm_id->cap = le32_to_cpu(nvme_nvm_id->cap);

	nvm_id->dom = le32_to_cpu(nvme_nvm_id->dom);

	memcpy(&nvm_id->ppaf, &nvme_nvm_id->ppaf,
@@ -622,7 +619,7 @@ static ssize_t nvm_dev_attr_show(struct device *dev, 
		return 0;



	id = &ndev->identity;

	grp = &id->groups[0];

	grp = &id->grp;

	attr = &dattr->attr;



	if (strcmp(attr->name, "version") == 0) {

include/linux/lightnvm.h

+1 −2
Original line number Diff line number Diff line
@@ -200,11 +200,10 @@ struct nvm_addr_format { 
struct nvm_id {

	u8	ver_id;

	u8	vmnt;

	u8	cgrps;

	u32	cap;

	u32	dom;

	struct nvm_addr_format ppaf;

	struct nvm_id_group groups[4];

	struct nvm_id_group grp;

} __packed;



struct nvm_target {