hw/dma: sifive_pdma: allow non-multiple transaction size transactions
Real PDMA is able to deal with non-multiple transaction size transactions. The following result is PDMA tested in U-Boot on Unmatched board: => mw.l 0x3000000 0x0 <= Disclaim channel 0 => mw.l 0x3000000 0x1 <= Claim channel 0 => mw.l 0x3000004 0x11000000 <= wsize = rsize = 1 (2^1 = 2 bytes) => mw.q 0x3000008 0x3 <= NextBytes = 3 => mw.q 0x3000010 0x84000000 <= NextDestination = 0x84000000 => mw.q 0x3000018 0x84001000 <= NextSource = 0x84001000 => mw.l 0x84000000 0x87654321 <= Fill test data to dst => mw.l 0x84001000 0x12345678 <= Fill test data to src => md.l 0x84000000 1; md.l 0x84001000 1 <= Dump src/dst memory contents 84000000: 87654321 !Ce. 84001000: 12345678 xV4. => md.l 0x3000000 8 <= Dump PDMA status 03000000: 00000001 11000000 00000003 00000000 ................ 03000010: 84000000 00000000 84001000 00000000 ................ => mw.l 0x3000000 0x3 <= Set channel 0 run and claim bits => md.l 0x3000000 8 <= Dump PDMA status 03000000: 40000001 11000000 00000003 00000000 ...@............ 03000010: 84000000 00000000 84001000 00000000 ................ => md.l 0x84000000 1; md.l 0x84001000 1 <= Dump src/dst memory contents 84000000: 87345678 xV4. 84001000: 12345678 xV4. Signed-off-by: Green Wan <green.wan@sifive.com> Reviewed-by: Frank Chang <frank.chang@sifive.com> Tested-by: Max Hsu <max.hsu@sifive.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Frank Chang <frank.chang@sifive.com> Message-id: 20210912130553.179501-4-frank.chang@sifive.com Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
9a8c26c08c
commit
e22d90f5f9
|
@ -74,7 +74,7 @@ static void sifive_pdma_run(SiFivePDMAState *s, int ch)
|
|||
uint64_t dst = s->chan[ch].next_dst;
|
||||
uint64_t src = s->chan[ch].next_src;
|
||||
uint32_t config = s->chan[ch].next_config;
|
||||
int wsize, rsize, size;
|
||||
int wsize, rsize, size, remainder;
|
||||
uint8_t buf[64];
|
||||
int n;
|
||||
|
||||
|
@ -106,11 +106,7 @@ static void sifive_pdma_run(SiFivePDMAState *s, int ch)
|
|||
size = 6;
|
||||
}
|
||||
size = 1 << size;
|
||||
|
||||
/* the bytes to transfer should be multiple of transaction size */
|
||||
if (bytes % size) {
|
||||
goto error;
|
||||
}
|
||||
remainder = bytes % size;
|
||||
|
||||
/* indicate a DMA transfer is started */
|
||||
s->chan[ch].state = DMA_CHAN_STATE_STARTED;
|
||||
|
@ -131,6 +127,14 @@ static void sifive_pdma_run(SiFivePDMAState *s, int ch)
|
|||
s->chan[ch].exec_bytes -= size;
|
||||
}
|
||||
|
||||
if (remainder) {
|
||||
cpu_physical_memory_read(s->chan[ch].exec_src, buf, remainder);
|
||||
cpu_physical_memory_write(s->chan[ch].exec_dst, buf, remainder);
|
||||
s->chan[ch].exec_src += remainder;
|
||||
s->chan[ch].exec_dst += remainder;
|
||||
s->chan[ch].exec_bytes -= remainder;
|
||||
}
|
||||
|
||||
/* indicate a DMA transfer is done */
|
||||
s->chan[ch].state = DMA_CHAN_STATE_DONE;
|
||||
s->chan[ch].control &= ~CONTROL_RUN;
|
||||
|
|
Loading…
Reference in a new issue