diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2016-07-10 19:08:57 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-07-18 10:40:27 +1000 |
| commit | 894993905daf9c56fee67e77d8f0f76889dc7b76 (patch) | |
| tree | ff34c990879b54b9b83f785e88dbe9189a04539a | |
| parent | e12f50b900bcc2079954c40828dcc167e4ace5cb (diff) | |
| download | qemu-894993905daf9c56fee67e77d8f0f76889dc7b76.zip qemu-894993905daf9c56fee67e77d8f0f76889dc7b76.tar.gz qemu-894993905daf9c56fee67e77d8f0f76889dc7b76.tar.bz2 | |
dbdma: set FLUSH bit upon reception of flush command for unassigned DBDMA channels
This fixes MacOS 9 whereby it continually flushes and polls the status bits
until they are set to indicate a successful flush.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/misc/macio/mac_dbdma.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index c5dd0ac..ef5b0a5 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -783,8 +783,18 @@ static void dbdma_unassigned_rw(DBDMA_io *io) static void dbdma_unassigned_flush(DBDMA_io *io) { DBDMA_channel *ch = io->channel; + dbdma_cmd *current = &ch->current; + uint16_t cmd; qemu_log_mask(LOG_GUEST_ERROR, "%s: use of unassigned channel %d\n", __func__, ch->channel); + + cmd = le16_to_cpu(current->command) & COMMAND_MASK; + if (cmd == OUTPUT_MORE || cmd == OUTPUT_LAST || + cmd == INPUT_MORE || cmd == INPUT_LAST) { + current->xfer_status = cpu_to_le16(ch->regs[DBDMA_STATUS] | FLUSH); + current->res_count = cpu_to_le16(io->len); + dbdma_cmdptr_save(ch); + } } void* DBDMA_init (MemoryRegion **dbdma_mem) |