ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: Ignore double DMA transfer starts/stops 

You can only start a DMA transfer if it's not running yet, and you can only
cancel it if it's running.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Kevin Wolf 2010-11-26 16:44:53 +01:00
parent e3982b3cf6
commit c29947bbb0
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ide/pci.c
View File

@ -39,6 +39,9 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
#ifdef DEBUG_IDE #ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val); printf("%s: 0x%08x\n", __func__, val);
#endif #endif
/* Ignore writes to SSBM if it keeps the old value */
if ((val & BM_CMD_START) != (bm->cmd & BM_CMD_START)) {
if (!(val & BM_CMD_START)) { if (!(val & BM_CMD_START)) {
/* /*
* We can't cancel Scatter Gather DMA in the middle of the * We can't cancel Scatter Gather DMA in the middle of the
@ -61,7 +64,6 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
printf("ide_dma_cancel: BM_STATUS_DMAING still pending"); printf("ide_dma_cancel: BM_STATUS_DMAING still pending");
#endif #endif
} }
bm->cmd = val & 0x09;
} else { } else {
if (!(bm->status & BM_STATUS_DMAING)) { if (!(bm->status & BM_STATUS_DMAING)) {
bm->status |= BM_STATUS_DMAING; bm->status |= BM_STATUS_DMAING;
@ -69,10 +71,12 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
if (bm->dma_cb) if (bm->dma_cb)
bm->dma_cb(bm, 0); bm->dma_cb(bm, 0);
} }
bm->cmd = val & 0x09;
} }
} }
bm->cmd = val & 0x09;
}
static void bmdma_addr_read(IORange *ioport, uint64_t addr, static void bmdma_addr_read(IORange *ioport, uint64_t addr,
unsigned width, uint64_t *data) unsigned width, uint64_t *data)
{ {