[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] hw/nvme: fix missing cq eventidx update
From: |
Klaus Jensen |
Subject: |
[PULL 4/6] hw/nvme: fix missing cq eventidx update |
Date: |
Wed, 11 Jan 2023 08:52:11 +0100 |
From: Klaus Jensen <k.jensen@samsung.com>
Prior to reading the shadow doorbell cq head, we have to update the
eventidx. Otherwise, we risk that the driver will skip an mmio doorbell
write. This happens on riscv64, as reported by Guenter.
Adding the missing update to the cq eventidx fixes the issue.
Fixes: 3f7fe8de3d49 ("hw/nvme: Implement shadow doorbell buffer support")
Cc: qemu-stable@nongnu.org
Cc: qemu-riscv@nongnu.org
Reported-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/ctrl.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 28e02ec7baa6..226480033771 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -1334,6 +1334,15 @@ static inline void nvme_blk_write(BlockBackend *blk,
int64_t offset,
}
}
+static void nvme_update_cq_eventidx(const NvmeCQueue *cq)
+{
+ uint32_t v = cpu_to_le32(cq->head);
+
+ trace_pci_nvme_update_cq_eventidx(cq->cqid, cq->head);
+
+ pci_dma_write(PCI_DEVICE(cq->ctrl), cq->ei_addr, &v, sizeof(v));
+}
+
static void nvme_update_cq_head(NvmeCQueue *cq)
{
uint32_t v;
@@ -1358,6 +1367,7 @@ static void nvme_post_cqes(void *opaque)
hwaddr addr;
if (n->dbbuf_enabled) {
+ nvme_update_cq_eventidx(cq);
nvme_update_cq_head(cq);
}
--
2.39.0
- [PULL 0/6] hw/nvme updates, Klaus Jensen, 2023/01/11
- [PULL 1/6] hw/nvme: use QOM accessors, Klaus Jensen, 2023/01/11
- [PULL 2/6] hw/nvme: rename shadow doorbell related trace events, Klaus Jensen, 2023/01/11
- [PULL 3/6] hw/nvme: fix missing endian conversions for doorbell buffers, Klaus Jensen, 2023/01/11
- [PULL 6/6] hw/nvme: cleanup error reporting in nvme_init_pci(), Klaus Jensen, 2023/01/11
- [PULL 5/6] hw/nvme: clean up confusing use of errp/local_err, Klaus Jensen, 2023/01/11
- [PULL 4/6] hw/nvme: fix missing cq eventidx update,
Klaus Jensen <=
- Re: [PULL 0/6] hw/nvme updates, Peter Maydell, 2023/01/12