[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.2 v2 18/25] block/nvme: Correct minimum device page size
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH-for-5.2 v2 18/25] block/nvme: Correct minimum device page size |
|
Date: |
Thu, 29 Oct 2020 10:32:59 +0100 |
While trying to simplify the code using a macro, we forgot
the 12-bit shift... Correct that.
Fixes: fad1eb68862 ("block/nvme: Use register definitions from 'block/nvme.h'")
Reported-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/nvme.c b/block/nvme.c
index bb75448a09f..bd3860ac4ef 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -755,7 +755,7 @@ static int nvme_init(BlockDriverState *bs, const char
*device, int namespace,
goto out;
}
- s->page_size = MAX(4096, 1 << NVME_CAP_MPSMIN(cap));
+ s->page_size = 1u << (12 + NVME_CAP_MPSMIN(cap));
s->doorbell_scale = (4 << NVME_CAP_DSTRD(cap)) / sizeof(uint32_t);
bs->bl.opt_mem_alignment = s->page_size;
bs->bl.request_alignment = s->page_size;
--
2.26.2
- [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions, (continued)
- [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 13/25] block/nvme: Use definitions instead of magic values in add_io_queue(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 14/25] block/nvme: Correctly initialize Admin Queue Attributes, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 15/25] block/nvme: Simplify ADMIN queue access, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 16/25] block/nvme: Simplify nvme_cmd_sync(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 17/25] block/nvme: Set request_alignment at initialization, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 19/25] block/nvme: Change size and alignment of IDENTIFY response buffer, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 18/25] block/nvme: Correct minimum device page size,
Philippe Mathieu-Daudé <=
- [PATCH-for-5.2 v2 20/25] block/nvme: Change size and alignment of queue, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 21/25] block/nvme: Change size and alignment of prp_list_pages, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 22/25] block/nvme: Align iov's va and size on host page size, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 23/25] block/nvme: Fix use of write-only doorbells page on Aarch64 arch, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 24/25] block/nvme: Fix nvme_submit_command() on big-endian host, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-6.0 v2 25/25] block/nvme: Simplify Completion Queue Command Identifier field use, Philippe Mathieu-Daudé, 2020/10/29