From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzjyR-0005wG-T7 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:03:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzjyL-0004YY-Rx for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:03:11 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:59793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzjyL-0004Y8-IN for qemu-devel@nongnu.org; Tue, 02 Jun 2015 07:03:05 -0400 Date: Tue, 2 Jun 2015 13:03:04 +0200 From: Aurelien Jarno Message-ID: <20150602110304.GD26298@aurel32.net> References: <1432729200-5322-1-git-send-email-hpoussin@reactos.org> <1432729200-5322-5-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <1432729200-5322-5-git-send-email-hpoussin@reactos.org> Sender: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH v2 04/17] dma/rc4030: do not use old_mmio accesses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-15?Q?Herv=E9?= Poussineau Cc: Leon Alrae , qemu-devel@nongnu.org On 2015-05-27 14:19, Herv=E9 Poussineau wrote: > Signed-off-by: Herv=E9 Poussineau > --- > hw/dma/rc4030.c | 112 ++++++++------------------------------------------= ------ > 1 file changed, 16 insertions(+), 96 deletions(-) >=20 > diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c > index a0b617f..96f796b 100644 > --- a/hw/dma/rc4030.c > +++ b/hw/dma/rc4030.c > @@ -125,7 +125,7 @@ static void set_next_tick(rc4030State *s) > } > =20 > /* called for accesses to rc4030 */ > -static uint32_t rc4030_readl(void *opaque, hwaddr addr) > +static uint64_t rc4030_read(void *opaque, hwaddr addr, unsigned int size) > { > rc4030State *s =3D opaque; > uint32_t val; > @@ -263,21 +263,6 @@ static uint32_t rc4030_readl(void *opaque, hwaddr ad= dr) > return val; > } > =20 > -static uint32_t rc4030_readw(void *opaque, hwaddr addr) > -{ > - uint32_t v =3D rc4030_readl(opaque, addr & ~0x3); > - if (addr & 0x2) > - return v >> 16; > - else > - return v & 0xffff; > -} > - > -static uint32_t rc4030_readb(void *opaque, hwaddr addr) > -{ > - uint32_t v =3D rc4030_readl(opaque, addr & ~0x3); > - return (v >> (8 * (addr & 0x3))) & 0xff; > -} > - > static void rc4030_dma_as_update_one(rc4030State *s, int index, uint32_t= frame) > { > if (index < MAX_TL_ENTRIES) { > @@ -368,10 +353,11 @@ static void rc4030_dma_tt_update(rc4030State *s, ui= nt32_t new_tl_base, > } > } > =20 > - > -static void rc4030_writel(void *opaque, hwaddr addr, uint32_t val) > +static void rc4030_write(void *opaque, hwaddr addr, uint64_t data, > + unsigned int size) > { > rc4030State *s =3D opaque; > + uint32_t val =3D data; > addr &=3D 0x3fff; > =20 > DPRINTF("write 0x%02x at " TARGET_FMT_plx "\n", val, addr); > @@ -494,43 +480,11 @@ static void rc4030_writel(void *opaque, hwaddr addr= , uint32_t val) > } > } > =20 > -static void rc4030_writew(void *opaque, hwaddr addr, uint32_t val) > -{ > - uint32_t old_val =3D rc4030_readl(opaque, addr & ~0x3); > - > - if (addr & 0x2) > - val =3D (val << 16) | (old_val & 0x0000ffff); > - else > - val =3D val | (old_val & 0xffff0000); > - rc4030_writel(opaque, addr & ~0x3, val); > -} > - > -static void rc4030_writeb(void *opaque, hwaddr addr, uint32_t val) > -{ > - uint32_t old_val =3D rc4030_readl(opaque, addr & ~0x3); > - > - switch (addr & 3) { > - case 0: > - val =3D val | (old_val & 0xffffff00); > - break; > - case 1: > - val =3D (val << 8) | (old_val & 0xffff00ff); > - break; > - case 2: > - val =3D (val << 16) | (old_val & 0xff00ffff); > - break; > - case 3: > - val =3D (val << 24) | (old_val & 0x00ffffff); > - break; > - } > - rc4030_writel(opaque, addr & ~0x3, val); > -} > - > static const MemoryRegionOps rc4030_ops =3D { > - .old_mmio =3D { > - .read =3D { rc4030_readb, rc4030_readw, rc4030_readl, }, > - .write =3D { rc4030_writeb, rc4030_writew, rc4030_writel, }, > - }, > + .read =3D rc4030_read, > + .write =3D rc4030_write, > + .impl.min_access_size =3D 4, > + .impl.max_access_size =3D 4, > .endianness =3D DEVICE_NATIVE_ENDIAN, > }; > =20 > @@ -583,7 +537,7 @@ static void rc4030_periodic_timer(void *opaque) > qemu_irq_raise(s->timer_irq); > } > =20 > -static uint32_t jazzio_readw(void *opaque, hwaddr addr) > +static uint64_t jazzio_read(void *opaque, hwaddr addr, unsigned int size) > { > rc4030State *s =3D opaque; > uint32_t val; > @@ -621,24 +575,11 @@ static uint32_t jazzio_readw(void *opaque, hwaddr a= ddr) > return val; > } > =20 > -static uint32_t jazzio_readb(void *opaque, hwaddr addr) > -{ > - uint32_t v; > - v =3D jazzio_readw(opaque, addr & ~0x1); > - return (v >> (8 * (addr & 0x1))) & 0xff; > -} > - > -static uint32_t jazzio_readl(void *opaque, hwaddr addr) > -{ > - uint32_t v; > - v =3D jazzio_readw(opaque, addr); > - v |=3D jazzio_readw(opaque, addr + 2) << 16; > - return v; > -} > - > -static void jazzio_writew(void *opaque, hwaddr addr, uint32_t val) > +static void jazzio_write(void *opaque, hwaddr addr, uint64_t data, > + unsigned int size) > { > rc4030State *s =3D opaque; > + uint32_t val =3D data; > addr &=3D 0xfff; > =20 > DPRINTF("(jazz io controller) write 0x%04x at " TARGET_FMT_plx "\n",= val, addr); > @@ -655,32 +596,11 @@ static void jazzio_writew(void *opaque, hwaddr addr= , uint32_t val) > } > } > =20 > -static void jazzio_writeb(void *opaque, hwaddr addr, uint32_t val) > -{ > - uint32_t old_val =3D jazzio_readw(opaque, addr & ~0x1); > - > - switch (addr & 1) { > - case 0: > - val =3D val | (old_val & 0xff00); > - break; > - case 1: > - val =3D (val << 8) | (old_val & 0x00ff); > - break; > - } > - jazzio_writew(opaque, addr & ~0x1, val); > -} > - > -static void jazzio_writel(void *opaque, hwaddr addr, uint32_t val) > -{ > - jazzio_writew(opaque, addr, val & 0xffff); > - jazzio_writew(opaque, addr + 2, (val >> 16) & 0xffff); > -} > - > static const MemoryRegionOps jazzio_ops =3D { > - .old_mmio =3D { > - .read =3D { jazzio_readb, jazzio_readw, jazzio_readl, }, > - .write =3D { jazzio_writeb, jazzio_writew, jazzio_writel, }, > - }, > + .read =3D jazzio_read, > + .write =3D jazzio_write, > + .impl.min_access_size =3D 2, > + .impl.max_access_size =3D 2, > .endianness =3D DEVICE_NATIVE_ENDIAN, > }; Nice cleanup :) Reviewed-by: Aurelien Jarno --=20 Aurelien Jarno GPG: 4096R/1DDD8C9B aurelien@aurel32.net http://www.aurel32.net