[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/11] dma/xlnx-zdma: Reorg to fix CUR_DSCR
From: |
Peter Maydell |
Subject: |
[PULL 11/11] dma/xlnx-zdma: Reorg to fix CUR_DSCR |
Date: |
Mon, 6 Apr 2020 11:12:05 +0100 |
From: "Edgar E. Iglesias" <address@hidden>
Reorganize the descriptor handling so that CUR_DSCR always
points to the next descriptor to be processed.
Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Francisco Iglesias <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/dma/xlnx-zdma.c | 47 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 25 deletions(-)
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index e856d233f2d..1c45367f3c6 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -333,10 +333,28 @@ static void zdma_load_src_descriptor(XlnxZDMA *s)
}
}
+static void zdma_update_descr_addr(XlnxZDMA *s, bool type,
+ unsigned int basereg)
+{
+ uint64_t addr, next;
+
+ if (type == DTYPE_LINEAR) {
+ addr = zdma_get_regaddr64(s, basereg);
+ next = addr + sizeof(s->dsc_dst);
+ } else {
+ addr = zdma_get_regaddr64(s, basereg);
+ addr += sizeof(s->dsc_dst);
+ address_space_read(s->dma_as, addr, s->attr, (void *) &next, 8);
+ }
+
+ zdma_put_regaddr64(s, basereg, next);
+}
+
static void zdma_load_dst_descriptor(XlnxZDMA *s)
{
uint64_t dst_addr;
unsigned int ptype = ARRAY_FIELD_EX32(s->regs, ZDMA_CH_CTRL0, POINT_TYPE);
+ bool dst_type;
if (ptype == PT_REG) {
memcpy(&s->dsc_dst, &s->regs[R_ZDMA_CH_DST_DSCR_WORD0],
@@ -349,24 +367,10 @@ static void zdma_load_dst_descriptor(XlnxZDMA *s)
if (!zdma_load_descriptor(s, dst_addr, &s->dsc_dst)) {
ARRAY_FIELD_DP32(s->regs, ZDMA_CH_ISR, AXI_RD_DST_DSCR, true);
}
-}
-static uint64_t zdma_update_descr_addr(XlnxZDMA *s, bool type,
- unsigned int basereg)
-{
- uint64_t addr, next;
-
- if (type == DTYPE_LINEAR) {
- next = zdma_get_regaddr64(s, basereg);
- next += sizeof(s->dsc_dst);
- zdma_put_regaddr64(s, basereg, next);
- } else {
- addr = zdma_get_regaddr64(s, basereg);
- addr += sizeof(s->dsc_dst);
- address_space_read(s->dma_as, addr, s->attr, &next, 8);
- zdma_put_regaddr64(s, basereg, next);
- }
- return next;
+ /* Advance the descriptor pointer. */
+ dst_type = FIELD_EX32(s->dsc_dst.words[3], ZDMA_CH_DST_DSCR_WORD3, TYPE);
+ zdma_update_descr_addr(s, dst_type, R_ZDMA_CH_DST_CUR_DSCR_LSB);
}
static void zdma_write_dst(XlnxZDMA *s, uint8_t *buf, uint32_t len)
@@ -387,14 +391,7 @@ static void zdma_write_dst(XlnxZDMA *s, uint8_t *buf,
uint32_t len)
dst_size = FIELD_EX32(s->dsc_dst.words[2], ZDMA_CH_DST_DSCR_WORD2,
SIZE);
if (dst_size == 0 && ptype == PT_MEM) {
- uint64_t next;
- bool dst_type = FIELD_EX32(s->dsc_dst.words[3],
- ZDMA_CH_DST_DSCR_WORD3,
- TYPE);
-
- next = zdma_update_descr_addr(s, dst_type,
- R_ZDMA_CH_DST_CUR_DSCR_LSB);
- zdma_load_descriptor(s, next, &s->dsc_dst);
+ zdma_load_dst_descriptor(s);
dst_size = FIELD_EX32(s->dsc_dst.words[2], ZDMA_CH_DST_DSCR_WORD2,
SIZE);
}
--
2.20.1
- [PULL 00/11] target-arm queue, Peter Maydell, 2020/04/06
- [PULL 02/11] hw/arm/collie: Put StrongARMState* into a CollieMachineState struct, Peter Maydell, 2020/04/06
- [PULL 03/11] target/arm: PSTATE.PAN should not clear exec bits, Peter Maydell, 2020/04/06
- [PULL 04/11] target/arm: Remove obsolete TODO note from get_phys_addr_lpae(), Peter Maydell, 2020/04/06
- [PULL 05/11] hw/gpio/aspeed_gpio.c: Don't directly include assert.h, Peter Maydell, 2020/04/06
- [PULL 06/11] dump: Fix writing of ELF section, Peter Maydell, 2020/04/06
- [PULL 08/11] dma/xlnx-zdma: Populate DBG0.CMN_BUF_FREE, Peter Maydell, 2020/04/06
- [PULL 09/11] dma/xlnx-zdma: Clear DMA_DONE when halting, Peter Maydell, 2020/04/06
- [PULL 01/11] target/arm: don't expose "ieee_half" via gdbstub, Peter Maydell, 2020/04/06
- [PULL 07/11] dma/xlnx-zdma: Remove comment, Peter Maydell, 2020/04/06
- [PULL 11/11] dma/xlnx-zdma: Reorg to fix CUR_DSCR,
Peter Maydell <=
- [PULL 10/11] dma/xlnx-zdma: Advance the descriptor address when stopping, Peter Maydell, 2020/04/06
- Re: [PULL 00/11] target-arm queue, Peter Maydell, 2020/04/06