[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] PPC: dbdma: Wait for DMA until we have data
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 13/15] PPC: dbdma: Wait for DMA until we have data |
Date: |
Sun, 30 Jun 2013 03:27:07 +0200 |
We should only start processing DMA requests when we have data to process.
Hold off working through the DMA shuffling until the IDE core told us that
it's ready.
This is required because the guest can program the DMA engine or the IDE
transfer first. Both are legal.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/ide/macio.c | 19 +++++++++++++++++++
hw/ppc/mac.h | 1 +
2 files changed, 20 insertions(+)
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index bd1b972..095e1f1 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -59,6 +59,14 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
goto done;
}
+ if (!m->dma_active) {
+ MACIO_DPRINTF("waiting for data (%#x - %#x - %x)\n",
+ s->nsector, io->len, s->status);
+ /* data not ready yet, wait for the channel to get restarted */
+ io->processing = 0;
+ return;
+ }
+
MACIO_DPRINTF("io_buffer_size = %#x\n", s->io_buffer_size);
if (s->io_buffer_size > 0) {
@@ -76,6 +84,7 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
if (s->packet_transfer_size <= 0) {
MACIO_DPRINTF("end of transfer\n");
ide_atapi_cmd_ok(s);
+ m->dma_active = false;
}
/* end of DMA ? */
@@ -127,6 +136,14 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
goto done;
}
+ if (!m->dma_active) {
+ MACIO_DPRINTF("waiting for data (%#x - %#x - %x)\n",
+ s->nsector, io->len, s->status);
+ /* data not ready yet, wait for the channel to get restarted */
+ io->processing = 0;
+ return;
+ }
+
sector_num = ide_get_sector(s);
MACIO_DPRINTF("io_buffer_size = %#x\n", s->io_buffer_size);
if (s->io_buffer_size > 0) {
@@ -143,6 +160,7 @@ static void pmac_ide_transfer_cb(void *opaque, int ret)
MACIO_DPRINTF("end of transfer\n");
s->status = READY_STAT | SEEK_STAT;
ide_set_irq(s->bus);
+ m->dma_active = false;
}
/* end of DMA ? */
@@ -379,6 +397,7 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s,
MACIOIDEState *m = container_of(dma, MACIOIDEState, dma);
MACIO_DPRINTF("\n", __LINE__);
+ m->dma_active = true;
DBDMA_kick(m->dbdma);
}
diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h
index 27c4ca3..1e578dd 100644
--- a/hw/ppc/mac.h
+++ b/hw/ppc/mac.h
@@ -133,6 +133,7 @@ typedef struct MACIOIDEState {
BlockDriverAIOCB *aiocb;
IDEDMA dma;
void *dbdma;
+ bool dma_active;
} MACIOIDEState;
void macio_ide_init_drives(MACIOIDEState *ide, DriveInfo **hd_table);
--
1.8.1.4
- [Qemu-devel] [PATCH 01/15] PPC: Mac: Fix guest exported tbfreq values, (continued)
- [Qemu-devel] [PATCH 01/15] PPC: Mac: Fix guest exported tbfreq values, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 06/15] PPC: dbdma: Fix debug print, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 07/15] PPC: dbdma: Allow new commands in RUN state, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 09/15] PPC: dbdma: Introduce kick function, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 05/15] PPC: Mac: Add debug prints in macio and dbdma code, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 12/15] PPC: dbdma: Move processing to io, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 13/15] PPC: dbdma: Wait for DMA until we have data,
Alexander Graf <=
- [Qemu-devel] [PATCH 11/15] PPC: dbdma: macio: Add DMA callback, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 10/15] PPC: dbdma: Move static bh variable to device struct, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 02/15] PPC: g3beige: Move secondary IDE bus to mac-io, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 04/15] PPC: dbdma: Replace tabs with spaces, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 14/15] PPC: dbdma: Support unaligned DMA access, Alexander Graf, 2013/06/29
- [Qemu-devel] [PATCH 08/15] PPC: dbdma: Move defines into header file, Alexander Graf, 2013/06/29