mirror of https://github.com/xemu-project/xemu.git
hw/intc/loongson_ipi: Move IPICore structure to loongson_ipi_common.h
Move the IPICore structure and corresponding common fields of LoongsonIPICommonState to "hw/intc/loongson_ipi_common.h". Signed-off-by: Bibo Mao <maobibo@loongson.cn> [PMD: Extracted from bigger commit, added commit description] Co-Developed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Bibo Mao <maobibo@loongson.cn> Tested-by: Bibo Mao <maobibo@loongson.cn> Acked-by: Song Gao <gaosong@loongson.cn> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Message-Id: <20240805180622.21001-7-philmd@linaro.org>
This commit is contained in:
parent
a022e0de53
commit
6c8698a5e4
|
@ -64,7 +64,7 @@ static MemTxResult loongson_ipi_iocsr_readl(void *opaque, hwaddr addr,
|
|||
uint64_t *data,
|
||||
unsigned size, MemTxAttrs attrs)
|
||||
{
|
||||
LoongsonIPIState *ipi = opaque;
|
||||
LoongsonIPICommonState *ipi = opaque;
|
||||
IPICore *s;
|
||||
|
||||
if (attrs.requester_id >= ipi->num_cpu) {
|
||||
|
@ -160,7 +160,7 @@ static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr,
|
|||
MemTxAttrs attrs)
|
||||
{
|
||||
IPICore *s = opaque;
|
||||
LoongsonIPIState *ipi = s->ipi;
|
||||
LoongsonIPICommonState *ipi = s->ipi;
|
||||
int index = 0;
|
||||
uint32_t cpuid;
|
||||
uint8_t vector;
|
||||
|
@ -214,7 +214,7 @@ static MemTxResult loongson_ipi_iocsr_writel(void *opaque, hwaddr addr,
|
|||
uint64_t val, unsigned size,
|
||||
MemTxAttrs attrs)
|
||||
{
|
||||
LoongsonIPIState *ipi = opaque;
|
||||
LoongsonIPICommonState *ipi = opaque;
|
||||
IPICore *s;
|
||||
|
||||
if (attrs.requester_id >= ipi->num_cpu) {
|
||||
|
@ -277,7 +277,7 @@ static const MemoryRegionOps loongson_ipi64_ops = {
|
|||
|
||||
static void loongson_ipi_common_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
LoongsonIPIState *s = LOONGSON_IPI(dev);
|
||||
LoongsonIPICommonState *s = LOONGSON_IPI_COMMON(dev);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||
int i;
|
||||
|
||||
|
@ -310,6 +310,7 @@ static void loongson_ipi_common_realize(DeviceState *dev, Error **errp)
|
|||
|
||||
static void loongson_ipi_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
LoongsonIPICommonState *sc = LOONGSON_IPI_COMMON(dev);
|
||||
LoongsonIPIState *s = LOONGSON_IPI(dev);
|
||||
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
||||
Error *local_err = NULL;
|
||||
|
@ -320,18 +321,19 @@ static void loongson_ipi_realize(DeviceState *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
s->ipi_mmio_mem = g_new0(MemoryRegion, s->num_cpu);
|
||||
for (unsigned i = 0; i < s->num_cpu; i++) {
|
||||
s->ipi_mmio_mem = g_new0(MemoryRegion, sc->num_cpu);
|
||||
for (unsigned i = 0; i < sc->num_cpu; i++) {
|
||||
g_autofree char *name = g_strdup_printf("loongson_ipi_cpu%d_mmio", i);
|
||||
|
||||
memory_region_init_io(&s->ipi_mmio_mem[i], OBJECT(dev),
|
||||
&loongson_ipi_core_ops, &s->cpu[i], name, 0x48);
|
||||
&loongson_ipi_core_ops, &sc->cpu[i], name, 0x48);
|
||||
sysbus_init_mmio(sbd, &s->ipi_mmio_mem[i]);
|
||||
}
|
||||
}
|
||||
|
||||
static void loongson_ipi_common_unrealize(DeviceState *dev)
|
||||
{
|
||||
LoongsonIPIState *s = LOONGSON_IPI(dev);
|
||||
LoongsonIPICommonState *s = LOONGSON_IPI_COMMON(dev);
|
||||
|
||||
g_free(s->cpu);
|
||||
}
|
||||
|
@ -345,36 +347,6 @@ static void loongson_ipi_unrealize(DeviceState *dev)
|
|||
loongson_ipi_common_unrealize(dev);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_ipi_core = {
|
||||
.name = "ipi-single",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(status, IPICore),
|
||||
VMSTATE_UINT32(en, IPICore),
|
||||
VMSTATE_UINT32(set, IPICore),
|
||||
VMSTATE_UINT32(clear, IPICore),
|
||||
VMSTATE_UINT32_ARRAY(buf, IPICore, IPI_MBX_NUM * 2),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_loongson_ipi = {
|
||||
.name = TYPE_LOONGSON_IPI,
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongsonIPIState, num_cpu,
|
||||
vmstate_ipi_core, IPICore),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static Property ipi_properties[] = {
|
||||
DEFINE_PROP_UINT32("num-cpu", LoongsonIPIState, num_cpu, 1),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void loongson_ipi_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
@ -384,8 +356,6 @@ static void loongson_ipi_class_init(ObjectClass *klass, void *data)
|
|||
&lic->parent_realize);
|
||||
device_class_set_parent_unrealize(dc, loongson_ipi_unrealize,
|
||||
&lic->parent_unrealize);
|
||||
device_class_set_props(dc, ipi_properties);
|
||||
dc->vmsd = &vmstate_loongson_ipi;
|
||||
}
|
||||
|
||||
static const TypeInfo loongson_ipi_types[] = {
|
||||
|
|
|
@ -8,6 +8,47 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "hw/intc/loongson_ipi_common.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
||||
static const VMStateDescription vmstate_ipi_core = {
|
||||
.name = "ipi-single",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(status, IPICore),
|
||||
VMSTATE_UINT32(en, IPICore),
|
||||
VMSTATE_UINT32(set, IPICore),
|
||||
VMSTATE_UINT32(clear, IPICore),
|
||||
VMSTATE_UINT32_ARRAY(buf, IPICore, IPI_MBX_NUM * 2),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_loongson_ipi_common = {
|
||||
.name = "loongson_ipi",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongsonIPICommonState,
|
||||
num_cpu, vmstate_ipi_core,
|
||||
IPICore),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static Property ipi_common_properties[] = {
|
||||
DEFINE_PROP_UINT32("num-cpu", LoongsonIPICommonState, num_cpu, 1),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static void loongson_ipi_common_class_init(ObjectClass *klass, void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
|
||||
device_class_set_props(dc, ipi_common_properties);
|
||||
dc->vmsd = &vmstate_loongson_ipi_common;
|
||||
}
|
||||
|
||||
static const TypeInfo loongarch_ipi_common_types[] = {
|
||||
{
|
||||
|
@ -15,6 +56,7 @@ static const TypeInfo loongarch_ipi_common_types[] = {
|
|||
.parent = TYPE_SYS_BUS_DEVICE,
|
||||
.instance_size = sizeof(LoongsonIPICommonState),
|
||||
.class_size = sizeof(LoongsonIPICommonClass),
|
||||
.class_init = loongson_ipi_common_class_init,
|
||||
.abstract = true,
|
||||
}
|
||||
};
|
||||
|
|
|
@ -12,22 +12,9 @@
|
|||
#include "hw/intc/loongson_ipi_common.h"
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
#define IPI_MBX_NUM 4
|
||||
|
||||
#define TYPE_LOONGSON_IPI "loongson_ipi"
|
||||
OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI)
|
||||
|
||||
typedef struct IPICore {
|
||||
LoongsonIPIState *ipi;
|
||||
uint32_t status;
|
||||
uint32_t en;
|
||||
uint32_t set;
|
||||
uint32_t clear;
|
||||
/* 64bit buf divide into 2 32bit buf */
|
||||
uint32_t buf[IPI_MBX_NUM * 2];
|
||||
qemu_irq irq;
|
||||
} IPICore;
|
||||
|
||||
struct LoongsonIPIClass {
|
||||
LoongsonIPICommonClass parent_class;
|
||||
|
||||
|
@ -39,10 +26,6 @@ struct LoongsonIPIState {
|
|||
LoongsonIPICommonState parent_obj;
|
||||
|
||||
MemoryRegion *ipi_mmio_mem;
|
||||
MemoryRegion ipi_iocsr_mem;
|
||||
MemoryRegion ipi64_iocsr_mem;
|
||||
uint32_t num_cpu;
|
||||
IPICore *cpu;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -11,12 +11,30 @@
|
|||
#include "qom/object.h"
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
#define IPI_MBX_NUM 4
|
||||
|
||||
#define TYPE_LOONGSON_IPI_COMMON "loongson_ipi_common"
|
||||
OBJECT_DECLARE_TYPE(LoongsonIPICommonState,
|
||||
LoongsonIPICommonClass, LOONGSON_IPI_COMMON)
|
||||
|
||||
typedef struct IPICore {
|
||||
LoongsonIPICommonState *ipi;
|
||||
uint32_t status;
|
||||
uint32_t en;
|
||||
uint32_t set;
|
||||
uint32_t clear;
|
||||
/* 64bit buf divide into 2 32-bit buf */
|
||||
uint32_t buf[IPI_MBX_NUM * 2];
|
||||
qemu_irq irq;
|
||||
} IPICore;
|
||||
|
||||
struct LoongsonIPICommonState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion ipi_iocsr_mem;
|
||||
MemoryRegion ipi64_iocsr_mem;
|
||||
uint32_t num_cpu;
|
||||
IPICore *cpu;
|
||||
};
|
||||
|
||||
struct LoongsonIPICommonClass {
|
||||
|
|
Loading…
Reference in New Issue