From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155301985814735.34781196597987; Tue, 19 Mar 2019 11:24:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:33137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JPC-0000o8-Ri for importer@patchew.org; Tue, 19 Mar 2019 14:24:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNP-00087c-IF for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNK-0000Lw-Uc for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:13 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47895) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JNJ-0008FT-0c; Tue, 19 Mar 2019 14:22:09 -0400 Received: from mail-bl2nam02lp2057.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([104.47.38.57]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:15 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4920.namprd04.prod.outlook.com (52.135.232.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:20:57 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:20:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019729; x=1584555729; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BPRFn2Nm69XGE0QMGTe+yW2wqre5n+KD3rRyClUnldA=; b=oRdjLbYyLAURprocBpvp2QUXJbGS7gBvGaaCe94xsJvuRcoH/gqQAWKo iGU05i11m+GYAS7XVeGp1pT/CsS5lF3kjCby+bEQVgAXSvRmuSyNPpotZ f0d6+doVvU+LnTOQ/7pOhoL5zn+zOLVf3sddcQF0whhrdCZHHKDpBceJ5 QvaVaKfkMufRsWOMXcV2oVvqXrNVNjMOcPlsgZamFZhuhe20ZkZ2aB5uY pjQGeKDw+CHG4IYZGT/qWntHZDZjZ9Yi1iQcxr9hWC3Zzr0p/T4KR22j6 bBvVZoTy+EkJ5ENo5S3r/+30bDPiyiyTePLNBfW7+cq0kgHwzGC3JZehU Q==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="209307022" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nqeNvi97Rs4I1hUjBknZLLAdr+X0Q0mf6zENlmf5LXU=; b=dg0hLtsnHzXY8WcVgE0wPX55wFjnQH/20iZU2Ci6AMpjrrU0AyGxEjmyp60rswsqzbFyXD1zxySLLllHxskGCKo8TVJnVmY/QsKwOTCA92Wa49TC5eM9QE1Z39kqUTKD07osPyKmWRLFDAseOakXllU9XrQ1A6gwzz3Du3uoKJk= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 1/6] target/riscv: Fall back to generating a RISC-V CPU Thread-Index: AQHU3oB/eT3KS//vn0a3705FukS/xw== Date: Tue, 19 Mar 2019 18:20:57 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR07CA0101.namprd07.prod.outlook.com (2603:10b6:a03:12b::42) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bd444c0a-ef3e-4255-c0d4-08d6ac97a16c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4920; x-ms-traffictypediagnostic: BYAPR04MB4920: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(39860400002)(346002)(136003)(396003)(199004)(189003)(68736007)(14454004)(72206003)(66066001)(2501003)(2906002)(14444005)(54906003)(256004)(478600001)(7736002)(86362001)(305945005)(6116002)(81166006)(81156014)(8936002)(50226002)(97736004)(8676002)(36756003)(3846002)(106356001)(2616005)(11346002)(486006)(476003)(446003)(316002)(71190400001)(71200400001)(44832011)(6436002)(6512007)(4326008)(25786009)(110136005)(102836004)(6486002)(76176011)(186003)(52116002)(53936002)(26005)(99286004)(118296001)(105586002)(5660300002)(6506007)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4920; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: vTJoUxSRLOLzwSpscQplxh6VqI8NetlL3QhtoDmzKSO5fm6kw1/radsjKRMJUijV+ZVgj8qe2+22U3zTdLOJyqcwXI6XEisf/pTKa/CeAObooFw8LyfgvNK9qx5l+m2my6xFgcdU9VcxmK5ZpvjMvCQrB6wqHBtLgt0opui3aHO725pAawatxdRcfb2wHWMW3pH+4UamFiCCn2BxXFE4WQyb4cluZDOcrBDwT4ZG6FgYplK4p8DwdV0jjXXyDl2/cmLvvSUtK0uAxpwmkGBzc3osk12Ew8NGcDsXU79zRaO4dUZtcfqfkiyOaCpKjw6ivF7cGgKy4juLXGBe5BObhcXb0ewXJynNZ4Zk4oFt1zQyBCOnZmqszMoyYCb7IaCmiOgSLW2qruiSUlTfhNytrTGujRzEpkmbc74FBIno7CQ= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd444c0a-ef3e-4255-c0d4-08d6ac97a16c X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:20:57.2975 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4920 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for 4.1 v1 1/6] target/riscv: Fall back to generating a RISC-V CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" If a user specifies a CPU that we don't understand then we want to fall back to a CPU generated from the ISA string. At the moment the generated CPU is assumed to be a privledge spec version 1.10 CPU with an MMU. This can be changed in the future. Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 95 +++++++++++++++++++++++++++++++++++++++++++++- target/riscv/cpu.h | 2 + 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d61bce6d55..31561c719f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/error-report.h" #include "cpu.h" #include "exec/exec-all.h" #include "qapi/error.h" @@ -103,6 +104,93 @@ static void set_resetvec(CPURISCVState *env, int reset= vec) #endif } =20 +static void riscv_generate_cpu_init(Object *obj) +{ + RISCVCPU *cpu =3D RISCV_CPU(obj); + CPURISCVState *env =3D &cpu->env; + RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(cpu); + const char *riscv_cpu =3D mcc->isa_str; + target_ulong target_misa =3D 0; + target_ulong rvxlen =3D 0; + int i; + bool valid =3D false; + + for (i =3D 0; i < strlen(riscv_cpu); i++) { + if (i =3D=3D 0 && riscv_cpu[i] =3D=3D 'r' && + riscv_cpu[i + 1] =3D=3D 'v') { + /* Starts with "rv" */ + i +=3D 2; + if (riscv_cpu[i] =3D=3D '3' && riscv_cpu[i + 1] =3D=3D '2') { + i +=3D 2; + valid =3D true; + rvxlen =3D RV32; + } + if (riscv_cpu[i] =3D=3D '6' && riscv_cpu[i + 1] =3D=3D '4') { + i +=3D 2; + valid =3D true; + rvxlen =3D RV64; + } + } + + switch (riscv_cpu[i]) { + case 'i': + if (target_misa & RVE) { + error_report("I and E extensions are incompatible"); + exit(1); + } + target_misa |=3D RVI; + continue; + case 'e': + if (target_misa & RVI) { + error_report("I and E extensions are incompatible"); + exit(1); + } + target_misa |=3D RVE; + continue; + case 'g': + target_misa |=3D RVI | RVM | RVA | RVF | RVD; + continue; + case 'm': + target_misa |=3D RVM; + continue; + case 'a': + target_misa |=3D RVA; + continue; + case 'f': + target_misa |=3D RVF; + continue; + case 'd': + target_misa |=3D RVD; + continue; + case 'c': + target_misa |=3D RVC; + continue; + case 's': + target_misa |=3D RVS; + continue; + case 'u': + target_misa |=3D RVU; + continue; + default: + warn_report("QEMU does not support the %c extension", + riscv_cpu[i]); + continue; + } + } + + if (!valid) { + error_report("'%s' does not appear to be a valid RISC-V CPU", + riscv_cpu); + exit(1); + } + + set_misa(env, rvxlen | target_misa); + set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0); + set_resetvec(env, DEFAULT_RSTVEC); + set_feature(env, RISCV_FEATURE_MMU); + set_feature(env, RISCV_FEATURE_PMP); +} + static void riscv_any_cpu_init(Object *obj) { CPURISCVState *env =3D &RISCV_CPU(obj)->env; @@ -178,6 +266,7 @@ static void rv64imacu_nommu_cpu_init(Object *obj) static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; + RISCVCPUClass *mcc; char *typename; char **cpuname; =20 @@ -188,7 +277,10 @@ static ObjectClass *riscv_cpu_class_by_name(const char= *cpu_model) g_free(typename); if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU) || object_class_is_abstract(oc)) { - return NULL; + /* No CPU found, try the generic CPU and pass in the ISA string */ + oc =3D object_class_by_name(TYPE_RISCV_CPU_GEN); + mcc =3D RISCV_CPU_CLASS(oc); + mcc->isa_str =3D g_strdup(cpu_model); } return oc; } @@ -440,6 +532,7 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { .class_init =3D riscv_cpu_class_init, }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_GEN, riscv_generate_cpu_init), #if defined(TARGET_RISCV32) DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_09_1, rv32gcsu_priv1_09_1_cpu_in= it), DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_10_0, rv32gcsu_priv1_10_0_cpu_in= it), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 20bce8742e..453108a855 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -48,6 +48,7 @@ #define CPU_RESOLVING_TYPE TYPE_RISCV_CPU =20 #define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any") +#define TYPE_RISCV_CPU_GEN RISCV_CPU_TYPE_NAME("rv*") #define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9= .1") #define TYPE_RISCV_CPU_RV32GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.1= 0.0") #define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nom= mu") @@ -211,6 +212,7 @@ typedef struct RISCVCPUClass { /*< public >*/ DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); + const char *isa_str; } RISCVCPUClass; =20 /** --=20 2.21.0 From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553020050320353.8737193199281; Tue, 19 Mar 2019 11:27:30 -0700 (PDT) Received: from localhost ([127.0.0.1]:33207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JSP-0003ay-Aq for importer@patchew.org; Tue, 19 Mar 2019 14:27:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNg-0008KF-Jh for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNd-0000sr-RD for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:32 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JNY-0000MN-Sq; Tue, 19 Mar 2019 14:22:28 -0400 Received: from mail-bl2nam02lp2057.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([104.47.38.57]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:16 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4920.namprd04.prod.outlook.com (52.135.232.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:21:11 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:21:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019744; x=1584555744; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=tl+xYE2Ag76+rug00OyLCp+7ai/skmz4m8I3hOEHOsk=; b=GAk+By4BXtHGnlDS1KRixdlK+5KB/Ncp0Z5V6PhCuvYXAI2yXC0BnlgW 5D93c2Y69kvhGjly2F4Rq/I/5RCfej+vCGFA5P6YUUAINVVk5mHo1y1yD +p9O1UvSzEg9QLjO7lJNTdTpJ53mTOry92AUHpue14rdff9Kucmehq9UN OBE2P6sPWUvhjBqIF21oItgyfqM9dwAzyjettj9tp3FnveA1n/QdQ0qTm rSWfdaNNBy8XNzqOrSZHTQfg3M+ccJQfcqk7NT1o3kKZIIOHEAHtYpRn7 WO7wTvf9goIbC+yOqxya3jJn9PMvutbaBTAHi2IJ+hnWpvGFx0DYA0ISP g==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="209307023" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7uC/t8Ht0x7cgW30qFfYD7V9rWaIb0DAvLxpgoD0Dbo=; b=MVIhjs5g8qfTbV98BCXWAlora1cOL8+sIpHozOQ4+zpWfXr4gUChp2n6bcwZa/W77zVQzVGkpoCrdnjIVjyL/KkcQm+4jXRGwJHb8IVzoHwrK8cCXo2LgGWf+vhoolxXm7m9AS1ULDYmzv1Uj0XTwF6PeJy8VDBDHajidUA7Pb0= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 2/6] target/riscv: Create settable CPU properties Thread-Index: AQHU3oCEG3n/sr6eE02Hxr2eXBDL2g== Date: Tue, 19 Mar 2019 18:21:06 +0000 Message-ID: <81f94c7c3e29f0d3647685f22ea47f1d8917e0f0.1553019560.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR05CA0056.namprd05.prod.outlook.com (2603:10b6:a03:74::33) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 97f3e19b-05ec-4b21-7d9e-08d6ac97a6c7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4920; x-ms-traffictypediagnostic: BYAPR04MB4920: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(39860400002)(346002)(136003)(396003)(199004)(189003)(68736007)(14454004)(72206003)(66066001)(2501003)(2906002)(54906003)(256004)(478600001)(7736002)(86362001)(305945005)(6116002)(81166006)(81156014)(8936002)(50226002)(97736004)(8676002)(36756003)(3846002)(106356001)(2616005)(11346002)(486006)(476003)(446003)(6666004)(316002)(71190400001)(71200400001)(44832011)(6436002)(6512007)(4326008)(25786009)(110136005)(102836004)(6486002)(76176011)(186003)(52116002)(53936002)(26005)(99286004)(118296001)(105586002)(5660300002)(6506007)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4920; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0qC7In768e+mK/Y/3hcae4VkSyNHzF52CSahL2qfcZvs+QiRCsNe6aoMNZVPumU5lFN+H6+nTlSDqGDJ8NhwjywEsWh0MB5H8mSEN1nI7ORuzaXDVLxyGi08VbJiUDHMnZmE6DkgaHMljxogTeWhzOGtJjdEI+zaDYS5oYVsUP3FGGgWmwTSYY64YQnLIDGbmOqO4dGO7idksSUUZiRujanBX77AuaiTpOS7e8byM0mzBDD79HI8JpFdlslrffkcd9wybi8YfNFplTtQ3havGmM5IWw7AF3GFC/ladNCjYCvvCE11aORXF8RpPl6rAUeygx6RLNhiO1lrCTHw2qOJfdTZ+pHstTpBUQQi5IIyLITXgdctxBFDmyFlhANRE9ycPOc32ujEADBsR14sBt8mytdh7LuKahLMfsxs14PDuo= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97f3e19b-05ec-4b21-7d9e-08d6ac97a6c7 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:21:06.1277 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4920 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for 4.1 v1 2/6] target/riscv: Create settable CPU properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 52 ++++++++++++++++++++++++++++++++++++++++++---- target/riscv/cpu.h | 8 +++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 31561c719f..b6408e0a83 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "qapi/error.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" =20 /* RISC-V CPU definitions */ @@ -185,12 +186,9 @@ static void riscv_generate_cpu_init(Object *obj) } =20 set_misa(env, rvxlen | target_misa); - set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0); - set_resetvec(env, DEFAULT_RSTVEC); - set_feature(env, RISCV_FEATURE_MMU); - set_feature(env, RISCV_FEATURE_PMP); } =20 + static void riscv_any_cpu_init(Object *obj) { CPURISCVState *env =3D &RISCV_CPU(obj)->env; @@ -388,7 +386,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, disa= ssemble_info *info) static void riscv_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); + RISCVCPU *cpu =3D RISCV_CPU(dev); + CPURISCVState *env =3D &cpu->env; RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(dev); + int priv_version =3D PRIV_VERSION_1_10_0; + int user_version =3D USER_VERSION_2_02_0; Error *local_err =3D NULL; =20 cpu_exec_realizefn(cs, &local_err); @@ -397,6 +399,39 @@ static void riscv_cpu_realize(DeviceState *dev, Error = **errp) return; } =20 + if (cpu->cfg.priv_spec) { + if (!g_strcmp0(cpu->cfg.priv_spec, "v1.10.0")) { + priv_version =3D PRIV_VERSION_1_10_0; + } else if (!g_strcmp0(cpu->cfg.priv_spec, "v1.9.1")) { + priv_version =3D PRIV_VERSION_1_09_1; + } else { + error_report("Unsupported privilege spec version '%s'", + cpu->cfg.priv_spec); + exit(1); + } + } + + if (cpu->cfg.user_spec) { + if (!g_strcmp0(cpu->cfg.user_spec, "v2.02.0")) { + user_version =3D USER_VERSION_2_02_0; + } else { + error_report("Unsupported user spec version '%s'", + cpu->cfg.user_spec); + exit(1); + } + } + + set_versions(env, user_version, priv_version); + set_resetvec(env, DEFAULT_RSTVEC); + + if (cpu->cfg.mmu) { + set_feature(env, RISCV_FEATURE_MMU); + } + + if (cpu->cfg.pmp) { + set_feature(env, RISCV_FEATURE_PMP); + } + riscv_cpu_register_gdb_regs_for_features(cs); =20 qemu_init_vcpu(cs); @@ -418,6 +453,14 @@ static const VMStateDescription vmstate_riscv_cpu =3D { .unmigratable =3D 1, }; =20 +static Property riscv_cpu_properties[] =3D { + DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), + DEFINE_PROP_STRING("user_spec", RISCVCPU, cfg.user_spec), + DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), + DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), + DEFINE_PROP_END_OF_LIST(), +}; + static void riscv_cpu_class_init(ObjectClass *c, void *data) { RISCVCPUClass *mcc =3D RISCV_CPU_CLASS(c); @@ -458,6 +501,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) #endif /* For now, mark unmigratable: */ cc->vmsd =3D &vmstate_riscv_cpu; + dc->props =3D riscv_cpu_properties; } =20 char *riscv_isa_string(RISCVCPU *cpu) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 453108a855..bc877d8107 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -226,6 +226,14 @@ typedef struct RISCVCPU { CPUState parent_obj; /*< public >*/ CPURISCVState env; + + /* Configuration Settings */ + struct { + char *priv_spec; + char *user_spec; + bool mmu; + bool pmp; + } cfg; } RISCVCPU; =20 static inline RISCVCPU *riscv_env_get_cpu(CPURISCVState *env) --=20 2.21.0 From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15530199847017.146726298516683; Tue, 19 Mar 2019 11:26:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:33191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JRM-0002p8-M7 for importer@patchew.org; Tue, 19 Mar 2019 14:26:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNX-0008Cv-2x for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNU-0000Z3-LO for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:21 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47877) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JNQ-0007iP-Ry; Tue, 19 Mar 2019 14:22:17 -0400 Received: from mail-bl2nam02lp2057.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([104.47.38.57]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:17 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4920.namprd04.prod.outlook.com (52.135.232.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:21:15 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:21:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019736; x=1584555736; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=eW1pwuIkig5Ey4iZ0a4xc9Umj6cbZ6PEmRiZ2dRpwWk=; b=N3jsu3kMIPZHVSYGkpdX/+z1TjJtewVTTQG5wxQYjjViXgitPe2/hWFy l8F9/z0Y52S6JkajiDNUg3uroKxaU13KAIrQFEE0CfLwWX8Wb/HO/UGk1 HBIreqRGx9eT7diCmFFTbohssyCOorT/wW51V32WQ8YAHzUWvN2ShQauE hFfN0IQIrHGdVAK7Gp76ykX62oHYKUP2xFoPtUuXJDU0IFMxnosB5Imdv /yB0Cy/4Nk8iv/js64UdmNuwcv2c2JymSulSiJfjAZWTmdgwGCkaDeFNT kkE8jQZMbH3QygwrOz/l+eBdpTzVLJRduU8xUo8u82rYgQdDYlNkK3SPo Q==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="209307027" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F8HUl7CBwhbzsSD7kg1Ck9OWTw4KS8v3g2egWDeOZI0=; b=CLi221sE2mzYLCJM5jsBbnmZ2UEcZF4AOiLo+Wki2is66vz747xYdg/yfjAHsJt2/N0Bg9sP0uGE6NO/op4S+1xQ0Y8qCXx44Y9djY1vnumCtIK6P1cRzGYdA4DThiy0U0oZfcPCs9vlMA/NF11ItqWNf6fixXCa65WV84YSeBA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 3/6] riscv: virt: Allow specifying a CPU via commandline Thread-Index: AQHU3oCJ3HX/a3XSpkeEFUMrNyv5uQ== Date: Tue, 19 Mar 2019 18:21:14 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR05CA0067.namprd05.prod.outlook.com (2603:10b6:a03:74::44) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 706f6586-bcb4-4b87-4f1e-08d6ac97ac0d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4920; x-ms-traffictypediagnostic: BYAPR04MB4920: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(39860400002)(346002)(136003)(396003)(199004)(189003)(68736007)(14454004)(72206003)(66066001)(2501003)(2906002)(14444005)(54906003)(256004)(478600001)(7736002)(86362001)(305945005)(6116002)(81166006)(81156014)(8936002)(50226002)(97736004)(8676002)(36756003)(3846002)(106356001)(2616005)(11346002)(486006)(476003)(446003)(316002)(71190400001)(71200400001)(44832011)(6436002)(6512007)(4326008)(25786009)(110136005)(102836004)(6486002)(76176011)(186003)(4744005)(52116002)(53936002)(26005)(99286004)(118296001)(105586002)(5660300002)(6506007)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4920; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: dj1/WgGOMMl0QRpT1PxcKzT0Y0wS85HEkUzhtPOkgp60ktYxC7BqundBG1zT/ZeWLO/K65dJiq1e3+V1REbCnhMb0NDEoSg/By+G8VKC2B+zfC17p0y9TmulSvBnnQOyxqjn9ofdDWEheS7UJwquwtDS6HN1YVauduacJ1HAHrXtZJwW28GV25aFHyNsFi/H/ypuPnWSeQAoh8rNCOGdSUv6q8b+md7O5spDzeM3z3DHp026Eg2N6JctqfMHY0MdRSL8oPAiLl3Y/S6Nj7Jh43KZinzGZn3lgea1fa53/iG/9WNYNkDtT802s70Itmlkad3crk4kwM4V37Y/pOrJkkfI+57AEULZCRmET6mvyXDUcfmYFZj80Z2E5+StBtN6qQnY19RQcRsTmEY9ru7rs8R0KnyEtavRcLMZWWNh1Gc= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 706f6586-bcb4-4b87-4f1e-08d6ac97ac0d X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:21:15.0039 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4920 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for 4.1 v1 3/6] riscv: virt: Allow specifying a CPU via commandline X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- hw/riscv/virt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index fc4c6b306e..5b25f028ad 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -400,7 +400,7 @@ static void riscv_virt_board_init(MachineState *machine) /* Initialize SOC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc= ), TYPE_RISCV_HART_ARRAY, &error_abort, NULL); - object_property_set_str(OBJECT(&s->soc), VIRT_CPU, "cpu-type", + object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type", &error_abort); object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", &error_abort); @@ -526,6 +526,7 @@ static void riscv_virt_board_machine_init(MachineClass = *mc) mc->desc =3D "RISC-V VirtIO Board (Privileged ISA v1.10)"; mc->init =3D riscv_virt_board_init; mc->max_cpus =3D 8; /* hardcoded limit in BBL */ + mc->default_cpu_type =3D VIRT_CPU; } =20 DEFINE_MACHINE("virt", riscv_virt_board_machine_init) --=20 2.21.0 From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553019874019311.4600918014394; Tue, 19 Mar 2019 11:24:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:33139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JPY-00017E-UW for importer@patchew.org; Tue, 19 Mar 2019 14:24:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNg-0008KH-KR for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNd-0000sJ-MG for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:32 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47895) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JNY-0008FT-5u; Tue, 19 Mar 2019 14:22:24 -0400 Received: from mail-by2nam05lp2058.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([104.47.50.58]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:24 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4326.namprd04.prod.outlook.com (20.176.251.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:21:24 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:21:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019744; x=1584555744; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=bXxxbDsH0aVj2idXiWu57viIIEYx489VzznurZVnEG4=; b=LX7jYiUPnui+W9NqtGfB71vJGgEk+hRtNiEl8irgMh9HhatDaLvMJHnw v2+PqxlsNkouEME9x9NSKZJ89O11A3D+0D3ZemzLtfFbaz0rNX+K3DmKK 5NIj98k+KJrGL6bKiecWuxnZk0fJ9GHUFSRj64o534CafxWzmrfhdkpSF dOT4aytDCyuVinNWxw/MtmLmoQV/5be8V9X7pbN3JtYmRwVbfCS9R7fob DuC0MXEsbjdXedO/YgbLrC45DAfOWjTjJhCVmwE6YD7flJXpbhnO1i8UX OmnfS0PO5oMGvRnWmFSmHKc7DcrOlVOmtB7uVARUXo3H6yz5a1IIG9eNB A==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="209307028" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e+PcgH83l8nVsFDXSW7WAmaBlMHXUIrdZ5fR8Zs7OWI=; b=Y7KF5t3XizBdSQuQZknJM97gM/06yPQQWTQ7YkciRPcy68uovc6AU4XlbK89MG43lOZLuVpFFNBNVWMTPfN15u1XzlaU5zQT1aZEP8zdPAOl7/19ZtB+E8tigTFSoehDMWg7f1wq2tAGiVjZxZumNyzpvbLmCD3AxgcWod4fCLQ= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 4/6] target/riscvL Remove the unused any CPU Thread-Index: AQHU3oCPPLbP72ihGUemb+ZAF/j0yg== Date: Tue, 19 Mar 2019 18:21:23 +0000 Message-ID: <073a79909f5ec317747ff8330744e6d7dabec717.1553019560.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR05CA0052.namprd05.prod.outlook.com (2603:10b6:a03:74::29) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a8d079a0-6ee3-4e45-c0d2-08d6ac97b151 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4326; x-ms-traffictypediagnostic: BYAPR04MB4326: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(39860400002)(136003)(396003)(189003)(199004)(71200400001)(316002)(6506007)(44832011)(4326008)(2616005)(11346002)(486006)(71190400001)(105586002)(446003)(476003)(6436002)(102836004)(99286004)(52116002)(5660300002)(53936002)(118296001)(386003)(26005)(25786009)(186003)(110136005)(6512007)(6486002)(76176011)(72206003)(54906003)(256004)(68736007)(66066001)(106356001)(8936002)(14454004)(478600001)(2906002)(7736002)(97736004)(3846002)(86362001)(81156014)(36756003)(2501003)(6116002)(305945005)(8676002)(81166006)(50226002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4326; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: iI5TZYichY541+wMm3zlFHmatkuYhhueakqNk2KonuFKgf4umRbOXnJMC0qsAJhl6ZaJ17dGOCYYBsVdnGqaSMF5E+0QHuX7KvY24vl3LeNXpIyQVoQHQAawMkcTbIWhkQ+1IHSW4jx+4yh+GPBFL3aWHwIVENVC5RekfwgbIJvGqjGewHbUa+fcHcoqx1WvMHH86Fe5UK21jxowiKa3ycECtBf5JJrw6vkRTYpq6kAC47a6TTw71Tu8jlLJX9JKqnrcAej/Jb8ehld1vqcUo/Wl7mG+gbLHwNHnjsboTSsd7bieaLRuqw1lzLGeFsy8I18lM7u3MfTM2OsMKDE+s3a+NGclHnz0eD4pOhGfqocDx7g3IcDJeWLPBOlXaXPzOLSkR+zKh7Tg6hJtlNsiu2e1eNrhQyPvTc9lmP5Ntj4= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8d079a0-6ee3-4e45-c0d2-08d6ac97b151 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:21:23.8620 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4326 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for 4.1 v1 4/6] target/riscvL Remove the unused any CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 10 ---------- target/riscv/cpu.h | 1 - 2 files changed, 11 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index b6408e0a83..298413f6f6 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -188,15 +188,6 @@ static void riscv_generate_cpu_init(Object *obj) set_misa(env, rvxlen | target_misa); } =20 - -static void riscv_any_cpu_init(Object *obj) -{ - CPURISCVState *env =3D &RISCV_CPU(obj)->env; - set_misa(env, RVXLEN | RVI | RVM | RVA | RVF | RVD | RVC | RVU); - set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0); - set_resetvec(env, DEFAULT_RSTVEC); -} - #if defined(TARGET_RISCV32) =20 static void rv32gcsu_priv1_09_1_cpu_init(Object *obj) @@ -575,7 +566,6 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { .class_size =3D sizeof(RISCVCPUClass), .class_init =3D riscv_cpu_class_init, }, - DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_GEN, riscv_generate_cpu_init), #if defined(TARGET_RISCV32) DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_09_1, rv32gcsu_priv1_09_1_cpu_in= it), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index bc877d8107..7d7caa294e 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -47,7 +47,6 @@ #define RISCV_CPU_TYPE_NAME(name) (name RISCV_CPU_TYPE_SUFFIX) #define CPU_RESOLVING_TYPE TYPE_RISCV_CPU =20 -#define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any") #define TYPE_RISCV_CPU_GEN RISCV_CPU_TYPE_NAME("rv*") #define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9= .1") #define TYPE_RISCV_CPU_RV32GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.1= 0.0") --=20 2.21.0 From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553019954722147.75261387363219; Tue, 19 Mar 2019 11:25:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:33189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JQp-0002SQ-KZ for importer@patchew.org; Tue, 19 Mar 2019 14:25:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNF-000811-KP for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNA-00007k-Rs for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:05 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:30649) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JN0-0008Ee-0s; Tue, 19 Mar 2019 14:21:57 -0400 Received: from mail-sn1nam01lp2059.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([104.47.32.59]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:35 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4326.namprd04.prod.outlook.com (20.176.251.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:21:32 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:21:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019710; x=1584555710; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BhMydo8zzOd2l3dcV85NG2hGafFCEXopZWc6e2JRQwI=; b=IAp/eR9/vApXoomYVApEPhPsFpud1WkctI5+YQOHzhGfIfw4b2E/1rgX UPoP0HRij9AwyPGKlpqzoWn2CHbRLtT0CevEPpiicSr9v1hQ8sXv9LRHV 4NE2zObiojjUKDDpBdNFGxm+LTuAyU/6E3E73RDKedqC0VtvsD74pv60U DEGuDzBTEaHT/1ab54QNDtUPfSo65yWkmiXm2OzlLccRKAsxDMPoyhZ3x rq2e6aiRa6JBBVMjHZMBeLUmgBs9yUNkMiBEfq7SVis8opZZcAJs/Nzmx eGFpLXiD7mI/EAPItd7kRxa11vZNj9MMi9xhDCIznjNNDX0TlCdRFR2xQ w==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="105112664" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V4pbjb6IuL2U8eaFhZ+iJD7/mwlLJ64YR248ntZ+uDc=; b=I0F8ahmKhr7DiWS/LbZlXEhbxHq6kOXakh3YlrbKNpfhj1FdUn52w9RCrgApI+SF4C3NgV53Yl0vaavLwXbO4SVJ376e2iOq4USIYUNEIbgDyZe06ECI3ZCCszw+vZeSodieVeae0P1DhEkQc7a7lATFwunSiDpJxTZAhGUSw6w= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 5/6] target/riscv: Remove the generic no MMU CPUs Thread-Index: AQHU3oCUeXYSCsAJn0SRWbaJuVqbAQ== Date: Tue, 19 Mar 2019 18:21:32 +0000 Message-ID: <5192dd7d90cab0837ec848635b57128988b6b1bd.1553019560.git.alistair.francis@wdc.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR05CA0052.namprd05.prod.outlook.com (2603:10b6:a03:74::29) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a6e47349-f302-4489-a1a8-08d6ac97b68f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4326; x-ms-traffictypediagnostic: BYAPR04MB4326: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(39860400002)(136003)(396003)(189003)(199004)(71200400001)(316002)(6506007)(44832011)(4326008)(2616005)(11346002)(486006)(71190400001)(105586002)(446003)(476003)(6436002)(102836004)(99286004)(52116002)(5660300002)(53936002)(118296001)(386003)(26005)(25786009)(186003)(110136005)(6512007)(6486002)(76176011)(72206003)(54906003)(256004)(68736007)(66066001)(106356001)(8936002)(14454004)(478600001)(2906002)(7736002)(97736004)(3846002)(86362001)(81156014)(36756003)(2501003)(6116002)(305945005)(8676002)(81166006)(50226002)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4326; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: nRvbmTBdazpc9dam0CFLaAAoQwsBLEs4+MMnC9bzK6yb6mxGnuJNQ3XHXyDJ2MHZrS0ZZOBpm1P4TtHAKS8njlSMq1UZRBPEkLYi9LqcafEHcfWbOAxV58/yvadDafrNvKUWoF0Q677m5jFwy/jEZJR9xOjfPPPBoUE6qR51YjX5CTjVgTIwUgHbIlYTuGuu2WNd2URK+w7ELJgunEZvladqIxN3+hDa4x+NiDloCOOiiIWKR5+ips57GA5EuNiyvGqCkOP1WZDvorrK4drb5pnxNBOg1VgjZcAoOw8JovAePIxLPBpH4k8szG2kSIPVQKkMAHG5IzlN0gYoZ9zafJ0erF7spQ5wWVDd60OddrSSZiB/4wusdiddL6eoiHJtDioYWlPIsu5b9EP3veQVsFQg6PjyLbBe9F5CPK+7aDg= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6e47349-f302-4489-a1a8-08d6ac97b68f X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:21:32.5491 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4326 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH for 4.1 v1 5/6] target/riscv: Remove the generic no MMU CPUs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" These can now be specified via the command line so we no longer need these. Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 2 -- target/riscv/cpu.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 298413f6f6..1d507c5216 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -570,13 +570,11 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { #if defined(TARGET_RISCV32) DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_09_1, rv32gcsu_priv1_09_1_cpu_in= it), DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_10_0, rv32gcsu_priv1_10_0_cpu_in= it), - DEFINE_CPU(TYPE_RISCV_CPU_RV32IMACU_NOMMU, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32gcsu_priv1_10_0_cpu_in= it) #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_RV64GCSU_V1_09_1, rv64gcsu_priv1_09_1_cpu_in= it), DEFINE_CPU(TYPE_RISCV_CPU_RV64GCSU_V1_10_0, rv64gcsu_priv1_10_0_cpu_in= it), - DEFINE_CPU(TYPE_RISCV_CPU_RV64IMACU_NOMMU, rv64imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64imacu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64gcsu_priv1_10_0_cpu_in= it) #endif diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7d7caa294e..2b26f77a5a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -50,10 +50,8 @@ #define TYPE_RISCV_CPU_GEN RISCV_CPU_TYPE_NAME("rv*") #define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9= .1") #define TYPE_RISCV_CPU_RV32GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.1= 0.0") -#define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nom= mu") #define TYPE_RISCV_CPU_RV64GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv64gcsu-v1.9= .1") #define TYPE_RISCV_CPU_RV64GCSU_V1_10_0 RISCV_CPU_TYPE_NAME("rv64gcsu-v1.1= 0.0") -#define TYPE_RISCV_CPU_RV64IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv64imacu-nom= mu") #define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31") #define TYPE_RISCV_CPU_SIFIVE_E51 RISCV_CPU_TYPE_NAME("sifive-e51") #define TYPE_RISCV_CPU_SIFIVE_U34 RISCV_CPU_TYPE_NAME("sifive-u34") --=20 2.21.0 From nobody Fri May 17 08:39:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.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=wdc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553019875415633.4015265013531; Tue, 19 Mar 2019 11:24:35 -0700 (PDT) Received: from localhost ([127.0.0.1]:33141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JPb-0001Au-7X for importer@patchew.org; Tue, 19 Mar 2019 14:24:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6JNh-0008Ki-5V for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6JNd-0000sm-Qc for qemu-devel@nongnu.org; Tue, 19 Mar 2019 14:22:33 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:47877) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6JNY-0007iP-EH; Tue, 19 Mar 2019 14:22:28 -0400 Received: from mail-by2nam05lp2050.outbound.protection.outlook.com (HELO NAM05-BY2-obe.outbound.protection.outlook.com) ([104.47.50.50]) by ob1.hgst.iphmx.com with ESMTP; 20 Mar 2019 02:21:42 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4326.namprd04.prod.outlook.com (20.176.251.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 18:21:41 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 18:21:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1553019744; x=1584555744; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TRaVJNiQbb0CrsQH7F8HHPVRuBS0J/goCg5iyU9aYfQ=; b=lCjTuVLQG6Fb7XcjItIhqki4stVVJruC4mQSV7+MZ5kE9Y/Zz6hDdnzC ocgHQobRcsZ88B+iArl0wo7fDYmOPaxM/BlrDwN+3wf249oCEV3o/cPcF P0pw+urslTxHfSdDlHI/j4LNZFmtc5vxIVFyMSge/ifvHZI8hoMHFWwix QTsFtovrC6gUA15K7uiuj9+VNdPK0AI+/xNxjFm/yEB9jU2BmfeHfpubS ETqEuvNpakFkKrtqGaBXHo4gsIgGalOe0wnR0mprnMSlCPBY0PP7pTjdD 47/NMuubsHx9msozQBXrMHxdmdi60u3JHWxNVY0s92dpIEZhyNQ33slpH Q==; X-IronPort-AV: E=Sophos;i="5.58,498,1544457600"; d="scan'208";a="209307041" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uulSttjDxf4KEla53VGejwEiwWvGiXEU3aCZpU+we0U=; b=IowXeqzjT55lbVR0lKIW8+TBIgugaCty6lLgEK450jxlZnjmmfLUvNsIkxMgg/Jr4SIqRzQpq8orKxf8oizqVlnCCoVQ5b4/cd7FMYJV+fEWonP5TuMuHcW//omhhF+PMQeYCyB/1qrOlUN/Pdc0s8n/460/E8tO2T9n8PWMikc= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v1 6/6] riscv: Add a generic spike machine Thread-Index: AQHU3oCZVYrRO73JyESjhifUBSqRMQ== Date: Tue, 19 Mar 2019 18:21:41 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR07CA0106.namprd07.prod.outlook.com (2603:10b6:a03:12b::47) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 53321578-199a-4538-56c7-08d6ac97bbee x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4326; x-ms-traffictypediagnostic: BYAPR04MB4326: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0981815F2F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(39860400002)(136003)(396003)(189003)(199004)(71200400001)(316002)(6506007)(44832011)(4326008)(2616005)(11346002)(486006)(71190400001)(105586002)(446003)(476003)(6436002)(102836004)(99286004)(52116002)(5660300002)(53936002)(118296001)(386003)(26005)(25786009)(186003)(110136005)(6512007)(6486002)(76176011)(72206003)(14444005)(54906003)(256004)(68736007)(66066001)(106356001)(8936002)(14454004)(478600001)(2906002)(7736002)(97736004)(3846002)(86362001)(81156014)(36756003)(2501003)(6116002)(305945005)(8676002)(81166006)(50226002)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4326; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: IV8hBy3JD7p9C/6mohVsVSTVchA1fGHY9nrl2TExhkZwOZjj9qfgRs00TZ1X3h6XxfI4nqxycq4Q2Q2Cmv7M4SrGkLKdun9bHeyN0afx8cL4v9GyvLpi2XOu2yqU26xBV2eTyC8Zjhh0CPGmWLoZcfFdhNrbG3V3NWfCD4ugOxq9MRS3+caOt82kMowMTV21J7cBeVzKlvEg7cGCYAtlWi6vL/CCfs3vgUEUR47x9BDzdHutLK7XGGyofu2HRbpSGXVQZVyLK6wfos74wgWxJBNniVwAgqBA7kq2kG1AB9/iTSMbZ5rQaQmX1+Yt8/yJYLdlYs8khX5KpPh2HVUc+GmsJAdRVzfm3T7MvmwXKn5G2dmXaYingsaR+uhpLslzPgL4WbDYjE8ffkwMjBNXuWqekMZFAAKj4ocrVJZNn/I= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53321578-199a-4538-56c7-08d6ac97bbee X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2019 18:21:41.5804 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4326 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH for 4.1 v1 6/6] riscv: Add a generic spike machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "alistair23@gmail.com" , "palmer@sifive.com" , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Content-Type: text/plain; charset="utf-8" Add a generic spike machine (not tied to a version) and deprecate the spike mahines that are tied to a specific version. As we can now specify the CPU via the command line we no londer need specific versions of the spike machines. Signed-off-by: Alistair Francis --- hw/riscv/spike.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 2a000a5800..9d3f7cec4d 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -39,6 +39,7 @@ #include "chardev/char.h" #include "sysemu/arch_init.h" #include "sysemu/device_tree.h" +#include "sysemu/qtest.h" #include "exec/address-spaces.h" #include "elf.h" =20 @@ -160,7 +161,89 @@ static void create_fdt(SpikeState *s, const struct Mem= mapEntry *memmap, qemu_fdt_add_subnode(fdt, "/chosen"); qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); } - } +} + +static void spike_board_init(MachineState *machine) +{ + const struct MemmapEntry *memmap =3D spike_memmap; + + SpikeState *s =3D g_new0(SpikeState, 1); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + int i; + + /* Initialize SOC */ + object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc= ), + TYPE_RISCV_HART_ARRAY, &error_abort, NULL); + object_property_set_str(OBJECT(&s->soc), machine->cpu_type, "cpu-type", + &error_abort); + object_property_set_int(OBJECT(&s->soc), smp_cpus, "num-harts", + &error_abort); + object_property_set_bool(OBJECT(&s->soc), true, "realized", + &error_abort); + + /* register system main memory (actual RAM) */ + memory_region_init_ram(main_mem, NULL, "riscv.spike.ram", + machine->ram_size, &error_fatal); + memory_region_add_subregion(system_memory, memmap[SPIKE_DRAM].base, + main_mem); + + /* create device tree */ + create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); + + /* boot rom */ + memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom", + memmap[SPIKE_MROM].size, &error_fatal); + memory_region_add_subregion(system_memory, memmap[SPIKE_MROM].base, + mask_rom); + + if (machine->kernel_filename) { + load_kernel(machine->kernel_filename); + } + + /* reset vector */ + uint32_t reset_vec[8] =3D { + 0x00000297, /* 1: auipc t0, %pcrel_hi(dtb) */ + 0x02028593, /* addi a1, t0, %pcrel_lo(1b) */ + 0xf1402573, /* csrr a0, mhartid */ +#if defined(TARGET_RISCV32) + 0x0182a283, /* lw t0, 24(t0) */ +#elif defined(TARGET_RISCV64) + 0x0182b283, /* ld t0, 24(t0) */ +#endif + 0x00028067, /* jr t0 */ + 0x00000000, + memmap[SPIKE_DRAM].base, /* start: .dword DRAM_BASE */ + 0x00000000, + /* dtb: */ + }; + + /* copy in the reset vector in little_endian byte order */ + for (i =3D 0; i < sizeof(reset_vec) >> 2; i++) { + reset_vec[i] =3D cpu_to_le32(reset_vec[i]); + } + rom_add_blob_fixed_as("mrom.reset", reset_vec, sizeof(reset_vec), + memmap[SPIKE_MROM].base, &address_space_memory); + + /* copy in the device tree */ + if (fdt_pack(s->fdt) || fdt_totalsize(s->fdt) > + memmap[SPIKE_MROM].size - sizeof(reset_vec)) { + error_report("not enough space to store device-tree"); + exit(1); + } + qemu_fdt_dumpdtb(s->fdt, fdt_totalsize(s->fdt)); + rom_add_blob_fixed_as("mrom.fdt", s->fdt, fdt_totalsize(s->fdt), + memmap[SPIKE_MROM].base + sizeof(reset_vec), + &address_space_memory); + + /* initialize HTIF using symbols found in load_kernel */ + htif_mm_init(system_memory, mask_rom, &s->soc.harts[0].env, serial_hd(= 0)); + + /* Core Local Interruptor (timer and IPI) */ + sifive_clint_create(memmap[SPIKE_CLINT].base, memmap[SPIKE_CLINT].size, + smp_cpus, SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE); +} =20 static void spike_v1_10_0_board_init(MachineState *machine) { @@ -172,6 +255,12 @@ static void spike_v1_10_0_board_init(MachineState *mac= hine) MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); int i; =20 + if (!qtest_enabled()) { + info_report("The Spike v1.10.0 machine has been depreceated. " + "Please use the deneric spike machine and specify the = ISA " + "versions using -cpu."); + } + /* Initialize SOC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc= ), TYPE_RISCV_HART_ARRAY, &error_abort, NULL); @@ -254,6 +343,12 @@ static void spike_v1_09_1_board_init(MachineState *mac= hine) MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); int i; =20 + if (!qtest_enabled()) { + info_report("The Spike v1.09.1 machine has been depreceated. " + "Please use the deneric spike machine and specify the = ISA " + "versions using -cpu."); + } + /* Initialize SOC */ object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc= ), TYPE_RISCV_HART_ARRAY, &error_abort, NULL); @@ -359,8 +454,17 @@ static void spike_v1_10_0_machine_init(MachineClass *m= c) mc->desc =3D "RISC-V Spike Board (Privileged ISA v1.10)"; mc->init =3D spike_v1_10_0_board_init; mc->max_cpus =3D 1; +} + +static void spike_machine_init(MachineClass *mc) +{ + mc->desc =3D "RISC-V Spike Board"; + mc->init =3D spike_board_init; + mc->max_cpus =3D 1; mc->is_default =3D 1; + mc->default_cpu_type =3D SPIKE_V1_10_0_CPU; } =20 DEFINE_MACHINE("spike_v1.9.1", spike_v1_09_1_machine_init) DEFINE_MACHINE("spike_v1.10", spike_v1_10_0_machine_init) +DEFINE_MACHINE("spike", spike_machine_init) --=20 2.21.0