From nobody Wed May 8 01:19:25 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1553907144859157.75051384586584; Fri, 29 Mar 2019 17:52:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:39697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA2E5-000347-49 for importer@patchew.org; Fri, 29 Mar 2019 20:52:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11J-0000cW-Qv for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0A3-0007TC-II for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:39:44 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:55795) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0A3-0007SU-8J; Fri, 29 Mar 2019 18:39:43 -0400 Received: from mail-sn1nam02lp2054.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.54]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:40:01 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5400.namprd04.prod.outlook.com (20.178.50.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:39:39 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:39:39 +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=1553899204; x=1585435204; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=DoF4bQPL/ldFzbKe9L+HnefRDNsUjORf7nJMDlHPmlY=; b=a40yGz+oWWWVg4/Op1Jvf4sSHTAYhPa5QFtTelQL/coa4OhqDDHWYfdL vTx1yr72Xihr3XW4ORNxWgr+MAP+uHBWsqBWWiKQRX4r73Fvhfdn/Gxzn qLSCNmi16YMAsU4EWx6vpjn1XqUqW7c5yQtP9iTEFuT4LKQpsL89jE4M2 VrW75aG50hRSWqsEpKf8kqJfEyeZfIqieqmZ1HOat6tgaN0kbYIQnOIon 0DSbjtODvoE9cjTcCfphoSVMxA60zKGzTUi/sT6ccJvDRiwe8gx+uSZ1u Uwy6Y5iXfos6qAv8pZDqGS1x4HpQbaNFUBeSl1wMxMrklkPY7bdBwNVmY A==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="203405996" 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=J71ZN9x58BA+k6kZUUx+A7a8Z/XrCBdcCDaInXqaSWQ=; b=NbEBf9wCi3kJR1eJd048uEKKuYRKS+YiiNws88vu9z0QEpHcKbBkc5o2dHfv4aNaTG13r9OdXhB/SB0bqIndQyXjg7115hebZDwg7t/NkqQohH046xY8brIqKs+EtOwTn4ILmZYsYL4iieIUUxcdfxOiZV4zCw8294MS1AcOtZI= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 1/6] linux-user/riscv: Add the CPU type as a comment Thread-Index: AQHU5oBLqJC+7vZKdEiIjJDEdVQntA== Date: Fri, 29 Mar 2019 22:39:39 +0000 Message-ID: <21a17584f4028f8fb4b05d0fc61a2f0939660a78.1553899050.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: BYAPR01CA0037.prod.exchangelabs.com (2603:10b6:a03:94::14) 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: 32cb1e26-d18a-467b-2d7f-08d6b4976dd5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5400; x-ms-traffictypediagnostic: BYAPR04MB5400: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(6486002)(110136005)(4744005)(118296001)(99286004)(3846002)(81166006)(8676002)(106356001)(102836004)(72206003)(4326008)(26005)(11346002)(2906002)(25786009)(66066001)(486006)(44832011)(105586002)(81156014)(186003)(2616005)(8936002)(446003)(478600001)(476003)(14454004)(6116002)(256004)(2501003)(7736002)(6512007)(5660300002)(53936002)(6506007)(86362001)(71190400001)(305945005)(52116002)(6436002)(386003)(50226002)(54906003)(68736007)(97736004)(316002)(71200400001)(76176011)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5400; 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: L7h1xJKynitsJO4i2ZNi32nW85FfG6NkEWleCSJSjpUWfo1EQbUiiXfiNNA3m1Ghx8qrRPdxvj/o8x+5YMJOE2l6uTwLUNOlbVTFXmTJuo0pdTIfC8USApSs5oj/Hd9M0xw0SzgnNJrv442le2EecxJWiJZrUoh0dcM/a8c5T5FsnAyh0Ek90lj3hfCBAl+wVrbWmnM1Mop4tUoK3/R6rkaaM4cuobUod1AZ8n6wovPGA70NAPoADvewbQiXNobWkQXDWX5r2UBIvHT3nMldl1WMWWJ3aCAy3l6vmaLg4vOWatB1aV3F2IqhOT6G/HgyslyHSqeHGOaBVnVRqLSvpKbFfpGAiqJcE08VHWbnxLiZo+9alDgD8uWo8fte2A2Rqr//BpiFo3P5O9acehDWEFuSsmcasgnqaeoUeuBCmKA= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32cb1e26-d18a-467b-2d7f-08d6b4976dd5 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:39:39.8214 (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: BYAPR04MB5400 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH for 4.1 v2 1/6] linux-user/riscv: Add the CPU type as a comment 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 --- linux-user/riscv/target_elf.h | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/riscv/target_elf.h b/linux-user/riscv/target_elf.h index a6716a6aac..9dd65652ee 100644 --- a/linux-user/riscv/target_elf.h +++ b/linux-user/riscv/target_elf.h @@ -9,6 +9,7 @@ #define RISCV_TARGET_ELF_H static inline const char *cpu_get_model(uint32_t eflags) { + /* TYPE_RISCV_CPU_ANY */ return "any"; } #endif --=20 2.21.0 From nobody Wed May 8 01:19:25 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 1553903324768498.9312366842613; Fri, 29 Mar 2019 16:48:44 -0700 (PDT) Received: from localhost ([127.0.0.1]:34968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1Ek-0003Q2-18 for importer@patchew.org; Fri, 29 Mar 2019 19:48:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11I-0000kg-Uv for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0AC-0007Vh-9Z for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:39:53 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:17103) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0AB-0007VH-S8; Fri, 29 Mar 2019 18:39:52 -0400 Received: from mail-co1nam05lp2054.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([104.47.48.54]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:39:49 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5400.namprd04.prod.outlook.com (20.178.50.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:39:48 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:39:48 +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=1553899191; x=1585435191; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=BPRFn2Nm69XGE0QMGTe+yW2wqre5n+KD3rRyClUnldA=; b=m7iGGGDNUd3mAWkmPPGm3eLK25mgbHrDuJn/kdfMWiPp8tOUoeCbOeS1 RG+0miDgp78QRiWmGsTDaitQaL2b23b1u6AO5Z2K+xqk/6kR3Rfcpg1Av iqbyelL78GVMx5u7XWexZy9GMp+rOM+cJFhtUjj4NfAbMWjFm/J52ePpY HGFh7R+yQebFt57TmAgYeIwCIYqdqGemtakgveE/ev5k1iP1FajBpASsJ zFrJ8MwrTpjwD7Or9ssm2U7kJntSfmPyfrsnaaj9oheKaBOp5Ya4bPQoX tfP+mCpj/mFnnj+NB0ghR2kdVUPuWrqO4t5R9JqI+mXsSrkcKVqJ1vFmX g==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="210282012" 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=b80cTgE4mp47X1L49gBReEvpXm6D25ESAUf2EEHv7xz4sXlhqGqAlhs4oFSt60GJj0sV6N28eDoO0dSkrBe9WIQqzFQz4/O0CIkM8AN/RuQJ8aUnsYF2zZTz5KQHfGSgUX9d+IP+EWQBuivPBQtE2CpfHWPuUD/JTZhe1CBsNMU= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 2/6] target/riscv: Fall back to generating a RISC-V CPU Thread-Index: AQHU5oBQrhRDOkxR50WVG9AJ6XU2dA== Date: Fri, 29 Mar 2019 22:39:48 +0000 Message-ID: <99590ce3f3572a2b02216a5d99cec03ccc3f35a8.1553899050.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: BYAPR01CA0058.prod.exchangelabs.com (2603:10b6:a03:94::35) 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: c3ab090d-bf71-4ed5-4b66-08d6b49772ef x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5400; x-ms-traffictypediagnostic: BYAPR04MB5400: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(6486002)(110136005)(118296001)(99286004)(3846002)(81166006)(8676002)(106356001)(102836004)(72206003)(4326008)(26005)(11346002)(2906002)(25786009)(66066001)(486006)(44832011)(105586002)(81156014)(186003)(2616005)(14444005)(8936002)(446003)(478600001)(476003)(14454004)(6116002)(256004)(2501003)(7736002)(6512007)(5660300002)(53936002)(6506007)(86362001)(71190400001)(305945005)(52116002)(6436002)(386003)(50226002)(54906003)(68736007)(97736004)(316002)(71200400001)(76176011)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5400; 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: 40EVJAdJsE71jHpBt+HLkEcVVTwzllW2qTS6NyE701LJq0BZ+SP3BFe382gMDZlm7OfRZ1rU4/517iFTv/rcYQa9p7JDkLfUsFIqwI8H3N17L81oMKF6QMIfJ08L2Bz7BoJ0KjPrFCyEViFEt7tFCunMLLQEg7vhvdfXdj3uVOB4MIaboyZlygCoo4FPf4aL8GFPnuJPNbyVfBr56abqDIUFhunYISaIR3t8SpOcrSEOzQGxGn7i409Z9beZXlXa5TnCQLZGI/1ePizkajlDl5MCC+z1BMlbbT9a25Ce9zmwFobznE2XfqONEQaMtcTopm7cQ0/dlHLbNwyW1599VIDRgMDHw0yhG+yMTatACX6KsXPYKiL9+zk2jA2uepFMdX1ZGyuyyR1U2A0+VmivgePSD2+3+HHdo6J7lztCcl0= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3ab090d-bf71-4ed5-4b66-08d6b49772ef X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:39:48.3281 (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: BYAPR04MB5400 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 v2 2/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 Wed May 8 01:19:25 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553904218526121.23623478382763; Fri, 29 Mar 2019 17:03:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:36447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1T4-0005I2-Oq for importer@patchew.org; Fri, 29 Mar 2019 20:03:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11H-0000mR-D3 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0AJ-0007Xb-ON for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:40:00 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:55816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0AJ-0007XK-DI; Fri, 29 Mar 2019 18:39:59 -0400 Received: from mail-co1nam04lp2050.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([104.47.45.50]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:40:03 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5400.namprd04.prod.outlook.com (20.178.50.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:39:57 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:39: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=1553899205; x=1585435205; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=tl+xYE2Ag76+rug00OyLCp+7ai/skmz4m8I3hOEHOsk=; b=N+o4Wwq4WsO70n6akf4NNRANBwsZlIkIbuzM7wI6nA1kQd3K7ChKHx7V zJVrHdRWVVLaU+UgMPKC0oumff2jwFl1YopsEE9g76BzdSDks9HnXrhbH 7l8Jb1j93xB1/TVDaQKj+u0yRvHB+sWJhUiheNzRHRn/aIdTZcBnMDyvU AaWFbp8t/2bpS1QtDBca0zox2YjT+oFbK7SFyP2oUa+/I87Xif7FasPkK kXi9pkBwhHXJ3c8BRFKVR79WI1TtDGrzRJI5O5lbSe7m+LdVs1u4oRIdl kpDZu4WOIi8tNvoeWspihNoQrDd1QEKmqitQKt3w0gwUt1a40pHTPNWOK Q==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="203406008" 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=D4JfSTzH4IVx0kse7x9xFOEmHBSl0eoYGgdfduhdDUXa/GmQR+Vp8J8nb0Be0brglD8AR/bKwOmWgxLlkgGX3h6XCrCXvv4zeBFJw5a7mDIBDw/vyQ9UWpnjRdFHNmWTaEd/GzOUUDrIursroEUlcPZ4M9FwJ0moIw+geC4Dln8= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 3/6] target/riscv: Create settable CPU properties Thread-Index: AQHU5oBVS6xsMd6xUkq1wDezuX3MBw== Date: Fri, 29 Mar 2019 22:39:56 +0000 Message-ID: <1bb1dbb8a5509131be161b08585421b7bd731541.1553899050.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: BYAPR07CA0104.namprd07.prod.outlook.com (2603:10b6:a03:12b::45) 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: 48719856-6f4f-40c9-bb5a-08d6b4977807 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5400; x-ms-traffictypediagnostic: BYAPR04MB5400: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(6486002)(110136005)(118296001)(99286004)(3846002)(81166006)(8676002)(106356001)(102836004)(72206003)(4326008)(26005)(11346002)(2906002)(25786009)(66066001)(486006)(44832011)(105586002)(81156014)(186003)(2616005)(8936002)(446003)(478600001)(476003)(14454004)(6116002)(256004)(2501003)(7736002)(6512007)(5660300002)(53936002)(6506007)(86362001)(71190400001)(305945005)(52116002)(6436002)(386003)(50226002)(54906003)(68736007)(97736004)(316002)(71200400001)(76176011)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5400; 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: imb9SnvSRjQKaV58czRKxYUrvHpFvsNA5oe650wUQ2EAx2w4An19O1cpHQoY4uWI649k/LI9/beG9JrZ9I4xZGfF+5SIdGv6/9r5Vx6ancmI0dyJcRE82WoceqCJHL0I2U/Xn//uh7alhN+ZESq5xWS+PkFg7S4dJR6+47T7fWB0rI7LIz6a/gz4priP2rg3jjxDR6nGDP1lATa7Q64FG7yS0DbsLtd98zVH58n2gVU2mxrW21w2qBYwN/9Ya5JYnpA9oDda59XH+BHkFRRuzozgiyJpix5WzswgmTKxZ9m+j/LY+9HXhbCph2xw7xXbeEstX/e5nK7j8CKbDElYlYfFWiUSZMQ9Kq0aspq3rSS5SoiZ21tNVIuMq2WsfmZHAsQDCQ7Gj2QMTWBGzZv2XDoVlLtfp205Lxpa2eW3gSc= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48719856-6f4f-40c9-bb5a-08d6b4977807 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:39:56.9279 (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: BYAPR04MB5400 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH for 4.1 v2 3/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 Wed May 8 01:19:25 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 1553905982923539.7561348761908; Fri, 29 Mar 2019 17:33:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:38323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1vf-0006IR-C2 for importer@patchew.org; Fri, 29 Mar 2019 20:32:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11G-0000f9-W0 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0AS-0007bu-U3 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:40:10 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:2076) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0AR-0007bS-VW; Fri, 29 Mar 2019 18:40:08 -0400 Received: from mail-co1nam04lp2057.outbound.protection.outlook.com (HELO NAM04-CO1-obe.outbound.protection.outlook.com) ([104.47.45.57]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:40:16 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5400.namprd04.prod.outlook.com (20.178.50.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:40:05 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:40:05 +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=1553899218; x=1585435218; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=eW1pwuIkig5Ey4iZ0a4xc9Umj6cbZ6PEmRiZ2dRpwWk=; b=eWx0Cv0G35t3L4CFcMgK/sAreLWcwJAfBY16sexHLYbI9cmgJIuw1YaF Xnz4GjiTD/cd5QapJe2kxRH0NMFkjKQmviF8GQrXx4YVCKzp6vFqRWGfP 3MnfTUE8qWDVd1YcGU9J6n92hmmcLSURORNfBMsh6aVO3yYVLQ9Gc5U9+ 8COqWbLicEmF0231RikeaVm8YEtkdNFl6nrTbAdGhx0sD/a/uRc+scTiD Yj3A9hyeJVOhfYMHi5TS2yAyRxP4YDs5Lr2F5yPGwDtPDsJEV1VaOz2xg U7IXOUx6zluWzi6Nicmz0NEHinqBEXvzRjW34BMPHhJvsLrzZgMPrcUTA Q==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="203406019" 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=N+pPwWrv9menfHkP4/+JoxC+nHI9LV87sN8RT9f6twiVH+XHxi62L2t+svcyYvNj90r0Hg1gCjICRmbHS70XmmLjILp7Z0v0WAU9gx12gt8dJKW8WVkTsdgBGquspMBfzACjJesOprjMNajUiik10JcAyl+yXJMbYV6ypU5e5NA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 4/6] riscv: virt: Allow specifying a CPU via commandline Thread-Index: AQHU5oBaiKvYEDv9E0eLAtSF7Zweow== Date: Fri, 29 Mar 2019 22:40:05 +0000 Message-ID: <2ed844108a9e7b3c9f99d2c80d2487d6e549883e.1553899050.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: BYAPR04CA0021.namprd04.prod.outlook.com (2603:10b6:a03:40::34) 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: 7f073f7b-3679-4dc0-4b82-08d6b4977d24 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5400; x-ms-traffictypediagnostic: BYAPR04MB5400: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(6486002)(110136005)(4744005)(118296001)(99286004)(3846002)(81166006)(8676002)(106356001)(102836004)(72206003)(4326008)(26005)(11346002)(2906002)(25786009)(66066001)(486006)(44832011)(105586002)(81156014)(186003)(2616005)(14444005)(8936002)(446003)(478600001)(476003)(14454004)(6116002)(256004)(2501003)(7736002)(6512007)(5660300002)(53936002)(6506007)(86362001)(71190400001)(305945005)(52116002)(6436002)(386003)(50226002)(54906003)(68736007)(97736004)(316002)(71200400001)(76176011)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5400; 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: fDywxGG7cVHjoOSEmEOc37bfUXRKCu2Mofe/J9r0AXGvomfvj6eJn/sSeFFVauMUZK+MjHxxxq56QNwqfvZ+stT7HwtYvSaEXZE6NGgjMuNKTX4V89t39HSqWq04QbBKC8AqR8WP7fBPcSo+kc2WDmXQUsx30VSfe7oJAe8ttPgGQyvKIzqWojnR7F+CyLFI77ZKUaeIrf6h1JPb+A4qo3oGzCphZwx00zbbXbikvqOUnRC07T7IF689VcuATUj92UgwBS8R6wN2QaznNUjDG/Tea4LTr3q/2RKnL2ES0vu7c4BA2F9hE5bQxzyt+Xtf2hh+udZyOJTf/9RkisJEEFkUUSY3ADg2FS3QGcikakVio2/YfRvrPOHyaGvIO1RTJsPWTUHAffOgTS9R1rqsMcEEAo5HgN/0Cez87z011cg= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f073f7b-3679-4dc0-4b82-08d6b4977d24 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:40:05.4867 (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: BYAPR04MB5400 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH for 4.1 v2 4/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 Wed May 8 01:19:25 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 1553905917085448.4806979356608; Fri, 29 Mar 2019 17:31:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:38097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1uO-0005O1-Nr for importer@patchew.org; Fri, 29 Mar 2019 20:31:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11G-0000Y5-Pm for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0Ac-0007gG-F2 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:40:19 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:2086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0Ac-0007g1-63; Fri, 29 Mar 2019 18:40:18 -0400 Received: from mail-sn1nam02lp2054.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.54]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:40:31 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5400.namprd04.prod.outlook.com (20.178.50.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:40:14 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:40:14 +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=1553899233; x=1585435233; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=6h2pgvRwrM4rvkKa/CQLxhPJE1tgk/3hv2eo2WBR1a0=; b=Wd1ylOyRffPGq+C1M9RYg+/pqbum9WlOEg4RIa7ShbsRmtYEd7gtUHKn jyiTMSir2ieDN0Dzb+tix+5OuvIV8cQUCfQOo6MwEBW1nX00fl+6pDg4h 29y649U6xVG/QOP+LKCr9qj/btT/zo2461BYwRaG7g7hHvzx/Ytpy5kTq Fbt1apuV/kdnrYcJHJ8bAq39DLwy2wZsHKWdw1JSPSf+8UwYee4I7+Yef lUgqCJeuSzSmU4RySPUBB+rvOulkr++QWdu9Q9KLH0WAOBTmlsnFfoeZ4 /1mzhs5y3HFrXnr9krkLuZ2ZPratDYW13FmOYEW+qfcgWSMqIZcO7JSFf w==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="203406028" 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=yNiVaYFhIzAH8ajFqgWfw4ldOwuhIl0SJ0+MB2YcosA=; b=S+d36nJEIY2hExGlY/UBlmezDTAqeW+BkW7t+HaJ0YzFAqV0Y/h6Dn2KbZ+CuwCwZQn/rNDz+WXaRXQd6IIapDQFKYdfUOGdllgAS/ZLPQ6LMHLTFcxODVKjxRs+08aMNAP+vCgfrM/vMBl9YSLqAsXsut9kHlfyvcfZbSOuku0= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 5/6] target/riscv: Remove the generic no MMU CPUs Thread-Index: AQHU5oBf/CsZVLHY7EG50dY3uAhmjA== Date: Fri, 29 Mar 2019 22:40:14 +0000 Message-ID: <25d6ef1788eaff99a4e3e4f1b8e1c8505f4d298c.1553899050.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: BYAPR07CA0088.namprd07.prod.outlook.com (2603:10b6:a03:12b::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: a50e83dc-3250-4084-92a1-08d6b497823e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600127)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5400; x-ms-traffictypediagnostic: BYAPR04MB5400: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(6486002)(110136005)(118296001)(99286004)(3846002)(81166006)(8676002)(106356001)(102836004)(72206003)(4326008)(26005)(11346002)(2906002)(25786009)(66066001)(486006)(44832011)(105586002)(81156014)(186003)(2616005)(8936002)(446003)(478600001)(476003)(14454004)(6116002)(256004)(2501003)(7736002)(6512007)(5660300002)(53936002)(6506007)(86362001)(71190400001)(305945005)(52116002)(6436002)(386003)(50226002)(54906003)(68736007)(97736004)(316002)(71200400001)(76176011)(36756003)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5400; 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: WOXETT7IoMYR4oRCIminR1CnyGWGbF1t4hu3TAlrHun73ZBeYcqhRhC9vY40WuTiVq8onM9c1a5tQk4XfDsKb2Z5qFGf/G8nwOkpn97MQy9drd+/NzsVX+Xu7hkQDd8sVT0CfHi/WkUy/zxahb3MNIkCBHk5Uf731wMOFaBaWRuMnoP8BQh8Zqex2CO2SED4L1f901s7aTcqmvzDzQ3BdUbvCsMqYuhV+MdTqj4m10ySaSv/SZ3n4cR/0o1dp8gnnn3bJdH+XOCSxlFEnVg6rtXJ0ZrWzOuq/IwrAao/4GHmGIkPCBv38f5sIK4Vz5KVbb2Jt0nDxr0IzAwvAatjbjtf8RkpQFYHkZ4M4LQOvcvhFgj5H9RYelz/ZZCbToVNuYI/emmG8fCb9dSWcbMu2cne/Y8QbWvDm+u8ubx1sos= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: a50e83dc-3250-4084-92a1-08d6b497823e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:40:14.0275 (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: BYAPR04MB5400 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PATCH for 4.1 v2 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 b6408e0a83..758201331c 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -580,13 +580,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 bc877d8107..6806f602b5 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -51,10 +51,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 Wed May 8 01:19:25 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 1553904501097101.15259587056562; Fri, 29 Mar 2019 17:08:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:36620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA1Xe-0005cS-Ik for importer@patchew.org; Fri, 29 Mar 2019 20:08:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA11G-0000Tz-K1 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hA0Ax-0007tU-7P for qemu-devel@nongnu.org; Fri, 29 Mar 2019 18:40:40 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:17136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hA0Aw-0007t9-Mt; Fri, 29 Mar 2019 18:40:39 -0400 Received: from mail-sn1nam02lp2055.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.55]) by ob1.hgst.iphmx.com with ESMTP; 30 Mar 2019 06:40:24 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5272.namprd04.prod.outlook.com (20.178.49.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.18; Fri, 29 Mar 2019 22:40:23 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1750.014; Fri, 29 Mar 2019 22:40:23 +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=1553899238; x=1585435238; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=TRaVJNiQbb0CrsQH7F8HHPVRuBS0J/goCg5iyU9aYfQ=; b=kINQzCcs+XcA9hipoLwMCngMI/f8PUOUdVwLF3yoabB+HParOPAjQJdu QRrBF6n3s0KvRToO4JCP1F8fwQL3ykgbJc0zYrSzGHA4hrVsc55DAP0y6 k7RA+bVpg3EI2EMmKHUZAUcAg5ciJgDOZwkuGlEXnAEqS3MNAXkHMyKpC oMvct7DZsDCgMJySZ5MxKF4D0xmTHD58j1j1XtchM7sodUdAlUMh3/GOq kPr5ZkSv6vRGOIY2yrzoIzqA8DH1SCJvAi8KPxxeWR+sVzDt52Me8bTdn 4BwllGnt65QpZE0k1q74katVk06vKpXt7CpeLecH1jMsyWT/cAFXEdFC+ A==; X-IronPort-AV: E=Sophos;i="5.60,286,1549900800"; d="scan'208";a="210282030" 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=iX79QAqud/TNmzSaZMqKp5609Y/rELC5RS9hnnOBtyQ8uiLNZuAPw9PzVgMQ2svPuxWl3XD8vHdwYYJJLo2hZEPYgRaOzyfZ7GpamkP/KZiF6aXcvliSnEfOANPrn8fEdtsazZ3jq5Uq7ih9QIE9oxA0QT2/R8mKpSN6PVzCJzA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v2 6/6] riscv: Add a generic spike machine Thread-Index: AQHU5oBlttf9H8wu10Ks+Mut4xftWw== Date: Fri, 29 Mar 2019 22:40:23 +0000 Message-ID: <7f8923d6253cdd16a5b4e78783f934304b4edeab.1553899050.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: BYAPR02CA0070.namprd02.prod.outlook.com (2603:10b6:a03:54::47) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.45.64] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 038bd1e7-8770-4c2b-0077-08d6b49787bf 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:BYAPR04MB5272; x-ms-traffictypediagnostic: BYAPR04MB5272: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0991CAB7B3 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(346002)(366004)(39860400002)(136003)(189003)(199004)(72206003)(8676002)(6512007)(25786009)(6506007)(6346003)(102836004)(3846002)(305945005)(478600001)(386003)(99286004)(71200400001)(97736004)(446003)(76176011)(14454004)(52116002)(5660300002)(50226002)(2501003)(71190400001)(256004)(53936002)(118296001)(66066001)(6486002)(36756003)(486006)(86362001)(81156014)(68736007)(81166006)(14444005)(26005)(8936002)(476003)(44832011)(2906002)(110136005)(4326008)(6436002)(7736002)(186003)(2616005)(6116002)(105586002)(54906003)(106356001)(316002)(11346002)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5272; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: /v9x0fIHhBvAjfMawX8KtRx+nDzr1omSZ8Gnq2agfRZ/3/qdumqT+koPCqnjWr94iUpXkarC+amM+IC4dXePtEqInUXtA4yja6xY4gtCpf59t08KVTkb/F9kOMsQsD/K4C89YiK99UX+54Bcs0PUQKTJS/S+DkjHiKbXZGxVlrqREeR4KZKMMYfph6jKMMI8Y75sHm0WQOL4rk1RwAoUwlJZi+cjZhdE8jxVICiLmHms+1cS+xVqzuchpXLa8T+DN0B3kg2MdbZL8RHkie9Tk/V1o0jdmnbv95eUUygCSGx/bXYaJEUHDwZlJGB9YQH5k9dtYph55wQSiloTltgUpF2rwz7n3bFX5Oa1XR4vzqFh6ruFIPiKz3zHVK/uyPKqmrkhGVeV12UNUTeCOxUl+wSt2TInjNKbAHGzy17C1jk= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 038bd1e7-8770-4c2b-0077-08d6b49787bf X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Mar 2019 22:40:23.3129 (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: BYAPR04MB5272 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 v2 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