hw/block/nvme: refactor nvme_addr_read
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 <k.jensen@samsung.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Reviewed-by: Keith Busch <kbusch@kernel.org> Message-Id: <20200609190333.59390-7-its@irrelevant.dk> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
3e829fd438
commit
b4529c5c3a
|
@ -65,14 +65,22 @@
|
||||||
|
|
||||||
static void nvme_process_sq(void *opaque);
|
static void nvme_process_sq(void *opaque);
|
||||||
|
|
||||||
|
static 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)
|
static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
|
||||||
{
|
{
|
||||||
if (n->cmbsz && addr >= n->ctrl_mem.addr &&
|
if (n->cmbsz && nvme_addr_is_cmb(n, addr)) {
|
||||||
addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size))) {
|
|
||||||
memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
|
memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
|
||||||
} else {
|
return;
|
||||||
pci_dma_read(&n->parent_obj, addr, buf, size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pci_dma_read(&n->parent_obj, addr, buf, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
|
static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
|
||||||
|
|
Loading…
Reference in New Issue