Reconstruct loongson ipi driver
v6 cover Reconstruct loongson ipi driver
(series fully reviewed, patches 1-15 will be posted
tomorrow in pull request)
Since v5:
- Add missing .class_size / .instance_size to
avoid heap-buffer-ovf
Since v4:
- Fix build failure due to rebase (Song)
- Loongarch -> LoongArch (Song)
- Added Song's tags
Since v3:
- Use DEFINE_TYPES() macro (unreviewed patch #1)
- Update MAINTAINERS
- Added Bibo's tags
Thanks,
Phil.
Bibo Mao (14):
hw/intc/loongson_ipi: Rename LoongsonIPI -> LoongsonIPIState hw/intc/loongson_ipi: Extract loongson_ipi_common_realize() hw/intc/loongson_ipi: Add TYPE_LOONGSON_IPI_COMMON stub hw/intc/loongson_ipi: Move common definitions to loongson_ipi_common.h hw/intc/loongson_ipi: Move IPICore::mmio_mem to LoongsonIPIState hw/intc/loongson_ipi: Move IPICore structure to loongson_ipi_common.h hw/intc/loongson_ipi: Pass LoongsonIPICommonState to send_ipi_data() hw/intc/loongson_ipi: Add LoongsonIPICommonClass::get_iocsr_as handler hw/intc/loongson_ipi: Add LoongsonIPICommonClass::cpu_by_arch_id
handler
hw/intc/loongson_ipi: Expose loongson_ipi_core_read/write helpers hw/intc/loongson_ipi: Move common code to loongson_ipi_common.c hw/intc/loongarch_ipi: Add loongarch IPI support hw/loongarch/virt: Replace Loongson IPI with LoongArch IPI hw/intc/loongson_ipi: Restrict to MIPS
Philippe Mathieu-Daudé (1):
hw/intc/loongson_ipi: Remove unused headers
MAINTAINERS | 6 +- include/hw/intc/loongarch_ipi.h | 25 ++ include/hw/intc/loongson_ipi.h | 51 +--- include/hw/intc/loongson_ipi_common.h | 74 ++++++ include/hw/loongarch/virt.h | 1 - hw/intc/loongarch_ipi.c | 68 +++++ hw/intc/loongson_ipi.c | 347 +++----------------------- hw/intc/loongson_ipi_common.c | 347 ++++++++++++++++++++++++++ hw/loongarch/virt.c | 4 +- hw/intc/Kconfig | 8 + hw/intc/meson.build | 2 + hw/loongarch/Kconfig | 2 +- 12 files changed, 574 insertions(+), 361 deletions(-) create mode 100644 include/hw/intc/loongarch_ipi.h create mode 100644 include/hw/intc/loongson_ipi_common.h create mode 100644 hw/intc/loongarch_ipi.c create mode 100644 hw/intc/loongson_ipi_common.c
Signature · 1 line
2.45.2
PATCH v6 1/15 hw/intc/loongson_ipi: Rename LoongsonIPI -> LoongsonIPIState
From: Bibo Mao <[email protected]>
We'll have to add LoongsonIPIClass in few commits, so rename LoongsonIPI as LoongsonIPIState for clarity.
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi.h | 6 +++--- hw/intc/loongson_ipi.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
include/hw/intc/loongson_ipi.h +3 -3
@@ -31,10 +31,10 @@#define IPI_MBX_NUM 4#define TYPE_LOONGSON_IPI "loongson_ipi" -OBJECT_DECLARE_SIMPLE_TYPE(LoongsonIPI, LOONGSON_IPI) +OBJECT_DECLARE_SIMPLE_TYPE(LoongsonIPIState, LOONGSON_IPI) typedef struct IPICore { - LoongsonIPI *ipi; + LoongsonIPIState *ipi; MemoryRegion *ipi_mmio_mem; uint32_t status; uint32_t en;
@@ -45,7 +45,7 @@ typedef struct IPICore {qemu_irq irq; } IPICore; -struct LoongsonIPI { +struct LoongsonIPIState {SysBusDevice parent_obj;MemoryRegion ipi_iocsr_mem;MemoryRegion ipi64_iocsr_mem;
hw/intc/loongson_ipi.c +8 -8
@@ -64,7 +64,7 @@ static MemTxResult loongson_ipi_iocsr_readl(void *opaque, hwaddr addr,uint64_t *data, unsigned size, MemTxAttrs attrs) { - LoongsonIPI *ipi = opaque; + LoongsonIPIState *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; -LoongsonIPI *ipi = s->ipi; +LoongsonIPIState *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) { - LoongsonIPI *ipi = opaque; + LoongsonIPIState *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_realize (DeviceState *dev,Error **errp) { -LoongsonIPI *s =LOONGSON_IPI (dev); +LoongsonIPIState *s =LOONGSON_IPI (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev);int i;
@@ -320,7 +320,7 @@ static void loongson_ipi_realize(DeviceState *dev, Error **errp)static void loongson_ipi_unrealize (DeviceState *dev) { -LoongsonIPI *s =LOONGSON_IPI (dev); +LoongsonIPIState *s =LOONGSON_IPI (dev);g_free (s->cpu); }
@@ -344,14 +344,14 @@ static const VMStateDescription vmstate_loongson_ipi = { .version_id = 2, .minimum_version_id = 2, .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_END_OF_LIST () } };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 (), };
@@ -369,7 +369,7 @@ static const TypeInfo loongson_ipi_types[] = { { .name = TYPE_LOONGSON_IPI, .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(LoongsonIPI), + .instance_size = sizeof(LoongsonIPIState), .class_init = loongson_ipi_class_init, } };
Signature · 1 line
2.45.2
PATCH v6 2/15 hw/intc/loongson_ipi: Extract loongson_ipi_common_realize()
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
In preparation to extract common IPI code in few commits, extract loongson_ipi_common_realize().
Message-Id: <[email protected]>
--- hw/intc/loongson_ipi.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-)
hw/intc/loongson_ipi.c +28 -12
@@ -275,7 +275,7 @@ static const MemoryRegionOps loongson_ipi64_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static void loongson_ipi_realize (DeviceState *dev,Error **errp) +static void loongson_ipi_common_realize (DeviceState *dev,Error **errp) {LoongsonIPIState *s =LOONGSON_IPI (dev);SysBusDevice *sbd =SYS_BUS_DEVICE (dev);
@@ -301,30 +301,46 @@ static void loongson_ipi_realize(DeviceState *dev, Error **errp)sysbus_init_mmio (sbd, &s->ipi64_iocsr_mem); s->cpu =g_new0 (IPICore, s->num_cpu); -if (s->cpu ==NULL ) { -error_setg (errp,"Memory allocation for IPICore faile" ); -return ; - } -for (i =0 ; i < s->num_cpu; i++) { s->cpu[i].ipi = s; - s->cpu[i].ipi_mmio_mem =g_new0 (MemoryRegion,1 ); - g_autofree char *name = g_strdup_printf("loongson_ipi_cpu%d_mmio", i); -memory_region_init_io (s->cpu[i].ipi_mmio_mem,OBJECT (dev), - &loongson_ipi_core_ops, &s->cpu[i], name,0x48 ); -sysbus_init_mmio (sbd, s->cpu[i].ipi_mmio_mem);qdev_init_gpio_out (dev, &s->cpu[i].irq,1 ); } } -static void loongson_ipi_unrealize (DeviceState *dev) +static void loongson_ipi_realize (DeviceState *dev,Error **errp) +{ +LoongsonIPIState *s =LOONGSON_IPI (dev); +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +Error *local_err =NULL ; + +loongson_ipi_common_realize (dev, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +for (unsigned i =0 ; i < s->num_cpu; i++) { + s->cpu[i].ipi_mmio_mem =g_new0 (MemoryRegion,1 ); + g_autofree char *name = g_strdup_printf("loongson_ipi_cpu%d_mmio", i); +memory_region_init_io (s->cpu[i].ipi_mmio_mem,OBJECT (dev), + &loongson_ipi_core_ops, &s->cpu[i], name,0x48 ); +sysbus_init_mmio (sbd, s->cpu[i].ipi_mmio_mem); + } +} + +static void loongson_ipi_common_unrealize (DeviceState *dev) {LoongsonIPIState *s =LOONGSON_IPI (dev);g_free (s->cpu); } +static void loongson_ipi_unrealize (DeviceState *dev) +{ +loongson_ipi_common_unrealize (dev); +} +static const VMStateDescription vmstate_ipi_core = { .name ="ipi-single" , .version_id =2 ,
Signature · 1 line
2.45.2
PATCH v6 3/15 hw/intc/loongson_ipi: Add TYPE_LOONGSON_IPI_COMMON stub
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Introduce LOONGSON_IPI_COMMON stubs, QDev parent of LOONGSON_IPI.
Message-Id: <[email protected]>
--- MAINTAINERS | 4 ++++ include/hw/intc/loongson_ipi.h | 14 ++++++++++++-- include/hw/intc/loongson_ipi_common.h | 26 ++++++++++++++++++++++++++ hw/intc/loongson_ipi.c | 10 +++++++--- hw/intc/loongson_ipi_common.c | 22 ++++++++++++++++++++++ hw/intc/Kconfig | 4 ++++ hw/intc/meson.build | 1 + 7 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 include/hw/intc/loongson_ipi_common.h create mode 100644 hw/intc/loongson_ipi_common.c
MAINTAINERS +4 -0
@@ -1250,8 +1250,10 @@ F: configs/devices/loongarch64-softmmu/default.mak F: hw/loongarch/ F: include/hw/loongarch/virt.h F: include/hw/intc/loongarch_*.h +F: include/hw/intc/loongson_ipi_common.h F: include/hw/intc/loongson_ipi.h F: hw/intc/loongarch_*.c +F: hw/intc/loongson_ipi_common.c F: hw/intc/loongson_ipi.c F: include/hw/pci-host/ls7a.h F: hw/rtc/ls7a_rtc.c
@@ -1386,11 +1388,13 @@ Loongson-3 virtual platforms M: Huacai Chen <[email protected]> R: Jiaxun Yang <[email protected]> S: Maintained +F: hw/intc/loongson_ipi_common.c F: hw/intc/loongson_ipi.c F: hw/intc/loongson_liointc.c F: hw/mips/loongson3_bootp.c F: hw/mips/loongson3_bootp.h 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_liointc.h F: tests/avocado/machine_mips_loongson3v.py
include/hw/intc/loongson_ipi.h +12 -2
@@ -8,6 +8,8 @@#ifndef HW_LOONGSON_IPI_H #define HW_LOONGSON_IPI_H +#include "qom/object.h" +#include "hw/intc/loongson_ipi_common.h" #include "hw/sysbus.h" /* Mainy used by iocsr read and write */
@@ -31,7 +33,7 @@#define IPI_MBX_NUM 4#define TYPE_LOONGSON_IPI "loongson_ipi" -OBJECT_DECLARE_SIMPLE_TYPE(LoongsonIPIState, LOONGSON_IPI) +OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI) typedef struct IPICore { LoongsonIPIState *ipi;
@@ -45,8 +47,16 @@ typedef struct IPICore {qemu_irq irq; } IPICore; +struct LoongsonIPIClass { +LoongsonIPICommonClass parent_class; + +DeviceRealize parent_realize; +DeviceUnrealize parent_unrealize; +}; +struct LoongsonIPIState { -SysBusDevice parent_obj; +LoongsonIPICommonState parent_obj; +MemoryRegion ipi_iocsr_mem;MemoryRegion ipi64_iocsr_mem;uint32_t num_cpu;
include/hw/intc/loongson_ipi_common.h new file +26 -0
@@ -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
hw/intc/loongson_ipi.c +7 -3
@@ -374,9 +374,12 @@ static Property ipi_properties[] = {static void loongson_ipi_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass); +LoongsonIPIClass *lic =LOONGSON_IPI_CLASS (klass); - dc->realize = loongson_ipi_realize; - dc->unrealize = loongson_ipi_unrealize; +device_class_set_parent_realize (dc, loongson_ipi_realize, + &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; }
@@ -384,8 +387,9 @@ static void loongson_ipi_class_init(ObjectClass *klass, void *data)static const TypeInfo loongson_ipi_types[] = { { .name =TYPE_LOONGSON_IPI , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_LOONGSON_IPI_COMMON , .instance_size =sizeof (LoongsonIPIState), + .class_size =sizeof (LoongsonIPIClass), .class_init = loongson_ipi_class_init, } };
hw/intc/loongson_ipi_common.c new file +22 -0
@@ -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)
hw/intc/Kconfig +4 -0
@@ -87,8 +87,12 @@ config GOLDFISH_PIC config M68K_IRQC bool +config LOONGSON_IPI_COMMON + bool + config LOONGSON_IPI bool + select LOONGSON_IPI_COMMON config LOONGARCH_PCH_PIC bool
hw/intc/meson.build +1 -0
@@ -69,6 +69,7 @@ specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], 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_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_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'))
Signature · 1 line
2.45.2
PATCH v6 4/15 hw/intc/loongson_ipi: Move common definitions to loongson_ipi_common.h
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi.h | 18 ------------------ include/hw/intc/loongson_ipi_common.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-)
include/hw/intc/loongson_ipi.h +0 -18
@@ -12,24 +12,6 @@#include "hw/intc/loongson_ipi_common.h" #include "hw/sysbus.h" -/* Mainy used by iocsr read and write */ -#define SMP_IPI_MAILBOX 0x1000ULL -#define CORE_STATUS_OFF 0x0 -#define CORE_EN_OFF 0x4 -#define CORE_SET_OFF 0x8 -#define CORE_CLEAR_OFF 0xc -#define CORE_BUF_20 0x20 -#define CORE_BUF_28 0x28 -#define CORE_BUF_30 0x30 -#define CORE_BUF_38 0x38 -#define IOCSR_IPI_SEND 0x40 -#define IOCSR_MAIL_SEND 0x48 -#define IOCSR_ANY_SEND 0x158 - -#define MAIL_SEND_ADDR (SMP_IPI_MAILBOX + IOCSR_MAIL_SEND) -#define MAIL_SEND_OFFSET 0 -#define ANY_SEND_OFFSET (IOCSR_ANY_SEND - IOCSR_MAIL_SEND) -#define IPI_MBX_NUM 4#define TYPE_LOONGSON_IPI "loongson_ipi"
include/hw/intc/loongson_ipi_common.h +19 -0
@@ -23,4 +23,23 @@ struct LoongsonIPICommonClass { SysBusDeviceClass parent_class; }; +/* Mainy used by iocsr read and write */ +#define SMP_IPI_MAILBOX 0x1000ULL + +#define CORE_STATUS_OFF 0x0 +#define CORE_EN_OFF 0x4 +#define CORE_SET_OFF 0x8 +#define CORE_CLEAR_OFF 0xc +#define CORE_BUF_20 0x20 +#define CORE_BUF_28 0x28 +#define CORE_BUF_30 0x30 +#define CORE_BUF_38 0x38 +#define IOCSR_IPI_SEND 0x40 +#define IOCSR_MAIL_SEND 0x48 +#define IOCSR_ANY_SEND 0x158 + +#define MAIL_SEND_ADDR (SMP_IPI_MAILBOX + IOCSR_MAIL_SEND) +#define MAIL_SEND_OFFSET 0 +#define ANY_SEND_OFFSET (IOCSR_ANY_SEND - IOCSR_MAIL_SEND) +#endif
Signature · 1 line
2.45.2
PATCH v6 5/15 hw/intc/loongson_ipi: Move IPICore::mmio_mem to LoongsonIPIState
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
It is easier to manage one array of MMIO MR rather than one per vCPU.
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi.h | 2 +- hw/intc/loongson_ipi.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)
include/hw/intc/loongson_ipi.h +1 -1
@@ -19,7 +19,6 @@ OBJECT_DECLARE_TYPE(LoongsonIPIState, LoongsonIPIClass, LOONGSON_IPI) typedef struct IPICore { LoongsonIPIState *ipi; - MemoryRegion *ipi_mmio_mem; uint32_t status; uint32_t en; uint32_t set;
@@ -39,6 +38,7 @@ struct LoongsonIPIClass {struct LoongsonIPIState {LoongsonIPICommonState parent_obj; +MemoryRegion *ipi_mmio_mem;MemoryRegion ipi_iocsr_mem;MemoryRegion ipi64_iocsr_mem;uint32_t num_cpu;
hw/intc/loongson_ipi.c +7 -3
@@ -320,12 +320,12 @@ 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->cpu[i].ipi_mmio_mem =g_new0 (MemoryRegion,1 ); g_autofree char *name = g_strdup_printf("loongson_ipi_cpu%d_mmio", i); -memory_region_init_io (s->cpu[i].ipi_mmio_mem,OBJECT (dev), +memory_region_init_io (&s->ipi_mmio_mem[i],OBJECT (dev), &loongson_ipi_core_ops, &s->cpu[i], name,0x48 ); -sysbus_init_mmio (sbd, s->cpu[i].ipi_mmio_mem); +sysbus_init_mmio (sbd, &s->ipi_mmio_mem[i]); } }
@@ -338,6 +338,10 @@ static void loongson_ipi_common_unrealize(DeviceState *dev)static void loongson_ipi_unrealize (DeviceState *dev) { +LoongsonIPIState *s =LOONGSON_IPI (dev); + +g_free (s->ipi_mmio_mem); +loongson_ipi_common_unrealize (dev); }
Signature · 1 line
2.45.2
PATCH v6 6/15 hw/intc/loongson_ipi: Move IPICore structure to loongson_ipi_common.h
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Move the IPICore structure and corresponding common fields of LoongsonIPICommonState to "hw/intc/loongson_ipi_common.h".
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi.h | 17 --------- include/hw/intc/loongson_ipi_common.h | 18 ++++++++++ hw/intc/loongson_ipi.c | 50 ++++++--------------------- hw/intc/loongson_ipi_common.c | 42 ++++++++++++++++++++++ 4 files changed, 70 insertions(+), 57 deletions(-)
include/hw/intc/loongson_ipi.h +0 -17
@@ -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
include/hw/intc/loongson_ipi_common.h +18 -0
@@ -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 {
hw/intc/loongson_ipi.c +10 -40
106 lines not on this page · raw message
hw/intc/loongson_ipi_common.c +42 -0
54 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v6 7/15 hw/intc/loongson_ipi: Pass LoongsonIPICommonState to send_ipi_data()
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
In order to get LoongsonIPICommonClass in send_ipi_data() in the next commit, propagate LoongsonIPICommonState.
Message-Id: <[email protected]>
--- hw/intc/loongson_ipi.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
hw/intc/loongson_ipi.c +11 -8
@@ -88,8 +88,8 @@ static AddressSpace *get_cpu_iocsr_as(CPUState *cpu)return NULL ; } -static MemTxResult send_ipi_data (CPUState *cpu,uint64_t val,hwaddr addr, -MemTxAttrs attrs) +static MemTxResult send_ipi_data (LoongsonIPICommonState *ipi,CPUState *cpu, +uint64_t val,hwaddr addr,MemTxAttrs attrs) {int i, mask =0 , data =0 ;AddressSpace *iocsr_as =get_cpu_iocsr_as (cpu);
@@ -119,7 +119,8 @@ static MemTxResult send_ipi_data(CPUState *cpu, uint64_t val, hwaddr addr,return MEMTX_OK ; } -static MemTxResult mail_send (uint64_t val,MemTxAttrs attrs) +static MemTxResult mail_send (LoongsonIPICommonState *ipi, +uint64_t val,MemTxAttrs attrs) {uint32_t cpuid;hwaddr addr;
@@ -134,10 +135,11 @@ static MemTxResult mail_send(uint64_t val, MemTxAttrs attrs)/* override requester_id */ addr =SMP_IPI_MAILBOX +CORE_BUF_20 + (val &0x1c ); attrs.requester_id = cs->cpu_index; -return send_ipi_data (cs, val, addr, attrs); +return send_ipi_data (ipi, cs, val, addr, attrs); } -static MemTxResult any_send (uint64_t val,MemTxAttrs attrs) +static MemTxResult any_send (LoongsonIPICommonState *ipi, +uint64_t val,MemTxAttrs attrs) {uint32_t cpuid;hwaddr addr;
@@ -152,7 +154,7 @@ static MemTxResult any_send(uint64_t val, MemTxAttrs attrs)/* override requester_id */ addr = val &0xffff ; attrs.requester_id = cs->cpu_index; -return send_ipi_data (cs, val, addr, attrs); +return send_ipi_data (ipi, cs, val, addr, attrs); } static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr,
@@ -249,15 +251,16 @@ static const MemoryRegionOps loongson_ipi_iocsr_ops = {static MemTxResult loongson_ipi_writeq (void *opaque,hwaddr addr,uint64_t val,unsigned size,MemTxAttrs attrs) { +LoongsonIPICommonState *ipi = opaque;MemTxResult ret =MEMTX_OK ; addr &=0xfff ;switch (addr) {case MAIL_SEND_OFFSET : - ret =mail_send (val, attrs); + ret =mail_send (ipi, val, attrs);break ;case ANY_SEND_OFFSET : - ret =any_send (val, attrs); + ret =any_send (ipi, val, attrs);break ;default :break ;
Signature · 1 line
2.45.2
PATCH v6 8/15 hw/intc/loongson_ipi: Add LoongsonIPICommonClass::get_iocsr_as handler
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Allow Loongson IPI implementations to have their own get_iocsr_as() handler.
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi_common.h | 2 ++ hw/intc/loongson_ipi.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)
include/hw/intc/loongson_ipi_common.h +2 -0
@@ -39,6 +39,8 @@ struct LoongsonIPICommonState {struct LoongsonIPICommonClass {SysBusDeviceClass parent_class; + +AddressSpace *(*get_iocsr_as)(CPUState *cpu); };/* Mainy used by iocsr read and write */
hw/intc/loongson_ipi.c +12 -4
@@ -75,24 +75,30 @@ static MemTxResult loongson_ipi_iocsr_readl(void *opaque, hwaddr addr,return loongson_ipi_core_readl (s, addr, data, size, attrs); } -static AddressSpace *get_cpu_iocsr_as (CPUState *cpu) -{#ifdef TARGET_LOONGARCH64 +static AddressSpace *get_iocsr_as (CPUState *cpu) +{return LOONGARCH_CPU (cpu)->env.address_space_iocsr; +}#endif +#ifdef TARGET_MIPS +static AddressSpace *get_iocsr_as (CPUState *cpu) +{if (ase_lcsr_available (&MIPS_CPU (cpu)->env)) {return &MIPS_CPU (cpu)->env.iocsr.as; } -#endif +return NULL ; } +#endif static MemTxResult send_ipi_data (LoongsonIPICommonState *ipi,CPUState *cpu,uint64_t val,hwaddr addr,MemTxAttrs attrs) { +LoongsonIPICommonClass *licc =LOONGSON_IPI_COMMON_GET_CLASS (ipi);int i, mask =0 , data =0 ; -AddressSpace *iocsr_as =get_cpu_iocsr_as (cpu); +AddressSpace *iocsr_as = licc->get_iocsr_as (cpu);if (!iocsr_as) {return MEMTX_DECODE_ERROR ;
@@ -354,11 +360,13 @@ static void loongson_ipi_class_init(ObjectClass *klass, void *data) {DeviceClass *dc =DEVICE_CLASS (klass);LoongsonIPIClass *lic =LOONGSON_IPI_CLASS (klass); +LoongsonIPICommonClass *licc =LOONGSON_IPI_COMMON_CLASS (klass);device_class_set_parent_realize (dc, loongson_ipi_realize, &lic->parent_realize);device_class_set_parent_unrealize (dc, loongson_ipi_unrealize, &lic->parent_unrealize); + licc->get_iocsr_as = get_iocsr_as; }static const TypeInfo loongson_ipi_types[] = {
Signature · 1 line
2.45.2
PATCH v6 9/15 hw/intc/loongson_ipi: Add LoongsonIPICommonClass::cpu_by_arch_id handler
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Allow Loongson IPI implementations to have their own cpu_by_arch_id() handler.
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi_common.h | 1 + hw/intc/loongson_ipi.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-)
include/hw/intc/loongson_ipi_common.h +1 -0
@@ -41,6 +41,7 @@ struct LoongsonIPICommonClass {SysBusDeviceClass parent_class; AddressSpace *(*get_iocsr_as)(CPUState *cpu); +CPUState *(*cpu_by_arch_id)(int64_t id); };/* Mainy used by iocsr read and write */
hw/intc/loongson_ipi.c +7 -3
@@ -128,12 +128,13 @@ static MemTxResult send_ipi_data(LoongsonIPICommonState *ipi, CPUState *cpu,static MemTxResult mail_send (LoongsonIPICommonState *ipi,uint64_t val,MemTxAttrs attrs) { +LoongsonIPICommonClass *licc =LOONGSON_IPI_COMMON_GET_CLASS (ipi);uint32_t cpuid;hwaddr addr;CPUState *cs; cpuid =extract32 (val,16 ,10 ); - cs =cpu_by_arch_id (cpuid); + cs = licc->cpu_by_arch_id (cpuid);if (cs ==NULL ) {return MEMTX_DECODE_ERROR ; }
@@ -147,12 +148,13 @@ static MemTxResult mail_send(LoongsonIPICommonState *ipi,static MemTxResult any_send (LoongsonIPICommonState *ipi,uint64_t val,MemTxAttrs attrs) { +LoongsonIPICommonClass *licc =LOONGSON_IPI_COMMON_GET_CLASS (ipi);uint32_t cpuid;hwaddr addr;CPUState *cs; cpuid =extract32 (val,16 ,10 ); - cs =cpu_by_arch_id (cpuid); + cs = licc->cpu_by_arch_id (cpuid);if (cs ==NULL ) {return MEMTX_DECODE_ERROR ; }
@@ -169,6 +171,7 @@ static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr, {IPICore *s = opaque;LoongsonIPICommonState *ipi = s->ipi; +LoongsonIPICommonClass *licc =LOONGSON_IPI_COMMON_GET_CLASS (ipi);int index =0 ;uint32_t cpuid;uint8_t vector;
@@ -203,7 +206,7 @@ static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr, cpuid =extract32 (val,16 ,10 );/* IPI status vector */ vector =extract8 (val,0 ,5 ); - cs =cpu_by_arch_id (cpuid); + cs = licc->cpu_by_arch_id (cpuid);if (cs ==NULL || cs->cpu_index >= ipi->num_cpu) {return MEMTX_DECODE_ERROR ; }
@@ -367,6 +370,7 @@ static void loongson_ipi_class_init(ObjectClass *klass, void *data)device_class_set_parent_unrealize (dc, loongson_ipi_unrealize, &lic->parent_unrealize); licc->get_iocsr_as = get_iocsr_as; + licc->cpu_by_arch_id = cpu_by_arch_id; }static const TypeInfo loongson_ipi_types[] = {
Signature · 1 line
2.45.2
PATCH v6 10/15 hw/intc/loongson_ipi: Expose loongson_ipi_core_read/write helpers
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
In order to access loongson_ipi_core_read/write helpers from loongson_ipi_common.c in the next commit, make their prototype declaration public.
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi_common.h | 6 ++++++ hw/intc/loongson_ipi.c | 10 ++++------ 2 files changed, 10 insertions(+), 6 deletions(-)
include/hw/intc/loongson_ipi_common.h +6 -0
@@ -10,6 +10,7 @@#include "qom/object.h" #include "hw/sysbus.h" +#include "exec/memattrs.h" #define IPI_MBX_NUM 4
@@ -44,6 +45,11 @@ struct LoongsonIPICommonClass {CPUState *(*cpu_by_arch_id)(int64_t id); }; +MemTxResult loongson_ipi_core_readl (void *opaque,hwaddr addr,uint64_t *data, +unsigned size,MemTxAttrs attrs); +MemTxResult loongson_ipi_core_writel (void *opaque,hwaddr addr,uint64_t val, +unsigned size,MemTxAttrs attrs); +/* Mainy used by iocsr read and write */ #define SMP_IPI_MAILBOX 0x1000ULL
hw/intc/loongson_ipi.c +4 -6
@@ -24,9 +24,8 @@#endif #include "trace.h" -static MemTxResult loongson_ipi_core_readl (void *opaque,hwaddr addr, -uint64_t *data, -unsigned size,MemTxAttrs attrs) +MemTxResult loongson_ipi_core_readl (void *opaque,hwaddr addr,uint64_t *data, +unsigned size,MemTxAttrs attrs) {IPICore *s = opaque;uint64_t ret =0 ;
@@ -165,9 +164,8 @@ static MemTxResult any_send(LoongsonIPICommonState *ipi,return send_ipi_data (ipi, cs, val, addr, attrs); } -static MemTxResult loongson_ipi_core_writel (void *opaque,hwaddr addr, -uint64_t val,unsigned size, -MemTxAttrs attrs) +MemTxResult loongson_ipi_core_writel (void *opaque,hwaddr addr,uint64_t val, +unsigned size,MemTxAttrs attrs) {IPICore *s = opaque;LoongsonIPICommonState *ipi = s->ipi;
Signature · 1 line
2.45.2
PATCH v6 11/15 hw/intc/loongson_ipi: Move common code to loongson_ipi_common.c
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Move the common code from loongson_ipi.c to loongson_ipi_common.c, call parent_realize() instead of loongson_ipi_common_realize() in loongson_ipi_realize().
Message-Id: <[email protected]>
--- include/hw/intc/loongson_ipi_common.h | 2 + hw/intc/loongson_ipi.c | 279 +------------------------ hw/intc/loongson_ipi_common.c | 283 ++++++++++++++++++++++++++ 3 files changed, 289 insertions(+), 275 deletions(-)
include/hw/intc/loongson_ipi_common.h +2 -0
@@ -41,6 +41,8 @@ struct LoongsonIPICommonState {struct LoongsonIPICommonClass {SysBusDeviceClass parent_class; +DeviceRealize parent_realize; +DeviceUnrealize parent_unrealize;AddressSpace *(*get_iocsr_as)(CPUState *cpu);CPUState *(*cpu_by_arch_id)(int64_t id); };
hw/intc/loongson_ipi.c +4 -275
316 lines not on this page · raw message
hw/intc/loongson_ipi_common.c +283 -0
298 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH v6 12/15 hw/intc/loongarch_ipi: Add loongarch IPI support
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Loongarch IPI is added here, it inherits from class TYPE_LOONGSON_IPI_COMMON, and two interfaces get_iocsr_as() and cpu_by_arch_id() are added for Loongarch 3A5000 machine. It can be used when ipi is emulated in userspace with KVM mode.
Message-Id: <[email protected]>
--- include/hw/intc/loongarch_ipi.h | 25 ++++++++++++ hw/intc/loongarch_ipi.c | 68 +++++++++++++++++++++++++++++++++ hw/intc/Kconfig | 4 ++ hw/intc/meson.build | 1 + 4 files changed, 98 insertions(+) create mode 100644 include/hw/intc/loongarch_ipi.h create mode 100644 hw/intc/loongarch_ipi.c
include/hw/intc/loongarch_ipi.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* LoongArch IPI interrupt header files +* +* Copyright (C) 2024 Loongson Technology Corporation Limited +*/ + +#ifndef HW_LOONGARCH_IPI_H +#define HW_LOONGARCH_IPI_H + +#include "qom/object.h" +#include "hw/intc/loongson_ipi_common.h" + +#define TYPE_LOONGARCH_IPI "loongarch_ipi" +OBJECT_DECLARE_TYPE(LoongarchIPIState, LoongarchIPIClass, LOONGARCH_IPI) + +struct LoongarchIPIState { +LoongsonIPICommonState parent_obj; +}; + +struct LoongarchIPIClass { +LoongsonIPICommonClass parent_class; +}; + +#endif
hw/intc/loongarch_ipi.c new file +68 -0
68 lines not on this page · raw message
hw/intc/Kconfig +4 -0
@@ -94,6 +94,10 @@ config LOONGSON_IPI bool select LOONGSON_IPI_COMMON +config LOONGARCH_IPI + bool + select LOONGSON_IPI_COMMON + config LOONGARCH_PCH_PIC bool select UNIMP
hw/intc/meson.build +1 -0
@@ -71,6 +71,7 @@ specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], 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_LOONGARCH_IPI', if_true: files('loongarch_ipi.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_EXTIOI', if_true: files('loongarch_extioi.c'))
Signature · 1 line
2.45.2
PATCH v6 13/15 hw/loongarch/virt: Replace Loongson IPI with LoongArch IPI
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Loongarch IPI inherits from class LoongsonIPICommonClass, and it only contains Loongarch 3A5000 virt machine specific interfaces, rather than mix different machine implementations together.
Message-Id: <[email protected]>
--- include/hw/loongarch/virt.h | 1 - hw/loongarch/virt.c | 4 ++-- hw/loongarch/Kconfig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
include/hw/loongarch/virt.h +0 -1
@@ -11,7 +11,6 @@#include "target/loongarch/cpu.h" #include "hw/boards.h" #include "qemu/queue.h" -#include "hw/intc/loongson_ipi.h" #include "hw/block/flash.h" #include "hw/loongarch/boot.h"
hw/loongarch/virt.c +2 -2
@@ -23,7 +23,7 @@#include "net/net.h" #include "hw/loader.h" #include "elf.h" -#include "hw/intc/loongson_ipi.h" +#include "hw/intc/loongarch_ipi.h" #include "hw/intc/loongarch_extioi.h" #include "hw/intc/loongarch_pch_pic.h" #include "hw/intc/loongarch_pch_msi.h"
@@ -788,7 +788,7 @@ static void virt_irq_init(LoongArchVirtMachineState *lvms)*/ /* Create IPI device */ - ipi =qdev_new (TYPE_LOONGSON_IPI ); + ipi =qdev_new (TYPE_LOONGARCH_IPI );qdev_prop_set_uint32 (ipi,"num-cpu" , ms->smp.cpus);sysbus_realize_and_unref (SYS_BUS_DEVICE (ipi), &error_fatal);
hw/loongarch/Kconfig +1 -1
@@ -12,7 +12,7 @@ config LOONGARCH_VIRT select SERIAL select VIRTIO_PCI select PLATFORM_BUS - select LOONGSON_IPI + select LOONGARCH_IPI select LOONGARCH_PCH_PIC select LOONGARCH_PCH_MSI select LOONGARCH_EXTIOI
Signature · 1 line
2.45.2
PATCH v6 14/15 hw/intc/loongson_ipi: Restrict to MIPS
In reply to Philippe Mathieu-DaudéFrom: Bibo Mao <[email protected]>
Now than LoongArch target can use the TYPE_LOONGARCH_IPI model, restrict TYPE_LOONGSON_IPI to MIPS.
Message-Id: <[email protected]>
--- MAINTAINERS | 2 -- hw/intc/loongson_ipi.c | 14 -------------- 2 files changed, 16 deletions(-)
MAINTAINERS +0 -2
@@ -1251,10 +1251,8 @@ F: hw/loongarch/ F: include/hw/loongarch/virt.h F: include/hw/intc/loongarch_*.h F: include/hw/intc/loongson_ipi_common.h -F: include/hw/intc/loongson_ipi.h F: hw/intc/loongarch_*.c F: hw/intc/loongson_ipi_common.c -F: hw/intc/loongson_ipi.c F: include/hw/pci-host/ls7a.h F: hw/rtc/ls7a_rtc.c F: gdb-xml/loongarch*.xml
hw/intc/loongson_ipi.c +0 -14
@@ -16,22 +16,9 @@#include "exec/address-spaces.h" #include "exec/memory.h" #include "migration/vmstate.h" -#ifdef TARGET_LOONGARCH64 -#include "target/loongarch/cpu.h" -#endif -#ifdef TARGET_MIPS #include "target/mips/cpu.h" -#endif #include "trace.h" -#ifdef TARGET_LOONGARCH64 -static AddressSpace *get_iocsr_as (CPUState *cpu) -{ -return LOONGARCH_CPU (cpu)->env.address_space_iocsr; -} -#endif - -#ifdef TARGET_MIPS static AddressSpace *get_iocsr_as (CPUState *cpu) {if (ase_lcsr_available (&MIPS_CPU (cpu)->env)) {
@@ -40,7 +27,6 @@ static AddressSpace *get_iocsr_as(CPUState *cpu)return NULL ; } -#endif static const MemoryRegionOps loongson_ipi_core_ops = { .read_with_attrs = loongson_ipi_core_readl,
Signature · 1 line
2.45.2
PATCH v6 15/15 hw/intc/loongson_ipi: Remove unused headers
In reply to Philippe Mathieu-DaudéMessage-Id: <[email protected]>
--- hw/intc/loongson_ipi.c | 9 --------- 1 file changed, 9 deletions(-)
hw/intc/loongson_ipi.c +0 -9
@@ -6,18 +6,9 @@*/ #include "qemu/osdep.h" -#include "hw/boards.h" -#include "hw/sysbus.h" #include "hw/intc/loongson_ipi.h" -#include "hw/irq.h" -#include "hw/qdev-properties.h" #include "qapi/error.h" -#include "qemu/log.h" -#include "exec/address-spaces.h" -#include "exec/memory.h" -#include "migration/vmstate.h" #include "target/mips/cpu.h" -#include "trace.h" static AddressSpace *get_iocsr_as (CPUState *cpu) {
Signature · 1 line
2.45.2
Quoted 8 lines · Philippe Mathieu-Daudé
Bibo Mao (14):
hw/intc/loongson_ipi: Rename LoongsonIPI -> LoongsonIPIState hw/intc/loongson_ipi: Extractloongson_ipi_common_realize()hw/intc/loongson_ipi: AddTYPE_LOONGSON_IPI_COMMONstub hw/intc/loongson_ipi: Move common definitions toloongson_ipi_common.hhw/intc/loongson_ipi: MoveIPICore::mmio_memto LoongsonIPIState hw/intc/loongson_ipi: Move IPICore structure toloongson_ipi_common.hhw/intc/loongson_ipi: Pass LoongsonIPICommonState tosend_ipi_data()
Quoted 8 lines
hw/intc/loongson_ipi: Add
LoongsonIPICommonClass::get_iocsr_ashandler hw/intc/loongson_ipi: AddLoongsonIPICommonClass::cpu_by_arch_id
handler
hw/intc/loongson_ipi: Expose loongson_ipi_core_read/write helpers hw/intc/loongson_ipi: Move common code toloongson_ipi_common.chw/intc/loongarch_ipi: Add loongarch IPI support hw/loongarch/virt: Replace Loongson IPI with LoongArch IPI hw/intc/loongson_ipi: Restrict to MIPS
Patches 1-15 queued.