Message ID | 20220830190048.67448-7-shentey@gmail.com |
---|---|
State | New |
Headers | show |
Series | Instantiate VT82xx functions in host device | expand |
On Tue, 30 Aug 2022, Bernhard Beschow wrote: > The USB functions can be enabled/disabled through the ISA function. Also > its interrupt routing can be influenced there. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > hw/isa/vt82c686.c | 12 ++++++++++++ > hw/mips/fuloong2e.c | 3 --- > hw/ppc/pegasos2.c | 4 ---- > 3 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c > index 9d946cea54..6aba7f29de 100644 > --- a/hw/isa/vt82c686.c > +++ b/hw/isa/vt82c686.c > @@ -23,6 +23,7 @@ > #include "hw/intc/i8259.h" > #include "hw/irq.h" > #include "hw/dma/i8257.h" > +#include "hw/usb/hcd-uhci.h" > #include "hw/timer/i8254.h" > #include "hw/rtc/mc146818rtc.h" > #include "migration/vmstate.h" > @@ -546,6 +547,7 @@ struct ViaISAState { > qemu_irq *isa_irqs; > ViaSuperIOState via_sio; > PCIIDEState ide; > + UHCIState uhci[2]; > }; > > static const VMStateDescription vmstate_via = { > @@ -563,6 +565,8 @@ static void via_isa_init(Object *obj) > ViaISAState *s = VIA_ISA(obj); > > object_initialize_child(obj, "ide", &s->ide, "via-ide"); > + object_initialize_child(obj, "uhci1", &s->uhci[0], "vt82c686b-usb-uhci"); > + object_initialize_child(obj, "uhci2", &s->uhci[1], "vt82c686b-usb-uhci"); > } > > static const TypeInfo via_isa_info = { > @@ -629,6 +633,14 @@ static void via_isa_realize(PCIDevice *d, Error **errp) > if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { > return; > } > + > + /* Functions 2-3: USB Ports */ > + for (i = 0; i < ARRAY_SIZE(s->uhci); ++i) { It does not really matter but Usually i++ is used in for loops so seeing ++i here is a bit odd but this alone isn't worth a new version. Regards, BALATON Zoltan > + qdev_prop_set_int32(DEVICE(&s->uhci[i]), "addr", d->devfn + 2 + i); > + if (!qdev_realize(DEVICE(&s->uhci[i]), BUS(pci_bus), errp)) { > + return; > + } > + } > } > > /* TYPE_VT82C686B_ISA */ > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index 32605901e7..dc92223b76 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -208,9 +208,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, > dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); > pci_ide_create_devs(dev); > > - pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); > - pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); > - > dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); > *i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); > > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c > index 8bc528a560..85cca6f7a6 100644 > --- a/hw/ppc/pegasos2.c > +++ b/hw/ppc/pegasos2.c > @@ -168,10 +168,6 @@ static void pegasos2_init(MachineState *machine) > dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); > pci_ide_create_devs(dev); > > - /* VT8231 function 2-3: USB Ports */ > - pci_create_simple(pci_bus, PCI_DEVFN(12, 2), "vt82c686b-usb-uhci"); > - pci_create_simple(pci_bus, PCI_DEVFN(12, 3), "vt82c686b-usb-uhci"); > - > /* VT8231 function 4: Power Management Controller */ > dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM); > i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); >
Am 31. August 2022 00:33:33 MESZ schrieb BALATON Zoltan <balaton@eik.bme.hu>: >On Tue, 30 Aug 2022, Bernhard Beschow wrote: >> The USB functions can be enabled/disabled through the ISA function. Also >> its interrupt routing can be influenced there. >> >> Signed-off-by: Bernhard Beschow <shentey@gmail.com> >> --- >> hw/isa/vt82c686.c | 12 ++++++++++++ >> hw/mips/fuloong2e.c | 3 --- >> hw/ppc/pegasos2.c | 4 ---- >> 3 files changed, 12 insertions(+), 7 deletions(-) >> >> diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c >> index 9d946cea54..6aba7f29de 100644 >> --- a/hw/isa/vt82c686.c >> +++ b/hw/isa/vt82c686.c >> @@ -23,6 +23,7 @@ >> #include "hw/intc/i8259.h" >> #include "hw/irq.h" >> #include "hw/dma/i8257.h" >> +#include "hw/usb/hcd-uhci.h" >> #include "hw/timer/i8254.h" >> #include "hw/rtc/mc146818rtc.h" >> #include "migration/vmstate.h" >> @@ -546,6 +547,7 @@ struct ViaISAState { >> qemu_irq *isa_irqs; >> ViaSuperIOState via_sio; >> PCIIDEState ide; >> + UHCIState uhci[2]; >> }; >> >> static const VMStateDescription vmstate_via = { >> @@ -563,6 +565,8 @@ static void via_isa_init(Object *obj) >> ViaISAState *s = VIA_ISA(obj); >> >> object_initialize_child(obj, "ide", &s->ide, "via-ide"); >> + object_initialize_child(obj, "uhci1", &s->uhci[0], "vt82c686b-usb-uhci"); >> + object_initialize_child(obj, "uhci2", &s->uhci[1], "vt82c686b-usb-uhci"); >> } >> >> static const TypeInfo via_isa_info = { >> @@ -629,6 +633,14 @@ static void via_isa_realize(PCIDevice *d, Error **errp) >> if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { >> return; >> } >> + >> + /* Functions 2-3: USB Ports */ >> + for (i = 0; i < ARRAY_SIZE(s->uhci); ++i) { > >It does not really matter but Usually i++ is used in for loops so seeing ++i here is a bit odd but this alone isn't worth a new version. Fixed in v3. Regards, Bernhard > >Regards, >BALATON Zoltan > >> + qdev_prop_set_int32(DEVICE(&s->uhci[i]), "addr", d->devfn + 2 + i); >> + if (!qdev_realize(DEVICE(&s->uhci[i]), BUS(pci_bus), errp)) { >> + return; >> + } >> + } >> } >> >> /* TYPE_VT82C686B_ISA */ >> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c >> index 32605901e7..dc92223b76 100644 >> --- a/hw/mips/fuloong2e.c >> +++ b/hw/mips/fuloong2e.c >> @@ -208,9 +208,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, >> dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); >> pci_ide_create_devs(dev); >> >> - pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); >> - pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); >> - >> dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); >> *i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); >> >> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c >> index 8bc528a560..85cca6f7a6 100644 >> --- a/hw/ppc/pegasos2.c >> +++ b/hw/ppc/pegasos2.c >> @@ -168,10 +168,6 @@ static void pegasos2_init(MachineState *machine) >> dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); >> pci_ide_create_devs(dev); >> >> - /* VT8231 function 2-3: USB Ports */ >> - pci_create_simple(pci_bus, PCI_DEVFN(12, 2), "vt82c686b-usb-uhci"); >> - pci_create_simple(pci_bus, PCI_DEVFN(12, 3), "vt82c686b-usb-uhci"); >> - >> /* VT8231 function 4: Power Management Controller */ >> dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM); >> i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); >>
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 9d946cea54..6aba7f29de 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -23,6 +23,7 @@ #include "hw/intc/i8259.h" #include "hw/irq.h" #include "hw/dma/i8257.h" +#include "hw/usb/hcd-uhci.h" #include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "migration/vmstate.h" @@ -546,6 +547,7 @@ struct ViaISAState { qemu_irq *isa_irqs; ViaSuperIOState via_sio; PCIIDEState ide; + UHCIState uhci[2]; }; static const VMStateDescription vmstate_via = { @@ -563,6 +565,8 @@ static void via_isa_init(Object *obj) ViaISAState *s = VIA_ISA(obj); object_initialize_child(obj, "ide", &s->ide, "via-ide"); + object_initialize_child(obj, "uhci1", &s->uhci[0], "vt82c686b-usb-uhci"); + object_initialize_child(obj, "uhci2", &s->uhci[1], "vt82c686b-usb-uhci"); } static const TypeInfo via_isa_info = { @@ -629,6 +633,14 @@ static void via_isa_realize(PCIDevice *d, Error **errp) if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { return; } + + /* Functions 2-3: USB Ports */ + for (i = 0; i < ARRAY_SIZE(s->uhci); ++i) { + qdev_prop_set_int32(DEVICE(&s->uhci[i]), "addr", d->devfn + 2 + i); + if (!qdev_realize(DEVICE(&s->uhci[i]), BUS(pci_bus), errp)) { + return; + } + } } /* TYPE_VT82C686B_ISA */ diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 32605901e7..dc92223b76 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -208,9 +208,6 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); pci_ide_create_devs(dev); - pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); - pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); - dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM); *i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 8bc528a560..85cca6f7a6 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -168,10 +168,6 @@ static void pegasos2_init(MachineState *machine) dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); pci_ide_create_devs(dev); - /* VT8231 function 2-3: USB Ports */ - pci_create_simple(pci_bus, PCI_DEVFN(12, 2), "vt82c686b-usb-uhci"); - pci_create_simple(pci_bus, PCI_DEVFN(12, 3), "vt82c686b-usb-uhci"); - /* VT8231 function 4: Power Management Controller */ dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM); i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
The USB functions can be enabled/disabled through the ISA function. Also its interrupt routing can be influenced there. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/isa/vt82c686.c | 12 ++++++++++++ hw/mips/fuloong2e.c | 3 --- hw/ppc/pegasos2.c | 4 ---- 3 files changed, 12 insertions(+), 7 deletions(-)