7428290d4a
- 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)
114 lines
3.5 KiB
Diff
114 lines
3.5 KiB
Diff
From 5e4d612de23539499b9a22986bebe9a3007edae1 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 7 May 2024 16:51:35 +0200
|
|
Subject: [PATCH 18/78] hw/loongarch: move memory map to boot.c
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Ensure that it can be used even if virt.c is not included in the build, as
|
|
is the case for --without-default-devices.
|
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Acked-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Message-ID: <20240507145135.270803-1-pbonzini@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
|
|
---
|
|
.gitlab-ci.d/buildtest.yml | 5 +++--
|
|
hw/loongarch/boot.c | 3 +++
|
|
hw/loongarch/virt.c | 3 ---
|
|
include/hw/loongarch/boot.h | 10 ++++++++++
|
|
include/hw/loongarch/virt.h | 10 ----------
|
|
5 files changed, 16 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
|
|
index 3fb99e79e9..983c3c132e 100644
|
|
--- a/.gitlab-ci.d/buildtest.yml
|
|
+++ b/.gitlab-ci.d/buildtest.yml
|
|
@@ -579,8 +579,9 @@ build-tci:
|
|
- make check-tcg
|
|
|
|
# Check our reduced build configurations
|
|
-# requires libfdt: aarch64, arm, i386, loongarch64, x86_64
|
|
-# does not build without boards: i386, loongarch64, x86_64
|
|
+# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
|
|
+# mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
|
|
+# does not build without boards: i386, s390x, sh4, sh4eb, x86_64
|
|
build-without-defaults:
|
|
extends: .native_build_job_template
|
|
needs:
|
|
diff --git a/hw/loongarch/boot.c b/hw/loongarch/boot.c
|
|
index 7d1630b2e7..03f6301a77 100644
|
|
--- a/hw/loongarch/boot.c
|
|
+++ b/hw/loongarch/boot.c
|
|
@@ -15,6 +15,9 @@
|
|
#include "sysemu/reset.h"
|
|
#include "sysemu/qtest.h"
|
|
|
|
+struct memmap_entry *memmap_table;
|
|
+unsigned memmap_entries;
|
|
+
|
|
ram_addr_t initrd_offset;
|
|
uint64_t initrd_size;
|
|
|
|
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
|
|
index 0972ebd150..76b36539e2 100644
|
|
--- a/hw/loongarch/virt.c
|
|
+++ b/hw/loongarch/virt.c
|
|
@@ -543,9 +543,6 @@ static void virt_powerdown_req(Notifier *notifier, void *opaque)
|
|
acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
|
|
}
|
|
|
|
-struct memmap_entry *memmap_table;
|
|
-unsigned memmap_entries;
|
|
-
|
|
static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
|
|
{
|
|
/* Ensure there are no duplicate entries. */
|
|
diff --git a/include/hw/loongarch/boot.h b/include/hw/loongarch/boot.h
|
|
index 4ebcc89dcf..b3b870df1f 100644
|
|
--- a/include/hw/loongarch/boot.h
|
|
+++ b/include/hw/loongarch/boot.h
|
|
@@ -104,6 +104,16 @@ struct loongarch_boot_info {
|
|
uint64_t a0, a1, a2;
|
|
};
|
|
|
|
+extern struct memmap_entry *memmap_table;
|
|
+extern unsigned memmap_entries;
|
|
+
|
|
+struct memmap_entry {
|
|
+ uint64_t address;
|
|
+ uint64_t length;
|
|
+ uint32_t type;
|
|
+ uint32_t reserved;
|
|
+};
|
|
+
|
|
void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info);
|
|
|
|
#endif /* HW_LOONGARCH_BOOT_H */
|
|
diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h
|
|
index 673b57aa2b..36158c758f 100644
|
|
--- a/include/hw/loongarch/virt.h
|
|
+++ b/include/hw/loongarch/virt.h
|
|
@@ -37,16 +37,6 @@
|
|
|
|
#define FDT_BASE 0x100000
|
|
|
|
-extern struct memmap_entry *memmap_table;
|
|
-extern unsigned memmap_entries;
|
|
-
|
|
-struct memmap_entry {
|
|
- uint64_t address;
|
|
- uint64_t length;
|
|
- uint32_t type;
|
|
- uint32_t reserved;
|
|
-};
|
|
-
|
|
struct LoongArchMachineState {
|
|
/*< private >*/
|
|
MachineState parent_obj;
|
|
--
|
|
2.39.1
|
|
|