mips: Add Loongson-3 machine support (with KVM)
v3 cover mips: Add Loongson-3 machine support (with KVM)
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)
Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)
Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)
Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.
We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel with arch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...
The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.
V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.
Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement the kvm_type() hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainer
--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +- target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c
--
2.7.0
PATCH v3 1/7 configure: Add KVM target support for MIPS64
Preparing for Loongson-3 virtualization, add KVM target support for MIPS64 in configure script.
--- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
@@ -198,7 +198,7 @@ supported_kvm_target() { arm:arm | aarch64:aarch64 | \ i386:i386 | i386:x86_64 | i386:x32 | \ x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ - mips:mips | mipsel:mips | \ + mips:mips | mipsel:mips | mips64:mips | mips64el:mips | \ ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | ppc64:ppc64le | \ s390x:s390x) return 0
Signature · 1 line
2.7.0
Re: [PATCH for-5.1 V3 1/7] configure: Add KVM target support for MIPS64
нед, 3. мај 2020. у 12:23 Huacai Chen <[email protected]> је написао/ла:
Quoted 7 lines
Preparing for Loongson-3 virtualization, add KVM target support for MIPS64 in configure script.
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Quoted 19 lines
configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)configure +1
-2@@ -198,7 +198,7 @@ supported_kvm_target() { arm:arm | aarch64:aarch64 | \ i386:i386 | i386:x86_64 | i386:x32 | \ x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ - mips:mips | mipsel:mips | \ + mips:mips | mipsel:mips | mips64:mips | mips64el:mips | \ ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | ppc64:ppc64le | \ s390x:s390x) return 0 --2.7.0
Aleksandar Markovic
AppliedRe: [PATCH for-5.1 V3 1/7] configure: Add KVM target support for MIPS64
In reply to Huacai ChenQuoted 7 lines · Huacai Chen
Preparing for Loongson-3 virtualization, add KVM target support for MIPS64 in configure script.
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Applied to MIPS queue.
May health be with you and all people of China!
Aleksandar
Quoted 20 lines
configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)configure +1
-2@@ -198,7 +198,7 @@ supported_kvm_target() { arm:arm | aarch64:aarch64 | \ i386:i386 | i386:x86_64 | i386:x32 | \ x86_64:i386 | x86_64:x86_64 | x86_64:x32 | \ - mips:mips | mipsel:mips | \ + mips:mips | mipsel:mips | mips64:mips | mips64el:mips | \ ppc:ppc | ppc64:ppc | ppc:ppc64 | ppc64:ppc64 | ppc64:ppc64le | \ s390x:s390x) return 0 --2.7.0
PATCH v3 2/7 hw/mips: Implement the kvm_type() hook in MachineClass
In reply to Huacai ChenMIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the kvm_type() hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need the kvm_type() hook.
--- hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.c
hw/core/Makefile.objs +1 -1
@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o +obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
hw/core/null-machine.c +4 -0
@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" static void machine_none_init (MachineState *mch) {
@@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =1 ; mc->default_ram_size =0 ; mc->default_ram_id ="ram" ; +#ifdef TARGET_MIPS + mc->kvm_type = mips_kvm_type; +#endif }DEFINE_MACHINE ("none" , machine_none_machine_init)
hw/mips/Makefile.objs +1 -1
@@ -1,4 +1,4 @@ -obj-y += addr.o mips_int.o +obj-y += addr.o common.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
hw/mips/common.c new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Common MIPS routines +* +* Copyright (c) 2020 Huacai Chen ([email protected]) +* This code is licensed under the GNU GPL v2. +*/ + +#include <linux/kvm.h> +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "hw/mips/mips.h" +#include "sysemu/kvm_int.h" + +int mips_kvm_type (MachineState *machine,const char *vm_type) +{ +int r; +KVMState *s =KVM_STATE (machine->accelerator); + + r =kvm_check_extension (s,KVM_CAP_MIPS_VZ ); +if (r >0 ) { +return KVM_VM_MIPS_VZ ; + } + + r =kvm_check_extension (s,KVM_CAP_MIPS_TE ); +if (r >0 ) { +return KVM_VM_MIPS_TE ; + } + +return -1 ; +}
include/hw/mips/mips.h +3 -0
@@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len);DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +/* common.c */ +int mips_kvm_type (MachineState *machine,const char *vm_type); +#endif
Signature · 1 line
2.7.0
Re: [PATCH for-5.1 V3 2/7] hw/mips: Implement the kvm_type() hook in MachineClass
нед, 3. мај 2020. у 12:24 Huacai Chen <[email protected]> је написао/ла:
Quoted 10 lines
MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the
kvm_type()hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need thekvm_type()hook.Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Quoted 109 lines
hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.chw/core/Makefile.objs +1
-1@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o +obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.ohw/core/null-machine.c +4
-0@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" static void machine_none_init (MachineState *mch) {@@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =1 ; mc->default_ram_size =0 ; mc->default_ram_id ="ram" ; +#ifdef TARGET_MIPS + mc->kvm_type = mips_kvm_type; +#endif }DEFINE_MACHINE ("none" , machine_none_machine_init)hw/mips/Makefile.objs +1
-1@@ -1,4 +1,4 @@ -obj-y += addr.o mips_int.o +obj-y += addr.o common.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.ohw/mips/common.c new file +31
-0@@ -0,0 +1,31 @@ +/* +* Common MIPS routines +* +* Copyright (c) 2020 Huacai Chen ([email protected]) +* This code is licensed under the GNU GPL v2. +*/ + +#include <linux/kvm.h> +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "hw/mips/mips.h" +#include "sysemu/kvm_int.h" + +int mips_kvm_type (MachineState *machine,const char *vm_type) +{ +int r; +KVMState *s =KVM_STATE (machine->accelerator); + + r =kvm_check_extension (s,KVM_CAP_MIPS_VZ ); +if (r >0 ) { +return KVM_VM_MIPS_VZ ; + } + + r =kvm_check_extension (s,KVM_CAP_MIPS_TE ); +if (r >0 ) { +return KVM_VM_MIPS_TE ; + } + +return -1 ; +}include/hw/mips/mips.h +3
-1@@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len);DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +/* common.c */ +int mips_kvm_type (MachineState *machine,const char *vm_type); +#endif --2.7.0
Aleksandar Markovic
AppliedRe: [PATCH for-5.1 V3 2/7] hw/mips: Implement the kvm_type() hook in MachineClass
In reply to Huacai ChenQuoted 10 lines · Huacai Chen
MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the
kvm_type()hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need thekvm_type()hook.Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Applied to MIPS queue.
Best Regards,
Aleksandar
Quoted 110 lines
hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.chw/core/Makefile.objs +1
-1@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o +obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.ohw/core/null-machine.c +4
-0@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" static void machine_none_init (MachineState *mch) {@@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =1 ; mc->default_ram_size =0 ; mc->default_ram_id ="ram" ; +#ifdef TARGET_MIPS + mc->kvm_type = mips_kvm_type; +#endif }DEFINE_MACHINE ("none" , machine_none_machine_init)hw/mips/Makefile.objs +1
-1@@ -1,4 +1,4 @@ -obj-y += addr.o mips_int.o +obj-y += addr.o common.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.ohw/mips/common.c new file +31
-0@@ -0,0 +1,31 @@ +/* +* Common MIPS routines +* +* Copyright (c) 2020 Huacai Chen ([email protected]) +* This code is licensed under the GNU GPL v2. +*/ + +#include <linux/kvm.h> +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "hw/mips/mips.h" +#include "sysemu/kvm_int.h" + +int mips_kvm_type (MachineState *machine,const char *vm_type) +{ +int r; +KVMState *s =KVM_STATE (machine->accelerator); + + r =kvm_check_extension (s,KVM_CAP_MIPS_VZ ); +if (r >0 ) { +return KVM_VM_MIPS_VZ ; + } + + r =kvm_check_extension (s,KVM_CAP_MIPS_TE ); +if (r >0 ) { +return KVM_VM_MIPS_TE ; + } + +return -1 ; +}include/hw/mips/mips.h +3
-1@@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len);DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +/* common.c */ +int mips_kvm_type (MachineState *machine,const char *vm_type); +#endif --2.7.0
Re: [PATCH for-5.1 V3 2/7] hw/mips: Implement the kvm_type() hook in MachineClass
Quoted 9 lines · Aleksandar Markovic
Quoted 7 lines · Huacai Chen
MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the
kvm_type()hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need thekvm_type()hook.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Applied to MIPS queue.
Huacai,
There were some problems during integration of this patch that I do before any pull request. I will for now omit it from the pull request I plan to send today. I leave to you to integrate the patch in some future series of yours, the one that will complete KVM support for Loongson 3.
In other words, this patch is "unapplied" to MIPS queue.
Best Regards,
Aleksandar
Quoted 113 lines
Best Regards,
AleksandarQuoted 110 lines
hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.chw/core/Makefile.objs +1
-1@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o +obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.ohw/core/null-machine.c +4
-0@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" static void machine_none_init (MachineState *mch) {@@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =1 ; mc->default_ram_size =0 ; mc->default_ram_id ="ram" ; +#ifdef TARGET_MIPS + mc->kvm_type = mips_kvm_type; +#endif }DEFINE_MACHINE ("none" , machine_none_machine_init)hw/mips/Makefile.objs +1
-1@@ -1,4 +1,4 @@ -obj-y += addr.o mips_int.o +obj-y += addr.o common.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.ohw/mips/common.c new file +31
-0@@ -0,0 +1,31 @@ +/* +* Common MIPS routines +* +* Copyright (c) 2020 Huacai Chen ([email protected]) +* This code is licensed under the GNU GPL v2. +*/ + +#include <linux/kvm.h> +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "hw/mips/mips.h" +#include "sysemu/kvm_int.h" + +int mips_kvm_type (MachineState *machine,const char *vm_type) +{ +int r; +KVMState *s =KVM_STATE (machine->accelerator); + + r =kvm_check_extension (s,KVM_CAP_MIPS_VZ ); +if (r >0 ) { +return KVM_VM_MIPS_VZ ; + } + + r =kvm_check_extension (s,KVM_CAP_MIPS_TE ); +if (r >0 ) { +return KVM_VM_MIPS_TE ; + } + +return -1 ; +}include/hw/mips/mips.h +3
-1@@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len);DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +/* common.c */ +int mips_kvm_type (MachineState *machine,const char *vm_type); +#endif --2.7.0
Re: [PATCH for-5.1 V3 2/7] hw/mips: Implement the kvm_type() hook in MachineClass
Quoted 26 lines · Aleksandar Markovic
Quoted 9 lines · Aleksandar Markovic
Quoted 7 lines · Huacai Chen
MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the
kvm_type()hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need thekvm_type()hook.Quoted 6 lines
Quoted 3 lines
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Applied to MIPS queue.
Huacai,
There were some problems during integration of this patch that I do before any pull request. I will for now omit it from the pull request I plan to send today. I leave to you to integrate the patch in some future series of yours, the one that will complete KVM support for Loongson 3.
Quoted 5 lines
In other words, this patch is "unapplied" to MIPS queue.
Best Regards,
Aleksandar
Hi, Aleksandar,
The V3 of kvm series can't be applied because of recent upstream changes. I will send V4 to sovle it tomorrow, please queue this series after that. Thanks.
Regards,
Huacai
Quoted 113 lines
Quoted 113 lines
Best Regards,
AleksandarQuoted 110 lines
hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.chw/core/Makefile.objs +1
-1@@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) += numa.o common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o +obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.ohw/core/null-machine.c +4
-0@@ -17,6 +17,7 @@#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" static void machine_none_init (MachineState *mch) {@@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =1 ; mc->default_ram_size =0 ; mc->default_ram_id ="ram" ; +#ifdef TARGET_MIPS + mc->kvm_type = mips_kvm_type; +#endif }DEFINE_MACHINE ("none" , machine_none_machine_init)hw/mips/Makefile.objs +1
-1@@ -1,4 +1,4 @@ -obj-y += addr.o mips_int.o +obj-y += addr.o common.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.ohw/mips/common.c new file +31
-0@@ -0,0 +1,31 @@ +/* +* Common MIPS routines +* +* Copyright (c) 2020 Huacai Chen ([email protected]) +* This code is licensed under the GNU GPL v2. +*/ + +#include <linux/kvm.h> +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "hw/mips/mips.h" +#include "sysemu/kvm_int.h" + +int mips_kvm_type (MachineState *machine,const char *vm_type) +{ +int r; +KVMState *s =KVM_STATE (machine->accelerator); + + r =kvm_check_extension (s,KVM_CAP_MIPS_VZ ); +if (r >0 ) { +return KVM_VM_MIPS_VZ ; + } + + r =kvm_check_extension (s,KVM_CAP_MIPS_TE ); +if (r >0 ) { +return KVM_VM_MIPS_TE ; + } + +return -1 ; +}include/hw/mips/mips.h +3
-1@@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len);DeviceState *rc4030_init (rc4030_dma **dmas,IOMMUMemoryRegion **dma_mr); +/* common.c */ +int mips_kvm_type (MachineState *machine,const char *vm_type); +#endif --2.7.0
Signature · 1 line
Huacai Chen
PATCH v3 3/7 hw/mips: Add CPU IRQ3 delivery for KVM
In reply to Huacai ChenCurrently, KVM/MIPS only deliver I/O interrupt via IP2, this patch add IP3 delivery as well, because Loongson-3 based machine use both IRQ2 (CPU's IP2) and IRQ3 (CPU's IP3).
--- hw/mips/mips_int.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/mips/mips_int.c +2 -2
@@ -48,14 +48,14 @@ static void cpu_mips_irq_request(void *opaque, int irq, int level)if (level) { env->CP0_Cause |=1 << (irq + CP0Ca_IP); -if (kvm_enabled () && irq ==2 ) { +if (kvm_enabled () && (irq ==2 || irq ==3 )) {kvm_mips_set_interrupt (cpu, irq, level); } }else { env->CP0_Cause &= ~(1 << (irq + CP0Ca_IP)); -if (kvm_enabled () && irq ==2 ) { +if (kvm_enabled () && (irq ==2 || irq ==3 )) {kvm_mips_set_interrupt (cpu, irq, level); } }
Signature · 1 line
2.7.0
Re: [PATCH for-5.1 V3 3/7] hw/mips: Add CPU IRQ3 delivery for KVM
нед, 3. мај 2020. у 12:24 Huacai Chen <[email protected]> је написао/ла:
Quoted 8 lines
Currently, KVM/MIPS only deliver I/O interrupt via IP2, this patch add IP3 delivery as well, because Loongson-3 based machine use both IRQ2 (CPU's IP2) and IRQ3 (CPU's IP3).
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Quoted 27 lines
hw/mips/mips_int.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)hw/mips/mips_int.c +2
-3@@ -48,14 +48,14 @@ static void cpu_mips_irq_request(void *opaque, int irq, int level)if (level) { env->CP0_Cause |=1 << (irq + CP0Ca_IP); -if (kvm_enabled () && irq ==2 ) { +if (kvm_enabled () && (irq ==2 || irq ==3 )) {kvm_mips_set_interrupt (cpu, irq, level); } }else { env->CP0_Cause &= ~(1 << (irq + CP0Ca_IP)); -if (kvm_enabled () && irq ==2 ) { +if (kvm_enabled () && (irq ==2 || irq ==3 )) {kvm_mips_set_interrupt (cpu, irq, level); } } --2.7.0
PATCH v3 4/7 target/mips: Add Loongson-3 CPU definition
In reply to Huacai ChenLoongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.
Loongson-3A has CONFIG6 and CONFIG7, so add their bit-fields as well.
--- target/mips/cpu.h | 28 +++++++++++++ target/mips/internal.h | 2 + target/mips/mips-defs.h | 7 +++- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-)
target/mips/cpu.h +28 -0
@@ -940,7 +940,35 @@ struct CPUMIPSState {#define CP0C5_UFR 2#define CP0C5_NFExists 0int32_t CP0_Config6; +int32_t CP0_Config6_rw_bitmask; +#define CP0C6_BPPASS 31 +#define CP0C6_KPOS 24 +#define CP0C6_KE 23 +#define CP0C6_VTLBONLY 22 +#define CP0C6_LASX 21 +#define CP0C6_SSEN 20 +#define CP0C6_DISDRTIME 19 +#define CP0C6_PIXNUEN 18 +#define CP0C6_SCRAND 17 +#define CP0C6_LLEXCEN 16 +#define CP0C6_DISVC 15 +#define CP0C6_VCLRU 14 +#define CP0C6_DCLRU 13 +#define CP0C6_PIXUEN 12 +#define CP0C6_DISBLKLYEN 11 +#define CP0C6_UMEMUALEN 10 +#define CP0C6_SFBEN 8 +#define CP0C6_FLTINT 7 +#define CP0C6_VLTINT 6 +#define CP0C6_DISBTB 5 +#define CP0C6_STPREFCTL 2 +#define CP0C6_INSTPREF 1 +#define CP0C6_DATAPREF 0int32_t CP0_Config7; +int64_t CP0_Config7_rw_bitmask; +#define CP0C7_NAPCGEN 2 +#define CP0C7_UNIMUEN 1 +#define CP0C7_VFPUCGEN 0uint64_t CP0_LLAddr;uint64_t CP0_MAAR [MIPS_MAAR_MAX ];int32_t CP0_MAARI ;
target/mips/internal.h +2 -0
@@ -36,7 +36,9 @@ struct mips_def_t {int32_t CP0_Config5;int32_t CP0_Config5_rw_bitmask;int32_t CP0_Config6; +int32_t CP0_Config6_rw_bitmask;int32_t CP0_Config7; +int32_t CP0_Config7_rw_bitmask;target_ulong CP0_LLAddr_rw_bitmask;int CP0_LLAddr_shift;int32_t SYNCI_Step;
target/mips/mips-defs.h +5 -2
@@ -51,8 +51,9 @@*/ #define INSN_LOONGSON2E 0x0001000000000000ULL#define INSN_LOONGSON2F 0x0002000000000000ULL -#define INSN_VR54XX 0x0004000000000000ULL -#define INSN_R5900 0x0008000000000000ULL +#define INSN_LOONGSON3A 0x0004000000000000ULL +#define INSN_VR54XX 0x0008000000000000ULL +#define INSN_R5900 0x0010000000000000ULL/* * bits 56-63: vendor-specific ASEs */
@@ -94,6 +95,8 @@/* Wave Computing: "nanoMIPS" */ #define CPU_NANOMIPS32 (CPU_MIPS32R6 | ISA_NANOMIPS32) +#define CPU_LOONGSON3A (CPU_MIPS64R2 | INSN_LOONGSON3A) +/* * Strictly follow the architecture standard: * - Disallow "special" instruction handling for PMON/SPIM.
target/mips/translate.c +2 -0
@@ -31206,7 +31206,9 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_Config5 = env->cpu_model->CP0_Config5; env->CP0_Config5_rw_bitmask = env->cpu_model->CP0_Config5_rw_bitmask; env->CP0_Config6 = env->cpu_model->CP0_Config6; + env->CP0_Config6_rw_bitmask = env->cpu_model->CP0_Config6_rw_bitmask; env->CP0_Config7 = env->cpu_model->CP0_Config7; + env->CP0_Config7_rw_bitmask = env->cpu_model->CP0_Config7_rw_bitmask; env->CP0_LLAddr_rw_bitmask = env->cpu_model->CP0_LLAddr_rw_bitmask << env->cpu_model->CP0_LLAddr_shift; env->CP0_LLAddr_shift = env->cpu_model->CP0_LLAddr_shift;
target/mips/translate_init.inc.c +86 -0
92 lines not on this page · raw message
Signature · 1 line
2.7.0
PATCH v3 5/7 target/mips: Add more CP0 register for save/restore
In reply to Huacai ChenAdd more CP0 register for save/restore, including: EBase, XContext, PageGrain, PWBase, PWSize, PWField, PWCtl, Config*, KScratch1~KScratch6.
--- target/mips/kvm.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++ target/mips/machine.c | 6 +- 2 files changed, 216 insertions(+), 2 deletions(-)
target/mips/kvm.c +212 -0
@@ -245,10 +245,16 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U64 | (8 * (_R) + (_S)))#define KVM_REG_MIPS_CP0_INDEX MIPS_CP0_32(0, 0) +#define KVM_REG_MIPS_CP0_RANDOM MIPS_CP0_32(1, 0)#define KVM_REG_MIPS_CP0_CONTEXT MIPS_CP0_64(4, 0)#define KVM_REG_MIPS_CP0_USERLOCAL MIPS_CP0_64(4, 2)#define KVM_REG_MIPS_CP0_PAGEMASK MIPS_CP0_32(5, 0) +#define KVM_REG_MIPS_CP0_PAGEGRAIN MIPS_CP0_32(5, 1) +#define KVM_REG_MIPS_CP0_PWBASE MIPS_CP0_64(5, 5) +#define KVM_REG_MIPS_CP0_PWFIELD MIPS_CP0_64(5, 6) +#define KVM_REG_MIPS_CP0_PWSIZE MIPS_CP0_64(5, 7)#define KVM_REG_MIPS_CP0_WIRED MIPS_CP0_32(6, 0) +#define KVM_REG_MIPS_CP0_PWCTL MIPS_CP0_32(6, 6)#define KVM_REG_MIPS_CP0_HWRENA MIPS_CP0_32(7, 0)#define KVM_REG_MIPS_CP0_BADVADDR MIPS_CP0_64(8, 0)#define KVM_REG_MIPS_CP0_COUNT MIPS_CP0_32(9, 0)
@@ -258,13 +264,22 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)#define KVM_REG_MIPS_CP0_CAUSE MIPS_CP0_32(13, 0)#define KVM_REG_MIPS_CP0_EPC MIPS_CP0_64(14, 0)#define KVM_REG_MIPS_CP0_PRID MIPS_CP0_32(15, 0) +#define KVM_REG_MIPS_CP0_EBASE MIPS_CP0_64(15, 1)#define KVM_REG_MIPS_CP0_CONFIG MIPS_CP0_32(16, 0)#define KVM_REG_MIPS_CP0_CONFIG1 MIPS_CP0_32(16, 1)#define KVM_REG_MIPS_CP0_CONFIG2 MIPS_CP0_32(16, 2)#define KVM_REG_MIPS_CP0_CONFIG3 MIPS_CP0_32(16, 3)#define KVM_REG_MIPS_CP0_CONFIG4 MIPS_CP0_32(16, 4)#define KVM_REG_MIPS_CP0_CONFIG5 MIPS_CP0_32(16, 5) +#define KVM_REG_MIPS_CP0_CONFIG6 MIPS_CP0_32(16, 6) +#define KVM_REG_MIPS_CP0_XCONTEXT MIPS_CP0_64(20, 0)#define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) +#define KVM_REG_MIPS_CP0_KSCRATCH1 MIPS_CP0_64(31, 2) +#define KVM_REG_MIPS_CP0_KSCRATCH2 MIPS_CP0_64(31, 3) +#define KVM_REG_MIPS_CP0_KSCRATCH3 MIPS_CP0_64(31, 4) +#define KVM_REG_MIPS_CP0_KSCRATCH4 MIPS_CP0_64(31, 5) +#define KVM_REG_MIPS_CP0_KSCRATCH5 MIPS_CP0_64(31, 6) +#define KVM_REG_MIPS_CP0_KSCRATCH6 MIPS_CP0_64(31, 7)static inline int kvm_mips_put_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr)
@@ -394,6 +409,29 @@ static inline int kvm_mips_get_one_ureg64(CPUState *cs, uint64_t reg_id, (1U << CP0C5_UFE) | \ (1U << CP0C5_FRE) | \ (1U << CP0C5_UFR)) +#define KVM_REG_MIPS_CP0_CONFIG6_MASK ((1U << CP0C6_BPPASS) | \ + (0x3fU << CP0C6_KPOS) | \ + (1U << CP0C6_KE) | \ + (1U << CP0C6_VTLBONLY) | \ + (1U << CP0C6_LASX) | \ + (1U << CP0C6_SSEN) | \ + (1U << CP0C6_DISDRTIME) | \ + (1U << CP0C6_PIXNUEN) | \ + (1U << CP0C6_SCRAND) | \ + (1U << CP0C6_LLEXCEN) | \ + (1U << CP0C6_DISVC) | \ + (1U << CP0C6_VCLRU) | \ + (1U << CP0C6_DCLRU) | \ + (1U << CP0C6_PIXUEN) | \ + (1U << CP0C6_DISBLKLYEN) | \ + (1U << CP0C6_UMEMUALEN) | \ + (1U << CP0C6_SFBEN) | \ + (1U << CP0C6_FLTINT) | \ + (1U << CP0C6_VLTINT) | \ + (1U << CP0C6_DISBTB) | \ + (3U << CP0C6_STPREFCTL) | \ + (1U << CP0C6_INSTPREF) | \ + (1U << CP0C6_DATAPREF))static inline int kvm_mips_change_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr,int32_t mask)
@@ -729,6 +767,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {
@@ -747,11 +790,40 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWField (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWCTL (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_HWRENA (%d)\n" , __func__, err);
@@ -799,6 +871,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0,KVM_REG_MIPS_CP0_CONFIG_MASK );
@@ -841,12 +918,61 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to change CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , + &env->CP0_Config6, +KVM_REG_MIPS_CP0_CONFIG6_MASK ); +if (err <0 ) { +DPRINTF ("%s: Failed to change CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }
@@ -862,6 +988,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {
@@ -880,11 +1011,40 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWFIELD (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWCtl (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_HWRENA (%d)\n" , __func__, err);
@@ -932,6 +1092,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_CONFIG (%d)\n" , __func__, err);
@@ -962,12 +1127,59 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , &env->CP0_Config6); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }
target/mips/machine.c +4 -2
@@ -212,8 +212,8 @@ const VMStateDescription vmstate_tlb = {const VMStateDescription vmstate_mips_cpu = { .name ="cpu" , - .version_id =19 , - .minimum_version_id =19 , + .version_id =20 , + .minimum_version_id =20 , .post_load = cpu_post_load, .fields = (VMStateField []) {/* Active TC */
@@ -289,6 +289,8 @@ const VMStateDescription vmstate_mips_cpu = {VMSTATE_INT32 (env.CP0_Config1,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config2,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config3,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config4,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config5,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config6,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config7,MIPSCPU ), VMSTATE_UINT64(env.CP0_LLAddr, MIPSCPU),
Signature · 1 line
2.7.0
Re: [PATCH for-5.1 V3 5/7] target/mips: Add more CP0 register for save/restore
нед, 3. мај 2020. у 12:25 Huacai Chen <[email protected]> је написао/ла:
Quoted 7 lines
Add more CP0 register for save/restore, including: EBase, XContext, PageGrain, PWBase, PWSize, PWField, PWCtl, Config*, KScratch1~KScratch6.
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Quoted 357 lines
target/mips/kvm.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++ target/mips/machine.c | 6 +- 2 files changed, 216 insertions(+), 2 deletions(-)target/mips/kvm.c +212
-0@@ -245,10 +245,16 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U64 | (8 * (_R) + (_S)))#define KVM_REG_MIPS_CP0_INDEX MIPS_CP0_32(0, 0) +#define KVM_REG_MIPS_CP0_RANDOM MIPS_CP0_32(1, 0)#define KVM_REG_MIPS_CP0_CONTEXT MIPS_CP0_64(4, 0)#define KVM_REG_MIPS_CP0_USERLOCAL MIPS_CP0_64(4, 2)#define KVM_REG_MIPS_CP0_PAGEMASK MIPS_CP0_32(5, 0) +#define KVM_REG_MIPS_CP0_PAGEGRAIN MIPS_CP0_32(5, 1) +#define KVM_REG_MIPS_CP0_PWBASE MIPS_CP0_64(5, 5) +#define KVM_REG_MIPS_CP0_PWFIELD MIPS_CP0_64(5, 6) +#define KVM_REG_MIPS_CP0_PWSIZE MIPS_CP0_64(5, 7)#define KVM_REG_MIPS_CP0_WIRED MIPS_CP0_32(6, 0) +#define KVM_REG_MIPS_CP0_PWCTL MIPS_CP0_32(6, 6)#define KVM_REG_MIPS_CP0_HWRENA MIPS_CP0_32(7, 0)#define KVM_REG_MIPS_CP0_BADVADDR MIPS_CP0_64(8, 0)#define KVM_REG_MIPS_CP0_COUNT MIPS_CP0_32(9, 0)@@ -258,13 +264,22 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)#define KVM_REG_MIPS_CP0_CAUSE MIPS_CP0_32(13, 0)#define KVM_REG_MIPS_CP0_EPC MIPS_CP0_64(14, 0)#define KVM_REG_MIPS_CP0_PRID MIPS_CP0_32(15, 0) +#define KVM_REG_MIPS_CP0_EBASE MIPS_CP0_64(15, 1)#define KVM_REG_MIPS_CP0_CONFIG MIPS_CP0_32(16, 0)#define KVM_REG_MIPS_CP0_CONFIG1 MIPS_CP0_32(16, 1)#define KVM_REG_MIPS_CP0_CONFIG2 MIPS_CP0_32(16, 2)#define KVM_REG_MIPS_CP0_CONFIG3 MIPS_CP0_32(16, 3)#define KVM_REG_MIPS_CP0_CONFIG4 MIPS_CP0_32(16, 4)#define KVM_REG_MIPS_CP0_CONFIG5 MIPS_CP0_32(16, 5) +#define KVM_REG_MIPS_CP0_CONFIG6 MIPS_CP0_32(16, 6) +#define KVM_REG_MIPS_CP0_XCONTEXT MIPS_CP0_64(20, 0)#define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) +#define KVM_REG_MIPS_CP0_KSCRATCH1 MIPS_CP0_64(31, 2) +#define KVM_REG_MIPS_CP0_KSCRATCH2 MIPS_CP0_64(31, 3) +#define KVM_REG_MIPS_CP0_KSCRATCH3 MIPS_CP0_64(31, 4) +#define KVM_REG_MIPS_CP0_KSCRATCH4 MIPS_CP0_64(31, 5) +#define KVM_REG_MIPS_CP0_KSCRATCH5 MIPS_CP0_64(31, 6) +#define KVM_REG_MIPS_CP0_KSCRATCH6 MIPS_CP0_64(31, 7)static inline int kvm_mips_put_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr)@@ -394,6 +409,29 @@ static inline int kvm_mips_get_one_ureg64(CPUState *cs, uint64_t reg_id, (1U << CP0C5_UFE) | \ (1U << CP0C5_FRE) | \ (1U << CP0C5_UFR)) +#define KVM_REG_MIPS_CP0_CONFIG6_MASK ((1U << CP0C6_BPPASS) | \ + (0x3fU << CP0C6_KPOS) | \ + (1U << CP0C6_KE) | \ + (1U << CP0C6_VTLBONLY) | \ + (1U << CP0C6_LASX) | \ + (1U << CP0C6_SSEN) | \ + (1U << CP0C6_DISDRTIME) | \ + (1U << CP0C6_PIXNUEN) | \ + (1U << CP0C6_SCRAND) | \ + (1U << CP0C6_LLEXCEN) | \ + (1U << CP0C6_DISVC) | \ + (1U << CP0C6_VCLRU) | \ + (1U << CP0C6_DCLRU) | \ + (1U << CP0C6_PIXUEN) | \ + (1U << CP0C6_DISBLKLYEN) | \ + (1U << CP0C6_UMEMUALEN) | \ + (1U << CP0C6_SFBEN) | \ + (1U << CP0C6_FLTINT) | \ + (1U << CP0C6_VLTINT) | \ + (1U << CP0C6_DISBTB) | \ + (3U << CP0C6_STPREFCTL) | \ + (1U << CP0C6_INSTPREF) | \ + (1U << CP0C6_DATAPREF))static inline int kvm_mips_change_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr,int32_t mask)@@ -729,6 +767,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {@@ -747,11 +790,40 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWField (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWCTL (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_HWRENA (%d)\n" , __func__, err);@@ -799,6 +871,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0,KVM_REG_MIPS_CP0_CONFIG_MASK );@@ -841,12 +918,61 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to change CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , + &env->CP0_Config6, +KVM_REG_MIPS_CP0_CONFIG6_MASK ); +if (err <0 ) { +DPRINTF ("%s: Failed to change CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }@@ -862,6 +988,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {@@ -880,11 +1011,40 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWFIELD (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWCtl (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_HWRENA (%d)\n" , __func__, err);@@ -932,6 +1092,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_CONFIG (%d)\n" , __func__, err);@@ -962,12 +1127,59 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , &env->CP0_Config6); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }target/mips/machine.c +4
-3@@ -212,8 +212,8 @@ const VMStateDescription vmstate_tlb = {const VMStateDescription vmstate_mips_cpu = { .name ="cpu" , - .version_id =19 , - .minimum_version_id =19 , + .version_id =20 , + .minimum_version_id =20 , .post_load = cpu_post_load, .fields = (VMStateField []) {/* Active TC */ @@ -289,6 +289,8 @@ const VMStateDescription vmstate_mips_cpu = {VMSTATE_INT32 (env.CP0_Config1,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config2,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config3,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config4,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config5,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config6,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config7,MIPSCPU ), VMSTATE_UINT64(env.CP0_LLAddr, MIPSCPU), --2.7.0
Aleksandar Markovic
AppliedRe: [PATCH for-5.1 V3 5/7] target/mips: Add more CP0 register for save/restore
In reply to Huacai ChenQuoted 7 lines · Huacai Chen
Add more CP0 register for save/restore, including: EBase, XContext, PageGrain, PWBase, PWSize, PWField, PWCtl, Config*, KScratch1~KScratch6.
Signed-off-by Huacai Chen <[email protected]>Co-developed-by Jiaxun Yang <[email protected]>---
Applied to MIPS queue.
Many thanks!
Aleksandar
Quoted 358 lines
target/mips/kvm.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++ target/mips/machine.c | 6 +- 2 files changed, 216 insertions(+), 2 deletions(-)target/mips/kvm.c +212
-0@@ -245,10 +245,16 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U64 | (8 * (_R) + (_S)))#define KVM_REG_MIPS_CP0_INDEX MIPS_CP0_32(0, 0) +#define KVM_REG_MIPS_CP0_RANDOM MIPS_CP0_32(1, 0)#define KVM_REG_MIPS_CP0_CONTEXT MIPS_CP0_64(4, 0)#define KVM_REG_MIPS_CP0_USERLOCAL MIPS_CP0_64(4, 2)#define KVM_REG_MIPS_CP0_PAGEMASK MIPS_CP0_32(5, 0) +#define KVM_REG_MIPS_CP0_PAGEGRAIN MIPS_CP0_32(5, 1) +#define KVM_REG_MIPS_CP0_PWBASE MIPS_CP0_64(5, 5) +#define KVM_REG_MIPS_CP0_PWFIELD MIPS_CP0_64(5, 6) +#define KVM_REG_MIPS_CP0_PWSIZE MIPS_CP0_64(5, 7)#define KVM_REG_MIPS_CP0_WIRED MIPS_CP0_32(6, 0) +#define KVM_REG_MIPS_CP0_PWCTL MIPS_CP0_32(6, 6)#define KVM_REG_MIPS_CP0_HWRENA MIPS_CP0_32(7, 0)#define KVM_REG_MIPS_CP0_BADVADDR MIPS_CP0_64(8, 0)#define KVM_REG_MIPS_CP0_COUNT MIPS_CP0_32(9, 0)@@ -258,13 +264,22 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level)#define KVM_REG_MIPS_CP0_CAUSE MIPS_CP0_32(13, 0)#define KVM_REG_MIPS_CP0_EPC MIPS_CP0_64(14, 0)#define KVM_REG_MIPS_CP0_PRID MIPS_CP0_32(15, 0) +#define KVM_REG_MIPS_CP0_EBASE MIPS_CP0_64(15, 1)#define KVM_REG_MIPS_CP0_CONFIG MIPS_CP0_32(16, 0)#define KVM_REG_MIPS_CP0_CONFIG1 MIPS_CP0_32(16, 1)#define KVM_REG_MIPS_CP0_CONFIG2 MIPS_CP0_32(16, 2)#define KVM_REG_MIPS_CP0_CONFIG3 MIPS_CP0_32(16, 3)#define KVM_REG_MIPS_CP0_CONFIG4 MIPS_CP0_32(16, 4)#define KVM_REG_MIPS_CP0_CONFIG5 MIPS_CP0_32(16, 5) +#define KVM_REG_MIPS_CP0_CONFIG6 MIPS_CP0_32(16, 6) +#define KVM_REG_MIPS_CP0_XCONTEXT MIPS_CP0_64(20, 0)#define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) +#define KVM_REG_MIPS_CP0_KSCRATCH1 MIPS_CP0_64(31, 2) +#define KVM_REG_MIPS_CP0_KSCRATCH2 MIPS_CP0_64(31, 3) +#define KVM_REG_MIPS_CP0_KSCRATCH3 MIPS_CP0_64(31, 4) +#define KVM_REG_MIPS_CP0_KSCRATCH4 MIPS_CP0_64(31, 5) +#define KVM_REG_MIPS_CP0_KSCRATCH5 MIPS_CP0_64(31, 6) +#define KVM_REG_MIPS_CP0_KSCRATCH6 MIPS_CP0_64(31, 7)static inline int kvm_mips_put_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr)@@ -394,6 +409,29 @@ static inline int kvm_mips_get_one_ureg64(CPUState *cs, uint64_t reg_id, (1U << CP0C5_UFE) | \ (1U << CP0C5_FRE) | \ (1U << CP0C5_UFR)) +#define KVM_REG_MIPS_CP0_CONFIG6_MASK ((1U << CP0C6_BPPASS) | \ + (0x3fU << CP0C6_KPOS) | \ + (1U << CP0C6_KE) | \ + (1U << CP0C6_VTLBONLY) | \ + (1U << CP0C6_LASX) | \ + (1U << CP0C6_SSEN) | \ + (1U << CP0C6_DISDRTIME) | \ + (1U << CP0C6_PIXNUEN) | \ + (1U << CP0C6_SCRAND) | \ + (1U << CP0C6_LLEXCEN) | \ + (1U << CP0C6_DISVC) | \ + (1U << CP0C6_VCLRU) | \ + (1U << CP0C6_DCLRU) | \ + (1U << CP0C6_PIXUEN) | \ + (1U << CP0C6_DISBLKLYEN) | \ + (1U << CP0C6_UMEMUALEN) | \ + (1U << CP0C6_SFBEN) | \ + (1U << CP0C6_FLTINT) | \ + (1U << CP0C6_VLTINT) | \ + (1U << CP0C6_DISBTB) | \ + (3U << CP0C6_STPREFCTL) | \ + (1U << CP0C6_INSTPREF) | \ + (1U << CP0C6_DATAPREF))static inline int kvm_mips_change_one_reg (CPUState *cs,uint64_t reg_id,int32_t *addr,int32_t mask)@@ -729,6 +767,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {@@ -747,11 +790,40 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWField (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_PWCTL (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_HWRENA (%d)\n" , __func__, err);@@ -799,6 +871,11 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to put CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0,KVM_REG_MIPS_CP0_CONFIG_MASK );@@ -841,12 +918,61 @@ static int kvm_mips_put_cp0_registers(CPUState *cs, int level)DPRINTF ("%s: Failed to change CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_change_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , + &env->CP0_Config6, +KVM_REG_MIPS_CP0_CONFIG6_MASK ); +if (err <0 ) { +DPRINTF ("%s: Failed to change CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to put CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_put_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to put CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }@@ -862,6 +988,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_INDEX (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_RANDOM , &env->CP0_Random); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_RANDOM (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_CONTEXT , &env->CP0_Context);if (err <0 ) {@@ -880,11 +1011,40 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PAGEMASK (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PAGEGRAIN , + &env->CP0_PageGrain); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PAGEGRAIN (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWBASE , + &env->CP0_PWBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWBASE (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWFIELD , + &env->CP0_PWField); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWFIELD (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_PWSIZE , + &env->CP0_PWSize); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWSIZE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_WIRED , &env->CP0_Wired);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_WIRED (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_PWCTL , &env->CP0_PWCtl); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_PWCtl (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_HWRENA , &env->CP0_HWREna);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_HWRENA (%d)\n" , __func__, err);@@ -932,6 +1092,11 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_PRID (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_EBASE , &env->CP0_EBase); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_EBASE (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG , &env->CP0_Config0);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_CONFIG (%d)\n" , __func__, err);@@ -962,12 +1127,59 @@ static int kvm_mips_get_cp0_registers(CPUState *cs)DPRINTF ("%s: Failed to get CP0_CONFIG5 (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_reg (cs,KVM_REG_MIPS_CP0_CONFIG6 , &env->CP0_Config6); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_CONFIG6 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_XCONTEXT , + &env->CP0_XContext); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_XCONTEXT (%d)\n" , __func__, err); + ret = err; + } err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_ERROREPC , &env->CP0_ErrorEPC);if (err <0 ) {DPRINTF ("%s: Failed to get CP0_ERROREPC (%d)\n" , __func__, err); ret = err; } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH1 , + &env->CP0_KScratch[0 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH1 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH2 , + &env->CP0_KScratch[1 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH2 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH3 , + &env->CP0_KScratch[2 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH3 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH4 , + &env->CP0_KScratch[3 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH4 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH5 , + &env->CP0_KScratch[4 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH5 (%d)\n" , __func__, err); + ret = err; + } + err =kvm_mips_get_one_ulreg (cs,KVM_REG_MIPS_CP0_KSCRATCH6 , + &env->CP0_KScratch[5 ]); +if (err <0 ) { +DPRINTF ("%s: Failed to get CP0_KSCRATCH6 (%d)\n" , __func__, err); + ret = err; + }return ret; }target/mips/machine.c +4
-3@@ -212,8 +212,8 @@ const VMStateDescription vmstate_tlb = {const VMStateDescription vmstate_mips_cpu = { .name ="cpu" , - .version_id =19 , - .minimum_version_id =19 , + .version_id =20 , + .minimum_version_id =20 , .post_load = cpu_post_load, .fields = (VMStateField []) {/* Active TC */ @@ -289,6 +289,8 @@ const VMStateDescription vmstate_mips_cpu = {VMSTATE_INT32 (env.CP0_Config1,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config2,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config3,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config4,MIPSCPU ), +VMSTATE_INT32 (env.CP0_Config5,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config6,MIPSCPU ),VMSTATE_INT32 (env.CP0_Config7,MIPSCPU ), VMSTATE_UINT64(env.CP0_LLAddr, MIPSCPU), --2.7.0
PATCH v3 6/7 hw/mips: Add Loongson-3 machine support (with KVM)
In reply to Huacai ChenAdd Loongson-3 based machine support, it use i8259 as the interrupt controler and use GPEX as the pci controller. Currently it can only work with KVM, but we will add TCG support in future.
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel with arch/mips/configs/loongson3_{def,hpc}config;
3, Boot the a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...
The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
--- default-configs/mips64el-softmmu.mak | 1 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 1 + hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ 4 files changed, 913 insertions(+) create mode 100644 hw/mips/mips_loongson3.c
default-configs/mips64el-softmmu.mak +1 -0
@@ -3,6 +3,7 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_LOONGSON3=y CONFIG_ATI_VGA=y CONFIG_RTL8139_PCI=y CONFIG_JAZZ=y
hw/mips/Kconfig +10 -0
@@ -44,6 +44,16 @@ config JAZZ config FULONG bool +config LOONGSON3 + bool + select PCKBD + select SERIAL + select ISA_BUS + select PCI_EXPRESS_GENERIC_BRIDGE + select VIRTIO_VGA + select QXL if SPICE + select MSI_NONBROKEN + config MIPS_CPS bool select PTIMER
hw/mips/Makefile.objs +1 -0
@@ -4,5 +4,6 @@ obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o +obj-$(CONFIG_LOONGSON3) += mips_loongson3.o obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_BOSTON) += boston.o
hw/mips/mips_loongson3.c new file +901 -0
901 lines not on this page · raw message
Signature · 1 line
2.7.0
PATCH v3 7/7 MAINTAINERS: Add myself as Loongson-3 maintainer
In reply to Huacai Chen--- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
@@ -1084,6 +1084,11 @@ F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h +Loongson-3 +M: Huacai Chen <[email protected]> +S: Maintained +F: hw/mips/mips_loongson3.c + Boston M: Paul Burton <[email protected]> R: Aleksandar Rikalo <[email protected]>
Signature · 1 line
2.7.0
The english version of the reference document is hard to head. I suggest first convert the chinese version into markdown or alternative format and
place them at github.
And we then translate the document with google translate.
Quoted 121 lines · Huacai Chen
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf
(Chinese Version)
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf
(Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf
(Chinese Version)
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf
(Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config; 3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000(quoted diff) +0
-2-kernel <path_to_kernel> -append ... Use QEMU with KVM (available at present): qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ... The "-cpu" parameter can be omitted here and QEMU will use the correcttype for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +- target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0
Signature · 6 lines
此致
礼
罗勇刚
Yours
sincerely,
Yonggang LuoHi, Yonggang,
We are planning to translate these manuals to English by human, but it needs a very long time to complete.
Huacai
Quoted 129 lines · 罗勇刚(Yonggang Luo)
The english version of the reference document is hard to head.
I suggest first convert the chinese version into markdown or alternative format and place them at github.
And we then translate the document with google translate.Quoted 110 lines · Huacai Chen
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +- target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.cQuoted 3 lines
--
2.7.0--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
Signature · 1 line
Huacai Chen
Yeap, I suggest convert the Chinese version to Markdown or other text format first,
then we can got help from others to translate those documents
Quoted 158 lines · chen huacai
Hi, Yonggang,
We are planning to translate these manuals to English by human, but it needs a very long time to complete.
Huacai
Quoted 3 lines · 罗勇刚(Yonggang Luo)
The english version of the reference document is hard to head. I suggest first convert the chinese version into markdown or alternative
format and
Quoted 4 lines
place them at github.
And we then translate the document with google translate.On Sun, May 3, 2020 at 6:22 PM Huacai Chen <[email protected]>
Quoted 11 lines · wrote:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Quoted 8 lines
Quoted 8 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdfhttp://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf
(Chinese Version)Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdfhttp://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf
(Chinese Version)Quoted 5 lines
Quoted 5 lines
Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (ChineseVersion)
Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (ChineseVersion)
Quoted 5 lines
Quoted 5 lines
Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf(Chinese Version)
Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf(Chinese Version)
Quoted 18 lines
Quoted 18 lines
Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
Quoted 8 lines
Quoted 8 lines
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config; 3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000-kernel <
path_to_kernel> -append ...Quoted 2 lines
Quoted 2 lines
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000-kernel <
path_to_kernel> -append ...Quoted 2 lines
Quoted 2 lines
The "-cpu" parameter can be omitted here and QEMU will use the
correct type for TCG/KVM automatically.
Quoted 19 lines
Quoted 19 lines
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerQuoted 12 lines
Quoted 12 lines
Signed-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901+++++++++++++++++++++++++++++++++++
Quoted 16 lines
Quoted 11 lines
include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +- target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.cQuoted 3 lines
--
2.7.0Quoted 7 lines
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo--
Huacai Chen
Signature · 6 lines
此致
礼
罗勇刚
Yours
sincerely,
Yonggang LuoPatchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
Not run: 259
Failures: 192
Failed 1 of 117 iotests
make: *** [check-tests/check-block.sh] Error 1
make: *** Waiting for unfinished jobs....
TEST check-qtest-aarch64: tests/qtest/test-hmp
TEST check-qtest-aarch64: tests/qtest/qos-test
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=8950e4c4713746e191eb1884fd629535', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-x9_nmvq4/src/docker-src.2020-05-03-06.33.44.10861:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=8950e4c4713746e191eb1884fd629535
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-x9_nmvq4/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 15m24.568s
user 0m8.657s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.
Huacai, thanks for putting together v3, which is a little better than v2, and thanks for addressing my previous suggestions.
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
Quoted 101 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +- target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0
Hi, Aleksandar,
Quoted 17 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Huacai, thanks for putting together v3, which is a little better than v2, and thanks for addressing my previous suggestions.
Quoted 7 lines
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
I'm sorry for this late response because I have done many tests to reproduce the problem reported at
https://patchew.org/QEMU/[email protected]/,
but I don't have such a failure...
What I have done:
1, "make check" on MIPS64 platform (distro is Fedora28 for Loongson); 2, "make check" on X86_64 platform (distro is RHEL8);
3, "make docker-test-quick@centos7 SHOW_ENV=1 NETWORK=1" on X86_64 platform (distro is RHEL8);
4, "make docker-test-quick@centos7 SHOW_ENV=1 J=n NETWORK=1" on X86_64 platform (distro is RHEL8 and I've tried n=2,3,4....14);
I always get the same result:
Not run: 259
Passed all 117 iotests
And, it seems that my patchset doesn't touch anything about iotests, so I don't know why the build test fails on iotests 192 (Maybe your build test has the same problem without my patches).
P.S.: I have found a problem that my patchset has a build failure with CONFIG_KVM=n, but this is another problem and I will send V4 to fix it (after collecting all problems in V3).
Quoted 94 lines
Quoted 94 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +-
Quoted 8 lines
Quoted 8 lines
target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0
--
Huacai Chen
уторак, 05. мај 2020., chen huacai <[email protected]> је написао/ла:
Quoted 46 lines
Hi, Aleksandar,
Quoted 2 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је
написао/ла:
Quoted 7 lines
Quoted 7 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It
is
Quoted 2 lines
Quoted 2 lines
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. Itis
Quoted 4 lines
Quoted 2 lines
suitable for KVM because Loongson-3A R4 has the VZ ASE.
Huacai, thanks for putting together v3, which is a little better than
v2, and
Quoted 9 lines
thanks for addressing my previous suggestions.
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
I'm sorry for this late response because I have done many tests to reproduce the problem reported at
https://patchew.org/QEMU/1588501221-1205-1-git-send-
[email protected]/,
but I don't have such a failure...What I have done:
1, "make check" on MIPS64 platform (distro is Fedora28 for Loongson); 2, "make check" onX86_64platform (distro is RHEL8);
3, "make docker-test-quick@centos7 SHOW_ENV=1 NETWORK=1" onX86_64platform (distro is RHEL8);
4, "make docker-test-quick@centos7 SHOW_ENV=1 J=n NETWORK=1" onX86_64platform (distro is RHEL8 and I've tried n=2,3,4....14);
Quoted 9 lines
I always get the same result:
Not run: 259
Passed all 117 iotestsAnd, it seems that my patchset doesn't touch anything about iotests, so I don't know why the build test fails on iotests 192 (Maybe your build test has the same problem without my patches).
From time to time, there is some instability in our automatic iotests. You shouldn't bother too much about it, of course you retest in your environments, that is good. But, in all likelyhood, your patchset doesn't really have anything to do with the reported iotest failure.
Truly yours,
Aleksandar
Quoted 124 lines
P.S.: I have found a problem that my patchset has a build failure withCONFIG_KVM=n, but this is another problem and I will send V4 to fix it (after collecting all problems in V3).Quoted 9 lines
Quoted 9 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version)
Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)
Quoted 5 lines
Quoted 5 lines
Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (ChineseVersion)
Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (ChineseVersion)
Quoted 5 lines
Quoted 5 lines
Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf(Chinese Version)
Quoted 3 lines
Quoted 3 lines
User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf(Chinese Version)
Quoted 8 lines
Quoted 8 lines
Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.Quoted 6 lines
Quoted 6 lines
We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x
LTS
Quoted 4 lines
Quoted 4 lines
but not upstream yet) here:
Quoted 8 lines
Quoted 8 lines
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config; 3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpuLoongson-3A1000 -kernel <
path_to_kernel> -append ...Quoted 2 lines
Quoted 2 lines
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpuLoongson-3A4000 -kernel <
path_to_kernel> -append ...Quoted 2 lines
Quoted 2 lines
The "-cpu" parameter can be omitted here and QEMU will use the
correct type for TCG/KVM automatically.
Quoted 19 lines
Quoted 19 lines
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerQuoted 12 lines
Quoted 12 lines
Signed-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901+++++++++++++++++++++++++++++++++++
Quoted 5 lines
Quoted 5 lines
include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +-Quoted 8 lines
Quoted 8 lines
target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0--
Huacai Chen
Hi, Aleksandar,
Quoted 50 lines · Aleksandar Markovic
уторак, 05. мај 2020., chen huacai <[email protected]> је написао/ла:
Quoted 46 lines
Hi, Aleksandar,
Quoted 17 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Huacai, thanks for putting together v3, which is a little better than v2, and thanks for addressing my previous suggestions.
Quoted 7 lines
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
I'm sorry for this late response because I have done many tests to reproduce the problem reported at
https://patchew.org/QEMU/[email protected]/,
but I don't have such a failure...What I have done:
1, "make check" on MIPS64 platform (distro is Fedora28 for Loongson); 2, "make check" onX86_64platform (distro is RHEL8);
3, "make docker-test-quick@centos7 SHOW_ENV=1 NETWORK=1" onX86_64platform (distro is RHEL8);
4, "make docker-test-quick@centos7 SHOW_ENV=1 J=n NETWORK=1" onX86_64platform (distro is RHEL8 and I've tried n=2,3,4....14);I always get the same result:
Not run: 259
Passed all 117 iotests
Quoted 6 lines
Quoted 4 lines
And, it seems that my patchset doesn't touch anything about iotests, so I don't know why the build test fails on iotests 192 (Maybe your build test has the same problem without my patches).
From time to time, there is some instability in our automatic iotests. You shouldn't bother too much about it, of course you retest in your environments, that is good. But, in all likelyhood, your patchset doesn't really have anything to do with the reported iotest failure.
Thank you for your help, and here is another question: Could "target/mips: Support variable page size" series be merged now? This Loongson-3 series depend on variable page size logically.
Quoted 118 lines
Truly yours,
AleksandarQuoted 113 lines
P.S.: I have found a problem that my patchset has a build failure withCONFIG_KVM=n, but this is another problem and I will send V4 to fix it (after collecting all problems in V3).Quoted 94 lines
Quoted 94 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +-Quoted 8 lines
Quoted 8 lines
target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0--
Huacai Chen
Best regards,
Huacai
сре, 6. мај 2020. у 03:43 Huacai Chen <[email protected]> је написао/ла:
Quoted 60 lines
Hi, Aleksandar,
Quoted 55 lines · Aleksandar Markovic
уторак, 05. мај 2020., chen huacai <[email protected]> је написао/ла:
Quoted 50 lines
Hi, Aleksandar,
Quoted 17 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Huacai, thanks for putting together v3, which is a little better than v2, and thanks for addressing my previous suggestions.
Quoted 7 lines
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
I'm sorry for this late response because I have done many tests to reproduce the problem reported at
https://patchew.org/QEMU/[email protected]/,
but I don't have such a failure...What I have done:
1, "make check" on MIPS64 platform (distro is Fedora28 for Loongson); 2, "make check" onX86_64platform (distro is RHEL8);
3, "make docker-test-quick@centos7 SHOW_ENV=1 NETWORK=1" onX86_64platform (distro is RHEL8);
4, "make docker-test-quick@centos7 SHOW_ENV=1 J=n NETWORK=1" onX86_64platform (distro is RHEL8 and I've tried n=2,3,4....14);I always get the same result:
Not run: 259
Passed all 117 iotestsAnd, it seems that my patchset doesn't touch anything about iotests, so I don't know why the build test fails on iotests 192 (Maybe your build test has the same problem without my patches).
Quoted 6 lines
Quoted 1 line
From time to time, there is some instability in our automatic iotests. You shouldn't bother too much about it, of course you retest in your environments, that is good. But, in all likelyhood, your patchset doesn't really have anything to do with the reported iotest failure.
Thank you for your help, and here is another question: Could "target/mips: Support variable page size" series be merged now? This Loongson-3 series depend on variable page size logically.
Hi, Huacei.
Please be patient. This is a significant series, and we don't do or have a "fast track" for series of such nature. It might or might not be that some of the patches will be accepted before the entire series, but certainly do not rush us. This is not the way to achieve your goal, let's put it that way. Focus on improving your series. Being careful with reviewing and upstreaming is actually in your interest.
Yours,
Aleksandar
Quoted 120 lines
Quoted 118 lines
Truly yours,
AleksandarQuoted 113 lines
P.S.: I have found a problem that my patchset has a build failure withCONFIG_KVM=n, but this is another problem and I will send V4 to fix it (after collecting all problems in V3).Quoted 94 lines
Quoted 94 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +-Quoted 8 lines
Quoted 8 lines
target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0--
Huacai ChenBest regards,
Huacai
Hi, Aleksandar,
Quoted 69 lines · Aleksandar Markovic
сре, 6. мај 2020. у 03:43 Huacai Chen <[email protected]> је написао/ла:
Quoted 60 lines
Hi, Aleksandar,
Quoted 55 lines · Aleksandar Markovic
уторак, 05. мај 2020., chen huacai <[email protected]> је написао/ла:
Quoted 50 lines
Hi, Aleksandar,
Quoted 17 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Huacai, thanks for putting together v3, which is a little better than v2, and thanks for addressing my previous suggestions.
Quoted 7 lines
Now, give us some time to digest new data on Loongson3. We will respond, but it won't happen immediately, which is, you'd agree, reasonable. Just be patient.
But again, in general, I salute your efforts very much!
Yours, Aleksandar
I'm sorry for this late response because I have done many tests to reproduce the problem reported at
https://patchew.org/QEMU/[email protected]/,
but I don't have such a failure...What I have done:
1, "make check" on MIPS64 platform (distro is Fedora28 for Loongson); 2, "make check" onX86_64platform (distro is RHEL8);
3, "make docker-test-quick@centos7 SHOW_ENV=1 NETWORK=1" onX86_64platform (distro is RHEL8);
4, "make docker-test-quick@centos7 SHOW_ENV=1 J=n NETWORK=1" onX86_64platform (distro is RHEL8 and I've tried n=2,3,4....14);I always get the same result:
Not run: 259
Passed all 117 iotestsAnd, it seems that my patchset doesn't touch anything about iotests, so I don't know why the build test fails on iotests 192 (Maybe your build test has the same problem without my patches).
Quoted 6 lines
Quoted 1 line
From time to time, there is some instability in our automatic iotests. You shouldn't bother too much about it, of course you retest in your environments, that is good. But, in all likelyhood, your patchset doesn't really have anything to do with the reported iotest failure.
Thank you for your help, and here is another question: Could "target/mips: Support variable page size" series be merged now? This Loongson-3 series depend on variable page size logically.
Quoted 8 lines
Hi, Huacei.
Please be patient. This is a significant series, and we don't do or have a "fast track" for series of such nature. It might or might not be that some of the patches will be accepted before the entire series, but certainly do not rush us. This is not the way to achieve your goal, let's put it that way. Focus on improving your series. Being careful with reviewing and upstreaming is actually in your interest.
Thank your very much. I know I should be patient, and I'm patient actually. I mention "target/mips: Support variable page size" here because I forget to add "for-5.1" in that series, I want to know whether I should resend it.
Quoted 124 lines
Yours,
AleksandarQuoted 120 lines
Quoted 118 lines
Truly yours,
AleksandarQuoted 113 lines
P.S.: I have found a problem that my patchset has a build failure withCONFIG_KVM=n, but this is another problem and I will send V4 to fix it (after collecting all problems in V3).Quoted 94 lines
Quoted 94 lines
Loongson-3 lacks English documents. I've tried to translated them with translate.google.com, and the machine translated documents (together with their original Chinese versions) are available here.
Loongson-3A R1 (Loongson-3A1000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A1000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A1000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A1000_processor_user_manual_P2.pdf (Chinese Version)Loongson-3A R2 (Loongson-3A2000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A2000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A2000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A2000_user2.pdf (Chinese Version)Loongson-3A R3 (Loongson-3A3000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A3000_p1.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual1.pdf (Chinese Version) User Manual Part 2:
http://ftp.godson.ac.cn/lemote/3A3000_p2.pdf
http://ftp.godson.ac.cn/lemote/Loongson3A3000_3B3000usermanual2.pdf (Chinese Version)Loongson-3A R4 (Loongson-3A4000)
User Manual Part 1:
http://ftp.godson.ac.cn/lemote/3A4000_p1.pdf
http://ftp.godson.ac.cn/lemote/3A4000user.pdf (Chinese Version) User Manual Part 2:
I'm sorry that it is unavailable now.We are preparing to add QEMU's Loongson-3 support. MIPS VZ extension is fully supported in Loongson-3A R4+, so we at first add QEMU/KVM support in this series. And the next series will add QEMU/TCG support (it will emulate Loongson-3A R1).
We already have a full functional Linux kernel (based on Linux-5.4.x LTS but not upstream yet) here:
https://github.com/chenhuacai/linux
How to use QEMU/Loongson-3?
1, Download kernel source from the above URL;
2, Build a kernel witharch/mips/configs/loongson3_{def,hpc}config;
3, Boot a Loongson-3A4000 host with this kernel;
4, Build QEMU-5.0.0 with this patchset;
5, modprobe kvm;
6, Use QEMU with TCG (available in future):
qemu-system-mips64el -M loongson3,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ...
Use QEMU with KVM (available at present):
qemu-system-mips64el -M loongson3,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ...The "-cpu" parameter can be omitted here and QEMU will use the correct type for TCG/KVM automatically.
V1 -> V2:
1, Add a cover letter;
2, Improve CPU definitions;
3, Remove LS7A-related things (Use GPEX instead); 4, Add a description of how to run QEMU/Loongson-3.V2 -> V3:
1, Fix all possible checkpatch.pl errors and warnings.Huacai Chen(7):
configure: Add KVM target support for MIPS64 hw/mips: Implement thekvm_type()hook in MachineClass hw/mips: Add CPU IRQ3 delivery for KVM target/mips: Add Loongson-3 CPU definition target/mips: Add more CP0 register for save/restor hw/mips: Add Loongson-3 machine support (with KVM)
MAINTAINERS: Add myself as Loongson-3 maintainerSigned-off-by Huacai Chen <[email protected]>--- MAINTAINERS | 5 + configure | 2 +- default-configs/mips64el-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 3 +- hw/mips/common.c | 31 ++ hw/mips/mips_int.c | 4 +- hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 + target/mips/cpu.h | 28 ++ target/mips/internal.h | 2 + target/mips/kvm.c | 212 +++++++++ target/mips/machine.c | 6 +-Quoted 8 lines
Quoted 8 lines
target/mips/mips-defs.h | 7 +- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++ 18 files changed, 1300 insertions(+), 9 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c--
2.7.0--
Huacai ChenBest regards,
Huacai
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.
Hi, Huacei,
Just a couple of practicalities. As you know, we can't upstream this series until correspondent kernel support is upstreamed into kernel. This is my advice, timing-wise:
- I think it is too late (and not good from testing/risk perspective) to shoot for integrating your kernel series into kernel 5.7;
- My advice is to try to upstream your kernel series at the beginning of 5.8 development cycle (which should not be too far)
- Once this is done, it will open the door for integrating this series into QEMU upstream
- This means that combination of kernel 5.8 and QEMU 5.1 will hopefully be a working system from Loongson KVM point of view
- This will also mean we will have relatively sufficient time to test, and possibly fix some new bugs before QEMU 5.1 release.
I hope this tentative plan sounds good to you.
Sincerely,
Aleksandar
Hi, Aleksandar,
Quoted 31 lines · Aleksandar Markovic
нед, 3. мај 2020. у 12:21 Huacai Chen <[email protected]> је написао/ла:
Quoted 11 lines
Loongson-3 CPU family include Loongson-3A R1/R2/R3/R4 and Loongson-3B R1/R2. Loongson-3A R1 is the oldest and its ISA is the smallest, while Loongson-3A R4 is the newest and its ISA is almost the superset of all others. To reduce complexity, in QEMU we just define two CPU types:
1, "Loongson-3A1000" CPU which is corresponding to Loongson-3A R1. It is
suitable for TCG because Loongson-3A R1 has fewest ASE.
2, "Loongson-3A4000" CPU which is corresponding to Loongson-3A R4. It is
suitable for KVM because Loongson-3A R4 has the VZ ASE.Hi, Huacei,
Just a couple of practicalities. As you know, we can't upstream this series until correspondent kernel support is upstreamed into kernel. This is my advice, timing-wise:
- I think it is too late (and not good from testing/risk perspective) to shoot for integrating your kernel series into kernel 5.7;
- My advice is to try to upstream your kernel series at the beginning of 5.8 development cycle (which should not be too far)
- Once this is done, it will open the door for integrating this series into QEMU upstream
- This means that combination of kernel 5.8 and QEMU 5.1 will hopefully be a working system from Loongson KVM point of view
- This will also mean we will have relatively sufficient time to test, and possibly fix some new bugs before QEMU 5.1 release.
Quoted 1 line
I hope this tentative plan sounds good to you.
OK, I will try to upstream kernel series at first, and send a V4 of qemu series after that.
Quoted 3 lines
Sincerely,
Aleksandar
Signature · 1 line
Huacai Chen