From: "Matias Bjørling" <mb@lightnvm.io>
To: "Javier González" <jg@lightnvm.io>
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nvme@lists.infradead.org,
"Javier González" <javier@cnexlabs.com>
Subject: Re: [PATCH 12/15] lightnvn: pblk: use generic address format
Date: Thu, 1 Mar 2018 11:41:45 +0100 [thread overview]
Message-ID: <f1468f08-9412-0243-440a-b79615814b1e@lightnvm.io> (raw)
In-Reply-To: <1519832975-25432-13-git-send-email-javier@cnexlabs.com>
On 02/28/2018 04:49 PM, Javier González wrote:
> Use the generic address format on common address manipulations.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
> drivers/lightnvm/pblk-core.c | 10 +++++-----
> drivers/lightnvm/pblk-map.c | 4 ++--
> drivers/lightnvm/pblk-sysfs.c | 4 ++--
> drivers/lightnvm/pblk.h | 4 ++--
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
> index 7d0bd33f11d9..2e10b18b61e3 100644
> --- a/drivers/lightnvm/pblk-core.c
> +++ b/drivers/lightnvm/pblk-core.c
> @@ -885,7 +885,7 @@ int pblk_line_erase(struct pblk *pblk, struct pblk_line *line)
> }
>
> ppa = pblk->luns[bit].bppa; /* set ch and lun */
> - ppa.g.blk = line->id;
> + ppa.a.blk = line->id;
>
> atomic_dec(&line->left_eblks);
> WARN_ON(test_and_set_bit(bit, line->erase_bitmap));
> @@ -1686,8 +1686,8 @@ static void __pblk_down_page(struct pblk *pblk, struct ppa_addr *ppa_list,
> int i;
>
> for (i = 1; i < nr_ppas; i++)
> - WARN_ON(ppa_list[0].g.lun != ppa_list[i].g.lun ||
> - ppa_list[0].g.ch != ppa_list[i].g.ch);
> + WARN_ON(ppa_list[0].a.lun != ppa_list[i].a.lun ||
> + ppa_list[0].a.ch != ppa_list[i].a.ch);
> #endif
>
> ret = down_timeout(&rlun->wr_sem, msecs_to_jiffies(30000));
> @@ -1731,8 +1731,8 @@ void pblk_up_page(struct pblk *pblk, struct ppa_addr *ppa_list, int nr_ppas)
> int i;
>
> for (i = 1; i < nr_ppas; i++)
> - WARN_ON(ppa_list[0].g.lun != ppa_list[i].g.lun ||
> - ppa_list[0].g.ch != ppa_list[i].g.ch);
> + WARN_ON(ppa_list[0].a.lun != ppa_list[i].a.lun ||
> + ppa_list[0].a.ch != ppa_list[i].a.ch);
> #endif
>
> rlun = &pblk->luns[pos];
> diff --git a/drivers/lightnvm/pblk-map.c b/drivers/lightnvm/pblk-map.c
> index 04e08d76ea5f..20dbaa89c9df 100644
> --- a/drivers/lightnvm/pblk-map.c
> +++ b/drivers/lightnvm/pblk-map.c
> @@ -127,7 +127,7 @@ void pblk_map_erase_rq(struct pblk *pblk, struct nvm_rq *rqd,
> atomic_dec(&e_line->left_eblks);
>
> *erase_ppa = rqd->ppa_list[i];
> - erase_ppa->g.blk = e_line->id;
> + erase_ppa->a.blk = e_line->id;
>
> spin_unlock(&e_line->lock);
>
> @@ -168,6 +168,6 @@ void pblk_map_erase_rq(struct pblk *pblk, struct nvm_rq *rqd,
> set_bit(bit, e_line->erase_bitmap);
> atomic_dec(&e_line->left_eblks);
> *erase_ppa = pblk->luns[bit].bppa; /* set ch and lun */
> - erase_ppa->g.blk = e_line->id;
> + erase_ppa->a.blk = e_line->id;
> }
> }
> diff --git a/drivers/lightnvm/pblk-sysfs.c b/drivers/lightnvm/pblk-sysfs.c
> index cbb5b6edb7bf..a643dc623731 100644
> --- a/drivers/lightnvm/pblk-sysfs.c
> +++ b/drivers/lightnvm/pblk-sysfs.c
> @@ -39,8 +39,8 @@ static ssize_t pblk_sysfs_luns_show(struct pblk *pblk, char *page)
> sz += snprintf(page + sz, PAGE_SIZE - sz,
> "pblk: pos:%d, ch:%d, lun:%d - %d\n",
> i,
> - rlun->bppa.g.ch,
> - rlun->bppa.g.lun,
> + rlun->bppa.a.ch,
> + rlun->bppa.a.lun,
> active);
> }
>
> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
> index dd0089fe62b9..6ac64d9eb57e 100644
> --- a/drivers/lightnvm/pblk.h
> +++ b/drivers/lightnvm/pblk.h
> @@ -936,12 +936,12 @@ static inline int pblk_pad_distance(struct pblk *pblk)
>
> static inline int pblk_ppa_to_line(struct ppa_addr p)
> {
> - return p.g.blk;
> + return p.a.blk;
> }
>
> static inline int pblk_ppa_to_pos(struct nvm_geo *geo, struct ppa_addr p)
> {
> - return p.g.lun * geo->num_ch + p.g.ch;
> + return p.a.lun * geo->num_ch + p.a.ch;
> }
>
> static inline struct ppa_addr addr_to_gen_ppa(struct pblk *pblk, u64 paddr,
>
Would it make sense to merge this with 7/15?
next prev parent reply other threads:[~2018-03-01 10:41 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-28 15:49 [PATCH V4 00/15] lightnvm: pblk: implement 2.0 support Javier González
2018-02-28 15:49 ` [PATCH 01/15] lightnvm: simplify geometry structure Javier González
2018-03-01 10:22 ` Matias Bjørling
2018-03-02 11:15 ` Javier González
2018-02-28 15:49 ` [PATCH 02/15] lightnvm: add controller capabilities to 2.0 Javier González
2018-03-01 10:33 ` Matias Bjørling
2018-03-02 11:59 ` Javier González
2018-02-28 15:49 ` [PATCH 03/15] lightnvm: add minor version to generic geometry Javier González
2018-02-28 15:49 ` [PATCH 04/15] lightnvm: add shorten OCSSD version in geo Javier González
2018-02-28 15:49 ` [PATCH 05/15] lightnvm: complete geo structure with maxoc* Javier González
2018-02-28 15:49 ` [PATCH 06/15] lightnvm: normalize geometry nomenclature Javier González
2018-02-28 15:49 ` [PATCH 07/15] lightnvm: add support for 2.0 address format Javier González
2018-02-28 15:49 ` [PATCH 08/15] lightnvm: make address conversions depend on generic device Javier González
2018-02-28 15:49 ` [PATCH 09/15] lightnvm: implement get log report chunk helpers Javier González
2018-03-01 10:40 ` Matias Bjørling
2018-03-01 11:02 ` Javier Gonzalez
2018-03-01 11:51 ` Matias Bjørling
2018-03-01 11:54 ` Javier Gonzalez
2018-02-28 15:49 ` [PATCH 10/15] lightnvm: pblk: check for supported version Javier González
2018-02-28 15:49 ` [PATCH 11/15] lightnvm: pblk: rename ppaf* to addrf* Javier González
2018-02-28 15:49 ` [PATCH 12/15] lightnvn: pblk: use generic address format Javier González
2018-03-01 10:41 ` Matias Bjørling [this message]
2018-03-01 11:05 ` Javier González
2018-02-28 15:49 ` [PATCH 13/15] lightnvm: pblk: implement get log report chunk Javier González
2018-03-01 10:45 ` Matias Bjørling
2018-02-28 15:49 ` [PATCH 14/15] lightnvm: pblk: refactor init/exit sequences Javier González
2018-02-28 15:49 ` [PATCH 15/15] lightnvm: pblk: implement 2.0 support Javier González
2018-03-01 10:48 ` Matias Bjørling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f1468f08-9412-0243-440a-b79615814b1e@lightnvm.io \
--to=mb@lightnvm.io \
--cc=javier@cnexlabs.com \
--cc=jg@lightnvm.io \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).