[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/31] dma/xlnx-zdma: Fix descriptor loading (REG) wrt endianness
From: |
Peter Maydell |
Subject: |
[PULL 02/31] dma/xlnx-zdma: Fix descriptor loading (REG) wrt endianness |
Date: |
Thu, 30 Apr 2020 12:51:13 +0100 |
From: "Edgar E. Iglesias" <address@hidden>
Fix descriptor loading from registers wrt host endianness.
Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Francisco Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/dma/xlnx-zdma.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 5f4775f6634..4121a1b489c 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -299,6 +299,14 @@ static void zdma_put_regaddr64(XlnxZDMA *s, unsigned int
basereg, uint64_t addr)
s->regs[basereg + 1] = addr >> 32;
}
+static void zdma_load_descriptor_reg(XlnxZDMA *s, unsigned int reg,
+ XlnxZDMADescr *descr)
+{
+ descr->addr = zdma_get_regaddr64(s, reg);
+ descr->size = s->regs[reg + 2];
+ descr->attr = s->regs[reg + 3];
+}
+
static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t addr,
XlnxZDMADescr *descr)
{
@@ -324,8 +332,7 @@ static void zdma_load_src_descriptor(XlnxZDMA *s)
unsigned int ptype = ARRAY_FIELD_EX32(s->regs, ZDMA_CH_CTRL0, POINT_TYPE);
if (ptype == PT_REG) {
- memcpy(&s->dsc_src, &s->regs[R_ZDMA_CH_SRC_DSCR_WORD0],
- sizeof(s->dsc_src));
+ zdma_load_descriptor_reg(s, R_ZDMA_CH_SRC_DSCR_WORD0, &s->dsc_src);
return;
}
@@ -360,8 +367,7 @@ static void zdma_load_dst_descriptor(XlnxZDMA *s)
bool dst_type;
if (ptype == PT_REG) {
- memcpy(&s->dsc_dst, &s->regs[R_ZDMA_CH_DST_DSCR_WORD0],
- sizeof(s->dsc_dst));
+ zdma_load_descriptor_reg(s, R_ZDMA_CH_DST_DSCR_WORD0, &s->dsc_dst);
return;
}
--
2.20.1
- [PULL 00/31] target-arm queue, Peter Maydell, 2020/04/30
- [PULL 01/31] dma/xlnx-zdma: Fix descriptor loading (MEM) wrt endianness, Peter Maydell, 2020/04/30
- [PULL 03/31] nrf51: Fix last GPIO CNF address, Peter Maydell, 2020/04/30
- [PULL 02/31] dma/xlnx-zdma: Fix descriptor loading (REG) wrt endianness,
Peter Maydell <=
- [PULL 05/31] Typo: Correct the name of CPU hotplug memory region, Peter Maydell, 2020/04/30
- [PULL 04/31] bugfix: Use gicr_typer in arm_gicv3_icc_reset, Peter Maydell, 2020/04/30
- [PULL 07/31] msf2: Add EMAC block to SmartFusion2 SoC, Peter Maydell, 2020/04/30
- [PULL 06/31] hw/net: Add Smartfusion2 emac block, Peter Maydell, 2020/04/30
- [PULL 08/31] tests/boot_linux_console: Add ethernet test to SmartFusion2, Peter Maydell, 2020/04/30
- [PULL 10/31] hw/core/clock-vmstate: define a vmstate entry for clock state, Peter Maydell, 2020/04/30
- [PULL 11/31] qdev: add clock input&output support to devices., Peter Maydell, 2020/04/30
- [PULL 12/31] qdev-clock: introduce an init array to ease the device construction, Peter Maydell, 2020/04/30
- [PULL 09/31] hw/core/clock: introduce clock object, Peter Maydell, 2020/04/30