From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,WEIRD_PORT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEF13C63697 for ; Sat, 28 Nov 2020 07:05:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 20F5D22274 for ; Sat, 28 Nov 2020 07:05:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h7h4bwL7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20F5D22274 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiuIZ-0000nA-US for qemu-devel@archiver.kernel.org; Sat, 28 Nov 2020 02:05:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiuHT-0008TU-Eb for qemu-devel@nongnu.org; Sat, 28 Nov 2020 02:04:27 -0500 Received: from mail-il1-x144.google.com ([2607:f8b0:4864:20::144]:40517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kiuHP-00069q-4b for qemu-devel@nongnu.org; Sat, 28 Nov 2020 02:04:27 -0500 Received: by mail-il1-x144.google.com with SMTP id g1so6479780ilk.7 for ; Fri, 27 Nov 2020 23:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=apj/SSAWvzC34I5TvRBP9QXMbfRvew5MhCgmHrSWTHA=; b=h7h4bwL72Q1qcG8xfQFGX3CiXUevCyAZIPIPKC+mJdNvpvSnvzU5Jl1T84uE8yAxLo FSHfGkeDfKFxB40ADFQy0l3Myrhywfljz7Q/H40BxrqVe0OM130xFUUofrcG94Ha3prX PcBj2SCyuyhU/N3chV0bReYIuaFAynpAUgG/BRqyq55NEH8SRG4ZLr7O1xbyBwfio90R AaeDSMxNj4Q83jers24rD1THWxpnmzW+AG/UnPLzY22zWFcDu4VuBwTPx6hhvwrlfN81 Id0Heay6vyTonao7EmSbNb1lngoFgdYQ7kmqCB/OxhBppHjLqBmRO8GLlK3yDl9JE7/b 2bFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=apj/SSAWvzC34I5TvRBP9QXMbfRvew5MhCgmHrSWTHA=; b=lfoW9RVvidj3HoomVDk7buDcSSzO6AzIRHAtYUOt4HNVJYcTfuFTFjWzkwJUmygkb2 vcaN3ITiwl1m3XeNStRElTor7w1lnntx0/lqcM4pIhR4hd/x3MGuowrRYq4bTGv63b9B PLhxx503tUhJ8cLHksiI2+CZDSUlcicrKWJa86llemqTIiB4G4wmee8pK/pO59YaqQvd 8EUkCfibmwGL9sFPUscJN/F+advL52e1LL0ueFt0XJrReDS5wZmlcz802OpjmAraxdps Y6xCzMRinHpwXzzywYSDdRADbcnLEBPNl8LIBw55dwDgkAHfaUNHt7yyKiTrWB9rSCxN nwTg== X-Gm-Message-State: AOAM532sboLoW+XEkynekF6exfDoHZc/9ZrVrswhTAHYZwyQL+4+V5bi p849kH5ekIyvaGNkbB6VigvxsQg9c/fMOie6fNxh8pOQAso= X-Google-Smtp-Source: ABdhPJytS3Mi3HH9Z79l8254XmQIgySyCerbb8Z5rIRt+2hvi9RFhUCDr89nl4bMfGHTls8nnTpdezV1/C1bRqKfo34= X-Received: by 2002:a92:85c5:: with SMTP id f188mr10567483ilh.173.1606547060169; Fri, 27 Nov 2020 23:04:20 -0800 (PST) MIME-Version: 1.0 References: <1604636510-8347-1-git-send-email-chenhc@lemote.com> <1604636510-8347-6-git-send-email-chenhc@lemote.com> <65db3e27-4708-6e42-8ed5-141d9f5cec69@amsat.org> In-Reply-To: <65db3e27-4708-6e42-8ed5-141d9f5cec69@amsat.org> From: Huacai Chen Date: Sat, 28 Nov 2020 15:04:07 +0800 Message-ID: Subject: Re: [PATCH V17 5/6] hw/mips: Add Loongson-3 machine support To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::144; envelope-from=chenhuacai@gmail.com; helo=mail-il1-x144.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_PORT=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huacai Chen , Aleksandar Rikalo , QEMU Developers , Aurelien Jarno , Aleksandar Markovic Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, Philippe, On Tue, Nov 24, 2020 at 5:54 AM Philippe Mathieu-Daud=C3=A9 wrote: > > Hi Huacai, > > On 11/6/20 5:21 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 wit= h > > 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) here: > > > > https://github.com/chenhuacai/linux > > > > Of course the upstream kernel is also usable (the kvm host side and > > guest side have both been upstream in Linux-5.9): > > > > 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=3Dtcg -cpu Loongson= -3A1000 -kernel -append ... > > Use QEMU with KVM: > > qemu-system-mips64el -M loongson3-virt,accel=3Dkvm -cpu Loongson= -3A4000 -kernel -append ... > > > > The "-cpu" parameter is optional here and QEMU will use the correct = type for TCG/KVM automatically. > > > > Signed-off-by: Huacai Chen > > Co-developed-by: Jiaxun Yang > > Signed-off-by: Jiaxun Yang > > --- > > default-configs/devices/mips64el-softmmu.mak | 1 + > > hw/mips/Kconfig | 12 + > > hw/mips/loongson3_virt.c | 614 +++++++++++++++++++= ++++++++ > > hw/mips/meson.build | 2 +- > > 4 files changed, 628 insertions(+), 1 deletion(-) > > create mode 100644 hw/mips/loongson3_virt.c > > > > diff --git a/default-configs/devices/mips64el-softmmu.mak b/default-con= figs/devices/mips64el-softmmu.mak > > index 9f8a3ef..26c660a 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=3Dy > > CONFIG_FULOONG=3Dy > > +CONFIG_LOONGSON3V=3Dy > > CONFIG_ATI_VGA=3Dy > > CONFIG_RTL8139_PCI=3Dy > > CONFIG_JAZZ=3Dy > > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > > index 8be7012..ef5cee1 100644 > > --- a/hw/mips/Kconfig > > +++ b/hw/mips/Kconfig > > @@ -32,6 +32,18 @@ config FULOONG > > bool > > select PCI_BONITO > > > > +config LOONGSON3V > > + bool > > + select PCKBD > > Is it used? I only see USB. OK, PCKBD will be removed. > > > + select SERIAL > > + select GOLDFISH_RTC > > + select LOONGSON_LIOINTC > > + select PCI_DEVICES > > + select PCI_EXPRESS_GENERIC_BRIDGE > > + select VIRTIO_VGA > > + select QXL if SPICE > > I don't understand the UI dependencies, as we should > be able to start this machine without UI (just console > for example). > > Maybe you want the 'imply' keyword instead? OK, I will use imply instead. > > > + 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 0000000..c5db2db > > --- /dev/null > > +++ b/hw/mips/loongson3_virt.c > > @@ -0,0 +1,614 @@ > > +/* > > + * Generic Loongson-3 Platform support > > + * > > + * Copyright (c) 2018-2020 Huacai Chen (chenhc@lemote.com) > > + * Copyright (c) 2018-2020 Jiaxun Yang > > + * > > + * This program is free software: you can redistribute it and/or modif= y > > + * it under the terms of the GNU General Public License as published b= y > > + * 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 . > > + */ > > + > > +/* > > + * Generic virtualized PC Platform based on Loongson-3 CPU (MIPS64R2 w= ith > > + * 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/intc/loongson_liointc.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/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_loongson= 3.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[] =3D { > > + [VIRT_LOWMEM] =3D { 0x00000000, 0x10000000 }, > > + [VIRT_PM] =3D { 0x10080000, 0x100 }, > > + [VIRT_FW_CFG] =3D { 0x10080100, 0x100 }, > > + [VIRT_RTC] =3D { 0x10081000, 0x1000 }, > > + [VIRT_PCIE_PIO] =3D { 0x18000000, 0x80000 }, > > + [VIRT_PCIE_ECAM] =3D { 0x1a000000, 0x2000000 }, > > + [VIRT_BIOS_ROM] =3D { 0x1fc00000, 0x200000 }, > > + [VIRT_UART] =3D { 0x1fe001e0, 0x8 }, > > + [VIRT_LIOINTC] =3D { 0x3ff01400, 0x64 }, > > + [VIRT_PCIE_MMIO] =3D { 0x40000000, 0x40000000 }, > > + [VIRT_HIGHMEM] =3D { 0x80000000, 0x0 }, /* Variable = */ > > +}; > > + > > +static const struct MemmapEntry loader_memmap[] =3D { > > + [LOADER_KERNEL] =3D { 0x00000000, 0x4000000 }, > > + [LOADER_INITRD] =3D { 0x04000000, 0x0 }, /* Variable = */ > > + [LOADER_CMDLINE] =3D { 0x0ff00000, 0x100000 }, > > +}; > > + > > +static const struct MemmapEntry loader_rommap[] =3D { > > + [LOADER_BOOTROM] =3D { 0x1fc00000, 0x1000 }, > > + [LOADER_PARAM] =3D { 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 !=3D 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 =3D { > > + .read =3D loongson3_pm_read, > > + .write =3D loongson3_pm_write, > > Any access size is OK? (from your ASM it is byte accessed). OK, I will limit it to byte access. > > > + .endianness =3D DEVICE_NATIVE_ENDIAN, > > +}; > > + > > +#define DEF_LOONGSON3_FREQ (800 * 1000 * 1000) > > + > > +static uint64_t get_cpu_freq_hz(void) > > +{ > > +#ifdef CONFIG_KVM > > + int ret; > > + uint64_t freq; > > + struct kvm_one_reg freq_reg =3D { > > + .id =3D KVM_REG_MIPS_COUNT_HZ, > > + .addr =3D (uintptr_t)(&freq) > > + }; > > + > > + if (kvm_enabled()) { > > + ret =3D kvm_vcpu_ioctl(first_cpu, KVM_GET_ONE_REG, &freq_reg); > > + if (ret >=3D 0) { > > + return freq * 2; > > + } > > + } > > +#endif > > + return DEF_LOONGSON3_FREQ; > > +} > > + > > +static void init_boot_param(void) > > +{ > > + void *p; > > + struct boot_params *bp; > > + > > + p =3D g_malloc0(loader_rommap[LOADER_PARAM].size); > > I'm worried Coverity complains we are leaking this. Maybe keep it > static? [updated, see MachineState comment below] > > > + bp =3D p; > > + > > + stw_le_p(&bp->efi.smbios.vers, 1); > > + init_reset_system(&(bp->reset_system)); > > + p +=3D 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 =3D cpu_mips_phys_to_kseg0(NULL, loader_rommap[LOA= DER_PARAM].base); > > +} > > + > > +static void init_boot_rom(void) > > +{ > > + const unsigned int boot_code[] =3D { > > + 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 =3D virt_memmap[VIRT_FW_CFG].base; > > + > > + fw_cfg =3D 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_hz()); > > + 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 =3D 0; > > + > > + /* Allocate cmdline_buf for command line. */ > > + cmdline_buf =3D g_malloc0(loader_memmap[LOADER_CMDLINE].size); > > + cmdline_vaddr =3D cpu_mips_phys_to_kseg0(NULL, > > + loader_memmap[LOADER_CMDLIN= E].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 =3D (void *)cmdline_buf; > > + > > + ret =3D (3 + 1) * 4; > > + *parg_env++ =3D cmdline_vaddr + ret; > > + ret +=3D (1 + snprintf(cmdline_buf + ret, 256 - ret, "g")); > > + > > + /* argv1 */ > > + *parg_env++ =3D cmdline_vaddr + ret; > > + if (initrd_size > 0) > > + ret +=3D (1 + snprintf(cmdline_buf + ret, 256 - ret, > > + "rd_start=3D0x" TARGET_FMT_lx " rd_size=3D%li %s", > > + cpu_mips_phys_to_kseg0(NULL, initrd_offset), > > + initrd_size, loaderparams.kernel_cmdline)); > > + else > > + ret +=3D (1 + snprintf(cmdline_buf + ret, 256 - ret, "%s", > > + loaderparams.kernel_cmdline)); > > + > > + /* argv2 */ > > + *parg_env++ =3D cmdline_vaddr + 4 * ret; > > + > > + /* env */ > > + sprintf(memenv, "%d", 256); > > Where is that used? This could be const... > > > + sprintf(highmemenv, "%ld", (unsigned long)(loaderparams.ram_size /= MiB) - 256); > > Where is that used? Anyhow, if needed, please use g_strdup_printf(). OK, they will be removed. > > > + > > + rom_add_blob_fixed("cmdline", cmdline_buf, > > + loader_memmap[LOADER_CMDLINE].size, > > + loader_memmap[LOADER_CMDLINE].base); > > + > > + g_free(cmdline_buf); > > + > > + loaderparams.a0 =3D 2; > > + loaderparams.a1 =3D 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 =3D load_elf(loaderparams.kernel_filename, NULL, > > + cpu_mips_kseg0_to_phys, NULL, > > + (uint64_t *)&kernel_entry, > > + (uint64_t *)&kernel_low, (uint64_t *)&kerne= l_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 =3D 0; > > + initrd_offset =3D 0; > > + if (loaderparams.initrd_filename) { > > + initrd_size =3D get_image_size(loaderparams.initrd_filename); > > + if (initrd_size > 0) { > > + initrd_offset =3D MAX(loader_memmap[LOADER_INITRD].base, > > + ROUND_UP(kernel_high, INITRD_PAGE_SIZE= )); > > + > > + if (initrd_offset + initrd_size > ram_size) { > > + error_report("memory too small for initial ram disk '%= s'", > > + loaderparams.initrd_filename); > > + exit(1); > > + } > > + > > + initrd_size =3D load_image_targphys(loaderparams.initrd_fi= lename, > > + initrd_offset, > > + ram_size - initrd_offset= ); > > + } > > + > > + if (initrd_size =3D=3D (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 =3D opaque; > > + CPUMIPSState *env =3D &cpu->env; > > + > > + cpu_reset(CPU(cpu)); > > + > > + /* Loongson-3 reset stuff */ > > + if (loaderparams.kernel_filename) { > > + if (cpu =3D=3D MIPS_CPU(first_cpu)) { > > + env->active_tc.gpr[4] =3D loaderparams.a0; > > + env->active_tc.gpr[5] =3D loaderparams.a1; > > + env->active_tc.gpr[6] =3D loaderparams.a2; > > + env->active_tc.PC =3D loaderparams.kernel_entry; > > + } > > + env->CP0_Status &=3D ~((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 =3D qdev_new(TYPE_GPEX_HOST); > > + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); > > + pci_bus =3D PCI_HOST_BRIDGE(dev)->bus; > > + > > + ecam_alias =3D g_new0(MemoryRegion, 1); > > Again, Coverity will complain for the memory leaked :( > > I think you want to keep all these pointers in an object > extending MachineState. You can check at RaspiMachineState > for an example. OK, I will do. > > > + ecam_reg =3D 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 =3D g_new0(MemoryRegion, 1); > > + mmio_reg =3D 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].bas= e, > > + virt_memmap[VIRT_PCIE_MMIO].size); > > + memory_region_add_subregion(get_system_memory(), > > + virt_memmap[VIRT_PCIE_MMIO].base, mmio= _alias); > > + > > + pio_alias =3D 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_a= lias); > > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, virt_memmap[VIRT_PCIE_PIO]= .base); > > + > > + for (i =3D 0; i < GPEX_NUM_IRQS; i++) { > > + irq =3D 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); > > + } > > Maybe set here "msi_nonbroken =3D true;". OK. > > > + > > + pci_vga_init(pci_bus); > > Maybe part of defaults_enabled... not sure although. Not needed, other machines also do it like this. > > > + > > + 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 =3D 0; i < nb_nics; i++) { > > + NICInfo *nd =3D &nd_table[i]; > > + > > + if (!nd->model) { > > + nd->model =3D 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; > > + Clock *cpuclk; > > + CPUMIPSState *env; > > + DeviceState *liointc; > > + char *filename; > > + const char *kernel_cmdline =3D machine->kernel_cmdline; > > + const char *kernel_filename =3D machine->kernel_filename; > > + const char *initrd_filename =3D machine->initrd_filename; > > + ram_addr_t ram_size =3D machine->ram_size; > > + MemoryRegion *address_space_mem =3D get_system_memory(); > > + MemoryRegion *ram =3D g_new(MemoryRegion, 1); > > + MemoryRegion *bios =3D g_new(MemoryRegion, 1); > > + MemoryRegion *iomem =3D g_new(MemoryRegion, 1); > > + > > + /* TODO: TCG will support all CPU types */ > > + if (!kvm_enabled()) { > > + if (!machine->cpu_type) { > > + machine->cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-3A1000"= ); > > + } > > + if (!strstr(machine->cpu_type, "Loongson-3A1000")) { > > + error_report("Loongson-3/TCG needs cpu type Loongson-3A100= 0"); > > Why not accept any 3A family? Because some new instructions hadn't been emulated in qemu. > > > + exit(1); > > + } > > + } else { > > + if (!machine->cpu_type) { > > + machine->cpu_type =3D MIPS_CPU_TYPE_NAME("Loongson-3A4000"= ); > > + } > > + if (!strstr(machine->cpu_type, "Loongson-3A4000")) { > > + error_report("Loongson-3/KVM needs cpu type Loongson-3A400= 0"); > > + 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 unimplemem= ted > > + * devices to emulate this feature. > > + */ > > + create_unimplemented_device("mmio fallback 0", 0x10000000, 256 * M= iB); > > + create_unimplemented_device("mmio fallback 1", 0x30000000, 256 * M= iB); > > + > > + liointc =3D 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_LIOIN= TC].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)); > > + > > + cpuclk =3D clock_new(OBJECT(machine), "cpu-refclk"); > > + clock_set_hz(cpuclk, DEF_LOONGSON3_FREQ); > > + > > + for (i =3D 0; i < machine->smp.cpus; i++) { > > + int ip; > > + > > + /* init CPUs */ > > + cpu =3D mips_cpu_create_with_clock(machine->cpu_type, cpuclk); > > + > > + /* Init internal devices */ > > + cpu_mips_irq_init_cpu(cpu); > > + cpu_mips_clock_init(cpu); > > + qemu_register_reset(main_cpu_reset, cpu); > > + > > + if (i >=3D 4) { > > + continue; /* Only node-0 can be connected to LIOINTC */ > > + } > > + > > + for (ip =3D 0; ip < 4 ; ip++) { > > + int pin =3D i * 4 + ip; > > + sysbus_connect_irq(SYS_BUS_DEVICE(liointc), > > + pin, cpu->env.irq[ip + 2]); > > + } > > + } > > + env =3D &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_fat= al); > > + memory_region_init_alias(ram, NULL, "loongson3.lowmem", > > + machine->ram, 0, virt_memmap[VIRT_LOWMEM].s= ize); > > + 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 =3D get_cpu_freq_hz(); > > + loaderparams.ram_size =3D ram_size; > > + loaderparams.kernel_filename =3D kernel_filename; > > + loaderparams.kernel_cmdline =3D kernel_cmdline; > > + loaderparams.initrd_filename =3D initrd_filename; > > + loaderparams.kernel_entry =3D load_kernel(env); > > + > > + init_boot_rom(); > > + init_boot_param(); > > + } else { > > + if (bios_name =3D=3D NULL) { > > + bios_name =3D LOONGSON3_BIOSNAME; > > + } > > + filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); > > + if (filename) { > > + bios_size =3D load_image_targphys(filename, > > + virt_memmap[VIRT_BIOS_ROM]= .base, > > + virt_memmap[VIRT_BIOS_ROM]= .size); > > + g_free(filename); > > + } else { > > + bios_size =3D -1; > > + } > > + > > + if ((bios_size < 0 || bios_size > virt_memmap[VIRT_BIOS_ROM].s= ize) && > > + !kernel_filename && !qtest_enabled()) { > > + error_report("Could not load MIPS bios '%s'", bios_name); > > + exit(1); > > + } > > + > > + fw_conf_init(ram_size); > > + } > > + > > + msi_nonbroken =3D true; > > + loongson3_virt_devices_init(machine, liointc); > > +} > > + > > +static void mips_loongson3_virt_machine_init(MachineClass *mc) > > +{ > > + mc->desc =3D "Loongson-3 Virtualization Platform"; > > + mc->init =3D mips_loongson3_virt_init; > > + mc->block_default_type =3D IF_IDE; > > + mc->max_cpus =3D LOONGSON_MAX_VCPUS; > > + mc->default_ram_id =3D "loongson3.highram"; > > + mc->default_ram_size =3D 1600 * MiB; > > + mc->kvm_type =3D mips_kvm_type; > > + mc->minimum_page_bits =3D 14; > > +} > > + > > +DEFINE_MACHINE("loongson3-virt", mips_loongson3_virt_machine_init) > > There are still some questions, but we are almost there! > > I can fix the leak/MachineState problem if you are lost. > > For smoke testing, you can have a look at test_pmon_serial_console() > in https://www.mail-archive.com/qemu-devel@nongnu.org/msg752605.html > (forgot the test_pmon_framebuffer_console part). > This should be almost a copy/paste for your machine. I will improve these problems in the next version, thanks. Huacai > > Regards, > > Phil.