[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] block/nvme: Pair doorbell registers
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/3] block/nvme: Pair doorbell registers |
Date: |
Fri, 4 Sep 2020 14:41:30 +0200 |
For each queue doorbell registers are paired as:
- Submission Queue Tail Doorbell
- Completion Queue Head Doorbell
Reflect that in the NVMeRegs structure, and adapt
nvme_create_queue_pair() accordingly.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index a216cc407f6..f4f27b6da7d 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -84,7 +84,10 @@ typedef struct {
/* Memory mapped registers */
typedef volatile struct {
NvmeBar ctrl;
- uint32_t doorbells[];
+ struct {
+ uint32_t sq_tail;
+ uint32_t cq_head;
+ } doorbells[];
} NVMeRegs;
#define INDEX_ADMIN 0
@@ -244,14 +247,14 @@ static NVMeQueuePair
*nvme_create_queue_pair(BDRVNVMeState *s,
error_propagate(errp, local_err);
goto fail;
}
- q->sq.doorbell = &s->regs->doorbells[idx * 2 * s->doorbell_scale];
+ q->sq.doorbell = &s->regs->doorbells[idx * s->doorbell_scale].sq_tail;
nvme_init_queue(s, &q->cq, size, NVME_CQ_ENTRY_BYTES, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto fail;
}
- q->cq.doorbell = &s->regs->doorbells[(idx * 2 + 1) * s->doorbell_scale];
+ q->cq.doorbell = &s->regs->doorbells[idx * s->doorbell_scale].cq_head;
return q;
fail:
--
2.26.2
- [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Philippe Mathieu-Daudé, 2020/09/04
- [PATCH 1/3] block/nvme: Group controller registers in NVMeRegs structure, Philippe Mathieu-Daudé, 2020/09/04
- [PATCH 2/3] block/nvme: Use generic NvmeBar structure, Philippe Mathieu-Daudé, 2020/09/04
- [PATCH 3/3] block/nvme: Pair doorbell registers,
Philippe Mathieu-Daudé <=
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Fam Zheng, 2020/09/04
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Klaus Jensen, 2020/09/04
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Kevin Wolf, 2020/09/07