[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [Qemu-devel] [PATCH 12/15] PPC: dbdma: Move processing to
From: |
Alexander Graf |
Subject: |
Re: [Qemu-ppc] [Qemu-devel] [PATCH 12/15] PPC: dbdma: Move processing to io |
Date: |
Mon, 1 Jul 2013 01:35:13 +0200 |
On 30.06.2013, at 08:48, Andreas Färber wrote:
> Am 30.06.2013 03:27, schrieb Alexander Graf:
>> Soon we will introduce intermediate processing pauses which will
>> allow the bottom half to restart a DMA request that couldn't be
>> fulfilled yet.
>>
>> For that to work, move the processing variable into the io struct
>> which is what DMA providers work with.
>>
>> Signed-off-by: Alexander Graf <address@hidden>
>> ---
>> hw/misc/macio/mac_dbdma.c | 10 ++++++----
>> include/hw/ppc/mac_dbdma.h | 3 ++-
>> 2 files changed, 8 insertions(+), 5 deletions(-)
>>
>> diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
>> index 324ac54..91b9eaf 100644
>> --- a/hw/misc/macio/mac_dbdma.c
>> +++ b/hw/misc/macio/mac_dbdma.c
>> @@ -275,7 +275,9 @@ static void dbdma_end(DBDMA_io *io)
>> conditional_branch(ch);
>>
>> wait:
>> - ch->processing = 0;
>> + /* Indicate that we're ready for a new DMA round */
>> + ch->io.processing = 0;
>> +
>> if ((ch->regs[DBDMA_STATUS] & RUN) &&
>> (ch->regs[DBDMA_STATUS] & ACTIVE))
>> channel_run(ch);
>> @@ -301,7 +303,7 @@ static void start_output(DBDMA_channel *ch, int key,
>> uint32_t addr,
>> ch->io.is_last = is_last;
>> ch->io.dma_end = dbdma_end;
>> ch->io.is_dma_out = 1;
>> - ch->processing = 1;
>> + ch->io.processing = 1;
>> if (ch->rw) {
>> ch->rw(&ch->io);
>> }
>> @@ -327,7 +329,7 @@ static void start_input(DBDMA_channel *ch, int key,
>> uint32_t addr,
>> ch->io.is_last = is_last;
>> ch->io.dma_end = dbdma_end;
>> ch->io.is_dma_out = 0;
>> - ch->processing = 1;
>> + ch->io.processing = 1;
>> if (ch->rw) {
>> ch->rw(&ch->io);
>> }
>> @@ -525,7 +527,7 @@ static void DBDMA_run(DBDMAState *s)
>> for (channel = 0; channel < DBDMA_CHANNELS; channel++) {
>> DBDMA_channel *ch = &s->channels[channel];
>> uint32_t status = ch->regs[DBDMA_STATUS];
>> - if (!ch->processing && (status & RUN) && (status & ACTIVE)) {
>> + if (!ch->io.processing && (status & RUN) && (status & ACTIVE)) {
>> channel_run(ch);
>> }
>> }
>> diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h
>> index eb8e0f0..8ad1b6e 100644
>> --- a/include/hw/ppc/mac_dbdma.h
>> +++ b/include/hw/ppc/mac_dbdma.h
>> @@ -37,6 +37,8 @@ struct DBDMA_io {
>> int is_last;
>> int is_dma_out;
>> DBDMA_end dma_end;
>> + /* DMA is in progress, don't start another one */
>> + int processing;
>
> Can it be changed to bool (its users to true/false) while at it?
Sure!
Alex
- [Qemu-ppc] [PATCH 00/15] PPC: Mac OS X guest bringup, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 03/15] PPC: Macio: Replace tabs with spaces, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 06/15] PPC: dbdma: Fix debug print, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 01/15] PPC: Mac: Fix guest exported tbfreq values, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 07/15] PPC: dbdma: Allow new commands in RUN state, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 09/15] PPC: dbdma: Introduce kick function, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 12/15] PPC: dbdma: Move processing to io, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 13/15] PPC: dbdma: Wait for DMA until we have data, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 11/15] PPC: dbdma: macio: Add DMA callback, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 10/15] PPC: dbdma: Move static bh variable to device struct, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 04/15] PPC: dbdma: Replace tabs with spaces, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 05/15] PPC: Mac: Add debug prints in macio and dbdma code, Alexander Graf, 2013/06/29
- [Qemu-ppc] [PATCH 02/15] PPC: g3beige: Move secondary IDE bus to mac-io, Alexander Graf, 2013/06/29