From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULH3W-0001UW-G6 for qemu-devel@nongnu.org; Thu, 28 Mar 2013 13:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULH3T-00019k-Pk for qemu-devel@nongnu.org; Thu, 28 Mar 2013 13:56:06 -0400 Received: from mail-qc0-x232.google.com ([2607:f8b0:400d:c01::232]:65355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULH3T-00019f-K6 for qemu-devel@nongnu.org; Thu, 28 Mar 2013 13:56:03 -0400 Received: by mail-qc0-f178.google.com with SMTP id d10so3597475qca.23 for ; Thu, 28 Mar 2013 10:56:03 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1363358063-23973-5-git-send-email-peter.maydell@linaro.org> References: <1363358063-23973-1-git-send-email-peter.maydell@linaro.org> <1363358063-23973-5-git-send-email-peter.maydell@linaro.org> Date: Thu, 28 Mar 2013 12:55:59 -0500 Message-ID: <87y5d7be8g.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 4/5] milkymist-softusb: Don't map RAM memory regions in the device itself List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: Paolo Bonzini , Michael Walle , Jan Kiszka , Andreas =?utf-8?Q?F=C3=A4rber?= , patches@linaro.org Peter Maydell writes: > Don't map the pmem and dmem RAM memory regions in the milkymist-softusb > device itself. Instead just expose them as sysbus mmio regions which > the device creator can map appropriately. This allows us to drop the > pmem_base and dmem_base properties. Instead of going via > cpu_physical_memory_read/_write when the device wants to access the > RAMs, we just keep a host pointer to the memory and use that. > > Signed-off-by: Peter Maydell > Reviewed-by: Andreas F=C3=A4rber > Acked-by: Michael Walle Breaks the build: [aliguori@ccnode4 qemu]$ make CC lm32-softmmu/hw/lm32/../milkymist-softusb.o /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c: In function =E2=80= =98softusb_mouse_hid_datain=E2=80=99: /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c:183:38: error: =E2= =80=98m=E2=80=99 may be used uninitialized in this function [-Werror=3Dmayb= e-uninitialized] /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c:179:13: note: =E2=80= =98m=E2=80=99 was declared here /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c: In function =E2=80= =98softusb_kbd_hid_datain=E2=80=99: /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c:197:38: error: =E2= =80=98m=E2=80=99 may be used uninitialized in this function [-Werror=3Dmayb= e-uninitialized] /home/aliguori/git/qemu/hw/lm32/../milkymist-softusb.c:193:13: note: =E2=80= =98m=E2=80=99 was declared here cc1: all warnings being treated as errors make[1]: *** [hw/lm32/../milkymist-softusb.o] Error 1 Regards, Anthony Liguori > --- > hw/milkymist-hw.h | 4 ++-- > hw/milkymist-softusb.c | 21 +++++++++++---------- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h > index aa0865f..5782e1a 100644 > --- a/hw/milkymist-hw.h > +++ b/hw/milkymist-hw.h > @@ -194,12 +194,12 @@ static inline DeviceState *milkymist_softusb_create= (hwaddr base, > DeviceState *dev; >=20=20 > dev =3D qdev_create(NULL, "milkymist-softusb"); > - qdev_prop_set_uint32(dev, "pmem_base", pmem_base); > qdev_prop_set_uint32(dev, "pmem_size", pmem_size); > - qdev_prop_set_uint32(dev, "dmem_base", dmem_base); > qdev_prop_set_uint32(dev, "dmem_size", dmem_size); > qdev_init_nofail(dev); > sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, pmem_base); > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, dmem_base); > sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); >=20=20 > return dev; > diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c > index d911686..b279d4e 100644 > --- a/hw/milkymist-softusb.c > +++ b/hw/milkymist-softusb.c > @@ -54,10 +54,11 @@ struct MilkymistSoftUsbState { > MemoryRegion dmem; > qemu_irq irq; >=20=20 > + void *pmem_ptr; > + void *dmem_ptr; > + > /* device properties */ > - uint32_t pmem_base; > uint32_t pmem_size; > - uint32_t dmem_base; > uint32_t dmem_size; >=20=20 > /* device registers */ > @@ -134,7 +135,7 @@ static inline void softusb_read_dmem(MilkymistSoftUsb= State *s, > return; > } >=20=20 > - cpu_physical_memory_read(s->dmem_base + offset, buf, len); > + memcpy(buf, s->dmem_ptr + offset, len); > } >=20=20 > static inline void softusb_write_dmem(MilkymistSoftUsbState *s, > @@ -146,7 +147,7 @@ static inline void softusb_write_dmem(MilkymistSoftUs= bState *s, > return; > } >=20=20 > - cpu_physical_memory_write(s->dmem_base + offset, buf, len); > + memcpy(s->dmem_ptr + offset, buf, len); > } >=20=20 > static inline void softusb_read_pmem(MilkymistSoftUsbState *s, > @@ -158,7 +159,7 @@ static inline void softusb_read_pmem(MilkymistSoftUsb= State *s, > return; > } >=20=20 > - cpu_physical_memory_read(s->pmem_base + offset, buf, len); > + memcpy(buf, s->pmem_ptr + offset, len); > } >=20=20 > static inline void softusb_write_pmem(MilkymistSoftUsbState *s, > @@ -170,7 +171,7 @@ static inline void softusb_write_pmem(MilkymistSoftUs= bState *s, > return; > } >=20=20 > - cpu_physical_memory_write(s->pmem_base + offset, buf, len); > + memcpy(s->pmem_ptr + offset, buf, len); > } >=20=20 > static void softusb_mouse_changed(MilkymistSoftUsbState *s) > @@ -270,11 +271,13 @@ static int milkymist_softusb_init(SysBusDevice *dev) > memory_region_init_ram(&s->pmem, "milkymist-softusb.pmem", > s->pmem_size); > vmstate_register_ram_global(&s->pmem); > - sysbus_add_memory(dev, s->pmem_base, &s->pmem); > + s->pmem_ptr =3D memory_region_get_ram_ptr(&s->pmem); > + sysbus_init_mmio(dev, &s->pmem); > memory_region_init_ram(&s->dmem, "milkymist-softusb.dmem", > s->dmem_size); > vmstate_register_ram_global(&s->dmem); > - sysbus_add_memory(dev, s->dmem_base, &s->dmem); > + s->dmem_ptr =3D memory_region_get_ram_ptr(&s->dmem); > + sysbus_init_mmio(dev, &s->dmem); >=20=20 > hid_init(&s->hid_kbd, HID_KEYBOARD, softusb_kbd_hid_datain); > hid_init(&s->hid_mouse, HID_MOUSE, softusb_mouse_hid_datain); > @@ -298,9 +301,7 @@ static const VMStateDescription vmstate_milkymist_sof= tusb =3D { > }; >=20=20 > static Property milkymist_softusb_properties[] =3D { > - DEFINE_PROP_UINT32("pmem_base", MilkymistSoftUsbState, pmem_base, 0x= a0000000), > DEFINE_PROP_UINT32("pmem_size", MilkymistSoftUsbState, pmem_size, 0x= 00001000), > - DEFINE_PROP_UINT32("dmem_base", MilkymistSoftUsbState, dmem_base, 0x= a0020000), > DEFINE_PROP_UINT32("dmem_size", MilkymistSoftUsbState, dmem_size, 0x= 00002000), > DEFINE_PROP_END_OF_LIST(), > }; > --=20 > 1.7.9.5