[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 06/48] nvme: refactor nvme_addr_read
From: |
Klaus Jensen |
Subject: |
[PATCH v7 06/48] nvme: refactor nvme_addr_read |
Date: |
Wed, 15 Apr 2020 07:50:58 +0200 |
From: Klaus Jensen <address@hidden>
Pull the controller memory buffer check to its own function. The check
will be used on its own in later patches.
Signed-off-by: Klaus Jensen <address@hidden>
Acked-by: Keith Busch <address@hidden>
---
hw/block/nvme.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 622103c42d0a..02d3dde90842 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -52,14 +52,22 @@
static void nvme_process_sq(void *opaque);
+static inline bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)
+{
+ hwaddr low = n->ctrl_mem.addr;
+ hwaddr hi = n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size);
+
+ return addr >= low && addr < hi;
+}
+
static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
{
- if (n->cmbsz && addr >= n->ctrl_mem.addr &&
- addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size))) {
+ if (n->cmbsz && nvme_addr_is_cmb(n, addr)) {
memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
- } else {
- pci_dma_read(&n->parent_obj, addr, buf, size);
+ return;
}
+
+ pci_dma_read(&n->parent_obj, addr, buf, size);
}
static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
--
2.26.0
- [PATCH v7 00/48] nvme: support NVMe v1.3d, SGLs and multiple namespaces, Klaus Jensen, 2020/04/15
- [PATCH v7 02/48] nvme: remove superfluous breaks, Klaus Jensen, 2020/04/15
- [PATCH v7 03/48] nvme: move device parameters to separate struct, Klaus Jensen, 2020/04/15
- [PATCH v7 05/48] nvme: use constants in identify, Klaus Jensen, 2020/04/15
- [PATCH v7 06/48] nvme: refactor nvme_addr_read,
Klaus Jensen <=
- [PATCH v7 09/48] nvme: add max_ioqpairs device parameter, Klaus Jensen, 2020/04/15
- [PATCH v7 10/48] nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/04/15
- [PATCH v7 07/48] nvme: add support for the abort command, Klaus Jensen, 2020/04/15
- [PATCH v7 08/48] nvme: fix pci doorbell size calculation, Klaus Jensen, 2020/04/15
- [PATCH v7 04/48] nvme: bump spec data structures to v1.3, Klaus Jensen, 2020/04/15