Merge remote-tracking branch 'afaerber-or/prep-up' into staging
# By Andreas Färber # Via Andreas Färber * afaerber-or/prep-up: prep: Move PReP machine to hw/ppc/ prep_pci: Convert to QOM realizefn prep_pci: Create PCIBus and PCIDevice in-place
This commit is contained in:
Anthony Liguori
commit
7cc2a8b14a
@ -395,7 +395,7 @@ PReP
|
||||
M: Andreas Färber <andreas.faerber@web.de>
|
||||
L: qemu-ppc@nongnu.org
|
||||
S: Odd Fixes
|
||||
F: hw/ppc_prep.c
|
||||
F: hw/ppc/prep.c
|
||||
F: hw/prep_pci.[hc]
|
||||
F: hw/pc87312.[hc]
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
obj-y = ppc.o ppc_booke.o
|
||||
# PREP target
|
||||
obj-y += mc146818rtc.o
|
||||
obj-y += ppc_prep.o
|
||||
# IBM pSeries (sPAPR)
|
||||
obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o
|
||||
obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
|
||||
@ -24,6 +23,8 @@ obj-y += xilinx_ethlite.o
|
||||
|
||||
obj-y := $(addprefix ../,$(obj-y))
|
||||
|
||||
# PReP
|
||||
obj-y += prep.o
|
||||
# OldWorld PowerMac
|
||||
obj-y += mac_oldworld.o
|
||||
# NewWorld PowerMac
|
||||
|
||||
@ -21,23 +21,23 @@
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
#include "hw.h"
|
||||
#include "nvram.h"
|
||||
#include "pc.h"
|
||||
#include "serial.h"
|
||||
#include "fdc.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/nvram.h"
|
||||
#include "hw/pc.h"
|
||||
#include "hw/serial.h"
|
||||
#include "hw/fdc.h"
|
||||
#include "net/net.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "isa.h"
|
||||
#include "pci/pci.h"
|
||||
#include "pci/pci_host.h"
|
||||
#include "ppc.h"
|
||||
#include "boards.h"
|
||||
#include "hw/isa.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "hw/pci/pci_host.h"
|
||||
#include "hw/ppc.h"
|
||||
#include "hw/boards.h"
|
||||
#include "qemu/log.h"
|
||||
#include "ide.h"
|
||||
#include "loader.h"
|
||||
#include "mc146818rtc.h"
|
||||
#include "pc87312.h"
|
||||
#include "hw/ide.h"
|
||||
#include "hw/loader.h"
|
||||
#include "hw/mc146818rtc.h"
|
||||
#include "hw/pc87312.h"
|
||||
#include "sysemu/blockdev.h"
|
||||
#include "sysemu/arch_init.h"
|
||||
#include "exec/address-spaces.h"
|
||||
@ -2,6 +2,7 @@
|
||||
* QEMU PREP PCI host
|
||||
*
|
||||
* Copyright (c) 2006 Fabrice Bellard
|
||||
* Copyright (c) 2011-2013 Andreas Färber
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
@ -24,12 +25,21 @@
|
||||
|
||||
#include "hw.h"
|
||||
#include "pci/pci.h"
|
||||
#include "pci/pci_bus.h"
|
||||
#include "pci/pci_host.h"
|
||||
#include "pc.h"
|
||||
#include "exec/address-spaces.h"
|
||||
|
||||
#define TYPE_RAVEN_PCI_DEVICE "raven"
|
||||
#define TYPE_RAVEN_PCI_HOST_BRIDGE "raven-pcihost"
|
||||
|
||||
#define RAVEN_PCI_DEVICE(obj) \
|
||||
OBJECT_CHECK(RavenPCIState, (obj), TYPE_RAVEN_PCI_DEVICE)
|
||||
|
||||
typedef struct RavenPCIState {
|
||||
PCIDevice dev;
|
||||
} RavenPCIState;
|
||||
|
||||
#define RAVEN_PCI_HOST_BRIDGE(obj) \
|
||||
OBJECT_CHECK(PREPPCIState, (obj), TYPE_RAVEN_PCI_HOST_BRIDGE)
|
||||
|
||||
@ -38,12 +48,10 @@ typedef struct PRePPCIState {
|
||||
|
||||
MemoryRegion intack;
|
||||
qemu_irq irq[4];
|
||||
PCIBus pci_bus;
|
||||
RavenPCIState pci_dev;
|
||||
} PREPPCIState;
|
||||
|
||||
typedef struct RavenPCIState {
|
||||
PCIDevice dev;
|
||||
} RavenPCIState;
|
||||
|
||||
static inline uint32_t PPC_PCIIO_config(hwaddr addr)
|
||||
{
|
||||
int i;
|
||||
@ -103,23 +111,19 @@ static void prep_set_irq(void *opaque, int irq_num, int level)
|
||||
qemu_set_irq(pic[irq_num] , level);
|
||||
}
|
||||
|
||||
static int raven_pcihost_init(SysBusDevice *dev)
|
||||
static void raven_pcihost_realizefn(DeviceState *d, Error **errp)
|
||||
{
|
||||
SysBusDevice *dev = SYS_BUS_DEVICE(d);
|
||||
PCIHostState *h = PCI_HOST_BRIDGE(dev);
|
||||
PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(dev);
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *address_space_io = get_system_io();
|
||||
PCIBus *bus;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
sysbus_init_irq(dev, &s->irq[i]);
|
||||
}
|
||||
|
||||
bus = pci_register_bus(DEVICE(dev), NULL,
|
||||
prep_set_irq, prep_map_irq, s->irq,
|
||||
address_space_mem, address_space_io, 0, 4);
|
||||
h->bus = bus;
|
||||
pci_bus_irqs(&s->pci_bus, prep_set_irq, prep_map_irq, s->irq, 4);
|
||||
|
||||
memory_region_init_io(&h->conf_mem, &pci_host_conf_be_ops, s,
|
||||
"pci-conf-idx", 1);
|
||||
@ -136,9 +140,29 @@ static int raven_pcihost_init(SysBusDevice *dev)
|
||||
|
||||
memory_region_init_io(&s->intack, &PPC_intack_ops, s, "pci-intack", 1);
|
||||
memory_region_add_subregion(address_space_mem, 0xbffffff0, &s->intack);
|
||||
pci_create_simple(bus, 0, "raven");
|
||||
|
||||
return 0;
|
||||
/* TODO Remove once realize propagates to child devices. */
|
||||
object_property_set_bool(OBJECT(&s->pci_dev), true, "realized", errp);
|
||||
}
|
||||
|
||||
static void raven_pcihost_initfn(Object *obj)
|
||||
{
|
||||
PCIHostState *h = PCI_HOST_BRIDGE(obj);
|
||||
PREPPCIState *s = RAVEN_PCI_HOST_BRIDGE(obj);
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *address_space_io = get_system_io();
|
||||
DeviceState *pci_dev;
|
||||
|
||||
pci_bus_new_inplace(&s->pci_bus, DEVICE(obj), NULL,
|
||||
address_space_mem, address_space_io, 0);
|
||||
h->bus = &s->pci_bus;
|
||||
|
||||
object_initialize(&s->pci_dev, TYPE_RAVEN_PCI_DEVICE);
|
||||
pci_dev = DEVICE(&s->pci_dev);
|
||||
qdev_set_parent_bus(pci_dev, BUS(&s->pci_bus));
|
||||
object_property_set_int(OBJECT(&s->pci_dev), PCI_DEVFN(0, 0), "addr",
|
||||
NULL);
|
||||
qdev_prop_set_bit(pci_dev, "multifunction", false);
|
||||
}
|
||||
|
||||
static int raven_init(PCIDevice *d)
|
||||
@ -176,7 +200,7 @@ static void raven_class_init(ObjectClass *klass, void *data)
|
||||
}
|
||||
|
||||
static const TypeInfo raven_info = {
|
||||
.name = "raven",
|
||||
.name = TYPE_RAVEN_PCI_DEVICE,
|
||||
.parent = TYPE_PCI_DEVICE,
|
||||
.instance_size = sizeof(RavenPCIState),
|
||||
.class_init = raven_class_init,
|
||||
@ -184,10 +208,9 @@ static const TypeInfo raven_info = {
|
||||
|
||||
static void raven_pcihost_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
||||
k->init = raven_pcihost_init;
|
||||
dc->realize = raven_pcihost_realizefn;
|
||||
dc->fw_name = "pci";
|
||||
dc->no_user = 1;
|
||||
}
|
||||
@ -196,6 +219,7 @@ static const TypeInfo raven_pcihost_info = {
|
||||
.name = TYPE_RAVEN_PCI_HOST_BRIDGE,
|
||||
.parent = TYPE_PCI_HOST_BRIDGE,
|
||||
.instance_size = sizeof(PREPPCIState),
|
||||
.instance_init = raven_pcihost_initfn,
|
||||
.class_init = raven_pcihost_class_init,
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user