From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1427034AbeCBLQL (ORCPT ); Fri, 2 Mar 2018 06:16:11 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:55111 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1427024AbeCBLP6 (ORCPT ); Fri, 2 Mar 2018 06:15:58 -0500 X-Google-Smtp-Source: AG47ELvocC06Tp+4iACX5rMicOuoIk3Q29ob9u0uaKyi+N1krEFlJmcG/UTnnPfCegkhmR0YH9HHuw== From: =?utf-8?Q?Javier_Gonz=C3=A1lez?= Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_C7589530-9E61-4A8D-9974-52E5F7BA9CAE"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 11.2 \(3445.5.20\)) Subject: Re: [PATCH 01/15] lightnvm: simplify geometry structure. Date: Fri, 2 Mar 2018 12:15:51 +0100 In-Reply-To: <49204a74-0ce5-8855-b659-04795b69e015@lightnvm.io> Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org To: =?utf-8?Q?Matias_Bj=C3=B8rling?= References: <1519832975-25432-1-git-send-email-javier@cnexlabs.com> <1519832975-25432-2-git-send-email-javier@cnexlabs.com> <49204a74-0ce5-8855-b659-04795b69e015@lightnvm.io> X-Mailer: Apple Mail (2.3445.5.20) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Apple-Mail=_C7589530-9E61-4A8D-9974-52E5F7BA9CAE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 1 Mar 2018, at 11.22, Matias Bj=C3=B8rling wrote: >=20 > On 02/28/2018 04:49 PM, Javier Gonz=C3=A1lez wrote: >> Currently, the device geometry is stored redundantly in the nvm_id = and >> nvm_geo structures at a device level. Moreover, when instantiating >> targets on a specific number of LUNs, these structures are replicated >> and manually modified to fit the instance channel and LUN = partitioning. >> Instead, create a generic geometry around nvm_geo, which can be used = by >> (i) the underlying device to describe the geometry of the whole = device, >> and (ii) instances to describe their geometry independently. >> Signed-off-by: Javier Gonz=C3=A1lez >> --- >> drivers/lightnvm/core.c | 70 +++----- >> drivers/lightnvm/pblk-core.c | 16 +- >> drivers/lightnvm/pblk-gc.c | 2 +- >> drivers/lightnvm/pblk-init.c | 119 +++++++------- >> drivers/lightnvm/pblk-read.c | 2 +- >> drivers/lightnvm/pblk-recovery.c | 14 +- >> drivers/lightnvm/pblk-rl.c | 2 +- >> drivers/lightnvm/pblk-sysfs.c | 39 +++-- >> drivers/lightnvm/pblk-write.c | 2 +- >> drivers/lightnvm/pblk.h | 87 +++++----- >> drivers/nvme/host/lightnvm.c | 341 = +++++++++++++++++++++++---------------- >> include/linux/lightnvm.h | 200 +++++++++++------------ >> 12 files changed, 465 insertions(+), 429 deletions(-) >> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c >> index 19c46ebb1b91..9a417d9cdf0c 100644 >> --- a/drivers/lightnvm/core.c >> +++ b/drivers/lightnvm/core.c >> @@ -155,7 +155,7 @@ static struct nvm_tgt_dev = *nvm_create_tgt_dev(struct nvm_dev *dev, >> int blun =3D lun_begin % dev->geo.nr_luns; >> int lunid =3D 0; >> int lun_balanced =3D 1; >> - int prev_nr_luns; >> + int sec_per_lun, prev_nr_luns; >> int i, j; >> nr_chnls =3D (nr_chnls_mod =3D=3D 0) ? nr_chnls : nr_chnls + 1; >> @@ -215,18 +215,23 @@ static struct nvm_tgt_dev = *nvm_create_tgt_dev(struct nvm_dev *dev, >> if (!tgt_dev) >> goto err_ch; >> + /* Inherit device geometry from parent */ >> memcpy(&tgt_dev->geo, &dev->geo, sizeof(struct nvm_geo)); >> + >> /* Target device only owns a portion of the physical device */ >> tgt_dev->geo.nr_chnls =3D nr_chnls; >> - tgt_dev->geo.all_luns =3D nr_luns; >> tgt_dev->geo.nr_luns =3D (lun_balanced) ? prev_nr_luns : -1; >> + tgt_dev->geo.all_luns =3D nr_luns; >> + tgt_dev->geo.all_chunks =3D nr_luns * dev->geo.nr_chks; >> + >> tgt_dev->geo.op =3D op; >> - tgt_dev->total_secs =3D nr_luns * tgt_dev->geo.sec_per_lun; >> + >> + sec_per_lun =3D dev->geo.clba * dev->geo.nr_chks; >> + tgt_dev->geo.total_secs =3D nr_luns * sec_per_lun; >> + >> tgt_dev->q =3D dev->q; >> tgt_dev->map =3D dev_map; >> tgt_dev->luns =3D luns; >> - memcpy(&tgt_dev->identity, &dev->identity, sizeof(struct = nvm_id)); >> - >> tgt_dev->parent =3D dev; >> return tgt_dev; >> @@ -296,8 +301,6 @@ static int __nvm_config_simple(struct nvm_dev = *dev, >> static int __nvm_config_extended(struct nvm_dev *dev, >> struct nvm_ioctl_create_extended *e) >> { >> - struct nvm_geo *geo =3D &dev->geo; >> - >> if (e->lun_begin =3D=3D 0xFFFF && e->lun_end =3D=3D 0xFFFF) { >> e->lun_begin =3D 0; >> e->lun_end =3D dev->geo.all_luns - 1; >> @@ -311,7 +314,7 @@ static int __nvm_config_extended(struct nvm_dev = *dev, >> return -EINVAL; >> } >> - return nvm_config_check_luns(geo, e->lun_begin, e->lun_end); >> + return nvm_config_check_luns(&dev->geo, e->lun_begin, = e->lun_end); >> } >> static int nvm_create_tgt(struct nvm_dev *dev, struct = nvm_ioctl_create *create) >> @@ -406,7 +409,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, = struct nvm_ioctl_create *create) >> tqueue->queuedata =3D targetdata; >> blk_queue_max_hw_sectors(tqueue, >> - (dev->geo.sec_size >> 9) * NVM_MAX_VLBA); >> + (dev->geo.csecs >> 9) * NVM_MAX_VLBA); >> set_capacity(tdisk, tt->capacity(targetdata)); >> add_disk(tdisk); >> @@ -841,40 +844,9 @@ EXPORT_SYMBOL(nvm_get_tgt_bb_tbl); >> static int nvm_core_init(struct nvm_dev *dev) >> { >> - struct nvm_id *id =3D &dev->identity; >> struct nvm_geo *geo =3D &dev->geo; >> int ret; >> - memcpy(&geo->ppaf, &id->ppaf, sizeof(struct nvm_addr_format)); >> - >> - if (id->mtype !=3D 0) { >> - pr_err("nvm: memory type not supported\n"); >> - return -EINVAL; >> - } >> - >> - /* Whole device values */ >> - geo->nr_chnls =3D id->num_ch; >> - geo->nr_luns =3D id->num_lun; >> - >> - /* Generic device geometry values */ >> - geo->ws_min =3D id->ws_min; >> - geo->ws_opt =3D id->ws_opt; >> - geo->ws_seq =3D id->ws_seq; >> - geo->ws_per_chk =3D id->ws_per_chk; >> - geo->nr_chks =3D id->num_chk; >> - geo->mccap =3D id->mccap; >> - >> - geo->sec_per_chk =3D id->clba; >> - geo->sec_per_lun =3D geo->sec_per_chk * geo->nr_chks; >> - geo->all_luns =3D geo->nr_luns * geo->nr_chnls; >> - >> - /* 1.2 spec device geometry values */ >> - geo->plane_mode =3D 1 << geo->ws_seq; >> - geo->nr_planes =3D geo->ws_opt / geo->ws_min; >> - geo->sec_per_pg =3D geo->ws_min; >> - geo->sec_per_pl =3D geo->sec_per_pg * geo->nr_planes; >> - >> - dev->total_secs =3D geo->all_luns * geo->sec_per_lun; >> dev->lun_map =3D kcalloc(BITS_TO_LONGS(geo->all_luns), >> sizeof(unsigned long), = GFP_KERNEL); >> if (!dev->lun_map) >> @@ -913,16 +885,14 @@ static int nvm_init(struct nvm_dev *dev) >> struct nvm_geo *geo =3D &dev->geo; >> int ret =3D -EINVAL; >> - if (dev->ops->identity(dev, &dev->identity)) { >> + if (dev->ops->identity(dev)) { >> pr_err("nvm: device could not be identified\n"); >> goto err; >> } >> - if (dev->identity.ver_id !=3D 1 && dev->identity.ver_id !=3D 2) = { >> - pr_err("nvm: device ver_id %d not supported by = kernel.\n", >> - dev->identity.ver_id); >> - goto err; >> - } >> + pr_debug("nvm: ver:%u nvm_vendor:%x\n", >> + geo->ver_id, >> + geo->vmnt); >> ret =3D nvm_core_init(dev); >> if (ret) { >> @@ -930,10 +900,10 @@ static int nvm_init(struct nvm_dev *dev) >> goto err; >> } >> - pr_info("nvm: registered %s [%u/%u/%u/%u/%u/%u]\n", >> - dev->name, geo->sec_per_pg, geo->nr_planes, >> - geo->ws_per_chk, geo->nr_chks, >> - geo->all_luns, geo->nr_chnls); >> + pr_info("nvm: registered %s [%u/%u/%u/%u/%u]\n", >> + dev->name, geo->ws_min, geo->ws_opt, >> + geo->nr_chks, geo->all_luns, >> + geo->nr_chnls); >> return 0; >> err: >> pr_err("nvm: failed to initialize nvm\n"); >> diff --git a/drivers/lightnvm/pblk-core.c = b/drivers/lightnvm/pblk-core.c >> index 8848443a0721..169589ddd457 100644 >> --- a/drivers/lightnvm/pblk-core.c >> +++ b/drivers/lightnvm/pblk-core.c >> @@ -613,7 +613,7 @@ static int pblk_line_submit_emeta_io(struct pblk = *pblk, struct pblk_line *line, >> memset(&rqd, 0, sizeof(struct nvm_rq)); >> rq_ppas =3D pblk_calc_secs(pblk, left_ppas, 0); >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> bio =3D pblk_bio_map_addr(pblk, emeta_buf, rq_ppas, rq_len, >> l_mg->emeta_alloc_type, = GFP_KERNEL); >> @@ -722,7 +722,7 @@ u64 pblk_line_smeta_start(struct pblk *pblk, = struct pblk_line *line) >> if (bit >=3D lm->blk_per_line) >> return -1; >> - return bit * geo->sec_per_pl; >> + return bit * geo->ws_opt; >> } >> static int pblk_line_submit_smeta_io(struct pblk *pblk, struct = pblk_line *line, >> @@ -1035,19 +1035,19 @@ static int pblk_line_init_bb(struct pblk = *pblk, struct pblk_line *line, >> /* Capture bad block information on line mapping bitmaps */ >> while ((bit =3D find_next_bit(line->blk_bitmap, = lm->blk_per_line, >> bit + 1)) < lm->blk_per_line) { >> - off =3D bit * geo->sec_per_pl; >> + off =3D bit * geo->ws_opt; >> bitmap_shift_left(l_mg->bb_aux, l_mg->bb_template, off, >> = lm->sec_per_line); >> bitmap_or(line->map_bitmap, line->map_bitmap, = l_mg->bb_aux, >> = lm->sec_per_line); >> - line->sec_in_line -=3D geo->sec_per_chk; >> + line->sec_in_line -=3D geo->clba; >> if (bit >=3D lm->emeta_bb) >> nr_bb++; >> } >> /* Mark smeta metadata sectors as bad sectors */ >> bit =3D find_first_zero_bit(line->blk_bitmap, lm->blk_per_line); >> - off =3D bit * geo->sec_per_pl; >> + off =3D bit * geo->ws_opt; >> bitmap_set(line->map_bitmap, off, lm->smeta_sec); >> line->sec_in_line -=3D lm->smeta_sec; >> line->smeta_ssec =3D off; >> @@ -1066,10 +1066,10 @@ static int pblk_line_init_bb(struct pblk = *pblk, struct pblk_line *line, >> emeta_secs =3D lm->emeta_sec[0]; >> off =3D lm->sec_per_line; >> while (emeta_secs) { >> - off -=3D geo->sec_per_pl; >> + off -=3D geo->ws_opt; >> if (!test_bit(off, line->invalid_bitmap)) { >> - bitmap_set(line->invalid_bitmap, off, = geo->sec_per_pl); >> - emeta_secs -=3D geo->sec_per_pl; >> + bitmap_set(line->invalid_bitmap, off, = geo->ws_opt); >> + emeta_secs -=3D geo->ws_opt; >> } >> } >> diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c >> index 320f99af99e9..6851a5c67189 100644 >> --- a/drivers/lightnvm/pblk-gc.c >> +++ b/drivers/lightnvm/pblk-gc.c >> @@ -88,7 +88,7 @@ static void pblk_gc_line_ws(struct work_struct = *work) >> up(&gc->gc_sem); >> - gc_rq->data =3D vmalloc(gc_rq->nr_secs * geo->sec_size); >> + gc_rq->data =3D vmalloc(gc_rq->nr_secs * geo->csecs); >> if (!gc_rq->data) { >> pr_err("pblk: could not GC line:%d (%d/%d)\n", >> line->id, *line->vsc, = gc_rq->nr_secs); >> diff --git a/drivers/lightnvm/pblk-init.c = b/drivers/lightnvm/pblk-init.c >> index 25fc70ca07f7..9b5ee05c3028 100644 >> --- a/drivers/lightnvm/pblk-init.c >> +++ b/drivers/lightnvm/pblk-init.c >> @@ -146,7 +146,7 @@ static int pblk_rwb_init(struct pblk *pblk) >> return -ENOMEM; >> power_size =3D get_count_order(nr_entries); >> - power_seg_sz =3D get_count_order(geo->sec_size); >> + power_seg_sz =3D get_count_order(geo->csecs); >> return pblk_rb_init(&pblk->rwb, entries, power_size, = power_seg_sz); >> } >> @@ -154,11 +154,11 @@ static int pblk_rwb_init(struct pblk *pblk) >> /* Minimum pages needed within a lun */ >> #define ADDR_POOL_SIZE 64 >> -static int pblk_set_ppaf(struct pblk *pblk) >> +static int pblk_set_addrf_12(struct nvm_geo *geo, >> + struct nvm_addr_format_12 *dst) >> { >> - struct nvm_tgt_dev *dev =3D pblk->dev; >> - struct nvm_geo *geo =3D &dev->geo; >> - struct nvm_addr_format ppaf =3D geo->ppaf; >> + struct nvm_addr_format_12 *src =3D >> + (struct nvm_addr_format_12 = *)&geo->addrf; >> int power_len; >> /* Re-calculate channel and lun format to adapt to configuration = */ >> @@ -167,34 +167,50 @@ static int pblk_set_ppaf(struct pblk *pblk) >> pr_err("pblk: supports only power-of-two channel = config.\n"); >> return -EINVAL; >> } >> - ppaf.ch_len =3D power_len; >> + dst->ch_len =3D power_len; >> power_len =3D get_count_order(geo->nr_luns); >> if (1 << power_len !=3D geo->nr_luns) { >> pr_err("pblk: supports only power-of-two LUN = config.\n"); >> return -EINVAL; >> } >> - ppaf.lun_len =3D power_len; >> + dst->lun_len =3D power_len; >> - pblk->ppaf.sec_offset =3D 0; >> - pblk->ppaf.pln_offset =3D ppaf.sect_len; >> - pblk->ppaf.ch_offset =3D pblk->ppaf.pln_offset + ppaf.pln_len; >> - pblk->ppaf.lun_offset =3D pblk->ppaf.ch_offset + ppaf.ch_len; >> - pblk->ppaf.pg_offset =3D pblk->ppaf.lun_offset + ppaf.lun_len; >> - pblk->ppaf.blk_offset =3D pblk->ppaf.pg_offset + ppaf.pg_len; >> - pblk->ppaf.sec_mask =3D (1ULL << ppaf.sect_len) - 1; >> - pblk->ppaf.pln_mask =3D ((1ULL << ppaf.pln_len) - 1) << >> - = pblk->ppaf.pln_offset; >> - pblk->ppaf.ch_mask =3D ((1ULL << ppaf.ch_len) - 1) << >> - = pblk->ppaf.ch_offset; >> - pblk->ppaf.lun_mask =3D ((1ULL << ppaf.lun_len) - 1) << >> - = pblk->ppaf.lun_offset; >> - pblk->ppaf.pg_mask =3D ((1ULL << ppaf.pg_len) - 1) << >> - = pblk->ppaf.pg_offset; >> - pblk->ppaf.blk_mask =3D ((1ULL << ppaf.blk_len) - 1) << >> - = pblk->ppaf.blk_offset; >> + dst->blk_len =3D src->blk_len; >> + dst->pg_len =3D src->pg_len; >> + dst->pln_len =3D src->pln_len; >> + dst->sect_len =3D src->sect_len; >> - pblk->ppaf_bitsize =3D pblk->ppaf.blk_offset + ppaf.blk_len; >> + dst->sect_offset =3D 0; >> + dst->pln_offset =3D dst->sect_len; >> + dst->ch_offset =3D dst->pln_offset + dst->pln_len; >> + dst->lun_offset =3D dst->ch_offset + dst->ch_len; >> + dst->pg_offset =3D dst->lun_offset + dst->lun_len; >> + dst->blk_offset =3D dst->pg_offset + dst->pg_len; >> + >> + dst->sec_mask =3D ((1ULL << dst->sect_len) - 1) << = dst->sect_offset; >> + dst->pln_mask =3D ((1ULL << dst->pln_len) - 1) << = dst->pln_offset; >> + dst->ch_mask =3D ((1ULL << dst->ch_len) - 1) << dst->ch_offset; >> + dst->lun_mask =3D ((1ULL << dst->lun_len) - 1) << = dst->lun_offset; >> + dst->pg_mask =3D ((1ULL << dst->pg_len) - 1) << dst->pg_offset; >> + dst->blk_mask =3D ((1ULL << dst->blk_len) - 1) << = dst->blk_offset; >> + >> + return dst->blk_offset + src->blk_len; >> +} >> + >> +static int pblk_set_ppaf(struct pblk *pblk) >> +{ >> + struct nvm_tgt_dev *dev =3D pblk->dev; >> + struct nvm_geo *geo =3D &dev->geo; >> + int mod; >> + >> + div_u64_rem(geo->clba, pblk->min_write_pgs, &mod); >> + if (mod) { >> + pr_err("pblk: bad configuration of sectors/pages\n"); >> + return -EINVAL; >> + } >> + >> + pblk->ppaf_bitsize =3D pblk_set_addrf_12(geo, (void = *)&pblk->ppaf); >> return 0; >> } >> @@ -253,8 +269,7 @@ static int pblk_core_init(struct pblk *pblk) >> struct nvm_tgt_dev *dev =3D pblk->dev; >> struct nvm_geo *geo =3D &dev->geo; >> - pblk->pgs_in_buffer =3D NVM_MEM_PAGE_WRITE * geo->sec_per_pg * >> - geo->nr_planes * = geo->all_luns; >> + pblk->pgs_in_buffer =3D geo->mw_cunits * geo->all_luns; >> if (pblk_init_global_caches(pblk)) >> return -ENOMEM; >> @@ -552,18 +567,18 @@ static unsigned int calc_emeta_len(struct pblk = *pblk) >> /* Round to sector size so that lba_list starts on its own = sector */ >> lm->emeta_sec[1] =3D DIV_ROUND_UP( >> sizeof(struct line_emeta) + lm->blk_bitmap_len + >> - sizeof(struct wa_counters), geo->sec_size); >> - lm->emeta_len[1] =3D lm->emeta_sec[1] * geo->sec_size; >> + sizeof(struct wa_counters), geo->csecs); >> + lm->emeta_len[1] =3D lm->emeta_sec[1] * geo->csecs; >> /* Round to sector size so that vsc_list starts on its own = sector */ >> lm->dsec_per_line =3D lm->sec_per_line - lm->emeta_sec[0]; >> lm->emeta_sec[2] =3D DIV_ROUND_UP(lm->dsec_per_line * = sizeof(u64), >> - geo->sec_size); >> - lm->emeta_len[2] =3D lm->emeta_sec[2] * geo->sec_size; >> + geo->csecs); >> + lm->emeta_len[2] =3D lm->emeta_sec[2] * geo->csecs; >> lm->emeta_sec[3] =3D DIV_ROUND_UP(l_mg->nr_lines * sizeof(u32), >> - geo->sec_size); >> - lm->emeta_len[3] =3D lm->emeta_sec[3] * geo->sec_size; >> + geo->csecs); >> + lm->emeta_len[3] =3D lm->emeta_sec[3] * geo->csecs; >> lm->vsc_list_len =3D l_mg->nr_lines * sizeof(u32); >> @@ -594,13 +609,13 @@ static void pblk_set_provision(struct pblk = *pblk, long nr_free_blks) >> * on user capacity consider only provisioned blocks >> */ >> pblk->rl.total_blocks =3D nr_free_blks; >> - pblk->rl.nr_secs =3D nr_free_blks * geo->sec_per_chk; >> + pblk->rl.nr_secs =3D nr_free_blks * geo->clba; >> /* Consider sectors used for metadata */ >> sec_meta =3D (lm->smeta_sec + lm->emeta_sec[0]) * = l_mg->nr_free_lines; >> - blk_meta =3D DIV_ROUND_UP(sec_meta, geo->sec_per_chk); >> + blk_meta =3D DIV_ROUND_UP(sec_meta, geo->clba); >> - pblk->capacity =3D (provisioned - blk_meta) * geo->sec_per_chk; >> + pblk->capacity =3D (provisioned - blk_meta) * geo->clba; >> atomic_set(&pblk->rl.free_blocks, nr_free_blks); >> atomic_set(&pblk->rl.free_user_blocks, nr_free_blks); >> @@ -711,10 +726,10 @@ static int pblk_lines_init(struct pblk *pblk) >> void *chunk_log; >> unsigned int smeta_len, emeta_len; >> long nr_bad_blks =3D 0, nr_free_blks =3D 0; >> - int bb_distance, max_write_ppas, mod; >> + int bb_distance, max_write_ppas; >> int i, ret; >> - pblk->min_write_pgs =3D geo->sec_per_pl * (geo->sec_size / = PAGE_SIZE); >> + pblk->min_write_pgs =3D geo->ws_opt * (geo->csecs / PAGE_SIZE); >> max_write_ppas =3D pblk->min_write_pgs * geo->all_luns; >> pblk->max_write_pgs =3D min_t(int, max_write_ppas, = NVM_MAX_VLBA); >> pblk_set_sec_per_write(pblk, pblk->min_write_pgs); >> @@ -725,19 +740,13 @@ static int pblk_lines_init(struct pblk *pblk) >> return -EINVAL; >> } >> - div_u64_rem(geo->sec_per_chk, pblk->min_write_pgs, &mod); >> - if (mod) { >> - pr_err("pblk: bad configuration of sectors/pages\n"); >> - return -EINVAL; >> - } >> - >> l_mg->nr_lines =3D geo->nr_chks; >> l_mg->log_line =3D l_mg->data_line =3D NULL; >> l_mg->l_seq_nr =3D l_mg->d_seq_nr =3D 0; >> l_mg->nr_free_lines =3D 0; >> bitmap_zero(&l_mg->meta_bitmap, PBLK_DATA_LINES); >> - lm->sec_per_line =3D geo->sec_per_chk * geo->all_luns; >> + lm->sec_per_line =3D geo->clba * geo->all_luns; >> lm->blk_per_line =3D geo->all_luns; >> lm->blk_bitmap_len =3D BITS_TO_LONGS(geo->all_luns) * = sizeof(long); >> lm->sec_bitmap_len =3D BITS_TO_LONGS(lm->sec_per_line) * = sizeof(long); >> @@ -751,8 +760,8 @@ static int pblk_lines_init(struct pblk *pblk) >> */ >> i =3D 1; >> add_smeta_page: >> - lm->smeta_sec =3D i * geo->sec_per_pl; >> - lm->smeta_len =3D lm->smeta_sec * geo->sec_size; >> + lm->smeta_sec =3D i * geo->ws_opt; >> + lm->smeta_len =3D lm->smeta_sec * geo->csecs; >> smeta_len =3D sizeof(struct line_smeta) + lm->lun_bitmap_len; >> if (smeta_len > lm->smeta_len) { >> @@ -765,8 +774,8 @@ static int pblk_lines_init(struct pblk *pblk) >> */ >> i =3D 1; >> add_emeta_page: >> - lm->emeta_sec[0] =3D i * geo->sec_per_pl; >> - lm->emeta_len[0] =3D lm->emeta_sec[0] * geo->sec_size; >> + lm->emeta_sec[0] =3D i * geo->ws_opt; >> + lm->emeta_len[0] =3D lm->emeta_sec[0] * geo->csecs; >> emeta_len =3D calc_emeta_len(pblk); >> if (emeta_len > lm->emeta_len[0]) { >> @@ -779,7 +788,7 @@ static int pblk_lines_init(struct pblk *pblk) >> lm->min_blk_line =3D 1; >> if (geo->all_luns > 1) >> lm->min_blk_line +=3D DIV_ROUND_UP(lm->smeta_sec + >> - lm->emeta_sec[0], = geo->sec_per_chk); >> + lm->emeta_sec[0], geo->clba); >> if (lm->min_blk_line > lm->blk_per_line) { >> pr_err("pblk: config. not supported. Min. LUN in = line:%d\n", >> @@ -803,9 +812,9 @@ static int pblk_lines_init(struct pblk *pblk) >> goto fail_free_bb_template; >> } >> - bb_distance =3D (geo->all_luns) * geo->sec_per_pl; >> + bb_distance =3D (geo->all_luns) * geo->ws_opt; >> for (i =3D 0; i < lm->sec_per_line; i +=3D bb_distance) >> - bitmap_set(l_mg->bb_template, i, geo->sec_per_pl); >> + bitmap_set(l_mg->bb_template, i, geo->ws_opt); >> INIT_LIST_HEAD(&l_mg->free_list); >> INIT_LIST_HEAD(&l_mg->corrupt_list); >> @@ -982,9 +991,9 @@ static void *pblk_init(struct nvm_tgt_dev *dev, = struct gendisk *tdisk, >> struct pblk *pblk; >> int ret; >> - if (dev->identity.dom & NVM_RSP_L2P) { >> + if (dev->geo.dom & NVM_RSP_L2P) { >> pr_err("pblk: host-side L2P table not supported. = (%x)\n", >> - = dev->identity.dom); >> + dev->geo.dom); >> return ERR_PTR(-EINVAL); >> } >> @@ -1092,7 +1101,7 @@ static void *pblk_init(struct nvm_tgt_dev = *dev, struct gendisk *tdisk, >> blk_queue_write_cache(tqueue, true, false); >> - tqueue->limits.discard_granularity =3D geo->sec_per_chk * = geo->sec_size; >> + tqueue->limits.discard_granularity =3D geo->clba * geo->csecs; >> tqueue->limits.discard_alignment =3D 0; >> blk_queue_max_discard_sectors(tqueue, UINT_MAX >> 9); >> queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, tqueue); >> diff --git a/drivers/lightnvm/pblk-read.c = b/drivers/lightnvm/pblk-read.c >> index 2f761283f43e..9eee10f69df0 100644 >> --- a/drivers/lightnvm/pblk-read.c >> +++ b/drivers/lightnvm/pblk-read.c >> @@ -563,7 +563,7 @@ int pblk_submit_read_gc(struct pblk *pblk, struct = pblk_gc_rq *gc_rq) >> if (!(gc_rq->secs_to_gc)) >> goto out; >> - data_len =3D (gc_rq->secs_to_gc) * geo->sec_size; >> + data_len =3D (gc_rq->secs_to_gc) * geo->csecs; >> bio =3D pblk_bio_map_addr(pblk, gc_rq->data, gc_rq->secs_to_gc, = data_len, >> PBLK_VMALLOC_META, = GFP_KERNEL); >> if (IS_ERR(bio)) { >> diff --git a/drivers/lightnvm/pblk-recovery.c = b/drivers/lightnvm/pblk-recovery.c >> index aaab9a5c17cc..26356429dc72 100644 >> --- a/drivers/lightnvm/pblk-recovery.c >> +++ b/drivers/lightnvm/pblk-recovery.c >> @@ -184,7 +184,7 @@ static int pblk_calc_sec_in_line(struct pblk = *pblk, struct pblk_line *line) >> int nr_bb =3D bitmap_weight(line->blk_bitmap, lm->blk_per_line); >> return lm->sec_per_line - lm->smeta_sec - lm->emeta_sec[0] - >> - nr_bb * geo->sec_per_chk; >> + nr_bb * geo->clba; >> } >> struct pblk_recov_alloc { >> @@ -232,7 +232,7 @@ static int pblk_recov_read_oob(struct pblk *pblk, = struct pblk_line *line, >> rq_ppas =3D pblk_calc_secs(pblk, left_ppas, 0); >> if (!rq_ppas) >> rq_ppas =3D pblk->min_write_pgs; >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> bio =3D bio_map_kern(dev->q, data, rq_len, GFP_KERNEL); >> if (IS_ERR(bio)) >> @@ -351,7 +351,7 @@ static int pblk_recov_pad_oob(struct pblk *pblk, = struct pblk_line *line, >> if (!pad_rq) >> return -ENOMEM; >> - data =3D vzalloc(pblk->max_write_pgs * geo->sec_size); >> + data =3D vzalloc(pblk->max_write_pgs * geo->csecs); >> if (!data) { >> ret =3D -ENOMEM; >> goto free_rq; >> @@ -368,7 +368,7 @@ static int pblk_recov_pad_oob(struct pblk *pblk, = struct pblk_line *line, >> goto fail_free_pad; >> } >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> meta_list =3D nvm_dev_dma_alloc(dev->parent, GFP_KERNEL, = &dma_meta_list); >> if (!meta_list) { >> @@ -509,7 +509,7 @@ static int pblk_recov_scan_all_oob(struct pblk = *pblk, struct pblk_line *line, >> rq_ppas =3D pblk_calc_secs(pblk, left_ppas, 0); >> if (!rq_ppas) >> rq_ppas =3D pblk->min_write_pgs; >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> bio =3D bio_map_kern(dev->q, data, rq_len, GFP_KERNEL); >> if (IS_ERR(bio)) >> @@ -640,7 +640,7 @@ static int pblk_recov_scan_oob(struct pblk *pblk, = struct pblk_line *line, >> rq_ppas =3D pblk_calc_secs(pblk, left_ppas, 0); >> if (!rq_ppas) >> rq_ppas =3D pblk->min_write_pgs; >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> bio =3D bio_map_kern(dev->q, data, rq_len, GFP_KERNEL); >> if (IS_ERR(bio)) >> @@ -745,7 +745,7 @@ static int pblk_recov_l2p_from_oob(struct pblk = *pblk, struct pblk_line *line) >> ppa_list =3D (void *)(meta_list) + pblk_dma_meta_size; >> dma_ppa_list =3D dma_meta_list + pblk_dma_meta_size; >> - data =3D kcalloc(pblk->max_write_pgs, geo->sec_size, = GFP_KERNEL); >> + data =3D kcalloc(pblk->max_write_pgs, geo->csecs, GFP_KERNEL); >> if (!data) { >> ret =3D -ENOMEM; >> goto free_meta_list; >> diff --git a/drivers/lightnvm/pblk-rl.c b/drivers/lightnvm/pblk-rl.c >> index 0d457b162f23..883a7113b19d 100644 >> --- a/drivers/lightnvm/pblk-rl.c >> +++ b/drivers/lightnvm/pblk-rl.c >> @@ -200,7 +200,7 @@ void pblk_rl_init(struct pblk_rl *rl, int budget) >> /* Consider sectors used for metadata */ >> sec_meta =3D (lm->smeta_sec + lm->emeta_sec[0]) * = l_mg->nr_free_lines; >> - blk_meta =3D DIV_ROUND_UP(sec_meta, geo->sec_per_chk); >> + blk_meta =3D DIV_ROUND_UP(sec_meta, geo->clba); >> rl->high =3D pblk->op_blks - blk_meta - lm->blk_per_line; >> rl->high_pw =3D get_count_order(rl->high); >> diff --git a/drivers/lightnvm/pblk-sysfs.c = b/drivers/lightnvm/pblk-sysfs.c >> index 1680ce0a828d..33199c6af267 100644 >> --- a/drivers/lightnvm/pblk-sysfs.c >> +++ b/drivers/lightnvm/pblk-sysfs.c >> @@ -113,26 +113,31 @@ static ssize_t pblk_sysfs_ppaf(struct pblk = *pblk, char *page) >> { >> struct nvm_tgt_dev *dev =3D pblk->dev; >> struct nvm_geo *geo =3D &dev->geo; >> + struct nvm_addr_format_12 *ppaf; >> + struct nvm_addr_format_12 *geo_ppaf; >> ssize_t sz =3D 0; >> - sz =3D snprintf(page, PAGE_SIZE - sz, >> - = "g:(b:%d)blk:%d/%d,pg:%d/%d,lun:%d/%d,ch:%d/%d,pl:%d/%d,sec:%d/%d\n", >> - pblk->ppaf_bitsize, >> - pblk->ppaf.blk_offset, geo->ppaf.blk_len, >> - pblk->ppaf.pg_offset, geo->ppaf.pg_len, >> - pblk->ppaf.lun_offset, geo->ppaf.lun_len, >> - pblk->ppaf.ch_offset, geo->ppaf.ch_len, >> - pblk->ppaf.pln_offset, geo->ppaf.pln_len, >> - pblk->ppaf.sec_offset, geo->ppaf.sect_len); >> + ppaf =3D (struct nvm_addr_format_12 *)&pblk->ppaf; >> + geo_ppaf =3D (struct nvm_addr_format_12 *)&geo->addrf; >> + >> + sz =3D snprintf(page, PAGE_SIZE, >> + = "pblk:(s:%d)ch:%d/%d,lun:%d/%d,blk:%d/%d,pg:%d/%d,pl:%d/%d,sec:%d/%d\n", >> + pblk->ppaf_bitsize, >> + ppaf->ch_offset, ppaf->ch_len, >> + ppaf->lun_offset, ppaf->lun_len, >> + ppaf->blk_offset, ppaf->blk_len, >> + ppaf->pg_offset, ppaf->pg_len, >> + ppaf->pln_offset, ppaf->pln_len, >> + ppaf->sect_offset, ppaf->sect_len); >=20 > Is it on purpose here that the code breaks user-space by changing the = sysfs print format? Fixed. >=20 >> sz +=3D snprintf(page + sz, PAGE_SIZE - sz, >> - = "d:blk:%d/%d,pg:%d/%d,lun:%d/%d,ch:%d/%d,pl:%d/%d,sec:%d/%d\n", >> - geo->ppaf.blk_offset, geo->ppaf.blk_len, >> - geo->ppaf.pg_offset, geo->ppaf.pg_len, >> - geo->ppaf.lun_offset, geo->ppaf.lun_len, >> - geo->ppaf.ch_offset, geo->ppaf.ch_len, >> - geo->ppaf.pln_offset, geo->ppaf.pln_len, >> - geo->ppaf.sect_offset, geo->ppaf.sect_len); >> + = "device:ch:%d/%d,lun:%d/%d,blk:%d/%d,pg:%d/%d,pl:%d/%d,sec:%d/%d\n", >> + geo_ppaf->ch_offset, geo_ppaf->ch_len, >> + geo_ppaf->lun_offset, geo_ppaf->lun_len, >> + geo_ppaf->blk_offset, geo_ppaf->blk_len, >> + geo_ppaf->pg_offset, geo_ppaf->pg_len, >> + geo_ppaf->pln_offset, geo_ppaf->pln_len, >> + geo_ppaf->sect_offset, geo_ppaf->sect_len); >=20 > Similarily here. Fixed. >=20 >> return sz; >> } >> @@ -288,7 +293,7 @@ static ssize_t pblk_sysfs_lines_info(struct pblk = *pblk, char *page) >> "blk_line:%d, sec_line:%d, = sec_blk:%d\n", >> lm->blk_per_line, >> lm->sec_per_line, >> - geo->sec_per_chk); >> + geo->clba); >> return sz; >> } >> diff --git a/drivers/lightnvm/pblk-write.c = b/drivers/lightnvm/pblk-write.c >> index aae86ed60b98..3e6f1ebd743a 100644 >> --- a/drivers/lightnvm/pblk-write.c >> +++ b/drivers/lightnvm/pblk-write.c >> @@ -333,7 +333,7 @@ int pblk_submit_meta_io(struct pblk *pblk, struct = pblk_line *meta_line) >> m_ctx =3D nvm_rq_to_pdu(rqd); >> m_ctx->private =3D meta_line; >> - rq_len =3D rq_ppas * geo->sec_size; >> + rq_len =3D rq_ppas * geo->csecs; >> data =3D ((void *)emeta->buf) + emeta->mem; >> bio =3D pblk_bio_map_addr(pblk, data, rq_ppas, rq_len, >> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h >> index f0309d8172c0..b29c1e6698aa 100644 >> --- a/drivers/lightnvm/pblk.h >> +++ b/drivers/lightnvm/pblk.h >> @@ -551,21 +551,6 @@ struct pblk_line_meta { >> unsigned int meta_distance; /* Distance between data and = metadata */ >> }; >> -struct pblk_addr_format { >> - u64 ch_mask; >> - u64 lun_mask; >> - u64 pln_mask; >> - u64 blk_mask; >> - u64 pg_mask; >> - u64 sec_mask; >> - u8 ch_offset; >> - u8 lun_offset; >> - u8 pln_offset; >> - u8 blk_offset; >> - u8 pg_offset; >> - u8 sec_offset; >> -}; >> - >> enum { >> PBLK_STATE_RUNNING =3D 0, >> PBLK_STATE_STOPPING =3D 1, >> @@ -585,8 +570,8 @@ struct pblk { >> struct pblk_line_mgmt l_mg; /* Line management */ >> struct pblk_line_meta lm; /* Line metadata */ >> + struct nvm_addr_format ppaf; >> int ppaf_bitsize; >> - struct pblk_addr_format ppaf; >> struct pblk_rb rwb; >> @@ -941,14 +926,12 @@ static inline int pblk_line_vsc(struct = pblk_line *line) >> return le32_to_cpu(*line->vsc); >> } >> -#define NVM_MEM_PAGE_WRITE (8) >> - >> static inline int pblk_pad_distance(struct pblk *pblk) >> { >> struct nvm_tgt_dev *dev =3D pblk->dev; >> struct nvm_geo *geo =3D &dev->geo; >> - return NVM_MEM_PAGE_WRITE * geo->all_luns * geo->sec_per_pl; >> + return geo->mw_cunits * geo->all_luns * geo->ws_opt; >> } >> static inline int pblk_ppa_to_line(struct ppa_addr p) >> @@ -964,15 +947,17 @@ static inline int pblk_ppa_to_pos(struct = nvm_geo *geo, struct ppa_addr p) >> static inline struct ppa_addr addr_to_gen_ppa(struct pblk *pblk, u64 = paddr, >> u64 line_id) >> { >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&pblk->ppaf; >> struct ppa_addr ppa; >> ppa.ppa =3D 0; >> ppa.g.blk =3D line_id; >> - ppa.g.pg =3D (paddr & pblk->ppaf.pg_mask) >> = pblk->ppaf.pg_offset; >> - ppa.g.lun =3D (paddr & pblk->ppaf.lun_mask) >> = pblk->ppaf.lun_offset; >> - ppa.g.ch =3D (paddr & pblk->ppaf.ch_mask) >> = pblk->ppaf.ch_offset; >> - ppa.g.pl =3D (paddr & pblk->ppaf.pln_mask) >> = pblk->ppaf.pln_offset; >> - ppa.g.sec =3D (paddr & pblk->ppaf.sec_mask) >> = pblk->ppaf.sec_offset; >> + ppa.g.pg =3D (paddr & ppaf->pg_mask) >> ppaf->pg_offset; >> + ppa.g.lun =3D (paddr & ppaf->lun_mask) >> ppaf->lun_offset; >> + ppa.g.ch =3D (paddr & ppaf->ch_mask) >> ppaf->ch_offset; >> + ppa.g.pl =3D (paddr & ppaf->pln_mask) >> ppaf->pln_offset; >> + ppa.g.sec =3D (paddr & ppaf->sec_mask) >> ppaf->sect_offset; >> return ppa; >> } >> @@ -980,13 +965,15 @@ static inline struct ppa_addr = addr_to_gen_ppa(struct pblk *pblk, u64 paddr, >> static inline u64 pblk_dev_ppa_to_line_addr(struct pblk *pblk, >> struct ppa_addr = p) >> { >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&pblk->ppaf; >> u64 paddr; >> - paddr =3D (u64)p.g.pg << pblk->ppaf.pg_offset; >> - paddr |=3D (u64)p.g.lun << pblk->ppaf.lun_offset; >> - paddr |=3D (u64)p.g.ch << pblk->ppaf.ch_offset; >> - paddr |=3D (u64)p.g.pl << pblk->ppaf.pln_offset; >> - paddr |=3D (u64)p.g.sec << pblk->ppaf.sec_offset; >> + paddr =3D (u64)p.g.ch << ppaf->ch_offset; >> + paddr |=3D (u64)p.g.lun << ppaf->lun_offset; >> + paddr |=3D (u64)p.g.pg << ppaf->pg_offset; >> + paddr |=3D (u64)p.g.pl << ppaf->pln_offset; >> + paddr |=3D (u64)p.g.sec << ppaf->sect_offset; >> return paddr; >> } >> @@ -1003,18 +990,15 @@ static inline struct ppa_addr = pblk_ppa32_to_ppa64(struct pblk *pblk, u32 ppa32) >> ppa64.c.line =3D ppa32 & ((~0U) >> 1); >> ppa64.c.is_cached =3D 1; >> } else { >> - ppa64.g.blk =3D (ppa32 & pblk->ppaf.blk_mask) >> >> - = pblk->ppaf.blk_offset; >> - ppa64.g.pg =3D (ppa32 & pblk->ppaf.pg_mask) >> >> - = pblk->ppaf.pg_offset; >> - ppa64.g.lun =3D (ppa32 & pblk->ppaf.lun_mask) >> >> - = pblk->ppaf.lun_offset; >> - ppa64.g.ch =3D (ppa32 & pblk->ppaf.ch_mask) >> >> - = pblk->ppaf.ch_offset; >> - ppa64.g.pl =3D (ppa32 & pblk->ppaf.pln_mask) >> >> - = pblk->ppaf.pln_offset; >> - ppa64.g.sec =3D (ppa32 & pblk->ppaf.sec_mask) >> >> - = pblk->ppaf.sec_offset; >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&pblk->ppaf; >> + >> + ppa64.g.ch =3D (ppa32 & ppaf->ch_mask) >> = ppaf->ch_offset; >> + ppa64.g.lun =3D (ppa32 & ppaf->lun_mask) >> = ppaf->lun_offset; >> + ppa64.g.blk =3D (ppa32 & ppaf->blk_mask) >> = ppaf->blk_offset; >> + ppa64.g.pg =3D (ppa32 & ppaf->pg_mask) >> = ppaf->pg_offset; >> + ppa64.g.pl =3D (ppa32 & ppaf->pln_mask) >> = ppaf->pln_offset; >> + ppa64.g.sec =3D (ppa32 & ppaf->sec_mask) >> = ppaf->sect_offset; >> } >> return ppa64; >> @@ -1030,12 +1014,15 @@ static inline u32 pblk_ppa64_to_ppa32(struct = pblk *pblk, struct ppa_addr ppa64) >> ppa32 |=3D ppa64.c.line; >> ppa32 |=3D 1U << 31; >> } else { >> - ppa32 |=3D ppa64.g.blk << pblk->ppaf.blk_offset; >> - ppa32 |=3D ppa64.g.pg << pblk->ppaf.pg_offset; >> - ppa32 |=3D ppa64.g.lun << pblk->ppaf.lun_offset; >> - ppa32 |=3D ppa64.g.ch << pblk->ppaf.ch_offset; >> - ppa32 |=3D ppa64.g.pl << pblk->ppaf.pln_offset; >> - ppa32 |=3D ppa64.g.sec << pblk->ppaf.sec_offset; >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&pblk->ppaf; >> + >> + ppa32 |=3D ppa64.g.ch << ppaf->ch_offset; >> + ppa32 |=3D ppa64.g.lun << ppaf->lun_offset; >> + ppa32 |=3D ppa64.g.blk << ppaf->blk_offset; >> + ppa32 |=3D ppa64.g.pg << ppaf->pg_offset; >> + ppa32 |=3D ppa64.g.pl << ppaf->pln_offset; >> + ppa32 |=3D ppa64.g.sec << ppaf->sect_offset; >> } >> return ppa32; >> @@ -1229,10 +1216,10 @@ static inline int = pblk_boundary_ppa_checks(struct nvm_tgt_dev *tgt_dev, >> if (!ppa->c.is_cached && >> ppa->g.ch < geo->nr_chnls && >> ppa->g.lun < geo->nr_luns && >> - ppa->g.pl < geo->nr_planes && >> + ppa->g.pl < geo->num_pln && >> ppa->g.blk < geo->nr_chks && >> - ppa->g.pg < geo->ws_per_chk && >> - ppa->g.sec < geo->sec_per_pg) >> + ppa->g.pg < geo->num_pg && >> + ppa->g.sec < geo->ws_min) >> continue; >> print_ppa(ppa, "boundary", i); >> diff --git a/drivers/nvme/host/lightnvm.c = b/drivers/nvme/host/lightnvm.c >> index 839c0b96466a..e276ace28c64 100644 >> --- a/drivers/nvme/host/lightnvm.c >> +++ b/drivers/nvme/host/lightnvm.c >> @@ -152,8 +152,8 @@ struct nvme_nvm_id12_addrf { >> __u8 blk_len; >> __u8 pg_offset; >> __u8 pg_len; >> - __u8 sect_offset; >> - __u8 sect_len; >> + __u8 sec_offset; >> + __u8 sec_len; >> __u8 res[4]; >> } __packed; >> @@ -254,106 +254,161 @@ static inline void = _nvme_nvm_check_size(void) >> BUILD_BUG_ON(sizeof(struct nvme_nvm_id20) !=3D = NVME_IDENTIFY_DATA_SIZE); >> } >> -static int init_grp(struct nvm_id *nvm_id, struct nvme_nvm_id12 = *id12) >> +static void nvme_nvm_set_addr_12(struct nvm_addr_format_12 *dst, >> + struct nvme_nvm_id12_addrf *src) >> +{ >> + dst->ch_len =3D src->ch_len; >> + dst->lun_len =3D src->lun_len; >> + dst->blk_len =3D src->blk_len; >> + dst->pg_len =3D src->pg_len; >> + dst->pln_len =3D src->pln_len; >> + dst->sect_len =3D src->sec_len; >> + >> + dst->ch_offset =3D src->ch_offset; >> + dst->lun_offset =3D src->lun_offset; >> + dst->blk_offset =3D src->blk_offset; >> + dst->pg_offset =3D src->pg_offset; >> + dst->pln_offset =3D src->pln_offset; >> + dst->sect_offset =3D src->sec_offset; >> + >> + dst->ch_mask =3D ((1ULL << dst->ch_len) - 1) << dst->ch_offset; >> + dst->lun_mask =3D ((1ULL << dst->lun_len) - 1) << = dst->lun_offset; >> + dst->blk_mask =3D ((1ULL << dst->blk_len) - 1) << = dst->blk_offset; >> + dst->pg_mask =3D ((1ULL << dst->pg_len) - 1) << dst->pg_offset; >> + dst->pln_mask =3D ((1ULL << dst->pln_len) - 1) << = dst->pln_offset; >> + dst->sec_mask =3D ((1ULL << dst->sect_len) - 1) << = dst->sect_offset; >> +} >> + >> +static int nvme_nvm_setup_12(struct nvme_nvm_id12 *id, >> + struct nvm_geo *geo) >> { >> struct nvme_nvm_id12_grp *src; >> int sec_per_pg, sec_per_pl, pg_per_blk; >> - if (id12->cgrps !=3D 1) >> + if (id->cgrps !=3D 1) >> return -EINVAL; >> - src =3D &id12->grp; >> + src =3D &id->grp; >> - nvm_id->mtype =3D src->mtype; >> - nvm_id->fmtype =3D src->fmtype; >> + if (src->mtype !=3D 0) { >> + pr_err("nvm: memory type not supported\n"); >> + return -EINVAL; >> + } >> + >> + geo->ver_id =3D id->ver_id; >> + >> + geo->nr_chnls =3D src->num_ch; >> + geo->nr_luns =3D src->num_lun; >> + geo->all_luns =3D geo->nr_chnls * geo->nr_luns; >> - nvm_id->num_ch =3D src->num_ch; >> - nvm_id->num_lun =3D src->num_lun; >> + geo->nr_chks =3D le16_to_cpu(src->num_chk); >> - nvm_id->num_chk =3D le16_to_cpu(src->num_chk); >> - nvm_id->csecs =3D le16_to_cpu(src->csecs); >> - nvm_id->sos =3D le16_to_cpu(src->sos); >> + geo->csecs =3D le16_to_cpu(src->csecs); >> + geo->sos =3D le16_to_cpu(src->sos); >> pg_per_blk =3D le16_to_cpu(src->num_pg); >> - sec_per_pg =3D le16_to_cpu(src->fpg_sz) / nvm_id->csecs; >> + sec_per_pg =3D le16_to_cpu(src->fpg_sz) / geo->csecs; >> sec_per_pl =3D sec_per_pg * src->num_pln; >> - nvm_id->clba =3D sec_per_pl * pg_per_blk; >> - nvm_id->ws_per_chk =3D pg_per_blk; >> - >> - nvm_id->mpos =3D le32_to_cpu(src->mpos); >> - nvm_id->cpar =3D le16_to_cpu(src->cpar); >> - nvm_id->mccap =3D le32_to_cpu(src->mccap); >> - >> - nvm_id->ws_opt =3D nvm_id->ws_min =3D sec_per_pg; >> - nvm_id->ws_seq =3D NVM_IO_SNGL_ACCESS; >> - >> - if (nvm_id->mpos & 0x020202) { >> - nvm_id->ws_seq =3D NVM_IO_DUAL_ACCESS; >> - nvm_id->ws_opt <<=3D 1; >> - } else if (nvm_id->mpos & 0x040404) { >> - nvm_id->ws_seq =3D NVM_IO_QUAD_ACCESS; >> - nvm_id->ws_opt <<=3D 2; >> + geo->clba =3D sec_per_pl * pg_per_blk; >> + >> + geo->all_chunks =3D geo->all_luns * geo->nr_chks; >> + geo->total_secs =3D geo->clba * geo->all_chunks; >> + >> + geo->ws_min =3D sec_per_pg; >> + geo->ws_opt =3D sec_per_pg; >> + geo->mw_cunits =3D geo->ws_opt << 3; /* default to MLC safe = values */ >> + >> + geo->mccap =3D le32_to_cpu(src->mccap); >> + >> + geo->trdt =3D le32_to_cpu(src->trdt); >> + geo->trdm =3D le32_to_cpu(src->trdm); >> + geo->tprt =3D le32_to_cpu(src->tprt); >> + geo->tprm =3D le32_to_cpu(src->tprm); >> + geo->tbet =3D le32_to_cpu(src->tbet); >> + geo->tbem =3D le32_to_cpu(src->tbem); >> + >> + /* 1.2 compatibility */ >> + geo->vmnt =3D id->vmnt; >> + geo->cap =3D le32_to_cpu(id->cap); >> + geo->dom =3D le32_to_cpu(id->dom); >> + >> + geo->mtype =3D src->mtype; >> + geo->fmtype =3D src->fmtype; >> + >> + geo->cpar =3D le16_to_cpu(src->cpar); >> + geo->mpos =3D le32_to_cpu(src->mpos); >> + >> + geo->plane_mode =3D NVM_PLANE_SINGLE; >> + >> + if (geo->mpos & 0x020202) { >> + geo->plane_mode =3D NVM_PLANE_DOUBLE; >> + geo->ws_opt <<=3D 1; >> + } else if (geo->mpos & 0x040404) { >> + geo->plane_mode =3D NVM_PLANE_QUAD; >> + geo->ws_opt <<=3D 2; >> } >> - nvm_id->trdt =3D le32_to_cpu(src->trdt); >> - nvm_id->trdm =3D le32_to_cpu(src->trdm); >> - nvm_id->tprt =3D le32_to_cpu(src->tprt); >> - nvm_id->tprm =3D le32_to_cpu(src->tprm); >> - nvm_id->tbet =3D le32_to_cpu(src->tbet); >> - nvm_id->tbem =3D le32_to_cpu(src->tbem); >> - >> - /* 1.2 compatibility */ >> - nvm_id->num_pln =3D src->num_pln; >> - nvm_id->num_pg =3D le16_to_cpu(src->num_pg); >> - nvm_id->fpg_sz =3D le16_to_cpu(src->fpg_sz); >> + geo->num_pln =3D src->num_pln; >> + geo->num_pg =3D le16_to_cpu(src->num_pg); >> + geo->fpg_sz =3D le16_to_cpu(src->fpg_sz); >> + >> + nvme_nvm_set_addr_12((struct nvm_addr_format_12 *)&geo->addrf, >> + = &id->ppaf); >> return 0; >> } >> -static int nvme_nvm_setup_12(struct nvm_dev *nvmdev, struct nvm_id = *nvm_id, >> - struct nvme_nvm_id12 *id) >> +static void nvme_nvm_set_addr_20(struct nvm_addr_format *dst, >> + struct nvme_nvm_id20_addrf *src) >> { >> - nvm_id->ver_id =3D id->ver_id; >> - nvm_id->vmnt =3D id->vmnt; >> - nvm_id->cap =3D le32_to_cpu(id->cap); >> - nvm_id->dom =3D le32_to_cpu(id->dom); >> - memcpy(&nvm_id->ppaf, &id->ppaf, >> - sizeof(struct nvm_addr_format)); >> - >> - return init_grp(nvm_id, id); >> + dst->ch_len =3D src->grp_len; >> + dst->lun_len =3D src->pu_len; >> + dst->chk_len =3D src->chk_len; >> + dst->sec_len =3D src->lba_len; >> + >> + dst->sec_offset =3D 0; >> + dst->chk_offset =3D dst->sec_len; >> + dst->lun_offset =3D dst->chk_offset + dst->chk_len; >> + dst->ch_offset =3D dst->lun_offset + dst->lun_len; >> + >> + dst->ch_mask =3D ((1ULL << dst->ch_len) - 1) << dst->ch_offset; >> + dst->lun_mask =3D ((1ULL << dst->lun_len) - 1) << = dst->lun_offset; >> + dst->chk_mask =3D ((1ULL << dst->chk_len) - 1) << = dst->chk_offset; >> + dst->sec_mask =3D ((1ULL << dst->sec_len) - 1) << = dst->sec_offset; >> } >> -static int nvme_nvm_setup_20(struct nvm_dev *nvmdev, struct nvm_id = *nvm_id, >> - struct nvme_nvm_id20 *id) >> +static int nvme_nvm_setup_20(struct nvme_nvm_id20 *id, >> + struct nvm_geo *geo) >> { >> - nvm_id->ver_id =3D id->mjr; >> + geo->ver_id =3D id->mjr; >> + >> + geo->nr_chnls =3D le16_to_cpu(id->num_grp); >> + geo->nr_luns =3D le16_to_cpu(id->num_pu); >> + geo->all_luns =3D geo->nr_chnls * geo->nr_luns; >> - nvm_id->num_ch =3D le16_to_cpu(id->num_grp); >> - nvm_id->num_lun =3D le16_to_cpu(id->num_pu); >> - nvm_id->num_chk =3D le32_to_cpu(id->num_chk); >> - nvm_id->clba =3D le32_to_cpu(id->clba); >> + geo->nr_chks =3D le32_to_cpu(id->num_chk); >> + geo->clba =3D le32_to_cpu(id->clba); >> - nvm_id->ws_min =3D le32_to_cpu(id->ws_min); >> - nvm_id->ws_opt =3D le32_to_cpu(id->ws_opt); >> - nvm_id->mw_cunits =3D le32_to_cpu(id->mw_cunits); >> + geo->all_chunks =3D geo->all_luns * geo->nr_chks; >> + geo->total_secs =3D geo->clba * geo->all_chunks; >> - nvm_id->trdt =3D le32_to_cpu(id->trdt); >> - nvm_id->trdm =3D le32_to_cpu(id->trdm); >> - nvm_id->tprt =3D le32_to_cpu(id->twrt); >> - nvm_id->tprm =3D le32_to_cpu(id->twrm); >> - nvm_id->tbet =3D le32_to_cpu(id->tcrst); >> - nvm_id->tbem =3D le32_to_cpu(id->tcrsm); >> + geo->ws_min =3D le32_to_cpu(id->ws_min); >> + geo->ws_opt =3D le32_to_cpu(id->ws_opt); >> + geo->mw_cunits =3D le32_to_cpu(id->mw_cunits); >> - /* calculated values */ >> - nvm_id->ws_per_chk =3D nvm_id->clba / nvm_id->ws_min; >> + geo->trdt =3D le32_to_cpu(id->trdt); >> + geo->trdm =3D le32_to_cpu(id->trdm); >> + geo->tprt =3D le32_to_cpu(id->twrt); >> + geo->tprm =3D le32_to_cpu(id->twrm); >> + geo->tbet =3D le32_to_cpu(id->tcrst); >> + geo->tbem =3D le32_to_cpu(id->tcrsm); >> - /* 1.2 compatibility */ >> - nvm_id->ws_seq =3D NVM_IO_SNGL_ACCESS; >> + nvme_nvm_set_addr_20(&geo->addrf, &id->lbaf); >> return 0; >> } >> -static int nvme_nvm_identity(struct nvm_dev *nvmdev, struct nvm_id = *nvm_id) >> +static int nvme_nvm_identity(struct nvm_dev *nvmdev) >> { >> struct nvme_ns *ns =3D nvmdev->q->queuedata; >> struct nvme_nvm_id12 *id; >> @@ -380,18 +435,18 @@ static int nvme_nvm_identity(struct nvm_dev = *nvmdev, struct nvm_id *nvm_id) >> */ >> switch (id->ver_id) { >> case 1: >> - ret =3D nvme_nvm_setup_12(nvmdev, nvm_id, id); >> + ret =3D nvme_nvm_setup_12(id, &nvmdev->geo); >> break; >> case 2: >> - ret =3D nvme_nvm_setup_20(nvmdev, nvm_id, >> - (struct nvme_nvm_id20 *)id); >> + ret =3D nvme_nvm_setup_20((struct nvme_nvm_id20 *)id, >> + &nvmdev->geo); >> break; >> default: >> - dev_err(ns->ctrl->device, >> - "OCSSD revision not supported (%d)\n", >> - nvm_id->ver_id); >> + dev_err(ns->ctrl->device, "OCSSD revision not supported = (%d)\n", >> + id->ver_id); >> ret =3D -EINVAL; >> } >> + >> out: >> kfree(id); >> return ret; >> @@ -406,7 +461,7 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev = *nvmdev, struct ppa_addr ppa, >> struct nvme_ctrl *ctrl =3D ns->ctrl; >> struct nvme_nvm_command c =3D {}; >> struct nvme_nvm_bb_tbl *bb_tbl; >> - int nr_blks =3D geo->nr_chks * geo->plane_mode; >> + int nr_blks =3D geo->nr_chks * geo->num_pln; >> int tblsz =3D sizeof(struct nvme_nvm_bb_tbl) + nr_blks; >> int ret =3D 0; >> @@ -447,7 +502,7 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev = *nvmdev, struct ppa_addr ppa, >> goto out; >> } >> - memcpy(blks, bb_tbl->blk, geo->nr_chks * geo->plane_mode); >> + memcpy(blks, bb_tbl->blk, geo->nr_chks * geo->num_pln); >> out: >> kfree(bb_tbl); >> return ret; >> @@ -815,9 +870,10 @@ int nvme_nvm_ioctl(struct nvme_ns *ns, unsigned = int cmd, unsigned long arg) >> void nvme_nvm_update_nvm_info(struct nvme_ns *ns) >> { >> struct nvm_dev *ndev =3D ns->ndev; >> + struct nvm_geo *geo =3D &ndev->geo; >> - ndev->identity.csecs =3D ndev->geo.sec_size =3D 1 << = ns->lba_shift; >> - ndev->identity.sos =3D ndev->geo.oob_size =3D ns->ms; >> + geo->csecs =3D 1 << ns->lba_shift; >> + geo->sos =3D ns->ms; >> } >> int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int = node) >> @@ -850,23 +906,22 @@ static ssize_t nvm_dev_attr_show(struct device = *dev, >> { >> struct nvme_ns *ns =3D nvme_get_ns_from_dev(dev); >> struct nvm_dev *ndev =3D ns->ndev; >> - struct nvm_id *id; >> + struct nvm_geo *geo =3D &ndev->geo; >> struct attribute *attr; >> if (!ndev) >> return 0; >> - id =3D &ndev->identity; >> attr =3D &dattr->attr; >> if (strcmp(attr->name, "version") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->ver_id); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->ver_id); >> } else if (strcmp(attr->name, "capabilities") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->cap); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->cap); >> } else if (strcmp(attr->name, "read_typ") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->trdt); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->trdt); >> } else if (strcmp(attr->name, "read_max") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->trdm); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->trdm); >> } else { >> return scnprintf(page, >> PAGE_SIZE, >> @@ -875,75 +930,79 @@ static ssize_t nvm_dev_attr_show(struct device = *dev, >> } >> } >> +static ssize_t nvm_dev_attr_show_ppaf(struct nvm_addr_format_12 = *ppaf, >> + char *page) >> +{ >> + return scnprintf(page, PAGE_SIZE, >> + "0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", >> + ppaf->ch_offset, ppaf->ch_len, >> + ppaf->lun_offset, ppaf->lun_len, >> + ppaf->pln_offset, ppaf->pln_len, >> + ppaf->blk_offset, ppaf->blk_len, >> + ppaf->pg_offset, ppaf->pg_len, >> + ppaf->sect_offset, ppaf->sect_len); >> +} >> + >> static ssize_t nvm_dev_attr_show_12(struct device *dev, >> struct device_attribute *dattr, char *page) >> { >> struct nvme_ns *ns =3D nvme_get_ns_from_dev(dev); >> struct nvm_dev *ndev =3D ns->ndev; >> - struct nvm_id *id; >> + struct nvm_geo *geo =3D &ndev->geo; >> struct attribute *attr; >> if (!ndev) >> return 0; >> - id =3D &ndev->identity; >> attr =3D &dattr->attr; >> if (strcmp(attr->name, "vendor_opcode") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->vmnt); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->vmnt); >> } else if (strcmp(attr->name, "device_mode") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->dom); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->dom); >> /* kept for compatibility */ >> } else if (strcmp(attr->name, "media_manager") =3D=3D 0) { >> return scnprintf(page, PAGE_SIZE, "%s\n", "gennvm"); >> } else if (strcmp(attr->name, "ppa_format") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, >> - = "0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", >> - id->ppaf.ch_offset, id->ppaf.ch_len, >> - id->ppaf.lun_offset, id->ppaf.lun_len, >> - id->ppaf.pln_offset, id->ppaf.pln_len, >> - id->ppaf.blk_offset, id->ppaf.blk_len, >> - id->ppaf.pg_offset, id->ppaf.pg_len, >> - id->ppaf.sect_offset, id->ppaf.sect_len); >> + return nvm_dev_attr_show_ppaf((void *)&geo->addrf, = page); >=20 > Why do the code here cast to void *, and not to the address format = data structure? >=20 > Have you thought about doing the cast directly here, instead of making = a function for it? I like it better to be tight instead of having to break the line for this. Same point you make below. >=20 >> } else if (strcmp(attr->name, "media_type") =3D=3D 0) { /* u8 */ >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->mtype); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->mtype); >> } else if (strcmp(attr->name, "flash_media_type") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->fmtype); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->fmtype); >> } else if (strcmp(attr->name, "num_channels") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_ch); >> + return scnprintf(page, PAGE_SIZE, "%u\n", = geo->nr_chnls); >> } else if (strcmp(attr->name, "num_luns") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_lun); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->nr_luns); >> } else if (strcmp(attr->name, "num_planes") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_pln); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->num_pln); >> } else if (strcmp(attr->name, "num_blocks") =3D=3D 0) { /* u16 = */ >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_chk); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->nr_chks); >> } else if (strcmp(attr->name, "num_pages") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_pg); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->num_pg); >> } else if (strcmp(attr->name, "page_size") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->fpg_sz); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->fpg_sz); >> } else if (strcmp(attr->name, "hw_sector_size") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->csecs); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->csecs); >> } else if (strcmp(attr->name, "oob_sector_size") =3D=3D 0) {/* = u32 */ >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->sos); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->sos); >> } else if (strcmp(attr->name, "prog_typ") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tprt); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tprt); >> } else if (strcmp(attr->name, "prog_max") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tprm); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tprm); >> } else if (strcmp(attr->name, "erase_typ") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tbet); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tbet); >> } else if (strcmp(attr->name, "erase_max") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tbem); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tbem); >> } else if (strcmp(attr->name, "multiplane_modes") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "0x%08x\n", id->mpos); >> + return scnprintf(page, PAGE_SIZE, "0x%08x\n", = geo->mpos); >> } else if (strcmp(attr->name, "media_capabilities") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "0x%08x\n", = id->mccap); >> + return scnprintf(page, PAGE_SIZE, "0x%08x\n", = geo->mccap); >> } else if (strcmp(attr->name, "max_phys_secs") =3D=3D 0) { >> return scnprintf(page, PAGE_SIZE, "%u\n", NVM_MAX_VLBA); >> } else { >> - return scnprintf(page, >> - PAGE_SIZE, >> - "Unhandled attr(%s) in = `nvm_dev_attr_show_12`\n", >> - attr->name); >> + return scnprintf(page, PAGE_SIZE, >> + "Unhandled attr(%s) in = `nvm_dev_attr_show_12`\n", >> + attr->name); >> } >> } >> @@ -952,42 +1011,40 @@ static ssize_t nvm_dev_attr_show_20(struct = device *dev, >> { >> struct nvme_ns *ns =3D nvme_get_ns_from_dev(dev); >> struct nvm_dev *ndev =3D ns->ndev; >> - struct nvm_id *id; >> + struct nvm_geo *geo =3D &ndev->geo; >> struct attribute *attr; >> if (!ndev) >> return 0; >> - id =3D &ndev->identity; >> attr =3D &dattr->attr; >> if (strcmp(attr->name, "groups") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_ch); >> + return scnprintf(page, PAGE_SIZE, "%u\n", = geo->nr_chnls); >> } else if (strcmp(attr->name, "punits") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_lun); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->nr_luns); >> } else if (strcmp(attr->name, "chunks") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->num_chk); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->nr_chks); >> } else if (strcmp(attr->name, "clba") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->clba); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->clba); >> } else if (strcmp(attr->name, "ws_min") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->ws_min); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_min); >> } else if (strcmp(attr->name, "ws_opt") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->ws_opt); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->ws_opt); >> } else if (strcmp(attr->name, "mw_cunits") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", = id->mw_cunits); >> + return scnprintf(page, PAGE_SIZE, "%u\n", = geo->mw_cunits); >> } else if (strcmp(attr->name, "write_typ") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tprt); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tprt); >> } else if (strcmp(attr->name, "write_max") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tprm); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tprm); >> } else if (strcmp(attr->name, "reset_typ") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tbet); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tbet); >> } else if (strcmp(attr->name, "reset_max") =3D=3D 0) { >> - return scnprintf(page, PAGE_SIZE, "%u\n", id->tbem); >> + return scnprintf(page, PAGE_SIZE, "%u\n", geo->tbem); >> } else { >> - return scnprintf(page, >> - PAGE_SIZE, >> - "Unhandled attr(%s) in = `nvm_dev_attr_show_20`\n", >> - attr->name); >> + return scnprintf(page, PAGE_SIZE, >> + "Unhandled attr(%s) in = `nvm_dev_attr_show_20`\n", >> + attr->name); >> } >> } >> @@ -1106,10 +1163,13 @@ static const struct attribute_group = nvm_dev_attr_group_20 =3D { >> int nvme_nvm_register_sysfs(struct nvme_ns *ns) >> { >> - if (!ns->ndev) >> + struct nvm_dev *ndev =3D ns->ndev; >> + struct nvm_geo *geo =3D &ndev->geo; >> + >> + if (!ndev) >> return -EINVAL; >> - switch (ns->ndev->identity.ver_id) { >> + switch (geo->ver_id) { >> case 1: >> return sysfs_create_group(&disk_to_dev(ns->disk)->kobj, >> &nvm_dev_attr_group_12); >> @@ -1123,7 +1183,10 @@ int nvme_nvm_register_sysfs(struct nvme_ns = *ns) >> void nvme_nvm_unregister_sysfs(struct nvme_ns *ns) >> { >> - switch (ns->ndev->identity.ver_id) { >> + struct nvm_dev *ndev =3D ns->ndev; >> + struct nvm_geo *geo =3D &ndev->geo; >> + >> + switch (geo->ver_id) { >> case 1: >> sysfs_remove_group(&disk_to_dev(ns->disk)->kobj, >> &nvm_dev_attr_group_12); >> diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h >> index e55b10573c99..16255fcd5250 100644 >> --- a/include/linux/lightnvm.h >> +++ b/include/linux/lightnvm.h >> @@ -50,7 +50,7 @@ struct nvm_id; >> struct nvm_dev; >> struct nvm_tgt_dev; >> -typedef int (nvm_id_fn)(struct nvm_dev *, struct nvm_id *); >> +typedef int (nvm_id_fn)(struct nvm_dev *); >> 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 ppa_addr *, = int, int); >> typedef int (nvm_submit_io_fn)(struct nvm_dev *, struct nvm_rq *); >> @@ -152,62 +152,48 @@ struct nvm_id_lp_tbl { >> struct nvm_id_lp_mlc mlc; >> }; >> -struct nvm_addr_format { >> - u8 ch_offset; >> +struct nvm_addr_format_12 { >=20 > I can see in a couple of places a statement has to be over two lines = due > to the length of writing out nvm_addr_format_12, would it make sense = to > shorthand it to nvm_addrf_12? Good idea. >=20 >> u8 ch_len; >> - u8 lun_offset; >> u8 lun_len; >> - u8 pln_offset; >> + u8 blk_len; >> + u8 pg_len; >> u8 pln_len; >> + u8 sect_len; >> + >> + u8 ch_offset; >> + u8 lun_offset; >> u8 blk_offset; >> - u8 blk_len; >> u8 pg_offset; >> - u8 pg_len; >> + u8 pln_offset; >> u8 sect_offset; >> - u8 sect_len; >> -}; >> - >> -struct nvm_id { >> - u8 ver_id; >> - u8 vmnt; >> - u32 cap; >> - u32 dom; >> - >> - struct nvm_addr_format ppaf; >> - >> - u8 num_ch; >> - u8 num_lun; >> - u16 num_chk; >> - u16 clba; >> - u16 csecs; >> - u16 sos; >> - >> - u32 ws_min; >> - u32 ws_opt; >> - u32 mw_cunits; >> - u32 trdt; >> - u32 trdm; >> - u32 tprt; >> - u32 tprm; >> - u32 tbet; >> - u32 tbem; >> - u32 mpos; >> - u32 mccap; >> - u16 cpar; >> - >> - /* calculated values */ >> - u16 ws_seq; >> - u16 ws_per_chk; >> - >> - /* 1.2 compatibility */ >> - u8 mtype; >> - u8 fmtype; >> + u64 ch_mask; >> + u64 lun_mask; >> + u64 blk_mask; >> + u64 pg_mask; >> + u64 pln_mask; >> + u64 sec_mask; >> +}; >> - u8 num_pln; >> - u16 num_pg; >> - u16 fpg_sz; >> -} __packed; >> +struct nvm_addr_format { >> + u8 ch_len; >> + u8 lun_len; >> + u8 chk_len; >> + u8 sec_len; >> + u8 rsv_len[2]; >> + >> + u8 ch_offset; >> + u8 lun_offset; >> + u8 chk_offset; >> + u8 sec_offset; >> + u8 rsv_off[2]; >> + >> + u64 ch_mask; >> + u64 lun_mask; >> + u64 chk_mask; >> + u64 sec_mask; >> + u64 rsv_mask[2]; >> +}; >> struct nvm_target { >> struct list_head list; >> @@ -274,36 +260,63 @@ enum { >> NVM_BLK_ST_BAD =3D 0x8, /* Bad block */ >> }; >> - >> -/* Device generic information */ >> +/* Instance geometry */ >> struct nvm_geo { >> - /* generic geometry */ >> + /* device reported version */ >> + u8 ver_id; >> + >> + /* instance specific geometry */ >> int nr_chnls; >> - int all_luns; /* across channels */ >> - int nr_luns; /* per channel */ >> - int nr_chks; /* per lun */ >> + int nr_luns; /* per channel */ >> - int sec_size; >> - int oob_size; >> - int mccap; >> + /* calculated values */ >> + int all_luns; /* across channels */ >> + int all_chunks; /* across channels */ >> - int sec_per_chk; >> - int sec_per_lun; >> + int op; /* over-provision in instance */ >> - int ws_min; >> - int ws_opt; >> - int ws_seq; >> - int ws_per_chk; >> + sector_t total_secs; /* across channels */ >> - int op; >> + /* chunk geometry */ >> + u32 nr_chks; /* chunks per lun */ >> + u32 clba; /* sectors per chunk */ >> + u16 csecs; /* sector size */ >> + u16 sos; /* out-of-band area size */ >> - struct nvm_addr_format ppaf; >> + /* device write constrains */ >> + u32 ws_min; /* minimum write size */ >> + u32 ws_opt; /* optimal write size */ >> + u32 mw_cunits; /* distance required for successful read = */ >> - /* Legacy 1.2 specific geometry */ >> - int plane_mode; /* drive device in single, double or quad mode = */ >> - int nr_planes; >> - int sec_per_pg; /* only sectors for a single page */ >> - int sec_per_pl; /* all sectors across planes */ >> + /* device capabilities */ >> + u32 mccap; >> + >> + /* device timings */ >> + u32 trdt; /* Avg. Tread (ns) */ >> + u32 trdm; /* Max Tread (ns) */ >> + u32 tprt; /* Avg. Tprog (ns) */ >> + u32 tprm; /* Max Tprog (ns) */ >> + u32 tbet; /* Avg. Terase (ns) */ >> + u32 tbem; /* Max Terase (ns) */ >> + >> + /* generic address format */ >> + struct nvm_addr_format addrf; >> + >> + /* 1.2 compatibility */ >> + u8 vmnt; >> + u32 cap; >> + u32 dom; >> + >> + u8 mtype; >> + u8 fmtype; >> + >> + u16 cpar; >> + u32 mpos; >> + >> + u8 num_pln; >> + u8 plane_mode; >> + u16 num_pg; >> + u16 fpg_sz; >> }; >> /* sub-device structure */ >> @@ -314,9 +327,6 @@ struct nvm_tgt_dev { >> /* Base ppas for target LUNs */ >> struct ppa_addr *luns; >> - sector_t total_secs; >> - >> - struct nvm_id identity; >> struct request_queue *q; >> struct nvm_dev *parent; >> @@ -331,13 +341,9 @@ struct nvm_dev { >> /* Device information */ >> struct nvm_geo geo; >> - unsigned long total_secs; >> - >> unsigned long *lun_map; >> void *dma_pool; >> - struct nvm_id identity; >> - >> /* Backend device */ >> struct request_queue *q; >> char name[DISK_NAME_LEN]; >> @@ -357,14 +363,16 @@ static inline struct ppa_addr = generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev, >> struct ppa_addr r) >> { >> struct nvm_geo *geo =3D &tgt_dev->geo; >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&geo->addrf; >> struct ppa_addr l; >> - l.ppa =3D ((u64)r.g.blk) << geo->ppaf.blk_offset; >> - l.ppa |=3D ((u64)r.g.pg) << geo->ppaf.pg_offset; >> - l.ppa |=3D ((u64)r.g.sec) << geo->ppaf.sect_offset; >> - l.ppa |=3D ((u64)r.g.pl) << geo->ppaf.pln_offset; >> - l.ppa |=3D ((u64)r.g.lun) << geo->ppaf.lun_offset; >> - l.ppa |=3D ((u64)r.g.ch) << geo->ppaf.ch_offset; >> + l.ppa =3D ((u64)r.g.ch) << ppaf->ch_offset; >> + l.ppa |=3D ((u64)r.g.lun) << ppaf->lun_offset; >> + l.ppa |=3D ((u64)r.g.blk) << ppaf->blk_offset; >> + l.ppa |=3D ((u64)r.g.pg) << ppaf->pg_offset; >> + l.ppa |=3D ((u64)r.g.pl) << ppaf->pln_offset; >> + l.ppa |=3D ((u64)r.g.sec) << ppaf->sect_offset; >> return l; >> } >> @@ -373,24 +381,18 @@ static inline struct ppa_addr = dev_to_generic_addr(struct nvm_tgt_dev *tgt_dev, >> struct ppa_addr r) >> { >> struct nvm_geo *geo =3D &tgt_dev->geo; >> + struct nvm_addr_format_12 *ppaf =3D >> + (struct nvm_addr_format_12 = *)&geo->addrf; >> struct ppa_addr l; >> l.ppa =3D 0; >> - /* >> - * (r.ppa << X offset) & X len bitmask. X eq. blk, pg, etc. >> - */ >> - l.g.blk =3D (r.ppa >> geo->ppaf.blk_offset) & >> - (((1 << geo->ppaf.blk_len) - = 1)); >> - l.g.pg |=3D (r.ppa >> geo->ppaf.pg_offset) & >> - (((1 << geo->ppaf.pg_len) - 1)); >> - l.g.sec |=3D (r.ppa >> geo->ppaf.sect_offset) & >> - (((1 << geo->ppaf.sect_len) - = 1)); >> - l.g.pl |=3D (r.ppa >> geo->ppaf.pln_offset) & >> - (((1 << geo->ppaf.pln_len) - = 1)); >> - l.g.lun |=3D (r.ppa >> geo->ppaf.lun_offset) & >> - (((1 << geo->ppaf.lun_len) - = 1)); >> - l.g.ch |=3D (r.ppa >> geo->ppaf.ch_offset) & >> - (((1 << geo->ppaf.ch_len) - 1)); >> + >> + l.g.ch =3D (r.ppa & ppaf->ch_mask) >> ppaf->ch_offset; >> + l.g.lun =3D (r.ppa & ppaf->lun_mask) >> ppaf->lun_offset; >> + l.g.blk =3D (r.ppa & ppaf->blk_mask) >> ppaf->blk_offset; >> + l.g.pg =3D (r.ppa & ppaf->pg_mask) >> ppaf->pg_offset; >> + l.g.pl =3D (r.ppa & ppaf->pln_mask) >> ppaf->pln_offset; >> + l.g.sec =3D (r.ppa & ppaf->sec_mask) >> ppaf->sect_offset; >> return l; >> } >=20 > Looks good to me, --Apple-Mail=_C7589530-9E61-4A8D-9974-52E5F7BA9CAE Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEm1mT7zen+vs9+T8kYx8FO3WZGMoFAlqZMmcACgkQYx8FO3WZ GMroxw//Tiz5uhmole684+31PVBmhpi/o3SdkoErdW+3OmtHkbhQhcyOFfpgb0cl XPfEPyhDTPC+x9d3W+aP4WSiumYqzU+jgpnSazvIKrJ6iod9REwC5Ymxssrwpx2C 2w9aVnEcppTFknh2gYtkRkwjQyBGWCYmigLB1h5G+iRDApCXeTvXIlhFDmxw+wRm EnSfrDqD+PgjTXVcj8wL7/W4w/SoxCkcVp7CVVmmcO+OApX7CQ+EmIFXqnXPC6cr G6YGbWFBld2CDZXK1TIatNgPPKdZuIKp3vtEQAcNiAJ+MccW67BAS9j4MY7AOIDF tAVvszs63dyCG8j+pX26rO25Dq7gqxO5Il4V0dCX3xw7gltEY+6SPiSAWRne19R4 vuO3QKlQECKxAio8XPYt/QQeyOGHKH5Pd/1hz0bY92q1B6/ZB99sqDXtE28u6UaX VbKhsTFSMLR9mujk+7eVblbs9kvsJR0+lBheAHBZ4yQZjO2xOv/H0lEdL9yDUevC Fi6reAGj7jwZ5SL+0B+m1SxHiwKKMKfGgnlFcVribHUT5OblE/H1qMJS2jf53WyF FUuMV0LqRyoiQXLQfrH5uThLbQJ6RZS8MrV2rHd/7+uZBh8YnFtuqnbr+vCDqJRo K8oXW1gUBh1KvES4bbVUgNrf0SXspcczNZqyB88Ly0KPrYYVIbU= =APl6 -----END PGP SIGNATURE----- --Apple-Mail=_C7589530-9E61-4A8D-9974-52E5F7BA9CAE--