@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "hw/isa/isa.h"
+#include "hw/pci/pci_bus.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
#include "sysemu/blockdev.h"
@@ -62,3 +63,16 @@ void isa_ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)
iobase2, ide_portio2_list, bus, "ide");
}
}
+
+void pci_ide_init_ioport(IDEBus *bus, PCIDevice *dev, int iobase, int iobase2)
+{
+ assert(dev);
+
+ pci_register_portio_list(dev, &bus->portio_list,
+ iobase, ide_portio_list, bus, "ide");
+
+ if (iobase2) {
+ pci_register_portio_list(dev, &bus->portio2_list,
+ iobase2, ide_portio2_list, bus, "ide");
+ }
+}
@@ -1440,6 +1440,24 @@ pcibus_t pci_bar_address(PCIDevice *d,
return new_addr;
}
+void pci_register_portio_list(PCIDevice *dev,
+ PortioList *piolist, uint16_t start,
+ const MemoryRegionPortio *pio_start,
+ void *opaque, const char *name)
+{
+ PCIBus *bus;
+
+ assert(dev);
+ assert(piolist && !piolist->owner);
+
+ bus = pci_get_bus(dev);
+
+ assert(bus);
+
+ portio_list_init(piolist, OBJECT(dev), pio_start, opaque, name);
+ portio_list_add(piolist, bus->address_space_io, start);
+}
+
static void pci_update_mappings(PCIDevice *d)
{
PCIIORegion *r;
@@ -625,6 +625,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind,
void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_exit(IDEState *s);
void isa_ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2);
+void pci_ide_init_ioport(IDEBus *bus, PCIDevice *isa, int iobase, int iobase2);
void ide_register_restart_cb(IDEBus *bus);
void ide_exec_cmd(IDEBus *bus, uint32_t val);
@@ -522,6 +522,27 @@ void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque);
pcibus_t pci_bar_address(PCIDevice *d,
int reg, uint8_t type, pcibus_t size);
+/**
+ * pci_register_portio_list: Initialize a set of io ports
+ *
+ * Several ISA devices have many dis-joint I/O ports. Worse, these I/O
+ * ports can be interleaved with I/O ports from other devices. This
+ * function makes it easy to create multiple MemoryRegions for a single
+ * device and use the legacy portio routines.
+ *
+ * @dev: the PCIDevice against which these are registered
+ * @piolist: the PortioList associated with the io ports
+ * @start: the base I/O port against which the portio->offset is applied.
+ * @portio: the ports, sorted by offset.
+ * @opaque: passed into the portio callbacks.
+ * @name: passed into memory_region_init_io.
+ */
+void pci_register_portio_list(PCIDevice *dev,
+ PortioList *piolist,
+ uint16_t start,
+ const MemoryRegionPortio *portio,
+ void *opaque, const char *name);
+
static inline void
pci_set_byte(uint8_t *config, uint8_t val)
{
pci_ide_init_ioport() and pci_register_portio_list() are introduced which mirror their ISA counterparts. But rather than asking for an ISADevice, the functions ask for PCIDevice which can be used in hw/ide/piix which fixes having to pass a NULL ISADevice which is not avialable there. Passing NULL as ISADevice to pci_ide_init_ioport() also causes a NULL ISADevice to be passed to isa_register_ioport(). Currently this function always uses the isabus global. To fix this, we'll want to determine the ISABus using isa_bus_from_device(), so no call-site must pass a NULL ISADevice. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/ide/ioport.c | 14 ++++++++++++++ hw/pci/pci.c | 18 ++++++++++++++++++ include/hw/ide/internal.h | 1 + include/hw/pci/pci.h | 21 +++++++++++++++++++++ 4 files changed, 54 insertions(+)