Commit 1633ed1e authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

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



Fix descriptor loading from registers wrt host endianness.

Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarFrancisco Iglesias <frasse.iglesias@gmail.com>
Message-id: 20200404122718.25111-3-edgar.iglesias@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent dac717da

hw/dma/xlnx-zdma.c

+10 −4
Original line number Diff line number Diff line
@@ -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;

    }