Commit 03756c84 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

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



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent bbcc635f

hw/pci-host/uninorth.c

+16 −0
Original line number Diff line number Diff line
@@ -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)

{

    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)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass);



    dc->realize = pci_unin_main_realize;

    dc->props = pci_unin_main_pci_host_props;

    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 = {

hw/ppc/mac_newworld.c

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ static void ppc_core99_init(MachineState *machine) 


        /* Uninorth main bus */

        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",

                                 &error_abort);

        qdev_init_nofail(dev);

include/hw/pci-host/uninorth.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
typedef struct UNINHostState {

    PCIHostState parent_obj;



    uint32_t ofw_addr;

    OpenPICState *pic;

    qemu_irq irqs[4];

    MemoryRegion pci_mmio;