[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC 1/5] block/nvme: use some NVME_CAP_* macros
From: |
Eric Auger |
Subject: |
[RFC 1/5] block/nvme: use some NVME_CAP_* macros |
Date: |
Thu, 15 Oct 2020 13:52:48 +0200 |
let's use NVME_CAP_DSTRD, NVME_CAP_MPSMIN and NVME_CAP_TO macros
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
block/nvme.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index f4f27b6da7..e3d96f20d0 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -728,10 +728,10 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
goto out;
}
- s->page_size = MAX(4096, 1 << (12 + ((cap >> 48) & 0xF)));
- s->doorbell_scale = (4 << (((cap >> 32) & 0xF))) / sizeof(uint32_t);
+ s->page_size = MAX(4096, 1 << (12 + NVME_CAP_MPSMIN(cap)));
+ s->doorbell_scale = (4 << ((NVME_CAP_DSTRD(cap)))) / sizeof(uint32_t);
bs->bl.opt_mem_alignment = s->page_size;
- timeout_ms = MIN(500 * ((cap >> 24) & 0xFF), 30000);
+ timeout_ms = MIN(500 * NVME_CAP_TO(cap), 30000);
/* Reset device to get a clean state. */
s->regs->ctrl.cc = cpu_to_le32(le32_to_cpu(s->regs->ctrl.cc) & 0xFE);
--
2.21.3
[RFC 2/5] block/nvme: Change size and alignment of IDENTIFY response buffer, Eric Auger, 2020/10/15
[RFC 3/5] block/nvme: Change size and alignment of queue, Eric Auger, 2020/10/15
[RFC 4/5] block/nvme: Change size and alignment of prp_list_pages, Eric Auger, 2020/10/15
[RFC 5/5] block/nvme: Align iov's va and size on host page size, Eric Auger, 2020/10/15