mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dma/xlnx-zdma: Fix descriptor loading (REG) wrt endianness

Browse Source 
Fix descriptor loading from registers 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>
Message-id: 20200404122718.25111-3-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2020-04-04 14:27:18 +02:00 committed by Peter Maydell
parent dac717da67
commit 1633ed1e2d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/dma/xlnx-zdma.c
View File

@ -299,6 +299,14 @@ static void zdma_put_regaddr64(XlnxZDMA *s, unsigned int basereg, uint64_t addr)
s->regs[basereg + 1] = addr >> 32; 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, static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t addr,
XlnxZDMADescr *descr) 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); unsigned int ptype = ARRAY_FIELD_EX32(s->regs, ZDMA_CH_CTRL0, POINT_TYPE);
if (ptype == PT_REG) { if (ptype == PT_REG) {
memcpy(&s->dsc_src, &s->regs[R_ZDMA_CH_SRC_DSCR_WORD0], zdma_load_descriptor_reg(s, R_ZDMA_CH_SRC_DSCR_WORD0, &s->dsc_src);
sizeof(s->dsc_src));
return; return;
} }
@ -360,8 +367,7 @@ static void zdma_load_dst_descriptor(XlnxZDMA *s)
bool dst_type; bool dst_type;
if (ptype == PT_REG) { if (ptype == PT_REG) {
memcpy(&s->dsc_dst, &s->regs[R_ZDMA_CH_DST_DSCR_WORD0], zdma_load_descriptor_reg(s, R_ZDMA_CH_DST_DSCR_WORD0, &s->dsc_dst);
sizeof(s->dsc_dst));
return; return;
} }