new file mode 100644
@@ -0,0 +1,88 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2006 Openedhand Ltd.
+ * Copyright (c) 2010 CodeSourcery
+ * Copyright (c) 2024 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/irq.h"
+#include "qapi/error.h"
+#include "qemu/module.h"
+#include "qemu/timer.h"
+#include "hw/usb.h"
+#include "migration/vmstate.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-dma.h"
+#include "hw/qdev-properties.h"
+#include "trace.h"
+#include "hcd-ohci.h"
+
+
+static void ohci_sysbus_realize(DeviceState *dev, Error **errp)
+{
+ OHCISysBusState *s = SYSBUS_OHCI(dev);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ Error *err = NULL;
+
+ usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset,
+ s->masterbus, s->firstport,
+ &address_space_memory, ohci_sysbus_die, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+ sysbus_init_irq(sbd, &s->ohci.irq);
+ sysbus_init_mmio(sbd, &s->ohci.mem);
+}
+
+static void ohci_sysbus_reset(DeviceState *dev)
+{
+ OHCISysBusState *s = SYSBUS_OHCI(dev);
+ OHCIState *ohci = &s->ohci;
+
+ ohci_hard_reset(ohci);
+}
+
+static Property ohci_sysbus_properties[] = {
+ DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
+ 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_END_OF_LIST(),
+};
+
+static void ohci_sysbus_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = ohci_sysbus_realize;
+ set_bit(DEVICE_CATEGORY_USB, dc->categories);
+ dc->desc = "OHCI USB Controller";
+ device_class_set_props(dc, ohci_sysbus_properties);
+ dc->reset = ohci_sysbus_reset;
+}
+
+static const TypeInfo ohci_sysbus_types[] = {
+ {
+ .name = TYPE_SYSBUS_OHCI,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(OHCISysBusState),
+ .class_init = ohci_sysbus_class_init,
+ },
+};
+
+DEFINE_TYPES(ohci_sysbus_types);
@@ -1955,31 +1955,6 @@ void ohci_sysbus_die(struct OHCIState *ohci)
ohci_bus_stop(ohci);
}
-static void ohci_realize_pxa(DeviceState *dev, Error **errp)
-{
- OHCISysBusState *s = SYSBUS_OHCI(dev);
- SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
- Error *err = NULL;
-
- usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset,
- s->masterbus, s->firstport,
- &address_space_memory, ohci_sysbus_die, &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
- sysbus_init_irq(sbd, &s->ohci.irq);
- sysbus_init_mmio(sbd, &s->ohci.mem);
-}
-
-static void usb_ohci_reset_sysbus(DeviceState *dev)
-{
- OHCISysBusState *s = SYSBUS_OHCI(dev);
- OHCIState *ohci = &s->ohci;
-
- ohci_hard_reset(ohci);
-}
-
static const VMStateDescription vmstate_ohci_state_port = {
.name = "ohci-core/port",
.version_id = 1,
@@ -2054,36 +2029,3 @@ const VMStateDescription vmstate_ohci_state = {
NULL
}
};
-
-static Property ohci_sysbus_properties[] = {
- DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
- 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_END_OF_LIST(),
-};
-
-static void ohci_sysbus_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
-
- dc->realize = ohci_realize_pxa;
- set_bit(DEVICE_CATEGORY_USB, dc->categories);
- dc->desc = "OHCI USB Controller";
- device_class_set_props(dc, ohci_sysbus_properties);
- dc->reset = usb_ohci_reset_sysbus;
-}
-
-static const TypeInfo ohci_sysbus_info = {
- .name = TYPE_SYSBUS_OHCI,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(OHCISysBusState),
- .class_init = ohci_sysbus_class_init,
-};
-
-static void ohci_register_types(void)
-{
- type_register_static(&ohci_sysbus_info);
-}
-
-type_init(ohci_register_types)
@@ -185,7 +185,7 @@ config PXA2XX
select SERIAL
select SD
select SSI
- select USB_OHCI
+ select USB_OHCI_SYSBUS
select PCMCIA
config GUMSTIX
@@ -256,7 +256,7 @@ config REALVIEW
select PL310 # cache controller
select ARM_SBCON_I2C
select DS1338 # I2C RTC+NVRAM
- select USB_OHCI
+ select USB_OHCI_SYSBUS
config SBSA_REF
bool
@@ -339,7 +339,7 @@ config VERSATILE
select PL080 # DMA controller
select PL190 # Vector PIC
select REALVIEW
- select USB_OHCI
+ select USB_OHCI_SYSBUS
config VEXPRESS
bool
@@ -395,6 +395,7 @@ config ALLWINNER_A10
select AXP2XX_PMU
select SERIAL
select UNIMP
+ select USB_OHCI_SYSBUS
config ALLWINNER_H3
bool
@@ -408,7 +409,7 @@ config ALLWINNER_H3
select ARM_TIMER
select ARM_GIC
select UNIMP
- select USB_OHCI
+ select USB_OHCI_SYSBUS
select USB_EHCI_SYSBUS
select SD
@@ -424,7 +425,7 @@ config ALLWINNER_R40
select ARM_TIMER
select ARM_GIC
select UNIMP
- select USB_OHCI
+ select USB_OHCI_SYSBUS
select USB_EHCI_SYSBUS
select SD
@@ -530,6 +531,7 @@ config NPCM7XX
select SSI
select UNIMP
select PCA954X
+ select USB_OHCI_SYSBUS
config FSL_IMX25
bool
@@ -77,6 +77,7 @@ config SM501
select I2C
select DDC
select SERIAL
+ select USB_OHCI_SYSBUS
config TCX
bool
@@ -70,7 +70,7 @@ config SAM460EX
select SM501
select SMBUS_EEPROM
select USB_EHCI_SYSBUS
- select USB_OHCI
+ select USB_OHCI_SYSBUS
select FDT_PPC
config AMIGAONE
@@ -6,7 +6,6 @@ config R2D
select I82378 if TEST_DEVICES
select IDE_MMIO
select PFLASH_CFI02
- select USB_OHCI_PCI
select PCI
select SM501
select SH7750
@@ -11,6 +11,10 @@ config USB_OHCI
bool
select USB
+config USB_OHCI_SYSBUS
+ bool
+ select USB_OHCI
+
config USB_OHCI_PCI
bool
default y if PCI_DEVICES
@@ -15,6 +15,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files(
system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c'))
system_ss.add(when: 'CONFIG_USB_OHCI', if_true: files('hcd-ohci.c'))
system_ss.add(when: 'CONFIG_USB_OHCI_PCI', if_true: files('hcd-ohci-pci.c'))
+system_ss.add(when: 'CONFIG_USB_OHCI_SYSBUS', if_true: files('hcd-ohci-sysbus.c'))
system_ss.add(when: 'CONFIG_USB_EHCI', if_true: files('hcd-ehci.c'))
system_ss.add(when: 'CONFIG_USB_EHCI_PCI', if_true: files('hcd-ehci-pci.c'))
system_ss.add(when: 'CONFIG_USB_EHCI_SYSBUS', if_true: files('hcd-ehci.c', 'hcd-ehci-sysbus.c'))