hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lightnvm: add minor version to generic geometry 

Separate the version between major and minor on the generic geometry and
represent it through sysfs in the 2.0 path. The 1.2 path only shows the
major version to preserve the existing user space interface.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Javier González 2018-03-30 00:05:11 +02:00 committed by Jens Axboe
parent e46f4e4822
commit 3cb98f84d3
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/lightnvm/core.c
View File

@ -890,8 +890,8 @@ static int nvm_init(struct nvm_dev *dev)
goto err; goto err;
} }
pr_debug("nvm: ver:%u nvm_vendor:%x\n", pr_debug("nvm: ver:%u.%u nvm_vendor:%x\n",
geo->ver_id, geo->major_ver_id, geo->minor_ver_id,
geo->vmnt); geo->vmnt);
ret = nvm_core_init(dev); ret = nvm_core_init(dev);

25
drivers/nvme/host/lightnvm.c
View File

@ -295,7 +295,9 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id,
return -EINVAL; return -EINVAL;
} }
geo->ver_id = id->ver_id; /* 1.2 spec. only reports a single version id - unfold */
geo->major_ver_id = id->ver_id;
geo->minor_ver_id = 2;
geo->nr_chnls = src->num_ch; geo->nr_chnls = src->num_ch;
geo->nr_luns = src->num_lun; geo->nr_luns = src->num_lun;
@ -379,7 +381,14 @@ static void nvme_nvm_set_addr_20(struct nvm_addrf *dst,
static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id,
struct nvm_geo *geo) struct nvm_geo *geo)
{ {
geo->ver_id = id->mjr; geo->major_ver_id = id->mjr;
geo->minor_ver_id = id->mnr;
if (!(geo->major_ver_id == 2 && geo->minor_ver_id == 0)) {
pr_err("nvm: OCSSD version not supported (v%d.%d)\n",
geo->major_ver_id, geo->minor_ver_id);
return -EINVAL;
}
geo->nr_chnls = le16_to_cpu(id->num_grp); geo->nr_chnls = le16_to_cpu(id->num_grp);
geo->nr_luns = le16_to_cpu(id->num_pu); geo->nr_luns = le16_to_cpu(id->num_pu);
@ -914,7 +923,13 @@ static ssize_t nvm_dev_attr_show(struct device *dev,
attr = &dattr->attr; attr = &dattr->attr;
if (strcmp(attr->name, "version") == 0) { if (strcmp(attr->name, "version") == 0) {
return scnprintf(page, PAGE_SIZE, "%u\n", geo->ver_id); if (geo->major_ver_id == 1)
return scnprintf(page, PAGE_SIZE, "%u\n",
geo->major_ver_id);
else
return scnprintf(page, PAGE_SIZE, "%u.%u\n",
geo->major_ver_id,
geo->minor_ver_id);
} else if (strcmp(attr->name, "capabilities") == 0) { } else if (strcmp(attr->name, "capabilities") == 0) {
return scnprintf(page, PAGE_SIZE, "%u\n", geo->cap); return scnprintf(page, PAGE_SIZE, "%u\n", geo->cap);
} else if (strcmp(attr->name, "read_typ") == 0) { } else if (strcmp(attr->name, "read_typ") == 0) {
@ -1167,7 +1182,7 @@ int nvme_nvm_register_sysfs(struct nvme_ns *ns)
if (!ndev) if (!ndev)
return -EINVAL; return -EINVAL;
switch (geo->ver_id) { switch (geo->major_ver_id) {
case 1: case 1:
return sysfs_create_group(&disk_to_dev(ns->disk)->kobj, return sysfs_create_group(&disk_to_dev(ns->disk)->kobj,
&nvm_dev_attr_group_12); &nvm_dev_attr_group_12);
@ -1184,7 +1199,7 @@ void nvme_nvm_unregister_sysfs(struct nvme_ns *ns)
struct nvm_dev *ndev = ns->ndev; struct nvm_dev *ndev = ns->ndev;
struct nvm_geo *geo = &ndev->geo; struct nvm_geo *geo = &ndev->geo;
switch (geo->ver_id) { switch (geo->major_ver_id) {
case 1: case 1:
sysfs_remove_group(&disk_to_dev(ns->disk)->kobj, sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,
&nvm_dev_attr_group_12); &nvm_dev_attr_group_12);

3
include/linux/lightnvm.h
View File

@ -263,7 +263,8 @@ enum {
/* Instance geometry */ /* Instance geometry */
struct nvm_geo { struct nvm_geo {
/* device reported version */ /* device reported version */
u8 ver_id; u8 major_ver_id;
u8 minor_ver_id;
/* instance specific geometry */ /* instance specific geometry */
int nr_chnls; int nr_chnls;