From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtBQn-0003k6-PA for qemu-devel@nongnu.org; Sun, 30 Jun 2013 02:48:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtBQm-0004dH-Pz for qemu-devel@nongnu.org; Sun, 30 Jun 2013 02:48:17 -0400 Message-ID: <51CFD4AA.3060302@suse.de> Date: Sun, 30 Jun 2013 08:48:10 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1372555629-17976-1-git-send-email-agraf@suse.de> <1372555629-17976-13-git-send-email-agraf@suse.de> In-Reply-To: <1372555629-17976-13-git-send-email-agraf@suse.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 12/15] PPC: dbdma: Move processing to io List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Kevin Wolf , programmingkidx@gmail.com, mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, qemu-devel@nongnu.org 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. >=20 > For that to work, move the processing variable into the io struct > which is what DMA providers work with. >=20 > Signed-off-by: Alexander Graf > --- > hw/misc/macio/mac_dbdma.c | 10 ++++++---- > include/hw/ppc/mac_dbdma.h | 3 ++- > 2 files changed, 8 insertions(+), 5 deletions(-) >=20 > 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); > =20 > wait: > - ch->processing =3D 0; > + /* Indicate that we're ready for a new DMA round */ > + ch->io.processing =3D 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 =3D is_last; > ch->io.dma_end =3D dbdma_end; > ch->io.is_dma_out =3D 1; > - ch->processing =3D 1; > + ch->io.processing =3D 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 =3D is_last; > ch->io.dma_end =3D dbdma_end; > ch->io.is_dma_out =3D 0; > - ch->processing =3D 1; > + ch->io.processing =3D 1; > if (ch->rw) { > ch->rw(&ch->io); > } > @@ -525,7 +527,7 @@ static void DBDMA_run(DBDMAState *s) > for (channel =3D 0; channel < DBDMA_CHANNELS; channel++) { > DBDMA_channel *ch =3D &s->channels[channel]; > uint32_t status =3D 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? Andreas > }; > =20 > /* > @@ -148,7 +150,6 @@ typedef struct DBDMA_channel { > DBDMA_rw rw; > DBDMA_flush flush; > dbdma_cmd current; > - int processing; > } DBDMA_channel; > =20 > typedef struct { --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg