[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/33] block/nvme: Use definitions instead of magic values in add_
From: |
Stefan Hajnoczi |
Subject: |
[PULL 15/33] block/nvme: Use definitions instead of magic values in add_io_queue() |
Date: |
Wed, 4 Nov 2020 15:18:10 +0000 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Replace magic values by definitions, and simplifiy since the
number of queues will never reach 64K.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201029093306.1063879-14-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
---
block/nvme.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 6eaba4e703..7285bd2e27 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -652,6 +652,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
NvmeCmd cmd;
unsigned queue_size = NVME_QUEUE_SIZE;
+ assert(n <= UINT16_MAX);
q = nvme_create_queue_pair(s, bdrv_get_aio_context(bs),
n, queue_size, errp);
if (!q) {
@@ -660,8 +661,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
cmd = (NvmeCmd) {
.opcode = NVME_ADM_CMD_CREATE_CQ,
.dptr.prp1 = cpu_to_le64(q->cq.iova),
- .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)),
- .cdw11 = cpu_to_le32(0x3),
+ .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n),
+ .cdw11 = cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC),
};
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) {
error_setg(errp, "Failed to create CQ io queue [%u]", n);
@@ -670,8 +671,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error
**errp)
cmd = (NvmeCmd) {
.opcode = NVME_ADM_CMD_CREATE_SQ,
.dptr.prp1 = cpu_to_le64(q->sq.iova),
- .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | (n & 0xFFFF)),
- .cdw11 = cpu_to_le32(0x1 | (n << 16)),
+ .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n),
+ .cdw11 = cpu_to_le32(NVME_SQ_PC | (n << 16)),
};
if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) {
error_setg(errp, "Failed to create SQ io queue [%u]", n);
--
2.28.0
- [PULL 05/33] block/nvme: Report warning with warn_report(), (continued)
- [PULL 05/33] block/nvme: Report warning with warn_report(), Stefan Hajnoczi, 2020/11/04
- [PULL 06/33] block/nvme: Trace controller capabilities, Stefan Hajnoczi, 2020/11/04
- [PULL 07/33] block/nvme: Trace nvme_poll_queue() per queue, Stefan Hajnoczi, 2020/11/04
- [PULL 08/33] block/nvme: Improve nvme_free_req_queue_wait() trace information, Stefan Hajnoczi, 2020/11/04
- [PULL 09/33] block/nvme: Trace queue pair creation/deletion, Stefan Hajnoczi, 2020/11/04
- [PULL 10/33] block/nvme: Move definitions before structure declarations, Stefan Hajnoczi, 2020/11/04
- [PULL 11/33] block/nvme: Use unsigned integer for queue counter/size, Stefan Hajnoczi, 2020/11/04
- [PULL 12/33] block/nvme: Make nvme_identify() return boolean indicating error, Stefan Hajnoczi, 2020/11/04
- [PULL 13/33] block/nvme: Make nvme_init_queue() return boolean indicating error, Stefan Hajnoczi, 2020/11/04
- [PULL 14/33] block/nvme: Introduce Completion Queue definitions, Stefan Hajnoczi, 2020/11/04
- [PULL 15/33] block/nvme: Use definitions instead of magic values in add_io_queue(),
Stefan Hajnoczi <=
- [PULL 16/33] block/nvme: Correctly initialize Admin Queue Attributes, Stefan Hajnoczi, 2020/11/04
- [PULL 17/33] block/nvme: Simplify ADMIN queue access, Stefan Hajnoczi, 2020/11/04
- [PULL 18/33] block/nvme: Simplify nvme_cmd_sync(), Stefan Hajnoczi, 2020/11/04
- [PULL 19/33] block/nvme: Set request_alignment at initialization, Stefan Hajnoczi, 2020/11/04
- [PULL 20/33] block/nvme: Correct minimum device page size, Stefan Hajnoczi, 2020/11/04
- [PULL 22/33] block/nvme: Change size and alignment of queue, Stefan Hajnoczi, 2020/11/04
- [PULL 21/33] block/nvme: Change size and alignment of IDENTIFY response buffer, Stefan Hajnoczi, 2020/11/04
- [PULL 23/33] block/nvme: Change size and alignment of prp_list_pages, Stefan Hajnoczi, 2020/11/04
- [PULL 24/33] block/nvme: Align iov's va and size on host page size, Stefan Hajnoczi, 2020/11/04
- [PULL 26/33] block/nvme: Fix nvme_submit_command() on big-endian host, Stefan Hajnoczi, 2020/11/04