mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
hw/loongarch/virt: Modify ipi as percpu device
ipi is used to communicate between cpus, this patch modified loongarch ipi device as percpu device, so that there are 2 MemoryRegions with ipi device, rather than 2*cpus MemoryRegions, which may be large than QDEV_MAX_MMIO if more cpus are added on loongarch virt machine. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Song Gao <gaosong@loongson.cn> Message-Id: <20230512100421.1867848-2-gaosong@loongson.cn>
This commit is contained in:
parent
7318c62215
commit
78464f023b
4 changed files with 26 additions and 41 deletions
|
@ -201,55 +201,43 @@ static const MemoryRegionOps loongarch_ipi64_ops = {
|
|||
|
||||
static void loongarch_ipi_init(Object *obj)
|
||||
{
|
||||
int cpu;
|
||||
LoongArchMachineState *lams;
|
||||
LoongArchIPI *s = LOONGARCH_IPI(obj);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
||||
Object *machine = qdev_get_machine();
|
||||
ObjectClass *mc = object_get_class(machine);
|
||||
/* 'lams' should be initialized */
|
||||
if (!strcmp(MACHINE_CLASS(mc)->name, "none")) {
|
||||
return;
|
||||
}
|
||||
lams = LOONGARCH_MACHINE(machine);
|
||||
for (cpu = 0; cpu < MAX_IPI_CORE_NUM; cpu++) {
|
||||
memory_region_init_io(&s->ipi_iocsr_mem[cpu], obj, &loongarch_ipi_ops,
|
||||
&lams->ipi_core[cpu], "loongarch_ipi_iocsr", 0x48);
|
||||
|
||||
/* loongarch_ipi_iocsr performs re-entrant IO through ipi_send */
|
||||
s->ipi_iocsr_mem[cpu].disable_reentrancy_guard = true;
|
||||
memory_region_init_io(&s->ipi_iocsr_mem, obj, &loongarch_ipi_ops,
|
||||
&s->ipi_core, "loongarch_ipi_iocsr", 0x48);
|
||||
|
||||
sysbus_init_mmio(sbd, &s->ipi_iocsr_mem[cpu]);
|
||||
/* loongarch_ipi_iocsr performs re-entrant IO through ipi_send */
|
||||
s->ipi_iocsr_mem.disable_reentrancy_guard = true;
|
||||
|
||||
memory_region_init_io(&s->ipi64_iocsr_mem[cpu], obj, &loongarch_ipi64_ops,
|
||||
&lams->ipi_core[cpu], "loongarch_ipi64_iocsr", 0x118);
|
||||
sysbus_init_mmio(sbd, &s->ipi64_iocsr_mem[cpu]);
|
||||
qdev_init_gpio_out(DEVICE(obj), &lams->ipi_core[cpu].irq, 1);
|
||||
}
|
||||
sysbus_init_mmio(sbd, &s->ipi_iocsr_mem);
|
||||
|
||||
memory_region_init_io(&s->ipi64_iocsr_mem, obj, &loongarch_ipi64_ops,
|
||||
&s->ipi_core, "loongarch_ipi64_iocsr", 0x118);
|
||||
sysbus_init_mmio(sbd, &s->ipi64_iocsr_mem);
|
||||
qdev_init_gpio_out(DEVICE(obj), &s->ipi_core.irq, 1);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_ipi_core = {
|
||||
.name = "ipi-single",
|
||||
.version_id = 0,
|
||||
.minimum_version_id = 0,
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32(status, IPICore),
|
||||
VMSTATE_UINT32(en, IPICore),
|
||||
VMSTATE_UINT32(set, IPICore),
|
||||
VMSTATE_UINT32(clear, IPICore),
|
||||
VMSTATE_UINT32_ARRAY(buf, IPICore, MAX_IPI_MBX_NUM * 2),
|
||||
VMSTATE_UINT32_ARRAY(buf, IPICore, 2),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_loongarch_ipi = {
|
||||
.name = TYPE_LOONGARCH_IPI,
|
||||
.version_id = 0,
|
||||
.minimum_version_id = 0,
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_STRUCT_ARRAY(ipi_core, LoongArchMachineState,
|
||||
MAX_IPI_CORE_NUM, 0,
|
||||
vmstate_ipi_core, IPICore),
|
||||
VMSTATE_STRUCT(ipi_core, LoongArchIPI, 0, vmstate_ipi_core, IPICore),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue