From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501448; cv=none; d=zohomail.com; s=zohoarc; b=TTpvU/OLJ9G4t2znr1nHNe5ki7BJIkKxEhXCCsaVw4i38wPOho0aMX5s0gPuKgGMLUT+7Pe23h/Ua+w9U4pQwLEeyPyLrPPnxKhnLz+hV5/QNuhX+9SdFrODX5SbrtYDTeWglUHTZIUeExalnFTiKdb1vSd6FV/VfM4paYQi00c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501448; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=u4m6+vzCc96Nl5shiNMOZfZokMTmk6NsaXZkY+++sic=; b=FXKD9kv8RC65r2gBdqjLcszoEoS6HzibNpFbe2SFk2FR/gWAxRC890ka1a6mi9lIiKHLskeBlGecZqE3O3WWRqFd/ov0KzYyIH+I92AvanBgjmfGZXxdkuCKnLH9c15SlvyxSiIwp3viE6U0Jd1O6DrbgWKigLwrDzf7gPt6pHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501448936538.7648366844364; Sun, 3 May 2020 03:24:08 -0700 (PDT) Received: from localhost ([::1]:45524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBn5-0000xk-IY for importer@patchew.org; Sun, 03 May 2020 06:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBmC-0008Tn-Uf for qemu-devel@nongnu.org; Sun, 03 May 2020 06:23:12 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:35061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBmB-0006nd-Tl for qemu-devel@nongnu.org; Sun, 03 May 2020 06:23:12 -0400 Received: by mail-pg1-x542.google.com with SMTP id t11so7102881pgg.2 for ; Sun, 03 May 2020 03:23:11 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.23.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u4m6+vzCc96Nl5shiNMOZfZokMTmk6NsaXZkY+++sic=; b=B6VJgQGRrWffj4p7+VWlBqAahNMIXo7SUgev/uGwzHH1SKvtVWjmeDIk8j4AWYoMB/ yfd8SoKdo54kyxoIMBNNIEcmnyo+RhWMBuRsWTlUlGqbguFRUfPs3rIOfEX/Yb2f+Iyw XHnp26xH4c3GsB7tYXhrxs1J3DFxwprbmBLP51BJv0NXsmdP4Vv1S1QIbA0J88ByzOoS k9D0S5xdw4P/9DGNfDjAlxaga718ezrF4y9b6EvoGj4rPeEfNbJ2c6oKNYkWVhFKeFt8 ASxn8X0yddaoDpYF1IqGMHTtCGIeV15B+n5/wndawgVSr6J0OciaLtLD0qAxl1g5G/e8 P/VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u4m6+vzCc96Nl5shiNMOZfZokMTmk6NsaXZkY+++sic=; b=E3qvfgKfGFKtsJkokWil4vdRe7/tvI9Jpicon01zsOqf+03RUQ5rtM0Nq03F32Tnya ciu3hK6mcBabhV/BbJImxHzF4NvkRI+fGaEOBYIGSE51d+0LuZ/88TsPn5jtoajz6aVh 8FYd7n5Dob33W4PgzvlGOalAFgE5w+HjSWw2cP705uRZ0lOn135NrtM502okhh7re/RV 90K6i10Zo2oU5fLQckcVf24JSN9tQn5LO1uZpK9ZNeymc018jQkmuDcicWraxdTsSgTU GsCi5nYU1ESMwuHDVd6Or+jzoRTtLgeJbhtdtBY6TUCmbk1n0g2wX5e+CIapWI6tT0St 8dyw== X-Gm-Message-State: AGi0PuarHHtv663yJHW619KnNvGrXG8qLju6hZn3fgzecBq48XRIrLk7 x8MqIFkPWCUvx1iF9REscX4= X-Google-Smtp-Source: APiQypINM0ufJVBvsbWdiq2pw6kqawELVz9SsMoajPGAv/JgHLc9s/4waKga7ZjKPTJ/l+fEgz868g== X-Received: by 2002:aa7:9093:: with SMTP id i19mr11979562pfa.152.1588501390074; Sun, 03 May 2020 03:23:10 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 1/7] configure: Add KVM target support for MIPS64 Date: Sun, 3 May 2020 18:20:15 +0800 Message-Id: <1588501221-1205-2-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::542; envelope-from=zltjiangshi@gmail.com; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Preparing for Loongson-3 virtualization, add KVM target support for MIPS64 in configure script. Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang Reviewed-by: Aleksandar Markovic --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 23b5e93..7581e65 100755 --- a/configure +++ b/configure @@ -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 --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501513; cv=none; d=zohomail.com; s=zohoarc; b=eFNYrSwPZQxedXj0T8pvG8Ej1elRwrLxknA9s3Dd60ipVHO4wj1L62B+eImuLnBmshbU+Z5O2Enmv/C80SWyraMhKBjkmab7TslMhBj49XeLOtu84Z9NH3zysiQMnJ6PR14rE2k4WxN09REk26H/pOX8QvS1V2rtBkVQW2j5w7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501513; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3jIcKseLRlDrsTfsSCco9E5+WjcQguD48G/bWDLSlaA=; b=ddkCrsFdAc5xif1tpqkVBUomEpZzWc+GOz0tTYbUaA2BddArcH+gItvI5xXIR13JBkbtVzJ/XvzHkrvNO9R6ms4VbhV4aboBhRndgHPKkS50y7wuW2zufWR0qWUmvAA6gznRmUwEhneqSPeIChpOoSrhj7rAxug65fr4BgQUQ6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158850151344583.5023220771468; Sun, 3 May 2020 03:25:13 -0700 (PDT) Received: from localhost ([::1]:48360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBo8-00028X-3u for importer@patchew.org; Sun, 03 May 2020 06:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBnJ-0001TG-AX for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:21 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:51136) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBnI-00070P-D7 for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:21 -0400 Received: by mail-pj1-x1043.google.com with SMTP id t9so2385283pjw.0 for ; Sun, 03 May 2020 03:24:19 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.24.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3jIcKseLRlDrsTfsSCco9E5+WjcQguD48G/bWDLSlaA=; b=lyeXgDMSqWOGdHs8q3AGTYhbaNEvUlnrvK6LbqRJ/ovza3yIyMaR4vpW9hhqcQc+FY 7Dg3ZIL5A6M8iRxbxZUHt3b/Eynj0cRyxsD3PugUqF+8QnrGCQ9Uj3ZECChi9AK45SpS cPiJkL+5tHRq7ax+KoQhwhpwW6qCEIh0Hg4iFP6KGkKlhHZpPdCzKpyvYaJgKgUG0U0E KHPYs/RZ/cL830LASSt1e9oY05MZsbYXXx43K9x7yavaXZ7m42chqLDOduNfkxt6gUk8 ACfMWLIgyPHMvHeVi5/JP1qGtONR/82FB6cbRElPsLO1ZSQY49FO82C66gcJnyLNGQc2 vVag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3jIcKseLRlDrsTfsSCco9E5+WjcQguD48G/bWDLSlaA=; b=cASQXe4gpBXj+en29VwTCtHgAeBrdLv9oVae1rlydlUykFBakxMHSWY/92gvaXjVbu 0iGYJ+YtIEkCTmebcBLKEk1YaHADSaPXMXEGFTYUTQKbW7ghReqVRm6D4Ra7VNN9bzSc WtEpHE4L7JDEEw+MvYghJdnFj3QWfK7g0J05/VR1yhPH9p9Xwv0kMNoP3PcZVvaUbhps qoXMyE4j+deKHDhOH1fccMPF0B5hxyGXJ1E2mgtjtvqZRZIC138ZoE/WcXiiOCLq/Uj0 ZJiuKXkq42iV5xZtLiPLN1Uzg2SIWI6+0ihnMK6k9uPSFBh/EHR6N1VLhGiVvhXP9a5y f5QA== X-Gm-Message-State: AGi0PuZXiLnWGID6op2gteutbDXkOVGwctn3CN9zAhuKZg3dSDgEXNT3 gUhXBC7uUVcdyy9DfL+2O10= X-Google-Smtp-Source: APiQypI71j+EA3Iq2DujYIsdL7muioyshOUx0vYJCWOeDjVENPAl9rJiMeuzbJrkYWj4Nc76uwr5Aw== X-Received: by 2002:a17:90a:6fe4:: with SMTP id e91mr10845265pjk.28.1588501458934; Sun, 03 May 2020 03:24:18 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 2/7] hw/mips: Implement the kvm_type() hook in MachineClass Date: Sun, 3 May 2020 18:20:16 +0800 Message-Id: <1588501221-1205-3-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=zltjiangshi@gmail.com; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" MIPS has two types of KVM: TE & VZ, and TE is the default type. Now we can't create a VZ guest in QEMU because it lacks the kvm_type() hook in MachineClass. Besides, libvirt uses a null-machine to detect the kvm capability, so by default it will return "KVM not supported" on a VZ platform. Thus, null-machine also need the kvm_type() hook. Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang Reviewed-by: Aleksandar Markovic --- hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 4 ++++ hw/mips/Makefile.objs | 2 +- hw/mips/common.c | 31 +++++++++++++++++++++++++++++++ include/hw/mips/mips.h | 3 +++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 hw/mips/common.c diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 1d540ed..b5672f4 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) +=3D vm-change-state-handl= er.o common-obj-$(CONFIG_SOFTMMU) +=3D qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) +=3D sysbus.o common-obj-$(CONFIG_SOFTMMU) +=3D machine.o -common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o common-obj-$(CONFIG_SOFTMMU) +=3D loader.o common-obj-$(CONFIG_SOFTMMU) +=3D machine-hmp-cmds.o common-obj-$(CONFIG_SOFTMMU) +=3D numa.o common-obj-$(CONFIG_SOFTMMU) +=3D clock-vmstate.o +obj-$(CONFIG_SOFTMMU) +=3D null-machine.o obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o =20 common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index cb47d9d..94a36f9 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -17,6 +17,7 @@ #include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "hw/core/cpu.h" +#include "hw/mips/mips.h" =20 static void machine_none_init(MachineState *mch) { @@ -50,6 +51,9 @@ static void machine_none_machine_init(MachineClass *mc) mc->max_cpus =3D 1; mc->default_ram_size =3D 0; mc->default_ram_id =3D "ram"; +#ifdef TARGET_MIPS + mc->kvm_type =3D mips_kvm_type; +#endif } =20 DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 525809a..2f7795b 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,4 +1,4 @@ -obj-y +=3D addr.o mips_int.o +obj-y +=3D addr.o common.o mips_int.o obj-$(CONFIG_R4K) +=3D mips_r4k.o obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) +=3D mips_mipssim.o diff --git a/hw/mips/common.c b/hw/mips/common.c new file mode 100644 index 0000000..0e33bd0 --- /dev/null +++ b/hw/mips/common.c @@ -0,0 +1,31 @@ +/* + * Common MIPS routines + * + * Copyright (c) 2020 Huacai Chen (chenhc@lemote.com) + * This code is licensed under the GNU GPL v2. + */ + +#include +#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 =3D KVM_STATE(machine->accelerator); + + r =3D kvm_check_extension(s, KVM_CAP_MIPS_VZ); + if (r > 0) { + return KVM_VM_MIPS_VZ; + } + + r =3D kvm_check_extension(s, KVM_CAP_MIPS_TE); + if (r > 0) { + return KVM_VM_MIPS_TE; + } + + return -1; +} diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h index 0af4c3d..2ac0580 100644 --- a/include/hw/mips/mips.h +++ b/include/hw/mips/mips.h @@ -20,4 +20,7 @@ void rc4030_dma_write(void *dma, uint8_t *buf, int len); =20 DeviceState *rc4030_init(rc4030_dma **dmas, IOMMUMemoryRegion **dma_mr); =20 +/* common.c */ +int mips_kvm_type(MachineState *machine, const char *vm_type); + #endif --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501547; cv=none; d=zohomail.com; s=zohoarc; b=SoAJrh8/zHyULsFlx2bOO+JTNpiOWFnliCBn6ep5Sh9MWvVzVEKobr78yxNHWuJ23wiB5eLDTAiFs8oKfQ7dqjmxjMUFcWoDbbQ/35i4fhQDhnJHYRVfwNSvwXQLLSgxZrESm0h2MGFtaiK2ghQxE90qVHm/JMr3mux4T9DjXSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501547; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=jfwiI8//wmy3ik49uBy2rjnF1vTWGg8mq8vj0CK4ofw=; b=KQOcf+WeKfjhK6g6HfftLmui1I2x3D+kzw2VihXd/Ry1szmgDs9iY3Y2fv5I5wSejBkMb+JHixunRmZfFrCMMuaOpuO08KhvuPsEttlFvIGrlMv0cJHAQ+hb85w7SZXDQ2lOOjjoN6TXJeaIkwbB0+gBLddsylUaL2bnjCynQKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501547888256.4458888584895; Sun, 3 May 2020 03:25:47 -0700 (PDT) Received: from localhost ([::1]:49484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBog-0002id-KP for importer@patchew.org; Sun, 03 May 2020 06:25:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBnY-0001kG-E2 for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:36 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:33017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBnX-00076R-0g for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:36 -0400 Received: by mail-pf1-x432.google.com with SMTP id x77so4072857pfc.0 for ; Sun, 03 May 2020 03:24:34 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.24.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jfwiI8//wmy3ik49uBy2rjnF1vTWGg8mq8vj0CK4ofw=; b=RttYHTIhvZo/D26CBwySPgcn7G8ibBnGNBAwnhx/ypIcXAbp8/crplIxiGfWhHPBD8 O+kSM1uu7X0cXy2UqVeWTwNVHqpQ7j4xaDmuSMcy8LbWmRRLsrt4/H0pPLAcS/cTbGWG oJ4qlPgd7A/3+Mw41bRqAy8R4YPTCpPd1bq4fnXymmgM+nR4Sc4rHzsfFRlfoQZdWEG+ vvZr3Oqg5KmEO2Q9Kx24GppXSx2kBYK397iAXWFLM+WmYgJFrMxKZU9BbS8Qv9tfXhwY HnH8MCV6beByIQIYuelYDXpRHrh/7RwW0hxGTXjjUwgXnLXki+ItAlAHWMLtWi3zV/ia 2T9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jfwiI8//wmy3ik49uBy2rjnF1vTWGg8mq8vj0CK4ofw=; b=r12cK27EBWUrCW0eanWmHd6/RX1d8KTGzQ6NAgqO5Vm02Cf2mzWZx1Rrm4hXZAOMF0 CBUcaWVXPwqz9u8IAYORJ+jMevQrd+se5Wo4MTZ6RXUgoh2pcxiyriZVXkqdXvTog6C/ B+BU8AvcRrn/JUtqNS1GWJnPG+YMTWuF0ooyzdImpnMiSO6HHvFY9kTNNTytxhIwfXaq o92sWt21+yCXEIfQPQpT3R0/XX46z5wcUxnqdqmCfQNNe+RP08wZZRPHI+scBOLKREJS w2J9pj6WFIa94VoUjRd1XGfaTf0lwTboiov86aPhCqZjduyrJtu73vHObUQv3DORMsL5 Q2yg== X-Gm-Message-State: AGi0PuYMIwJBXu4zPoW4LFw4QeFssber3uouqwemh4NEtt+y+7x0HOeW OpQxKO7W4HGvb2CqxEgYiVo= X-Google-Smtp-Source: APiQypLGQT02ho06oeV1+twps5Giu+0OgK9nQUiYgUt1UsfSVAAYCfY6+61FrWjL9WVDH91Wog7pRQ== X-Received: by 2002:a62:3857:: with SMTP id f84mr13246113pfa.56.1588501473618; Sun, 03 May 2020 03:24:33 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 3/7] hw/mips: Add CPU IRQ3 delivery for KVM Date: Sun, 3 May 2020 18:20:17 +0800 Message-Id: <1588501221-1205-4-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=zltjiangshi@gmail.com; helo=mail-pf1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, KVM/MIPS only deliver I/O interrupt via IP2, this patch add IP3 delivery as well, because Loongson-3 based machine use both IRQ2 (CPU's IP2) and IRQ3 (CPU's IP3). Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang Reviewed-by: Aleksandar Markovic --- hw/mips/mips_int.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 796730b..982ce34 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -48,14 +48,14 @@ static void cpu_mips_irq_request(void *opaque, int irq,= int level) if (level) { env->CP0_Cause |=3D 1 << (irq + CP0Ca_IP); =20 - if (kvm_enabled() && irq =3D=3D 2) { + if (kvm_enabled() && (irq =3D=3D 2 || irq =3D=3D 3)) { kvm_mips_set_interrupt(cpu, irq, level); } =20 } else { env->CP0_Cause &=3D ~(1 << (irq + CP0Ca_IP)); =20 - if (kvm_enabled() && irq =3D=3D 2) { + if (kvm_enabled() && (irq =3D=3D 2 || irq =3D=3D 3)) { kvm_mips_set_interrupt(cpu, irq, level); } } --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501678; cv=none; d=zohomail.com; s=zohoarc; b=TBVALX7bcwDOkwJ0yarkuEU0K9uonD+yiO2o5EHconOrb9iQ76Xw1nzBiAXV4fQMFSvQNZBRXWm+be7oLyjeGs5Nnh3W8NCRa0rq948xh+redPvvWVuUsEzoLoZNIci7mEqtkBWs7eeDt6p/ALn6LJGRMyB4+ZtThoUMMA99qmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501678; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Pja4TRHYcV39jROvm5UhXGDO0MXNz8Qe9iULx5cF5qI=; b=YH6m5iN6k3son/OEt6ThMVcCbye5DcO0t9ZrUjVOGGxer35asH4LnNdPnamH3hIqT/mXzKk5eCLgyAugadZUUkKuIfN8VwvqMZIxORXOGTazrR3FQV8VDTnJaKqemQl5mmohAfYU/hxLqhwAHlZBpx0HUSfk5KQ11pSb7LvWvoI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501678234267.2403653175446; Sun, 3 May 2020 03:27:58 -0700 (PDT) Received: from localhost ([::1]:55392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBqm-0005Wh-JS for importer@patchew.org; Sun, 03 May 2020 06:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBnj-00021J-BR for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:47 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:38243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBni-0007Dy-5F for qemu-devel@nongnu.org; Sun, 03 May 2020 06:24:47 -0400 Received: by mail-pj1-x102f.google.com with SMTP id t40so2345085pjb.3 for ; Sun, 03 May 2020 03:24:45 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.24.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pja4TRHYcV39jROvm5UhXGDO0MXNz8Qe9iULx5cF5qI=; b=Z5QPb69LVnkYTK0SsEO6G1eJ/0omRrbNQOpPgDleMxitw4EppifZsxu6kQ43fvyUwb aOMyITgcBfSws3gv3wE0m2NzB4K+2iGiWHYxiJHVVDRZkP2eidQSByO7JiffBR3x9po1 v4WzgxvIg2O5fjGmm3wURW0c70OFq4jz6SJNRsgzLtmTu2PuPRyC1pojREt5gKWZkaos QIGVLIkgZD+gRzDYLtXCwCsedHZ9MKyWTkk5zcV6SZCRr1iQAp00IJe1tcveEE5MEe1A /mmPmYz1HvajPR6d80R6CsLvHNYp04cFZWs0WxXicBiR1bxLiv1tLV7kYldO6ir9gD9k onqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Pja4TRHYcV39jROvm5UhXGDO0MXNz8Qe9iULx5cF5qI=; b=q/nR+TXTxbjjMP4zMZ0VXYrb4e6WQ/ZCMu2SHxN/zW48rVC005+o1njq7TucZKF7v1 /htOrmeNetjqfT4MWKMVrUqfvOChX6f+b0zc5WqrggR/D/pTpxIJd/WpI7z45XeDQVBm EIsTcKwQ+Eoa7jOVG4K1nqxrYwYZX+sF+mlLyceUItKQ+8IbIsRBN5Xe4kNsQKGzcsRF zCcmSzNR09j1SDaWa0LqU8gnTJQmoKyu42gozfv3CD1OmGTxLvvZui/Qry/FL9qMX6Oi 66Rp16NsFw8mnasrRdJRBemmixzIF6cYKlxrUGsxLP6Y0riZTcjFs2XdfxqfLgL7+DW/ Evxw== X-Gm-Message-State: AGi0PubUTqUsjt6KEbRIBqSy5CU/oZo+ba5zfBLVpnk0bJino2DwrUHb poVP1dpp3Kw2tqN8fEb6+Vg= X-Google-Smtp-Source: APiQypI3dDR/c4o6QXmnZSEdocSlbmwTHL5RCly/KEGZaJAlLg60M9EAyQRU7R99hWz8Zv815+RRnA== X-Received: by 2002:a17:90a:6f22:: with SMTP id d31mr10775126pjk.14.1588501484904; Sun, 03 May 2020 03:24:44 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 4/7] target/mips: Add Loongson-3 CPU definition Date: Sun, 3 May 2020 18:20:18 +0800 Message-Id: <1588501221-1205-5-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=zltjiangshi@gmail.com; helo=mail-pj1-x102f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, 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. Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang --- target/mips/cpu.h | 28 +++++++++++++ target/mips/internal.h | 2 + target/mips/mips-defs.h | 7 +++- target/mips/translate.c | 2 + target/mips/translate_init.inc.c | 86 ++++++++++++++++++++++++++++++++++++= ++++ 5 files changed, 123 insertions(+), 2 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 94d01ea..0b3c987 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -940,7 +940,35 @@ struct CPUMIPSState { #define CP0C5_UFR 2 #define CP0C5_NFExists 0 int32_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 0 int32_t CP0_Config7; + int64_t CP0_Config7_rw_bitmask; +#define CP0C7_NAPCGEN 2 +#define CP0C7_UNIMUEN 1 +#define CP0C7_VFPUCGEN 0 uint64_t CP0_LLAddr; uint64_t CP0_MAAR[MIPS_MAAR_MAX]; int32_t CP0_MAARI; diff --git a/target/mips/internal.h b/target/mips/internal.h index 1bf274b..7853cb1 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -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; diff --git a/target/mips/mips-defs.h b/target/mips/mips-defs.h index a831bb4..c2c96db 100644 --- a/target/mips/mips-defs.h +++ b/target/mips/mips-defs.h @@ -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) =20 +#define CPU_LOONGSON3A (CPU_MIPS64R2 | INSN_LOONGSON3A) + /* * Strictly follow the architecture standard: * - Disallow "special" instruction handling for PMON/SPIM. diff --git a/target/mips/translate.c b/target/mips/translate.c index 25b595a..2caf4cb 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -31206,7 +31206,9 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_Config5 =3D env->cpu_model->CP0_Config5; env->CP0_Config5_rw_bitmask =3D env->cpu_model->CP0_Config5_rw_bitmask; env->CP0_Config6 =3D env->cpu_model->CP0_Config6; + env->CP0_Config6_rw_bitmask =3D env->cpu_model->CP0_Config6_rw_bitmask; env->CP0_Config7 =3D env->cpu_model->CP0_Config7; + env->CP0_Config7_rw_bitmask =3D env->cpu_model->CP0_Config7_rw_bitmask; env->CP0_LLAddr_rw_bitmask =3D env->cpu_model->CP0_LLAddr_rw_bitmask << env->cpu_model->CP0_LLAddr_shift; env->CP0_LLAddr_shift =3D env->cpu_model->CP0_LLAddr_shift; diff --git a/target/mips/translate_init.inc.c b/target/mips/translate_init.= inc.c index 6d145a9..a31f229 100644 --- a/target/mips/translate_init.inc.c +++ b/target/mips/translate_init.inc.c @@ -802,6 +802,92 @@ const mips_def_t mips_defs[] =3D .mmu_type =3D MMU_TYPE_R4000, }, { + .name =3D "Loongson-3A1000", + .CP0_PRid =3D 0x6305, + /* 64KB I-cache and d-cache. 4 way with 32 bit cache line size. */ + .CP0_Config0 =3D MIPS_CONFIG0 | (0x1 << CP0C0_AR) | (0x2 << CP0C0_= AT) | + (MMU_TYPE_R4000 << CP0C0_MT), + .CP0_Config1 =3D MIPS_CONFIG1 | (1 << CP0C1_FP) | (63 << CP0C1_MMU= ) | + (3 << CP0C1_IS) | (4 << CP0C1_IL) | (3 << CP0C1_IA)= | + (3 << CP0C1_DS) | (4 << CP0C1_DL) | (3 << CP0C1_DA)= | + (1 << CP0C1_PC) | (1 << CP0C1_WR) | (1 << CP0C1_EP), + .CP0_Config2 =3D MIPS_CONFIG2 | (7 << CP0C2_SS) | (4 << CP0C2_SL) | + (3 << CP0C2_SA), + .CP0_Config3 =3D MIPS_CONFIG3 | (1 << CP0C3_LPA), + .CP0_LLAddr_rw_bitmask =3D 0, + .SYNCI_Step =3D 32, + .CCRes =3D 2, + .CP0_Status_rw_bitmask =3D 0x74D8FFFF, + .CP0_PageGrain =3D (1 << CP0PG_ELPA), + .CP0_PageGrain_rw_bitmask =3D (1 << CP0PG_ELPA), + .CP1_fcr0 =3D (0x5 << FCR0_PRID) | (0x1 << FCR0_REV) | (0x1 << FCR= 0_F64) | + (0x1 << FCR0_PS) | (0x1 << FCR0_L) | (0x1 << FCR0_W) | + (0x1 << FCR0_D) | (0x1 << FCR0_S), + .CP1_fcr31 =3D 0, + .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, + .SEGBITS =3D 42, + .PABITS =3D 48, + .insn_flags =3D CPU_LOONGSON3A, + .mmu_type =3D MMU_TYPE_R4000, + }, + { + .name =3D "Loongson-3A4000", + .CP0_PRid =3D 0x14C000, + /* 64KB I-cache and d-cache. 4 way with 32 bit cache line size. */ + .CP0_Config0 =3D MIPS_CONFIG0 | (0x1 << CP0C0_AR) | (0x2 << CP0C0_= AT) | + (MMU_TYPE_R4000 << CP0C0_MT), + .CP0_Config1 =3D MIPS_CONFIG1 | (1 << CP0C1_FP) | (63 << CP0C1_MMU= ) | + (2 << CP0C1_IS) | (5 << CP0C1_IL) | (3 << CP0C1_IA)= | + (2 << CP0C1_DS) | (5 << CP0C1_DL) | (3 << CP0C1_DA)= | + (1 << CP0C1_PC) | (1 << CP0C1_WR) | (1 << CP0C1_EP), + .CP0_Config2 =3D MIPS_CONFIG2 | (5 << CP0C2_SS) | (5 << CP0C2_SL) | + (15 << CP0C2_SA), + .CP0_Config3 =3D MIPS_CONFIG3 | (1U << CP0C3_M) | (1 << CP0C3_MSAP= ) | + (1 << CP0C3_BP) | (1 << CP0C3_BI) | (1 << CP0C3_ULR= I) | + (1 << CP0C3_RXI) | (1 << CP0C3_LPA) | (1 << CP0C3_V= Int), + .CP0_Config4 =3D MIPS_CONFIG4 | (1U << CP0C4_M) | (2 << CP0C4_IE) | + (1 << CP0C4_AE) | (0x1c << CP0C4_KScrExist), + .CP0_Config4_rw_bitmask =3D 0, + .CP0_Config5 =3D MIPS_CONFIG5 | (1 << CP0C5_CRCP) | (1 << CP0C5_NF= Exists), + .CP0_Config5_rw_bitmask =3D (1 << CP0C5_K) | (1 << CP0C5_CV) | + (1 << CP0C5_MSAEn) | (1 << CP0C5_UFE) | + (1 << CP0C5_FRE) | (1 << CP0C5_SBRI), + .CP0_Config6 =3D (1 << CP0C6_VCLRU) | (1 << CP0C6_DCLRU) | + (1 << CP0C6_SFBEN) | (1 << CP0C6_VLTINT) | + (1 << CP0C6_INSTPREF) | (1 << CP0C6_DATAPREF), + .CP0_Config6_rw_bitmask =3D (1 << CP0C6_BPPASS) | (0x3f << CP0C6_K= POS) | + (1 << CP0C6_KE) | (1 << CP0C6_VTLBONLY) | + (1 << CP0C6_LASX) | (1 << CP0C6_SSEN) | + (1 << CP0C6_DISDRTIME) | (1 << CP0C6_PIX= NUEN) | + (1 << CP0C6_SCRAND) | (1 << CP0C6_LLEXCE= N) | + (1 << CP0C6_DISVC) | (1 << CP0C6_VCLRU) | + (1 << CP0C6_DCLRU) | (1 << CP0C6_PIXUEN)= | + (1 << CP0C6_DISBLKLYEN) | (1 << CP0C6_UM= EMUALEN) | + (1 << CP0C6_SFBEN) | (1 << CP0C6_FLTINT)= | + (1 << CP0C6_VLTINT) | (1 << CP0C6_DISBTB= ) | + (3 << CP0C6_STPREFCTL) | (1 << CP0C6_INS= TPREF) | + (1 << CP0C6_DATAPREF), + .CP0_Config7 =3D 0, + .CP0_Config7_rw_bitmask =3D (1 << CP0C7_NAPCGEN) | (1 << CP0C7_UNI= MUEN) | + (1 << CP0C7_VFPUCGEN), + .CP0_LLAddr_rw_bitmask =3D 1, + .SYNCI_Step =3D 16, + .CCRes =3D 2, + .CP0_Status_rw_bitmask =3D 0x7DDBFFFF, + .CP0_PageGrain =3D (1 << CP0PG_ELPA), + .CP0_PageGrain_rw_bitmask =3D (1U << CP0PG_RIE) | (1 << CP0PG_XIE)= | + (1 << CP0PG_ELPA) | (1 << CP0PG_IEC), + .CP1_fcr0 =3D (0x5 << FCR0_PRID) | (0x1 << FCR0_REV) | (0x1 << FCR= 0_F64) | + (0x1 << FCR0_PS) | (0x1 << FCR0_L) | (0x1 << FCR0_W) | + (0x1 << FCR0_D) | (0x1 << FCR0_S), + .CP1_fcr31 =3D 0, + .CP1_fcr31_rw_bitmask =3D 0xFF83FFFF, + .SEGBITS =3D 48, + .PABITS =3D 48, + .insn_flags =3D CPU_LOONGSON3A, + .mmu_type =3D MMU_TYPE_R4000, + }, + { /* A generic CPU providing MIPS64 DSP R2 ASE features. FIXME: Eventually this should be replaced by a real CPU model. = */ .name =3D "mips64dspr2", --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501768; cv=none; d=zohomail.com; s=zohoarc; b=CtiByliHnlZT0qQtBHuOMYZeAAnz/lx0xK6Gs57oMA/vkkIwKcT3fNF1Ry8lbBJTlFMjgqBRKh+FXNk+6/JovWPP2tG/ol7FiSJ3KTaphbXDlCGH9fP6muffGYRpRiiSfZOlwhSFJwVoPyCe5QXS5u5sMRgZHDweZBA8pJRglNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501768; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=hH+WJS7P2vdGj2kP2clpp5p3F7ykGj330Lsee1IC1yw=; b=T9GEyTVzs9OSI5PkZbtpm059cGwHJbR8aSFaWkYXe1BEIkxwbXN2FS+JiGisZByGWIzTz5kPuF/nKJNBJ2tq3+gs92TgEHlSViavRX9NynaKzwFAUunm4fmKfA+OYimw+Tt+A/81Q407/MC/Tl6cu/RrW/akHdFWQR8q57bwwQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501768724391.5479415519143; Sun, 3 May 2020 03:29:28 -0700 (PDT) Received: from localhost ([::1]:60880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBsF-0008I7-EA for importer@patchew.org; Sun, 03 May 2020 06:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBoQ-0002ot-15 for qemu-devel@nongnu.org; Sun, 03 May 2020 06:25:30 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:53558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBoO-0007lo-GD for qemu-devel@nongnu.org; Sun, 03 May 2020 06:25:29 -0400 Received: by mail-pj1-x102a.google.com with SMTP id hi11so2381364pjb.3 for ; Sun, 03 May 2020 03:25:28 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.25.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:25:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hH+WJS7P2vdGj2kP2clpp5p3F7ykGj330Lsee1IC1yw=; b=Yo1dI8GIASM54rNwgvJY/RYQ2wUGBNh/kxDo+Yz6w7/L9TI4zvo9NhAZn/ieSSQJz0 b7LzqgERZ1KsmLlAN2yy9ecCYYKvGamHOzSn5NDKaexUEvUPXgs5V+A5oXe3A9pW++sf VyUTgFR2j4U3GvLN3ihSVeoF4vcq7jNme68GjARRsqjMyd4kZBrVw43GeLwM4Kp5wOO2 99DWBQ/SNCfQyjvEfiJKuTcC1CuyjYp3tmoGIyxWAthZkuaFD7GL0NpmIrTZi39pOdGB FxHQCxTlba+FDcbQq/QjyYWaAaig0szcTQqVSX9Lmz5kuf2qJV3g7MUPZgNHtOK3BTdz KjMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hH+WJS7P2vdGj2kP2clpp5p3F7ykGj330Lsee1IC1yw=; b=Fm08o8H7eQdunR36V25O0fVlAZWf+NXvRahPyMOGP1Z0cikpMrvHs63jkCYcG61Pu5 i7i1dLUuHt2UbI6qGp+DfOpHCaDI8iBEngNUhIG1nxgSYAaUEVy5k6J+hXtI0E1v3gWO hq2ZKrz+Fgtk72Bai0m0zyS+5NVuye3TuqRjCQNLhWGdyvvfSp5VHxK31elV9mebvxPV TYlDTlRTudcEEok2CUSdMa9lv0ijKmEcenphmGuTT4NqZfEdMR1xOdF3YUTnftvpNkJZ MMBfqRDVGsYjCsuzymdrC84/Tf7AU/msvIZZ4TLBfzSI0LG0zjcaSmRxJZ9CirgWR4Aw vPoA== X-Gm-Message-State: AGi0Pua4IhL5AyiIwRq8EaflX9qGKKIwqWnZMN44vjPtCPwVKsLYW9nS xAJe/DUxlX8FiIrqMAq+DEw= X-Google-Smtp-Source: APiQypJE0v2ImuWhCiEGZlCE4F34QNNMQgTOMoC0lM+qPSWujfPkwS3RNWO/Xyd4R13xTrLCvzgntg== X-Received: by 2002:a17:90a:37a3:: with SMTP id v32mr11168607pjb.2.1588501527046; Sun, 03 May 2020 03:25:27 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 5/7] target/mips: Add more CP0 register for save/restore Date: Sun, 3 May 2020 18:20:19 +0800 Message-Id: <1588501221-1205-6-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=zltjiangshi@gmail.com; helo=mail-pj1-x102a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add more CP0 register for save/restore, including: EBase, XContext, PageGrain, PWBase, PWSize, PWField, PWCtl, Config*, KScratch1~KScratch6. Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang Reviewed-by: Aleksandar Markovic --- target/mips/kvm.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ target/mips/machine.c | 6 +- 2 files changed, 216 insertions(+), 2 deletions(-) diff --git a/target/mips/kvm.c b/target/mips/kvm.c index de3e26e..96cfa10 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -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))) =20 #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) =20 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)) =20 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, in= t level) DPRINTF("%s: Failed to put CP0_INDEX (%d)\n", __func__, err); ret =3D err; } + err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_RANDOM, &env->CP0_Ra= ndom); + if (err < 0) { + DPRINTF("%s: Failed to put CP0_RANDOM (%d)\n", __func__, err); + ret =3D err; + } err =3D 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, i= nt level) DPRINTF("%s: Failed to put CP0_PAGEMASK (%d)\n", __func__, err); ret =3D err; } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_WIRED, &env->CP0_Wir= ed); if (err < 0) { DPRINTF("%s: Failed to put CP0_WIRED (%d)\n", __func__, err); ret =3D err; } + err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_PWCTL, &env->CP0_PWC= tl); + if (err < 0) { + DPRINTF("%s: Failed to put CP0_PWCTL (%d)\n", __func__, err); + ret =3D err; + } err =3D kvm_mips_put_one_reg(cs, KVM_REG_MIPS_CP0_HWRENA, &env->CP0_HW= REna); 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, in= t level) DPRINTF("%s: Failed to put CP0_PRID (%d)\n", __func__, err); ret =3D err; } + err =3D kvm_mips_put_one_ulreg(cs, KVM_REG_MIPS_CP0_EBASE, &env->CP0_E= Base); + if (err < 0) { + DPRINTF("%s: Failed to put CP0_EBASE (%d)\n", __func__, err); + ret =3D err; + } err =3D 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, i= nt level) DPRINTF("%s: Failed to change CP0_CONFIG5 (%d)\n", __func__, err); ret =3D err; } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } err =3D 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 =3D err; } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } =20 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 =3D err; } + err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_RANDOM, &env->CP0_Ra= ndom); + if (err < 0) { + DPRINTF("%s: Failed to get CP0_RANDOM (%d)\n", __func__, err); + ret =3D err; + } err =3D 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 =3D err; } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_WIRED, &env->CP0_Wir= ed); if (err < 0) { DPRINTF("%s: Failed to get CP0_WIRED (%d)\n", __func__, err); ret =3D err; } + err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_PWCTL, &env->CP0_PWC= tl); + if (err < 0) { + DPRINTF("%s: Failed to get CP0_PWCtl (%d)\n", __func__, err); + ret =3D err; + } err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_HWRENA, &env->CP0_HW= REna); 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 =3D err; } + err =3D kvm_mips_get_one_ulreg(cs, KVM_REG_MIPS_CP0_EBASE, &env->CP0_E= Base); + if (err < 0) { + DPRINTF("%s: Failed to get CP0_EBASE (%d)\n", __func__, err); + ret =3D err; + } err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG, &env->CP0_Co= nfig0); 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 =3D err; } + err =3D kvm_mips_get_one_reg(cs, KVM_REG_MIPS_CP0_CONFIG6, &env->CP0_C= onfig6); + if (err < 0) { + DPRINTF("%s: Failed to get CP0_CONFIG6 (%d)\n", __func__, err); + ret =3D err; + } + err =3D 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 =3D err; + } err =3D 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 =3D err; } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } + err =3D 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 =3D err; + } =20 return ret; } diff --git a/target/mips/machine.c b/target/mips/machine.c index 8d5b18b..5b23e3e 100644 --- a/target/mips/machine.c +++ b/target/mips/machine.c @@ -212,8 +212,8 @@ const VMStateDescription vmstate_tlb =3D { =20 const VMStateDescription vmstate_mips_cpu =3D { .name =3D "cpu", - .version_id =3D 19, - .minimum_version_id =3D 19, + .version_id =3D 20, + .minimum_version_id =3D 20, .post_load =3D cpu_post_load, .fields =3D (VMStateField[]) { /* Active TC */ @@ -289,6 +289,8 @@ const VMStateDescription vmstate_mips_cpu =3D { 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), --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501650; cv=none; d=zohomail.com; s=zohoarc; b=oCtSbXme+BIQnS39AXRZclQt+ureKL8mioIWzjN18NuMAT23xtpjPkyEYho3SgbuhPcMF/q+qTfbk3xctt034mdjHWHULSZqmjkuP/LrKULtvPQHqYPLbDzhPngYgbc2i6eFVCw5+97mlOWLlGZr03gZoE4yg6M4DFrjN6DJyBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501650; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HdrfpUElYS6wMeCM42Cihu+fLmU+dFuPcCHwy8GwgEk=; b=TekDlB0PjT962CzyH6brhzQJImDyo3ctYAUm+WOAjykUMfCR1EUZvKiuZbue4GWBLQbAcoacDGLKSg+uizTZP12YFpw0OQt4ki2LuAhKcmHR+DnFU5cW7YZOKtCa6xx8znY0m7UDra6/bbQvPjALo7I+taIssYpmOD0aZMyFOws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501650761605.6653519111744; Sun, 3 May 2020 03:27:30 -0700 (PDT) Received: from localhost ([::1]:53556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBqG-0004eb-5d for importer@patchew.org; Sun, 03 May 2020 06:27:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBoq-0003L2-KV for qemu-devel@nongnu.org; Sun, 03 May 2020 06:25:57 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:45966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBoo-00087B-CF for qemu-devel@nongnu.org; Sun, 03 May 2020 06:25:56 -0400 Received: by mail-pf1-x443.google.com with SMTP id w65so4054758pfc.12 for ; Sun, 03 May 2020 03:25:52 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.25.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:25:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HdrfpUElYS6wMeCM42Cihu+fLmU+dFuPcCHwy8GwgEk=; b=PydS6kTYIp4CajSwOJRsjDIaELHzzrGulV05L8anLoPCAF/KTckhf1q/LV6Vs1DFQ+ gEZic3GRXYJI0Tg5Skl8Cr2r0ji1io5YPuTow7qOC1GXI85O1GAmN4+ECBQYDhsrRiXv CXb90ZOZbpN729QxlnmOSsuXXMqU1p+JURXfhDCx0/Y3O2+YV6p7P5w70SSxrytsXxAp YVY1mjBE2rkVzLINoWMcJqWaPOGy+/SKtgiocIhZGEGknQYHOq6wxoalZ1s0LrTbyT2+ Q834ipGoUIB2EzxR4vweA7azaUdMbQ1wNRDMJz/Yx8f/s0nDYGUe2CJlOyVisJ4gErl3 FTyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HdrfpUElYS6wMeCM42Cihu+fLmU+dFuPcCHwy8GwgEk=; b=n+7a1UTzNnQhYBzYxznVS8VlCSLhovVl+i6mVm5+7lTr1tjqJuconQ+JLsa8EvK6ki MoDORq0AMkflFzNZO4bwq1bmUEF7gTIa/Z/IIzjCbbZS5WHp6f5OeyX8qf6VXzJG4wVh Ou0P3bO/5sV2iXlt45Hq3x3wyMoN2xtTJAJFcE9OO6OwBKMw3iPgWarWOexRHtlvAfhh WIslsaOAYF+ZQDWuB0zFeV3MmUMj+B6wFFqjZmkzVTZ4f5Qdx1RieofRqrZssgQbj5gd HifVUGojEukKU2v9yssE0kcr7gScbjB2gB0C1TsQn6jnPrWsLkoWhOvdXk2q4Mr1UaNm pyAw== X-Gm-Message-State: AGi0PubBpEd6sAdMOYKVpmb8xM2tGBhm3cGvaZJi98ZSJfyQQc0ZfzNw Nh/2bebzEkCIufC8+ftZclM= X-Google-Smtp-Source: APiQypJQh+5JcZ4DITMM2QS1BN6rERXSAvif5Qmuxx4eLD9qisMUje9EU0Gu9cTX6hVG5OntOkoc3Q== X-Received: by 2002:a65:6709:: with SMTP id u9mr3641822pgf.386.1588501551509; Sun, 03 May 2020 03:25:51 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 6/7] hw/mips: Add Loongson-3 machine support (with KVM) Date: Sun, 3 May 2020 18:20:20 +0800 Message-Id: <1588501221-1205-7-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=zltjiangshi@gmail.com; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add 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=3Dtcg -cpu Loongson-3A1000 -= kernel -append ... Use QEMU with KVM (available at present): qemu-system-mips64el -M loongson3,accel=3Dkvm -cpu Loongson-3A4000 -= kernel -append ... The "-cpu" parameter can be omitted here and QEMU will use the correct t= ype for TCG/KVM automatically. Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang --- default-configs/mips64el-softmmu.mak | 1 + hw/mips/Kconfig | 10 + hw/mips/Makefile.objs | 1 + hw/mips/mips_loongson3.c | 901 +++++++++++++++++++++++++++++++= ++++ 4 files changed, 913 insertions(+) create mode 100644 hw/mips/mips_loongson3.c diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 8b0c9b1..fc798e4 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -3,6 +3,7 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=3Dy CONFIG_FULONG=3Dy +CONFIG_LOONGSON3=3Dy CONFIG_ATI_VGA=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_JAZZ=3Dy diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 2c2adbc..6f16b16 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -44,6 +44,16 @@ config JAZZ config FULONG bool =20 +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 diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 2f7795b..f9bc8f5 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -4,5 +4,6 @@ obj-$(CONFIG_MALTA) +=3D gt64xxx_pci.o mips_malta.o obj-$(CONFIG_MIPSSIM) +=3D mips_mipssim.o obj-$(CONFIG_JAZZ) +=3D mips_jazz.o obj-$(CONFIG_FULONG) +=3D mips_fulong2e.o +obj-$(CONFIG_LOONGSON3) +=3D mips_loongson3.o obj-$(CONFIG_MIPS_CPS) +=3D cps.o obj-$(CONFIG_MIPS_BOSTON) +=3D boston.o diff --git a/hw/mips/mips_loongson3.c b/hw/mips/mips_loongson3.c new file mode 100644 index 0000000..3294a67 --- /dev/null +++ b/hw/mips/mips_loongson3.c @@ -0,0 +1,901 @@ +/* + * Generic Loongson-3 Platform support + * + * Copyright (c) 2015-2020 Huacai Chen (chenhc@lemote.com) + * This code is licensed under the GNU GPL v2. + * + * Contributions are licensed under the terms of the GNU GPL, + * version 2 or (at your option) any later version. + */ + +/* + * Generic 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 "qapi/error.h" +#include "cpu.h" +#include "elf.h" +#include "hw/boards.h" +#include "hw/char/serial.h" +#include "hw/mips/mips.h" +#include "hw/mips/cpudevs.h" +#include "hw/intc/i8259.h" +#include "hw/loader.h" +#include "hw/ide.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 "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 INITRD_OFFSET 0x04000000 +#define BOOTPARAM_ADDR 0x8ff00000 +#define BOOTPARAM_PHYADDR 0x0ff00000 +#define CFG_ADDR 0x0f100000 +#define FW_CONF_ADDR 0x0fff0000 +#define PM_MMIO_ADDR 0x10080000 +#define PM_MMIO_SIZE 0x100 +#define PM_CNTL_MODE 0x10 + +#define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff) + +/* Loongson-3 has a 2MB flash rom */ +#define BIOS_SIZE (2 * MiB) +#define LOONGSON_MAX_VCPUS 16 + +#define LOONGSON3_BIOSNAME "bios_loongson3.bin" + +#define PCIE_IRQ_BASE 3 + +#define VIRT_PCI_IO_BASE 0x18000000ul +#define VIRT_PCI_IO_SIZE 0x000c0000ul +#define VIRT_PCI_MEM_BASE 0x40000000ul +#define VIRT_PCI_MEM_SIZE 0x40000000ul +#define VIRT_PCI_ECAM_BASE 0x1a000000ul +#define VIRT_PCI_ECAM_SIZE 0x02000000ul + +#define align(x) (((x) + 63) & ~63) + +/* LEFI (a UEFI-like interface for BIOS-Kernel boot parameters) data struc= trues + * defined at arch/mips/include/asm/mach-loongson64/boot_param.h in Linux = kernel + */ +struct efi_memory_map_loongson { + uint16_t vers; /* version of efi_memory_map */ + uint32_t nr_map; /* number of memory_maps */ + uint32_t mem_freq; /* memory frequence */ + struct mem_map { + uint32_t node_id; /* node_id which memory attached to */ + uint32_t mem_type; /* system memory, pci memory, pci io, etc= . */ + uint64_t mem_start; /* memory map start address */ + uint32_t mem_size; /* each memory_map size, not the total si= ze */ + } map[128]; +} __attribute__((packed)); + +enum loongson_cpu_type { + Legacy_2E =3D 0x0, + Legacy_2F =3D 0x1, + Legacy_3A =3D 0x2, + Legacy_3B =3D 0x3, + Legacy_1A =3D 0x4, + Legacy_1B =3D 0x5, + Legacy_2G =3D 0x6, + Legacy_2H =3D 0x7, + Loongson_1A =3D 0x100, + Loongson_1B =3D 0x101, + Loongson_2E =3D 0x200, + Loongson_2F =3D 0x201, + Loongson_2G =3D 0x202, + Loongson_2H =3D 0x203, + Loongson_3A =3D 0x300, + Loongson_3B =3D 0x301 +}; + +/* + * Capability and feature descriptor structure for MIPS CPU + */ +struct efi_cpuinfo_loongson { + uint16_t vers; /* version of efi_cpuinfo_loongson */ + uint32_t processor_id; /* PRID, e.g. 6305, 6306 */ + uint32_t cputype; /* Loongson_3A/3B, etc. */ + uint32_t total_node; /* num of total numa nodes */ + uint16_t cpu_startup_core_id; /* Boot core id */ + uint16_t reserved_cores_mask; + uint32_t cpu_clock_freq; /* cpu_clock */ + uint32_t nr_cpus; + char cpuname[64]; +} __attribute__((packed)); + +#define MAX_UARTS 64 +struct uart_device { + uint32_t iotype; + uint32_t uartclk; + uint32_t int_offset; + uint64_t uart_base; +} __attribute__((packed)); + +#define MAX_SENSORS 64 +#define SENSOR_TEMPER 0x00000001 +#define SENSOR_VOLTAGE 0x00000002 +#define SENSOR_FAN 0x00000004 +struct sensor_device { + char name[32]; /* a formal name */ + char label[64]; /* a flexible description */ + uint32_t type; /* SENSOR_* */ + uint32_t id; /* instance id of a sensor-class */ + uint32_t fan_policy; /* step speed or constant speed */ + uint32_t fan_percent;/* only for constant speed policy */ + uint64_t base_addr; /* base address of device registers */ +} __attribute__((packed)); + +struct system_loongson { + uint16_t vers; /* version of system_loongson */ + uint32_t ccnuma_smp; /* 0: no numa; 1: has numa */ + uint32_t sing_double_channel;/* 1: single; 2: double */ + uint32_t nr_uarts; + struct uart_device uarts[MAX_UARTS]; + uint32_t nr_sensors; + struct sensor_device sensors[MAX_SENSORS]; + char has_ec; + char ec_name[32]; + uint64_t ec_base_addr; + char has_tcm; + char tcm_name[32]; + uint64_t tcm_base_addr; + uint64_t workarounds; + uint64_t of_dtb_addr; /* NULL if not support */ +} __attribute__((packed)); + +struct irq_source_routing_table { + uint16_t vers; + uint16_t size; + uint16_t rtr_bus; + uint16_t rtr_devfn; + uint32_t vendor; + uint32_t device; + uint32_t PIC_type; /* conform use HT or PCI to route to CPU-= PIC */ + uint64_t ht_int_bit; /* 3A: 1<<24; 3B: 1<<16 */ + uint64_t ht_enable; /* irqs used in this PIC */ + uint32_t node_id; /* node id: 0x0-0; 0x1-1; 0x10-2; 0x11-3 = */ + uint64_t pci_mem_start_addr; + uint64_t pci_mem_end_addr; + uint64_t pci_io_start_addr; + uint64_t pci_io_end_addr; + uint64_t pci_config_addr; + uint16_t dma_mask_bits; + uint16_t dma_noncoherent; +} __attribute__((packed)); + +struct interface_info { + uint16_t vers; /* version of the specificition */ + uint16_t size; + uint8_t flag; + char description[64]; +} __attribute__((packed)); + +#define MAX_RESOURCE_NUMBER 128 +struct resource_loongson { + uint64_t start; /* resource start address */ + uint64_t end; /* resource end address */ + char name[64]; + uint32_t flags; +}; + +struct archdev_data {}; /* arch specific additions */ + +struct board_devices { + char name[64]; /* hold the device name */ + uint32_t num_resources; /* number of device_resource */ + /* for each device's resource */ + struct resource_loongson resource[MAX_RESOURCE_NUMBER]; + /* arch specific additions */ + struct archdev_data archdata; +}; + +struct loongson_special_attribute { + uint16_t vers; /* version of this special */ + char special_name[64]; /* special_atribute_name */ + uint32_t loongson_special_type; /* type of special device */ + /* for each device's resource */ + struct resource_loongson resource[MAX_RESOURCE_NUMBER]; +}; + +struct loongson_params { + uint64_t memory_offset; /* efi_memory_map_loongson struct offset = */ + uint64_t cpu_offset; /* efi_cpuinfo_loongson struct offset */ + uint64_t system_offset; /* system_loongson struct offset */ + uint64_t irq_offset; /* irq_source_routing_table struct offset= */ + uint64_t interface_offset; /* interface_info struct offset */ + uint64_t special_offset; /* loongson_special_attribute struct offs= et */ + uint64_t boarddev_table_offset; /* board_devices offset */ +}; + +struct smbios_tables { + uint16_t vers; /* version of smbios */ + uint64_t vga_bios; /* vga_bios address */ + struct loongson_params lp; +}; + +struct efi_reset_system_t { + uint64_t ResetCold; + uint64_t ResetWarm; + uint64_t ResetType; + uint64_t Shutdown; + uint64_t DoSuspend; /* NULL if not support */ +}; + +struct efi_loongson { + uint64_t mps; /* MPS table */ + uint64_t acpi; /* ACPI table (IA64 ext 0.71) */ + uint64_t acpi20; /* ACPI table (ACPI 2.0) */ + struct smbios_tables smbios; /* SM BIOS table */ + uint64_t sal_systab; /* SAL system table */ + uint64_t boot_info; /* boot info table */ +}; + +struct boot_params { + struct efi_loongson efi; + struct efi_reset_system_t reset_system; +}; + +static struct _fw_config { + unsigned long ram_size; + unsigned int mem_freq; + unsigned int nr_cpus; + unsigned int cpu_clock_freq; +} fw_config; + +static struct _loaderparams { + unsigned long ram_size; + const char *kernel_cmdline; + const char *kernel_filename; + const char *initrd_filename; + int64_t kernel_entry; + unsigned long a0, a1, a2; +} loaderparams; + +static void *boot_params_p; +static void *boot_params_buf; + +static unsigned int bios_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 = */ +}; + +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, un= signed 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, + .endianness =3D DEVICE_NATIVE_ENDIAN, +}; + +static struct efi_memory_map_loongson *init_memory_map(void *g_map) +{ + struct efi_memory_map_loongson *emap =3D g_map; + + emap->nr_map =3D 2; + emap->mem_freq =3D 300000000; + + emap->map[0].node_id =3D 0; + emap->map[0].mem_type =3D 1; + emap->map[0].mem_start =3D 0x0; + emap->map[0].mem_size =3D (loaderparams.ram_size > 0x10000000 + ? 256 : (loaderparams.ram_size >> 20)) - 16; + + emap->map[1].node_id =3D 0; + emap->map[1].mem_type =3D 2; + emap->map[1].mem_start =3D 0x90000000; + emap->map[1].mem_size =3D (loaderparams.ram_size > 0x10000000 + ? (loaderparams.ram_size >> 20) - 256 : 0); + + return emap; +} + +static int get_host_cpu_freq(void) +{ + int fd =3D 0, freq =3D 0; + char buf[1024], *buf_p; + + fd =3D open("/proc/cpuinfo", O_RDONLY); + if (fd =3D=3D -1) { + fprintf(stderr, "Failed to open /proc/cpuinfo!\n"); + return 0; + } + + if (read(fd, buf, 1024) < 0) { + close(fd); + fprintf(stderr, "Failed to read /proc/cpuinfo!\n"); + return 0; + } + close(fd); + + buf_p =3D strstr(buf, "model name"); + while (*buf_p !=3D '@') { + buf_p++; + } + + buf_p +=3D 2; + memcpy(buf, buf_p, 12); + buf_p =3D buf; + while ((*buf_p >=3D '0') && (*buf_p <=3D '9')) { + buf_p++; + } + *buf_p =3D '\0'; + + freq =3D atoi(buf); + + return freq * 1000 * 1000; +} + +static struct efi_cpuinfo_loongson *init_cpu_info(void *g_cpuinfo_loongson) +{ + struct efi_cpuinfo_loongson *c =3D g_cpuinfo_loongson; + + c->cputype =3D Loongson_3A; + c->processor_id =3D 0x14C000; + c->cpu_clock_freq =3D get_host_cpu_freq(); + if (!c->cpu_clock_freq) { + c->cpu_clock_freq =3D 500000000; + } + + c->cpu_startup_core_id =3D 0; + c->nr_cpus =3D current_machine->smp.cpus; + c->total_node =3D (current_machine->smp.cpus + 3) / 4; + + return c; +} + +static struct system_loongson *init_system_loongson(void *g_system) +{ + struct system_loongson *s =3D g_system; + + s->ccnuma_smp =3D 0; + s->sing_double_channel =3D 1; + s->nr_uarts =3D 1; + s->uarts[0].iotype =3D 2; + s->uarts[0].int_offset =3D 2; + s->uarts[0].uartclk =3D 25000000; + s->uarts[0].uart_base =3D 0x1fe001e0; + + return s; +} + +static struct irq_source_routing_table *init_irq_source(void *g_irq_source) +{ + struct irq_source_routing_table *irq_info =3D g_irq_source; + + irq_info->node_id =3D 0; + irq_info->PIC_type =3D 0; + irq_info->dma_mask_bits =3D 64; + irq_info->pci_mem_start_addr =3D VIRT_PCI_MEM_BASE; + irq_info->pci_mem_end_addr =3D VIRT_PCI_MEM_BASE + VIRT_PCI_MEM_SIZE= - 1; + irq_info->pci_io_start_addr =3D VIRT_PCI_IO_BASE; + + return irq_info; +} + +static struct interface_info *init_interface_info(void *g_interface) +{ + struct interface_info *interface =3D g_interface; + + interface->vers =3D 0x01; + strcpy(interface->description, "UEFI_Version_v1.0"); + + return interface; +} + +static struct board_devices *board_devices_info(void *g_board) +{ + struct board_devices *bd =3D g_board; + + strcpy(bd->name, "Loongson-3A-VIRT-1w-V1.00-demo"); + + return bd; +} + +static struct loongson_special_attribute *init_special_info(void *g_specia= l) +{ + struct loongson_special_attribute *special =3D g_special; + + strcpy(special->special_name, "2015-09-01"); + + return special; +} + +static void init_loongson_params(struct loongson_params *lp) +{ + void *p =3D boot_params_p; + + lp->memory_offset =3D (unsigned long long)init_memory_map(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct efi_memory_map_loongson)); + + lp->cpu_offset =3D (unsigned long long)init_cpu_info(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct efi_cpuinfo_loongson)); + + lp->system_offset =3D (unsigned long long)init_system_loongson(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct system_loongson)); + + lp->irq_offset =3D (unsigned long long)init_irq_source(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct irq_source_routing_table)); + + lp->interface_offset =3D (unsigned long long)init_interface_info(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct interface_info)); + + lp->boarddev_table_offset =3D (unsigned long long)board_devices_info(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct board_devices)); + + lp->special_offset =3D (unsigned long long)init_special_info(p) + - (unsigned long long)lp; + p +=3D align(sizeof(struct loongson_special_attribute)); + + boot_params_p =3D p; +} + +static void init_smbios(struct smbios_tables *smbios) +{ + smbios->vers =3D 1; + init_loongson_params(&(smbios->lp)); +} + +static void init_efi(struct efi_loongson *efi) +{ + init_smbios(&(efi->smbios)); +} + +static void init_reset_system(struct efi_reset_system_t *reset) +{ + reset->Shutdown =3D 0xffffffffbfc000a8; + reset->ResetCold =3D 0xffffffffbfc00080; + reset->ResetWarm =3D 0xffffffffbfc00080; +} + +static int init_boot_param(struct boot_params *bp) +{ + init_efi(&(bp->efi)); + init_reset_system(&(bp->reset_system)); + + return 0; +} + +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; + + 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); + qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); + + fw_config.ram_size =3D ram_size; + fw_config.mem_freq =3D 300000000; + fw_config.nr_cpus =3D current_machine->smp.cpus; + fw_config.cpu_clock_freq =3D get_host_cpu_freq(); +} + +static int set_prom_bootparam(ram_addr_t initrd_offset, long initrd_size) +{ + long params_size; + char memenv[32]; + char highmemenv[32]; + void *params_buf; + unsigned int *parg_env; + int ret =3D 0; + + /* Allocate params_buf for command line. */ + params_size =3D 0x100000; + params_buf =3D g_malloc0(params_size); + + /* + * Layout of params_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 *)params_buf; + + ret =3D (3 + 1) * 4; + *parg_env++ =3D (BOOTPARAM_ADDR + ret); + ret +=3D (1 + snprintf(params_buf + ret, 256 - ret, "g")); + + /* argv1 */ + *parg_env++ =3D BOOTPARAM_ADDR + ret; + if (initrd_size > 0) + ret +=3D (1 + snprintf(params_buf + ret, 256 - ret, + "rd_start=3D0x" TARGET_FMT_lx " rd_size=3D%li %s", + PHYS_TO_VIRT((uint32_t)initrd_offset), + initrd_size, loaderparams.kernel_cmdline)); + else + ret +=3D (1 + snprintf(params_buf + ret, 256 - ret, "%s", + loaderparams.kernel_cmdline)); + + /* argv2 */ + *parg_env++ =3D BOOTPARAM_ADDR + 4 * ret; + + /* env */ + sprintf(memenv, "%ld", loaderparams.ram_size > 0x10000000 + ? 256 : (loaderparams.ram_size >> 20)); + sprintf(highmemenv, "%ld", loaderparams.ram_size > 0x10000000 + ? (loaderparams.ram_size >> 20) - 256 : 0); + + setenv("memsize", memenv, 1); + setenv("highmemsize", highmemenv, 1); + + ret =3D ((ret + 32) & ~31); + + boot_params_buf =3D (void *)(params_buf + ret); + boot_params_p =3D boot_params_buf + align(sizeof(struct boot_params)); + + init_boot_param(boot_params_buf); + + rom_add_blob_fixed("params", params_buf, params_size, + BOOTPARAM_PHYADDR); + loaderparams.a0 =3D 2; + loaderparams.a1 =3D 0xffffffff80000000ULL + BOOTPARAM_PHYADDR; + loaderparams.a2 =3D 0xffffffff80000000ULL + BOOTPARAM_PHYADDR + ret; + + return 0; +} + +static int64_t load_kernel(CPUMIPSState *env) +{ + long kernel_size; + ram_addr_t initrd_offset; + int64_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 *)&kernel_hi= gh, + 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 (kernel_high + ~INITRD_PAGE_MASK) & + INITRD_PAGE_MASK; + initrd_offset =3D MAX(initrd_offset, INITRD_OFFSET); + + 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_filena= me, + 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 parameters. */ + set_prom_bootparam(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 void loongson3_isa_init(qemu_irq intc) +{ + qemu_irq *i8259; + ISABus *isa_bus; + + isa_bus =3D isa_bus_new(NULL, get_system_memory(), get_system_io(), &e= rror_abort); + + /* Interrupt controller */ + /* The 8259 -> IP3 */ + i8259 =3D i8259_init(isa_bus, intc); + isa_bus_irqs(isa_bus, i8259); + /* init other devices */ + isa_create_simple(isa_bus, "i8042"); + mc146818_rtc_init(isa_bus, 2000, NULL); +} + +static inline void loongson3_pcie_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_create(NULL, TYPE_GPEX_HOST); + + qdev_init_nofail(dev); + pci_bus =3D PCI_HOST_BRIDGE(dev)->bus; + + ecam_alias =3D g_new0(MemoryRegion, 1); + 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_PCI_ECAM_SIZE); + memory_region_add_subregion(get_system_memory(), VIRT_PCI_ECAM_BASE, e= cam_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_PCI_MEM_BASE, VIRT_PCI_MEM_SIZ= E); + memory_region_add_subregion(get_system_memory(), VIRT_PCI_MEM_BASE, mm= io_alias); + + pio_alias =3D g_new0(MemoryRegion, 1); + memory_region_init_alias(pio_alias, OBJECT(dev), "pcie-pio", + get_system_io(), 0, VIRT_PCI_IO_SIZE); + memory_region_add_subregion(get_system_memory(), VIRT_PCI_IO_BASE, pio= _alias); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, VIRT_PCI_IO_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); + } + + pci_vga_init(pci_bus); + + 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_init(MachineState *machine) +{ + int i; + long bios_size; + MIPSCPU *cpu; + CPUMIPSState *env; + 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); + + 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 need cpu type Loongson-3A1000"); + 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 need cpu type Loongson-3A4000"); + exit(1); + } + } + + if (ram_size < 256 * 0x100000) { + error_report("Loongson-3 need at least 256MB memory"); + exit(1); + } + + for (i =3D 0; i < machine->smp.cpus; i++) { + /* init CPUs */ + cpu =3D 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); + } + env =3D &MIPS_CPU(first_cpu)->env; + + /* Allocate RAM/BIOS, 0x00000000~0x10000000 is alias of 0x80000000~0x9= 0000000 */ + memory_region_init_rom(bios, NULL, "loongson3.bios", + BIOS_SIZE, &error_fatal); + memory_region_init_alias(ram, NULL, "loongson3.lowram", + machine->ram, 0, 256 * 0x100000); + memory_region_init_io(iomem, NULL, &loongson3_pm_ops, + NULL, "loongson3_pm", PM_MMIO_SIZE); + + memory_region_add_subregion(address_space_mem, 0x00000000LL, ram); + memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios); + memory_region_add_subregion(address_space_mem, 0x80000000LL, machine->= ram); + memory_region_add_subregion(address_space_mem, PM_MMIO_ADDR, iomem); + + /* + * We do not support flash operation, just loading pmon.bin as raw BIO= S. + * Please use -L to set the BIOS path and -bios to set bios name. + */ + + if (kernel_filename) { + 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); + rom_add_blob_fixed("bios", + bios_boot_code, sizeof(bios_boot_code), 0x1fc0000= 0LL); + } 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, 0x1fc00000LL, + BIOS_SIZE); + g_free(filename); + } else { + bios_size =3D -1; + } + + if ((bios_size < 0 || bios_size > BIOS_SIZE) && + !kernel_filename && !qtest_enabled()) { + error_report("Could not load MIPS bios '%s'", bios_name); + exit(1); + } + + fw_conf_init(ram_size); + rom_add_blob_fixed("fw_conf", + &fw_config, sizeof(fw_config), FW_CONF_ADDR); + } + + msi_nonbroken =3D true; + loongson3_isa_init(env->irq[3]); + loongson3_pcie_init(machine, isa_pic); + + if (serial_hd(0)) { + serial_mm_init(address_space_mem, 0x1fe001e0, 0, env->irq[2], + 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); + } +} + +static void mips_loongson3_machine_init(MachineClass *mc) +{ + mc->desc =3D "Generic Loongson-3 Platform"; + mc->init =3D mips_loongson3_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 960 * MiB; + mc->kvm_type =3D mips_kvm_type; + mc->minimum_page_bits =3D 14; +} + +DEFINE_MACHINE("loongson3", mips_loongson3_machine_init) --=20 2.7.0 From nobody Mon Apr 29 14:19:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588501713; cv=none; d=zohomail.com; s=zohoarc; b=dPNLf6NWJlGueyU8Vf/wm2CpF0+3/D8L5vLZSVrEsra9SFCJn9Gdm89U/WE7FTfCxQrBvh3RW2B6ulNrn57g/d79F2CEpGWNm/nuAYlGwV569uslI5QHLfKNTUMmW0wxB+D/ufTm9MrjExMYm53MGfG8UFyabPsadPq+mOAivUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588501713; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ag+hcUiFPULNj9KU2KM3Lt10lyM2QWt6bEtScV/STh4=; b=iTtCy3/EPOiURPJkyVhQ9pSk/FCcJE08+aua38qN2+I+e11ee2wY5hfQPIzW9ljscsUU44WULzxR19qiIvkDQrgbsZ1HNehPSIA6NQZHB64zLWDHLc+ZpDkMkuw0LxpQ5he+/VritnoK46FeQshKWfVgTtOmb7ajNo2SppYtxUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588501713916828.1056809364075; Sun, 3 May 2020 03:28:33 -0700 (PDT) Received: from localhost ([::1]:57652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVBrM-0006ZA-JG for importer@patchew.org; Sun, 03 May 2020 06:28:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVBpo-0004eU-VJ for qemu-devel@nongnu.org; Sun, 03 May 2020 06:26:56 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:33809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVBpm-0000A5-FA for qemu-devel@nongnu.org; Sun, 03 May 2020 06:26:56 -0400 Received: by mail-pl1-x632.google.com with SMTP id s10so5616179plr.1 for ; Sun, 03 May 2020 03:26:53 -0700 (PDT) Received: from software.domain.org (28.144.92.34.bc.googleusercontent.com. [34.92.144.28]) by smtp.gmail.com with ESMTPSA id a12sm6173654pfr.28.2020.05.03.03.26.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 May 2020 03:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ag+hcUiFPULNj9KU2KM3Lt10lyM2QWt6bEtScV/STh4=; b=jjhWLuq40I5TZiRF/aV8S/XqNArixtxvnog9toZLv4hWlUe5mBqUP9x2vIOxfidqso kknc/ipiuZed6hRBT2CsApMZ9iJAgWL/eFq8qfq7QbmH7lOw2fHl6maK/NT7keJ6ORAf VCkkG9yNvlQBSidVbJEFh2ofzSMkJqpTTmLFBCc7Mj5PR+FWACf+ditTdUqtEWSIRTUn gobr6bD5YAkowiXUqm/EBw0xzwNb2oWmDZ2jrWFc7B4V9hNPAcVtZ0+1wz9M24dlMZ7f xbTZYVcLIY45192l4MZh8UGF5IfZjgm9zxwxTgjOiKw1Mp1zdALNEU+gD9kha6c2dsi8 1rNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ag+hcUiFPULNj9KU2KM3Lt10lyM2QWt6bEtScV/STh4=; b=LPv6r3eMXSsJDNDNaKsFcVf+sWlIyEJ5fmkVxpPuTPSa+1gDQSu3MvI0zQycLhc43Y lnZG8FmgUBY7e1ko5MI2OebFaXYX4iqIgyut6TlgO1eK2MvA/oaZt8u3HEWamYis8h4Q 7/4gajkRCZ/3uX2XgJJIKC+C3dpizz/2mkiKoyV+mFn0N1VrQJVqZvR/aNksUJ59kawf 0pwWpvEi18fvEhAZGH8xGy1OoGL8BPgV9+PzWwbnXHF37KVZBU/tOzt3tgP8lNzE4F4h uTWJUZB34fy6hIfGSDyfsidfVngjVv402RLUksHgw7NQ3lhdqB+ZsRvJSvyODJ+Q7ABy FODw== X-Gm-Message-State: AGi0PuZlH53qA8WBPbPREx0r8lQJG+GQDa261GRyz+9BCXa4ZEkzffJX okOkppMIQg7PRDEwE1VvIlY= X-Google-Smtp-Source: APiQypKF2MOh8Uds/2OHmZ8SdWBi2HPk9YxcX1At263/FFSPYdyly2ZmDhGlqdh0IPeb+yI0we5HMQ== X-Received: by 2002:a17:90a:4802:: with SMTP id a2mr11344640pjh.66.1588501612849; Sun, 03 May 2020 03:26:52 -0700 (PDT) From: Huacai Chen X-Google-Original-From: Huacai Chen To: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH for-5.1 V3 7/7] MAINTAINERS: Add myself as Loongson-3 maintainer Date: Sun, 3 May 2020 18:20:21 +0800 Message-Id: <1588501221-1205-8-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1588501221-1205-1-git-send-email-chenhc@lemote.com> References: <1588501221-1205-1-git-send-email-chenhc@lemote.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=zltjiangshi@gmail.com; helo=mail-pl1-x632.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Huacai Chen , Aleksandar Rikalo , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Huacai Chen Co-developed-by: Jiaxun Yang --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index fc3d1b0..8d5cfec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1084,6 +1084,11 @@ F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: include/hw/isa/vt82c686.h =20 +Loongson-3 +M: Huacai Chen +S: Maintained +F: hw/mips/mips_loongson3.c + Boston M: Paul Burton R: Aleksandar Rikalo --=20 2.7.0