lkml.org 
[lkml]   [2018]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/15] lightnvm: complete geo structure with maxoc*
    Date
    Complete the generic geometry structure with the maxoc and maxocpu
    felds, present in the 2.0 spec. Also, expose them through sysfs.

    Signed-off-by: Javier González <javier@cnexlabs.com>
    ---
    drivers/nvme/host/lightnvm.c | 17 +++++++++++++++++
    include/linux/lightnvm.h | 2 ++
    2 files changed, 19 insertions(+)

    diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
    index 85f336a79cda..afb5f883f8c8 100644
    --- a/drivers/nvme/host/lightnvm.c
    +++ b/drivers/nvme/host/lightnvm.c
    @@ -323,6 +323,13 @@ static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id,
    geo->ws_opt = sec_per_pg;
    geo->mw_cunits = geo->ws_opt << 3; /* default to MLC safe values */

    + /* Do not impose values for maximum number of open blocks as it is
    + * unspecified in 1.2. Users of 1.2 must be aware of this and eventually
    + * specify these values through a quirk if restrictions apply.
    + */
    + geo->maxoc = geo->all_luns * geo->nr_chks;
    + geo->maxocpu = geo->nr_chks;
    +
    geo->cap = le32_to_cpu(src->mccap);

    geo->trdt = le32_to_cpu(src->trdt);
    @@ -410,6 +417,8 @@ static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id,
    geo->ws_min = le32_to_cpu(id->ws_min);
    geo->ws_opt = le32_to_cpu(id->ws_opt);
    geo->mw_cunits = le32_to_cpu(id->mw_cunits);
    + geo->maxoc = le32_to_cpu(id->maxoc);
    + geo->maxocpu = le32_to_cpu(id->maxocpu);

    geo->cap = le32_to_cpu(id->mccap);

    @@ -1054,6 +1063,10 @@ static ssize_t nvm_dev_attr_show_20(struct device *dev,
    return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_min);
    } else if (strcmp(attr->name, "ws_opt") == 0) {
    return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_opt);
    + } else if (strcmp(attr->name, "maxoc") == 0) {
    + return scnprintf(page, PAGE_SIZE, "%u\n", geo->maxoc);
    + } else if (strcmp(attr->name, "maxocpu") == 0) {
    + return scnprintf(page, PAGE_SIZE, "%u\n", geo->maxocpu);
    } else if (strcmp(attr->name, "mw_cunits") == 0) {
    return scnprintf(page, PAGE_SIZE, "%u\n", geo->mw_cunits);
    } else if (strcmp(attr->name, "write_typ") == 0) {
    @@ -1151,6 +1164,8 @@ static NVM_DEV_ATTR_20_RO(chunks);
    static NVM_DEV_ATTR_20_RO(clba);
    static NVM_DEV_ATTR_20_RO(ws_min);
    static NVM_DEV_ATTR_20_RO(ws_opt);
    +static NVM_DEV_ATTR_20_RO(maxoc);
    +static NVM_DEV_ATTR_20_RO(maxocpu);
    static NVM_DEV_ATTR_20_RO(mw_cunits);
    static NVM_DEV_ATTR_20_RO(write_typ);
    static NVM_DEV_ATTR_20_RO(write_max);
    @@ -1167,6 +1182,8 @@ static struct attribute *nvm_dev_attrs_20[] = {
    &dev_attr_clba.attr,
    &dev_attr_ws_min.attr,
    &dev_attr_ws_opt.attr,
    + &dev_attr_maxoc.attr,
    + &dev_attr_maxocpu.attr,
    &dev_attr_mw_cunits.attr,

    &dev_attr_read_typ.attr,
    diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
    index b8bc158a2472..2102b092c7eb 100644
    --- a/include/linux/lightnvm.h
    +++ b/include/linux/lightnvm.h
    @@ -296,6 +296,8 @@ struct nvm_geo {
    u32 ws_min; /* minimum write size */
    u32 ws_opt; /* optimal write size */
    u32 mw_cunits; /* distance required for successful read */
    + u32 maxoc; /* maximum open chunks */
    + u32 maxocpu; /* maximum open chunks per parallel unit */

    /* device capabilities. Note that this represents capabilities in 1.2
    * and media and controller capabilities in 2.0
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-02-28 18:12    [W:4.241 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site