From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0W9-0004xI-Ba for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:44:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur0W6-0000Hj-78 for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:44:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0W5-0000HQ-Vc for qemu-devel@nongnu.org; Mon, 24 Jun 2013 02:44:46 -0400 From: Gerd Hoffmann Date: Mon, 24 Jun 2013 08:44:36 +0200 Message-Id: <1372056283-4845-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1372056283-4845-1-git-send-email-kraxel@redhat.com> References: <1372056283-4845-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/9] usb/hcd-ehci: Split off instance_init from realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann From: Andreas F=C3=A4rber This makes the mem MemoryRegion available to derived instance_inits. Keep the bus in realize for now since naming breaks in instance_init. Signed-off-by: Andreas F=C3=A4rber Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci-pci.c | 19 ++++++++++++++----- hw/usb/hcd-ehci-sysbus.c | 16 +++++++++++++--- hw/usb/hcd-ehci.c | 28 ++++++++++++++++------------ hw/usb/hcd-ehci.h | 1 + 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index b352f73..509867d 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -60,20 +60,28 @@ static int usb_ehci_pci_initfn(PCIDevice *dev) pci_conf[0x6e] =3D 0x00; pci_conf[0x6f] =3D 0xc0; /* USBLEFCTLSTS */ =20 - s->caps[0x09] =3D 0x68; /* EECP */ - s->irq =3D dev->irq[3]; s->as =3D pci_get_address_space(dev); =20 - s->capsbase =3D 0x00; - s->opregbase =3D 0x20; - usb_ehci_realize(s, DEVICE(dev), NULL); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mem); =20 return 0; } =20 +static void usb_ehci_pci_init(Object *obj) +{ + EHCIPCIState *i =3D PCI_EHCI(obj); + EHCIState *s =3D &i->ehci; + + s->caps[0x09] =3D 0x68; /* EECP */ + + s->capsbase =3D 0x00; + s->opregbase =3D 0x20; + + usb_ehci_init(s, DEVICE(obj)); +} + static void usb_ehci_pci_write_config(PCIDevice *dev, uint32_t addr, uint32_t val, int l) { @@ -122,6 +130,7 @@ static const TypeInfo ehci_pci_type_info =3D { .name =3D TYPE_PCI_EHCI, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(EHCIPCIState), + .instance_init =3D usb_ehci_pci_init, .abstract =3D true, .class_init =3D ehci_class_init, }; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 3179e6f..e450137 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -36,15 +36,24 @@ static void usb_ehci_sysbus_realize(DeviceState *dev,= Error **errp) { SysBusDevice *d =3D SYS_BUS_DEVICE(dev); EHCISysBusState *i =3D SYS_BUS_EHCI(dev); - SysBusEHCIClass *sec =3D SYS_BUS_EHCI_GET_CLASS(dev); + EHCIState *s =3D &i->ehci; + + usb_ehci_realize(s, dev, errp); + sysbus_init_irq(d, &s->irq); +} + +static void ehci_sysbus_init(Object *obj) +{ + SysBusDevice *d =3D SYS_BUS_DEVICE(obj); + EHCISysBusState *i =3D SYS_BUS_EHCI(obj); + SysBusEHCIClass *sec =3D SYS_BUS_EHCI_GET_CLASS(obj); EHCIState *s =3D &i->ehci; =20 s->capsbase =3D sec->capsbase; s->opregbase =3D sec->opregbase; s->as =3D &address_space_memory; =20 - usb_ehci_realize(s, dev, errp); - sysbus_init_irq(d, &s->irq); + usb_ehci_init(s, DEVICE(obj)); sysbus_init_mmio(d, &s->mem); } =20 @@ -61,6 +70,7 @@ static const TypeInfo ehci_type_info =3D { .name =3D TYPE_SYS_BUS_EHCI, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(EHCISysBusState), + .instance_init =3D ehci_sysbus_init, .abstract =3D true, .class_init =3D ehci_sysbus_class_init, .class_size =3D sizeof(SysBusEHCIClass), diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index ea0379b..546032a 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2512,6 +2512,22 @@ void usb_ehci_realize(EHCIState *s, DeviceState *d= ev, Error **errp) { int i; =20 + usb_bus_new(&s->bus, &ehci_bus_ops, dev); + for (i =3D 0; i < NB_PORTS; i++) { + usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops, + USB_SPEED_MASK_HIGH); + s->ports[i].dev =3D 0; + } + + s->frame_timer =3D qemu_new_timer_ns(vm_clock, ehci_frame_timer, s); + s->async_bh =3D qemu_bh_new(ehci_frame_timer, s); + + qemu_register_reset(ehci_reset, s); + qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s); +} + +void usb_ehci_init(EHCIState *s, DeviceState *dev) +{ /* 2.2 host controller interface version */ s->caps[0x00] =3D (uint8_t)(s->opregbase - s->capsbase); s->caps[0x01] =3D 0x00; @@ -2525,22 +2541,10 @@ void usb_ehci_realize(EHCIState *s, DeviceState *= dev, Error **errp) s->caps[0x0a] =3D 0x00; s->caps[0x0b] =3D 0x00; =20 - usb_bus_new(&s->bus, &ehci_bus_ops, dev); - for(i =3D 0; i < NB_PORTS; i++) { - usb_register_port(&s->bus, &s->ports[i], s, i, &ehci_port_ops, - USB_SPEED_MASK_HIGH); - s->ports[i].dev =3D 0; - } - - s->frame_timer =3D qemu_new_timer_ns(vm_clock, ehci_frame_timer, s); - s->async_bh =3D qemu_bh_new(ehci_frame_timer, s); QTAILQ_INIT(&s->aqueues); QTAILQ_INIT(&s->pqueues); usb_packet_init(&s->ipacket); =20 - qemu_register_reset(ehci_reset, s); - qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s); - memory_region_init(&s->mem, "ehci", MMIO_SIZE); memory_region_init_io(&s->mem_caps, &ehci_mmio_caps_ops, s, "capabilities", CAPA_SIZE); diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 15c7630..7a93957 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -322,6 +322,7 @@ struct EHCIState { =20 extern const VMStateDescription vmstate_ehci; =20 +void usb_ehci_init(EHCIState *s, DeviceState *dev); void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp); =20 #define TYPE_PCI_EHCI "pci-ehci-usb" --=20 1.7.9.7