Commit da4aeff9 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Eduardo Habkost
Browse files

hw/microblaze/zynqmp: Let the SoC manage the IPI devices 



The Inter Processor Interrupt is a block part of the SoC, not the
"machine" (See Zynq UltraScale+ Device TRM UG1085, "Platform
Management Unit", Power Domains and Islands).

Move the IPI management from the machine to the SoC.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190507163416.24647-13-philmd@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent a8ae92e0

hw/microblaze/xlnx-zynqmp-pmu.c

+16 −20
Original line number Diff line number Diff line
@@ -68,6 +68,13 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) 


    sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc),

                          TYPE_XLNX_PMU_IO_INTC);



    /* Create the IPI device */

    for (int i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {

        object_initialize(&s->ipi[i], sizeof(XlnxZynqMPIPI),

                          TYPE_XLNX_ZYNQMP_IPI);

        qdev_set_parent_bus(DEVICE(&s->ipi[i]), sysbus_get_default());

    }

}



static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp)
@@ -113,6 +120,15 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->intc), 0, XLNX_ZYNQMP_PMU_INTC_ADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->intc), 0,

                       qdev_get_gpio_in(DEVICE(&s->cpu), MB_CPU_IRQ));



    /* Connect the IPI device */

    for (int i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {

        object_property_set_bool(OBJECT(&s->ipi[i]), true, "realized",

                                 &error_abort);

        sysbus_mmio_map(SYS_BUS_DEVICE(&s->ipi[i]), 0, ipi_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->ipi[i]), 0,

                           qdev_get_gpio_in(DEVICE(&s->intc), ipi_irq[i]));

    }

}



static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data)
@@ -145,8 +161,6 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) 
    MemoryRegion *address_space_mem = get_system_memory();

    MemoryRegion *pmu_rom = g_new(MemoryRegion, 1);

    MemoryRegion *pmu_ram = g_new(MemoryRegion, 1);

    qemu_irq irq[32];

    int i;



    /* Create the ROM */

    memory_region_init_rom(pmu_rom, NULL, "xlnx-zynqmp-pmu.rom",
@@ -166,24 +180,6 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) 
                              &error_abort);

    object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal);



    for (i = 0; i < 32; i++) {

        irq[i] = qdev_get_gpio_in(DEVICE(&pmu->intc), i);

    }



    /* Create and connect the IPI device */

    for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {

        object_initialize(&pmu->ipi[i], sizeof(XlnxZynqMPIPI),

                          TYPE_XLNX_ZYNQMP_IPI);

        qdev_set_parent_bus(DEVICE(&pmu->ipi[i]), sysbus_get_default());

    }



    for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) {

        object_property_set_bool(OBJECT(&pmu->ipi[i]), true, "realized",

                                 &error_abort);

        sysbus_mmio_map(SYS_BUS_DEVICE(&pmu->ipi[i]), 0, ipi_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&pmu->ipi[i]), 0, irq[ipi_irq[i]]);

    }



    /* Load the kernel */

    microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,

                           machine->ram_size,