From: Dmitry Fomichev <dmitry.fomichev@wdc.com>
To: "Keith Busch" <kbusch@kernel.org>,
"Klaus Jensen" <k.jensen@samsung.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Maxim Levitsky" <mlevitsky@redhat.com>,
"Fam Zheng" <fam@euphon.net>
Cc: Niklas Cassel <niklas.cassel@wdc.com>,
Damien Le Moal <damien.lemoal@wdc.com>,
qemu-block@nongnu.org, Dmitry Fomichev <dmitry.fomichev@wdc.com>,
qemu-devel@nongnu.org,
Alistair Francis <alistair.francis@wdc.com>,
Matias Bjorling <matias.bjorling@wdc.com>
Subject: [PATCH v2 02/15] hw/block/nvme: Report actual LBA data shift in LBAF
Date: Sun, 13 Sep 2020 07:54:17 +0900 [thread overview]
Message-ID: <20200912225430.1772-3-dmitry.fomichev@wdc.com> (raw)
In-Reply-To: <20200912225430.1772-1-dmitry.fomichev@wdc.com>
Calculate the data shift value to report based on the set value of
logical_block_size device property.
In the process, use a local variable to calculate the LBA format
index instead of the hardcoded value 0. This makes the code more
readable and it will make it easier to add support for multiple LBA
formats in the future.
Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---
hw/block/nvme.c | 4 +++-
hw/block/nvme.h | 11 +++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 3a90d80694..1cfc136042 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -2203,6 +2203,7 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
{
int64_t bs_size;
NvmeIdNs *id_ns = &ns->id_ns;
+ int lba_index;
bs_size = blk_getlength(n->conf.blk);
if (bs_size < 0) {
@@ -2212,7 +2213,8 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
n->ns_size = bs_size;
- id_ns->lbaf[0].ds = BDRV_SECTOR_BITS;
+ lba_index = NVME_ID_NS_FLBAS_INDEX(ns->id_ns.flbas);
+ id_ns->lbaf[lba_index].ds = nvme_ilog2(n->conf.logical_block_size);
id_ns->nsze = cpu_to_le64(nvme_ns_nlbas(n, ns));
/* no thin provisioning */
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 52ba794f2e..190c974b6c 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -137,4 +137,15 @@ static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, NvmeNamespace *ns)
return n->ns_size >> nvme_ns_lbads(ns);
}
+static inline int nvme_ilog2(uint64_t i)
+{
+ int log = -1;
+
+ while (i) {
+ i >>= 1;
+ log++;
+ }
+ return log;
+}
+
#endif /* HW_NVME_H */
--
2.21.0
next prev parent reply other threads:[~2020-09-12 23:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-12 22:54 [PATCH v2 00/15] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 01/15] hw/block/nvme: Define 64 bit cqe.result Dmitry Fomichev
2020-09-12 22:54 ` Dmitry Fomichev [this message]
2020-09-12 22:54 ` [PATCH v2 03/15] hw/block/nvme: Add Commands Supported and Effects log Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 04/15] hw/block/nvme: Introduce the Namespace Types definitions Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 05/15] hw/block/nvme: Define trace events related to NS Types Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 06/15] hw/block/nvme: Add support for Namespace Types Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 07/15] hw/block/nvme: Add support for active/inactive namespaces Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 08/15] hw/block/nvme: Make Zoned NS Command Set definitions Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 09/15] hw/block/nvme: Define Zoned NS Command Set trace events Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 10/15] hw/block/nvme: Support Zoned Namespace Command Set Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 11/15] hw/block/nvme: Introduce max active and open zone limits Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 12/15] hw/block/nvme: Support Zone Descriptor Extensions Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 13/15] hw/block/nvme: Add injection of Offline/Read-Only zones Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 14/15] hw/block/nvme: Use zone metadata file for persistence Dmitry Fomichev
2020-09-12 22:54 ` [PATCH v2 15/15] hw/block/nvme: Document zoned parameters in usage text Dmitry Fomichev
2020-09-12 23:12 ` [PATCH v2 00/15] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set no-reply
2020-09-15 7:43 ` Klaus Jensen
2020-09-15 18:55 ` Dmitry Fomichev
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=20200912225430.1772-3-dmitry.fomichev@wdc.com \
--to=dmitry.fomichev@wdc.com \
--cc=alistair.francis@wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=fam@euphon.net \
--cc=k.jensen@samsung.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=matias.bjorling@wdc.com \
--cc=mlevitsky@redhat.com \
--cc=niklas.cassel@wdc.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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).