| Message ID | 1602831120-3377-1-git-send-email-chenhc@lemote.com |
|---|---|
| Headers | show |
| Series | mips: Add Loongson-3 machine support | expand |
Patchew URL: https://patchew.org/QEMU/1602831120-3377-1-git-send-email-chenhc@lemote.com/ Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 1602831120-3377-1-git-send-email-chenhc@lemote.com Subject: [PATCH V14 0/8] mips: Add Loongson-3 machine support === 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 === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu * [new tag] patchew/1602831120-3377-1-git-send-email-chenhc@lemote.com -> patchew/1602831120-3377-1-git-send-email-chenhc@lemote.com Switched to a new branch 'test' d292df4 docs/system: Update MIPS machine documentation 4e63ead hw/mips: Add Loongson-3 machine support 1bf0737 hw/mips: Add Loongson-3 boot parameter helpers bd43b2f hw/mips: Implement fw_cfg_arch_key_name() f93634a target/mips: Add loongson-ext lsdc2 group of instructions b55eee0 target/mips: Add loongson-ext lswc2 group of instructions (Part 2) 2c2eaaa target/mips: Add loongson-ext lswc2 group of instructions (Part 1) ab68efd target/mips: Fix PageMask with variable page size === OUTPUT BEGIN === 1/8 Checking commit ab68efdc70ef (target/mips: Fix PageMask with variable page size) 2/8 Checking commit 2c2eaaabbd3a (target/mips: Add loongson-ext lswc2 group of instructions (Part 1)) 3/8 Checking commit b55eee07bfbe (target/mips: Add loongson-ext lswc2 group of instructions (Part 2)) 4/8 Checking commit f93634a586de (target/mips: Add loongson-ext lsdc2 group of instructions) 5/8 Checking commit bd43b2ff95e9 (hw/mips: Implement fw_cfg_arch_key_name()) WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #16: new file mode 100644 total: 0 errors, 1 warnings, 60 lines checked Patch 5/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 6/8 Checking commit 1bf0737aee8c (hw/mips: Add Loongson-3 boot parameter helpers) WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #15: new file mode 100644 WARNING: line over 80 characters #47: FILE: hw/mips/loongson3_bootp.c:28: +static struct efi_cpuinfo_loongson *init_cpu_info(void *g_cpuinfo, uint64_t cpu_freq) WARNING: line over 80 characters #66: FILE: hw/mips/loongson3_bootp.c:47: +static struct efi_memory_map_loongson *init_memory_map(void *g_map, uint64_t ram_size) total: 0 errors, 3 warnings, 394 lines checked Patch 6/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 7/8 Checking commit 4e63ead64501 (hw/mips: Add Loongson-3 machine support) WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #80: new file mode 100644 ERROR: line over 90 characters #151: FILE: hw/mips/loongson3_virt.c:67: + * 3, http://www.anheng.com.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin ERROR: line over 90 characters #152: FILE: hw/mips/loongson3_virt.c:68: + * 4, http://mirrors.ustc.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin ERROR: line over 90 characters #153: FILE: hw/mips/loongson3_virt.c:69: + * 5, http://mirrors.nju.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin ERROR: line over 90 characters #154: FILE: hw/mips/loongson3_virt.c:70: + * 6, https://mirrors.tuna.tsinghua.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin ERROR: line over 90 characters #155: FILE: hw/mips/loongson3_virt.c:71: + * 7, https://mirrors.bfsu.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin ERROR: line over 90 characters #156: FILE: hw/mips/loongson3_virt.c:72: + * 8, https://mirrors.cloud.tencent.com/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin WARNING: line over 80 characters #204: FILE: hw/mips/loongson3_virt.c:120: +static void loongson3_pm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) WARNING: line over 80 characters #279: FILE: hw/mips/loongson3_virt.c:195: + loaderparams.a2 = cpu_mips_phys_to_kseg0(NULL, loader_rommap[LOADER_PARAM].base); WARNING: line over 80 characters #361: FILE: hw/mips/loongson3_virt.c:277: + fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)current_machine->smp.max_cpus); WARNING: line over 80 characters #409: FILE: hw/mips/loongson3_virt.c:325: + sprintf(highmemenv, "%ld", (unsigned long)(loaderparams.ram_size / MiB) - 256); WARNING: line over 80 characters #495: FILE: hw/mips/loongson3_virt.c:411: +static inline void loongson3_virt_devices_init(MachineState *machine, DeviceState *pic) WARNING: line over 80 characters #526: FILE: hw/mips/loongson3_virt.c:442: + get_system_io(), 0, virt_memmap[VIRT_PCIE_PIO].size); WARNING: line over 80 characters #640: FILE: hw/mips/loongson3_virt.c:556: + /* Allocate RAM/BIOS, 0x00000000~0x10000000 is alias of 0x80000000~0x90000000 */ total: 6 errors, 8 warnings, 660 lines checked Patch 7/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. 8/8 Checking commit d292df465eb8 (docs/system: Update MIPS machine documentation) === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/1602831120-3377-1-git-send-email-chenhc@lemote.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
On 10/16/20 8:52 AM, Huacai Chen wrote: > Add Loongson-3A CPU models and Loongson-3 based machine description. > > Signed-off-by: Huacai Chen <chenhc@lemote.com> > --- > docs/system/cpu-models-mips.rst.inc | 10 ++++++++-- > docs/system/target-mips.rst | 10 ++++++++++ > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/docs/system/cpu-models-mips.rst.inc b/docs/system/cpu-models-mips.rst.inc > index 499b5b6fed..02cc4bb884 100644 > --- a/docs/system/cpu-models-mips.rst.inc > +++ b/docs/system/cpu-models-mips.rst.inc > @@ -48,11 +48,17 @@ across all desired hosts. > ``I6400`` > MIPS64 Processor (Release 6, 2014) > > +``Loongson-2E`` > + MIPS64 Processor (Loongson 2, 2006) > + > ``Loongson-2F`` > MIPS64 Processor (Loongson 2, 2008) > > -``Loongson-2E`` > - MIPS64 Processor (Loongson 2, 2006) > +``Loongson-3A1000`` > + MIPS64 Processor (Loongson 3, 2010) > + > +``Loongson-3A4000`` > + MIPS64 Processor (Loongson 3, 2018) > > ``mips64dspr2`` > MIPS64 Processor (Release 2, 2006) I'm queuing the CPU models part for now. > diff --git a/docs/system/target-mips.rst b/docs/system/target-mips.rst > index cd2a931edf..138441bdec 100644 > --- a/docs/system/target-mips.rst > +++ b/docs/system/target-mips.rst > @@ -84,6 +84,16 @@ The Fuloong 2E emulation supports: > > - RTL8139D as a network card chipset > > +The Loongson-3 virtual platform emulation supports: > + > +- Loongson 3A CPU > + > +- LIOINTC as interrupt controller > + > +- GPEX and virtio as peripheral devices > + > +- Both KVM and TCG supported > + > The mipssim pseudo board emulation provides an environment similar to > what the proprietary MIPS emulator uses for running Linux. It supports: > >
On 10/16/20 8:51 AM, Huacai Chen wrote: > 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 Patches 2-4 applied to mips-next (fixing the bisectability build failure in patch 2 & 3).
Hi, Philippe, On Sat, Oct 17, 2020 at 11:58 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > On 10/16/20 8:51 AM, Huacai Chen wrote: > > Add Loongson-3 based machine support, it use liointc as the interrupt > > controler and use GPEX as the pci controller. Currently it can work with > > both TCG and KVM. > > > > As the machine model is not based on any exiting physical hardware, the > > name of the machine is "loongson3-virt". It may be superseded in future > > by a real machine model. If this happens, then a regular deprecation > > procedure shall occur for "loongson3-virt" machine. > > > > 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_defconfig; > > 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. > > > > Signed-off-by: Huacai Chen <chenhc@lemote.com> > > Co-developed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > > --- > > default-configs/devices/mips64el-softmmu.mak | 1 + > > hw/mips/Kconfig | 12 + > > hw/mips/loongson3_virt.c | 615 +++++++++++++++++++ > > hw/mips/meson.build | 2 +- > > 4 files changed, 629 insertions(+), 1 deletion(-) > > create mode 100644 hw/mips/loongson3_virt.c > > > > diff --git a/default-configs/devices/mips64el-softmmu.mak b/default-configs/devices/mips64el-softmmu.mak > > index 9f8a3ef156..26c660a05c 100644 > > --- a/default-configs/devices/mips64el-softmmu.mak > > +++ b/default-configs/devices/mips64el-softmmu.mak > > @@ -3,6 +3,7 @@ > > include mips-softmmu-common.mak > > CONFIG_IDE_VIA=y > > CONFIG_FULOONG=y > > +CONFIG_LOONGSON3V=y > > CONFIG_ATI_VGA=y > > CONFIG_RTL8139_PCI=y > > CONFIG_JAZZ=y > > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > > index 67d39c56a4..6562b346ab 100644 > > --- a/hw/mips/Kconfig > > +++ b/hw/mips/Kconfig > > @@ -45,6 +45,18 @@ config FULOONG > > bool > > select PCI_BONITO > > > > +config LOONGSON3V > > + bool > > + select PCKBD > > + select SERIAL > > + select GOLDFISH_RTC > > + select LOONGSON_LIOINTC > > + select PCI_DEVICES > > + select PCI_EXPRESS_GENERIC_BRIDGE > > + select VIRTIO_VGA > > + select QXL if SPICE > > + select MSI_NONBROKEN > > + > > config MIPS_CPS > > bool > > select PTIMER > > diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c > > new file mode 100644 > > index 0000000000..c298a16793 > > --- /dev/null > > +++ b/hw/mips/loongson3_virt.c > > @@ -0,0 +1,627 @@ > > +/* > > + * Generic Loongson-3 Platform support > > + * > > + * Copyright (c) 2017-2020 Huacai Chen (chenhc@lemote.com) > > + * Copyright (c) 2017-2020 Jiaxun Yang <jiaxun.yang@flygoat.com> > > + * > > + * This program is free software: you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License as published by > > + * the Free Software Foundation, either version 2 of the License, or > > + * (at your option) any later version. > > + * > > + * This program is distributed in the hope that it will be useful, > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > + * GNU General Public License for more details. > > + * > > + * You should have received a copy of the GNU General Public License > > + * along with this program. If not, see <https://www.gnu.org/licenses/>. > > + */ > > + > > +/* > > + * Generic virtualized PC Platform based on Loongson-3 CPU (MIPS64R2 with > > + * extensions, 800~2000MHz) > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qemu-common.h" > > +#include "qemu/units.h" > > +#include "qemu/cutils.h" > > +#include "qapi/error.h" > > +#include "cpu.h" > > +#include "elf.h" > > +#include "kvm_mips.h" > > +#include "hw/boards.h" > > +#include "hw/char/serial.h" > > +#include "hw/mips/mips.h" > > +#include "hw/mips/cpudevs.h" > > +#include "hw/mips/fw_cfg.h" > > +#include "hw/mips/loongson3_bootp.h" > > +#include "hw/misc/unimp.h" > > +#include "hw/intc/i8259.h" > > +#include "hw/loader.h" > > +#include "hw/isa/superio.h" > > +#include "hw/pci/msi.h" > > +#include "hw/pci/pci.h" > > +#include "hw/pci/pci_host.h" > > +#include "hw/pci-host/gpex.h" > > +#include "hw/rtc/mc146818rtc.h" > > +#include "hw/usb.h" > > +#include "net/net.h" > > +#include "exec/address-spaces.h" > > +#include "sysemu/kvm.h" > > +#include "sysemu/qtest.h" > > +#include "sysemu/reset.h" > > +#include "sysemu/runstate.h" > > +#include "qemu/log.h" > > +#include "qemu/error-report.h" > > + > > +#define PM_CNTL_MODE 0x10 > > + > > +#define LOONGSON_MAX_VCPUS 16 > > + > > +/* > > + * Loongson-3's virtual machine BIOS can be obtained here: > > + * 1, https://github.com/loongson-community/firmware-nonfree > > + * 2, http://dev.lemote.com:8000/files/firmware/UEFI/KVM/bios_loongson3.bin > > I'd simply list #2, as it seems the official. Hmmm, let me remove all mirrors and list #1, #2. because there may be some trouble to access #2 if you are not in China. > > The BIOS is extremly slow (eating 100% of a core) when trying > to list the devices: > > Shell> devices > T D > Y C I > P F A > CTRL E G G #P #D #C Device Name > ==== = = = == == === > ========================================================= > [50sec here] > 23 R - - 0 1 1 > VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1) > 30 R - - 0 1 4 PciRoot(0x0) > 36 D - - 1 0 0 Primary Console Input Device > 37 D - - 2 0 0 Primary Console Output Device > 38 D - - 1 0 0 Primary Standard Error Device > 66 D - - 1 0 0 PciRoot(0x0)/Pci(0x0,0x0) > 67 B - - 1 1 1 QEMU Video PCI Adapter > 68 D - - 1 2 0 Usb Universal Host Controller > 69 B - - 1 2 1 Virtio Network Device > > Is that a known issue? Yes, it is, the virtual BIOS is a modified UEFI from real hardware, it try to load many modules such as grub. In current implementation, TCG has a poor performance if there are lots of memory access. > > > + * 3, http://www.anheng.com.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + * 4, http://mirrors.ustc.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + * 5, http://mirrors.nju.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + * 6, https://mirrors.tuna.tsinghua.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + * 7, https://mirrors.bfsu.edu.cn/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + * 8, https://mirrors.cloud.tencent.com/loongson/firmware-nonfree/uefi/loongson3-virt/bios_loongson3.bin > > + */ > > +#define LOONGSON3_BIOSNAME "bios_loongson3.bin" > > + > > +#define UART_IRQ 0 > > +#define RTC_IRQ 1 > > +#define PCIE_IRQ_BASE 2 > > + > > +const struct MemmapEntry virt_memmap[] = { > > + [VIRT_LOWMEM] = { 0x00000000, 0x10000000 }, > > + [VIRT_PM] = { 0x10080000, 0x100 }, > > + [VIRT_FW_CFG] = { 0x10080100, 0x100 }, > > + [VIRT_RTC] = { 0x10081000, 0x1000 }, > > + [VIRT_PCIE_PIO] = { 0x18000000, 0x80000 }, > > + [VIRT_PCIE_ECAM] = { 0x1a000000, 0x2000000 }, > > + [VIRT_BIOS_ROM] = { 0x1fc00000, 0x200000 }, > > + [VIRT_UART] = { 0x1fe001e0, 0x8 }, > > + [VIRT_LIOINTC] = { 0x3ff01400, 0x64 }, > > + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, > > + [VIRT_HIGHMEM] = { 0x80000000, 0x0 }, /* Variable */ > > +}; > > + > > +static const struct MemmapEntry loader_memmap[] = { > > + [LOADER_KERNEL] = { 0x00000000, 0x4000000 }, > > + [LOADER_INITRD] = { 0x04000000, 0x0 }, /* Variable */ > > + [LOADER_CMDLINE] = { 0x0ff00000, 0x100000 }, > > +}; > > + > > +static const struct MemmapEntry loader_rommap[] = { > > + [LOADER_BOOTROM] = { 0x1fc00000, 0x1000 }, > > + [LOADER_PARAM] = { 0x1fc01000, 0x10000 }, > > +}; > > + > > +static struct _loaderparams { > > + uint64_t cpu_freq; > > + uint64_t ram_size; > > + const char *kernel_cmdline; > > + const char *kernel_filename; > > + const char *initrd_filename; > > + uint64_t kernel_entry; > > + uint64_t a0, a1, a2; > > +} loaderparams; > > + > > +static uint64_t loongson3_pm_read(void *opaque, hwaddr addr, unsigned size) > > +{ > > + return 0; > > +} > > + > > +static void loongson3_pm_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) > > +{ > > + if (addr != PM_CNTL_MODE) { > > + return; > > + } > > + > > + switch (val) { > > + case 0x00: > > + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); > > + return; > > + case 0xff: > > + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > > + return; > > + default: > > + return; > > + } > > +} > > + > > +static const MemoryRegionOps loongson3_pm_ops = { > > + .read = loongson3_pm_read, > > + .write = loongson3_pm_write, > > + .endianness = DEVICE_NATIVE_ENDIAN, > > +}; > > + > > +#define DEF_TCG_FREQ (200 * 1000 * 1000) > > +#define DEF_KVM_FREQ (1600 * 1000 * 1000) > > + > > +static uint64_t get_cpu_freq(void) > > Please rename get_cpu_freq_hz(). OK. > > > +{ > > +#ifdef CONFIG_KVM > > + int ret; > > + uint64_t freq; > > + struct kvm_one_reg freq_reg = { > > + .id = KVM_REG_MIPS_COUNT_HZ, > > + .addr = (uintptr_t)(&freq) > > + }; > > + > > + if (kvm_enabled()) { > > This is not working as expected... as this returns TRUE > using TCG on x86. I will improve this, as you listed below. > > > + ret = kvm_vcpu_ioctl(first_cpu, KVM_GET_ONE_REG, &freq_reg); > > + if (ret < 0) { > > + return DEF_KVM_FREQ; > > + } > > + return freq * 2; > > + } else { > > + /* > > + * TCG has a default CP0 Timer period 10 ns, which is 100MHz, > > + * CPU frequency is defined as double of CP0 timer frequency. > > + */ > > + return DEF_TCG_FREQ; > > + } > > +#else > > + return DEF_TCG_FREQ; > > +#endif > > +} > > + > > +static void init_boot_param(void) > > +{ > > + void *p; > > + struct boot_params *bp; > > + > > + p = g_malloc0(loader_rommap[LOADER_PARAM].size); > > + bp = p; > > + > > + stw_le_p(&bp->efi.smbios.vers, 1); > > + init_reset_system(&(bp->reset_system)); > > + p += ROUND_UP(sizeof(struct boot_params), 64); > > + init_loongson_params(&(bp->efi.smbios.lp), p, > > + loaderparams.cpu_freq, loaderparams.ram_size); > > + > > + rom_add_blob_fixed("params_rom", bp, > > + loader_rommap[LOADER_PARAM].size, > > + loader_rommap[LOADER_PARAM].base); > > + > > + g_free(bp); > > + > > + loaderparams.a2 = cpu_mips_phys_to_kseg0(NULL, loader_rommap[LOADER_PARAM].base); > > +} > > + > > +static void init_boot_rom(void) > > +{ > > + const unsigned int boot_code[] = { > > + 0x40086000, /* mfc0 t0, CP0_STATUS */ > > + 0x240900E4, /* li t1, 0xe4 #set kx, sx, ux, erl */ > > + 0x01094025, /* or t0, t0, t1 */ > > + 0x3C090040, /* lui t1, 0x40 #set bev */ > > + 0x01094025, /* or t0, t0, t1 */ > > + 0x40886000, /* mtc0 t0, CP0_STATUS */ > > + 0x00000000, > > + 0x40806800, /* mtc0 zero, CP0_CAUSE */ > > + 0x00000000, > > + 0x400A7801, /* mfc0 t2, $15, 1 */ > > + 0x314A00FF, /* andi t2, 0x0ff */ > > + 0x3C089000, /* dli t0, 0x900000003ff01000 */ > > + 0x00084438, > > + 0x35083FF0, > > + 0x00084438, > > + 0x35081000, > > + 0x314B0003, /* andi t3, t2, 0x3 #local cpuid */ > > + 0x000B5A00, /* sll t3, 8 */ > > + 0x010B4025, /* or t0, t0, t3 */ > > + 0x314C000C, /* andi t4, t2, 0xc #node id */ > > + 0x000C62BC, /* dsll t4, 42 */ > > + 0x010C4025, /* or t0, t0, t4 */ > > + /* WaitForInit: */ > > + 0xDD020020, /* ld v0, FN_OFF(t0) #FN_OFF 0x020 */ > > + 0x1040FFFE, /* beqz v0, WaitForInit */ > > + 0x00000000, /* nop */ > > + 0xDD1D0028, /* ld sp, SP_OFF(t0) #FN_OFF 0x028 */ > > + 0xDD1C0030, /* ld gp, GP_OFF(t0) #FN_OFF 0x030 */ > > + 0xDD050038, /* ld a1, A1_OFF(t0) #FN_OFF 0x038 */ > > + 0x00400008, /* jr v0 #byebye */ > > + 0x00000000, /* nop */ > > + 0x1000FFFF, /* 1: b 1b */ > > + 0x00000000, /* nop */ > > + > > + /* Reset */ > > + 0x3C0C9000, /* dli t0, 0x9000000010080010 */ > > + 0x358C0000, > > + 0x000C6438, > > + 0x358C1008, > > + 0x000C6438, > > + 0x358C0010, > > + 0x240D0000, /* li t1, 0x00 */ > > + 0xA18D0000, /* sb t1, (t0) */ > > + 0x1000FFFF, /* 1: b 1b */ > > + 0x00000000, /* nop */ > > + > > + /* Shutdown */ > > + 0x3C0C9000, /* dli t0, 0x9000000010080010 */ > > + 0x358C0000, > > + 0x000C6438, > > + 0x358C1008, > > + 0x000C6438, > > + 0x358C0010, > > + 0x240D00FF, /* li t1, 0xff */ > > + 0xA18D0000, /* sb t1, (t0) */ > > + 0x1000FFFF, /* 1: b 1b */ > > + 0x00000000 /* nop */ > > + }; > > + > > + rom_add_blob_fixed("boot_rom", boot_code, sizeof(boot_code), > > + loader_rommap[LOADER_BOOTROM].base); > > +} > > + > > +static void fw_cfg_boot_set(void *opaque, const char *boot_device, > > + Error **errp) > > +{ > > + fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]); > > +} > > + > > +static void fw_conf_init(unsigned long ram_size) > > +{ > > + FWCfgState *fw_cfg; > > + hwaddr cfg_addr = virt_memmap[VIRT_FW_CFG].base; > > + > > + fw_cfg = fw_cfg_init_mem_wide(cfg_addr, cfg_addr + 8, 8, 0, NULL); > > + fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)current_machine->smp.cpus); > > + fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)current_machine->smp.max_cpus); > > + fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); > > + fw_cfg_add_i32(fw_cfg, FW_CFG_MACHINE_VERSION, 1); > > + fw_cfg_add_i64(fw_cfg, FW_CFG_CPU_FREQ, get_cpu_freq()); > > + qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); > > +} > > + > > +static int set_prom_cmdline(ram_addr_t initrd_offset, long initrd_size) > > +{ > > + hwaddr cmdline_vaddr; > > + char memenv[32]; > > + char highmemenv[32]; > > + void *cmdline_buf; > > + unsigned int *parg_env; > > + int ret = 0; > > + > > + /* Allocate cmdline_buf for command line. */ > > + cmdline_buf = g_malloc0(loader_memmap[LOADER_CMDLINE].size); > > + cmdline_vaddr = cpu_mips_phys_to_kseg0(NULL, > > + loader_memmap[LOADER_CMDLINE].base); > > + > > + /* > > + * Layout of cmdline_buf looks like this: > > + * argv[0], argv[1], 0, env[0], env[1], ... env[i], 0, > > + * argv[0]'s data, argv[1]'s data, env[0]'data, ..., env[i]'s data, 0 > > + */ > > + parg_env = (void *)cmdline_buf; > > + > > + ret = (3 + 1) * 4; > > + *parg_env++ = cmdline_vaddr + ret; > > + ret += (1 + snprintf(cmdline_buf + ret, 256 - ret, "g")); > > + > > + /* argv1 */ > > + *parg_env++ = cmdline_vaddr + ret; > > + if (initrd_size > 0) > > + ret += (1 + snprintf(cmdline_buf + ret, 256 - ret, > > + "rd_start=0x" TARGET_FMT_lx " rd_size=%li %s", > > + cpu_mips_phys_to_kseg0(NULL, initrd_offset), > > + initrd_size, loaderparams.kernel_cmdline)); > > + else > > + ret += (1 + snprintf(cmdline_buf + ret, 256 - ret, "%s", > > + loaderparams.kernel_cmdline)); > > + > > + /* argv2 */ > > + *parg_env++ = cmdline_vaddr + 4 * ret; > > + > > + /* env */ > > + sprintf(memenv, "%d", 256); > > + sprintf(highmemenv, "%ld", (unsigned long)(loaderparams.ram_size / MiB) - 256); > > + > > + rom_add_blob_fixed("cmdline", cmdline_buf, > > + loader_memmap[LOADER_CMDLINE].size, > > + loader_memmap[LOADER_CMDLINE].base); > > + > > + g_free(cmdline_buf); > > + > > + loaderparams.a0 = 2; > > + loaderparams.a1 = cmdline_vaddr; > > + > > + return 0; > > +} > > + > > +static uint64_t load_kernel(CPUMIPSState *env) > > +{ > > + long kernel_size; > > + ram_addr_t initrd_offset; > > + uint64_t kernel_entry, kernel_low, kernel_high, initrd_size; > > + > > + kernel_size = load_elf(loaderparams.kernel_filename, NULL, > > + cpu_mips_kseg0_to_phys, NULL, > > + (uint64_t *)&kernel_entry, > > + (uint64_t *)&kernel_low, (uint64_t *)&kernel_high, > > + NULL, 0, EM_MIPS, 1, 0); > > + if (kernel_size < 0) { > > + error_report("could not load kernel '%s': %s", > > + loaderparams.kernel_filename, > > + load_elf_strerror(kernel_size)); > > + exit(1); > > + } > > + > > + /* load initrd */ > > + initrd_size = 0; > > + initrd_offset = 0; > > + if (loaderparams.initrd_filename) { > > + initrd_size = get_image_size(loaderparams.initrd_filename); > > + if (initrd_size > 0) { > > + initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & > > + INITRD_PAGE_MASK; > > + initrd_offset = MAX(initrd_offset, > > + loader_memmap[LOADER_INITRD].base); > > Now you can use directly: > > initrd_offset = MAX(ROUND_UP(kernel_high, INITRD_PAGE_SIZE), > loader_memmap[LOADER_INITRD].base); > OK. > > + > > + if (initrd_offset + initrd_size > ram_size) { > > + error_report("memory too small for initial ram disk '%s'", > > + loaderparams.initrd_filename); > > + exit(1); > > + } > > + > > + initrd_size = load_image_targphys(loaderparams.initrd_filename, > > + initrd_offset, > > + ram_size - initrd_offset); > > + } > > + > > + if (initrd_size == (target_ulong) -1) { > > + error_report("could not load initial ram disk '%s'", > > + loaderparams.initrd_filename); > > + exit(1); > > + } > > + } > > + > > + /* Setup prom cmdline. */ > > + set_prom_cmdline(initrd_offset, initrd_size); > > + > > + return kernel_entry; > > +} > > + > > +static void main_cpu_reset(void *opaque) > > +{ > > + MIPSCPU *cpu = opaque; > > + CPUMIPSState *env = &cpu->env; > > + > > + cpu_reset(CPU(cpu)); > > + > > + /* Loongson-3 reset stuff */ > > + if (loaderparams.kernel_filename) { > > + if (cpu == MIPS_CPU(first_cpu)) { > > + env->active_tc.gpr[4] = loaderparams.a0; > > + env->active_tc.gpr[5] = loaderparams.a1; > > + env->active_tc.gpr[6] = loaderparams.a2; > > + env->active_tc.PC = loaderparams.kernel_entry; > > + } > > + env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL)); > > + } > > +} > > + > > +static inline void loongson3_virt_devices_init(MachineState *machine, DeviceState *pic) > > +{ > > + int i; > > + qemu_irq irq; > > + PCIBus *pci_bus; > > + DeviceState *dev; > > + MemoryRegion *pio_alias; > > + MemoryRegion *mmio_alias, *mmio_reg; > > + MemoryRegion *ecam_alias, *ecam_reg; > > + > > + dev = qdev_new(TYPE_GPEX_HOST); > > + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); > > + pci_bus = PCI_HOST_BRIDGE(dev)->bus; > > + > > + ecam_alias = g_new0(MemoryRegion, 1); > > + ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); > > + memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam", > > + ecam_reg, 0, virt_memmap[VIRT_PCIE_ECAM].size); > > + memory_region_add_subregion(get_system_memory(), > > + virt_memmap[VIRT_PCIE_ECAM].base, ecam_alias); > > + > > + mmio_alias = g_new0(MemoryRegion, 1); > > + mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); > > + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio", > > + mmio_reg, virt_memmap[VIRT_PCIE_MMIO].base, > > + virt_memmap[VIRT_PCIE_MMIO].size); > > + memory_region_add_subregion(get_system_memory(), > > + virt_memmap[VIRT_PCIE_MMIO].base, mmio_alias); > > + > > + pio_alias = g_new0(MemoryRegion, 1); > > + memory_region_init_alias(pio_alias, OBJECT(dev), "pcie-pio", > > + get_system_io(), 0, virt_memmap[VIRT_PCIE_PIO].size); > > + memory_region_add_subregion(get_system_memory(), > > + virt_memmap[VIRT_PCIE_PIO].base, pio_alias); > > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, virt_memmap[VIRT_PCIE_PIO].base); > > + > > + for (i = 0; i < GPEX_NUM_IRQS; i++) { > > + irq = qdev_get_gpio_in(pic, PCIE_IRQ_BASE + i); > > + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); > > + gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ_BASE + i); > > + } > > + > > + pci_vga_init(pci_bus); > > + > > + if (defaults_enabled()) { > > + pci_create_simple(pci_bus, -1, "pci-ohci"); > > + usb_create_simple(usb_bus_find(-1), "usb-kbd"); > > + usb_create_simple(usb_bus_find(-1), "usb-tablet"); > > + } > > + > > + for (i = 0; i < nb_nics; i++) { > > + NICInfo *nd = &nd_table[i]; > > + > > + if (!nd->model) { > > + nd->model = g_strdup("virtio"); > > + } > > + > > + pci_nic_init_nofail(nd, pci_bus, nd->model, NULL); > > + } > > +} > > + > > +static void mips_loongson3_virt_init(MachineState *machine) > > +{ > > + int i; > > + long bios_size; > > + MIPSCPU *cpu; > > + CPUMIPSState *env; > > + DeviceState *liointc; > > + char *filename; > > + const char *kernel_cmdline = machine->kernel_cmdline; > > + const char *kernel_filename = machine->kernel_filename; > > + const char *initrd_filename = machine->initrd_filename; > > + ram_addr_t ram_size = machine->ram_size; > > + MemoryRegion *address_space_mem = get_system_memory(); > > + MemoryRegion *ram = g_new(MemoryRegion, 1); > > + MemoryRegion *bios = g_new(MemoryRegion, 1); > > + MemoryRegion *iomem = g_new(MemoryRegion, 1); > > + > > + /* TODO: TCG will support all CPU types */ > > + if (!kvm_enabled()) { > > + if (!machine->cpu_type) { > > + machine->cpu_type = MIPS_CPU_TYPE_NAME("Loongson-3A1000"); > > + } > > + if (!strstr(machine->cpu_type, "Loongson-3A1000")) { > > + error_report("Loongson-3/TCG needs cpu type Loongson-3A1000"); > > + exit(1); > > + } > > + } else { > > + if (!machine->cpu_type) { > > + machine->cpu_type = MIPS_CPU_TYPE_NAME("Loongson-3A4000"); > > + } > > + if (!strstr(machine->cpu_type, "Loongson-3A4000")) { > > + error_report("Loongson-3/KVM needs cpu type Loongson-3A4000"); > > + exit(1); > > + } > > + } > > + > > + if (ram_size < 512 * MiB) { > > + error_report("Loongson-3 machine needs at least 512MB memory"); > > + exit(1); > > + } > > + > > + /* > > + * The whole MMIO range among configure registers doesn't generate > > + * exception when accessing invalid memory. Create some unimplememted > > + * devices to emulate this feature. > > + */ > > + create_unimplemented_device("mmio fallback 0", 0x10000000, 256 * MiB); > > + create_unimplemented_device("mmio fallback 1", 0x30000000, 256 * MiB); > > The problem using large container to ignore accesses is we have > no idea what the firmware is trying to do: > > mmio fallback 1: unimplemented device write (size 8, offset 0xff01038, > value 0x980000000e3d1000) > mmio fallback 1: unimplemented device write (size 8, offset 0xff01020, > value 0x980000000e720ef8) We can compute these addresses and find it in Loongson's documents, this is also need to do for small regions. And, the address caught by UNIMP devices are always "useless" addresses for a virtual machine (because useful addresses are catched by implemented devices). > > > + > > + liointc = qdev_new("loongson.liointc"); > > + sysbus_realize_and_unref(SYS_BUS_DEVICE(liointc), &error_fatal); > > + > > + sysbus_mmio_map(SYS_BUS_DEVICE(liointc), 0, virt_memmap[VIRT_LIOINTC].base); > > + > > + serial_mm_init(address_space_mem, virt_memmap[VIRT_UART].base, 0, > > + qdev_get_gpio_in(liointc, UART_IRQ), 115200, serial_hd(0), > > + DEVICE_NATIVE_ENDIAN); > > + > > + sysbus_create_simple("goldfish_rtc", virt_memmap[VIRT_RTC].base, > > + qdev_get_gpio_in(liointc, RTC_IRQ)); > > + > > + for (i = 0; i < machine->smp.cpus; i++) { > > + int ip; > > + > > + /* init CPUs */ > > + cpu = MIPS_CPU(cpu_create(machine->cpu_type)); > > + > > + /* Init internal devices */ > > + cpu_mips_irq_init_cpu(cpu); > > + cpu_mips_clock_init(cpu); > > + qemu_register_reset(main_cpu_reset, cpu); > > + > > + if (i >= 4) { > > + continue; /* Only node-0 can be connected to LIOINTC */ > > + } > > + > > + for (ip = 0; ip < 4 ; ip++) { > > + int pin = i * 4 + ip; > > + sysbus_connect_irq(SYS_BUS_DEVICE(liointc), > > + pin, cpu->env.irq[ip + 2]); > > + } > > + } > > + env = &MIPS_CPU(first_cpu)->env; > > + > > + /* Allocate RAM/BIOS, 0x00000000~0x10000000 is alias of 0x80000000~0x90000000 */ > > + memory_region_init_rom(bios, NULL, "loongson3.bios", > > + virt_memmap[VIRT_BIOS_ROM].size, &error_fatal); > > + memory_region_init_alias(ram, NULL, "loongson3.lowmem", > > + machine->ram, 0, virt_memmap[VIRT_LOWMEM].size); > > + memory_region_init_io(iomem, NULL, &loongson3_pm_ops, > > + NULL, "loongson3_pm", virt_memmap[VIRT_PM].size); > > + > > + memory_region_add_subregion(address_space_mem, > > + virt_memmap[VIRT_LOWMEM].base, ram); > > + memory_region_add_subregion(address_space_mem, > > + virt_memmap[VIRT_BIOS_ROM].base, bios); > > + memory_region_add_subregion(address_space_mem, > > + virt_memmap[VIRT_HIGHMEM].base, machine->ram); > > + memory_region_add_subregion(address_space_mem, > > + virt_memmap[VIRT_PM].base, iomem); > > + > > + /* > > + * We do not support flash operation, just loading bios.bin as raw BIOS. > > + * Please use -L to set the BIOS path and -bios to set bios name. > > + */ > > + > > + if (kernel_filename) { > > + loaderparams.cpu_freq = get_cpu_freq(); > > + loaderparams.ram_size = ram_size; > > + loaderparams.kernel_filename = kernel_filename; > > + loaderparams.kernel_cmdline = kernel_cmdline; > > + loaderparams.initrd_filename = initrd_filename; > > + loaderparams.kernel_entry = load_kernel(env); > > + > > + init_boot_rom(); > > + init_boot_param(); > > + } else { > > + if (bios_name == NULL) { > > + bios_name = LOONGSON3_BIOSNAME; > > + } > > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); > > + if (filename) { > > + bios_size = load_image_targphys(filename, > > + virt_memmap[VIRT_BIOS_ROM].base, > > + virt_memmap[VIRT_BIOS_ROM].size); > > + g_free(filename); > > + } else { > > + bios_size = -1; > > + } > > + > > + if ((bios_size < 0 || bios_size > virt_memmap[VIRT_BIOS_ROM].size) && > > + !kernel_filename && !qtest_enabled()) { > > + error_report("Could not load MIPS bios '%s'", bios_name); > > + exit(1); > > + } > > + > > + fw_conf_init(ram_size); > > + } > > + > > + msi_nonbroken = true; > > + loongson3_virt_devices_init(machine, liointc); > > +} > > + > > +static void mips_loongson3_virt_machine_init(MachineClass *mc) > > +{ > > + mc->desc = "Loongson-3 Virtualization Platform"; > > + mc->init = mips_loongson3_virt_init; > > + mc->block_default_type = IF_IDE; > > + mc->max_cpus = LOONGSON_MAX_VCPUS; > > + mc->default_ram_id = "loongson3.highram"; > > + mc->default_ram_size = 1600 * MiB; > > + mc->kvm_type = mips_kvm_type; > > + mc->minimum_page_bits = 14; > > +} > > I tested on top of mips-next using: > > -- >8 -- > diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c > index 6a42808015d..2f1fa2e72ea 100644 > --- a/hw/mips/loongson3_virt.c > +++ b/hw/mips/loongson3_virt.c > @@ -31,6 +31,7 @@ > #include "cpu.h" > #include "elf.h" > #include "kvm_mips.h" > +#include "hw/clock.h" > #include "hw/boards.h" > #include "hw/char/serial.h" > #include "hw/mips/mips.h" > @@ -141,9 +142,6 @@ static const MemoryRegionOps loongson3_pm_ops = { > .endianness = DEVICE_NATIVE_ENDIAN, > }; > > -#define DEF_TCG_FREQ (200 * 1000 * 1000) > -#define DEF_KVM_FREQ (1600 * 1000 * 1000) > - > static uint64_t get_cpu_freq(void) > { > #ifdef CONFIG_KVM > @@ -156,20 +154,12 @@ static uint64_t get_cpu_freq(void) > > if (kvm_enabled()) { > ret = kvm_vcpu_ioctl(first_cpu, KVM_GET_ONE_REG, &freq_reg); > - if (ret < 0) { > - return DEF_KVM_FREQ; > + if (ret >= 0) { > + return freq * 2; > } > - return freq * 2; > - } else { > - /* > - * TCG has a default CP0 Timer period 10 ns, which is 100MHz, > - * CPU frequency is defined as double of CP0 timer frequency. > - */ > - return DEF_TCG_FREQ; > } > -#else > - return DEF_TCG_FREQ; > #endif > + return 1600 * 1000 * 1000; > } > > static void init_boot_param(void) > @@ -471,6 +461,7 @@ static void mips_loongson3_virt_init(MachineState > *machine) > { > int i; > long bios_size; > + Clock *cpuclk; > MIPSCPU *cpu; > CPUMIPSState *env; > DeviceState *liointc; > @@ -528,11 +519,14 @@ static void mips_loongson3_virt_init(MachineState > *machine) > sysbus_create_simple("goldfish_rtc", virt_memmap[VIRT_RTC].base, > qdev_get_gpio_in(liointc, RTC_IRQ)); > > + cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); > + clock_set_hz(cpuclk, get_cpu_freq()); > + > for (i = 0; i < machine->smp.cpus; i++) { > int ip; > > /* init CPUs */ > - cpu = MIPS_CPU(cpu_create(machine->cpu_type)); > + cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk); > > /* Init internal devices */ > cpu_mips_irq_init_cpu(cpu); > --- Huacai
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; V13 -> V14: 1, Remove merged patches; 2, Split boot parameter helpers to a separate patch; 4, Many other improvements suggested by Philippe Mathieu-Daudé. Huacai Chen and Jiaxun Yang (8): 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 boot parameter helpers 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 | 627 +++++++++++++++++++++++++++ hw/mips/meson.build | 3 +- target/mips/cp0_helper.c | 36 +- target/mips/cpu.h | 1 + target/mips/translate.c | 443 +++++++++++++++++++ 13 files changed, 1574 insertions(+), 10 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