david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grackle: set device fw_name and address for correct fw path generation

Browse Source 
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:08 +01:00 committed by David Gibson
parent 5c8e3d17ed
commit ac43eb2e13
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/pci-host/grackle.c
View File

@ -37,6 +37,7 @@
typedef struct GrackleState { typedef struct GrackleState {
PCIHostState parent_obj; PCIHostState parent_obj;
uint32_t ofw_addr;
HeathrowState *pic; HeathrowState *pic;
qemu_irq irqs[4]; qemu_irq irqs[4];
MemoryRegion pci_mmio; MemoryRegion pci_mmio;
@ -146,12 +147,28 @@ static const TypeInfo grackle_pci_info = {
}, },
}; };
static char *grackle_ofw_unit_address(const SysBusDevice *dev)
{
GrackleState *s = GRACKLE_PCI_HOST_BRIDGE(dev);
return g_strdup_printf("%x", s->ofw_addr);
}
static Property grackle_properties[] = {
DEFINE_PROP_UINT32("ofw-addr", GrackleState, ofw_addr, -1),
DEFINE_PROP_END_OF_LIST()
};
static void grackle_class_init(ObjectClass *klass, void *data) static void grackle_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 = grackle_realize; dc->realize = grackle_realize;
dc->props = grackle_properties;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "pci";
sbc->explicit_ofw_unit_address = grackle_ofw_unit_address;
} }
static const TypeInfo grackle_host_info = { static const TypeInfo grackle_host_info = {

1
hw/ppc/mac_oldworld.c
View File

@ -254,6 +254,7 @@ static void ppc_heathrow_init(MachineState *machine)
/* Grackle PCI host bridge */ /* Grackle PCI host bridge */
dev = qdev_create(NULL, TYPE_GRACKLE_PCI_HOST_BRIDGE); dev = qdev_create(NULL, TYPE_GRACKLE_PCI_HOST_BRIDGE);
qdev_prop_set_uint32(dev, "ofw-addr", 0x80000000);
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);