hw/intc/loongson_ipi: Add TYPE_LOONGSON_IPI_COMMON stub

Introduce LOONGSON_IPI_COMMON stubs, QDev parent of LOONGSON_IPI.

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-4-philmd@linaro.org>
This commit is contained in:
Bibo Mao 2024-07-23 11:25:53 +02:00 committed by Philippe Mathieu-Daudé
parent 530e6daf74
commit 7e555781e4
7 changed files with 76 additions and 5 deletions

View file

@ -1250,8 +1250,10 @@ F: configs/devices/loongarch64-softmmu/default.mak
F: hw/loongarch/ F: hw/loongarch/
F: include/hw/loongarch/virt.h F: include/hw/loongarch/virt.h
F: include/hw/intc/loongarch_*.h F: include/hw/intc/loongarch_*.h
F: include/hw/intc/loongson_ipi_common.h
F: include/hw/intc/loongson_ipi.h F: include/hw/intc/loongson_ipi.h
F: hw/intc/loongarch_*.c F: hw/intc/loongarch_*.c
F: hw/intc/loongson_ipi_common.c
F: hw/intc/loongson_ipi.c F: hw/intc/loongson_ipi.c
F: include/hw/pci-host/ls7a.h F: include/hw/pci-host/ls7a.h
F: hw/rtc/ls7a_rtc.c F: hw/rtc/ls7a_rtc.c
@ -1386,11 +1388,13 @@ Loongson-3 virtual platforms
M: Huacai Chen <chenhuacai@kernel.org> M: Huacai Chen <chenhuacai@kernel.org>
R: Jiaxun Yang <jiaxun.yang@flygoat.com> R: Jiaxun Yang <jiaxun.yang@flygoat.com>
S: Maintained S: Maintained
F: hw/intc/loongson_ipi_common.c
F: hw/intc/loongson_ipi.c F: hw/intc/loongson_ipi.c
F: hw/intc/loongson_liointc.c F: hw/intc/loongson_liointc.c
F: hw/mips/loongson3_bootp.c F: hw/mips/loongson3_bootp.c
F: hw/mips/loongson3_bootp.h F: hw/mips/loongson3_bootp.h
F: hw/mips/loongson3_virt.c F: hw/mips/loongson3_virt.c
F: include/hw/intc/loongson_ipi_common.h
F: include/hw/intc/loongson_ipi.h F: include/hw/intc/loongson_ipi.h
F: include/hw/intc/loongson_liointc.h F: include/hw/intc/loongson_liointc.h
F: tests/avocado/machine_mips_loongson3v.py F: tests/avocado/machine_mips_loongson3v.py

View file

@ -87,8 +87,12 @@ config GOLDFISH_PIC
config M68K_IRQC config M68K_IRQC
bool bool
config LOONGSON_IPI_COMMON
bool
config LOONGSON_IPI config LOONGSON_IPI
bool bool
select LOONGSON_IPI_COMMON
config LOONGARCH_PCH_PIC config LOONGARCH_PCH_PIC
bool bool

View file

@ -374,9 +374,12 @@ static Property ipi_properties[] = {
static void loongson_ipi_class_init(ObjectClass *klass, void *data) static void loongson_ipi_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
LoongsonIPIClass *lic = LOONGSON_IPI_CLASS(klass);
dc->realize = loongson_ipi_realize; device_class_set_parent_realize(dc, loongson_ipi_realize,
dc->unrealize = loongson_ipi_unrealize; &lic->parent_realize);
device_class_set_parent_unrealize(dc, loongson_ipi_unrealize,
&lic->parent_unrealize);
device_class_set_props(dc, ipi_properties); device_class_set_props(dc, ipi_properties);
dc->vmsd = &vmstate_loongson_ipi; dc->vmsd = &vmstate_loongson_ipi;
} }
@ -384,8 +387,9 @@ static void loongson_ipi_class_init(ObjectClass *klass, void *data)
static const TypeInfo loongson_ipi_types[] = { static const TypeInfo loongson_ipi_types[] = {
{ {
.name = TYPE_LOONGSON_IPI, .name = TYPE_LOONGSON_IPI,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_LOONGSON_IPI_COMMON,
.instance_size = sizeof(LoongsonIPIState), .instance_size = sizeof(LoongsonIPIState),
.class_size = sizeof(LoongsonIPIClass),
.class_init = loongson_ipi_class_init, .class_init = loongson_ipi_class_init,
} }
}; };

