mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-15 07:23:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

hw/loongarch/virt: Modify ipi as percpu device

Browse Source 
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:
Song Gao 2023-04-06 14:57:27 +08:00
parent 7318c62215
commit 78464f023b
No known key found for this signature in database
GPG Key ID: 40A2FFF239263EDF
4 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hw/intc/loongarch_ipi.c
View File

@ -201,55 +201,43 @@ static const MemoryRegionOps loongarch_ipi64_ops = {
static void loongarch_ipi_init(Object *obj) static void loongarch_ipi_init(Object *obj)
{ {
int cpu;
LoongArchMachineState *lams;
LoongArchIPI *s = LOONGARCH_IPI(obj); LoongArchIPI *s = LOONGARCH_IPI(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
Object *machine = qdev_get_machine();
ObjectClass *mc = object_get_class(machine); memory_region_init_io(&s->ipi_iocsr_mem, obj, &loongarch_ipi_ops,
/* 'lams' should be initialized */ &s->ipi_core, "loongarch_ipi_iocsr", 0x48);
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 */ /* loongarch_ipi_iocsr performs re-entrant IO through ipi_send */
s->ipi_iocsr_mem[cpu].disable_reentrancy_guard = true; s->ipi_iocsr_mem.disable_reentrancy_guard = true;
sysbus_init_mmio(sbd, &s->ipi_iocsr_mem[cpu]); sysbus_init_mmio(sbd, &s->ipi_iocsr_mem);
memory_region_init_io(&s->ipi64_iocsr_mem[cpu], obj, &loongarch_ipi64_ops, memory_region_init_io(&s->ipi64_iocsr_mem, obj, &loongarch_ipi64_ops,
&lams->ipi_core[cpu], "loongarch_ipi64_iocsr", 0x118); &s->ipi_core, "loongarch_ipi64_iocsr", 0x118);
sysbus_init_mmio(sbd, &s->ipi64_iocsr_mem[cpu]); sysbus_init_mmio(sbd, &s->ipi64_iocsr_mem);
qdev_init_gpio_out(DEVICE(obj), &lams->ipi_core[cpu].irq, 1); qdev_init_gpio_out(DEVICE(obj), &s->ipi_core.irq, 1);
}
} }
static const VMStateDescription vmstate_ipi_core = { static const VMStateDescription vmstate_ipi_core = {
.name = "ipi-single", .name = "ipi-single",
.version_id = 0, .version_id = 1,
.minimum_version_id = 0, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32(status, IPICore), VMSTATE_UINT32(status, IPICore),
VMSTATE_UINT32(en, IPICore), VMSTATE_UINT32(en, IPICore),
VMSTATE_UINT32(set, IPICore), VMSTATE_UINT32(set, IPICore),
VMSTATE_UINT32(clear, 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() VMSTATE_END_OF_LIST()
} }
}; };
static const VMStateDescription vmstate_loongarch_ipi = { static const VMStateDescription vmstate_loongarch_ipi = {
.name = TYPE_LOONGARCH_IPI, .name = TYPE_LOONGARCH_IPI,
.version_id = 0, .version_id = 1,
.minimum_version_id = 0, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_STRUCT_ARRAY(ipi_core, LoongArchMachineState, VMSTATE_STRUCT(ipi_core, LoongArchIPI, 0, vmstate_ipi_core, IPICore),
MAX_IPI_CORE_NUM, 0,
vmstate_ipi_core, IPICore),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };

12
hw/loongarch/virt.c
View File

@ -565,9 +565,6 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
CPUState *cpu_state; CPUState *cpu_state;
int cpu, pin, i, start, num; int cpu, pin, i, start, num;
ipi = qdev_new(TYPE_LOONGARCH_IPI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(ipi), &error_fatal);
extioi = qdev_new(TYPE_LOONGARCH_EXTIOI); extioi = qdev_new(TYPE_LOONGARCH_EXTIOI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(extioi), &error_fatal);
@ -598,15 +595,18 @@ static void loongarch_irq_init(LoongArchMachineState *lams)
lacpu = LOONGARCH_CPU(cpu_state); lacpu = LOONGARCH_CPU(cpu_state);
env = &(lacpu->env); env = &(lacpu->env);
ipi = qdev_new(TYPE_LOONGARCH_IPI);
sysbus_realize_and_unref(SYS_BUS_DEVICE(ipi), &error_fatal);
/* connect ipi irq to cpu irq */ /* connect ipi irq to cpu irq */
qdev_connect_gpio_out(ipi, cpu, qdev_get_gpio_in(cpudev, IRQ_IPI)); qdev_connect_gpio_out(ipi, 0, qdev_get_gpio_in(cpudev, IRQ_IPI));
/* IPI iocsr memory region */ /* IPI iocsr memory region */
memory_region_add_subregion(&env->system_iocsr, SMP_IPI_MAILBOX, memory_region_add_subregion(&env->system_iocsr, SMP_IPI_MAILBOX,
sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi),
cpu * 2)); 0));
memory_region_add_subregion(&env->system_iocsr, MAIL_SEND_ADDR, memory_region_add_subregion(&env->system_iocsr, MAIL_SEND_ADDR,
sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi),
cpu * 2 + 1)); 1));
/* extioi iocsr memory region */ /* extioi iocsr memory region */
memory_region_add_subregion(&env->system_iocsr, APIC_BASE, memory_region_add_subregion(&env->system_iocsr, APIC_BASE,
sysbus_mmio_get_region(SYS_BUS_DEVICE(extioi), sysbus_mmio_get_region(SYS_BUS_DEVICE(extioi),

10
include/hw/intc/loongarch_ipi.h
View File

@ -28,9 +28,6 @@
#define MAIL_SEND_OFFSET 0 #define MAIL_SEND_OFFSET 0
#define ANY_SEND_OFFSET (IOCSR_ANY_SEND - IOCSR_MAIL_SEND) #define ANY_SEND_OFFSET (IOCSR_ANY_SEND - IOCSR_MAIL_SEND)
#define MAX_IPI_CORE_NUM 4
#define MAX_IPI_MBX_NUM 4
#define TYPE_LOONGARCH_IPI "loongarch_ipi" #define TYPE_LOONGARCH_IPI "loongarch_ipi"
OBJECT_DECLARE_SIMPLE_TYPE(LoongArchIPI, LOONGARCH_IPI) OBJECT_DECLARE_SIMPLE_TYPE(LoongArchIPI, LOONGARCH_IPI)
@ -40,14 +37,15 @@ typedef struct IPICore {
uint32_t set; uint32_t set;
uint32_t clear; uint32_t clear;
/* 64bit buf divide into 2 32bit buf */ /* 64bit buf divide into 2 32bit buf */
uint32_t buf[MAX_IPI_MBX_NUM * 2]; uint32_t buf[2];
qemu_irq irq; qemu_irq irq;
} IPICore; } IPICore;
struct LoongArchIPI { struct LoongArchIPI {
SysBusDevice parent_obj; SysBusDevice parent_obj;
MemoryRegion ipi_iocsr_mem[MAX_IPI_CORE_NUM]; MemoryRegion ipi_iocsr_mem;
MemoryRegion ipi64_iocsr_mem[MAX_IPI_CORE_NUM]; MemoryRegion ipi64_iocsr_mem;
IPICore ipi_core;
}; };
#endif #endif

1
include/hw/loongarch/virt.h
View File

@ -36,7 +36,6 @@ struct LoongArchMachineState {
/*< private >*/ /*< private >*/
MachineState parent_obj; MachineState parent_obj;
IPICore ipi_core[MAX_IPI_CORE_NUM];
MemoryRegion lowmem; MemoryRegion lowmem;
MemoryRegion highmem; MemoryRegion highmem;
MemoryRegion isa_io; MemoryRegion isa_io;