| Message ID | 1602059975-10115-1-git-send-email-chenhc@lemote.com |
|---|---|
| Headers | show |
| Series | mips: Add Loongson-3 machine support | expand |
On 10/7/20 10:39 AM, Huacai Chen wrote: > Update MIPS KVM type defintition from Linux 5.9-rc6. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > Signed-off-by: Huacai Chen <chenhc@lemote.com> > --- > linux-headers/linux/kvm.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h > index 6683e2e..c138b2f 100644 > --- a/linux-headers/linux/kvm.h > +++ b/linux-headers/linux/kvm.h > @@ -790,9 +790,10 @@ struct kvm_ppc_resize_hpt { > #define KVM_VM_PPC_HV 1 > #define KVM_VM_PPC_PR 2 > > -/* on MIPS, 0 forces trap & emulate, 1 forces VZ ASE */ > -#define KVM_VM_MIPS_TE 0 > +/* on MIPS, 0 indicates auto, 1 forces VZ ASE, 2 forces trap & emulate */ > +#define KVM_VM_MIPS_AUTO 0 > #define KVM_VM_MIPS_VZ 1 > +#define KVM_VM_MIPS_TE 2 > > #define KVM_S390_SIE_PAGE_OFFSET 1 > >
On 10/10/20 2:59 PM, Peter Maydell wrote: > On Wed, 7 Oct 2020 at 09:44, Huacai Chen <zltjiangshi@gmail.com> wrote: >> >> Update MIPS KVM type defintition from Linux 5.9-rc6. >> >> Signed-off-by: Huacai Chen <chenhc@lemote.com> >> --- > > Is this a sync using scripts/update-linux-headers.sh ? > > (I vaguely had the idea of adding a --make-commit option to > that script so it would automatically create a git commit > with a header message saying it was a sync against the > kernel git commit, but I never got round to it.) I just realized you merged this change as commit 94c7fefcb45 ("linux headers: sync to 5.9-rc7") =) > > thanks > -- PMM >
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. And human-translated documents (W.I.P) are available here now: https://github.com/loongson-community/docs/tree/master/English-translation-of-Loongson-manual Both KVM and TCG are available now! We now already have a full functional Linux kernel (based on Linux-5.4.x LTS, the kvm host side and guest side have both been upstream for Linux- 5.9, but Linux-5.9 has not been released yet) here: https://github.com/chenhuacai/linux Of course the upstream kernel is also usable (though it is "unstable" now): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 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 (for KVM mode); 4, Build QEMU-master with this patchset; 5, modprobe kvm (only necessary for KVM mode); 6, Use QEMU with TCG: qemu-system-mips64el -M loongson3-virt,accel=tcg -cpu Loongson-3A1000 -kernel <path_to_kernel> -append ... Use QEMU with KVM: qemu-system-mips64el -M loongson3-virt,accel=kvm -cpu Loongson-3A4000 -kernel <path_to_kernel> -append ... The "-cpu" parameter is optional 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. V3 -> V4: 1, Sync code with upstream; 2, Remove merged patches; 3, Fix build failure without CONFIG_KVM; 4, Add Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>. V4 -> V5: 1, Improve coding style; 2, Remove merged patches; 3, Rename machine name from "loongson3" to "loongson3-virt"; 4, Rework the "loongson3-virt" machine to drop any ISA things; 5, Rework "hw/mips: Implement the kvm_type() hook in MachineClass"; 6, Add Jiaxun Yang as a reviewer of Loongson-3. V5 -> V6: 1, Fix license preamble; 2, Improve commit messages; 3, Add hw/intc/loongson_liointc.c to MAINTAINERS; 4, Fix all possible checkpatch.pl errors and warnings. V7 and V8 have only one patch (machine definition) with some minor improvements. V8 -> V9: 1, Update KVM type definition from kernel; 2, Fix PageMask with variable page size for TCG; 3, Add TCG support (add Loongson-EXT instructions). V9 -> V10: 1, Split fw_cfg to a separate patch; 2, Split boot parameters definition to a local header; 3, Update MIPS machine documentation; 4, Many other improvements suggested by Philippe Mathieu-Daudé. V10 -> V11: 1, Fix some typos; 2, Add Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>. V11 -> V12: 1, Split boot parameter helpers to loongson3_bootp.c; 2, Support both BE and LE host (Loongson guests are always LE). V12 -> V13: 1, Sync code with upstream; 2, Re-enable KVM support for MIPS in meson; Huacai Chen and Jiaxun Yang (9): linux-headers: Update MIPS KVM type defintition meson.build: Re-enable KVM support for MIPS target/mips: Fix PageMask with variable page size target/mips: Add loongson-ext lswc2 group of instructions (Part 1) target/mips: Add loongson-ext lswc2 group of instructions (Part 2) target/mips: Add loongson-ext lsdc2 group of instructions hw/mips: Implement fw_cfg_arch_key_name() hw/mips: Add Loongson-3 machine support docs/system: Update MIPS machine documentation Signed-off-by: Huacai Chen <chenhc@lemote.com> --- default-configs/devices/mips64el-softmmu.mak | 1 + docs/system/cpu-models-mips.rst.inc | 10 +- docs/system/target-mips.rst | 10 + hw/mips/Kconfig | 12 + hw/mips/fw_cfg.c | 35 ++ hw/mips/fw_cfg.h | 19 + hw/mips/loongson3_bootp.c | 162 +++++++ hw/mips/loongson3_bootp.h | 225 ++++++++++ hw/mips/loongson3_virt.c | 615 +++++++++++++++++++++++++++ hw/mips/meson.build | 3 +- linux-headers/linux/kvm.h | 5 +- meson.build | 2 + target/mips/cp0_helper.c | 36 +- target/mips/cpu.h | 1 + target/mips/translate.c | 443 +++++++++++++++++++ 15 files changed, 1567 insertions(+), 12 deletions(-) create mode 100644 hw/mips/fw_cfg.c create mode 100644 hw/mips/fw_cfg.h create mode 100644 hw/mips/loongson3_bootp.c create mode 100644 hw/mips/loongson3_bootp.h create mode 100644 hw/mips/loongson3_virt.c -- 2.7.0