- fix compile error on loongarch
- hw/loongarch: fix cpu hotplug reset
- hw/loongarch/boot: Use warn_report when no kernel filename
- hw/loongarch: clean code
- hw/loongarch: Add KVM pch msi device support
- hw/loongarch: Add KVM pch pic device support
- hw/loongarch: Add KVM extioi device support
- hw/loongarch: Add KVM IPI device support
- hw/loongarch/virt: Update the ACPI table for hotplug cpu
- hw/loongarch/virt: Add basic CPU plug support
- hw/loongarch/virt: Add CPU topology support
- accel/kvm/kvm-all: Fixes the missing break in vCPU unpark logic
- gdbstub: Add helper function to unregister GDB register space
- physmem: Add helper function to destroy CPU AddressSpace
- hw/acpi: Update CPUs AML with cpu-(ctrl)dev change
- hw/acpi: Update ACPI GED framework to support vCPU Hotplug
- hw/acpi: Move CPU ctrl-dev MMIO region len macro to common header file
- accel/kvm: Extract common KVM vCPU {creation,parking} code
- target/loongarch: Add steal time support on migration
- linux-headers: loongarch: Add kvm_para.h and unistd_64.h
- target/loongarch/kvm: Implement LoongArch PMU extension
- target/loongarch: Implement lbt registers save/restore function
- target/loongarch: Add loongson binary translation feature
- sync loongarch linux-headers
- target/loongarch: Avoid bits shift exceeding width of bool type
- target/loongarch: Use explicit little-endian LD/ST API
- target/loongarch: fix -Werror=maybe-uninitialized false-positive
- target/loongarch: Support QMP dump-guest-memory
- target/loongarch/kvm: Add vCPU reset function
- target/loongarch: Add compatible support about VM reboot
- target/loongarch: Fix cpu_reset set wrong CSR_CRMD
- target/loongarch: Set CSR_PRCFG1 and CSR_PRCFG2 values
- target/loongarch: Remove avail_64 in trans_srai_w() and simplify it
- target/loongarch/kvm: Add software breakpoint support
- target/loongarch: Add loongarch vector property unconditionally
- target/loongarch/kvm: Fix VM recovery from disk failures
- target/loongarch: Put cpucfg operation before CSR register
- target/loongarch: Add TCG macro in structure CPUArchState
- hw/arm/virt-acpi-build.c: Migrate SPCR creation to common location
- hw/loongarch/virt: Add FDT table support with acpi ged pm register
- hw/loongarch/virt: Add description for virt machine type
- hw/loongarch: Add acpi SPCR table support
- hw/loongarch: virt: pass random seed to fdt
- hw/loongarch: virt: support up to 4 serial ports
- hw/loongarch: Remove default enable with VIRTIO_VGA device
- hw/loongarch: Fix length for lowram in ACPI SRAT
- hw/loongarch/virt: Remove unused assignment
- hw/loongarch: Change the tpm support by default
- hw/loongarch/boot.c: fix out-of-bound reading
- hw/loongarch/virt: Use MemTxAttrs interface for misc ops
- tests/libqos: Add loongarch virt machine node
- hw/loongarch: Remove minimum and default memory size
- hw/loongarch: Refine system dram memory region
- hw/loongarch: Refine fwcfg memory map
- hw/loongarch: Refine fadt memory table for numa memory
- hw/loongarch: Refine acpi srat table for numa memory
- hw/loongarch: Add VM mode in IOCSR feature register in kvm mode
- hw/loongarch: Refine default numa id calculation
- hw/loongarch: Rename LoongArchMachineState with LoongArchVirtMachineState
- hw/loongarch: Rename LOONGARCH_MACHINE with LOONGARCH_VIRT_MACHINE
- hw/loongarch: move memory map to boot.c
- loongarch: switch boards to "default y"
- hw/loongarch: Add cells missing from rtc node
- hw/loongarch: Add cells missing from uart node
- hw/loongarch: fdt remove unused irqchip node
- hw/loongarch: fdt adds pcie irq_map node
- hw/loongarch: fdt adds pch_msi Controller
- hw/loongarch: fdt adds pch_pic Controller
- hw/loongarch: fdt adds Extend I/O Interrupt Controller
- hw/loongarch: fdt adds cpu interrupt controller node
- hw/loongarch: Init efi_fdt table
- hw/loongarch: Init efi_initrd table
- hw/loongarch: Init efi_boot_memmap table
- hw/loongarch: Init efi_system_table
- hw/loongarch: Add init_cmdline
- hw/loongarch: Add slave cpu boot_code
- hw/loongarch: Add load initrd
- hw/loongarch: Move boot functions to boot.c
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
(cherry picked from commit 04ca9e6c8ff19630116722240ae0136cea831c5c)
184 lines
6.3 KiB
Diff
184 lines
6.3 KiB
Diff
From 254957f2de480901a063759d762d4b1eca5b5bb0 Mon Sep 17 00:00:00 2001
|
|
From: Bibo Mao <maobibo@loongson.cn>
|
|
Date: Tue, 28 May 2024 16:20:53 +0800
|
|
Subject: [PATCH 28/78] tests/libqos: Add loongarch virt machine node
|
|
|
|
Add loongarch virt machine to the graph. It is a modified copy of
|
|
the existing riscv virtmachine in riscv-virt-machine.c
|
|
|
|
It contains a generic-pcihost controller, and an extra function
|
|
loongarch_config_qpci_bus() to configure GPEX pci host controller
|
|
information, such as ecam and pio_base addresses.
|
|
|
|
Also hotplug handle checking about TYPE_VIRTIO_IOMMU_PCI device is
|
|
added on loongarch virt machine, since virtio_mmu_pci device requires
|
|
it.
|
|
|
|
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
|
|
Acked-by: Thomas Huth <thuth@redhat.com>
|
|
Message-Id: <20240528082053.938564-1-maobibo@loongson.cn>
|
|
Signed-off-by: Song Gao <gaosong@loongson.cn>
|
|
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
|
|
---
|
|
hw/loongarch/virt.c | 2 +
|
|
tests/qtest/libqos/loongarch-virt-machine.c | 114 ++++++++++++++++++++
|
|
tests/qtest/libqos/meson.build | 1 +
|
|
3 files changed, 117 insertions(+)
|
|
create mode 100644 tests/qtest/libqos/loongarch-virt-machine.c
|
|
|
|
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
|
|
index 11ba879e52..f7874bccf9 100644
|
|
--- a/hw/loongarch/virt.c
|
|
+++ b/hw/loongarch/virt.c
|
|
@@ -47,6 +47,7 @@
|
|
#include "sysemu/tpm.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "hw/block/flash.h"
|
|
+#include "hw/virtio/virtio-iommu.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
static bool virt_is_veiointc_enabled(LoongArchVirtMachineState *lvms)
|
|
@@ -1302,6 +1303,7 @@ static HotplugHandler *virt_get_hotplug_handler(MachineState *machine,
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
|
|
|
if (device_is_dynamic_sysbus(mc, dev) ||
|
|
+ object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) ||
|
|
memhp_type_supported(dev)) {
|
|
return HOTPLUG_HANDLER(machine);
|
|
}
|
|
diff --git a/tests/qtest/libqos/loongarch-virt-machine.c b/tests/qtest/libqos/loongarch-virt-machine.c
|
|
new file mode 100644
|
|
index 0000000000..c12089c015
|
|
--- /dev/null
|
|
+++ b/tests/qtest/libqos/loongarch-virt-machine.c
|
|
@@ -0,0 +1,114 @@
|
|
+/*
|
|
+ * libqos driver framework
|
|
+ *
|
|
+ * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
|
|
+ *
|
|
+ * This library is free software; you can redistribute it and/or
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
|
+ * License version 2.1 as published by the Free Software Foundation.
|
|
+ *
|
|
+ * This library is distributed in the hope that it will be useful,
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
+ * Lesser General Public License for more details.
|
|
+ *
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
|
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>
|
|
+ */
|
|
+
|
|
+#include "qemu/osdep.h"
|
|
+#include "../libqtest.h"
|
|
+#include "qemu/module.h"
|
|
+#include "libqos-malloc.h"
|
|
+#include "qgraph.h"
|
|
+#include "virtio-mmio.h"
|
|
+#include "generic-pcihost.h"
|
|
+#include "hw/pci/pci_regs.h"
|
|
+
|
|
+#define LOONGARCH_PAGE_SIZE 0x1000
|
|
+#define LOONGARCH_VIRT_RAM_ADDR 0x100000
|
|
+#define LOONGARCH_VIRT_RAM_SIZE 0xFF00000
|
|
+
|
|
+#define LOONGARCH_VIRT_PIO_BASE 0x18000000
|
|
+#define LOONGARCH_VIRT_PCIE_PIO_OFFSET 0x4000
|
|
+#define LOONGARCH_VIRT_PCIE_PIO_LIMIT 0x10000
|
|
+#define LOONGARCH_VIRT_PCIE_ECAM_BASE 0x20000000
|
|
+#define LOONGARCH_VIRT_PCIE_MMIO32_BASE 0x40000000
|
|
+#define LOONGARCH_VIRT_PCIE_MMIO32_LIMIT 0x80000000
|
|
+
|
|
+typedef struct QVirtMachine QVirtMachine;
|
|
+
|
|
+struct QVirtMachine {
|
|
+ QOSGraphObject obj;
|
|
+ QGuestAllocator alloc;
|
|
+ QVirtioMMIODevice virtio_mmio;
|
|
+ QGenericPCIHost bridge;
|
|
+};
|
|
+
|
|
+static void virt_destructor(QOSGraphObject *obj)
|
|
+{
|
|
+ QVirtMachine *machine = (QVirtMachine *) obj;
|
|
+ alloc_destroy(&machine->alloc);
|
|
+}
|
|
+
|
|
+static void *virt_get_driver(void *object, const char *interface)
|
|
+{
|
|
+ QVirtMachine *machine = object;
|
|
+ if (!g_strcmp0(interface, "memory")) {
|
|
+ return &machine->alloc;
|
|
+ }
|
|
+
|
|
+ fprintf(stderr, "%s not present in loongarch/virtio\n", interface);
|
|
+ g_assert_not_reached();
|
|
+}
|
|
+
|
|
+static QOSGraphObject *virt_get_device(void *obj, const char *device)
|
|
+{
|
|
+ QVirtMachine *machine = obj;
|
|
+ if (!g_strcmp0(device, "generic-pcihost")) {
|
|
+ return &machine->bridge.obj;
|
|
+ } else if (!g_strcmp0(device, "virtio-mmio")) {
|
|
+ return &machine->virtio_mmio.obj;
|
|
+ }
|
|
+
|
|
+ fprintf(stderr, "%s not present in loongarch/virt\n", device);
|
|
+ g_assert_not_reached();
|
|
+}
|
|
+
|
|
+static void loongarch_config_qpci_bus(QGenericPCIBus *qpci)
|
|
+{
|
|
+ qpci->gpex_pio_base = LOONGARCH_VIRT_PIO_BASE;
|
|
+ qpci->bus.pio_alloc_ptr = LOONGARCH_VIRT_PCIE_PIO_OFFSET;
|
|
+ qpci->bus.pio_limit = LOONGARCH_VIRT_PCIE_PIO_LIMIT;
|
|
+ qpci->bus.mmio_alloc_ptr = LOONGARCH_VIRT_PCIE_MMIO32_BASE;
|
|
+ qpci->bus.mmio_limit = LOONGARCH_VIRT_PCIE_MMIO32_LIMIT;
|
|
+ qpci->ecam_alloc_ptr = LOONGARCH_VIRT_PCIE_ECAM_BASE;
|
|
+}
|
|
+
|
|
+static void *qos_create_machine_loongarch_virt(QTestState *qts)
|
|
+{
|
|
+ QVirtMachine *machine = g_new0(QVirtMachine, 1);
|
|
+
|
|
+ alloc_init(&machine->alloc, 0,
|
|
+ LOONGARCH_VIRT_RAM_ADDR,
|
|
+ LOONGARCH_VIRT_RAM_ADDR + LOONGARCH_VIRT_RAM_SIZE,
|
|
+ LOONGARCH_PAGE_SIZE);
|
|
+
|
|
+ qos_create_generic_pcihost(&machine->bridge, qts, &machine->alloc);
|
|
+ loongarch_config_qpci_bus(&machine->bridge.pci);
|
|
+
|
|
+ machine->obj.get_device = virt_get_device;
|
|
+ machine->obj.get_driver = virt_get_driver;
|
|
+ machine->obj.destructor = virt_destructor;
|
|
+ return machine;
|
|
+}
|
|
+
|
|
+static void virt_machine_register_nodes(void)
|
|
+{
|
|
+ qos_node_create_machine_args("loongarch64/virt",
|
|
+ qos_create_machine_loongarch_virt,
|
|
+ " -cpu la464");
|
|
+ qos_node_contains("loongarch64/virt", "generic-pcihost", NULL);
|
|
+}
|
|
+
|
|
+libqos_init(virt_machine_register_nodes);
|
|
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
|
|
index 90aae42a22..482c9b2aab 100644
|
|
--- a/tests/qtest/libqos/meson.build
|
|
+++ b/tests/qtest/libqos/meson.build
|
|
@@ -60,6 +60,7 @@ libqos_srcs = files(
|
|
'arm-xilinx-zynq-a9-machine.c',
|
|
'ppc64_pseries-machine.c',
|
|
'x86_64_pc-machine.c',
|
|
+ 'loongarch-virt-machine.c',
|
|
)
|
|
|
|
if have_virtfs
|
|
--
|
|
2.39.1
|
|
|