david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ohci: Allow sysbus version to be used as a companion

Browse Source 
Some PPC SoCs have an EHCI with OHCI companion USB controller. To
emulate this allow the sysbus version of OHCI to be used as a companion.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
BALATON Zoltan 2017-09-16 16:02:41 +02:00 committed by David Gibson
parent 712b25c4cb
commit d7145b66c6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/usb/hcd-ohci.c
View File

@ -1999,7 +1999,9 @@ typedef struct {
/*< public >*/ /*< public >*/
OHCIState ohci; OHCIState ohci;
char *masterbus;
uint32_t num_ports; uint32_t num_ports;
uint32_t firstport;
dma_addr_t dma_offset; dma_addr_t dma_offset;
} OHCISysBusState; } OHCISysBusState;
@ -2007,10 +2009,15 @@ static void ohci_realize_pxa(DeviceState *dev, Error **errp)
{ {
OHCISysBusState *s = SYSBUS_OHCI(dev); OHCISysBusState *s = SYSBUS_OHCI(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
Error *err = NULL;
/* Cannot fail as we pass NULL for masterbus */ usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset,
usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, NULL, 0, s->masterbus, s->firstport,
&address_space_memory, &error_abort); &address_space_memory, &err);
if (err) {
error_propagate(errp, err);
return;
}
sysbus_init_irq(sbd, &s->ohci.irq); sysbus_init_irq(sbd, &s->ohci.irq);
sysbus_init_mmio(sbd, &s->ohci.mem); sysbus_init_mmio(sbd, &s->ohci.mem);
} }
@ -2142,7 +2149,9 @@ static const TypeInfo ohci_pci_info = {
}; };
static Property ohci_sysbus_properties[] = { static Property ohci_sysbus_properties[] = {
DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3),
DEFINE_PROP_UINT32("firstport", OHCISysBusState, firstport, 0),
DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 0), DEFINE_PROP_DMAADDR("dma-offset", OHCISysBusState, dma_offset, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };