mips: Add Loongson-3 machine support (with KVM)
v2 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.
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 | 29 ++ hw/mips/mips_int.c | 6 +- hw/mips/mips_loongson3.c | 886 +++++++++++++++++++++++++++++++++++ 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 | 84 ++++ 18 files changed, 1281 insertions(+), 11 deletions(-) create mode 100644 hw/mips/common.c create mode 100644 hw/mips/mips_loongson3.c
--
2.7.0
PATCH v2 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
PATCH v2 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 | 29 +++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.c
hw/core/Makefile.objs +1 -1
@@ -16,10 +16,10 @@ 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 +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 +29 -0
@@ -0,0 +1,29 @@ +/* +* 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
PATCH v2 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
hw/mips/mips_int.c +2 -4
@@ -48,16 +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); - } }if (env->CP0_Cause & CP0Ca_IP_mask) {
Signature · 1 line
2.7.0
PATCH v2 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 | 84 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 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 +84 -0
90 lines not on this page · raw message
Signature · 1 line
2.7.0
PATCH v2 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
PATCH v2 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 | 886 +++++++++++++++++++++++++++++++++++ 4 files changed, 898 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 +886 -0
886 lines not on this page · raw message
Signature · 1 line
2.7.0
PATCH v2 7/7 MAINTAINERS: Add myself as Loongson-3 maintainer
In reply to Huacai Chen--- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
@@ -1080,6 +1080,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
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [PATCH for-5.1 V2 0/7] mips: Add Loongson-3 machine support (with KVM)
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
7b568a8 MAINTAINERS: Add myself as Loongson-3 maintainer e188b58 hw/mips: Add Loongson-3 machine support (with KVM) cd58c7b target/mips: Add more CP0 register for save/restore febf0f7 target/mips: Add Loongson-3 CPU definition 811cf86 hw/mips: Add CPU IRQ3 delivery for KVM b1c4913 hw/mips: Implement the kvm_type() hook in MachineClass d5fd437 configure: Add KVM target support for MIPS64
=== OUTPUT BEGIN ===
1/7 Checking commit d5fd4379e217 (configure: Add KVM target support for MIPS64) 2/7 Checking commit b1c4913d34d3 (hw/mips: Implement the kvm_type() hook in MachineClass)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #66:
new file mode 100644
ERROR: superfluous trailing semicolon
#88: FILE: hw/mips/common.c:18:
+ KVMState *s = KVM_STATE(machine->accelerator);;
ERROR: braces {} are necessary for all arms of this statement #91: FILE: hw/mips/common.c:21:
+ if (r > 0)
[...]
ERROR: braces {} are necessary for all arms of this statement #95: FILE: hw/mips/common.c:25:
+ if (r > 0)
[...]
total: 3 errors, 1 warnings, 68 lines checked
Patch 2/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
3/7 Checking commit 811cf860565a (hw/mips: Add CPU IRQ3 delivery for KVM)
ERROR: braces {} are necessary for all arms of this statement #24: FILE: hw/mips/mips_int.c:51:
+ if (kvm_enabled() && (irq == 2 || irq == 3))
[...]
total: 1 errors, 0 warnings, 18 lines checked
Patch 3/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
4/7 Checking commit febf0f756c77 (target/mips: Add Loongson-3 CPU definition)
ERROR: code indent should never use tabs
#133: FILE: target/mips/translate_init.inc.c:815:
+^I^I (3 << CP0C2_SA),$
ERROR: code indent should never use tabs
#162: FILE: target/mips/translate_init.inc.c:844:
+^I^I (15 << CP0C2_SA),$
WARNING: line over 80 characters
#173: FILE: target/mips/translate_init.inc.c:855:
+ .CP0_Config6 = (1 << CP0C6_VCLRU) | (1 << CP0C6_DCLRU) | (1 << CP0C6_SFBEN) |
ERROR: line over 90 characters
#174: FILE: target/mips/translate_init.inc.c:856:
+ (1 << CP0C6_FLTINT) | (1 << CP0C6_INSTPREF) | (1 << CP0C6_DATAPREF),
ERROR: line over 90 characters
#176: FILE: target/mips/translate_init.inc.c:858:
+ (1 << CP0C6_KE) | (1 << CP0C6_VTLBONLY) | (1 << CP0C6_LASX) |
WARNING: line over 80 characters
#181: FILE: target/mips/translate_init.inc.c:863:
+ (1 << CP0C6_PIXUEN) | (1 << CP0C6_DISBLKLYEN) |
WARNING: line over 80 characters
#187: FILE: target/mips/translate_init.inc.c:869:
+ .CP0_Config7_rw_bitmask = (1 << CP0C7_NAPCGEN) | (1 << CP0C7_UNIMUEN) | \
total: 4 errors, 3 warnings, 162 lines checked
Patch 4/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
5/7 Checking commit cd58c7be6558 (target/mips: Add more CP0 register for save/restore) 6/7 Checking commit e188b58a2e06 (hw/mips: Add Loongson-3 machine support (with KVM))
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #78:
new file mode 100644
ERROR: code indent should never use tabs
#126: FILE: hw/mips/mips_loongson3.c:44:
+#define INITRD_OFFSET^I^I0x04000000$
ERROR: code indent should never use tabs
#127: FILE: hw/mips/mips_loongson3.c:45:
+#define BOOTPARAM_ADDR^I^I0x8ff00000$
ERROR: code indent should never use tabs
#128: FILE: hw/mips/mips_loongson3.c:46:
+#define BOOTPARAM_PHYADDR^I0x0ff00000$
ERROR: code indent should never use tabs
#129: FILE: hw/mips/mips_loongson3.c:47:
+#define CFG_ADDR ^I^I0x0f100000$
ERROR: code indent should never use tabs
#130: FILE: hw/mips/mips_loongson3.c:48:
+#define FW_CONF_ADDR^I^I0x0fff0000$
ERROR: code indent should never use tabs
#131: FILE: hw/mips/mips_loongson3.c:49:
+#define PM_MMIO_ADDR^I^I0x10080000$
ERROR: code indent should never use tabs
#132: FILE: hw/mips/mips_loongson3.c:50:
+#define PM_MMIO_SIZE^I^I0x100$
ERROR: code indent should never use tabs
#133: FILE: hw/mips/mips_loongson3.c:51:
+#define PM_CNTL_MODE^I^I0x10$
ERROR: code indent should never use tabs
#143: FILE: hw/mips/mips_loongson3.c:61:
+#define PCIE_IRQ_BASE^I 3$
ERROR: missing space after struct definition
#158: FILE: hw/mips/mips_loongson3.c:76:
+ struct mem_map{
WARNING: line over 80 characters
#217: FILE: hw/mips/mips_loongson3.c:135:
+ uint32_t fan_policy; /* see arch/mips/include/asm/mach-loongson/loongson_hwmon.h */
WARNING: line over 80 characters
#352: FILE: hw/mips/mips_loongson3.c:270:
+ 0x40086000, /* mfc0 t0, CP0_STATUS */
WARNING: line over 80 characters
#353: FILE: hw/mips/mips_loongson3.c:271:
+ 0x240900E2, /* li t1, 0x00e2 #{cu3,cu2,cu1,cu0,status_fr}<={0111} */
WARNING: line over 80 characters
#354: FILE: hw/mips/mips_loongson3.c:272:
+ 0x01094025, /* or t0, t0, t1 */
WARNING: line over 80 characters
#355: FILE: hw/mips/mips_loongson3.c:273:
+ 0x40886000, /* mtc0 t0, CP0_STATUS */
WARNING: line over 80 characters
#357: FILE: hw/mips/mips_loongson3.c:275:
+ 0x40086000, /* mfc0 t0, CP0_STATUS */
WARNING: line over 80 characters
#358: FILE: hw/mips/mips_loongson3.c:276:
+ 0x3C090040, /* lui t1, 0x40 #bev */
WARNING: line over 80 characters
#359: FILE: hw/mips/mips_loongson3.c:277:
+ 0x01094025, /* or t0, t0, t1 */
WARNING: line over 80 characters
#360: FILE: hw/mips/mips_loongson3.c:278:
+ 0x40886000, /* mtc0 t0, CP0_STATUS */
WARNING: line over 80 characters
#362: FILE: hw/mips/mips_loongson3.c:280:
+ 0x40806800, /* mtc0 zero, CP0_CAUSE */
WARNING: line over 80 characters
#364: FILE: hw/mips/mips_loongson3.c:282:
+ 0x400A7801, /* mfc0 t2, $15, 1 */
WARNING: line over 80 characters
#365: FILE: hw/mips/mips_loongson3.c:283:
+ 0x314A00FF, /* andi t2, 0x0ff */
WARNING: line over 80 characters
#366: FILE: hw/mips/mips_loongson3.c:284:
+ 0x3C089000, /* dli t0, 0x900000003ff01000 */
WARNING: line over 80 characters
#371: FILE: hw/mips/mips_loongson3.c:289:
+ 0x314B0003, /* andi t3, t2, 0x3 #local cpuid */
WARNING: line over 80 characters
#372: FILE: hw/mips/mips_loongson3.c:290:
+ 0x000B5A00, /* sll t3, 8 */
WARNING: line over 80 characters
#373: FILE: hw/mips/mips_loongson3.c:291:
+ 0x010B4025, /* or t0, t0, t3 */
WARNING: line over 80 characters
#374: FILE: hw/mips/mips_loongson3.c:292:
+ 0x314C000C, /* andi t4, t2, 0xc #node id */
WARNING: line over 80 characters
#375: FILE: hw/mips/mips_loongson3.c:293:
+ 0x000C62BC, /* dsll t4, 42 */
WARNING: line over 80 characters
#376: FILE: hw/mips/mips_loongson3.c:294:
+ 0x010C4025, /* or t0, t0, t4 */
WARNING: line over 80 characters
#377: FILE: hw/mips/mips_loongson3.c:295:
+ /* waitforinit: */
WARNING: line over 80 characters
#378: FILE: hw/mips/mips_loongson3.c:296:
+ 0xDD020020, /* ld v0, FN_OFF(t0) #FN_OFF 0x020 */
WARNING: line over 80 characters
#379: FILE: hw/mips/mips_loongson3.c:297:
+ 0x1040FFFE, /* beqz v0, waitforinit */
WARNING: line over 80 characters
#380: FILE: hw/mips/mips_loongson3.c:298:
+ 0x00000000, /* nop */
WARNING: line over 80 characters
#381: FILE: hw/mips/mips_loongson3.c:299:
+ 0xDD1D0028, /* ld sp, SP_OFF(t0) #FN_OFF 0x028 */
WARNING: line over 80 characters
#382: FILE: hw/mips/mips_loongson3.c:300:
+ 0xDD1C0030, /* ld gp, GP_OFF(t0) #FN_OFF 0x030 */
WARNING: line over 80 characters
#383: FILE: hw/mips/mips_loongson3.c:301:
+ 0xDD050038, /* ld a1, A1_OFF(t0) #FN_OFF 0x038 */
WARNING: line over 80 characters
#384: FILE: hw/mips/mips_loongson3.c:302:
+ 0x00400008, /* jr v0 #byebye */
WARNING: line over 80 characters
#385: FILE: hw/mips/mips_loongson3.c:303:
+ 0x00000000, /* nop */
WARNING: line over 80 characters
#386: FILE: hw/mips/mips_loongson3.c:304:
+ 0x1000FFFF, /* 1: b 1b */
WARNING: line over 80 characters
#387: FILE: hw/mips/mips_loongson3.c:305:
+ 0x00000000, /* nop */
WARNING: line over 80 characters
#389: FILE: hw/mips/mips_loongson3.c:307:
+ /* Reset */
WARNING: line over 80 characters
#390: FILE: hw/mips/mips_loongson3.c:308:
+ 0x3C0C9000, /* dli t0, 0x9000000010080010 */
WARNING: line over 80 characters
#396: FILE: hw/mips/mips_loongson3.c:314:
+ 0x240D0000, /* li t1, 0x00 */
WARNING: line over 80 characters
#397: FILE: hw/mips/mips_loongson3.c:315:
+ 0xA18D0000, /* sb t1, (t0) */
WARNING: line over 80 characters
#398: FILE: hw/mips/mips_loongson3.c:316:
+ 0x1000FFFF, /* 1: b 1b */
WARNING: line over 80 characters
#399: FILE: hw/mips/mips_loongson3.c:317:
+ 0x00000000, /* nop */
WARNING: line over 80 characters
#401: FILE: hw/mips/mips_loongson3.c:319:
+ /* Shutdown */
WARNING: line over 80 characters
#402: FILE: hw/mips/mips_loongson3.c:320:
+ 0x3C0C9000, /* dli t0, 0x9000000010080010 */
WARNING: line over 80 characters
#408: FILE: hw/mips/mips_loongson3.c:326:
+ 0x240D00FF, /* li t1, 0xff */
WARNING: line over 80 characters
#409: FILE: hw/mips/mips_loongson3.c:327:
+ 0xA18D0000, /* sb t1, (t0) */
WARNING: line over 80 characters
#410: FILE: hw/mips/mips_loongson3.c:328:
+ 0x1000FFFF, /* 1: b 1b */
WARNING: line over 80 characters
#411: FILE: hw/mips/mips_loongson3.c:329:
+ 0x00000000 /* nop */
WARNING: line over 80 characters
#419: FILE: hw/mips/mips_loongson3.c:337:
+static void loongson3_pm_write(void *opaque, hwaddr addr, uint64_t val,unsigned size)
ERROR: space required after that ',' (ctx:VxV)
#419: FILE: hw/mips/mips_loongson3.c:337:
+static void loongson3_pm_write(void *opaque, hwaddr addr, uint64_t val,unsigned size)
^
ERROR: braces {} are necessary for all arms of this statement #421: FILE: hw/mips/mips_loongson3.c:339:
+ if (addr != PM_CNTL_MODE)
[...]
ERROR: do not use assignment in if condition
#469: FILE: hw/mips/mips_loongson3.c:387:
+ if ((fd = open("/proc/cpuinfo", O_RDONLY)) == -1) {
ERROR: trailing statements should be on next line
#482: FILE: hw/mips/mips_loongson3.c:400:
+ while (*buf_p != '@') buf_p++;
ERROR: braces {} are necessary for all arms of this statement #482: FILE: hw/mips/mips_loongson3.c:400:
+ while (*buf_p != '@') buf_p++;
[...]
ERROR: trailing statements should be on next line
#487: FILE: hw/mips/mips_loongson3.c:405:
+ while ((*buf_p >= '0') && (*buf_p <= '9')) buf_p++;
ERROR: braces {} are necessary for all arms of this statement #487: FILE: hw/mips/mips_loongson3.c:405:
+ while ((*buf_p >= '0') && (*buf_p <= '9')) buf_p++;
[...]
ERROR: braces {} are necessary for all arms of this statement #502: FILE: hw/mips/mips_loongson3.c:420:
+ if (!c->cpu_clock_freq)
[...]
ERROR: spaces required around that '+=' (ctx:VxW)
#595: FILE: hw/mips/mips_loongson3.c:513:
+ p+= align(sizeof(struct board_devices));
^ERROR: spaces required around that '+=' (ctx:VxW)
#599: FILE: hw/mips/mips_loongson3.c:517:
+ p+= align(sizeof(struct loongson_special_attribute));
^WARNING: line over 80 characters
#642: FILE: hw/mips/mips_loongson3.c:560:
+ fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)current_machine->smp.max_cpus);
ERROR: spaces required around that '+' (ctx:VxV)
#684: FILE: hw/mips/mips_loongson3.c:602:
+ ret += (1 + snprintf(params_buf+ret, 256 - ret, "%s",
^
ERROR: spaces required around that '*' (ctx:VxV)
#688: FILE: hw/mips/mips_loongson3.c:606:
+ *parg_env++ = BOOTPARAM_ADDR + 4*ret;
^WARNING: line over 80 characters
#791: FILE: hw/mips/mips_loongson3.c:709:
+ isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(), &error_abort);
WARNING: line over 80 characters
#821: FILE: hw/mips/mips_loongson3.c:739:
+ memory_region_add_subregion(get_system_memory(), VIRT_PCI_ECAM_BASE, ecam_alias);
WARNING: line over 80 characters
#827: FILE: hw/mips/mips_loongson3.c:745:
+ memory_region_add_subregion(get_system_memory(), VIRT_PCI_MEM_BASE, mmio_alias);
WARNING: line over 80 characters
#832: FILE: hw/mips/mips_loongson3.c:750:
+ memory_region_add_subregion(get_system_memory(), VIRT_PCI_IO_BASE, pio_alias);
ERROR: space required before the open parenthesis '(' #843: FILE: hw/mips/mips_loongson3.c:761:
+ for(i = 0; i < nb_nics; i++) {
ERROR: braces {} are necessary for all arms of this statement #846: FILE: hw/mips/mips_loongson3.c:764:
+ if (!nd->model)
[...]
ERROR: braces {} are necessary for all arms of this statement #870: FILE: hw/mips/mips_loongson3.c:788:
+ if (!machine->cpu_type)
[...]
ERROR: Error messages should not contain newlines
#874: FILE: hw/mips/mips_loongson3.c:792:
+ error_report("Loongson-3/TCG need cpu type Loongson-3A1000\n");
ERROR: braces {} are necessary for all arms of this statement #878: FILE: hw/mips/mips_loongson3.c:796:
+ if (!machine->cpu_type)
[...]
ERROR: Error messages should not contain newlines
#882: FILE: hw/mips/mips_loongson3.c:800:
+ error_report("Loongson-3/KVM need cpu type Loongson-3A4000\n");
WARNING: line over 80 characters
#903: FILE: hw/mips/mips_loongson3.c:821:
+ /* Allocate RAM/BIOS, 0x00000000~0x10000000 is alias of 0x80000000~0x90000000 */
WARNING: line over 80 characters
#904: FILE: hw/mips/mips_loongson3.c:822:
+ memory_region_init_rom(bios, NULL, "loongson3.bios", BIOS_SIZE, &error_fatal);
ERROR: line over 90 characters
#905: FILE: hw/mips/mips_loongson3.c:823:
+ memory_region_init_alias(ram, NULL, "loongson3.lowram", machine->ram, 0, 256 * 0x100000);
ERROR: line over 90 characters
#906: FILE: hw/mips/mips_loongson3.c:824:
+ memory_region_init_io(iomem, NULL, &loongson3_pm_ops, NULL, "loongson3_pm", PM_MMIO_SIZE);
WARNING: line over 80 characters
#924: FILE: hw/mips/mips_loongson3.c:842:
+ rom_add_blob_fixed("bios", bios_boot_code, sizeof(bios_boot_code), 0x1fc00000LL);
WARNING: line over 80 characters
#945: FILE: hw/mips/mips_loongson3.c:863:
+ rom_add_blob_fixed("fw_conf", (void*)&fw_config, sizeof(fw_config), FW_CONF_ADDR);
ERROR: "(foo*)" should be "(foo *)"
#945: FILE: hw/mips/mips_loongson3.c:863:
+ rom_add_blob_fixed("fw_conf", (void*)&fw_config, sizeof(fw_config), FW_CONF_ADDR);
ERROR: braces {} are necessary for all arms of this statement #952: FILE: hw/mips/mips_loongson3.c:870:
+ if (serial_hd(0))
[...]
ERROR: line over 90 characters
#953: FILE: hw/mips/mips_loongson3.c:871:
+ serial_mm_init(address_space_mem, 0x1fe001e0, 0, env->irq[2], 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
total: 33 errors, 53 warnings, 915 lines checked
Patch 6/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
7/7 Checking commit 7b568a8bbbe2 (MAINTAINERS: Add myself as Loongson-3 maintainer) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]