mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/grlib_irqmp: add ncpus property

Browse Source 
This adds a "ncpus" property to the "grlib-irqmp" device to be used
later, this required a little refactoring of how we initialize the
device (ie: use realize instead of init).

Co-developed-by: Frederic Konrad <konrad.frederic@yahoo.fr>
Signed-off-by: Clément Chigot <chigot@adacore.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240131085047.18458-3-chigot@adacore.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Clément Chigot 2024-01-31 09:50:40 +01:00 committed by Philippe Mathieu-Daudé
parent f432962e72
commit 6bf1478543
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/intc/grlib_irqmp.c
View File

@ -1,7 +1,7 @@
/* /*
* QEMU GRLIB IRQMP Emulator * QEMU GRLIB IRQMP Emulator
* *
* (Multiprocessor and extended interrupt not supported) * (Extended interrupt not supported)
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@ -63,6 +63,7 @@ struct IRQMP {
MemoryRegion iomem; MemoryRegion iomem;
unsigned int ncpus;
IRQMPState *state; IRQMPState *state;
qemu_irq irq; qemu_irq irq;
}; };
@ -326,33 +327,44 @@ static void grlib_irqmp_reset(DeviceState *d)
irqmp->state->parent = irqmp; irqmp->state->parent = irqmp;
} }
static void grlib_irqmp_init(Object *obj) static void grlib_irqmp_realize(DeviceState *dev, Error **errp)
{ {
IRQMP *irqmp = GRLIB_IRQMP(obj); IRQMP *irqmp = GRLIB_IRQMP(dev);
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
qdev_init_gpio_in(DEVICE(obj), grlib_irqmp_set_irq, MAX_PILS); if ((!irqmp->ncpus) || (irqmp->ncpus > IRQMP_MAX_CPU)) {
qdev_init_gpio_out_named(DEVICE(obj), &irqmp->irq, "grlib-irq", 1); error_setg(errp, "Invalid ncpus properties: "
memory_region_init_io(&irqmp->iomem, obj, &grlib_irqmp_ops, irqmp, "%u, must be 0 < ncpus =< %u.", irqmp->ncpus,
IRQMP_MAX_CPU);
}
qdev_init_gpio_in(dev, grlib_irqmp_set_irq, MAX_PILS);
qdev_init_gpio_out_named(dev, &irqmp->irq, "grlib-irq", 1);
memory_region_init_io(&irqmp->iomem, OBJECT(dev), &grlib_irqmp_ops, irqmp,
"irqmp", IRQMP_REG_SIZE); "irqmp", IRQMP_REG_SIZE);
irqmp->state = g_malloc0(sizeof *irqmp->state); irqmp->state = g_malloc0(sizeof *irqmp->state);
sysbus_init_mmio(dev, &irqmp->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &irqmp->iomem);
} }
static Property grlib_irqmp_properties[] = {
DEFINE_PROP_UINT32("ncpus", IRQMP, ncpus, 1),
DEFINE_PROP_END_OF_LIST(),
};
static void grlib_irqmp_class_init(ObjectClass *klass, void *data) static void grlib_irqmp_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = grlib_irqmp_realize;
dc->reset = grlib_irqmp_reset; dc->reset = grlib_irqmp_reset;
device_class_set_props(dc, grlib_irqmp_properties);
} }
static const TypeInfo grlib_irqmp_info = { static const TypeInfo grlib_irqmp_info = {
.name = TYPE_GRLIB_IRQMP, .name = TYPE_GRLIB_IRQMP,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IRQMP), .instance_size = sizeof(IRQMP),
.instance_init = grlib_irqmp_init,
.class_init = grlib_irqmp_class_init, .class_init = grlib_irqmp_class_init,
}; };

2
hw/sparc/leon3.c
View File

@ -264,11 +264,11 @@ static void leon3_generic_hw_init(MachineState *machine)
/* Allocate IRQ manager */ /* Allocate IRQ manager */
irqmpdev = qdev_new(TYPE_GRLIB_IRQMP); irqmpdev = qdev_new(TYPE_GRLIB_IRQMP);
sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal);
qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in, qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in,
env, "pil", 1); env, "pil", 1);
qdev_connect_gpio_out_named(irqmpdev, "grlib-irq", 0, qdev_connect_gpio_out_named(irqmpdev, "grlib-irq", 0,
qdev_get_gpio_in_named(DEVICE(cpu), "pil", 0)); qdev_get_gpio_in_named(DEVICE(cpu), "pil", 0));
sysbus_realize_and_unref(SYS_BUS_DEVICE(irqmpdev), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(irqmpdev), 0, LEON3_IRQMP_OFFSET); sysbus_mmio_map(SYS_BUS_DEVICE(irqmpdev), 0, LEON3_IRQMP_OFFSET);
env->irq_manager = irqmpdev; env->irq_manager = irqmpdev;
env->qemu_irq_ack = leon3_irq_manager; env->qemu_irq_ack = leon3_irq_manager;