aboutsummaryrefslogtreecommitdiff
path: root/hw/dma/xlnx-zdma.c
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>2020-04-04 14:27:17 +0200
committerPeter Maydell <peter.maydell@linaro.org>2020-04-30 11:52:24 +0100
commitdac717da679938d52be05c8232cd818e7902796c (patch)
treec23099deaaf2dc4f789102237d1403e9923a155c /hw/dma/xlnx-zdma.c
parent648db19685b7030aa558a4ddbd3a8e53d8c9a062 (diff)
downloadqemu-dac717da679938d52be05c8232cd818e7902796c.zip
qemu-dac717da679938d52be05c8232cd818e7902796c.tar.gz
qemu-dac717da679938d52be05c8232cd818e7902796c.tar.bz2
dma/xlnx-zdma: Fix descriptor loading (MEM) wrt endianness
Fix descriptor loading from memory wrt host endianness. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20200404122718.25111-2-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/dma/xlnx-zdma.c')
-rw-r--r--hw/dma/xlnx-zdma.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 1c45367..5f4775f 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -299,19 +299,22 @@ static void zdma_put_regaddr64(XlnxZDMA *s, unsigned int basereg, uint64_t addr)
s->regs[basereg + 1] = addr >> 32;
}
-static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t addr, void *buf)
+static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t addr,
+ XlnxZDMADescr *descr)
{
/* ZDMA descriptors must be aligned to their own size. */
if (addr % sizeof(XlnxZDMADescr)) {
qemu_log_mask(LOG_GUEST_ERROR,
"zdma: unaligned descriptor at %" PRIx64,
addr);
- memset(buf, 0x0, sizeof(XlnxZDMADescr));
+ memset(descr, 0x0, sizeof(XlnxZDMADescr));
s->error = true;
return false;
}
- address_space_read(s->dma_as, addr, s->attr, buf, sizeof(XlnxZDMADescr));
+ descr->addr = address_space_ldq_le(s->dma_as, addr, s->attr, NULL);
+ descr->size = address_space_ldl_le(s->dma_as, addr + 8, s->attr, NULL);
+ descr->attr = address_space_ldl_le(s->dma_as, addr + 12, s->attr, NULL);
return true;
}
@@ -344,7 +347,7 @@ static void zdma_update_descr_addr(XlnxZDMA *s, bool type,
} else {
addr = zdma_get_regaddr64(s, basereg);
addr += sizeof(s->dsc_dst);
- address_space_read(s->dma_as, addr, s->attr, (void *) &next, 8);
+ next = address_space_ldq_le(s->dma_as, addr, s->attr, NULL);
}
zdma_put_regaddr64(s, basereg, next);