grackle_pci: QOM'ify Grackle PCI host bridge
Introduce type constant. Introduce cast macro to drop dummy busdev field used with FROM_SYSBUS() that would've broken SYS_BUS_DEVICE(). Avoid accessing parent fields directly. Drop no-op reset function. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
ab61536737
commit
0e655047c5
|
@ -23,10 +23,9 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "sysbus.h"
|
#include "pci_host.h"
|
||||||
#include "ppc_mac.h"
|
#include "ppc_mac.h"
|
||||||
#include "pci.h"
|
#include "pci.h"
|
||||||
#include "pci_host.h"
|
|
||||||
|
|
||||||
/* debug Grackle */
|
/* debug Grackle */
|
||||||
//#define DEBUG_GRACKLE
|
//#define DEBUG_GRACKLE
|
||||||
|
@ -38,9 +37,12 @@
|
||||||
#define GRACKLE_DPRINTF(fmt, ...)
|
#define GRACKLE_DPRINTF(fmt, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define GRACKLE_PCI_HOST_BRIDGE(obj) \
|
||||||
|
OBJECT_CHECK(GrackleState, (obj), TYPE_GRACKLE_PCI_HOST_BRIDGE)
|
||||||
|
|
||||||
typedef struct GrackleState {
|
typedef struct GrackleState {
|
||||||
SysBusDevice busdev;
|
|
||||||
PCIHostState host_state;
|
PCIHostState host_state;
|
||||||
|
|
||||||
MemoryRegion pci_mmio;
|
MemoryRegion pci_mmio;
|
||||||
MemoryRegion pci_hole;
|
MemoryRegion pci_hole;
|
||||||
} GrackleState;
|
} GrackleState;
|
||||||
|
@ -59,22 +61,20 @@ static void pci_grackle_set_irq(void *opaque, int irq_num, int level)
|
||||||
qemu_set_irq(pic[irq_num + 0x15], level);
|
qemu_set_irq(pic[irq_num + 0x15], level);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pci_grackle_reset(void *opaque)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
||||||
MemoryRegion *address_space_mem,
|
MemoryRegion *address_space_mem,
|
||||||
MemoryRegion *address_space_io)
|
MemoryRegion *address_space_io)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
SysBusDevice *s;
|
SysBusDevice *s;
|
||||||
|
PCIHostState *phb;
|
||||||
GrackleState *d;
|
GrackleState *d;
|
||||||
|
|
||||||
dev = qdev_create(NULL, "grackle-pcihost");
|
dev = qdev_create(NULL, TYPE_GRACKLE_PCI_HOST_BRIDGE);
|
||||||
qdev_init_nofail(dev);
|
qdev_init_nofail(dev);
|
||||||
s = sysbus_from_qdev(dev);
|
s = SYS_BUS_DEVICE(dev);
|
||||||
d = FROM_SYSBUS(GrackleState, s);
|
phb = FROM_SYSBUS(PCIHostState, s);
|
||||||
|
d = GRACKLE_PCI_HOST_BRIDGE(dev);
|
||||||
|
|
||||||
memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL);
|
memory_region_init(&d->pci_mmio, "pci-mmio", 0x100000000ULL);
|
||||||
memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio,
|
memory_region_init_alias(&d->pci_hole, "pci-hole", &d->pci_mmio,
|
||||||
|
@ -82,7 +82,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
||||||
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
|
memory_region_add_subregion(address_space_mem, 0x80000000ULL,
|
||||||
&d->pci_hole);
|
&d->pci_hole);
|
||||||
|
|
||||||
d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",
|
phb->bus = pci_register_bus(dev, "pci",
|
||||||
pci_grackle_set_irq,
|
pci_grackle_set_irq,
|
||||||
pci_grackle_map_irq,
|
pci_grackle_map_irq,
|
||||||
pic,
|
pic,
|
||||||
|
@ -90,28 +90,27 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
||||||
address_space_io,
|
address_space_io,
|
||||||
0, 4);
|
0, 4);
|
||||||
|
|
||||||
pci_create_simple(d->host_state.bus, 0, "grackle");
|
pci_create_simple(phb->bus, 0, "grackle");
|
||||||
|
|
||||||
sysbus_mmio_map(s, 0, base);
|
sysbus_mmio_map(s, 0, base);
|
||||||
sysbus_mmio_map(s, 1, base + 0x00200000);
|
sysbus_mmio_map(s, 1, base + 0x00200000);
|
||||||
|
|
||||||
return d->host_state.bus;
|
return phb->bus;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pci_grackle_init_device(SysBusDevice *dev)
|
static int pci_grackle_init_device(SysBusDevice *dev)
|
||||||
{
|
{
|
||||||
GrackleState *s;
|
PCIHostState *phb;
|
||||||
|
|
||||||
s = FROM_SYSBUS(GrackleState, dev);
|
phb = FROM_SYSBUS(PCIHostState, dev);
|
||||||
|
|
||||||
memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops,
|
memory_region_init_io(&phb->conf_mem, &pci_host_conf_le_ops,
|
||||||
&s->host_state, "pci-conf-idx", 0x1000);
|
dev, "pci-conf-idx", 0x1000);
|
||||||
memory_region_init_io(&s->host_state.data_mem, &pci_host_data_le_ops,
|
memory_region_init_io(&phb->data_mem, &pci_host_data_le_ops,
|
||||||
&s->host_state, "pci-data-idx", 0x1000);
|
dev, "pci-data-idx", 0x1000);
|
||||||
sysbus_init_mmio(dev, &s->host_state.conf_mem);
|
sysbus_init_mmio(dev, &phb->conf_mem);
|
||||||
sysbus_init_mmio(dev, &s->host_state.data_mem);
|
sysbus_init_mmio(dev, &phb->data_mem);
|
||||||
|
|
||||||
qemu_register_reset(pci_grackle_reset, &s->host_state);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,7 +150,7 @@ static void pci_grackle_class_init(ObjectClass *klass, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo grackle_pci_host_info = {
|
static const TypeInfo grackle_pci_host_info = {
|
||||||
.name = "grackle-pcihost",
|
.name = TYPE_GRACKLE_PCI_HOST_BRIDGE,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(GrackleState),
|
.instance_size = sizeof(GrackleState),
|
||||||
.class_init = pci_grackle_class_init,
|
.class_init = pci_grackle_class_init,
|
||||||
|
|
|
@ -55,6 +55,7 @@ qemu_irq *heathrow_pic_init(MemoryRegion **pmem,
|
||||||
int nb_cpus, qemu_irq **irqs);
|
int nb_cpus, qemu_irq **irqs);
|
||||||
|
|
||||||
/* Grackle PCI */
|
/* Grackle PCI */
|
||||||
|
#define TYPE_GRACKLE_PCI_HOST_BRIDGE "grackle-pcihost"
|
||||||
PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,
|
||||||
MemoryRegion *address_space_mem,
|
MemoryRegion *address_space_mem,
|
||||||
MemoryRegion *address_space_io);
|
MemoryRegion *address_space_io);
|
||||||
|
|
Loading…
Reference in a new issue