lkml.org 
[lkml]   [2016]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/28] lightnvm: add fpg_size and pfpg_size to struct nvm_dev
    Date
    The flash page size (fpg) and size across planes (pfpg) are convenient
    to know when allocating buffer sizes. This has previously been a
    calculated in various places. Replace with the pre-calculated values.

    Reviewed by: Johannes Thumshirn <jthumshirn@suse.de>
    Signed-off-by: Matias Bjørling <m@bjorling.me>
    ---
    drivers/lightnvm/core.c | 2 ++
    drivers/lightnvm/sysblk.c | 17 +++++++----------
    include/linux/lightnvm.h | 2 ++
    3 files changed, 11 insertions(+), 10 deletions(-)

    diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
    index f4e04a5..652b8c7 100644
    --- a/drivers/lightnvm/core.c
    +++ b/drivers/lightnvm/core.c
    @@ -476,6 +476,8 @@ static int nvm_core_init(struct nvm_dev *dev)
    dev->pgs_per_blk = grp->num_pg;
    dev->blks_per_lun = grp->num_blk;
    dev->nr_planes = grp->num_pln;
    + dev->fpg_size = grp->fpg_sz;
    + dev->pfpg_size = grp->fpg_sz * grp->num_pln;
    dev->sec_size = grp->csecs;
    dev->oob_size = grp->sos;
    dev->sec_per_pg = grp->fpg_sz / grp->csecs;
    diff --git a/drivers/lightnvm/sysblk.c b/drivers/lightnvm/sysblk.c
    index b1e1404..b6971f8 100644
    --- a/drivers/lightnvm/sysblk.c
    +++ b/drivers/lightnvm/sysblk.c
    @@ -154,13 +154,12 @@ static int nvm_scan_block(struct nvm_dev *dev, struct ppa_addr *ppa,
    struct nvm_system_block *sblk)
    {
    struct nvm_system_block *cur;
    - int pg, cursz, ret, found = 0;
    + int pg, ret, found = 0;

    /* the full buffer for a flash page is allocated. Only the first of it
    * contains the system block information
    */
    - cursz = dev->sec_size * dev->sec_per_pg * dev->nr_planes;
    - cur = kmalloc(cursz, GFP_KERNEL);
    + cur = kmalloc(dev->pfpg_size, GFP_KERNEL);
    if (!cur)
    return -ENOMEM;

    @@ -169,7 +168,7 @@ static int nvm_scan_block(struct nvm_dev *dev, struct ppa_addr *ppa,
    ppa->g.pg = ppa_to_slc(dev, pg);

    ret = nvm_submit_ppa(dev, ppa, 1, NVM_OP_PREAD, NVM_IO_SLC_MODE,
    - cur, cursz);
    + cur, dev->pfpg_size);
    if (ret) {
    if (ret == NVM_RSP_ERR_EMPTYPAGE) {
    pr_debug("nvm: sysblk scan empty ppa (%u %u %u %u)\n",
    @@ -272,14 +271,12 @@ static int nvm_write_and_verify(struct nvm_dev *dev, struct nvm_sb_info *info,
    {
    struct nvm_system_block nvmsb;
    void *buf;
    - int i, sect, ret = 0, bufsz;
    + int i, sect, ret = 0;
    struct ppa_addr *ppas;

    nvm_cpu_to_sysblk(&nvmsb, info);

    - /* buffer for flash page */
    - bufsz = dev->sec_size * dev->sec_per_pg * dev->nr_planes;
    - buf = kzalloc(bufsz, GFP_KERNEL);
    + buf = kzalloc(dev->pfpg_size, GFP_KERNEL);
    if (!buf)
    return -ENOMEM;
    memcpy(buf, &nvmsb, sizeof(struct nvm_system_block));
    @@ -309,7 +306,7 @@ static int nvm_write_and_verify(struct nvm_dev *dev, struct nvm_sb_info *info,
    }

    ret = nvm_submit_ppa(dev, ppas, dev->sec_per_pg, NVM_OP_PWRITE,
    - NVM_IO_SLC_MODE, buf, bufsz);
    + NVM_IO_SLC_MODE, buf, dev->pfpg_size);
    if (ret) {
    pr_err("nvm: sysblk failed program (%u %u %u)\n",
    ppas[0].g.ch,
    @@ -319,7 +316,7 @@ static int nvm_write_and_verify(struct nvm_dev *dev, struct nvm_sb_info *info,
    }

    ret = nvm_submit_ppa(dev, ppas, dev->sec_per_pg, NVM_OP_PREAD,
    - NVM_IO_SLC_MODE, buf, bufsz);
    + NVM_IO_SLC_MODE, buf, dev->pfpg_size);
    if (ret) {
    pr_err("nvm: sysblk failed read (%u %u %u)\n",
    ppas[0].g.ch,
    diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
    index 38814e2..f7c607f 100644
    --- a/include/linux/lightnvm.h
    +++ b/include/linux/lightnvm.h
    @@ -323,6 +323,8 @@ struct nvm_dev {
    int sec_per_pg; /* only sectors for a single page */
    int pgs_per_blk;
    int blks_per_lun;
    + int fpg_size;
    + int pfpg_size; /* size of buffer if all pages are to be read */
    int sec_size;
    int oob_size;
    int mccap;
    --
    2.1.4
    \
     
     \ /
      Last update: 2016-05-06 20:21    [W:4.147 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site