| 1 | The following changes since commit d29201ff34a135cdfc197f4413c1c5047e4f58bb: | 1 | The following changes since commit 38d0939b86e2eef6f6a622c6f1f7befda0146595: |
|---|---|---|---|
| 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-vfio-20241226' of https://github.com/legoater/qemu into staging (2024-12-26 04:38:38 -0500) |
| 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-20220920 | 7 | https://gitlab.com/bibo-mao/qemu.git tags/pull-loongarch-20241227 |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 1895b967922890f76ad0ba8eefad6019e0328606: | 9 | for you to fetch changes up to 5e360dabedb1ab1f15cce27a134ccbe4b8e18424: |
| 10 | 10 | ||
| 11 | hw/loongarch: Improve acpi dsdt table (2022-09-20 15:44:25 +0800) | 11 | target/loongarch: Use auto method with LASX feature (2024-12-27 11:33:06 +0800) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | v2: fix compile error. | 14 | pull-loongarch-20241227 |
| 15 | v1 ... v2 | ||
| 16 | 1. Modify patch auther inconsistent with SOB | ||
| 15 | 17 | ||
| 16 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
| 17 | Xiaojuan Yang (9): | 19 | Bibo Mao (5): |
| 18 | hw/loongarch: Remove vga device when loongarch init | 20 | target/loongarch: Use actual operand size with vbsrl check |
| 19 | hw/loongarch: Support fw_cfg dma function | 21 | hw/loongarch/virt: Create fdt table on machine creation done notification |
| 20 | hw/loongarch: Add interrupt information to FDT table | 22 | hw/loongarch/virt: Improve fdt table creation for CPU object |
| 21 | hw/loongarch: Add platform bus support | 23 | target/loongarch: Use auto method with LSX feature |
| 22 | hw/loongarch: Add hotplug handler for machine | 24 | target/loongarch: Use auto method with LASX feature |
| 23 | hw/loongarch: Add RAMFB to dynamic_sysbus_devices list | ||
| 24 | hw/loongarch: Fix acpi ged irq number in dsdt table | ||
| 25 | hw/loongarch: Support memory hotplug | ||
| 26 | hw/loongarch: Improve acpi dsdt table | ||
| 27 | 25 | ||
| 28 | hw/loongarch/Kconfig | 5 +- | 26 | Guo Hongyu (1): |
| 29 | hw/loongarch/acpi-build.c | 191 ++++++++++------------------------------- | 27 | target/loongarch: Fix vldi inst |
| 30 | hw/loongarch/fw_cfg.c | 3 +- | 28 | |
| 31 | hw/loongarch/virt.c | 204 +++++++++++++++++++++++++++++++++++++++++++- | 29 | hw/loongarch/virt.c | 142 ++++++++++++++---------- |
| 32 | include/hw/loongarch/virt.h | 2 + | 30 | target/loongarch/cpu.c | 86 ++++++++------ |
| 33 | include/hw/pci-host/ls7a.h | 5 ++ | 31 | target/loongarch/cpu.h | 4 + |
| 34 | 6 files changed, 258 insertions(+), 152 deletions(-) | 32 | target/loongarch/kvm/kvm.c | 107 ++++++++++++++++++ |
| 33 | target/loongarch/tcg/insn_trans/trans_vec.c.inc | 4 +- | ||
| 34 | 5 files changed, 249 insertions(+), 94 deletions(-) | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 2 | 1 | ||
| 3 | Remove the vga device when loongarch machine init and | ||
| 4 | we will support other display device in the future. | ||
| 5 | |||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 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 | ||
| 17 | --- a/hw/loongarch/Kconfig | ||
| 18 | +++ b/hw/loongarch/Kconfig | ||
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | ||
| 20 | bool | ||
| 21 | select PCI | ||
| 22 | select PCI_EXPRESS_GENERIC_BRIDGE | ||
| 23 | - imply VGA_PCI | ||
| 24 | imply VIRTIO_VGA | ||
| 25 | imply PCI_DEVICES | ||
| 26 | select ISA_BUS | ||
| 27 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 28 | index XXXXXXX..XXXXXXX 100644 | ||
| 29 | --- a/hw/loongarch/virt.c | ||
| 30 | +++ b/hw/loongarch/virt.c | ||
| 31 | @@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState * | ||
| 32 | pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); | ||
| 33 | } | ||
| 34 | |||
| 35 | - /* VGA setup */ | ||
| 36 | - pci_vga_init(pci_bus); | ||
| 37 | - | ||
| 38 | /* | ||
| 39 | * There are some invalid guest memory access. | ||
| 40 | * Create some unimplemented devices to emulate this. | ||
| 41 | -- | ||
| 42 | 2.31.1 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 2 | 1 | ||
| 3 | Support fw_cfg dma function for LoongArch virt machine. | ||
| 4 | |||
| 5 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 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 | ||
| 17 | --- a/hw/loongarch/Kconfig | ||
| 18 | +++ b/hw/loongarch/Kconfig | ||
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | ||
| 20 | select SMBIOS | ||
| 21 | select ACPI_PCI | ||
| 22 | select ACPI_HW_REDUCED | ||
| 23 | + select FW_CFG_DMA | ||
| 24 | diff --git a/hw/loongarch/fw_cfg.c b/hw/loongarch/fw_cfg.c | ||
| 25 | index XXXXXXX..XXXXXXX 100644 | ||
| 26 | --- a/hw/loongarch/fw_cfg.c | ||
| 27 | +++ b/hw/loongarch/fw_cfg.c | ||
| 28 | @@ -XXX,XX +XXX,XX @@ FWCfgState *loongarch_fw_cfg_init(ram_addr_t ram_size, MachineState *ms) | ||
| 29 | int max_cpus = ms->smp.max_cpus; | ||
| 30 | int smp_cpus = ms->smp.cpus; | ||
| 31 | |||
| 32 | - fw_cfg = fw_cfg_init_mem_wide(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, 8, 0, NULL); | ||
| 33 | + fw_cfg = fw_cfg_init_mem_wide(VIRT_FWCFG_BASE + 8, VIRT_FWCFG_BASE, 8, | ||
| 34 | + VIRT_FWCFG_BASE + 16, &address_space_memory); | ||
| 35 | fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); | ||
| 36 | fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); | ||
| 37 | fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)smp_cpus); | ||
| 38 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 39 | index XXXXXXX..XXXXXXX 100644 | ||
| 40 | --- a/hw/loongarch/virt.c | ||
| 41 | +++ b/hw/loongarch/virt.c | ||
| 42 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_fw_cfg_node(const LoongArchMachineState *lams) | ||
| 43 | qemu_fdt_setprop_string(ms->fdt, nodename, | ||
| 44 | "compatible", "qemu,fw-cfg-mmio"); | ||
| 45 | qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", | ||
| 46 | - 2, base, 2, 0x8); | ||
| 47 | + 2, base, 2, 0x18); | ||
| 48 | qemu_fdt_setprop(ms->fdt, nodename, "dma-coherent", NULL, 0); | ||
| 49 | g_free(nodename); | ||
| 50 | } | ||
| 51 | -- | ||
| 52 | 2.31.1 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 2 | 1 | ||
| 3 | Add interrupt information to FDT table, such as interrupt | ||
| 4 | controller info, compatiable info, etc. | ||
| 5 | |||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 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 | 28 ++++++++++++++++++++++++++++ | ||
| 12 | 1 file changed, 28 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | ||
| 16 | --- a/hw/loongarch/virt.c | ||
| 17 | +++ b/hw/loongarch/virt.c | ||
| 18 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_pcie_node(const LoongArchMachineState *lams) | ||
| 19 | qemu_fdt_dumpdtb(ms->fdt, lams->fdt_size); | ||
| 20 | } | ||
| 21 | |||
| 22 | +static void fdt_add_irqchip_node(LoongArchMachineState *lams) | ||
| 23 | +{ | ||
| 24 | + MachineState *ms = MACHINE(lams); | ||
| 25 | + char *nodename; | ||
| 26 | + uint32_t irqchip_phandle; | ||
| 27 | + | ||
| 28 | + irqchip_phandle = qemu_fdt_alloc_phandle(ms->fdt); | ||
| 29 | + qemu_fdt_setprop_cell(ms->fdt, "/", "interrupt-parent", irqchip_phandle); | ||
| 30 | + | ||
| 31 | + nodename = g_strdup_printf("/intc@%lx", VIRT_IOAPIC_REG_BASE); | ||
| 32 | + qemu_fdt_add_subnode(ms->fdt, nodename); | ||
| 33 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#interrupt-cells", 3); | ||
| 34 | + qemu_fdt_setprop(ms->fdt, nodename, "interrupt-controller", NULL, 0); | ||
| 35 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#address-cells", 0x2); | ||
| 36 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "#size-cells", 0x2); | ||
| 37 | + qemu_fdt_setprop(ms->fdt, nodename, "ranges", NULL, 0); | ||
| 38 | + | ||
| 39 | + qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", | ||
| 40 | + "loongarch,ls7a"); | ||
| 41 | + | ||
| 42 | + qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", | ||
| 43 | + 2, VIRT_IOAPIC_REG_BASE, | ||
| 44 | + 2, PCH_PIC_ROUTE_ENTRY_OFFSET); | ||
| 45 | + | ||
| 46 | + qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", irqchip_phandle); | ||
| 47 | + g_free(nodename); | ||
| 48 | +} | ||
| 49 | |||
| 50 | #define PM_BASE 0x10080000 | ||
| 51 | #define PM_SIZE 0x100 | ||
| 52 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | ||
| 53 | } | ||
| 54 | /* Initialize the IO interrupt subsystem */ | ||
| 55 | loongarch_irq_init(lams); | ||
| 56 | + fdt_add_irqchip_node(lams); | ||
| 57 | lams->machine_done.notify = virt_machine_done; | ||
| 58 | qemu_add_machine_init_done_notifier(&lams->machine_done); | ||
| 59 | fdt_add_pcie_node(lams); | ||
| 60 | -- | ||
| 61 | 2.31.1 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | From: Guo Hongyu <guohongyu24@mails.ucas.ac.cn> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Cleanup the previous pci information in acpi dsdt table. | 3 | Refer to the link below for a description of the vldi instructions: |
| 4 | And using the common acpi_dsdt_add_gpex function to build | 4 | https://jia.je/unofficial-loongarch-intrinsics-guide/lsx/misc/#synopsis_88 |
| 5 | the gpex and pci information. | 5 | Fixed errors in vldi instruction implementation. |
| 6 | 6 | ||
| 7 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 7 | Signed-off-by: Guo Hongyu <guohongyu24@mails.ucas.ac.cn> |
| 8 | Acked-by: Song Gao <gaosong@loongson.cn> | 8 | Tested-by: Xianglai Li <lixianglai@loongson.cn> |
| 9 | Message-Id: <20220908094623.73051-10-yangxiaojuan@loongson.cn> | 9 | Signed-off-by: Xianglai Li <lixianglai@loongson.cn> |
| 10 | Signed-off-by: Song Gao <gaosong@loongson.cn> | 10 | Reviewed-by: Bibo Mao <maobibo@loongson.cn> |
| 11 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> | ||
| 11 | --- | 12 | --- |
| 12 | hw/loongarch/acpi-build.c | 159 +++++------------------------------- | 13 | target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +- |
| 13 | hw/loongarch/virt.c | 1 + | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | include/hw/loongarch/virt.h | 1 + | ||
| 15 | 3 files changed, 21 insertions(+), 140 deletions(-) | ||
| 16 | 15 | ||
| 17 | diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c | 16 | diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 18 | index XXXXXXX..XXXXXXX 100644 | 17 | index XXXXXXX..XXXXXXX 100644 |
| 19 | --- a/hw/loongarch/acpi-build.c | 18 | --- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 20 | +++ b/hw/loongarch/acpi-build.c | 19 | +++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 21 | @@ -XXX,XX +XXX,XX @@ | 20 | @@ -XXX,XX +XXX,XX @@ static uint64_t vldi_get_value(DisasContext *ctx, uint32_t imm) |
| 22 | #include "qom/qom-qobject.h" | 21 | break; |
| 23 | 22 | case 1: | |
| 24 | #include "hw/acpi/generic_event_device.h" | 23 | /* data: {2{16'0, imm[7:0], 8'0}} */ |
| 25 | +#include "hw/pci-host/gpex.h" | 24 | - data = (t << 24) | (t << 8); |
| 26 | 25 | + data = (t << 40) | (t << 8); | |
| 27 | #define ACPI_BUILD_ALIGN_SIZE 0x1000 | 26 | break; |
| 28 | #define ACPI_BUILD_TABLE_SIZE 0x20000 | 27 | case 2: |
| 29 | @@ -XXX,XX +XXX,XX @@ struct AcpiBuildState { | 28 | /* data: {2{8'0, imm[7:0], 16'0}} */ |
| 30 | MemoryRegion *linker_mr; | ||
| 31 | } AcpiBuildState; | ||
| 32 | |||
| 33 | -static void build_gpex_pci0_int(Aml *table) | ||
| 34 | -{ | ||
| 35 | - Aml *sb_scope = aml_scope("_SB"); | ||
| 36 | - Aml *pci0_scope = aml_scope("PCI0"); | ||
| 37 | - Aml *prt_pkg = aml_varpackage(128); | ||
| 38 | - int slot, pin; | ||
| 39 | - | ||
| 40 | - for (slot = 0; slot < PCI_SLOT_MAX; slot++) { | ||
| 41 | - for (pin = 0; pin < PCI_NUM_PINS; pin++) { | ||
| 42 | - Aml *pkg = aml_package(4); | ||
| 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 | - } | ||
| 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 | -} | ||
| 54 | - | ||
| 55 | -static void build_dbg_aml(Aml *table) | ||
| 56 | -{ | ||
| 57 | - Aml *field; | ||
| 58 | - Aml *method; | ||
| 59 | - Aml *while_ctx; | ||
| 60 | - Aml *scope = aml_scope("\\"); | ||
| 61 | - Aml *buf = aml_local(0); | ||
| 62 | - Aml *len = aml_local(1); | ||
| 63 | - Aml *idx = aml_local(2); | ||
| 64 | - | ||
| 65 | - aml_append(scope, | ||
| 66 | - aml_operation_region("DBG", AML_SYSTEM_IO, aml_int(0x0402), 0x01)); | ||
| 67 | - field = aml_field("DBG", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); | ||
| 68 | - aml_append(field, aml_named_field("DBGB", 8)); | ||
| 69 | - aml_append(scope, field); | ||
| 70 | - | ||
| 71 | - method = aml_method("DBUG", 1, AML_NOTSERIALIZED); | ||
| 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 | { | ||
| 137 | Aml *dev; | ||
| 138 | @@ -XXX,XX +XXX,XX @@ build_la_ged_aml(Aml *dsdt, MachineState *machine) | ||
| 139 | } | ||
| 140 | } | ||
| 141 | |||
| 142 | +static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams) | ||
| 143 | +{ | ||
| 144 | + struct GPEXConfig cfg = { | ||
| 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 | + | ||
| 155 | + acpi_dsdt_add_gpex(scope, &cfg); | ||
| 156 | +} | ||
| 157 | + | ||
| 158 | /* build DSDT */ | ||
| 159 | static void | ||
| 160 | build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | ||
| 161 | { | ||
| 162 | - Aml *dsdt, *sb_scope, *scope, *dev, *crs, *pkg; | ||
| 163 | - int root_bus_limit = 0x7F; | ||
| 164 | + Aml *dsdt, *scope, *pkg; | ||
| 165 | LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); | ||
| 166 | AcpiTable table = { .sig = "DSDT", .rev = 1, .oem_id = lams->oem_id, | ||
| 167 | .oem_table_id = lams->oem_table_id }; | ||
| 168 | |||
| 169 | acpi_table_begin(&table, table_data); | ||
| 170 | - | ||
| 171 | dsdt = init_aml_allocator(); | ||
| 172 | - | ||
| 173 | - build_dbg_aml(dsdt); | ||
| 174 | - | ||
| 175 | - sb_scope = aml_scope("_SB"); | ||
| 176 | - dev = aml_device("PCI0"); | ||
| 177 | - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08"))); | ||
| 178 | - aml_append(dev, aml_name_decl("_CID", aml_eisaid("PNP0A03"))); | ||
| 179 | - aml_append(dev, aml_name_decl("_ADR", aml_int(0))); | ||
| 180 | - aml_append(dev, aml_name_decl("_BBN", aml_int(0))); | ||
| 181 | - aml_append(dev, aml_name_decl("_UID", aml_int(1))); | ||
| 182 | - aml_append(dev, build_osc_method()); | ||
| 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 | -- | 29 | -- |
| 239 | 2.31.1 | 30 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Hardcoded 32 bytes is used for vbsrl emulation check, there is |
|---|---|---|---|
| 2 | problem when options lsx=on,lasx=off is used for vbsrl.v instruction | ||
| 3 | in TCG mode. It injects LASX exception rather LSX exception. | ||
| 2 | 4 | ||
| 3 | In dsdt, acpi ged irq should use gsi number, and the | 5 | Here actual operand size is used. |
| 4 | VIRT_SCI_IRQ means it. | ||
| 5 | 6 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 7 | Cc: qemu-stable@nongnu.org |
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | 8 | Fixes: df97f338076 ("target/loongarch: Implement xvreplve xvinsve0 xvpickve") |
| 8 | Message-Id: <20220908094623.73051-8-yangxiaojuan@loongson.cn> | 9 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | 10 | Reviewed-by: Richard Henderson <richard.henderson@linaro.org> |
| 11 | Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
| 10 | --- | 12 | --- |
| 11 | hw/loongarch/acpi-build.c | 2 +- | 13 | target/loongarch/tcg/insn_trans/trans_vec.c.inc | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | 15 | ||
| 14 | diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c | 16 | diff --git a/target/loongarch/tcg/insn_trans/trans_vec.c.inc b/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 15 | index XXXXXXX..XXXXXXX 100644 | 17 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/acpi-build.c | 18 | --- a/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 17 | +++ b/hw/loongarch/acpi-build.c | 19 | +++ b/target/loongarch/tcg/insn_trans/trans_vec.c.inc |
| 18 | @@ -XXX,XX +XXX,XX @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | 20 | @@ -XXX,XX +XXX,XX @@ static bool do_vbsrl_v(DisasContext *ctx, arg_vv_i *a, uint32_t oprsz) |
| 19 | if (lams->acpi_ged) { | 21 | { |
| 20 | build_ged_aml(dsdt, "\\_SB."GED_DEVICE, | 22 | int i, ofs; |
| 21 | HOTPLUG_HANDLER(lams->acpi_ged), | 23 | |
| 22 | - VIRT_SCI_IRQ - PCH_PIC_IRQ_OFFSET, AML_SYSTEM_MEMORY, | 24 | - if (!check_vec(ctx, 32)) { |
| 23 | + VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, | 25 | + if (!check_vec(ctx, oprsz)) { |
| 24 | VIRT_GED_EVT_ADDR); | 26 | return true; |
| 25 | } | 27 | } |
| 26 | 28 | ||
| 27 | -- | 29 | -- |
| 28 | 2.31.1 | 30 | 2.43.5 |
| 31 | |||
| 32 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | The same with ACPI table, fdt table is created on machine done |
|---|---|---|---|
| 2 | notification. Some objects like CPU objects can be created with cold-plug | ||
| 3 | method with command such as -smp x, -device la464-loongarch-cpu, so all | ||
| 4 | objects finish to create when machine is done. | ||
| 2 | 5 | ||
| 3 | Add hotplug handler for LoongArch virt machine and now only support | 6 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | the dynamic sysbus device. | 7 | Reviewed-by: Bibo Mao <maobibo@loongson.cn> |
| 5 | |||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 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 | --- | 8 | --- |
| 11 | hw/loongarch/virt.c | 32 ++++++++++++++++++++++++++++++++ | 9 | hw/loongarch/virt.c | 103 ++++++++++++++++++++++++-------------------- |
| 12 | 1 file changed, 32 insertions(+) | 10 | 1 file changed, 57 insertions(+), 46 deletions(-) |
| 13 | 11 | ||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 12 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c |
| 15 | index XXXXXXX..XXXXXXX 100644 | 13 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/virt.c | 14 | --- a/hw/loongarch/virt.c |
| 17 | +++ b/hw/loongarch/virt.c | 15 | +++ b/hw/loongarch/virt.c |
| 18 | @@ -XXX,XX +XXX,XX @@ static void loongarch_machine_initfn(Object *obj) | 16 | @@ -XXX,XX +XXX,XX @@ static void virt_build_smbios(LoongArchVirtMachineState *lvms) |
| 19 | lams->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8); | 17 | } |
| 20 | } | 18 | } |
| 21 | 19 | ||
| 22 | +static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, | 20 | +static void virt_fdt_setup(LoongArchVirtMachineState *lvms) |
| 23 | + DeviceState *dev, Error **errp) | ||
| 24 | +{ | 21 | +{ |
| 25 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(hotplug_dev); | 22 | + MachineState *machine = MACHINE(lvms); |
| 26 | + MachineClass *mc = MACHINE_GET_CLASS(lams); | 23 | + uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle; |
| 27 | + | 24 | + int i; |
| 28 | + if (device_is_dynamic_sysbus(mc, dev)) { | 25 | + |
| 29 | + if (lams->platform_bus_dev) { | 26 | + create_fdt(lvms); |
| 30 | + platform_bus_link_device(PLATFORM_BUS_DEVICE(lams->platform_bus_dev), | 27 | + fdt_add_cpu_nodes(lvms); |
| 31 | + SYS_BUS_DEVICE(dev)); | 28 | + fdt_add_memory_nodes(machine); |
| 32 | + } | 29 | + fdt_add_fw_cfg_node(lvms); |
| 30 | + fdt_add_flash_node(lvms); | ||
| 31 | + | ||
| 32 | + /* Add cpu interrupt-controller */ | ||
| 33 | + fdt_add_cpuic_node(lvms, &cpuintc_phandle); | ||
| 34 | + /* Add Extend I/O Interrupt Controller node */ | ||
| 35 | + fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle); | ||
| 36 | + /* Add PCH PIC node */ | ||
| 37 | + fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle); | ||
| 38 | + /* Add PCH MSI node */ | ||
| 39 | + fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle); | ||
| 40 | + /* Add pcie node */ | ||
| 41 | + fdt_add_pcie_node(lvms, &pch_pic_phandle, &pch_msi_phandle); | ||
| 42 | + | ||
| 43 | + /* | ||
| 44 | + * Create uart fdt node in reverse order so that they appear | ||
| 45 | + * in the finished device tree lowest address first | ||
| 46 | + */ | ||
| 47 | + for (i = VIRT_UART_COUNT; i-- > 0;) { | ||
| 48 | + hwaddr base = VIRT_UART_BASE + i * VIRT_UART_SIZE; | ||
| 49 | + int irq = VIRT_UART_IRQ + i - VIRT_GSI_BASE; | ||
| 50 | + fdt_add_uart_node(lvms, &pch_pic_phandle, base, irq, i == 0); | ||
| 33 | + } | 51 | + } |
| 52 | + | ||
| 53 | + fdt_add_rtc_node(lvms, &pch_pic_phandle); | ||
| 54 | + fdt_add_ged_reset(lvms); | ||
| 55 | + platform_bus_add_all_fdt_nodes(machine->fdt, "/platic", | ||
| 56 | + VIRT_PLATFORM_BUS_BASEADDRESS, | ||
| 57 | + VIRT_PLATFORM_BUS_SIZE, | ||
| 58 | + VIRT_PLATFORM_BUS_IRQ); | ||
| 59 | + | ||
| 60 | + /* | ||
| 61 | + * Since lowmem region starts from 0 and Linux kernel legacy start address | ||
| 62 | + * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer | ||
| 63 | + * access. FDT size limit with 1 MiB. | ||
| 64 | + * Put the FDT into the memory map as a ROM image: this will ensure | ||
| 65 | + * the FDT is copied again upon reset, even if addr points into RAM. | ||
| 66 | + */ | ||
| 67 | + qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size); | ||
| 68 | + rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE, | ||
| 69 | + &address_space_memory); | ||
| 70 | + qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, | ||
| 71 | + rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size)); | ||
| 34 | +} | 72 | +} |
| 35 | + | 73 | + |
| 36 | +static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, | 74 | static void virt_done(Notifier *notifier, void *data) |
| 37 | + DeviceState *dev) | ||
| 38 | +{ | ||
| 39 | + MachineClass *mc = MACHINE_GET_CLASS(machine); | ||
| 40 | + | ||
| 41 | + if (device_is_dynamic_sysbus(mc, dev)) { | ||
| 42 | + return HOTPLUG_HANDLER(machine); | ||
| 43 | + } | ||
| 44 | + return NULL; | ||
| 45 | +} | ||
| 46 | + | ||
| 47 | static void loongarch_class_init(ObjectClass *oc, void *data) | ||
| 48 | { | 75 | { |
| 49 | MachineClass *mc = MACHINE_CLASS(oc); | 76 | LoongArchVirtMachineState *lvms = container_of(notifier, |
| 50 | + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); | 77 | LoongArchVirtMachineState, machine_done); |
| 51 | 78 | virt_build_smbios(lvms); | |
| 52 | mc->desc = "Loongson-3A5000 LS7A1000 machine"; | 79 | loongarch_acpi_setup(lvms); |
| 53 | mc->init = loongarch_init; | 80 | + virt_fdt_setup(lvms); |
| 54 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | 81 | } |
| 55 | mc->block_default_type = IF_VIRTIO; | 82 | |
| 56 | mc->default_boot_order = "c"; | 83 | static void virt_powerdown_req(Notifier *notifier, void *opaque) |
| 57 | mc->no_cdrom = 1; | 84 | @@ -XXX,XX +XXX,XX @@ static DeviceState *create_platform_bus(DeviceState *pch_pic) |
| 58 | + mc->get_hotplug_handler = virt_machine_get_hotplug_handler; | 85 | } |
| 59 | + hc->plug = loongarch_machine_device_plug_cb; | 86 | |
| 60 | 87 | static void virt_devices_init(DeviceState *pch_pic, | |
| 61 | object_class_property_add(oc, "acpi", "OnOffAuto", | 88 | - LoongArchVirtMachineState *lvms, |
| 62 | loongarch_get_acpi, loongarch_set_acpi, | 89 | - uint32_t *pch_pic_phandle, |
| 63 | @@ -XXX,XX +XXX,XX @@ static const TypeInfo loongarch_machine_types[] = { | 90 | - uint32_t *pch_msi_phandle) |
| 64 | .instance_size = sizeof(LoongArchMachineState), | 91 | + LoongArchVirtMachineState *lvms) |
| 65 | .class_init = loongarch_class_init, | 92 | { |
| 66 | .instance_init = loongarch_machine_initfn, | 93 | MachineClass *mc = MACHINE_GET_CLASS(lvms); |
| 67 | + .interfaces = (InterfaceInfo[]) { | 94 | DeviceState *gpex_dev; |
| 68 | + { TYPE_HOTPLUG_HANDLER }, | 95 | @@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic, |
| 69 | + { } | 96 | gpex_set_irq_num(GPEX_HOST(gpex_dev), i, 16 + i); |
| 70 | + }, | 97 | } |
| 71 | } | 98 | |
| 72 | }; | 99 | - /* Add pcie node */ |
| 73 | 100 | - fdt_add_pcie_node(lvms, pch_pic_phandle, pch_msi_phandle); | |
| 101 | - | ||
| 102 | /* | ||
| 103 | * Create uart fdt node in reverse order so that they appear | ||
| 104 | * in the finished device tree lowest address first | ||
| 105 | @@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic, | ||
| 106 | serial_mm_init(get_system_memory(), base, 0, | ||
| 107 | qdev_get_gpio_in(pch_pic, irq), | ||
| 108 | 115200, serial_hd(i), DEVICE_LITTLE_ENDIAN); | ||
| 109 | - fdt_add_uart_node(lvms, pch_pic_phandle, base, irq, i == 0); | ||
| 110 | } | ||
| 111 | |||
| 112 | /* Network init */ | ||
| 113 | @@ -XXX,XX +XXX,XX @@ static void virt_devices_init(DeviceState *pch_pic, | ||
| 114 | sysbus_create_simple("ls7a_rtc", VIRT_RTC_REG_BASE, | ||
| 115 | qdev_get_gpio_in(pch_pic, | ||
| 116 | VIRT_RTC_IRQ - VIRT_GSI_BASE)); | ||
| 117 | - fdt_add_rtc_node(lvms, pch_pic_phandle); | ||
| 118 | - fdt_add_ged_reset(lvms); | ||
| 119 | |||
| 120 | /* acpi ged */ | ||
| 121 | lvms->acpi_ged = create_acpi_ged(pch_pic, lvms); | ||
| 122 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) | ||
| 123 | CPULoongArchState *env; | ||
| 124 | CPUState *cpu_state; | ||
| 125 | int cpu, pin, i, start, num; | ||
| 126 | - uint32_t cpuintc_phandle, eiointc_phandle, pch_pic_phandle, pch_msi_phandle; | ||
| 127 | |||
| 128 | /* | ||
| 129 | * Extended IRQ model. | ||
| 130 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) | ||
| 131 | memory_region_add_subregion(&lvms->system_iocsr, MAIL_SEND_ADDR, | ||
| 132 | sysbus_mmio_get_region(SYS_BUS_DEVICE(ipi), 1)); | ||
| 133 | |||
| 134 | - /* Add cpu interrupt-controller */ | ||
| 135 | - fdt_add_cpuic_node(lvms, &cpuintc_phandle); | ||
| 136 | - | ||
| 137 | for (cpu = 0; cpu < ms->smp.cpus; cpu++) { | ||
| 138 | cpu_state = qemu_get_cpu(cpu); | ||
| 139 | cpudev = DEVICE(cpu_state); | ||
| 140 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) | ||
| 141 | } | ||
| 142 | } | ||
| 143 | |||
| 144 | - /* Add Extend I/O Interrupt Controller node */ | ||
| 145 | - fdt_add_eiointc_node(lvms, &cpuintc_phandle, &eiointc_phandle); | ||
| 146 | - | ||
| 147 | pch_pic = qdev_new(TYPE_LOONGARCH_PIC); | ||
| 148 | num = VIRT_PCH_PIC_IRQ_NUM; | ||
| 149 | qdev_prop_set_uint32(pch_pic, "pch_pic_irq_num", num); | ||
| 150 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) | ||
| 151 | qdev_connect_gpio_out(DEVICE(d), i, qdev_get_gpio_in(extioi, i)); | ||
| 152 | } | ||
| 153 | |||
| 154 | - /* Add PCH PIC node */ | ||
| 155 | - fdt_add_pch_pic_node(lvms, &eiointc_phandle, &pch_pic_phandle); | ||
| 156 | - | ||
| 157 | pch_msi = qdev_new(TYPE_LOONGARCH_PCH_MSI); | ||
| 158 | start = num; | ||
| 159 | num = EXTIOI_IRQS - start; | ||
| 160 | @@ -XXX,XX +XXX,XX @@ static void virt_irq_init(LoongArchVirtMachineState *lvms) | ||
| 161 | qdev_get_gpio_in(extioi, i + start)); | ||
| 162 | } | ||
| 163 | |||
| 164 | - /* Add PCH MSI node */ | ||
| 165 | - fdt_add_pch_msi_node(lvms, &eiointc_phandle, &pch_msi_phandle); | ||
| 166 | - | ||
| 167 | - virt_devices_init(pch_pic, lvms, &pch_pic_phandle, &pch_msi_phandle); | ||
| 168 | + virt_devices_init(pch_pic, lvms); | ||
| 169 | } | ||
| 170 | |||
| 171 | static void virt_firmware_init(LoongArchVirtMachineState *lvms) | ||
| 172 | @@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine) | ||
| 173 | cpu_model = LOONGARCH_CPU_TYPE_NAME("la464"); | ||
| 174 | } | ||
| 175 | |||
| 176 | - create_fdt(lvms); | ||
| 177 | - | ||
| 178 | /* Create IOCSR space */ | ||
| 179 | memory_region_init_io(&lvms->system_iocsr, OBJECT(machine), NULL, | ||
| 180 | machine, "iocsr", UINT64_MAX); | ||
| 181 | @@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine) | ||
| 182 | lacpu = LOONGARCH_CPU(cpu); | ||
| 183 | lacpu->phy_id = machine->possible_cpus->cpus[i].arch_id; | ||
| 184 | } | ||
| 185 | - fdt_add_cpu_nodes(lvms); | ||
| 186 | - fdt_add_memory_nodes(machine); | ||
| 187 | fw_cfg_add_memory(machine); | ||
| 188 | |||
| 189 | /* Node0 memory */ | ||
| 190 | @@ -XXX,XX +XXX,XX @@ static void virt_init(MachineState *machine) | ||
| 191 | memmap_table, | ||
| 192 | sizeof(struct memmap_entry) * (memmap_entries)); | ||
| 193 | } | ||
| 194 | - fdt_add_fw_cfg_node(lvms); | ||
| 195 | - fdt_add_flash_node(lvms); | ||
| 196 | |||
| 197 | /* Initialize the IO interrupt subsystem */ | ||
| 198 | virt_irq_init(lvms); | ||
| 199 | - platform_bus_add_all_fdt_nodes(machine->fdt, "/platic", | ||
| 200 | - VIRT_PLATFORM_BUS_BASEADDRESS, | ||
| 201 | - VIRT_PLATFORM_BUS_SIZE, | ||
| 202 | - VIRT_PLATFORM_BUS_IRQ); | ||
| 203 | lvms->machine_done.notify = virt_done; | ||
| 204 | qemu_add_machine_init_done_notifier(&lvms->machine_done); | ||
| 205 | /* connect powerdown request */ | ||
| 206 | lvms->powerdown_notifier.notify = virt_powerdown_req; | ||
| 207 | qemu_register_powerdown_notifier(&lvms->powerdown_notifier); | ||
| 208 | |||
| 209 | - /* | ||
| 210 | - * Since lowmem region starts from 0 and Linux kernel legacy start address | ||
| 211 | - * at 2 MiB, FDT base address is located at 1 MiB to avoid NULL pointer | ||
| 212 | - * access. FDT size limit with 1 MiB. | ||
| 213 | - * Put the FDT into the memory map as a ROM image: this will ensure | ||
| 214 | - * the FDT is copied again upon reset, even if addr points into RAM. | ||
| 215 | - */ | ||
| 216 | - qemu_fdt_dumpdtb(machine->fdt, lvms->fdt_size); | ||
| 217 | - rom_add_blob_fixed_as("fdt", machine->fdt, lvms->fdt_size, FDT_BASE, | ||
| 218 | - &address_space_memory); | ||
| 219 | - qemu_register_reset_nosnapshotload(qemu_fdt_randomize_seeds, | ||
| 220 | - rom_ptr_for_as(&address_space_memory, FDT_BASE, lvms->fdt_size)); | ||
| 221 | - | ||
| 222 | lvms->bootinfo.ram_size = ram_size; | ||
| 223 | loongarch_load_kernel(machine, &lvms->bootinfo); | ||
| 224 | } | ||
| 74 | -- | 225 | -- |
| 75 | 2.31.1 | 226 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | For CPU object, possible_cpu_arch_ids() function is used rather than |
|---|---|---|---|
| 2 | smp.cpus. With command -smp x, -device la464-loongarch-cpu, smp.cpus | ||
| 3 | is not accurate for all possible CPU objects, possible_cpu_arch_ids() | ||
| 4 | is used here. | ||
| 2 | 5 | ||
| 3 | Add RAMFB device to dynamic_sysbus_devices list so that it can be | 6 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | hotpluged to the machine. | 7 | Reviewed-by: Bibo Mao <maobibo@loongson.cn> |
| 5 | |||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | ||
| 7 | Acked-by: Song Gao <gaosong@loongson.cn> | ||
| 8 | Message-Id: <20220908094623.73051-7-yangxiaojuan@loongson.cn> | ||
| 9 | Signed-off-by: Song Gao <gaosong@loongson.cn> | ||
| 10 | --- | 8 | --- |
| 11 | hw/loongarch/virt.c | 2 ++ | 9 | hw/loongarch/virt.c | 39 +++++++++++++++++++++++++-------------- |
| 12 | 1 file changed, 2 insertions(+) | 10 | 1 file changed, 25 insertions(+), 14 deletions(-) |
| 13 | 11 | ||
| 14 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 12 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c |
| 15 | index XXXXXXX..XXXXXXX 100644 | 13 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/hw/loongarch/virt.c | 14 | --- a/hw/loongarch/virt.c |
| 17 | +++ b/hw/loongarch/virt.c | 15 | +++ b/hw/loongarch/virt.c |
| 18 | @@ -XXX,XX +XXX,XX @@ | 16 | @@ -XXX,XX +XXX,XX @@ static void create_fdt(LoongArchVirtMachineState *lvms) |
| 19 | #include <libfdt.h> | 17 | static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms) |
| 20 | #include "hw/core/sysbus-fdt.h" | ||
| 21 | #include "hw/platform-bus.h" | ||
| 22 | +#include "hw/display/ramfb.h" | ||
| 23 | |||
| 24 | static void create_fdt(LoongArchMachineState *lams) | ||
| 25 | { | 18 | { |
| 26 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | 19 | int num; |
| 27 | NULL, NULL); | 20 | - const MachineState *ms = MACHINE(lvms); |
| 28 | object_class_property_set_description(oc, "acpi", | 21 | - int smp_cpus = ms->smp.cpus; |
| 29 | "Enable ACPI"); | 22 | + MachineState *ms = MACHINE(lvms); |
| 30 | + machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); | 23 | + MachineClass *mc = MACHINE_GET_CLASS(ms); |
| 24 | + const CPUArchIdList *possible_cpus; | ||
| 25 | + LoongArchCPU *cpu; | ||
| 26 | + CPUState *cs; | ||
| 27 | + char *nodename, *map_path; | ||
| 28 | |||
| 29 | qemu_fdt_add_subnode(ms->fdt, "/cpus"); | ||
| 30 | qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#address-cells", 0x1); | ||
| 31 | qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#size-cells", 0x0); | ||
| 32 | |||
| 33 | /* cpu nodes */ | ||
| 34 | - for (num = smp_cpus - 1; num >= 0; num--) { | ||
| 35 | - char *nodename = g_strdup_printf("/cpus/cpu@%d", num); | ||
| 36 | - LoongArchCPU *cpu = LOONGARCH_CPU(qemu_get_cpu(num)); | ||
| 37 | - CPUState *cs = CPU(cpu); | ||
| 38 | + possible_cpus = mc->possible_cpu_arch_ids(ms); | ||
| 39 | + for (num = 0; num < possible_cpus->len; num++) { | ||
| 40 | + cs = possible_cpus->cpus[num].cpu; | ||
| 41 | + if (cs == NULL) { | ||
| 42 | + continue; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + nodename = g_strdup_printf("/cpus/cpu@%d", num); | ||
| 46 | + cpu = LOONGARCH_CPU(cs); | ||
| 47 | |||
| 48 | qemu_fdt_add_subnode(ms->fdt, nodename); | ||
| 49 | qemu_fdt_setprop_string(ms->fdt, nodename, "device_type", "cpu"); | ||
| 50 | qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", | ||
| 51 | cpu->dtb_compatible); | ||
| 52 | - if (ms->possible_cpus->cpus[cs->cpu_index].props.has_node_id) { | ||
| 53 | + if (possible_cpus->cpus[num].props.has_node_id) { | ||
| 54 | qemu_fdt_setprop_cell(ms->fdt, nodename, "numa-node-id", | ||
| 55 | - ms->possible_cpus->cpus[cs->cpu_index].props.node_id); | ||
| 56 | + possible_cpus->cpus[num].props.node_id); | ||
| 57 | } | ||
| 58 | qemu_fdt_setprop_cell(ms->fdt, nodename, "reg", num); | ||
| 59 | qemu_fdt_setprop_cell(ms->fdt, nodename, "phandle", | ||
| 60 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms) | ||
| 61 | |||
| 62 | /*cpu map */ | ||
| 63 | qemu_fdt_add_subnode(ms->fdt, "/cpus/cpu-map"); | ||
| 64 | + for (num = 0; num < possible_cpus->len; num++) { | ||
| 65 | + cs = possible_cpus->cpus[num].cpu; | ||
| 66 | + if (cs == NULL) { | ||
| 67 | + continue; | ||
| 68 | + } | ||
| 69 | |||
| 70 | - for (num = smp_cpus - 1; num >= 0; num--) { | ||
| 71 | - char *cpu_path = g_strdup_printf("/cpus/cpu@%d", num); | ||
| 72 | - char *map_path; | ||
| 73 | - | ||
| 74 | + nodename = g_strdup_printf("/cpus/cpu@%d", num); | ||
| 75 | if (ms->smp.threads > 1) { | ||
| 76 | map_path = g_strdup_printf( | ||
| 77 | "/cpus/cpu-map/socket%d/core%d/thread%d", | ||
| 78 | @@ -XXX,XX +XXX,XX @@ static void fdt_add_cpu_nodes(const LoongArchVirtMachineState *lvms) | ||
| 79 | num % ms->smp.cores); | ||
| 80 | } | ||
| 81 | qemu_fdt_add_path(ms->fdt, map_path); | ||
| 82 | - qemu_fdt_setprop_phandle(ms->fdt, map_path, "cpu", cpu_path); | ||
| 83 | + qemu_fdt_setprop_phandle(ms->fdt, map_path, "cpu", nodename); | ||
| 84 | |||
| 85 | g_free(map_path); | ||
| 86 | - g_free(cpu_path); | ||
| 87 | + g_free(nodename); | ||
| 88 | } | ||
| 31 | } | 89 | } |
| 32 | 90 | ||
| 33 | static const TypeInfo loongarch_machine_types[] = { | ||
| 34 | -- | 91 | -- |
| 35 | 2.31.1 | 92 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Like LBT feature, add type OnOffAuto for LSX feature setting. Also |
|---|---|---|---|
| 2 | add LSX feature detection with new VM ioctl command, fallback to old | ||
| 3 | method if it is not supported. | ||
| 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: Bibo Mao <maobibo@loongson.cn> |
| 7 | --- | ||
| 8 | target/loongarch/cpu.c | 38 +++++++++++++++------------ | ||
| 9 | target/loongarch/cpu.h | 2 ++ | ||
| 10 | target/loongarch/kvm/kvm.c | 54 ++++++++++++++++++++++++++++++++++++++ | ||
| 11 | 3 files changed, 77 insertions(+), 17 deletions(-) | ||
| 5 | 12 | ||
| 6 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 13 | diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.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 | 14 | index XXXXXXX..XXXXXXX 100644 |
| 19 | --- a/hw/loongarch/Kconfig | 15 | --- a/target/loongarch/cpu.c |
| 20 | +++ b/hw/loongarch/Kconfig | 16 | +++ b/target/loongarch/cpu.c |
| 21 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 17 | @@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj) |
| 22 | select SERIAL | 18 | { |
| 23 | select SERIAL_ISA | 19 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); |
| 24 | select VIRTIO_PCI | 20 | CPULoongArchState *env = &cpu->env; |
| 25 | + select PLATFORM_BUS | 21 | + uint32_t data = 0; |
| 26 | select LOONGARCH_IPI | 22 | int i; |
| 27 | select LOONGARCH_PCH_PIC | 23 | |
| 28 | select LOONGARCH_PCH_MSI | 24 | for (i = 0; i < 21; i++) { |
| 29 | diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c | 25 | @@ -XXX,XX +XXX,XX @@ static void loongarch_la464_initfn(Object *obj) |
| 26 | cpu->dtb_compatible = "loongarch,Loongson-3A5000"; | ||
| 27 | env->cpucfg[0] = 0x14c010; /* PRID */ | ||
| 28 | |||
| 29 | - uint32_t data = 0; | ||
| 30 | data = FIELD_DP32(data, CPUCFG1, ARCH, 2); | ||
| 31 | data = FIELD_DP32(data, CPUCFG1, PGMMU, 1); | ||
| 32 | data = FIELD_DP32(data, CPUCFG1, IOCSR, 1); | ||
| 33 | @@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj) | ||
| 34 | { | ||
| 35 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 36 | CPULoongArchState *env = &cpu->env; | ||
| 37 | - | ||
| 38 | + uint32_t data = 0; | ||
| 39 | int i; | ||
| 40 | |||
| 41 | for (i = 0; i < 21; i++) { | ||
| 42 | @@ -XXX,XX +XXX,XX @@ static void loongarch_la132_initfn(Object *obj) | ||
| 43 | cpu->dtb_compatible = "loongarch,Loongson-1C103"; | ||
| 44 | env->cpucfg[0] = 0x148042; /* PRID */ | ||
| 45 | |||
| 46 | - uint32_t data = 0; | ||
| 47 | data = FIELD_DP32(data, CPUCFG1, ARCH, 1); /* LA32 */ | ||
| 48 | data = FIELD_DP32(data, CPUCFG1, PGMMU, 1); | ||
| 49 | data = FIELD_DP32(data, CPUCFG1, IOCSR, 1); | ||
| 50 | @@ -XXX,XX +XXX,XX @@ static void loongarch_cpu_realizefn(DeviceState *dev, Error **errp) | ||
| 51 | |||
| 52 | static bool loongarch_get_lsx(Object *obj, Error **errp) | ||
| 53 | { | ||
| 54 | - LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 55 | - bool ret; | ||
| 56 | - | ||
| 57 | - if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) { | ||
| 58 | - ret = true; | ||
| 59 | - } else { | ||
| 60 | - ret = false; | ||
| 61 | - } | ||
| 62 | - return ret; | ||
| 63 | + return LOONGARCH_CPU(obj)->lsx != ON_OFF_AUTO_OFF; | ||
| 64 | } | ||
| 65 | |||
| 66 | static void loongarch_set_lsx(Object *obj, bool value, Error **errp) | ||
| 67 | { | ||
| 68 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 69 | + uint32_t val; | ||
| 70 | |||
| 71 | - if (value) { | ||
| 72 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1); | ||
| 73 | - } else { | ||
| 74 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0); | ||
| 75 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0); | ||
| 76 | + cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; | ||
| 77 | + if (kvm_enabled()) { | ||
| 78 | + /* kvm feature detection in function kvm_arch_init_vcpu */ | ||
| 79 | + return; | ||
| 80 | } | ||
| 81 | + | ||
| 82 | + /* LSX feature detection in TCG mode */ | ||
| 83 | + val = cpu->env.cpucfg[2]; | ||
| 84 | + if (cpu->lsx == ON_OFF_AUTO_ON) { | ||
| 85 | + if (FIELD_EX32(val, CPUCFG2, LSX) == 0) { | ||
| 86 | + error_setg(errp, "Failed to enable LSX in TCG mode"); | ||
| 87 | + return; | ||
| 88 | + } | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value); | ||
| 92 | } | ||
| 93 | |||
| 94 | static bool loongarch_get_lasx(Object *obj, Error **errp) | ||
| 95 | @@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj) | ||
| 96 | { | ||
| 97 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 98 | |||
| 99 | + cpu->lsx = ON_OFF_AUTO_AUTO; | ||
| 100 | object_property_add_bool(obj, "lsx", loongarch_get_lsx, | ||
| 101 | loongarch_set_lsx); | ||
| 102 | object_property_add_bool(obj, "lasx", loongarch_get_lasx, | ||
| 103 | @@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj) | ||
| 104 | |||
| 105 | } else { | ||
| 106 | cpu->lbt = ON_OFF_AUTO_OFF; | ||
| 107 | + cpu->pmu = ON_OFF_AUTO_OFF; | ||
| 108 | } | ||
| 109 | } | ||
| 110 | |||
| 111 | diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h | ||
| 30 | index XXXXXXX..XXXXXXX 100644 | 112 | index XXXXXXX..XXXXXXX 100644 |
| 31 | --- a/hw/loongarch/virt.c | 113 | --- a/target/loongarch/cpu.h |
| 32 | +++ b/hw/loongarch/virt.c | 114 | +++ b/target/loongarch/cpu.h |
| 33 | @@ -XXX,XX +XXX,XX @@ | 115 | @@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB; |
| 34 | #include "hw/mem/nvdimm.h" | 116 | #endif |
| 35 | #include "sysemu/device_tree.h" | 117 | |
| 36 | #include <libfdt.h> | 118 | enum loongarch_features { |
| 37 | +#include "hw/core/sysbus-fdt.h" | 119 | + LOONGARCH_FEATURE_LSX, |
| 38 | +#include "hw/platform-bus.h" | 120 | LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */ |
| 39 | 121 | LOONGARCH_FEATURE_PMU, | |
| 40 | static void create_fdt(LoongArchMachineState *lams) | 122 | }; |
| 41 | { | 123 | @@ -XXX,XX +XXX,XX @@ struct ArchCPU { |
| 42 | @@ -XXX,XX +XXX,XX @@ static DeviceState *create_acpi_ged(DeviceState *pch_pic, LoongArchMachineState | 124 | uint32_t phy_id; |
| 43 | return dev; | 125 | OnOffAuto lbt; |
| 44 | } | 126 | OnOffAuto pmu; |
| 45 | 127 | + OnOffAuto lsx; | |
| 46 | +static DeviceState *create_platform_bus(DeviceState *pch_pic) | 128 | |
| 129 | /* 'compatible' string for this CPU for Linux device trees */ | ||
| 130 | const char *dtb_compatible; | ||
| 131 | diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c | ||
| 132 | index XXXXXXX..XXXXXXX 100644 | ||
| 133 | --- a/target/loongarch/kvm/kvm.c | ||
| 134 | +++ b/target/loongarch/kvm/kvm.c | ||
| 135 | @@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature) | ||
| 136 | { | ||
| 137 | int ret; | ||
| 138 | struct kvm_device_attr attr; | ||
| 139 | + uint64_t val; | ||
| 140 | |||
| 141 | switch (feature) { | ||
| 142 | + case LOONGARCH_FEATURE_LSX: | ||
| 143 | + attr.group = KVM_LOONGARCH_VM_FEAT_CTRL; | ||
| 144 | + attr.attr = KVM_LOONGARCH_VM_FEAT_LSX; | ||
| 145 | + ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr); | ||
| 146 | + if (ret == 0) { | ||
| 147 | + return true; | ||
| 148 | + } | ||
| 149 | + | ||
| 150 | + /* Fallback to old kernel detect interface */ | ||
| 151 | + val = 0; | ||
| 152 | + attr.group = KVM_LOONGARCH_VCPU_CPUCFG; | ||
| 153 | + /* Cpucfg2 */ | ||
| 154 | + attr.attr = 2; | ||
| 155 | + attr.addr = (uint64_t)&val; | ||
| 156 | + ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr); | ||
| 157 | + if (!ret) { | ||
| 158 | + ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr); | ||
| 159 | + if (ret) { | ||
| 160 | + return false; | ||
| 161 | + } | ||
| 162 | + | ||
| 163 | + ret = FIELD_EX32((uint32_t)val, CPUCFG2, LSX); | ||
| 164 | + return (ret != 0); | ||
| 165 | + } | ||
| 166 | + return false; | ||
| 167 | + | ||
| 168 | case LOONGARCH_FEATURE_LBT: | ||
| 169 | /* | ||
| 170 | * Return all if all the LBT features are supported such as: | ||
| 171 | @@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature) | ||
| 172 | return false; | ||
| 173 | } | ||
| 174 | |||
| 175 | +static int kvm_cpu_check_lsx(CPUState *cs, Error **errp) | ||
| 47 | +{ | 176 | +{ |
| 48 | + DeviceState *dev; | 177 | + CPULoongArchState *env = cpu_env(cs); |
| 49 | + SysBusDevice *sysbus; | 178 | + LoongArchCPU *cpu = LOONGARCH_CPU(cs); |
| 50 | + int i, irq; | 179 | + bool kvm_supported; |
| 51 | + MemoryRegion *sysmem = get_system_memory(); | 180 | + |
| 52 | + | 181 | + kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LSX); |
| 53 | + dev = qdev_new(TYPE_PLATFORM_BUS_DEVICE); | 182 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 0); |
| 54 | + dev->id = g_strdup(TYPE_PLATFORM_BUS_DEVICE); | 183 | + if (cpu->lsx == ON_OFF_AUTO_ON) { |
| 55 | + qdev_prop_set_uint32(dev, "num_irqs", VIRT_PLATFORM_BUS_NUM_IRQS); | 184 | + if (kvm_supported) { |
| 56 | + qdev_prop_set_uint32(dev, "mmio_size", VIRT_PLATFORM_BUS_SIZE); | 185 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1); |
| 57 | + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); | 186 | + } else { |
| 58 | + | 187 | + error_setg(errp, "'lsx' feature not supported by KVM on this host"); |
| 59 | + sysbus = SYS_BUS_DEVICE(dev); | 188 | + return -ENOTSUP; |
| 60 | + for (i = 0; i < VIRT_PLATFORM_BUS_NUM_IRQS; i++) { | 189 | + } |
| 61 | + irq = VIRT_PLATFORM_BUS_IRQ - PCH_PIC_IRQ_OFFSET + i; | 190 | + } else if ((cpu->lsx == ON_OFF_AUTO_AUTO) && kvm_supported) { |
| 62 | + sysbus_connect_irq(sysbus, i, qdev_get_gpio_in(pch_pic, irq)); | 191 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LSX, 1); |
| 63 | + } | 192 | + } |
| 64 | + | 193 | + |
| 65 | + memory_region_add_subregion(sysmem, | 194 | + return 0; |
| 66 | + VIRT_PLATFORM_BUS_BASEADDRESS, | ||
| 67 | + sysbus_mmio_get_region(sysbus, 0)); | ||
| 68 | + return dev; | ||
| 69 | +} | 195 | +} |
| 70 | + | 196 | + |
| 71 | static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState *lams) | 197 | static int kvm_cpu_check_lbt(CPUState *cs, Error **errp) |
| 72 | { | 198 | { |
| 73 | DeviceState *gpex_dev; | 199 | CPULoongArchState *env = cpu_env(cs); |
| 74 | @@ -XXX,XX +XXX,XX @@ static void loongarch_devices_init(DeviceState *pch_pic, LoongArchMachineState * | 200 | @@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs) |
| 75 | memory_region_add_subregion(get_system_memory(), PM_BASE, pm_mem); | 201 | brk_insn = val; |
| 76 | /* acpi ged */ | 202 | } |
| 77 | lams->acpi_ged = create_acpi_ged(pch_pic, lams); | 203 | |
| 78 | + /* platform bus */ | 204 | + ret = kvm_cpu_check_lsx(cs, &local_err); |
| 79 | + lams->platform_bus_dev = create_platform_bus(pch_pic); | 205 | + if (ret < 0) { |
| 80 | } | 206 | + error_report_err(local_err); |
| 81 | 207 | + } | |
| 82 | static void loongarch_irq_init(LoongArchMachineState *lams) | 208 | + |
| 83 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | 209 | ret = kvm_cpu_check_lbt(cs, &local_err); |
| 84 | /* Initialize the IO interrupt subsystem */ | 210 | if (ret < 0) { |
| 85 | loongarch_irq_init(lams); | 211 | error_report_err(local_err); |
| 86 | fdt_add_irqchip_node(lams); | ||
| 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 | }; | ||
| 104 | |||
| 105 | #define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt") | ||
| 106 | diff --git a/include/hw/pci-host/ls7a.h b/include/hw/pci-host/ls7a.h | ||
| 107 | index XXXXXXX..XXXXXXX 100644 | ||
| 108 | --- a/include/hw/pci-host/ls7a.h | ||
| 109 | +++ b/include/hw/pci-host/ls7a.h | ||
| 110 | @@ -XXX,XX +XXX,XX @@ | ||
| 111 | #define VIRT_RTC_REG_BASE (VIRT_MISC_REG_BASE + 0x00050100) | ||
| 112 | #define VIRT_RTC_LEN 0x100 | ||
| 113 | #define VIRT_SCI_IRQ (PCH_PIC_IRQ_OFFSET + 4) | ||
| 114 | + | ||
| 115 | +#define VIRT_PLATFORM_BUS_BASEADDRESS 0x16000000 | ||
| 116 | +#define VIRT_PLATFORM_BUS_SIZE 0x2000000 | ||
| 117 | +#define VIRT_PLATFORM_BUS_NUM_IRQS 2 | ||
| 118 | +#define VIRT_PLATFORM_BUS_IRQ 69 | ||
| 119 | #endif | ||
| 120 | -- | 212 | -- |
| 121 | 2.31.1 | 213 | 2.43.5 | diff view generated by jsdifflib |
| 1 | From: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 1 | Like LSX feature, add type OnOffAuto for LASX feature setting. |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Add hotplug/unplug interface for memory device. | 3 | Signed-off-by: Bibo Mao <maobibo@loongson.cn> |
| 4 | Reviewed-by: Bibo Mao <maobibo@loongson.cn> | ||
| 5 | --- | ||
| 6 | target/loongarch/cpu.c | 50 +++++++++++++++++++++++------------ | ||
| 7 | target/loongarch/cpu.h | 2 ++ | ||
| 8 | target/loongarch/kvm/kvm.c | 53 ++++++++++++++++++++++++++++++++++++++ | ||
| 9 | 3 files changed, 89 insertions(+), 16 deletions(-) | ||
| 4 | 10 | ||
| 5 | Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn> | 11 | diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.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/target/loongarch/cpu.c |
| 18 | +++ b/hw/loongarch/Kconfig | 14 | +++ b/target/loongarch/cpu.c |
| 19 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 15 | @@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp) |
| 20 | select PCI_EXPRESS_GENERIC_BRIDGE | 16 | uint32_t val; |
| 21 | imply VIRTIO_VGA | 17 | |
| 22 | imply PCI_DEVICES | 18 | cpu->lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; |
| 23 | + imply NVDIMM | 19 | + if (cpu->lsx == ON_OFF_AUTO_OFF) { |
| 24 | select ISA_BUS | 20 | + cpu->lasx = ON_OFF_AUTO_OFF; |
| 25 | select SERIAL | 21 | + if (cpu->lasx == ON_OFF_AUTO_ON) { |
| 26 | select SERIAL_ISA | 22 | + error_setg(errp, "Failed to disable LSX since LASX is enabled"); |
| 27 | @@ -XXX,XX +XXX,XX @@ config LOONGARCH_VIRT | 23 | + return; |
| 28 | select ACPI_PCI | 24 | + } |
| 29 | select ACPI_HW_REDUCED | ||
| 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 | + } | 25 | + } |
| 45 | + | 26 | + |
| 46 | acpi_table_end(linker, &table); | 27 | if (kvm_enabled()) { |
| 28 | /* kvm feature detection in function kvm_arch_init_vcpu */ | ||
| 29 | return; | ||
| 30 | @@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp) | ||
| 31 | error_setg(errp, "Failed to enable LSX in TCG mode"); | ||
| 32 | return; | ||
| 33 | } | ||
| 34 | + } else { | ||
| 35 | + cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, 0); | ||
| 36 | + val = cpu->env.cpucfg[2]; | ||
| 37 | } | ||
| 38 | |||
| 39 | cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LSX, value); | ||
| 40 | @@ -XXX,XX +XXX,XX @@ static void loongarch_set_lsx(Object *obj, bool value, Error **errp) | ||
| 41 | |||
| 42 | static bool loongarch_get_lasx(Object *obj, Error **errp) | ||
| 43 | { | ||
| 44 | - LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 45 | - bool ret; | ||
| 46 | - | ||
| 47 | - if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) { | ||
| 48 | - ret = true; | ||
| 49 | - } else { | ||
| 50 | - ret = false; | ||
| 51 | - } | ||
| 52 | - return ret; | ||
| 53 | + return LOONGARCH_CPU(obj)->lasx != ON_OFF_AUTO_OFF; | ||
| 47 | } | 54 | } |
| 48 | 55 | ||
| 49 | @@ -XXX,XX +XXX,XX @@ static void build_uart_device_aml(Aml *table) | 56 | static void loongarch_set_lasx(Object *obj, bool value, Error **errp) |
| 50 | aml_append(table, scope); | 57 | { |
| 58 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 59 | + uint32_t val; | ||
| 60 | |||
| 61 | - if (value) { | ||
| 62 | - if (!FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) { | ||
| 63 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1); | ||
| 64 | - } | ||
| 65 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 1); | ||
| 66 | - } else { | ||
| 67 | - cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0); | ||
| 68 | + cpu->lasx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; | ||
| 69 | + if ((cpu->lsx == ON_OFF_AUTO_OFF) && (cpu->lasx == ON_OFF_AUTO_ON)) { | ||
| 70 | + error_setg(errp, "Failed to enable LASX since lSX is disabled"); | ||
| 71 | + return; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + if (kvm_enabled()) { | ||
| 75 | + /* kvm feature detection in function kvm_arch_init_vcpu */ | ||
| 76 | + return; | ||
| 77 | } | ||
| 78 | + | ||
| 79 | + /* LASX feature detection in TCG mode */ | ||
| 80 | + val = cpu->env.cpucfg[2]; | ||
| 81 | + if (cpu->lasx == ON_OFF_AUTO_ON) { | ||
| 82 | + if (FIELD_EX32(val, CPUCFG2, LASX) == 0) { | ||
| 83 | + error_setg(errp, "Failed to enable LASX in TCG mode"); | ||
| 84 | + return; | ||
| 85 | + } | ||
| 86 | + } | ||
| 87 | + | ||
| 88 | + cpu->env.cpucfg[2] = FIELD_DP32(val, CPUCFG2, LASX, value); | ||
| 51 | } | 89 | } |
| 52 | 90 | ||
| 53 | +static void | 91 | static bool loongarch_get_lbt(Object *obj, Error **errp) |
| 54 | +build_la_ged_aml(Aml *dsdt, MachineState *machine) | 92 | @@ -XXX,XX +XXX,XX @@ void loongarch_cpu_post_init(Object *obj) |
| 93 | LoongArchCPU *cpu = LOONGARCH_CPU(obj); | ||
| 94 | |||
| 95 | cpu->lsx = ON_OFF_AUTO_AUTO; | ||
| 96 | + cpu->lasx = ON_OFF_AUTO_AUTO; | ||
| 97 | object_property_add_bool(obj, "lsx", loongarch_get_lsx, | ||
| 98 | loongarch_set_lsx); | ||
| 99 | object_property_add_bool(obj, "lasx", loongarch_get_lasx, | ||
| 100 | diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h | ||
| 101 | index XXXXXXX..XXXXXXX 100644 | ||
| 102 | --- a/target/loongarch/cpu.h | ||
| 103 | +++ b/target/loongarch/cpu.h | ||
| 104 | @@ -XXX,XX +XXX,XX @@ typedef struct LoongArchTLB LoongArchTLB; | ||
| 105 | |||
| 106 | enum loongarch_features { | ||
| 107 | LOONGARCH_FEATURE_LSX, | ||
| 108 | + LOONGARCH_FEATURE_LASX, | ||
| 109 | LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */ | ||
| 110 | LOONGARCH_FEATURE_PMU, | ||
| 111 | }; | ||
| 112 | @@ -XXX,XX +XXX,XX @@ struct ArchCPU { | ||
| 113 | OnOffAuto lbt; | ||
| 114 | OnOffAuto pmu; | ||
| 115 | OnOffAuto lsx; | ||
| 116 | + OnOffAuto lasx; | ||
| 117 | |||
| 118 | /* 'compatible' string for this CPU for Linux device trees */ | ||
| 119 | const char *dtb_compatible; | ||
| 120 | diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c | ||
| 121 | index XXXXXXX..XXXXXXX 100644 | ||
| 122 | --- a/target/loongarch/kvm/kvm.c | ||
| 123 | +++ b/target/loongarch/kvm/kvm.c | ||
| 124 | @@ -XXX,XX +XXX,XX @@ static bool kvm_feature_supported(CPUState *cs, enum loongarch_features feature) | ||
| 125 | } | ||
| 126 | return false; | ||
| 127 | |||
| 128 | + case LOONGARCH_FEATURE_LASX: | ||
| 129 | + attr.group = KVM_LOONGARCH_VM_FEAT_CTRL; | ||
| 130 | + attr.attr = KVM_LOONGARCH_VM_FEAT_LASX; | ||
| 131 | + ret = kvm_vm_ioctl(kvm_state, KVM_HAS_DEVICE_ATTR, &attr); | ||
| 132 | + if (ret == 0) { | ||
| 133 | + return true; | ||
| 134 | + } | ||
| 135 | + | ||
| 136 | + /* Fallback to old kernel detect interface */ | ||
| 137 | + val = 0; | ||
| 138 | + attr.group = KVM_LOONGARCH_VCPU_CPUCFG; | ||
| 139 | + /* Cpucfg2 */ | ||
| 140 | + attr.attr = 2; | ||
| 141 | + attr.addr = (uint64_t)&val; | ||
| 142 | + ret = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, &attr); | ||
| 143 | + if (!ret) { | ||
| 144 | + ret = kvm_vcpu_ioctl(cs, KVM_GET_DEVICE_ATTR, &attr); | ||
| 145 | + if (ret) { | ||
| 146 | + return false; | ||
| 147 | + } | ||
| 148 | + | ||
| 149 | + ret = FIELD_EX32((uint32_t)val, CPUCFG2, LASX); | ||
| 150 | + return (ret != 0); | ||
| 151 | + } | ||
| 152 | + return false; | ||
| 153 | + | ||
| 154 | case LOONGARCH_FEATURE_LBT: | ||
| 155 | /* | ||
| 156 | * Return all if all the LBT features are supported such as: | ||
| 157 | @@ -XXX,XX +XXX,XX @@ static int kvm_cpu_check_lsx(CPUState *cs, Error **errp) | ||
| 158 | return 0; | ||
| 159 | } | ||
| 160 | |||
| 161 | +static int kvm_cpu_check_lasx(CPUState *cs, Error **errp) | ||
| 55 | +{ | 162 | +{ |
| 56 | + uint32_t event; | 163 | + CPULoongArchState *env = cpu_env(cs); |
| 57 | + LoongArchMachineState *lams = LOONGARCH_MACHINE(machine); | 164 | + LoongArchCPU *cpu = LOONGARCH_CPU(cs); |
| 165 | + bool kvm_supported; | ||
| 58 | + | 166 | + |
| 59 | + build_ged_aml(dsdt, "\\_SB."GED_DEVICE, | 167 | + kvm_supported = kvm_feature_supported(cs, LOONGARCH_FEATURE_LASX); |
| 60 | + HOTPLUG_HANDLER(lams->acpi_ged), | 168 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 0); |
| 61 | + VIRT_SCI_IRQ, AML_SYSTEM_MEMORY, | 169 | + if (cpu->lasx == ON_OFF_AUTO_ON) { |
| 62 | + VIRT_GED_EVT_ADDR); | 170 | + if (kvm_supported) { |
| 63 | + event = object_property_get_uint(OBJECT(lams->acpi_ged), | 171 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1); |
| 64 | + "ged-event", &error_abort); | 172 | + } else { |
| 65 | + if (event & ACPI_GED_MEM_HOTPLUG_EVT) { | 173 | + error_setg(errp, "'lasx' feature not supported by KVM on host"); |
| 66 | + build_memory_hotplug_aml(dsdt, machine->ram_slots, "\\_SB", NULL, | 174 | + return -ENOTSUP; |
| 67 | + AML_SYSTEM_MEMORY, | 175 | + } |
| 68 | + VIRT_GED_MEM_ADDR); | 176 | + } else if ((cpu->lasx == ON_OFF_AUTO_AUTO) && kvm_supported) { |
| 177 | + env->cpucfg[2] = FIELD_DP32(env->cpucfg[2], CPUCFG2, LASX, 1); | ||
| 69 | + } | 178 | + } |
| 179 | + | ||
| 180 | + return 0; | ||
| 70 | +} | 181 | +} |
| 71 | + | 182 | + |
| 72 | /* build DSDT */ | 183 | static int kvm_cpu_check_lbt(CPUState *cs, Error **errp) |
| 73 | static void | ||
| 74 | build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | ||
| 75 | @@ -XXX,XX +XXX,XX @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine) | ||
| 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 | { | 184 | { |
| 101 | @@ -XXX,XX +XXX,XX @@ static void loongarch_init(MachineState *machine) | 185 | CPULoongArchState *env = cpu_env(cs); |
| 102 | machine->ram, offset, highram_size); | 186 | @@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs) |
| 103 | memory_region_add_subregion(address_space_mem, 0x90000000, &lams->highmem); | 187 | error_report_err(local_err); |
| 104 | memmap_add_entry(0x90000000, highram_size, 1); | 188 | } |
| 105 | + | 189 | |
| 106 | + /* initialize device memory address space */ | 190 | + ret = kvm_cpu_check_lasx(cs, &local_err); |
| 107 | + if (machine->ram_size < machine->maxram_size) { | 191 | + if (ret < 0) { |
| 108 | + machine->device_memory = g_malloc0(sizeof(*machine->device_memory)); | 192 | + error_report_err(local_err); |
| 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 | + } | 193 | + } |
| 133 | + | 194 | + |
| 134 | /* Add isa io region */ | 195 | ret = kvm_cpu_check_lbt(cs, &local_err); |
| 135 | memory_region_init_alias(&lams->isa_io, NULL, "isa-io", | 196 | if (ret < 0) { |
| 136 | get_system_io(), 0, VIRT_ISA_IO_SIZE); | 197 | error_report_err(local_err); |
| 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 | +} | ||
| 147 | + | ||
| 148 | +static void virt_mem_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, | ||
| 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 | { | ||
| 211 | @@ -XXX,XX +XXX,XX @@ static void loongarch_machine_device_plug_cb(HotplugHandler *hotplug_dev, | ||
| 212 | platform_bus_link_device(PLATFORM_BUS_DEVICE(lams->platform_bus_dev), | ||
| 213 | SYS_BUS_DEVICE(dev)); | ||
| 214 | } | ||
| 215 | + } else if (memhp_type_supported(dev)) { | ||
| 216 | + virt_mem_plug(hotplug_dev, dev, errp); | ||
| 217 | } | ||
| 218 | } | ||
| 219 | |||
| 220 | @@ -XXX,XX +XXX,XX @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, | ||
| 221 | { | ||
| 222 | MachineClass *mc = MACHINE_GET_CLASS(machine); | ||
| 223 | |||
| 224 | - if (device_is_dynamic_sysbus(mc, dev)) { | ||
| 225 | + if (device_is_dynamic_sysbus(mc, dev) || | ||
| 226 | + memhp_type_supported(dev)) { | ||
| 227 | return HOTPLUG_HANDLER(machine); | ||
| 228 | } | ||
| 229 | return NULL; | ||
| 230 | @@ -XXX,XX +XXX,XX @@ static void loongarch_class_init(ObjectClass *oc, void *data) | ||
| 231 | mc->no_cdrom = 1; | ||
| 232 | mc->get_hotplug_handler = virt_machine_get_hotplug_handler; | ||
| 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 | -- | 198 | -- |
| 241 | 2.31.1 | 199 | 2.43.5 | diff view generated by jsdifflib |