Skip to content

Commit 47b5fbf

Browse files
lbmengalistair23
authored andcommitted
hw/dma: sifive_pdma: Don't run DMA when channel is disclaimed
If Control.run bit is set while not preserving the Control.claim bit, the DMA transfer shall not be started. The following result is PDMA tested in U-Boot on Unleashed board: => mw.l 0x3000000 0x0 <= Disclaim channel 0 => mw.l 0x3000000 0x1 <= Claim channel 0 => mw.l 0x3000004 0x55000000 <= wsize = rsize = 5 (2^5 = 32 bytes) => mw.q 0x3000008 0x2 <= NextBytes = 2 => 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 55000000 00000002 00000000 .......U........ 03000010: 84000000 00000000 84001000 00000000 ................ => mw.l 0x3000000 0x2 <= Set channel 0 run bit only => md.l 0x3000000 8 <= Dump PDMA status 03000000: 00000000 55000000 00000002 00000000 .......U........ 03000010: 84000000 00000000 84001000 00000000 ................ => md.l 0x84000000 1; md.l 0x84001000 1 <= Dump src/dst memory contents 84000000: 87654321 !Ce. 84001000: 12345678 xV4. Signed-off-by: Bin Meng <[email protected]> Acked-by: Alistair Francis <[email protected]> Message-id: [email protected] Signed-off-by: Alistair Francis <[email protected]>
1 parent b7af62a commit 47b5fbf

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

hw/dma/sifive_pdma.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static void sifive_pdma_write(void *opaque, hwaddr offset,
232232
{
233233
SiFivePDMAState *s = opaque;
234234
int ch = SIFIVE_PDMA_CHAN_NO(offset);
235-
bool claimed;
235+
bool claimed, run;
236236

237237
if (ch >= SIFIVE_PDMA_CHANS) {
238238
qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid channel no %d\n",
@@ -244,6 +244,7 @@ static void sifive_pdma_write(void *opaque, hwaddr offset,
244244
switch (offset) {
245245
case DMA_CONTROL:
246246
claimed = !!(s->chan[ch].control & CONTROL_CLAIM);
247+
run = !!(s->chan[ch].control & CONTROL_RUN);
247248

248249
if (!claimed && (value & CONTROL_CLAIM)) {
249250
/* reset Next* registers */
@@ -254,13 +255,19 @@ static void sifive_pdma_write(void *opaque, hwaddr offset,
254255
s->chan[ch].next_src = 0;
255256
}
256257

258+
/* claim bit can only be cleared when run is low */
259+
if (run && !(value & CONTROL_CLAIM)) {
260+
value |= CONTROL_CLAIM;
261+
}
262+
257263
s->chan[ch].control = value;
258264

259265
/*
260266
* If channel was not claimed before run bit is set,
267+
* or if the channel is disclaimed when run was low,
261268
* DMA won't run.
262269
*/
263-
if (!claimed) {
270+
if (!claimed || (!run && !(value & CONTROL_CLAIM))) {
264271
s->chan[ch].control &= ~CONTROL_RUN;
265272
return;
266273
}

0 commit comments

Comments
 (0)