| 1 | The following changes since commit d29201ff34a135cdfc197f4413c1c5047e4f58bb: | 1 | The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge tag 'pull-hmp-20220915a' of https://gitlab.com/dagrh/qemu into staging (2022-09-17 10:31:11 -0400) | 3 | Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000) |
| 4 | 4 | ||
| 5 | are available in the Git repository at: | 5 | are available in the Git repository at: |
| 6 | 6 | ||
| 7 | https://gitlab.com/gaosong/qemu.git tags/pull-loongarch-20220919 | 7 | https://gitlab.com/bibo-mao/qemu.git pull-loongarch-20241213 |
| 8 | 8 | ||
| 9 | for you to fetch changes up to c06bc455a0ac03123548ac9a2a76e5887f9b9a89: | 9 | for you to fetch changes up to 78aa256571aa06f32001bd80635a1858187c609b: |
| 10 | 10 | ||
| 11 | hw/loongarch: Improve acpi dsdt table (2022-09-19 20:01:41 +0800) | 11 | hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic (2024-12-13 14:39:39 +0800) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | pull-loongarch | 14 | pull-loongarch-20241213 |
| 15 | 15 | ||
| 16 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
| 17 | Xiaojuan Yang (9): | 17 | Bibo Mao (8): |
| 18 | hw/loongarch: Remove vga device when loongarch init | 18 | include: Add loongarch_pic_common header file |
| 19 | hw/loongarch: Support fw_cfg dma function | 19 | include: Move struct LoongArchPCHPIC to loongarch_pic_common header file |
| 20 | hw/loongarch: Add interrupt information to FDT table | 20 | hw/intc/loongarch_pch: Merge instance_init() into realize() |
| 21 | hw/loongarch: Add platform bus support | 21 | hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState |
| 22 | hw/loongarch: Add hotplug handler for machine | 22 | hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common |
| 23 | hw/loongarch: Add RAMFB to dynamic_sysbus_devices list | 23 | hw/intc/loongarch_pch: Inherit from loongarch_pic_common |
| 24 | hw/loongarch: Fix acpi ged irq number in dsdt table | 24 | hw/intc/loongarch_pch: Add pre_save and post_load interfaces |
| 25 | hw/loongarch: Support memory hotplug | 25 | hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic |
| 26 | hw/loongarch: Improve acpi dsdt table | ||
| 27 | 26 | ||
| 28 | hw/loongarch/Kconfig | 5 +- | 27 | hw/intc/loongarch_pch_pic.c | 106 +++++++++++---------------------- |
| 29 | hw/loongarch/acpi-build.c | 191 ++++++++++------------------------------- | 28 | hw/intc/loongarch_pic_common.c | 97 ++++++++++++++++++++++++++++++ |
| 30 | hw/loongarch/fw_cfg.c | 3 +- | 29 | hw/intc/meson.build | 2 +- |
| 31 | hw/loongarch/virt.c | 205 +++++++++++++++++++++++++++++++++++++++++++- | 30 | hw/loongarch/virt.c | 2 +- |
| 32 | include/hw/loongarch/virt.h | 2 + | 31 | include/hw/intc/loongarch_pch_pic.h | 70 +++++----------------- |
| 33 | include/hw/pci-host/ls7a.h | 5 ++ | 32 | include/hw/intc/loongarch_pic_common.h | 82 +++++++++++++++++++++++++ |
| 34 | 6 files changed, 259 insertions(+), 152 deletions(-) | 33 | 6 files changed, 230 insertions(+), 129 deletions(-) |
| 34 | create mode 100644 hw/intc/loongarch_pic_common.c | ||
| 35 | create mode 100644 include/hw/intc/loongarch_pic_common.h | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | Add common header file hw/intc/loongarch_pic_common.h, and move | ||
| 2 | some macro definition from hw/intc/loongarch_pch_pic.h to the common | ||
| 3 | header file. | ||
| 1 | 4 | ||
| 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> | ||
| 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
| 7 | --- | ||
| 8 | include/hw/intc/loongarch_pch_pic.h | 36 +++------------------- | ||
| 9 | include/hw/intc/loongarch_pic_common.h | 42 ++++++++++++++++++++++++++ | ||
| 10 | 2 files changed, 47 insertions(+), 31 deletions(-) | ||
| 11 | create mode 100644 include/hw/intc/loongarch_pic_common.h | ||
| 12 | |||
| 13 | diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h | ||
| 14 | index XXXXXXX..XXXXXXX 100644 | ||
| 15 | --- a/include/hw/intc/loongarch_pch_pic.h | ||
| 16 | +++ b/include/hw/intc/loongarch_pch_pic.h | ||
| 17 | @@ -XXX,XX +XXX,XX @@ | ||
| 18 | * Copyright (c) 2021 Loongson Technology Corporation Limited | ||
| 19 | */ | ||
| 20 | |||
| 21 | -#include "hw/sysbus.h" | ||
| 22 | +#ifndef HW_LOONGARCH_PCH_PIC_H | ||
| 23 | +#define HW_LOONGARCH_PCH_PIC_H | ||
| 24 | + | ||
| 25 | +#include "hw/intc/loongarch_pic_common.h" | ||
| 26 | |||
| 27 | #define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic" | ||
| 28 | #define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name | ||
| 29 | OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC) | ||
| 30 | |||
| 31 | -#define PCH_PIC_INT_ID_VAL 0x7000000UL | ||
| 32 | -#define PCH_PIC_INT_ID_VER 0x1UL | ||
| 33 | - | ||
| 34 | -#define PCH_PIC_INT_ID_LO 0x00 | ||
| 35 | -#define PCH_PIC_INT_ID_HI 0x04 | ||
| 36 | -#define PCH_PIC_INT_MASK_LO 0x20 | ||
| 37 | -#define PCH_PIC_INT_MASK_HI 0x24 | ||
| 38 | -#define PCH_PIC_HTMSI_EN_LO 0x40 | ||
| 39 | -#define PCH_PIC_HTMSI_EN_HI 0x44 | ||
| 40 | -#define PCH_PIC_INT_EDGE_LO 0x60 | ||
| 41 | -#define PCH_PIC_INT_EDGE_HI 0x64 | ||
| 42 | -#define PCH_PIC_INT_CLEAR_LO 0x80 | ||
| 43 | -#define PCH_PIC_INT_CLEAR_HI 0x84 | ||
| 44 | -#define PCH_PIC_AUTO_CTRL0_LO 0xc0 | ||
| 45 | -#define PCH_PIC_AUTO_CTRL0_HI 0xc4 | ||
| 46 | -#define PCH_PIC_AUTO_CTRL1_LO 0xe0 | ||
| 47 | -#define PCH_PIC_AUTO_CTRL1_HI 0xe4 | ||
| 48 | -#define PCH_PIC_ROUTE_ENTRY_OFFSET 0x100 | ||
| 49 | -#define PCH_PIC_ROUTE_ENTRY_END 0x13f | ||
| 50 | -#define PCH_PIC_HTMSI_VEC_OFFSET 0x200 | ||
| 51 | -#define PCH_PIC_HTMSI_VEC_END 0x23f | ||
| 52 | -#define PCH_PIC_INT_STATUS_LO 0x3a0 | ||
| 53 | -#define PCH_PIC_INT_STATUS_HI 0x3a4 | ||
| 54 | -#define PCH_PIC_INT_POL_LO 0x3e0 | ||
| 55 | -#define PCH_PIC_INT_POL_HI 0x3e4 | ||
| 56 | - | ||
| 57 | -#define STATUS_LO_START 0 | ||
| 58 | -#define STATUS_HI_START 0x4 | ||
| 59 | -#define POL_LO_START 0x40 | ||
| 60 | -#define POL_HI_START 0x44 | ||
| 61 | struct LoongArchPCHPIC { | ||
| 62 | SysBusDevice parent_obj; | ||
| 63 | qemu_irq parent_irq[64]; | ||
| 64 | @@ -XXX,XX +XXX,XX @@ struct LoongArchPCHPIC { | ||
| 65 | MemoryRegion iomem8; | ||
| 66 | unsigned int irq_num; | ||
| 67 | }; | ||
| 68 | +#endif /* HW_LOONGARCH_PCH_PIC_H */ | ||
| 69 | diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h | ||
| 70 | new file mode 100644 | ||
| 71 | index XXXXXXX..XXXXXXX | ||
| 72 | --- /dev/null | ||
| 73 | +++ b/include/hw/intc/loongarch_pic_common.h | ||
| 74 | @@ -XXX,XX +XXX,XX @@ | ||
| 75 | +/* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 76 | +/* | ||
| 77 | + * LoongArch 7A1000 I/O interrupt controller definitions | ||
| 78 | + * Copyright (c) 2024 Loongson Technology Corporation Limited | ||
| 79 | + */ | ||
| 80 | + | ||
| 81 | +#ifndef HW_LOONGARCH_PIC_COMMON_H | ||
| 82 | +#define HW_LOONGARCH_PIC_COMMON_H | ||
| 83 | + | ||
| 84 | +#include "hw/pci-host/ls7a.h" | ||
| 85 | +#include "hw/sysbus.h" | ||
| 86 | + | ||
| 87 | +#define PCH_PIC_INT_ID_VAL 0x7000000UL | ||
| 88 | +#define PCH_PIC_INT_ID_VER 0x1UL | ||
| 89 | +#define PCH_PIC_INT_ID_LO 0x00 | ||
| 90 | +#define PCH_PIC_INT_ID_HI 0x04 | ||
| 91 | +#define PCH_PIC_INT_MASK_LO 0x20 | ||
| 92 | +#define PCH_PIC_INT_MASK_HI 0x24 | ||
| 93 | +#define PCH_PIC_HTMSI_EN_LO 0x40 | ||
| 94 | +#define PCH_PIC_HTMSI_EN_HI 0x44 | ||
| 95 | +#define PCH_PIC_INT_EDGE_LO 0x60 | ||
| 96 | +#define PCH_PIC_INT_EDGE_HI 0x64 | ||
| 97 | +#define PCH_PIC_INT_CLEAR_LO 0x80 | ||
| 98 | +#define PCH_PIC_INT_CLEAR_HI 0x84 | ||
| 99 | +#define PCH_PIC_AUTO_CTRL0_LO 0xc0 | ||
| 100 | +#define PCH_PIC_AUTO_CTRL0_HI 0xc4 | ||
| 101 | +#define PCH_PIC_AUTO_CTRL1_LO 0xe0 | ||
| 102 | +#define PCH_PIC_AUTO_CTRL1_HI 0xe4 | ||
| 103 | +#define PCH_PIC_ROUTE_ENTRY_OFFSET 0x100 | ||
| 104 | +#define PCH_PIC_ROUTE_ENTRY_END 0x13f | ||
| 105 | +#define PCH_PIC_HTMSI_VEC_OFFSET 0x200 | ||
| 106 | +#define PCH_PIC_HTMSI_VEC_END 0x23f | ||
| 107 | +#define PCH_PIC_INT_STATUS_LO 0x3a0 | ||
| 108 | +#define PCH_PIC_INT_STATUS_HI 0x3a4 | ||
| 109 | +#define PCH_PIC_INT_POL_LO 0x3e0 | ||
| 110 | +#define PCH_PIC_INT_POL_HI 0x3e4 | ||
| 111 | + | ||
| 112 | +#define STATUS_LO_START 0 | ||
| 113 | +#define STATUS_HI_START 0x4 | ||
| 114 | +#define POL_LO_START 0x40 | ||
| 115 | +#define POL_HI_START 0x44 | ||
| 116 | +#endif /* HW_LOONGARCH_PIC_COMMON_H */ | ||
| 117 | -- | ||
| 118 | 2.43.5 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | Move structure LoongArchPCHPIC from header file loongarch_pch_pic.h | ||
| 2 | to file loongarch_pic_common.h, and rename structure name with | ||
| 3 | LoongArchPICCommonState. | ||
| 1 | 4 | ||
| 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> | ||
| 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
| 7 | --- | ||
| 8 | include/hw/intc/loongarch_pch_pic.h | 27 +------------------------ | ||
| 9 | include/hw/intc/loongarch_pic_common.h | 28 ++++++++++++++++++++++++++ | ||
| 10 | 2 files changed, 29 insertions(+), 26 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/include/hw/intc/loongarch_pch_pic.h | ||
| 15 | +++ b/include/hw/intc/loongarch_pch_pic.h | ||
| 16 | @@ -XXX,XX +XXX,XX @@ | ||
| 17 | |||
| 18 | #include "hw/intc/loongarch_pic_common.h" | ||
| 19 | |||
| 20 | +#define LoongArchPCHPIC LoongArchPICCommonState | ||
| 21 | #define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic" | ||
| 22 | #define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name | ||
| 23 | OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC) | ||
| 24 | |||
| 25 | -struct LoongArchPCHPIC { | ||
| 26 | - SysBusDevice parent_obj; | ||
| 27 | - qemu_irq parent_irq[64]; | ||
| 28 | - uint64_t int_mask; /*0x020 interrupt mask register*/ | ||
| 29 | - uint64_t htmsi_en; /*0x040 1=msi*/ | ||
| 30 | - uint64_t intedge; /*0x060 edge=1 level =0*/ | ||
| 31 | - uint64_t intclr; /*0x080 for clean edge int,set 1 clean,set 0 is noused*/ | ||
| 32 | - uint64_t auto_crtl0; /*0x0c0*/ | ||
| 33 | - uint64_t auto_crtl1; /*0x0e0*/ | ||
| 34 | - uint64_t last_intirr; /* edge detection */ | ||
| 35 | - uint64_t intirr; /* 0x380 interrupt request register */ | ||
| 36 | - uint64_t intisr; /* 0x3a0 interrupt service register */ | ||
| 37 | - /* | ||
| 38 | - * 0x3e0 interrupt level polarity selection | ||
| 39 | - * register 0 for high level trigger | ||
| 40 | - */ | ||
| 41 | - uint64_t int_polarity; | ||
| 42 | - | ||
| 43 | - uint8_t route_entry[64]; /*0x100 - 0x138*/ | ||
| 44 | - uint8_t htmsi_vector[64]; /*0x200 - 0x238*/ | ||
| 45 | - | ||
| 46 | - MemoryRegion iomem32_low; | ||
| 47 | - MemoryRegion iomem32_high; | ||
| 48 | - MemoryRegion iomem8; | ||
| 49 | - unsigned int irq_num; | ||
| 50 | -}; | ||
| 51 | #endif /* HW_LOONGARCH_PCH_PIC_H */ | ||
| 52 | diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h | ||
| 53 | index XXXXXXX..XXXXXXX 100644 | ||
| 54 | --- a/include/hw/intc/loongarch_pic_common.h | ||
| 55 | +++ b/include/hw/intc/loongarch_pic_common.h | ||
| 56 | @@ -XXX,XX +XXX,XX @@ | ||
| 57 | #define STATUS_HI_START 0x4 | ||
| 58 | #define POL_LO_START 0x40 | ||
| 59 | #define POL_HI_START 0x44 | ||
| 60 | + | ||
| 61 | +struct LoongArchPICCommonState { | ||
| 62 | + SysBusDevice parent_obj; | ||
| 63 | + | ||
| 64 | + qemu_irq parent_irq[64]; | ||
| 65 | + uint64_t int_mask; /* 0x020 interrupt mask register */ | ||
| 66 | + uint64_t htmsi_en; /* 0x040 1=msi */ | ||
| 67 | + uint64_t intedge; /* 0x060 edge=1 level=0 */ | ||
| 68 | + uint64_t intclr; /* 0x080 clean edge int, set 1 clean, 0 noused */ | ||
| 69 | + uint64_t auto_crtl0; /* 0x0c0 */ | ||
| 70 | + uint64_t auto_crtl1; /* 0x0e0 */ | ||
| 71 | + uint64_t last_intirr; /* edge detection */ | ||
| 72 | + uint64_t intirr; /* 0x380 interrupt request register */ | ||
| 73 | + uint64_t intisr; /* 0x3a0 interrupt service register */ | ||
| 74 | + /* | ||
| 75 | + * 0x3e0 interrupt level polarity selection | ||
| 76 | + * register 0 for high level trigger | ||
| 77 | + */ | ||
| 78 | + uint64_t int_polarity; | ||
| 79 | + | ||
| 80 | + uint8_t route_entry[64]; /* 0x100 - 0x138 */ | ||
| 81 | + uint8_t htmsi_vector[64]; /* 0x200 - 0x238 */ | ||
| 82 | + | ||
| 83 | + MemoryRegion iomem32_low; | ||
| 84 | + MemoryRegion iomem32_high; | ||
| 85 | + MemoryRegion iomem8; | ||
| 86 | + unsigned int irq_num; | ||
| 87 | +}; | ||
| 88 | #endif /* HW_LOONGARCH_PIC_COMMON_H */ | ||
| 89 | -- | ||
| 90 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Memory region is created in instance_init(), merge it into function |
|---|---|---|---|
| 2 | realize(). There is no special class_init() for loongarch_pch object. | ||
| 2 | 3 | ||
| 3 | In dsdt, acpi ged irq should use gsi number, and the | 4 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | VIRT_SCI_IRQ means it. | 5 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 6 | --- | ||
| 7 | hw/intc/loongarch_pch_pic.c | 15 ++++----------- | ||
| 8 | 1 file changed, 4 insertions(+), 11 deletions(-) | ||
| 5 | 9 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 10 | diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-8-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | ||
| 11 | hw/loongarch/acpi-build.c | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | 11 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/acpi-build.c | 12 | --- a/hw/intc/loongarch_pch_pic.c |
| 17 | +++ b/hw/loongarch/acpi-build.c | 13 | +++ b/hw/intc/loongarch_pch_pic.c |
| 18 | @@ -XXX,XX +XXX,XX @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | 14 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_reset(DeviceState *d) |
| 19 | if (lams->acpi_ged) { | 15 | static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) |
| 20 | build_ged_aml(dsdt, "\\_SB."GED_DEVICE, | 16 | { |
| 21 | HOTPLUG_HANDLER(lams->acpi_ged), | 17 | LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); |
| 22 | - VIRT_SCI_IRQ - PCH_PIC_IRQ_OFFSET, AML_SYSTEM_MEMORY, | 18 | + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); |
| 23 | + VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, | 19 | |
| 24 | VIRT_GED_EVT_ADDR); | 20 | if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { |
| 25 | } | 21 | error_setg(errp, "Invalid 'pic_irq_num'"); |
| 22 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) | ||
| 23 | |||
| 24 | qdev_init_gpio_out(dev, s->parent_irq, s->irq_num); | ||
| 25 | qdev_init_gpio_in(dev, pch_pic_irq_handler, s->irq_num); | ||
| 26 | -} | ||
| 27 | - | ||
| 28 | -static void loongarch_pch_pic_init(Object *obj) | ||
| 29 | -{ | ||
| 30 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(obj); | ||
| 31 | - SysBusDevice *sbd = SYS_BUS_DEVICE(obj); | ||
| 32 | - | ||
| 33 | - memory_region_init_io(&s->iomem32_low, obj, | ||
| 34 | + memory_region_init_io(&s->iomem32_low, OBJECT(dev), | ||
| 35 | &loongarch_pch_pic_reg32_low_ops, | ||
| 36 | s, PCH_PIC_NAME(.reg32_part1), 0x100); | ||
| 37 | - memory_region_init_io(&s->iomem8, obj, &loongarch_pch_pic_reg8_ops, | ||
| 38 | + memory_region_init_io(&s->iomem8, OBJECT(dev), &loongarch_pch_pic_reg8_ops, | ||
| 39 | s, PCH_PIC_NAME(.reg8), 0x2a0); | ||
| 40 | - memory_region_init_io(&s->iomem32_high, obj, | ||
| 41 | + memory_region_init_io(&s->iomem32_high, OBJECT(dev), | ||
| 42 | &loongarch_pch_pic_reg32_high_ops, | ||
| 43 | s, PCH_PIC_NAME(.reg32_part2), 0xc60); | ||
| 44 | sysbus_init_mmio(sbd, &s->iomem32_low); | ||
| 45 | @@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_pch_pic_info = { | ||
| 46 | .name = TYPE_LOONGARCH_PCH_PIC, | ||
| 47 | .parent = TYPE_SYS_BUS_DEVICE, | ||
| 48 | .instance_size = sizeof(LoongArchPCHPIC), | ||
| 49 | - .instance_init = loongarch_pch_pic_init, | ||
| 50 | .class_init = loongarch_pch_pic_class_init, | ||
| 51 | }; | ||
| 26 | 52 | ||
| 27 | -- | 53 | -- |
| 28 | 2.31.1 | 54 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | With pic vmstate, rename structure name vmstate_loongarch_pch_pic with |
|---|---|---|---|
| 2 | vmstate_loongarch_pic_common, and with pic property rename | ||
| 3 | loongarch_pch_pic_properties with loongarch_pic_common_properties. | ||
| 2 | 4 | ||
| 3 | Add platform bus support and add the bus information such as address, | 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | size, irq number to FDT table. | 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 7 | --- | ||
| 8 | hw/intc/loongarch_pch_pic.c | 52 +++++++++++++++++++++++-------------- | ||
| 9 | 1 file changed, 32 insertions(+), 20 deletions(-) | ||
| 5 | 10 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-5-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | ||
| 11 | hw/loongarch/Kconfig | 1 + | ||
| 12 | hw/loongarch/virt.c | 33 +++++++++++++++++++++++++++++++++ | ||
| 13 | include/hw/loongarch/virt.h | 1 + | ||
| 14 | include/hw/pci-host/ls7a.h | 5 +++++ | ||
| 15 | 4 files changed, 40 insertions(+) | ||
| 16 | |||
| 17 | diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig | ||
| 18 | index XXXXXXX..XXXXXXX 100644 | 12 | index XXXXXXX..XXXXXXX 100644 |
| 19 | --- a/hw/loongarch/Kconfig | 13 | --- a/hw/intc/loongarch_pch_pic.c |
| 20 | +++ b/hw/loongarch/Kconfig | 14 | +++ b/hw/intc/loongarch_pch_pic.c |
| 21 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 15 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_reset(DeviceState *d) |
| 22 | select SERIAL | 16 | s->int_polarity = 0x0; |
| 23 | select SERIAL_ISA | ||
| 24 | select VIRTIO_PCI | ||
| 25 | + select PLATFORM_BUS | ||
| 26 | select LOONGARCH_IPI | ||
| 27 | select LOONGARCH_PCH_PIC | ||
| 28 | select LOONGARCH_PCH_MSI | ||
| 29 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 30 | index XXXXXXX..XXXXXXX 100644 | ||
| 31 | --- a/hw/loongarch/virt.c | ||
| 32 | +++ b/hw/loongarch/virt.c | ||
| 33 | @@ -XXX,XX +XXX,XX @@ | ||
| 34 | #include "hw/mem/nvdimm.h" | ||
| 35 | #include "sysemu/device_tree.h" | ||
| 36 | #include <libfdt.h> | ||
| 37 | +#include "hw/core/sysbus-fdt.h" | ||
| 38 | +#include "hw/platform-bus.h" | ||
| 39 | |||
| 40 | static void create_fdt(LoongArchMachineState *lams) | ||
| 41 | { | ||
| 42 | @@ -XXX,XX +XXX,XX @@ static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState | ||
| 43 | return dev; | ||
| 44 | } | 17 | } |
| 45 | 18 | ||
| 46 | +static DeviceState *create_platform_bus(DeviceState *pch_pic) | 19 | +static void loongarch_pic_common_realize(DeviceState *dev, Error **errp) |
| 47 | +{ | 20 | +{ |
| 48 | + DeviceState *dev; | 21 | + LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev); |
| 49 | + SysBusDevice *sysbus; | ||
| 50 | + int i, irq; | ||
| 51 | + MemoryRegion *sysmem = get_system_memory(); | ||
| 52 | + | 22 | + |
| 53 | + dev = qdev_new(TYPE_PLATFORM_BUS_DEVICE); | 23 | + if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { |
| 54 | + dev->id = g_strdup(TYPE_PLATFORM_BUS_DEVICE); | 24 | + error_setg(errp, "Invalid 'pic_irq_num'"); |
| 55 | + qdev_prop_set_uint32(dev, "num_irqs", VIRT_PLATFORM_BUS_NUM_IRQS); | 25 | + return; |
| 56 | + qdev_prop_set_uint32(dev, "mmio_size", VIRT_PLATFORM_BUS_SIZE); | ||
| 57 | + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); | ||
| 58 | + | ||
| 59 | + sysbus = SYS_BUS_DEVICE(dev); | ||
| 60 | + for (i = 0; i < VIRT_PLATFORM_BUS_NUM_IRQS; i++) { | ||
| 61 | + irq = VIRT_PLATFORM_BUS_IRQ - PCH_PIC_IRQ_OFFSET + i; | ||
| 62 | + sysbus_connect_irq(sysbus, i, qdev_get_gpio_in(pch_pic, irq)); | ||
| 63 | + } | 26 | + } |
| 64 | + | ||
| 65 | + memory_region_add_subregion(sysmem, | ||
| 66 | + VIRT_PLATFORM_BUS_BASEADDRESS, | ||
| 67 | + sysbus_mmio_get_region(sysbus, 0)); | ||
| 68 | + return dev; | ||
| 69 | +} | 27 | +} |
| 70 | + | 28 | + |
| 71 | static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams) | 29 | static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) |
| 72 | { | 30 | { |
| 73 | DeviceState *gpex_dev; | 31 | LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); |
| 74 | @@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState * | 32 | SysBusDevice *sbd = SYS_BUS_DEVICE(dev); |
| 75 | memory_region_add_subregion(get_system_memory(), PM_BASE, pm_mem); | 33 | + Error *local_err = NULL; |
| 76 | /* acpi ged */ | 34 | |
| 77 | lams->acpi_ged = create_acpi_ged(pch_pic, lams); | 35 | - if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { |
| 78 | + /* platform bus */ | 36 | - error_setg(errp, "Invalid 'pic_irq_num'"); |
| 79 | + lams->platform_bus_dev = create_platform_bus(pch_pic); | 37 | + loongarch_pic_common_realize(dev, &local_err); |
| 38 | + if (local_err) { | ||
| 39 | + error_propagate(errp, local_err); | ||
| 40 | return; | ||
| 41 | } | ||
| 42 | |||
| 43 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) | ||
| 44 | |||
| 80 | } | 45 | } |
| 81 | 46 | ||
| 82 | static void loongarch_irq_init(LoongArchMachineState *lams) | 47 | -static Property loongarch_pch_pic_properties[] = { |
| 83 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | 48 | - DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPCHPIC, irq_num, 0), |
| 84 | /* Initialize the IO interrupt subsystem */ | 49 | +static Property loongarch_pic_common_properties[] = { |
| 85 | loongarch_irq_init(lams); | 50 | + DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0), |
| 86 | fdt_add_irqchip_node(lams); | 51 | DEFINE_PROP_END_OF_LIST(), |
| 87 | + platform_bus_add_all_fdt_nodes(machine->fdt, "/intc", | ||
| 88 | + VIRT_PLATFORM_BUS_BASEADDRESS, | ||
| 89 | + VIRT_PLATFORM_BUS_SIZE, | ||
| 90 | + VIRT_PLATFORM_BUS_IRQ); | ||
| 91 | lams->machine_done.notify = virt_machine_done; | ||
| 92 | qemu_add_machine_init_done_notifier(&lams->machine_done); | ||
| 93 | fdt_add_pcie_node(lams); | ||
| 94 | diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h | ||
| 95 | index XXXXXXX..XXXXXXX 100644 | ||
| 96 | --- a/include/hw/loongarch/virt.h | ||
| 97 | +++ b/include/hw/loongarch/virt.h | ||
| 98 | @@ -XXX,XX +XXX,XX @@ struct LoongArchMachineState { | ||
| 99 | char *oem_table_id; | ||
| 100 | DeviceState *acpi_ged; | ||
| 101 | int fdt_size; | ||
| 102 | + DeviceState *platform_bus_dev; | ||
| 103 | }; | 52 | }; |
| 104 | 53 | ||
| 105 | #define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt") | 54 | -static const VMStateDescription vmstate_loongarch_pch_pic = { |
| 106 | diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h | 55 | - .name = TYPE_LOONGARCH_PCH_PIC, |
| 107 | index XXXXXXX..XXXXXXX 100644 | 56 | +static const VMStateDescription vmstate_loongarch_pic_common = { |
| 108 | --- a/include/hw/pci-host/ls7a.h | 57 | + .name = "loongarch_pch_pic", |
| 109 | +++ b/include/hw/pci-host/ls7a.h | 58 | .version_id = 1, |
| 110 | @@ -XXX,XX +XXX,XX @@ | 59 | .minimum_version_id = 1, |
| 111 | #define VIRT_RTC_REG_BASE (VIRT_MISC_REG_BASE + 0x00050100) | 60 | .fields = (const VMStateField[]) { |
| 112 | #define VIRT_RTC_LEN 0x100 | 61 | - VMSTATE_UINT64(int_mask, LoongArchPCHPIC), |
| 113 | #define VIRT_SCI_IRQ (PCH_PIC_IRQ_OFFSET + 4) | 62 | - VMSTATE_UINT64(htmsi_en, LoongArchPCHPIC), |
| 114 | + | 63 | - VMSTATE_UINT64(intedge, LoongArchPCHPIC), |
| 115 | +#define VIRT_PLATFORM_BUS_BASEADDRESS 0x16000000 | 64 | - VMSTATE_UINT64(intclr, LoongArchPCHPIC), |
| 116 | +#define VIRT_PLATFORM_BUS_SIZE 0x2000000 | 65 | - VMSTATE_UINT64(auto_crtl0, LoongArchPCHPIC), |
| 117 | +#define VIRT_PLATFORM_BUS_NUM_IRQS 2 | 66 | - VMSTATE_UINT64(auto_crtl1, LoongArchPCHPIC), |
| 118 | +#define VIRT_PLATFORM_BUS_IRQ 69 | 67 | - VMSTATE_UINT8_ARRAY(route_entry, LoongArchPCHPIC, 64), |
| 119 | #endif | 68 | - VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPCHPIC, 64), |
| 69 | - VMSTATE_UINT64(last_intirr, LoongArchPCHPIC), | ||
| 70 | - VMSTATE_UINT64(intirr, LoongArchPCHPIC), | ||
| 71 | - VMSTATE_UINT64(intisr, LoongArchPCHPIC), | ||
| 72 | - VMSTATE_UINT64(int_polarity, LoongArchPCHPIC), | ||
| 73 | + VMSTATE_UINT64(int_mask, LoongArchPICCommonState), | ||
| 74 | + VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState), | ||
| 75 | + VMSTATE_UINT64(intedge, LoongArchPICCommonState), | ||
| 76 | + VMSTATE_UINT64(intclr, LoongArchPICCommonState), | ||
| 77 | + VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState), | ||
| 78 | + VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState), | ||
| 79 | + VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64), | ||
| 80 | + VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64), | ||
| 81 | + VMSTATE_UINT64(last_intirr, LoongArchPICCommonState), | ||
| 82 | + VMSTATE_UINT64(intirr, LoongArchPICCommonState), | ||
| 83 | + VMSTATE_UINT64(intisr, LoongArchPICCommonState), | ||
| 84 | + VMSTATE_UINT64(int_polarity, LoongArchPICCommonState), | ||
| 85 | VMSTATE_END_OF_LIST() | ||
| 86 | } | ||
| 87 | }; | ||
| 88 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data) | ||
| 89 | |||
| 90 | dc->realize = loongarch_pch_pic_realize; | ||
| 91 | device_class_set_legacy_reset(dc, loongarch_pch_pic_reset); | ||
| 92 | - dc->vmsd = &vmstate_loongarch_pch_pic; | ||
| 93 | - device_class_set_props(dc, loongarch_pch_pic_properties); | ||
| 94 | + dc->vmsd = &vmstate_loongarch_pic_common; | ||
| 95 | + device_class_set_props(dc, loongarch_pic_common_properties); | ||
| 96 | } | ||
| 97 | |||
| 98 | static const TypeInfo loongarch_pch_pic_info = { | ||
| 120 | -- | 99 | -- |
| 121 | 2.31.1 | 100 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Move some common functions to file loongarch_pic_common.c, the common |
|---|---|---|---|
| 2 | functions include loongarch_pic_common_realize(), property structure | ||
| 3 | loongarch_pic_common_properties and vmstate structure | ||
| 4 | vmstate_loongarch_pic_common. | ||
| 2 | 5 | ||
| 3 | Cleanup the previous pci information in acpi dsdt table. | 6 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | And using the common acpi_dsdt_add_gpex function to build | 7 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 5 | the gpex and pci information. | 8 | --- |
| 9 | hw/intc/loongarch_pch_pic.c | 37 +----------------------------- | ||
| 10 | hw/intc/loongarch_pic_common.c | 41 ++++++++++++++++++++++++++++++++++ | ||
| 11 | 2 files changed, 42 insertions(+), 36 deletions(-) | ||
| 12 | create mode 100644 hw/intc/loongarch_pic_common.c | ||
| 6 | 13 | ||
| 7 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 14 | diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c |
| 8 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 9 | Message-Id: <20220908094623.73051-10-yangxiaojuan@loongson.cn> | ||
| 10 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 11 | --- | ||
| 12 | hw/loongarch/acpi-build.c | 159 +++++------------------------------- | ||
| 13 | hw/loongarch/virt.c | 1 + | ||
| 14 | include/hw/loongarch/virt.h | 1 + | ||
| 15 | 3 files changed, 21 insertions(+), 140 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c | ||
| 18 | index XXXXXXX..XXXXXXX 100644 | 15 | index XXXXXXX..XXXXXXX 100644 |
| 19 | --- a/hw/loongarch/acpi-build.c | 16 | --- a/hw/intc/loongarch_pch_pic.c |
| 20 | +++ b/hw/loongarch/acpi-build.c | 17 | +++ b/hw/intc/loongarch_pch_pic.c |
| 21 | @@ -XXX,XX +XXX,XX @@ | 18 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_reset(DeviceState *d) |
| 22 | #include "qom/qom-qobject.h" | 19 | s->int_polarity = 0x0; |
| 23 | 20 | } | |
| 24 | #include "hw/acpi/generic_event_device.h" | 21 | |
| 25 | +#include "hw/pci-host/gpex.h" | 22 | -static void loongarch_pic_common_realize(DeviceState *dev, Error **errp) |
| 26 | |||
| 27 | #define ACPI_BUILD_ALIGN_SIZE 0x1000 | ||
| 28 | #define ACPI_BUILD_TABLE_SIZE 0x20000 | ||
| 29 | @@ -XXX,XX +XXX,XX @@ struct AcpiBuildState { | ||
| 30 | MemoryRegion *linker_mr; | ||
| 31 | } AcpiBuildState; | ||
| 32 | |||
| 33 | -static void build_gpex_pci0_int(Aml *table) | ||
| 34 | -{ | 23 | -{ |
| 35 | - Aml *sb_scope = aml_scope("_SB"); | 24 | - LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev); |
| 36 | - Aml *pci0_scope = aml_scope("PCI0"); | ||
| 37 | - Aml *prt_pkg = aml_varpackage(128); | ||
| 38 | - int slot, pin; | ||
| 39 | - | 25 | - |
| 40 | - for (slot = 0; slot < PCI_SLOT_MAX; slot++) { | 26 | - if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { |
| 41 | - for (pin = 0; pin < PCI_NUM_PINS; pin++) { | 27 | - error_setg(errp, "Invalid 'pic_irq_num'"); |
| 42 | - Aml *pkg = aml_package(4); | 28 | - return; |
| 43 | - aml_append(pkg, aml_int((slot << 16) | 0xFFFF)); | ||
| 44 | - aml_append(pkg, aml_int(pin)); | ||
| 45 | - aml_append(pkg, aml_int(0)); | ||
| 46 | - aml_append(pkg, aml_int(80 + (slot + pin) % 4)); | ||
| 47 | - aml_append(prt_pkg, pkg); | ||
| 48 | - } | ||
| 49 | - } | 29 | - } |
| 50 | - aml_append(pci0_scope, aml_name_decl("_PRT", prt_pkg)); | ||
| 51 | - aml_append(sb_scope, pci0_scope); | ||
| 52 | - aml_append(table, sb_scope); | ||
| 53 | -} | 30 | -} |
| 54 | - | 31 | - |
| 55 | -static void build_dbg_aml(Aml *table) | 32 | +#include "loongarch_pic_common.c" |
| 56 | -{ | 33 | static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) |
| 57 | - Aml *field; | 34 | { |
| 58 | - Aml *method; | 35 | LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); |
| 59 | - Aml *while_ctx; | 36 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) |
| 60 | - Aml *scope = aml_scope("\\"); | 37 | |
| 61 | - Aml *buf = aml_local(0); | 38 | } |
| 62 | - Aml *len = aml_local(1); | 39 | |
| 63 | - Aml *idx = aml_local(2); | 40 | -static Property loongarch_pic_common_properties[] = { |
| 41 | - DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0), | ||
| 42 | - DEFINE_PROP_END_OF_LIST(), | ||
| 43 | -}; | ||
| 64 | - | 44 | - |
| 65 | - aml_append(scope, | 45 | -static const VMStateDescription vmstate_loongarch_pic_common = { |
| 66 | - aml_operation_region("DBG", AML_SYSTEM_IO, aml_int(0x0402), 0x01)); | 46 | - .name = "loongarch_pch_pic", |
| 67 | - field = aml_field("DBG", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); | 47 | - .version_id = 1, |
| 68 | - aml_append(field, aml_named_field("DBGB", 8)); | 48 | - .minimum_version_id = 1, |
| 69 | - aml_append(scope, field); | 49 | - .fields = (const VMStateField[]) { |
| 50 | - VMSTATE_UINT64(int_mask, LoongArchPICCommonState), | ||
| 51 | - VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState), | ||
| 52 | - VMSTATE_UINT64(intedge, LoongArchPICCommonState), | ||
| 53 | - VMSTATE_UINT64(intclr, LoongArchPICCommonState), | ||
| 54 | - VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState), | ||
| 55 | - VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState), | ||
| 56 | - VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64), | ||
| 57 | - VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64), | ||
| 58 | - VMSTATE_UINT64(last_intirr, LoongArchPICCommonState), | ||
| 59 | - VMSTATE_UINT64(intirr, LoongArchPICCommonState), | ||
| 60 | - VMSTATE_UINT64(intisr, LoongArchPICCommonState), | ||
| 61 | - VMSTATE_UINT64(int_polarity, LoongArchPICCommonState), | ||
| 62 | - VMSTATE_END_OF_LIST() | ||
| 63 | - } | ||
| 64 | -}; | ||
| 70 | - | 65 | - |
| 71 | - method = aml_method("DBUG", 1, AML_NOTSERIALIZED); | 66 | static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data) |
| 72 | - | ||
| 73 | - aml_append(method, aml_to_hexstring(aml_arg(0), buf)); | ||
| 74 | - aml_append(method, aml_to_buffer(buf, buf)); | ||
| 75 | - aml_append(method, aml_subtract(aml_sizeof(buf), aml_int(1), len)); | ||
| 76 | - aml_append(method, aml_store(aml_int(0), idx)); | ||
| 77 | - | ||
| 78 | - while_ctx = aml_while(aml_lless(idx, len)); | ||
| 79 | - aml_append(while_ctx, | ||
| 80 | - aml_store(aml_derefof(aml_index(buf, idx)), aml_name("DBGB"))); | ||
| 81 | - aml_append(while_ctx, aml_increment(idx)); | ||
| 82 | - aml_append(method, while_ctx); | ||
| 83 | - aml_append(method, aml_store(aml_int(0x0A), aml_name("DBGB"))); | ||
| 84 | - aml_append(scope, method); | ||
| 85 | - aml_append(table, scope); | ||
| 86 | -} | ||
| 87 | - | ||
| 88 | -static Aml *build_osc_method(void) | ||
| 89 | -{ | ||
| 90 | - Aml *if_ctx; | ||
| 91 | - Aml *if_ctx2; | ||
| 92 | - Aml *else_ctx; | ||
| 93 | - Aml *method; | ||
| 94 | - Aml *a_cwd1 = aml_name("CDW1"); | ||
| 95 | - Aml *a_ctrl = aml_local(0); | ||
| 96 | - | ||
| 97 | - method = aml_method("_OSC", 4, AML_NOTSERIALIZED); | ||
| 98 | - aml_append(method, aml_create_dword_field(aml_arg(3), aml_int(0), "CDW1")); | ||
| 99 | - | ||
| 100 | - if_ctx = aml_if(aml_equal( | ||
| 101 | - aml_arg(0), aml_touuid("33DB4D5B-1FF7-401C-9657-7441C03DD766"))); | ||
| 102 | - aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(4), "CDW2")); | ||
| 103 | - aml_append(if_ctx, aml_create_dword_field(aml_arg(3), aml_int(8), "CDW3")); | ||
| 104 | - aml_append(if_ctx, aml_store(aml_name("CDW3"), a_ctrl)); | ||
| 105 | - | ||
| 106 | - /* | ||
| 107 | - * Always allow native PME, AER (no dependencies) | ||
| 108 | - * Allow SHPC (PCI bridges can have SHPC controller) | ||
| 109 | - */ | ||
| 110 | - aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl)); | ||
| 111 | - | ||
| 112 | - if_ctx2 = aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1)))); | ||
| 113 | - /* Unknown revision */ | ||
| 114 | - aml_append(if_ctx2, aml_or(a_cwd1, aml_int(0x08), a_cwd1)); | ||
| 115 | - aml_append(if_ctx, if_ctx2); | ||
| 116 | - | ||
| 117 | - if_ctx2 = aml_if(aml_lnot(aml_equal(aml_name("CDW3"), a_ctrl))); | ||
| 118 | - /* Capabilities bits were masked */ | ||
| 119 | - aml_append(if_ctx2, aml_or(a_cwd1, aml_int(0x10), a_cwd1)); | ||
| 120 | - aml_append(if_ctx, if_ctx2); | ||
| 121 | - | ||
| 122 | - /* Update DWORD3 in the buffer */ | ||
| 123 | - aml_append(if_ctx, aml_store(a_ctrl, aml_name("CDW3"))); | ||
| 124 | - aml_append(method, if_ctx); | ||
| 125 | - | ||
| 126 | - else_ctx = aml_else(); | ||
| 127 | - /* Unrecognized UUID */ | ||
| 128 | - aml_append(else_ctx, aml_or(a_cwd1, aml_int(4), a_cwd1)); | ||
| 129 | - aml_append(method, else_ctx); | ||
| 130 | - | ||
| 131 | - aml_append(method, aml_return(aml_arg(3))); | ||
| 132 | - return method; | ||
| 133 | -} | ||
| 134 | - | ||
| 135 | static void build_uart_device_aml(Aml *table) | ||
| 136 | { | 67 | { |
| 137 | Aml *dev; | 68 | DeviceClass *dc = DEVICE_CLASS(klass); |
| 138 | @@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine) | 69 | diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c |
| 139 | } | 70 | new file mode 100644 |
| 140 | } | 71 | index XXXXXXX..XXXXXXX |
| 141 | 72 | --- /dev/null | |
| 142 | +static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams) | 73 | +++ b/hw/intc/loongarch_pic_common.c |
| 74 | @@ -XXX,XX +XXX,XX @@ | ||
| 75 | +/* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 76 | +/* | ||
| 77 | + * QEMU Loongson 7A1000 I/O interrupt controller. | ||
| 78 | + * Copyright (C) 2024 Loongson Technology Corporation Limited | ||
| 79 | + */ | ||
| 80 | + | ||
| 81 | +static void loongarch_pic_common_realize(DeviceState *dev, Error **errp) | ||
| 143 | +{ | 82 | +{ |
| 144 | + struct GPEXConfig cfg = { | 83 | + LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev); |
| 145 | + .mmio64.base = VIRT_PCI_MEM_BASE, | ||
| 146 | + .mmio64.size = VIRT_PCI_MEM_SIZE, | ||
| 147 | + .pio.base = VIRT_PCI_IO_BASE, | ||
| 148 | + .pio.size = VIRT_PCI_IO_SIZE, | ||
| 149 | + .ecam.base = VIRT_PCI_CFG_BASE, | ||
| 150 | + .ecam.size = VIRT_PCI_CFG_SIZE, | ||
| 151 | + .irq = PCH_PIC_IRQ_OFFSET + VIRT_DEVICE_IRQS, | ||
| 152 | + .bus = lams->pci_bus, | ||
| 153 | + }; | ||
| 154 | + | 84 | + |
| 155 | + acpi_dsdt_add_gpex(scope, &cfg); | 85 | + if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { |
| 86 | + error_setg(errp, "Invalid 'pic_irq_num'"); | ||
| 87 | + return; | ||
| 88 | + } | ||
| 156 | +} | 89 | +} |
| 157 | + | 90 | + |
| 158 | /* build DSDT */ | 91 | +static Property loongarch_pic_common_properties[] = { |
| 159 | static void | 92 | + DEFINE_PROP_UINT32("pch_pic_irq_num", LoongArchPICCommonState, irq_num, 0), |
| 160 | build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | 93 | + DEFINE_PROP_END_OF_LIST(), |
| 161 | { | 94 | +}; |
| 162 | - Aml *dsdt, *sb_scope, *scope, *dev, *crs, *pkg; | 95 | + |
| 163 | - int root_bus_limit = 0x7F; | 96 | +static const VMStateDescription vmstate_loongarch_pic_common = { |
| 164 | + Aml *dsdt, *scope, *pkg; | 97 | + .name = "loongarch_pch_pic", |
| 165 | LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); | 98 | + .version_id = 1, |
| 166 | AcpiTable table = { .sig = "DSDT", .rev = 1, .oem_id = lams->oem_id, | 99 | + .minimum_version_id = 1, |
| 167 | .oem_table_id = lams->oem_table_id }; | 100 | + .fields = (const VMStateField[]) { |
| 168 | 101 | + VMSTATE_UINT64(int_mask, LoongArchPICCommonState), | |
| 169 | acpi_table_begin(&table, table_data); | 102 | + VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState), |
| 170 | - | 103 | + VMSTATE_UINT64(intedge, LoongArchPICCommonState), |
| 171 | dsdt = init_aml_allocator(); | 104 | + VMSTATE_UINT64(intclr, LoongArchPICCommonState), |
| 172 | - | 105 | + VMSTATE_UINT64(auto_crtl0, LoongArchPICCommonState), |
| 173 | - build_dbg_aml(dsdt); | 106 | + VMSTATE_UINT64(auto_crtl1, LoongArchPICCommonState), |
| 174 | - | 107 | + VMSTATE_UINT8_ARRAY(route_entry, LoongArchPICCommonState, 64), |
| 175 | - sb_scope = aml_scope("_SB"); | 108 | + VMSTATE_UINT8_ARRAY(htmsi_vector, LoongArchPICCommonState, 64), |
| 176 | - dev = aml_device("PCI0"); | 109 | + VMSTATE_UINT64(last_intirr, LoongArchPICCommonState), |
| 177 | - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"))); | 110 | + VMSTATE_UINT64(intirr, LoongArchPICCommonState), |
| 178 | - aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); | 111 | + VMSTATE_UINT64(intisr, LoongArchPICCommonState), |
| 179 | - aml_append(dev, aml_name_decl("_ADR", aml_int(0))); | 112 | + VMSTATE_UINT64(int_polarity, LoongArchPICCommonState), |
| 180 | - aml_append(dev, aml_name_decl("_BBN", aml_int(0))); | 113 | + VMSTATE_END_OF_LIST() |
| 181 | - aml_append(dev, aml_name_decl("_UID", aml_int(1))); | 114 | + } |
| 182 | - aml_append(dev, build_osc_method()); | 115 | +}; |
| 183 | - aml_append(sb_scope, dev); | ||
| 184 | - aml_append(dsdt, sb_scope); | ||
| 185 | - | ||
| 186 | - build_gpex_pci0_int(dsdt); | ||
| 187 | build_uart_device_aml(dsdt); | ||
| 188 | + build_pci_device_aml(dsdt, lams); | ||
| 189 | build_la_ged_aml(dsdt, machine); | ||
| 190 | |||
| 191 | - scope = aml_scope("\\_SB.PCI0"); | ||
| 192 | - /* Build PCI0._CRS */ | ||
| 193 | - crs = aml_resource_template(); | ||
| 194 | - aml_append(crs, | ||
| 195 | - aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE, | ||
| 196 | - 0x0000, 0x0, root_bus_limit, | ||
| 197 | - 0x0000, root_bus_limit + 1)); | ||
| 198 | - aml_append(crs, | ||
| 199 | - aml_dword_io(AML_MIN_FIXED, AML_MAX_FIXED, | ||
| 200 | - AML_POS_DECODE, AML_ENTIRE_RANGE, | ||
| 201 | - 0x0000, 0x0000, 0xFFFF, 0x18000000, 0x10000)); | ||
| 202 | - aml_append(crs, | ||
| 203 | - aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED, | ||
| 204 | - AML_CACHEABLE, AML_READ_WRITE, | ||
| 205 | - 0, VIRT_PCI_MEM_BASE, | ||
| 206 | - VIRT_PCI_MEM_BASE + VIRT_PCI_MEM_SIZE - 1, | ||
| 207 | - 0, VIRT_PCI_MEM_BASE)); | ||
| 208 | - aml_append(scope, aml_name_decl("_CRS", crs)); | ||
| 209 | - aml_append(dsdt, scope); | ||
| 210 | - | ||
| 211 | /* System State Package */ | ||
| 212 | scope = aml_scope("\\"); | ||
| 213 | pkg = aml_package(4); | ||
| 214 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 215 | index XXXXXXX..XXXXXXX 100644 | ||
| 216 | --- a/hw/loongarch/virt.c | ||
| 217 | +++ b/hw/loongarch/virt.c | ||
| 218 | @@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState * | ||
| 219 | d = SYS_BUS_DEVICE(gpex_dev); | ||
| 220 | sysbus_realize_and_unref(d, &error_fatal); | ||
| 221 | pci_bus = PCI_HOST_BRIDGE(gpex_dev)->bus; | ||
| 222 | + lams->pci_bus = pci_bus; | ||
| 223 | |||
| 224 | /* Map only part size_ecam bytes of ECAM space */ | ||
| 225 | ecam_alias = g_new0(MemoryRegion, 1); | ||
| 226 | diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h | ||
| 227 | index XXXXXXX..XXXXXXX 100644 | ||
| 228 | --- a/include/hw/loongarch/virt.h | ||
| 229 | +++ b/include/hw/loongarch/virt.h | ||
| 230 | @@ -XXX,XX +XXX,XX @@ struct LoongArchMachineState { | ||
| 231 | DeviceState *acpi_ged; | ||
| 232 | int fdt_size; | ||
| 233 | DeviceState *platform_bus_dev; | ||
| 234 | + PCIBus *pci_bus; | ||
| 235 | }; | ||
| 236 | |||
| 237 | #define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt") | ||
| 238 | -- | 116 | -- |
| 239 | 2.31.1 | 117 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Set TYPE_LOONGARCH_PIC inherit from TYPE_LOONGARCH_PIC_COMMON object, |
|---|---|---|---|
| 2 | it shares vmsate and property of TYPE_LOONGARCH_PIC_COMMON, and has | ||
| 3 | its own realize() function. | ||
| 2 | 4 | ||
| 3 | Add interrupt information to FDT table, such as interrupt | 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | controller info, compatiable info, etc. | 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 7 | --- | ||
| 8 | hw/intc/loongarch_pch_pic.c | 38 ++++++++++++-------------- | ||
| 9 | hw/intc/loongarch_pic_common.c | 32 +++++++++++++++++++++- | ||
| 10 | hw/intc/meson.build | 2 +- | ||
| 11 | include/hw/intc/loongarch_pch_pic.h | 21 +++++++++++--- | ||
| 12 | include/hw/intc/loongarch_pic_common.h | 10 +++++++ | ||
| 13 | 5 files changed, 77 insertions(+), 26 deletions(-) | ||
| 5 | 14 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 15 | diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-4-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | ||
| 11 | hw/loongarch/virt.c | 29 +++++++++++++++++++++++++++++ | ||
| 12 | 1 file changed, 29 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | 16 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/virt.c | 17 | --- a/hw/intc/loongarch_pch_pic.c |
| 17 | +++ b/hw/loongarch/virt.c | 18 | +++ b/hw/intc/loongarch_pch_pic.c |
| 18 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams) | 19 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_reset(DeviceState *d) |
| 19 | qemu_fdt_dumpdtb(ms->fdt, lams->fdt_size); | 20 | s->int_polarity = 0x0; |
| 20 | } | 21 | } |
| 21 | 22 | ||
| 22 | +static void fdt_add_irqchip_node(LoongArchMachineState *lams) | 23 | -#include "loongarch_pic_common.c" |
| 24 | -static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) | ||
| 25 | +static void loongarch_pic_realize(DeviceState *dev, Error **errp) | ||
| 26 | { | ||
| 27 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(dev); | ||
| 28 | - SysBusDevice *sbd = SYS_BUS_DEVICE(dev); | ||
| 29 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev); | ||
| 30 | + LoongarchPICClass *lpc = LOONGARCH_PIC_GET_CLASS(dev); | ||
| 31 | + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); | ||
| 32 | Error *local_err = NULL; | ||
| 33 | |||
| 34 | - loongarch_pic_common_realize(dev, &local_err); | ||
| 35 | + lpc->parent_realize(dev, &local_err); | ||
| 36 | if (local_err) { | ||
| 37 | error_propagate(errp, local_err); | ||
| 38 | return; | ||
| 39 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_realize(DeviceState *dev, Error **errp) | ||
| 40 | |||
| 41 | } | ||
| 42 | |||
| 43 | -static void loongarch_pch_pic_class_init(ObjectClass *klass, void *data) | ||
| 44 | +static void loongarch_pic_class_init(ObjectClass *klass, void *data) | ||
| 45 | { | ||
| 46 | DeviceClass *dc = DEVICE_CLASS(klass); | ||
| 47 | + LoongarchPICClass *lpc = LOONGARCH_PIC_CLASS(klass); | ||
| 48 | |||
| 49 | - dc->realize = loongarch_pch_pic_realize; | ||
| 50 | device_class_set_legacy_reset(dc, loongarch_pch_pic_reset); | ||
| 51 | - dc->vmsd = &vmstate_loongarch_pic_common; | ||
| 52 | - device_class_set_props(dc, loongarch_pic_common_properties); | ||
| 53 | + device_class_set_parent_realize(dc, loongarch_pic_realize, | ||
| 54 | + &lpc->parent_realize); | ||
| 55 | } | ||
| 56 | |||
| 57 | -static const TypeInfo loongarch_pch_pic_info = { | ||
| 58 | - .name = TYPE_LOONGARCH_PCH_PIC, | ||
| 59 | - .parent = TYPE_SYS_BUS_DEVICE, | ||
| 60 | - .instance_size = sizeof(LoongArchPCHPIC), | ||
| 61 | - .class_init = loongarch_pch_pic_class_init, | ||
| 62 | +static const TypeInfo loongarch_pic_types[] = { | ||
| 63 | + { | ||
| 64 | + .name = TYPE_LOONGARCH_PIC, | ||
| 65 | + .parent = TYPE_LOONGARCH_PIC_COMMON, | ||
| 66 | + .instance_size = sizeof(LoongarchPICState), | ||
| 67 | + .class_size = sizeof(LoongarchPICClass), | ||
| 68 | + .class_init = loongarch_pic_class_init, | ||
| 69 | + } | ||
| 70 | }; | ||
| 71 | |||
| 72 | -static void loongarch_pch_pic_register_types(void) | ||
| 73 | -{ | ||
| 74 | - type_register_static(&loongarch_pch_pic_info); | ||
| 75 | -} | ||
| 76 | - | ||
| 77 | -type_init(loongarch_pch_pic_register_types) | ||
| 78 | +DEFINE_TYPES(loongarch_pic_types) | ||
| 79 | diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c | ||
| 80 | index XXXXXXX..XXXXXXX 100644 | ||
| 81 | --- a/hw/intc/loongarch_pic_common.c | ||
| 82 | +++ b/hw/intc/loongarch_pic_common.c | ||
| 83 | @@ -XXX,XX +XXX,XX @@ | ||
| 84 | * Copyright (C) 2024 Loongson Technology Corporation Limited | ||
| 85 | */ | ||
| 86 | |||
| 87 | +#include "qemu/osdep.h" | ||
| 88 | +#include "qapi/error.h" | ||
| 89 | +#include "hw/intc/loongarch_pic_common.h" | ||
| 90 | +#include "hw/qdev-properties.h" | ||
| 91 | +#include "migration/vmstate.h" | ||
| 92 | + | ||
| 93 | static void loongarch_pic_common_realize(DeviceState *dev, Error **errp) | ||
| 94 | { | ||
| 95 | - LoongArchPICCommonState *s = LOONGARCH_PCH_PIC(dev); | ||
| 96 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev); | ||
| 97 | |||
| 98 | if (!s->irq_num || s->irq_num > VIRT_PCH_PIC_IRQ_NUM) { | ||
| 99 | error_setg(errp, "Invalid 'pic_irq_num'"); | ||
| 100 | @@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_loongarch_pic_common = { | ||
| 101 | VMSTATE_END_OF_LIST() | ||
| 102 | } | ||
| 103 | }; | ||
| 104 | + | ||
| 105 | +static void loongarch_pic_common_class_init(ObjectClass *klass, void *data) | ||
| 23 | +{ | 106 | +{ |
| 24 | + MachineState *ms = MACHINE(lams); | 107 | + DeviceClass *dc = DEVICE_CLASS(klass); |
| 25 | + char *nodename; | 108 | + LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_CLASS(klass); |
| 26 | + uint32_t irqchip_phandle; | ||
| 27 | + | 109 | + |
| 28 | + irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt); | 110 | + device_class_set_parent_realize(dc, loongarch_pic_common_realize, |
| 29 | + qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle); | 111 | + &lpcc->parent_realize); |
| 112 | + device_class_set_props(dc, loongarch_pic_common_properties); | ||
| 113 | + dc->vmsd = &vmstate_loongarch_pic_common; | ||
| 114 | +} | ||
| 30 | + | 115 | + |
| 31 | + nodename = g_strdup_printf("/intc@%" PRIx64, | 116 | +static const TypeInfo loongarch_pic_common_types[] = { |
| 32 | + VIRT_IOAPIC_REG_BASE); | 117 | + { |
| 33 | + qemu_fdt_add_subnode(ms->fdt, nodename); | 118 | + .name = TYPE_LOONGARCH_PIC_COMMON, |
| 34 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3); | 119 | + .parent = TYPE_SYS_BUS_DEVICE, |
| 35 | + qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0); | 120 | + .instance_size = sizeof(LoongArchPICCommonState), |
| 36 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2); | 121 | + .class_size = sizeof(LoongArchPICCommonClass), |
| 37 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2); | 122 | + .class_init = loongarch_pic_common_class_init, |
| 38 | + qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0); | 123 | + .abstract = true, |
| 124 | + } | ||
| 125 | +}; | ||
| 39 | + | 126 | + |
| 40 | + qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", | 127 | +DEFINE_TYPES(loongarch_pic_common_types) |
| 41 | + "loongarch,ls7a"); | 128 | diff --git a/hw/intc/meson.build b/hw/intc/meson.build |
| 129 | index XXXXXXX..XXXXXXX 100644 | ||
| 130 | --- a/hw/intc/meson.build | ||
| 131 | +++ b/hw/intc/meson.build | ||
| 132 | @@ -XXX,XX +XXX,XX @@ specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) | ||
| 133 | specific_ss.add(when: 'CONFIG_LOONGSON_IPI_COMMON', if_true: files('loongson_ipi_common.c')) | ||
| 134 | specific_ss.add(when: 'CONFIG_LOONGSON_IPI', if_true: files('loongson_ipi.c')) | ||
| 135 | specific_ss.add(when: 'CONFIG_LOONGARCH_IPI', if_true: files('loongarch_ipi.c')) | ||
| 136 | -specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c')) | ||
| 137 | +specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_PIC', if_true: files('loongarch_pch_pic.c', 'loongarch_pic_common.c')) | ||
| 138 | specific_ss.add(when: 'CONFIG_LOONGARCH_PCH_MSI', if_true: files('loongarch_pch_msi.c')) | ||
| 139 | specific_ss.add(when: 'CONFIG_LOONGARCH_EXTIOI', if_true: files('loongarch_extioi.c')) | ||
| 140 | diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h | ||
| 141 | index XXXXXXX..XXXXXXX 100644 | ||
| 142 | --- a/include/hw/intc/loongarch_pch_pic.h | ||
| 143 | +++ b/include/hw/intc/loongarch_pch_pic.h | ||
| 144 | @@ -XXX,XX +XXX,XX @@ | ||
| 145 | |||
| 146 | #include "hw/intc/loongarch_pic_common.h" | ||
| 147 | |||
| 148 | -#define LoongArchPCHPIC LoongArchPICCommonState | ||
| 149 | -#define TYPE_LOONGARCH_PCH_PIC "loongarch_pch_pic" | ||
| 150 | -#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PCH_PIC#name | ||
| 151 | -OBJECT_DECLARE_SIMPLE_TYPE(LoongArchPCHPIC, LOONGARCH_PCH_PIC) | ||
| 152 | +#define TYPE_LOONGARCH_PIC "loongarch_pic" | ||
| 153 | +#define PCH_PIC_NAME(name) TYPE_LOONGARCH_PIC#name | ||
| 154 | +OBJECT_DECLARE_TYPE(LoongarchPICState, LoongarchPICClass, LOONGARCH_PIC) | ||
| 42 | + | 155 | + |
| 43 | + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", | 156 | +struct LoongarchPICState { |
| 44 | + 2, VIRT_IOAPIC_REG_BASE, | 157 | + LoongArchPICCommonState parent_obj; |
| 45 | + 2, PCH_PIC_ROUTE_ENTRY_OFFSET); | 158 | +}; |
| 46 | + | 159 | + |
| 47 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle); | 160 | +struct LoongarchPICClass { |
| 48 | + g_free(nodename); | 161 | + LoongArchPICCommonClass parent_class; |
| 49 | +} | 162 | + |
| 50 | 163 | + DeviceRealize parent_realize; | |
| 51 | #define PM_BASE 0x10080000 | 164 | +}; |
| 52 | #define PM_SIZE 0x100 | 165 | + |
| 53 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | 166 | +#define TYPE_LOONGARCH_PCH_PIC TYPE_LOONGARCH_PIC |
| 54 | } | 167 | +typedef struct LoongArchPICCommonState LoongArchPCHPIC; |
| 55 | /* Initialize the IO interrupt subsystem */ | 168 | +#define LOONGARCH_PCH_PIC(obj) ((struct LoongArchPICCommonState *)(obj)) |
| 56 | loongarch_irq_init(lams); | 169 | |
| 57 | + fdt_add_irqchip_node(lams); | 170 | #endif /* HW_LOONGARCH_PCH_PIC_H */ |
| 58 | lams->machine_done.notify = virt_machine_done; | 171 | diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h |
| 59 | qemu_add_machine_init_done_notifier(&lams->machine_done); | 172 | index XXXXXXX..XXXXXXX 100644 |
| 60 | fdt_add_pcie_node(lams); | 173 | --- a/include/hw/intc/loongarch_pic_common.h |
| 174 | +++ b/include/hw/intc/loongarch_pic_common.h | ||
| 175 | @@ -XXX,XX +XXX,XX @@ | ||
| 176 | #define POL_LO_START 0x40 | ||
| 177 | #define POL_HI_START 0x44 | ||
| 178 | |||
| 179 | +#define TYPE_LOONGARCH_PIC_COMMON "loongarch_pic_common" | ||
| 180 | +OBJECT_DECLARE_TYPE(LoongArchPICCommonState, | ||
| 181 | + LoongArchPICCommonClass, LOONGARCH_PIC_COMMON) | ||
| 182 | + | ||
| 183 | struct LoongArchPICCommonState { | ||
| 184 | SysBusDevice parent_obj; | ||
| 185 | |||
| 186 | @@ -XXX,XX +XXX,XX @@ struct LoongArchPICCommonState { | ||
| 187 | MemoryRegion iomem8; | ||
| 188 | unsigned int irq_num; | ||
| 189 | }; | ||
| 190 | + | ||
| 191 | +struct LoongArchPICCommonClass { | ||
| 192 | + SysBusDeviceClass parent_class; | ||
| 193 | + | ||
| 194 | + DeviceRealize parent_realize; | ||
| 195 | +}; | ||
| 196 | #endif /* HW_LOONGARCH_PIC_COMMON_H */ | ||
| 61 | -- | 197 | -- |
| 62 | 2.31.1 | 198 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Add vmstate pre_save and post_load interfaces, which can be used |
|---|---|---|---|
| 2 | by pic kvm driver in future. | ||
| 2 | 3 | ||
| 3 | Add hotplug/unplug interface for memory device. | 4 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 5 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
| 6 | --- | ||
| 7 | hw/intc/loongarch_pic_common.c | 26 ++++++++++++++++++++++++++ | ||
| 8 | include/hw/intc/loongarch_pic_common.h | 2 ++ | ||
| 9 | 2 files changed, 28 insertions(+) | ||
| 4 | 10 | ||
| 5 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/hw/intc/loongarch_pic_common.c b/hw/intc/loongarch_pic_common.c |
| 6 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 7 | Message-Id: <20220908094623.73051-9-yangxiaojuan@loongson.cn> | ||
| 8 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 9 | --- | ||
| 10 | hw/loongarch/Kconfig | 2 + | ||
| 11 | hw/loongarch/acpi-build.c | 32 +++++++++--- | ||
| 12 | hw/loongarch/virt.c | 105 +++++++++++++++++++++++++++++++++++++- | ||
| 13 | 3 files changed, 132 insertions(+), 7 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | 12 | index XXXXXXX..XXXXXXX 100644 |
| 17 | --- a/hw/loongarch/Kconfig | 13 | --- a/hw/intc/loongarch_pic_common.c |
| 18 | +++ b/hw/loongarch/Kconfig | 14 | +++ b/hw/intc/loongarch_pic_common.c |
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 15 | @@ -XXX,XX +XXX,XX @@ |
| 20 | select PCI_EXPRESS_GENERIC_BRIDGE | 16 | #include "hw/qdev-properties.h" |
| 21 | imply VIRTIO_VGA | 17 | #include "migration/vmstate.h" |
| 22 | imply PCI_DEVICES | 18 | |
| 23 | + imply NVDIMM | 19 | +static int loongarch_pic_pre_save(void *opaque) |
| 24 | select ISA_BUS | 20 | +{ |
| 25 | select SERIAL | 21 | + LoongArchPICCommonState *s = (LoongArchPICCommonState *)opaque; |
| 26 | select SERIAL_ISA | 22 | + LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_GET_CLASS(s); |
| 27 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 23 | + |
| 28 | select ACPI_PCI | 24 | + if (lpcc->pre_save) { |
| 29 | select ACPI_HW_REDUCED | 25 | + return lpcc->pre_save(s); |
| 30 | select FW_CFG_DMA | ||
| 31 | + select DIMM | ||
| 32 | diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c | ||
| 33 | index XXXXXXX..XXXXXXX 100644 | ||
| 34 | --- a/hw/loongarch/acpi-build.c | ||
| 35 | +++ b/hw/loongarch/acpi-build.c | ||
| 36 | @@ -XXX,XX +XXX,XX @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) | ||
| 37 | build_srat_memory(table_data, VIRT_HIGHMEM_BASE, machine->ram_size - VIRT_LOWMEM_SIZE, | ||
| 38 | 0, MEM_AFFINITY_ENABLED); | ||
| 39 | |||
| 40 | + if (ms->device_memory) { | ||
| 41 | + build_srat_memory(table_data, ms->device_memory->base, | ||
| 42 | + memory_region_size(&ms->device_memory->mr), | ||
| 43 | + 0, MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); | ||
| 44 | + } | 26 | + } |
| 45 | + | 27 | + |
| 46 | acpi_table_end(linker, &table); | 28 | + return 0; |
| 47 | } | ||
| 48 | |||
| 49 | @@ -XXX,XX +XXX,XX @@ static void build_uart_device_aml(Aml *table) | ||
| 50 | aml_append(table, scope); | ||
| 51 | } | ||
| 52 | |||
| 53 | +static void | ||
| 54 | +build_la_ged_aml(Aml *dsdt, MachineState *machine) | ||
| 55 | +{ | ||
| 56 | + uint32_t event; | ||
| 57 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); | ||
| 58 | + | ||
| 59 | + build_ged_aml(dsdt, "\\_SB."GED_DEVICE, | ||
| 60 | + HOTPLUG_HANDLER(lams->acpi_ged), | ||
| 61 | + VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, | ||
| 62 | + VIRT_GED_EVT_ADDR); | ||
| 63 | + event = object_property_get_uint(OBJECT(lams->acpi_ged), | ||
| 64 | + "ged-event", &error_abort); | ||
| 65 | + if (event & ACPI_GED_MEM_HOTPLUG_EVT) { | ||
| 66 | + build_memory_hotplug_aml(dsdt, machine->ram_slots, "\\_SB", NULL, | ||
| 67 | + AML_SYSTEM_MEMORY, | ||
| 68 | + VIRT_GED_MEM_ADDR); | ||
| 69 | + } | ||
| 70 | +} | 29 | +} |
| 71 | + | 30 | + |
| 72 | /* build DSDT */ | 31 | +static int loongarch_pic_post_load(void *opaque, int version_id) |
| 73 | static void | 32 | +{ |
| 74 | build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | 33 | + LoongArchPICCommonState *s = (LoongArchPICCommonState *)opaque; |
| 75 | @@ -XXX,XX +XXX,XX @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | 34 | + LoongArchPICCommonClass *lpcc = LOONGARCH_PIC_COMMON_GET_CLASS(s); |
| 76 | |||
| 77 | build_gpex_pci0_int(dsdt); | ||
| 78 | build_uart_device_aml(dsdt); | ||
| 79 | - if (lams->acpi_ged) { | ||
| 80 | - build_ged_aml(dsdt, "\\_SB."GED_DEVICE, | ||
| 81 | - HOTPLUG_HANDLER(lams->acpi_ged), | ||
| 82 | - VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, | ||
| 83 | - VIRT_GED_EVT_ADDR); | ||
| 84 | - } | ||
| 85 | + build_la_ged_aml(dsdt, machine); | ||
| 86 | |||
| 87 | scope = aml_scope("\\_SB.PCI0"); | ||
| 88 | /* Build PCI0._CRS */ | ||
| 89 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 90 | index XXXXXXX..XXXXXXX 100644 | ||
| 91 | --- a/hw/loongarch/virt.c | ||
| 92 | +++ b/hw/loongarch/virt.c | ||
| 93 | @@ -XXX,XX +XXX,XX @@ | ||
| 94 | #include "hw/core/sysbus-fdt.h" | ||
| 95 | #include "hw/platform-bus.h" | ||
| 96 | #include "hw/display/ramfb.h" | ||
| 97 | +#include "hw/mem/pc-dimm.h" | ||
| 98 | |||
| 99 | static void create_fdt(LoongArchMachineState *lams) | ||
| 100 | { | ||
| 101 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | ||
| 102 | machine->ram, offset, highram_size); | ||
| 103 | memory_region_add_subregion(address_space_mem, 0x90000000, &lams->highmem); | ||
| 104 | memmap_add_entry(0x90000000, highram_size, 1); | ||
| 105 | + | 35 | + |
| 106 | + /* initialize device memory address space */ | 36 | + if (lpcc->post_load) { |
| 107 | + if (machine->ram_size < machine->maxram_size) { | 37 | + return lpcc->post_load(s, version_id); |
| 108 | + machine->device_memory = g_malloc0(sizeof(*machine->device_memory)); | ||
| 109 | + ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size; | ||
| 110 | + | ||
| 111 | + if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) { | ||
| 112 | + error_report("unsupported amount of memory slots: %"PRIu64, | ||
| 113 | + machine->ram_slots); | ||
| 114 | + exit(EXIT_FAILURE); | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + if (QEMU_ALIGN_UP(machine->maxram_size, | ||
| 118 | + TARGET_PAGE_SIZE) != machine->maxram_size) { | ||
| 119 | + error_report("maximum memory size must by aligned to multiple of " | ||
| 120 | + "%d bytes", TARGET_PAGE_SIZE); | ||
| 121 | + exit(EXIT_FAILURE); | ||
| 122 | + } | ||
| 123 | + /* device memory base is the top of high memory address. */ | ||
| 124 | + machine->device_memory->base = 0x90000000 + highram_size; | ||
| 125 | + machine->device_memory->base = | ||
| 126 | + ROUND_UP(machine->device_memory->base, 1 * GiB); | ||
| 127 | + | ||
| 128 | + memory_region_init(&machine->device_memory->mr, OBJECT(lams), | ||
| 129 | + "device-memory", device_mem_size); | ||
| 130 | + memory_region_add_subregion(address_space_mem, machine->device_memory->base, | ||
| 131 | + &machine->device_memory->mr); | ||
| 132 | + } | 38 | + } |
| 133 | + | 39 | + |
| 134 | /* Add isa io region */ | 40 | + return 0; |
| 135 | memory_region_init_alias(&lams->isa_io, NULL, "isa-io", | ||
| 136 | get_system_io(), 0, VIRT_ISA_IO_SIZE); | ||
| 137 | @@ -XXX,XX +XXX,XX @@ static void loongarch_machine_initfn(Object *obj) | ||
| 138 | lams->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); | ||
| 139 | } | ||
| 140 | |||
| 141 | +static bool memhp_type_supported(DeviceState *dev) | ||
| 142 | +{ | ||
| 143 | + /* we only support pc dimm now */ | ||
| 144 | + return object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) && | ||
| 145 | + !object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); | ||
| 146 | +} | 41 | +} |
| 147 | + | 42 | + |
| 148 | +static void virt_mem_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, | 43 | static void loongarch_pic_common_realize(DeviceState *dev, Error **errp) |
| 149 | + Error **errp) | ||
| 150 | +{ | ||
| 151 | + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); | ||
| 152 | +} | ||
| 153 | + | ||
| 154 | +static void virt_machine_device_pre_plug(HotplugHandler *hotplug_dev, | ||
| 155 | + DeviceState *dev, Error **errp) | ||
| 156 | +{ | ||
| 157 | + if (memhp_type_supported(dev)) { | ||
| 158 | + virt_mem_pre_plug(hotplug_dev, dev, errp); | ||
| 159 | + } | ||
| 160 | +} | ||
| 161 | + | ||
| 162 | +static void virt_mem_unplug_request(HotplugHandler *hotplug_dev, | ||
| 163 | + DeviceState *dev, Error **errp) | ||
| 164 | +{ | ||
| 165 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); | ||
| 166 | + | ||
| 167 | + /* the acpi ged is always exist */ | ||
| 168 | + hotplug_handler_unplug_request(HOTPLUG_HANDLER(lams->acpi_ged), dev, | ||
| 169 | + errp); | ||
| 170 | +} | ||
| 171 | + | ||
| 172 | +static void virt_machine_device_unplug_request(HotplugHandler *hotplug_dev, | ||
| 173 | + DeviceState *dev, Error **errp) | ||
| 174 | +{ | ||
| 175 | + if (memhp_type_supported(dev)) { | ||
| 176 | + virt_mem_unplug_request(hotplug_dev, dev, errp); | ||
| 177 | + } | ||
| 178 | +} | ||
| 179 | + | ||
| 180 | +static void virt_mem_unplug(HotplugHandler *hotplug_dev, | ||
| 181 | + DeviceState *dev, Error **errp) | ||
| 182 | +{ | ||
| 183 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); | ||
| 184 | + | ||
| 185 | + hotplug_handler_unplug(HOTPLUG_HANDLER(lams->acpi_ged), dev, errp); | ||
| 186 | + pc_dimm_unplug(PC_DIMM(dev), MACHINE(lams)); | ||
| 187 | + qdev_unrealize(dev); | ||
| 188 | +} | ||
| 189 | + | ||
| 190 | +static void virt_machine_device_unplug(HotplugHandler *hotplug_dev, | ||
| 191 | + DeviceState *dev, Error **errp) | ||
| 192 | +{ | ||
| 193 | + if (memhp_type_supported(dev)) { | ||
| 194 | + virt_mem_unplug(hotplug_dev, dev, errp); | ||
| 195 | + } | ||
| 196 | +} | ||
| 197 | + | ||
| 198 | +static void virt_mem_plug(HotplugHandler *hotplug_dev, | ||
| 199 | + DeviceState *dev, Error **errp) | ||
| 200 | +{ | ||
| 201 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); | ||
| 202 | + | ||
| 203 | + pc_dimm_plug(PC_DIMM(dev), MACHINE(lams)); | ||
| 204 | + hotplug_handler_plug(HOTPLUG_HANDLER(lams->acpi_ged), | ||
| 205 | + dev, &error_abort); | ||
| 206 | +} | ||
| 207 | + | ||
| 208 | static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, | ||
| 209 | DeviceState *dev, Error **errp) | ||
| 210 | { | 44 | { |
| 211 | @@ -XXX,XX +XXX,XX @@ static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, | 45 | LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(dev); |
| 212 | platform_bus_link_device(PLATFORM_BUS_DEVICE(lams->platform_bus_dev), | 46 | @@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_loongarch_pic_common = { |
| 213 | SYS_BUS_DEVICE(dev)); | 47 | .name = "loongarch_pch_pic", |
| 214 | } | 48 | .version_id = 1, |
| 215 | + } else if (memhp_type_supported(dev)) { | 49 | .minimum_version_id = 1, |
| 216 | + virt_mem_plug(hotplug_dev, dev, errp); | 50 | + .pre_save = loongarch_pic_pre_save, |
| 217 | } | 51 | + .post_load = loongarch_pic_post_load, |
| 218 | } | 52 | .fields = (const VMStateField[]) { |
| 219 | 53 | VMSTATE_UINT64(int_mask, LoongArchPICCommonState), | |
| 220 | @@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, | 54 | VMSTATE_UINT64(htmsi_en, LoongArchPICCommonState), |
| 221 | { | 55 | diff --git a/include/hw/intc/loongarch_pic_common.h b/include/hw/intc/loongarch_pic_common.h |
| 222 | MachineClass *mc = MACHINE_GET_CLASS(machine); | 56 | index XXXXXXX..XXXXXXX 100644 |
| 223 | 57 | --- a/include/hw/intc/loongarch_pic_common.h | |
| 224 | - if (device_is_dynamic_sysbus(mc, dev)) { | 58 | +++ b/include/hw/intc/loongarch_pic_common.h |
| 225 | + if (device_is_dynamic_sysbus(mc, dev) || | 59 | @@ -XXX,XX +XXX,XX @@ struct LoongArchPICCommonClass { |
| 226 | + memhp_type_supported(dev)) { | 60 | SysBusDeviceClass parent_class; |
| 227 | return HOTPLUG_HANDLER(machine); | 61 | |
| 228 | } | 62 | DeviceRealize parent_realize; |
| 229 | return NULL; | 63 | + int (*pre_save)(LoongArchPICCommonState *s); |
| 230 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | 64 | + int (*post_load)(LoongArchPICCommonState *s, int version_id); |
| 231 | mc->no_cdrom = 1; | 65 | }; |
| 232 | mc->get_hotplug_handler = virt_machine_get_hotplug_handler; | 66 | #endif /* HW_LOONGARCH_PIC_COMMON_H */ |
| 233 | hc->plug = loongarch_machine_device_plug_cb; | ||
| 234 | + hc->pre_plug = virt_machine_device_pre_plug; | ||
| 235 | + hc->unplug_request = virt_machine_device_unplug_request; | ||
| 236 | + hc->unplug = virt_machine_device_unplug; | ||
| 237 | |||
| 238 | object_class_property_add(oc, "acpi", "OnOffAuto", | ||
| 239 | loongarch_get_acpi, loongarch_set_acpi, | ||
| 240 | -- | 67 | -- |
| 241 | 2.31.1 | 68 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Remove definition about LoongArchPCHPIC and LOONGARCH_PCH_PIC, and |
|---|---|---|---|
| 2 | replace them with LoongArchPICCommonState and LOONGARCH_PIC_COMMON | ||
| 3 | separately. Also remove unnecessary header files. | ||
| 2 | 4 | ||
| 3 | Add RAMFB device to dynamic_sysbus_devices list so that it can be | 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | hotpluged to the machine. | 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 7 | --- | ||
| 8 | hw/intc/loongarch_pch_pic.c | 24 ++++++++++-------------- | ||
| 9 | hw/loongarch/virt.c | 2 +- | ||
| 10 | include/hw/intc/loongarch_pch_pic.h | 4 ---- | ||
| 11 | 3 files changed, 11 insertions(+), 19 deletions(-) | ||
| 5 | 12 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 13 | diff --git a/hw/intc/loongarch_pch_pic.c b/hw/intc/loongarch_pch_pic.c |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | 14 | index XXXXXXX..XXXXXXX 100644 |
| 8 | Message-Id: <20220908094623.73051-7-yangxiaojuan@loongson.cn> | 15 | --- a/hw/intc/loongarch_pch_pic.c |
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | 16 | +++ b/hw/intc/loongarch_pch_pic.c |
| 10 | --- | 17 | @@ -XXX,XX +XXX,XX @@ |
| 11 | hw/loongarch/virt.c | 2 ++ | 18 | |
| 12 | 1 file changed, 2 insertions(+) | 19 | #include "qemu/osdep.h" |
| 13 | 20 | #include "qemu/bitops.h" | |
| 21 | -#include "hw/sysbus.h" | ||
| 22 | -#include "hw/loongarch/virt.h" | ||
| 23 | -#include "hw/pci-host/ls7a.h" | ||
| 24 | #include "hw/irq.h" | ||
| 25 | #include "hw/intc/loongarch_pch_pic.h" | ||
| 26 | -#include "hw/qdev-properties.h" | ||
| 27 | -#include "migration/vmstate.h" | ||
| 28 | #include "trace.h" | ||
| 29 | #include "qapi/error.h" | ||
| 30 | |||
| 31 | -static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64_t mask, int level) | ||
| 32 | +static void pch_pic_update_irq(LoongArchPICCommonState *s, uint64_t mask, | ||
| 33 | + int level) | ||
| 34 | { | ||
| 35 | uint64_t val; | ||
| 36 | int irq; | ||
| 37 | @@ -XXX,XX +XXX,XX @@ static void pch_pic_update_irq(LoongArchPCHPIC *s, uint64_t mask, int level) | ||
| 38 | |||
| 39 | static void pch_pic_irq_handler(void *opaque, int irq, int level) | ||
| 40 | { | ||
| 41 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 42 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 43 | uint64_t mask = 1ULL << irq; | ||
| 44 | |||
| 45 | assert(irq < s->irq_num); | ||
| 46 | @@ -XXX,XX +XXX,XX @@ static void pch_pic_irq_handler(void *opaque, int irq, int level) | ||
| 47 | static uint64_t loongarch_pch_pic_low_readw(void *opaque, hwaddr addr, | ||
| 48 | unsigned size) | ||
| 49 | { | ||
| 50 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 51 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 52 | uint64_t val = 0; | ||
| 53 | uint32_t offset = addr & 0xfff; | ||
| 54 | |||
| 55 | @@ -XXX,XX +XXX,XX @@ static uint64_t get_writew_val(uint64_t value, uint32_t target, bool hi) | ||
| 56 | static void loongarch_pch_pic_low_writew(void *opaque, hwaddr addr, | ||
| 57 | uint64_t value, unsigned size) | ||
| 58 | { | ||
| 59 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 60 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 61 | uint32_t offset, old_valid, data = (uint32_t)value; | ||
| 62 | uint64_t old, int_mask; | ||
| 63 | offset = addr & 0xfff; | ||
| 64 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_low_writew(void *opaque, hwaddr addr, | ||
| 65 | static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr, | ||
| 66 | unsigned size) | ||
| 67 | { | ||
| 68 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 69 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 70 | uint64_t val = 0; | ||
| 71 | uint32_t offset = addr & 0xfff; | ||
| 72 | |||
| 73 | @@ -XXX,XX +XXX,XX @@ static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr, | ||
| 74 | static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr, | ||
| 75 | uint64_t value, unsigned size) | ||
| 76 | { | ||
| 77 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 78 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 79 | uint32_t offset, data = (uint32_t)value; | ||
| 80 | offset = addr & 0xfff; | ||
| 81 | |||
| 82 | @@ -XXX,XX +XXX,XX @@ static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr, | ||
| 83 | static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr, | ||
| 84 | unsigned size) | ||
| 85 | { | ||
| 86 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 87 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 88 | uint64_t val = 0; | ||
| 89 | uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET; | ||
| 90 | int64_t offset_tmp; | ||
| 91 | @@ -XXX,XX +XXX,XX @@ static uint64_t loongarch_pch_pic_readb(void *opaque, hwaddr addr, | ||
| 92 | static void loongarch_pch_pic_writeb(void *opaque, hwaddr addr, | ||
| 93 | uint64_t data, unsigned size) | ||
| 94 | { | ||
| 95 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(opaque); | ||
| 96 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); | ||
| 97 | int32_t offset_tmp; | ||
| 98 | uint32_t offset = (addr & 0xfff) + PCH_PIC_ROUTE_ENTRY_OFFSET; | ||
| 99 | |||
| 100 | @@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps loongarch_pch_pic_reg8_ops = { | ||
| 101 | |||
| 102 | static void loongarch_pch_pic_reset(DeviceState *d) | ||
| 103 | { | ||
| 104 | - LoongArchPCHPIC *s = LOONGARCH_PCH_PIC(d); | ||
| 105 | + LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(d); | ||
| 106 | int i; | ||
| 107 | |||
| 108 | s->int_mask = -1; | ||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 109 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c |
| 15 | index XXXXXXX..XXXXXXX 100644 | 110 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/virt.c | 111 | --- a/hw/loongarch/virt.c |
| 17 | +++ b/hw/loongarch/virt.c | 112 | +++ b/hw/loongarch/virt.c |
| 18 | @@ -XXX,XX +XXX,XX @@ | 113 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) |
| 19 | #include <libfdt.h> | 114 | /* Add Extend I/O Interrupt Controller node */ |
| 20 | #include "hw/core/sysbus-fdt.h" | 115 | fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle); |
| 21 | #include "hw/platform-bus.h" | 116 | |
| 22 | +#include "hw/display/ramfb.h" | 117 | - pch_pic = qdev_new(TYPE_LOONGARCH_PCH_PIC); |
| 23 | 118 | + pch_pic = qdev_new(TYPE_LOONGARCH_PIC); | |
| 24 | static void create_fdt(LoongArchMachineState *lams) | 119 | num = VIRT_PCH_PIC_IRQ_NUM; |
| 25 | { | 120 | qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num); |
| 26 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | 121 | d = SYS_BUS_DEVICE(pch_pic); |
| 27 | NULL, NULL); | 122 | diff --git a/include/hw/intc/loongarch_pch_pic.h b/include/hw/intc/loongarch_pch_pic.h |
| 28 | object_class_property_set_description(oc, "acpi", | 123 | index XXXXXXX..XXXXXXX 100644 |
| 29 | "Enable ACPI"); | 124 | --- a/include/hw/intc/loongarch_pch_pic.h |
| 30 | + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); | 125 | +++ b/include/hw/intc/loongarch_pch_pic.h |
| 31 | } | 126 | @@ -XXX,XX +XXX,XX @@ struct LoongarchPICClass { |
| 32 | 127 | DeviceRealize parent_realize; | |
| 33 | static const TypeInfo loongarch_machine_types[] = { | 128 | }; |
| 129 | |||
| 130 | -#define TYPE_LOONGARCH_PCH_PIC TYPE_LOONGARCH_PIC | ||
| 131 | -typedef struct LoongArchPICCommonState LoongArchPCHPIC; | ||
| 132 | -#define LOONGARCH_PCH_PIC(obj) ((struct LoongArchPICCommonState *)(obj)) | ||
| 133 | - | ||
| 134 | #endif /* HW_LOONGARCH_PCH_PIC_H */ | ||
| 34 | -- | 135 | -- |
| 35 | 2.31.1 | 136 | 2.43.5 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | Add common header file include/hw/intc/loongarch_extioi_common.h, and | ||
| 2 | move some macro definition from include/hw/intc/loongarch_extioi.h to | ||
| 3 | the common header file. | ||
| 1 | 4 | ||
| 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> | ||
| 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
| 7 | --- | ||
| 8 | include/hw/intc/loongarch_extioi.h | 50 +------------------ | ||
| 9 | include/hw/intc/loongarch_extioi_common.h | 58 +++++++++++++++++++++++ | ||
| 10 | 2 files changed, 59 insertions(+), 49 deletions(-) | ||
| 11 | create mode 100644 include/hw/intc/loongarch_extioi_common.h | ||
| 12 | |||
| 13 | diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h | ||
| 14 | index XXXXXXX..XXXXXXX 100644 | ||
| 15 | --- a/include/hw/intc/loongarch_extioi.h | ||
| 16 | +++ b/include/hw/intc/loongarch_extioi.h | ||
| 17 | @@ -XXX,XX +XXX,XX @@ | ||
| 18 | * Copyright (C) 2021 Loongson Technology Corporation Limited | ||
| 19 | */ | ||
| 20 | |||
| 21 | -#include "hw/sysbus.h" | ||
| 22 | -#include "hw/loongarch/virt.h" | ||
| 23 | - | ||
| 24 | #ifndef LOONGARCH_EXTIOI_H | ||
| 25 | #define LOONGARCH_EXTIOI_H | ||
| 26 | |||
| 27 | -#define LS3A_INTC_IP 8 | ||
| 28 | -#define EXTIOI_IRQS (256) | ||
| 29 | -#define EXTIOI_IRQS_BITMAP_SIZE (256 / 8) | ||
| 30 | -/* irq from EXTIOI is routed to no more than 4 cpus */ | ||
| 31 | -#define EXTIOI_CPUS (4) | ||
| 32 | -/* map to ipnum per 32 irqs */ | ||
| 33 | -#define EXTIOI_IRQS_IPMAP_SIZE (256 / 32) | ||
| 34 | -#define EXTIOI_IRQS_COREMAP_SIZE 256 | ||
| 35 | -#define EXTIOI_IRQS_NODETYPE_COUNT 16 | ||
| 36 | -#define EXTIOI_IRQS_GROUP_COUNT 8 | ||
| 37 | - | ||
| 38 | -#define APIC_OFFSET 0x400 | ||
| 39 | -#define APIC_BASE (0x1000ULL + APIC_OFFSET) | ||
| 40 | - | ||
| 41 | -#define EXTIOI_NODETYPE_START (0x4a0 - APIC_OFFSET) | ||
| 42 | -#define EXTIOI_NODETYPE_END (0x4c0 - APIC_OFFSET) | ||
| 43 | -#define EXTIOI_IPMAP_START (0x4c0 - APIC_OFFSET) | ||
| 44 | -#define EXTIOI_IPMAP_END (0x4c8 - APIC_OFFSET) | ||
| 45 | -#define EXTIOI_ENABLE_START (0x600 - APIC_OFFSET) | ||
| 46 | -#define EXTIOI_ENABLE_END (0x620 - APIC_OFFSET) | ||
| 47 | -#define EXTIOI_BOUNCE_START (0x680 - APIC_OFFSET) | ||
| 48 | -#define EXTIOI_BOUNCE_END (0x6a0 - APIC_OFFSET) | ||
| 49 | -#define EXTIOI_ISR_START (0x700 - APIC_OFFSET) | ||
| 50 | -#define EXTIOI_ISR_END (0x720 - APIC_OFFSET) | ||
| 51 | -#define EXTIOI_COREISR_START (0x800 - APIC_OFFSET) | ||
| 52 | -#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET) | ||
| 53 | -#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET) | ||
| 54 | -#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET) | ||
| 55 | -#define EXTIOI_SIZE 0x800 | ||
| 56 | - | ||
| 57 | -#define EXTIOI_VIRT_BASE (0x40000000) | ||
| 58 | -#define EXTIOI_VIRT_SIZE (0x1000) | ||
| 59 | -#define EXTIOI_VIRT_FEATURES (0x0) | ||
| 60 | -#define EXTIOI_HAS_VIRT_EXTENSION (0) | ||
| 61 | -#define EXTIOI_HAS_ENABLE_OPTION (1) | ||
| 62 | -#define EXTIOI_HAS_INT_ENCODE (2) | ||
| 63 | -#define EXTIOI_HAS_CPU_ENCODE (3) | ||
| 64 | -#define EXTIOI_VIRT_HAS_FEATURES (BIT(EXTIOI_HAS_VIRT_EXTENSION) \ | ||
| 65 | - | BIT(EXTIOI_HAS_ENABLE_OPTION) \ | ||
| 66 | - | BIT(EXTIOI_HAS_CPU_ENCODE)) | ||
| 67 | -#define EXTIOI_VIRT_CONFIG (0x4) | ||
| 68 | -#define EXTIOI_ENABLE (1) | ||
| 69 | -#define EXTIOI_ENABLE_INT_ENCODE (2) | ||
| 70 | -#define EXTIOI_ENABLE_CPU_ENCODE (3) | ||
| 71 | -#define EXTIOI_VIRT_COREMAP_START (0x40) | ||
| 72 | -#define EXTIOI_VIRT_COREMAP_END (0x240) | ||
| 73 | +#include "hw/intc/loongarch_extioi_common.h" | ||
| 74 | |||
| 75 | typedef struct ExtIOICore { | ||
| 76 | uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT]; | ||
| 77 | diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h | ||
| 78 | new file mode 100644 | ||
| 79 | index XXXXXXX..XXXXXXX | ||
| 80 | --- /dev/null | ||
| 81 | +++ b/include/hw/intc/loongarch_extioi_common.h | ||
| 82 | @@ -XXX,XX +XXX,XX @@ | ||
| 83 | +/* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 84 | +/* | ||
| 85 | + * LoongArch 3A5000 ext interrupt controller definitions | ||
| 86 | + * Copyright (C) 2024 Loongson Technology Corporation Limited | ||
| 87 | + */ | ||
| 88 | + | ||
| 89 | +#ifndef LOONGARCH_EXTIOI_COMMON_H | ||
| 90 | +#define LOONGARCH_EXTIOI_COMMON_H | ||
| 91 | + | ||
| 92 | +#include "hw/sysbus.h" | ||
| 93 | +#include "hw/loongarch/virt.h" | ||
| 94 | + | ||
| 95 | +#define LS3A_INTC_IP 8 | ||
| 96 | +#define EXTIOI_IRQS (256) | ||
| 97 | +#define EXTIOI_IRQS_BITMAP_SIZE (256 / 8) | ||
| 98 | +/* irq from EXTIOI is routed to no more than 4 cpus */ | ||
| 99 | +#define EXTIOI_CPUS (4) | ||
| 100 | +/* map to ipnum per 32 irqs */ | ||
| 101 | +#define EXTIOI_IRQS_IPMAP_SIZE (256 / 32) | ||
| 102 | +#define EXTIOI_IRQS_COREMAP_SIZE 256 | ||
| 103 | +#define EXTIOI_IRQS_NODETYPE_COUNT 16 | ||
| 104 | +#define EXTIOI_IRQS_GROUP_COUNT 8 | ||
| 105 | + | ||
| 106 | +#define APIC_OFFSET 0x400 | ||
| 107 | +#define APIC_BASE (0x1000ULL + APIC_OFFSET) | ||
| 108 | +#define EXTIOI_NODETYPE_START (0x4a0 - APIC_OFFSET) | ||
| 109 | +#define EXTIOI_NODETYPE_END (0x4c0 - APIC_OFFSET) | ||
| 110 | +#define EXTIOI_IPMAP_START (0x4c0 - APIC_OFFSET) | ||
| 111 | +#define EXTIOI_IPMAP_END (0x4c8 - APIC_OFFSET) | ||
| 112 | +#define EXTIOI_ENABLE_START (0x600 - APIC_OFFSET) | ||
| 113 | +#define EXTIOI_ENABLE_END (0x620 - APIC_OFFSET) | ||
| 114 | +#define EXTIOI_BOUNCE_START (0x680 - APIC_OFFSET) | ||
| 115 | +#define EXTIOI_BOUNCE_END (0x6a0 - APIC_OFFSET) | ||
| 116 | +#define EXTIOI_ISR_START (0x700 - APIC_OFFSET) | ||
| 117 | +#define EXTIOI_ISR_END (0x720 - APIC_OFFSET) | ||
| 118 | +#define EXTIOI_COREISR_START (0x800 - APIC_OFFSET) | ||
| 119 | +#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET) | ||
| 120 | +#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET) | ||
| 121 | +#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET) | ||
| 122 | +#define EXTIOI_SIZE 0x800 | ||
| 123 | + | ||
| 124 | +#define EXTIOI_VIRT_BASE (0x40000000) | ||
| 125 | +#define EXTIOI_VIRT_SIZE (0x1000) | ||
| 126 | +#define EXTIOI_VIRT_FEATURES (0x0) | ||
| 127 | +#define EXTIOI_HAS_VIRT_EXTENSION (0) | ||
| 128 | +#define EXTIOI_HAS_ENABLE_OPTION (1) | ||
| 129 | +#define EXTIOI_HAS_INT_ENCODE (2) | ||
| 130 | +#define EXTIOI_HAS_CPU_ENCODE (3) | ||
| 131 | +#define EXTIOI_VIRT_HAS_FEATURES (BIT(EXTIOI_HAS_VIRT_EXTENSION) \ | ||
| 132 | + | BIT(EXTIOI_HAS_ENABLE_OPTION) \ | ||
| 133 | + | BIT(EXTIOI_HAS_CPU_ENCODE)) | ||
| 134 | +#define EXTIOI_VIRT_CONFIG (0x4) | ||
| 135 | +#define EXTIOI_ENABLE (1) | ||
| 136 | +#define EXTIOI_ENABLE_INT_ENCODE (2) | ||
| 137 | +#define EXTIOI_ENABLE_CPU_ENCODE (3) | ||
| 138 | +#define EXTIOI_VIRT_COREMAP_START (0x40) | ||
| 139 | +#define EXTIOI_VIRT_COREMAP_END (0x240) | ||
| 140 | +#endif /* LOONGARCH_EXTIOI_H */ | ||
| 141 | -- | ||
| 142 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Move definiton of structure LoongArchExtIOI from header file loongarch_extioi.h |
|---|---|---|---|
| 2 | to file loongarch_extioi_common.h. | ||
| 2 | 3 | ||
| 3 | Support fw_cfg dma function for LoongArch virt machine. | 4 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 5 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
| 6 | --- | ||
| 7 | include/hw/intc/loongarch_extioi.h | 26 ---------------------- | ||
| 8 | include/hw/intc/loongarch_extioi_common.h | 27 +++++++++++++++++++++++ | ||
| 9 | 2 files changed, 27 insertions(+), 26 deletions(-) | ||
| 4 | 10 | ||
| 5 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h |
| 6 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 7 | Message-Id: <20220908094623.73051-3-yangxiaojuan@loongson.cn> | ||
| 8 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 9 | --- | ||
| 10 | hw/loongarch/Kconfig | 1 + | ||
| 11 | hw/loongarch/fw_cfg.c | 3 ++- | ||
| 12 | hw/loongarch/virt.c | 2 +- | ||
| 13 | 3 files changed, 4 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | 12 | index XXXXXXX..XXXXXXX 100644 |
| 17 | --- a/hw/loongarch/Kconfig | 13 | --- a/include/hw/intc/loongarch_extioi.h |
| 18 | +++ b/hw/loongarch/Kconfig | 14 | +++ b/include/hw/intc/loongarch_extioi.h |
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 15 | @@ -XXX,XX +XXX,XX @@ |
| 20 | select SMBIOS | 16 | |
| 21 | select ACPI_PCI | 17 | #include "hw/intc/loongarch_extioi_common.h" |
| 22 | select ACPI_HW_REDUCED | 18 | |
| 23 | + select FW_CFG_DMA | 19 | -typedef struct ExtIOICore { |
| 24 | diff --git a/hw/loongarch/fw_cfg.c b/hw/loongarch/fw_cfg.c | 20 | - uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT]; |
| 21 | - DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS); | ||
| 22 | - qemu_irq parent_irq[LS3A_INTC_IP]; | ||
| 23 | -} ExtIOICore; | ||
| 24 | - | ||
| 25 | #define TYPE_LOONGARCH_EXTIOI "loongarch.extioi" | ||
| 26 | OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI) | ||
| 27 | -struct LoongArchExtIOI { | ||
| 28 | - SysBusDevice parent_obj; | ||
| 29 | - uint32_t num_cpu; | ||
| 30 | - uint32_t features; | ||
| 31 | - uint32_t status; | ||
| 32 | - /* hardware state */ | ||
| 33 | - uint32_t nodetype[EXTIOI_IRQS_NODETYPE_COUNT / 2]; | ||
| 34 | - uint32_t bounce[EXTIOI_IRQS_GROUP_COUNT]; | ||
| 35 | - uint32_t isr[EXTIOI_IRQS / 32]; | ||
| 36 | - uint32_t enable[EXTIOI_IRQS / 32]; | ||
| 37 | - uint32_t ipmap[EXTIOI_IRQS_IPMAP_SIZE / 4]; | ||
| 38 | - uint32_t coremap[EXTIOI_IRQS / 4]; | ||
| 39 | - uint32_t sw_pending[EXTIOI_IRQS / 32]; | ||
| 40 | - uint8_t sw_ipmap[EXTIOI_IRQS_IPMAP_SIZE]; | ||
| 41 | - uint8_t sw_coremap[EXTIOI_IRQS]; | ||
| 42 | - qemu_irq irq[EXTIOI_IRQS]; | ||
| 43 | - ExtIOICore *cpu; | ||
| 44 | - MemoryRegion extioi_system_mem; | ||
| 45 | - MemoryRegion virt_extend; | ||
| 46 | -}; | ||
| 47 | #endif /* LOONGARCH_EXTIOI_H */ | ||
| 48 | diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h | ||
| 25 | index XXXXXXX..XXXXXXX 100644 | 49 | index XXXXXXX..XXXXXXX 100644 |
| 26 | --- a/hw/loongarch/fw_cfg.c | 50 | --- a/include/hw/intc/loongarch_extioi_common.h |
| 27 | +++ b/hw/loongarch/fw_cfg.c | 51 | +++ b/include/hw/intc/loongarch_extioi_common.h |
| 28 | @@ -XXX,XX +XXX,XX @@ FWCfgState *loongarch_fw_cfg_init(ram_addr_t ram_size, MachineState *ms) | 52 | @@ -XXX,XX +XXX,XX @@ |
| 29 | int max_cpus = ms->smp.max_cpus; | 53 | #define EXTIOI_ENABLE_CPU_ENCODE (3) |
| 30 | int smp_cpus = ms->smp.cpus; | 54 | #define EXTIOI_VIRT_COREMAP_START (0x40) |
| 31 | 55 | #define EXTIOI_VIRT_COREMAP_END (0x240) | |
| 32 | - fw_cfg = fw_cfg_init_mem_wide(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, 8, 0, NULL); | 56 | + |
| 33 | + fw_cfg = fw_cfg_init_mem_wide(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, 8, | 57 | +typedef struct ExtIOICore { |
| 34 | + VIRT_FWCFG_BASE + 16, &address_space_memory); | 58 | + uint32_t coreisr[EXTIOI_IRQS_GROUP_COUNT]; |
| 35 | fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); | 59 | + DECLARE_BITMAP(sw_isr[LS3A_INTC_IP], EXTIOI_IRQS); |
| 36 | fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); | 60 | + qemu_irq parent_irq[LS3A_INTC_IP]; |
| 37 | fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus); | 61 | +} ExtIOICore; |
| 38 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 62 | + |
| 39 | index XXXXXXX..XXXXXXX 100644 | 63 | +struct LoongArchExtIOI { |
| 40 | --- a/hw/loongarch/virt.c | 64 | + SysBusDevice parent_obj; |
| 41 | +++ b/hw/loongarch/virt.c | 65 | + uint32_t num_cpu; |
| 42 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams) | 66 | + uint32_t features; |
| 43 | qemu_fdt_setprop_string(ms->fdt, nodename, | 67 | + uint32_t status; |
| 44 | "compatible", "qemu,fw-cfg-mmio"); | 68 | + /* hardware state */ |
| 45 | qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", | 69 | + uint32_t nodetype[EXTIOI_IRQS_NODETYPE_COUNT / 2]; |
| 46 | - 2, base, 2, 0x8); | 70 | + uint32_t bounce[EXTIOI_IRQS_GROUP_COUNT]; |
| 47 | + 2, base, 2, 0x18); | 71 | + uint32_t isr[EXTIOI_IRQS / 32]; |
| 48 | qemu_fdt_setprop(ms->fdt, nodename, "dma-coherent", NULL, 0); | 72 | + uint32_t enable[EXTIOI_IRQS / 32]; |
| 49 | g_free(nodename); | 73 | + uint32_t ipmap[EXTIOI_IRQS_IPMAP_SIZE / 4]; |
| 50 | } | 74 | + uint32_t coremap[EXTIOI_IRQS / 4]; |
| 75 | + uint32_t sw_pending[EXTIOI_IRQS / 32]; | ||
| 76 | + uint8_t sw_ipmap[EXTIOI_IRQS_IPMAP_SIZE]; | ||
| 77 | + uint8_t sw_coremap[EXTIOI_IRQS]; | ||
| 78 | + qemu_irq irq[EXTIOI_IRQS]; | ||
| 79 | + ExtIOICore *cpu; | ||
| 80 | + MemoryRegion extioi_system_mem; | ||
| 81 | + MemoryRegion virt_extend; | ||
| 82 | +}; | ||
| 83 | #endif /* LOONGARCH_EXTIOI_H */ | ||
| 51 | -- | 84 | -- |
| 52 | 2.31.1 | 85 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Rename structure LoongArchExtIOI with LoongArchExtIOICommonState, |
|---|---|---|---|
| 2 | since it is defined in file loongarch_extioi_common.h | ||
| 2 | 3 | ||
| 3 | Remove the vga device when loongarch machine init and | 4 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | we will support other display device in the future. | 5 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 6 | --- | ||
| 7 | include/hw/intc/loongarch_extioi.h | 1 + | ||
| 8 | include/hw/intc/loongarch_extioi_common.h | 2 +- | ||
| 9 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
| 5 | 10 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/include/hw/intc/loongarch_extioi.h b/include/hw/intc/loongarch_extioi.h |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-2-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | ||
| 11 | hw/loongarch/Kconfig | 1 - | ||
| 12 | hw/loongarch/virt.c | 3 --- | ||
| 13 | 2 files changed, 4 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/hw/loongarch/Kconfig b/hw/loongarch/Kconfig | ||
| 16 | index XXXXXXX..XXXXXXX 100644 | 12 | index XXXXXXX..XXXXXXX 100644 |
| 17 | --- a/hw/loongarch/Kconfig | 13 | --- a/include/hw/intc/loongarch_extioi.h |
| 18 | +++ b/hw/loongarch/Kconfig | 14 | +++ b/include/hw/intc/loongarch_extioi.h |
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 15 | @@ -XXX,XX +XXX,XX @@ |
| 20 | bool | 16 | |
| 21 | select PCI | 17 | #include "hw/intc/loongarch_extioi_common.h" |
| 22 | select PCI_EXPRESS_GENERIC_BRIDGE | 18 | |
| 23 | - imply VGA_PCI | 19 | +#define LoongArchExtIOI LoongArchExtIOICommonState |
| 24 | imply VIRTIO_VGA | 20 | #define TYPE_LOONGARCH_EXTIOI "loongarch.extioi" |
| 25 | imply PCI_DEVICES | 21 | OBJECT_DECLARE_SIMPLE_TYPE(LoongArchExtIOI, LOONGARCH_EXTIOI) |
| 26 | select ISA_BUS | 22 | #endif /* LOONGARCH_EXTIOI_H */ |
| 27 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 23 | diff --git a/include/hw/intc/loongarch_extioi_common.h b/include/hw/intc/loongarch_extioi_common.h |
| 28 | index XXXXXXX..XXXXXXX 100644 | 24 | index XXXXXXX..XXXXXXX 100644 |
| 29 | --- a/hw/loongarch/virt.c | 25 | --- a/include/hw/intc/loongarch_extioi_common.h |
| 30 | +++ b/hw/loongarch/virt.c | 26 | +++ b/include/hw/intc/loongarch_extioi_common.h |
| 31 | @@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState * | 27 | @@ -XXX,XX +XXX,XX @@ typedef struct ExtIOICore { |
| 32 | pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); | 28 | qemu_irq parent_irq[LS3A_INTC_IP]; |
| 33 | } | 29 | } ExtIOICore; |
| 34 | 30 | ||
| 35 | - /* VGA setup */ | 31 | -struct LoongArchExtIOI { |
| 36 | - pci_vga_init(pci_bus); | 32 | +struct LoongArchExtIOICommonState { |
| 37 | - | 33 | SysBusDevice parent_obj; |
| 38 | /* | 34 | uint32_t num_cpu; |
| 39 | * There are some invalid guest memory access. | 35 | uint32_t features; |
| 40 | * Create some unimplemented devices to emulate this. | ||
| 41 | -- | 36 | -- |
| 42 | 2.31.1 | 37 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | With some structure such as vmstate and property, rename LoongArchExtIOI |
|---|---|---|---|
| 2 | with LoongArchExtIOICommonState, these common structure will be moved | ||
| 3 | to common file. | ||
| 2 | 4 | ||
| 3 | Add hotplug handler for LoongArch virt machine and now only support | 5 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | the dynamic sysbus device. | 6 | Reviewed-by: Song Gao <gaosong@loongson.cn> |
| 7 | --- | ||
| 8 | hw/intc/loongarch_extioi.c | 41 +++++++++++++++++++++++--------------- | ||
| 9 | 1 file changed, 25 insertions(+), 16 deletions(-) | ||
| 5 | 10 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-6-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | ||
| 11 | hw/loongarch/virt.c | 32 ++++++++++++++++++++++++++++++++ | ||
| 12 | 1 file changed, 32 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | 12 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/virt.c | 13 | --- a/hw/intc/loongarch_extioi.c |
| 17 | +++ b/hw/loongarch/virt.c | 14 | +++ b/hw/intc/loongarch_extioi.c |
| 18 | @@ -XXX,XX +XXX,XX @@ static void loongarch_machine_initfn(Object *obj) | 15 | @@ -XXX,XX +XXX,XX @@ static int vmstate_extioi_post_load(void *opaque, int version_id) |
| 19 | lams->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); | 16 | return 0; |
| 20 | } | 17 | } |
| 21 | 18 | ||
| 22 | +static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, | 19 | +static int loongarch_extioi_common_post_load(void *opaque, int version_id) |
| 23 | + DeviceState *dev, Error **errp) | ||
| 24 | +{ | 20 | +{ |
| 25 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); | 21 | + return vmstate_extioi_post_load(opaque, version_id); |
| 26 | + MachineClass *mc = MACHINE_GET_CLASS(lams); | ||
| 27 | + | ||
| 28 | + if (device_is_dynamic_sysbus(mc, dev)) { | ||
| 29 | + if (lams->platform_bus_dev) { | ||
| 30 | + platform_bus_link_device(PLATFORM_BUS_DEVICE(lams->platform_bus_dev), | ||
| 31 | + SYS_BUS_DEVICE(dev)); | ||
| 32 | + } | ||
| 33 | + } | ||
| 34 | +} | 22 | +} |
| 35 | + | 23 | + |
| 36 | +static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, | 24 | static const VMStateDescription vmstate_extioi_core = { |
| 37 | + DeviceState *dev) | 25 | .name = "extioi-core", |
| 38 | +{ | 26 | .version_id = 1, |
| 39 | + MachineClass *mc = MACHINE_GET_CLASS(machine); | 27 | @@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_extioi_core = { |
| 40 | + | 28 | }; |
| 41 | + if (device_is_dynamic_sysbus(mc, dev)) { | 29 | |
| 42 | + return HOTPLUG_HANDLER(machine); | 30 | static const VMStateDescription vmstate_loongarch_extioi = { |
| 43 | + } | 31 | - .name = TYPE_LOONGARCH_EXTIOI, |
| 44 | + return NULL; | 32 | + .name = "loongarch.extioi", |
| 45 | +} | 33 | .version_id = 3, |
| 46 | + | 34 | .minimum_version_id = 3, |
| 47 | static void loongarch_class_init(ObjectClass *oc, void *data) | 35 | - .post_load = vmstate_extioi_post_load, |
| 48 | { | 36 | + .post_load = loongarch_extioi_common_post_load, |
| 49 | MachineClass *mc = MACHINE_CLASS(oc); | 37 | .fields = (const VMStateField[]) { |
| 50 | + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); | 38 | - VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOI, EXTIOI_IRQS_GROUP_COUNT), |
| 51 | 39 | - VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOI, | |
| 52 | mc->desc = "Loongson-3A5000 LS7A1000 machine"; | 40 | + VMSTATE_UINT32_ARRAY(bounce, LoongArchExtIOICommonState, |
| 53 | mc->init = loongarch_init; | 41 | + EXTIOI_IRQS_GROUP_COUNT), |
| 54 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | 42 | + VMSTATE_UINT32_ARRAY(nodetype, LoongArchExtIOICommonState, |
| 55 | mc->block_default_type = IF_VIRTIO; | 43 | EXTIOI_IRQS_NODETYPE_COUNT / 2), |
| 56 | mc->default_boot_order = "c"; | 44 | - VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOI, EXTIOI_IRQS / 32), |
| 57 | mc->no_cdrom = 1; | 45 | - VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOI, EXTIOI_IRQS / 32), |
| 58 | + mc->get_hotplug_handler = virt_machine_get_hotplug_handler; | 46 | - VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOI, EXTIOI_IRQS_IPMAP_SIZE / 4), |
| 59 | + hc->plug = loongarch_machine_device_plug_cb; | 47 | - VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOI, EXTIOI_IRQS / 4), |
| 60 | 48 | - | |
| 61 | object_class_property_add(oc, "acpi", "OnOffAuto", | 49 | - VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOI, num_cpu, |
| 62 | loongarch_get_acpi, loongarch_set_acpi, | 50 | - vmstate_extioi_core, ExtIOICore), |
| 63 | @@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_machine_types[] = { | 51 | - VMSTATE_UINT32(features, LoongArchExtIOI), |
| 64 | .instance_size = sizeof(LoongArchMachineState), | 52 | - VMSTATE_UINT32(status, LoongArchExtIOI), |
| 65 | .class_init = loongarch_class_init, | 53 | + VMSTATE_UINT32_ARRAY(enable, LoongArchExtIOICommonState, |
| 66 | .instance_init = loongarch_machine_initfn, | 54 | + EXTIOI_IRQS / 32), |
| 67 | + .interfaces = (InterfaceInfo[]) { | 55 | + VMSTATE_UINT32_ARRAY(isr, LoongArchExtIOICommonState, |
| 68 | + { TYPE_HOTPLUG_HANDLER }, | 56 | + EXTIOI_IRQS / 32), |
| 69 | + { } | 57 | + VMSTATE_UINT32_ARRAY(ipmap, LoongArchExtIOICommonState, |
| 70 | + }, | 58 | + EXTIOI_IRQS_IPMAP_SIZE / 4), |
| 59 | + VMSTATE_UINT32_ARRAY(coremap, LoongArchExtIOICommonState, | ||
| 60 | + EXTIOI_IRQS / 4), | ||
| 61 | + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(cpu, LoongArchExtIOICommonState, | ||
| 62 | + num_cpu, vmstate_extioi_core, ExtIOICore), | ||
| 63 | + VMSTATE_UINT32(features, LoongArchExtIOICommonState), | ||
| 64 | + VMSTATE_UINT32(status, LoongArchExtIOICommonState), | ||
| 65 | VMSTATE_END_OF_LIST() | ||
| 71 | } | 66 | } |
| 72 | }; | 67 | }; |
| 73 | 68 | ||
| 69 | static Property extioi_properties[] = { | ||
| 70 | - DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOI, num_cpu, 1), | ||
| 71 | - DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOI, features, | ||
| 72 | - EXTIOI_HAS_VIRT_EXTENSION, 0), | ||
| 73 | + DEFINE_PROP_UINT32("num-cpu", LoongArchExtIOICommonState, num_cpu, 1), | ||
| 74 | + DEFINE_PROP_BIT("has-virtualization-extension", LoongArchExtIOICommonState, | ||
| 75 | + features, EXTIOI_HAS_VIRT_EXTENSION, 0), | ||
| 76 | DEFINE_PROP_END_OF_LIST(), | ||
| 77 | }; | ||
| 78 | |||
| 74 | -- | 79 | -- |
| 75 | 2.31.1 | 80 | 2.43.5 | diff view generated by jsdifflib |