- 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)
192 lines
5.6 KiB
Diff
192 lines
5.6 KiB
Diff
From a7b08284143f7ace3635036bf0366cbec4d52c99 Mon Sep 17 00:00:00 2001
|
|
From: Bibo Mao <maobibo@loongson.cn>
|
|
Date: Sun, 29 Sep 2024 15:04:05 +0800
|
|
Subject: [PATCH 58/78] target/loongarch: Implement lbt registers save/restore
|
|
function
|
|
|
|
Six registers scr0 - scr3, eflags and ftop are added in percpu vmstate.
|
|
And two functions kvm_loongarch_get_lbt/kvm_loongarch_put_lbt are added
|
|
to save/restore lbt registers.
|
|
|
|
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
|
|
Reviewed-by: Song Gao <gaosong@loongson.cn>
|
|
Message-Id: <20240929070405.235200-3-maobibo@loongson.cn>
|
|
Signed-off-by: Song Gao <gaosong@loongson.cn>
|
|
Signed-off-by: Xianglai Li <lixianglai@loongson.cn>
|
|
---
|
|
target/loongarch/cpu.h | 13 ++++++++
|
|
target/loongarch/kvm/kvm.c | 62 ++++++++++++++++++++++++++++++++++++++
|
|
target/loongarch/machine.c | 24 +++++++++++++++
|
|
3 files changed, 99 insertions(+)
|
|
|
|
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
|
|
index 3e2bcbf608..2f8c5cf2dd 100644
|
|
--- a/target/loongarch/cpu.h
|
|
+++ b/target/loongarch/cpu.h
|
|
@@ -18,6 +18,7 @@
|
|
#endif
|
|
#include "cpu-csr.h"
|
|
#include "cpu-qom.h"
|
|
+#include "qapi/qapi-types-common.h"
|
|
|
|
#define IOCSRF_TEMP 0
|
|
#define IOCSRF_NODECNT 1
|
|
@@ -290,6 +291,17 @@ enum loongarch_features {
|
|
LOONGARCH_FEATURE_LBT, /* loongson binary translation extension */
|
|
};
|
|
|
|
+typedef struct LoongArchBT {
|
|
+ /* scratch registers */
|
|
+ uint64_t scr0;
|
|
+ uint64_t scr1;
|
|
+ uint64_t scr2;
|
|
+ uint64_t scr3;
|
|
+ /* loongarch eflags */
|
|
+ uint32_t eflags;
|
|
+ uint32_t ftop;
|
|
+} lbt_t;
|
|
+
|
|
typedef struct CPUArchState {
|
|
uint64_t gpr[32];
|
|
uint64_t pc;
|
|
@@ -297,6 +309,7 @@ typedef struct CPUArchState {
|
|
fpr_t fpr[32];
|
|
bool cf[8];
|
|
uint32_t fcsr0;
|
|
+ lbt_t lbt;
|
|
|
|
uint32_t cpucfg[21];
|
|
|
|
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
|
|
index 567404bdb5..118f66f742 100644
|
|
--- a/target/loongarch/kvm/kvm.c
|
|
+++ b/target/loongarch/kvm/kvm.c
|
|
@@ -486,6 +486,58 @@ static int kvm_loongarch_put_regs_fp(CPUState *cs)
|
|
return ret;
|
|
}
|
|
|
|
+static int kvm_loongarch_put_lbt(CPUState *cs)
|
|
+{
|
|
+ CPULoongArchState *env = cpu_env(cs);
|
|
+ uint64_t val;
|
|
+ int ret;
|
|
+
|
|
+ /* check whether vm support LBT firstly */
|
|
+ if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LBT_ALL) != 7) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ /* set six LBT registers including scr0-scr3, eflags, ftop */
|
|
+ ret = kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR0, &env->lbt.scr0);
|
|
+ ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR1, &env->lbt.scr1);
|
|
+ ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR2, &env->lbt.scr2);
|
|
+ ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR3, &env->lbt.scr3);
|
|
+ /*
|
|
+ * Be cautious, KVM_REG_LOONGARCH_LBT_FTOP is defined as 64-bit however
|
|
+ * lbt.ftop is 32-bit; the same with KVM_REG_LOONGARCH_LBT_EFLAGS register
|
|
+ */
|
|
+ val = env->lbt.eflags;
|
|
+ ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_EFLAGS, &val);
|
|
+ val = env->lbt.ftop;
|
|
+ ret |= kvm_set_one_reg(cs, KVM_REG_LOONGARCH_LBT_FTOP, &val);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int kvm_loongarch_get_lbt(CPUState *cs)
|
|
+{
|
|
+ CPULoongArchState *env = cpu_env(cs);
|
|
+ uint64_t val;
|
|
+ int ret;
|
|
+
|
|
+ /* check whether vm support LBT firstly */
|
|
+ if (FIELD_EX32(env->cpucfg[2], CPUCFG2, LBT_ALL) != 7) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ /* get six LBT registers including scr0-scr3, eflags, ftop */
|
|
+ ret = kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR0, &env->lbt.scr0);
|
|
+ ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR1, &env->lbt.scr1);
|
|
+ ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR2, &env->lbt.scr2);
|
|
+ ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_SCR3, &env->lbt.scr3);
|
|
+ ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_EFLAGS, &val);
|
|
+ env->lbt.eflags = (uint32_t)val;
|
|
+ ret |= kvm_get_one_reg(cs, KVM_REG_LOONGARCH_LBT_FTOP, &val);
|
|
+ env->lbt.ftop = (uint32_t)val;
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
void kvm_arch_reset_vcpu(CPUState *cs)
|
|
{
|
|
CPULoongArchState *env = cpu_env(cs);
|
|
@@ -733,6 +785,11 @@ int kvm_arch_get_registers(CPUState *cs)
|
|
return ret;
|
|
}
|
|
|
|
+ ret = kvm_loongarch_get_lbt(cs);
|
|
+ if (ret) {
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
ret = kvm_loongarch_get_mpstate(cs);
|
|
return ret;
|
|
}
|
|
@@ -761,6 +818,11 @@ int kvm_arch_put_registers(CPUState *cs, int level)
|
|
return ret;
|
|
}
|
|
|
|
+ ret = kvm_loongarch_put_lbt(cs);
|
|
+ if (ret) {
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
ret = kvm_loongarch_put_mpstate(cs);
|
|
return ret;
|
|
}
|
|
diff --git a/target/loongarch/machine.c b/target/loongarch/machine.c
|
|
index 97e1152ffd..5d62aabd51 100644
|
|
--- a/target/loongarch/machine.c
|
|
+++ b/target/loongarch/machine.c
|
|
@@ -130,6 +130,29 @@ static int cpu_pre_save(void *opaque)
|
|
return 0;
|
|
}
|
|
|
|
+static bool lbt_needed(void *opaque)
|
|
+{
|
|
+ LoongArchCPU *cpu = opaque;
|
|
+
|
|
+ return !!FIELD_EX64(cpu->env.cpucfg[2], CPUCFG2, LBT_ALL);
|
|
+}
|
|
+
|
|
+static const VMStateDescription vmstate_lbt = {
|
|
+ .name = "cpu/lbt",
|
|
+ .version_id = 0,
|
|
+ .minimum_version_id = 0,
|
|
+ .needed = lbt_needed,
|
|
+ .fields = (const VMStateField[]) {
|
|
+ VMSTATE_UINT64(env.lbt.scr0, LoongArchCPU),
|
|
+ VMSTATE_UINT64(env.lbt.scr1, LoongArchCPU),
|
|
+ VMSTATE_UINT64(env.lbt.scr2, LoongArchCPU),
|
|
+ VMSTATE_UINT64(env.lbt.scr3, LoongArchCPU),
|
|
+ VMSTATE_UINT32(env.lbt.eflags, LoongArchCPU),
|
|
+ VMSTATE_UINT32(env.lbt.ftop, LoongArchCPU),
|
|
+ VMSTATE_END_OF_LIST()
|
|
+ },
|
|
+};
|
|
+
|
|
#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
|
|
static bool tlb_needed(void *opaque)
|
|
{
|
|
@@ -244,6 +267,7 @@ const VMStateDescription vmstate_loongarch_cpu = {
|
|
#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
|
|
&vmstate_tlb,
|
|
#endif
|
|
+ &vmstate_lbt,
|
|
NULL
|
|
}
|
|
};
|
|
--
|
|
2.39.1
|
|
|