ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uninorth: add ofw-addr property to allow correct fw path generation 

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-08-29 17:59:10 +01:00 committed by David Gibson
parent bbcc635fcd
commit 03756c840e
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/pci-host/uninorth.c
View File

@ -118,6 +118,13 @@ static void pci_unin_init_irqs(UNINHostState *s)
} }
} }
static char *pci_unin_main_ofw_unit_address(const SysBusDevice *dev)
{
UNINHostState *s = UNI_NORTH_PCI_HOST_BRIDGE(dev);
return g_strdup_printf("%x", s->ofw_addr);
}
static void pci_unin_main_realize(DeviceState *dev, Error **errp) static void pci_unin_main_realize(DeviceState *dev, Error **errp)
{ {
UNINHostState *s = UNI_NORTH_PCI_HOST_BRIDGE(dev); UNINHostState *s = UNI_NORTH_PCI_HOST_BRIDGE(dev);
@ -455,12 +462,21 @@ static const TypeInfo unin_internal_pci_host_info = {
}, },
}; };
static Property pci_unin_main_pci_host_props[] = {
DEFINE_PROP_UINT32("ofw-addr", UNINHostState, ofw_addr, -1),
DEFINE_PROP_END_OF_LIST()
};
static void pci_unin_main_class_init(ObjectClass *klass, void *data) static void pci_unin_main_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);
dc->realize = pci_unin_main_realize; dc->realize = pci_unin_main_realize;
dc->props = pci_unin_main_pci_host_props;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "pci";
sbc->explicit_ofw_unit_address = pci_unin_main_ofw_unit_address;
} }
static const TypeInfo pci_unin_main_info = { static const TypeInfo pci_unin_main_info = {

1
hw/ppc/mac_newworld.c
View File

@ -344,6 +344,7 @@ static void ppc_core99_init(MachineState *machine)
/* Uninorth main bus */ /* Uninorth main bus */
dev = qdev_create(NULL, TYPE_UNI_NORTH_PCI_HOST_BRIDGE); dev = qdev_create(NULL, TYPE_UNI_NORTH_PCI_HOST_BRIDGE);
qdev_prop_set_uint32(dev, "ofw-addr", 0xf2000000);
object_property_set_link(OBJECT(dev), OBJECT(pic_dev), "pic", object_property_set_link(OBJECT(dev), OBJECT(pic_dev), "pic",
&error_abort); &error_abort);
qdev_init_nofail(dev); qdev_init_nofail(dev);

1
include/hw/pci-host/uninorth.h
View File

@ -49,6 +49,7 @@
typedef struct UNINHostState { typedef struct UNINHostState {
PCIHostState parent_obj; PCIHostState parent_obj;
uint32_t ofw_addr;
OpenPICState *pic; OpenPICState *pic;
qemu_irq irqs[4]; qemu_irq irqs[4];
MemoryRegion pci_mmio; MemoryRegion pci_mmio;