motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/intc/loongson_ipi: Rename LoongsonIPI -> LoongsonIPIState

Browse source 
We'll have to add LoongsonIPIClass in few commits,
so rename LoongsonIPI as LoongsonIPIState for clarity.

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-2-philmd@linaro.org>
This commit is contained in:
Bibo Mao 2024-07-15 16:50:51 +02:00 • committed by Philippe Mathieu-Daudé
parent e7207a9971
commit 40a0815e31
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/intc/loongson_ipi.c
View file

@ -64,7 +64,7 @@ static MemTxResult loongson_ipi_iocsr_readl(void *opaque, hwaddr addr,
uint64_t *data, uint64_t *data,
unsigned size, MemTxAttrs attrs) unsigned size, MemTxAttrs attrs)
{ {
LoongsonIPI *ipi = opaque; LoongsonIPIState *ipi = opaque;
IPICore *s; IPICore *s;
if (attrs.requester_id >= ipi->num_cpu) { if (attrs.requester_id >= ipi->num_cpu) {
@ -160,7 +160,7 @@ static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
IPICore *s = opaque; IPICore *s = opaque;
LoongsonIPI *ipi = s->ipi; LoongsonIPIState *ipi = s->ipi;
int index = 0; int index = 0;
uint32_t cpuid; uint32_t cpuid;
uint8_t vector; uint8_t vector;
@ -214,7 +214,7 @@ static MemTxResult loongson_ipi_iocsr_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size, uint64_t val, unsigned size,
MemTxAttrs attrs) MemTxAttrs attrs)
{ {
LoongsonIPI *ipi = opaque; LoongsonIPIState *ipi = opaque;
IPICore *s; IPICore *s;
if (attrs.requester_id >= ipi->num_cpu) { if (attrs.requester_id >= ipi->num_cpu) {
@ -277,7 +277,7 @@ static const MemoryRegionOps loongson_ipi64_ops = {
static void loongson_ipi_realize(DeviceState *dev, Error **errp) static void loongson_ipi_realize(DeviceState *dev, Error **errp)
{ {
LoongsonIPI *s = LOONGSON_IPI(dev); LoongsonIPIState *s = LOONGSON_IPI(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
int i; int i;
@ -320,7 +320,7 @@ static void loongson_ipi_realize(DeviceState *dev, Error **errp)
static void loongson_ipi_unrealize(DeviceState *dev) static void loongson_ipi_unrealize(DeviceState *dev)
{ {
LoongsonIPI *s = LOONGSON_IPI(dev); LoongsonIPIState *s = LOONGSON_IPI(dev);
g_free(s->cpu); g_free(s->cpu);
} }
@ -344,14 +344,14 @@ static const VMStateDescription vmstate_loongson_ipi = {
.version_id = 2, .version_id = 2,
.minimum_version_id = 2, .minimum_version_id = 2,
.fields = (const VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongsonIPI, num_cpu, VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongsonIPIState, num_cpu,
vmstate_ipi_core, IPICore), vmstate_ipi_core, IPICore),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };
static Property ipi_properties[] = { static Property ipi_properties[] = {
DEFINE_PROP_UINT32("num-cpu", LoongsonIPI, num_cpu, 1), DEFINE_PROP_UINT32("num-cpu", LoongsonIPIState, num_cpu, 1),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -369,7 +369,7 @@ static const TypeInfo loongson_ipi_types[] = {
{ {
.name = TYPE_LOONGSON_IPI, .name = TYPE_LOONGSON_IPI,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LoongsonIPI), .instance_size = sizeof(LoongsonIPIState),
.class_init = loongson_ipi_class_init, .class_init = loongson_ipi_class_init,
} }
}; };

6
include/hw/intc/loongson_ipi.h
View file

@ -31,10 +31,10 @@
#define IPI_MBX_NUM 4 #define IPI_MBX_NUM 4
#define TYPE_LOONGSON_IPI "loongson_ipi" #define TYPE_LOONGSON_IPI "loongson_ipi"
OBJECT_DECLARE_SIMPLE_TYPE(LoongsonIPI, LOONGSON_IPI) OBJECT_DECLARE_SIMPLE_TYPE(LoongsonIPIState, LOONGSON_IPI)
typedef struct IPICore { typedef struct IPICore {
LoongsonIPI *ipi; LoongsonIPIState *ipi;
MemoryRegion *ipi_mmio_mem; MemoryRegion *ipi_mmio_mem;
uint32_t status; uint32_t status;
uint32_t en; uint32_t en;
@ -45,7 +45,7 @@ typedef struct IPICore {
qemu_irq irq; qemu_irq irq;
} IPICore; } IPICore;
struct LoongsonIPI { struct LoongsonIPIState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
MemoryRegion ipi_iocsr_mem; MemoryRegion ipi_iocsr_mem;
MemoryRegion ipi64_iocsr_mem; MemoryRegion ipi64_iocsr_mem;