[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/15] hw/block/nvme: Report actual LBA data shift in LBAF
From: |
Dmitry Fomichev |
Subject: |
[PATCH v2 02/15] hw/block/nvme: Report actual LBA data shift in LBAF |
Date: |
Sun, 13 Sep 2020 07:54:17 +0900 |
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
- [PATCH v2 00/15] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set, Dmitry Fomichev, 2020/09/12
- [PATCH v2 01/15] hw/block/nvme: Define 64 bit cqe.result, Dmitry Fomichev, 2020/09/12
- [PATCH v2 02/15] hw/block/nvme: Report actual LBA data shift in LBAF,
Dmitry Fomichev <=
- [PATCH v2 03/15] hw/block/nvme: Add Commands Supported and Effects log, Dmitry Fomichev, 2020/09/12
- [PATCH v2 04/15] hw/block/nvme: Introduce the Namespace Types definitions, Dmitry Fomichev, 2020/09/12
- [PATCH v2 05/15] hw/block/nvme: Define trace events related to NS Types, Dmitry Fomichev, 2020/09/12
- [PATCH v2 06/15] hw/block/nvme: Add support for Namespace Types, Dmitry Fomichev, 2020/09/12
- [PATCH v2 07/15] hw/block/nvme: Add support for active/inactive namespaces, Dmitry Fomichev, 2020/09/12
- [PATCH v2 08/15] hw/block/nvme: Make Zoned NS Command Set definitions, Dmitry Fomichev, 2020/09/12
- [PATCH v2 09/15] hw/block/nvme: Define Zoned NS Command Set trace events, Dmitry Fomichev, 2020/09/12
- [PATCH v2 10/15] hw/block/nvme: Support Zoned Namespace Command Set, Dmitry Fomichev, 2020/09/12
- [PATCH v2 11/15] hw/block/nvme: Introduce max active and open zone limits, Dmitry Fomichev, 2020/09/12
- [PATCH v2 12/15] hw/block/nvme: Support Zone Descriptor Extensions, Dmitry Fomichev, 2020/09/12