View file

@ -0,0 +1,22 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Loongson IPI interrupt common support
*
* Copyright (C) 2021 Loongson Technology Corporation Limited
*/
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/intc/loongson_ipi_common.h"
static const TypeInfo loongarch_ipi_common_types[] = {
{
.name = TYPE_LOONGSON_IPI_COMMON,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LoongsonIPICommonState),
.class_size = sizeof(LoongsonIPICommonClass),
.abstract = true,
}
};
DEFINE_TYPES(loongarch_ipi_common_types)

View file

@ -69,6 +69,7 @@ specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c'))
specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'],
if_true: files('spapr_xive_kvm.c')) if_true: files('spapr_xive_kvm.c'))
specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c'))
specific_ss.add(when: 'CONFIG_LOONGSON_IPI_COMMON', if_true: files('loongson_ipi_common.c'))
specific_ss.add(when: 'CONFIG_LOONGSON_IPI', if_true: files('loongson_ipi.c')) specific_ss.add(when: 'CONFIG_LOONGSON_IPI', if_true: files('loongson_ipi.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c')) specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c'))
specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_MSI', if_true: files('loongarch_pch_msi.c')) specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_MSI', if_true: files('loongarch_pch_msi.c'))

View file

@ -8,6 +8,8 @@
#ifndef HW_LOONGSON_IPI_H #ifndef HW_LOONGSON_IPI_H
#define HW_LOONGSON_IPI_H #define HW_LOONGSON_IPI_H
#include "qom/object.h"
#include "hw/intc/loongson_ipi_common.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
/* Mainy used by iocsr read and write */ /* Mainy used by iocsr read and write */
@ -31,7 +33,7 @@
#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(LoongsonIPIState, LOONGSON_IPI) OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI)
typedef struct IPICore { typedef struct IPICore {
LoongsonIPIState *ipi; LoongsonIPIState *ipi;
@ -45,8 +47,16 @@ typedef struct IPICore {
qemu_irq irq; qemu_irq irq;
} IPICore; } IPICore;
struct LoongsonIPIClass {
LoongsonIPICommonClass parent_class;
DeviceRealize parent_realize;
DeviceUnrealize parent_unrealize;
};
struct LoongsonIPIState { struct LoongsonIPIState {
SysBusDevice parent_obj; LoongsonIPICommonState parent_obj;
MemoryRegion ipi_iocsr_mem; MemoryRegion ipi_iocsr_mem;
MemoryRegion ipi64_iocsr_mem; MemoryRegion ipi64_iocsr_mem;
uint32_t num_cpu; uint32_t num_cpu;

View file

@ -0,0 +1,26 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Loongson ipi interrupt header files
*
* Copyright (C) 2021 Loongson Technology Corporation Limited
*/
#ifndef HW_LOONGSON_IPI_COMMON_H
#define HW_LOONGSON_IPI_COMMON_H
#include "qom/object.h"
#include "hw/sysbus.h"
#define TYPE_LOONGSON_IPI_COMMON "loongson_ipi_common"
OBJECT_DECLARE_TYPE(LoongsonIPICommonState,
LoongsonIPICommonClass, LOONGSON_IPI_COMMON)
struct LoongsonIPICommonState {
SysBusDevice parent_obj;
};
struct LoongsonIPICommonClass {
SysBusDeviceClass parent_class;
};
#endif