From nobody Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727227; cv=none; d=zoho.com; s=zohoarc; b=FdHN/2QgTC3JSIhoueLOGPuiZku26jc1f80pJYyO8K4VSBzL/dgzToFsLd1SXAKDo3Lxih8qDHmsNq/SGRHerO4pUwAWig8/Aqx7cjECeoDTLf4YUqSzmVoHLcvpw/TXt1/G3GsbvqHn/oK8iRaYmG77DYnl5wPmeuvFwS/M7ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727227; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=VhlFS4wWGVfvKnjFYtcxDbBd75J46iCic0zcDF/h6UM=; b=R2TgznVcEyTakdkFBgQ98PTpxbxASHuZry7G+jkqhxFMVpUBSfxrFVgQwRQZgF95Rg0LWFDL8BaZSBRFCWqVq7M8CY8YhMnrJSGVzUn3id2pd9p+hjWFsLcwAWVXg0QejDZ4Dzp7W04pIHA5V+sSv8LfKN37Q0ejDLR1H16AuCU= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555727227103878.1023120700106; Fri, 19 Apr 2019 19:27:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:35776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfi4-00050v-5n for importer@patchew.org; Fri, 19 Apr 2019 22:26:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfg0-0003O9-U0 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHffP-0002CL-Eu for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:23:48 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26459) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHffO-00027f-9Y; Fri, 19 Apr 2019 22:23:46 -0400 Received: from mail-by2nam03lp2053.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.53]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:23:46 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:23:45 +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.1813.011; Sat, 20 Apr 2019 02:23:45 +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=1555727027; x=1587263027; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=VhlFS4wWGVfvKnjFYtcxDbBd75J46iCic0zcDF/h6UM=; b=B7g7Q2iPK1wzxuUcnEnvudbN4gh6FpFUH6kHt6f2dlN1ffUBnu32tuBq uFmmKAsv4pASCa9P+Y78B2mEgFOooMm90P4P8ZvCEyUjQtnRI0BkyRgAn udYSvTZEuFybBlW1JLAKGmnwHXhZGDtRMqjjj13RxHqEvqycoxz0A1SZd qNINuo2UMZjTJB/DFawTzNivO0q82Bby3GfeFSt/5lI6Yw/Nxc7GCvem+ kdRGsPBC4KLCDepfez8hAWRejtA4vKETH9iuvs/lLqxYQmEaet2QoOJ47 LY2dng6Uf9QRRr+PBAgwNClaufh2n0OeAZ63UROJ2bE68Qaw5KbQuU01w A==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="107617866" 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=VhlFS4wWGVfvKnjFYtcxDbBd75J46iCic0zcDF/h6UM=; b=OShhFyBAmiP+L0OzFfAS2n9Y/m/MCtMIupOEmvsFq34+9aN2sk5fkFZl/etZ1zL6sixEXuvuZ809YerD5sGvB8G9pCtx7U+qp2Pkd/ScC1eahDxY1EuSP4JXizzYYpHfNhNATFH5g1esSw4lDxhc4cDt8yKdmo20Dh5oznDrtBA= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 1/6] linux-user/riscv: Add the CPU type as a comment Thread-Index: AQHU9yAU2SbW/ZkF0ECJ7bcQE6RRZw== Date: Sat, 20 Apr 2019 02:23:44 +0000 Message-ID: <7d7b75ffdb42418d9c949eff7e35aa9d5ecf504a.1555726824.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: BYAPR01CA0035.prod.exchangelabs.com (2603:10b6:a02:80::48) 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.172] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b089df7d-5404-4a65-5070-08d6c5373674 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(4744005)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: TZwwzOQhhZ/O2a+6qlW5YZ3uNrcV4kJHwiZfmY9Jhg7/jd/l0rAUML4YaONRUXlQr+X7TE1aFn1biib/uyd4GpnrA6jnAVhutjA92Cv8pg0ebipP1a4sl1EJ9GY5uRMjfMBIwq2V0iGKIGYjhPr1tyUnEP9HRe4h42YXLaQ25S7fadcykVg4QmUS6p4oCTJL60k+Oikf3QxpSkOxRRMQqLVX7RApaioxuZb6l+s2PfZUfdkHGJWzhSptDQjMh5SS04BBBuYQ10aJgSZ5n50YWhTp4eG9AdaZ86RxIrZ4hS03W0KTsAiDaKMKXAbB19zPRtEe9GxuFnu1i5V9teCS0g2nUD95uSH5TYmvQptbpSdcyx+IGR0jNb3fkv5X+DYy1lCZwNptaEg/xX+mUkzDeFq1dSpv40Iu4vn/ZYHrNR8= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: b089df7d-5404-4a65-5070-08d6c5373674 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:23:45.0301 (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: BYAPR04MB3943 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 v1 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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) 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 Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727231; cv=none; d=zoho.com; s=zohoarc; b=e/JFGf5UaPpG3Qs202j9+FU1JKvdFXD1WowQce2z1h7LD86gInPwkF1OQ5bnY9ka+qae1tqE+AhT20/XULATGi+qOlfD54vQ09ZiR9wpgEAOdet5WI/9by0kBJO/H664aT0Z3tsimyL914+2zc4L7XHgQ2C15//7iA0T+LMonrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727231; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=rIKrYt7w8dvN5WsBNs/xhO+LKNL7nnzJmFQzezzMR5s=; b=MZEwdb61GGv+Ep4pC3GGg/s3oNay/KkrWUnfx0VuCFk9FmFN6DAyr9618/zD1q59WTxfrBzQdqcAlbZdUuE+lcalgHk1xpxB+M0CLtQgoclK6M/CwfKyQTGbTfGij/WjHmCPs65CSwDQDzqppgkHYMycBGam4LGoBODkjhzVShk= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15557272316891.1946357336297524; Fri, 19 Apr 2019 19:27:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:35772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfhu-0004k0-Mx for importer@patchew.org; Fri, 19 Apr 2019 22:26:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHffz-0003O9-2o for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHffY-0002GB-Rv for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:23:57 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5759) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHffX-0002Du-MO; Fri, 19 Apr 2019 22:23:55 -0400 Received: from mail-by2nam03lp2051.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.51]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:24:32 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:23:53 +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.1813.011; Sat, 20 Apr 2019 02:23:53 +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=1555727074; x=1587263074; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=rIKrYt7w8dvN5WsBNs/xhO+LKNL7nnzJmFQzezzMR5s=; b=JH18NsZOddT/ycyCX4PjyfC0xkCpazTJlsZ6ZPq28jRxRutmK9cSch/E 9z+wrApF62EWN0HXa0xNKh+w9ZM338+FeAGx19CPus5kz4Lf+7iwez/qM GgMBVzYnn6ku95RhcDXYx/mX1r4YhOXkJxIeEBVprf/kLhVVShog03/Rf WPVR5sHS+docKBmVUyS80ctfFz5rQGWu/+pnaOAPCTitd4B7zvas41ZoC 2dKiNbbOEbCY0x26tFx/A28QXoDsqUr1DOBt+tigVI4Qwz+5jhlfn8wPd Q5nOp185u4G67s9s4zemgce5AYWOemkr4L3ONF1rbi0U+xN36pyj1JwDt Q==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="205476495" 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=rIKrYt7w8dvN5WsBNs/xhO+LKNL7nnzJmFQzezzMR5s=; b=m57MvPSvqLBMRqSwYLk0VVTmJENPkHooV1vTn1F7MCOloFOa88oDALnJFupOnnVCamh7o3hQvSyA7gAylzRj9yj8OhD47kOP/sizarEovkHzmaC0tnHEOdg2L1ePz9EYBHHhbFKUETyG7DCOHDFtrR8yCGhxocA3AHnuQBJArGk= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 2/6] riscv: virt: Allow specifying a CPU via commandline Thread-Index: AQHU9yAZenMWYgTtrUWdN4w/lJrkWg== Date: Sat, 20 Apr 2019 02:23:53 +0000 Message-ID: <6480a4d099d59afc8103313a3ac51262fac43cbc.1555726824.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: BYAPR02CA0042.namprd02.prod.outlook.com (2603:10b6:a03:54::19) 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.172] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 89293068-841e-42f2-301c-08d6c5373b62 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(14444005)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: qEJ+8C5g0vOPgPMdKgmZBnyk393EhD4E83pLwt4J0a68thru3o50pj0oUikeH5dudt7k6X61HoMCrU+Xo8lW5bGhM42ngPqNyVjn+itm6N9wSFIKVe9tg6fKCHRYOVK6DxV6W7MhpBo/mwYI1O4KqUfZpq5HxjXE0BpBpIkc9W4ZqbF2uxCKheh2T7yAqBzr9PbXK5HkJ4dPf9cz84iVd7mM3dfrfyonA+Ln+igkDce2MPYXf5rcb/P0C+W6flmE2zIYVXcEmgiR39nbkM3luwPpNMDbRQUQORjWbuoJq3J00y+lz9UgDQCwNh/tGbQWnenYmnKVxGxzUI/F5oNKj6QFdprY5wnlolEA9dZcvJehlEh5jW4yUbxYcNcECeUVKAQRxKXF8uULEmw1/0TB03IXpSe1DCoCLKuQNnDkIWM= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89293068-841e-42f2-301c-08d6c5373b62 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:23:53.2549 (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: BYAPR04MB3943 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 v1 2/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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Signed-off-by: Alistair Francis Reviewed-by: Igor Mammedov --- 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 Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727198; cv=none; d=zoho.com; s=zohoarc; b=dGWT99oF2MlEtDQzxma5tUAG6tTffnOKnuonxNwRy4qjx25C+YcrHyTjBznVFmjz8YNwyKXWqmNFfyGyyGRQVsHkeDnboKZqMIKyV5Su8Ss5+gljcilKTuv/rCXZ0vJpb/fSoJRlzixE3rl0QEOLlI1klf2yWBVBD+eLgmvmwdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727198; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1gn9wSg2UBktimUbFrZvmmomEWaUXQomWIeKjSp4d7g=; b=iAGyunoHta1su+nm+YQgp/LIMJmM3FYILws6U9Ho1Qadczfgl4wv9p63WhSa+/mcMfjhp5YP1gTsvLQ0ydAdij03LXKY7nbbJIiD3Z6dQMUBg2bt97qPxrYlYSYIaBmSWyavtVxngPoD1U+3BTDGFCitQuNazsZag+UFrbBvhHM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555727198359745.1454039272766; Fri, 19 Apr 2019 19:26:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:35770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfhu-0004iS-BU for importer@patchew.org; Fri, 19 Apr 2019 22:26:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHffx-0003O2-Qj for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHffj-0002MV-B7 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:08 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:38653) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHffh-0002Lj-R8; Fri, 19 Apr 2019 22:24:06 -0400 Received: from mail-bn3nam04lp2055.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.55]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:24:02 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:24:01 +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.1813.011; Sat, 20 Apr 2019 02:24:01 +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=1555727046; x=1587263046; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1gn9wSg2UBktimUbFrZvmmomEWaUXQomWIeKjSp4d7g=; b=hYtm8+iCUoRXk/XF6or5m2G7iUNjOI76FUzBes3J3g3DtIY+15+m31Tg Y22DhOHzhM+EXsZKGzjgpf4SQTTQRC6t2PbaafGb1iyT4kMBXa0WJnzma x4xV5V/8Gjtqz2TILVDFV9jLQtbzztI8pj0T9IBYfyJCwZS23OM7per3T XAxAIj6ZDejt/W+v8+mYLvX29+Tw+eXRu7HCjmCs5Ym9VCThOPvX4NIWV bOi7bJRO3J1I0cpv5VZctKkc0ollilZ9oGn+0LpnoK+XpJNBRure82F/4 0KAmIpZDLi+OjT8H4xG7yJcJSDFxZkT9YfnYBGdAJhm5ZCvG77vzjTmWE Q==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="111349338" 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=1gn9wSg2UBktimUbFrZvmmomEWaUXQomWIeKjSp4d7g=; b=DHsFMxulUJY4BhWStUWHjKjcbYyS4+S3lLaOnIBkQR90hD1bXBra2HWJnDtPY6lYABVmeI3/nfIRxA0Xdg9glcZVraN1glkNv9ucH+T2B9djV0WT1FeS2zniBsHDPUBQyqpTXXZVZYyrRuiNU3e8tWZOdWpAeSSbSwZy4TlurMc= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 3/6] target/riscv: Create settable CPU properties Thread-Index: AQHU9yAdZ6R2Nezjh0+0qUGEnhK5Jw== Date: Sat, 20 Apr 2019 02:24:01 +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: BYAPR02CA0041.namprd02.prod.outlook.com (2603:10b6:a03:54::18) 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.172] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8b5dd19e-ec4a-457b-e1bf-08d6c5374034 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: BLITDjVj+TFME0F7W9rGbqYFFyYbMKB/PLTauU1UUFOrHntEd7tnNBzwgOpY0SHkQwtVLz+dtY9M5dUbG52LE7jf/DE4s53GXOHNfZpHbIwD5jIQ7cOU3NM5g8hCGwsNvh+xBGR3k4jinE2Bjdq4lS6sw07MXrCODyNrP5MULTcaHgj+QgDfYCwo/UMPlgLMk3czGoFb84oXysiGrsFrCy0Hsn2zzEPm/+PQ6T9bBD+UgalkAfBEFO9WOJgw2yLkevArjNbcosICq8zJ3hxA1urvtcd59rQXCX5GFxqf289fIXGkLWwWaIyHx81BRrrdVJWgnKg8czhLP6xukwX4kzF8zWhA6tcIfiC92JJyE0OBcJUl5xthsQDEtbVTcTnAWrA6seyMQ4sRYXhrN6B3GDb2XLwfw0+6BCZWnCXDG6g= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b5dd19e-ec4a-457b-e1bf-08d6c5374034 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:24:01.3876 (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: BYAPR04MB3943 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PATCH v1 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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 8 ++++++++ 2 files changed, 57 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d61bce6d55..8f14fb8a1f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -22,6 +22,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 */ @@ -296,7 +297,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); @@ -305,6 +310,41 @@ 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_setg(errp, + "Unsupported privilege spec version '%s'", + cpu->cfg.priv_spec); + return; + } + } + + 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_setg(errp, + "Unsupported user spec version '%s'", + cpu->cfg.user_spec); + return; + } + } + + 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); @@ -326,6 +366,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); @@ -366,6 +414,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 20bce8742e..6321983584 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -224,6 +224,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 Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727349; cv=none; d=zoho.com; s=zohoarc; b=WSv33kMtmiWDB0PuHdVikwoN3QTm3CX5azPjVwsxEUYjyMsEgHmNnaS93NJK8qwCv19BFAsIiVIEvQ2d3Dqf2wW5mPe+ET+dystcBonm9MLb/1IpmjlBn8cxBLEKVLwbMxmnwe464Yd41E8KX/4npkKZQBai7uiMVYVXF7MO/BE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727349; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wGLmzXY8ln9aDL3Bg8Ndtbb2YnNj4WFChx31WkfF5+w=; b=AESMVQbf4mIYSq5o7YZP5gRHHPY2+AoPNvzf1R3Wb7gbvtlm+sH71Hlund+xOsHgheCCEh3WHPbMhlDo9T2DOpm3jL3ki2RVVgGEkF90bjccbc8krsohVLA33n9IOjMaBFAo6DAzVjkXBToQxHTqH5eJlUOETSEcVudWudzB9FY= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555727349257353.8842109256784; Fri, 19 Apr 2019 19:29:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:35816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfkX-0007UM-St for importer@patchew.org; Fri, 19 Apr 2019 22:29:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfgH-0003ft-J1 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHfgG-0002bd-Bz for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:24:41 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHffv-0002QE-5u; Fri, 19 Apr 2019 22:24:19 -0400 Received: from mail-by2nam03lp2054.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.54]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:25:01 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:24:10 +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.1813.011; Sat, 20 Apr 2019 02:24:10 +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=1555727110; x=1587263110; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=wGLmzXY8ln9aDL3Bg8Ndtbb2YnNj4WFChx31WkfF5+w=; b=AYtMIdXPDuC82cXm26d0VSkKOATZTWUJG+8GiCZaVsZXY6L1K4/qXY2Z DAg15oYIlues38mK44AefJnHgcPDnrfGYb9RdZjKZ8IIwYdjJDst+ahdq K7mgT29xqX7R1RPw2TFwwPWiipCN2b6yEskYLHJbhjte2i1XEIep3IhSI EZHHMs6OfJ7NHqKrWjzlJjAVfS94/D5Dulff+IRRuYmfsz3Aq0K+KzRkD rs57EEjnqeP+4g7if8IVEZxhqH0qwSHU/zyIjY2M+Yt0wSXTPWA82pcIE ygAM7qQo1OkNLQhdXfEHnSLFxTvJVwUV3/2J9hHQrkgrsP26mbwoqegZV w==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="205476513" 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=wGLmzXY8ln9aDL3Bg8Ndtbb2YnNj4WFChx31WkfF5+w=; b=Bn5ywpfA3e1D0sGTuQcdaVMH1JNtwVTCrMFReb7MfZyzo70S8mKIWWAkn/Vgr/uvdQvjZvz1gGkp69lfW9NWpO4UAvGafbq67/tPRMh9w+TziRgcSpcYpKVofYtoqlO022hLhlI7mkMuetnOL5mKrsD8a+CMNa/hsQCm+Kb1WPM= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 4/6] target/riscv: Add a base 32 and 64 bit CPU Thread-Index: AQHU9yAix5tSgPliOECOn528JVIbEQ== Date: Sat, 20 Apr 2019 02:24:09 +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: BYAPR01CA0067.prod.exchangelabs.com (2603:10b6:a03:94::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: 758795e9-25ab-40e9-61eb-08d6c5374554 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: ufdSwiKEDE2P9YZnbiHtynUV1cI88YscvrfqMToXfp924J+HmA4fQ8rcu5wEUtZfG5m8ME5wDMj/kYzmMgWYgTl70BuiZ285/hXgp8gKn7fvnklgyGD9TzbPUdiRO17Q55SVmh96G7GAoXKRM0snSvpDoHxHHU874e8NU4veP1U6GSLRDPEG7PkG2+sAswo97qN/dnNmnSmAdTIloEY1U1iV5wP9yNh/jxJT7HTrAq6ygnQHHQPrckfRE9KVWN5D7mauLchX7nak7BWHeJujd4dGRapXNhMV2ezsBGkaxuP/mXWuhoGl8bH3U2WtVzAsW98/+mRxmaWrofiDorOMK3hpUotrnGYmZt27jXsiP7+hUZktdyhRDLbYPmRLHRY/GDmZjaLMP7pb9xoazN/X4hbPbD+AtRb3Hv6T9rBPIcI= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 758795e9-25ab-40e9-61eb-08d6c5374554 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:24:09.9316 (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: BYAPR04MB3943 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 v1 4/6] target/riscv: Add a base 32 and 64 bit 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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) At the same time deprecate the ISA string CPUs. It is dobtful anyone specifies the CPUs, but we are keeping them for the Spike machine (which is about to be depreated) so we may as well just mark them as deprecated. Signed-off-by: Alistair Francis --- include/hw/riscv/virt.h | 4 ++-- qemu-deprecated.texi | 9 +++++++++ target/riscv/cpu.c | 14 ++++++++++++++ target/riscv/cpu.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 568764b570..d01a1a85c4 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -74,9 +74,9 @@ enum { FDT_PLIC_ADDR_CELLS + FDT_PLIC_INT_CELLS) =20 #if defined(TARGET_RISCV32) -#define VIRT_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0 +#define VIRT_CPU TYPE_RISCV_CPU_BASE32 #elif defined(TARGET_RISCV64) -#define VIRT_CPU TYPE_RISCV_CPU_RV64GCSU_V1_10_0 +#define VIRT_CPU TYPE_RISCV_CPU_BASE64 #endif =20 #endif diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 842e71b11d..92ce909e50 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -128,6 +128,15 @@ The ``acl_show'', ``acl_reset'', ``acl_policy'', ``acl= _add'', and ``acl_remove'' commands are deprecated with no replacement. Authorization for VNC should be performed using the pluggable QAuthZ objects. =20 +@section System emulator CPUS + +@subsection RISC-V ISA CPUs (since 4.1) + +The RISC-V cpus with the ISA version in the CPU name have been depcreated.= The +four CPUs are: ``rv32gcsu-v1.9.1``, ``rv32gcsu-v1.10.0``, ``rv64gcsu-v1.9.= 1`` and +``rv64gcsu-v1.10.0``. Instead the version can be specified via the CPU ``p= riv_spec`` +option when using the ``rv32`` or ``rv64`` CPUs. + @section System emulator devices =20 @subsection bluetooth (since 3.1) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8f14fb8a1f..a3431d66a3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -114,6 +114,12 @@ static void riscv_any_cpu_init(Object *obj) =20 #if defined(TARGET_RISCV32) =20 +static void riscv_base32_cpu_init(Object *obj) +{ + CPURISCVState *env =3D &RISCV_CPU(obj)->env; + set_misa(env, RV32 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); +} + static void rv32gcsu_priv1_09_1_cpu_init(Object *obj) { CPURISCVState *env =3D &RISCV_CPU(obj)->env; @@ -145,6 +151,12 @@ static void rv32imacu_nommu_cpu_init(Object *obj) =20 #elif defined(TARGET_RISCV64) =20 +static void riscv_base64_cpu_init(Object *obj) +{ + CPURISCVState *env =3D &RISCV_CPU(obj)->env; + set_misa(env, RV64 | RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); +} + static void rv64gcsu_priv1_09_1_cpu_init(Object *obj) { CPURISCVState *env =3D &RISCV_CPU(obj)->env; @@ -490,12 +502,14 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init), #if defined(TARGET_RISCV32) + DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base32_cpu_init), 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_BASE64, riscv_base64_cpu_init), 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), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 6321983584..a2c1a9af0a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -48,6 +48,8 @@ #define CPU_RESOLVING_TYPE TYPE_RISCV_CPU =20 #define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any") +#define TYPE_RISCV_CPU_BASE32 RISCV_CPU_TYPE_NAME("rv32") +#define TYPE_RISCV_CPU_BASE64 RISCV_CPU_TYPE_NAME("rv64") #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") --=20 2.21.0 From nobody Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727901; cv=none; d=zoho.com; s=zohoarc; b=eeVSMUPGi6t1nlGZ8AhkCdP8VD4bvs83MSOnArZjRWlEptKDfTIYa1SmleHmZC8T7cD5Z+0tYodFduZ3sgPl/Q5oeulUNzJupaPfFdhP8bUbmOzFxf09lKn+KFgP+z07ePz1FiXFHVw/0MF1t4XYvIDuohLdAzLrRRGs+LIw0eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727901; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jsHhhF06ccnOxaXimd0kePpFsqTeg4jvhXdO1Ic3wBA=; b=JQO/xlVJB1QP7o9IBMZ8g/XzqCixjez6G3X3BCA0zj94AilPDJuu8qjvd39OG42RR6ri+WcyhaY8f/1haSKi4kbIZv82gchKUAm76s177cVZtn7GGfL3AkYT7tIalM/jwjtHR630VRNAlvTViCncNcqw/MJT4Yuo0ZGYADVsbYM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155572790134695.84947423436415; Fri, 19 Apr 2019 19:38:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:35966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHftG-0006Ef-1a for importer@patchew.org; Fri, 19 Apr 2019 22:38:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfl5-0008Mh-Eo for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:29:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHfl4-0004sK-Hh for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:29:39 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHffw-0002Qo-RJ; Fri, 19 Apr 2019 22:24:21 -0400 Received: from mail-by2nam03lp2052.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.52]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:24:20 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:24:18 +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.1813.011; Sat, 20 Apr 2019 02:24:18 +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=1555727061; x=1587263061; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=jsHhhF06ccnOxaXimd0kePpFsqTeg4jvhXdO1Ic3wBA=; b=Aso8Pd91ppcuW0lqPIVDGc5mdmrYwWQmThTJfBup29r2Gjan6jerxNUs 1qKWpn+AEpZNaGAVkl2tcgwNja8pIUTAs62CGnOOG78vjazA74BUOeDEO ytKY3CPbpp1rjZXiJkKn2onvuKSATkkxOa3l5oXp6G3WYxoHR7175BVDK e39tS+NKw0Hp071H0nddV7n6wxANfGFRWUYGiedISjZ9w8a4/xWzCvaCF cfOg3sqr4I1raTpMUh5akV7r1CPfusOANkF0PN7WENrPGUMj6OgQnDhj7 /IsGPE75abmA1XhPJ2hjl8t2pQfWwzWxSZgFy2muTroee3znJ5WtXM5CB A==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="107617887" 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=jsHhhF06ccnOxaXimd0kePpFsqTeg4jvhXdO1Ic3wBA=; b=Ctvno8hBXitqnMZiaRj+2QijNUoT2ffp0YrqW35IGIu7HdWQtyF7JJ0qMnKqkyFOIorHyTVVz4w0QPf8vAVDP7S5KDbL5AYfRVNFzH+WVDK2IUxofEhCBb0pHIIADj7z3v9yAe9k/HpuzuPOVgSYOZZ3tAXEi/u25CBQBWKmIZc= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 5/6] target/riscv: Deprecate the generic no MMU CPUs Thread-Index: AQHU9yAnlKI1qdQGC0el4C8lJCcPPA== Date: Sat, 20 Apr 2019 02:24:18 +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: BYAPR05CA0045.namprd05.prod.outlook.com (2603:10b6:a03:74::22) 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: 10eb3264-cd20-4a51-e417-08d6c5374a49 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(4744005)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: pkLmHQOjnlhtsQl8qvxlPeDTWtuY8kGnYOAn0QnL/TQSP2V+HfESlYUufO9T3ic4R9/q4qv6rviE1rLTHgBe0xGMjhiZ+bYHVRLafijVPwOtE2fzXx7IW20zjlwOwYuKr4lvzFIArkWDGucbqaoHK03myTNBqltAtKS6F66UwlzBMWBXg76vHPLE86xcr8FX8y/+Qed6XXqStzss+lJkmmXXmrvxtMQlph/cYheLCIee1PrtIU4339BMMCyipKFgfmB+ZLtuPh4CPp7iHJlfvUDWsIZoXyzcBt9n/dRnwzQ+xNqfQyyVJsP5eFhHPg0Bob+uczEXIC0h9v1c3aq1D6xeYjx3C9AgHgYEIzfO9BFZW1GXiQwMHsl0DH0KxSxTzFsgL2C1iYj/fJjlEH/KSTIY2vhUWz0fdxB5pnvC69Q= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10eb3264-cd20-4a51-e417-08d6c5374a49 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:24:18.2815 (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: BYAPR04MB3943 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 v1 5/6] target/riscv: Deprecate 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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) These can now be specified via the command line so we no longer need these. Signed-off-by: Alistair Francis --- qemu-deprecated.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 92ce909e50..d01fdf9907 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -137,6 +137,12 @@ four CPUs are: ``rv32gcsu-v1.9.1``, ``rv32gcsu-v1.10.0= ``, ``rv64gcsu-v1.9.1`` an ``rv64gcsu-v1.10.0``. Instead the version can be specified via the CPU ``p= riv_spec`` option when using the ``rv32`` or ``rv64`` CPUs. =20 +@subsection RISC-V ISA CPUs (since 4.1) + +The RISC-V no MMU cpus have been depcreated. The two CPUs: ``rv32imacu-nom= mu`` and +``rv64imacu-nommu`` should no longer be used. Instead the MMU status can b= e specified +via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` CPUs. + @section System emulator devices =20 @subsection bluetooth (since 3.1) --=20 2.21.0 From nobody Sun May 19 01:15:20 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 ARC-Seal: i=1; a=rsa-sha256; t=1555727774; cv=none; d=zoho.com; s=zohoarc; b=FbQ/vpfgb5ERw3oeKd1JeYyHj4jLFN5xRuR8yW4QmNHX6urn3MMDQUaTh5OqvPXB/cKB/k8vXRHT2i2BjeQ07ehn8v9z4LGzYpgnOgwaAGoyAF1aMiJtdYJbubqQh8sPUkdEjy+7ihI2c800WMosZQoh1X8a4kp1i8yshc7gg2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555727774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NkJ/2kU1GSH85AcIFvu8qBgmrltCLrn+8JpmQd0zqAs=; b=nsH0NimxNj4MdJpIEvuerzpYTZq4kbcgTOHa0t7/I+Flsw+4hYR+MBmm8+ofiONJX+GRarqKa89UNceIYmMhTU5IW6n/cSFKBnURgtrrDMf7qUIoOC39+zOGmbZnAHG6jKqeVe02mvh+u/2rGrT5JwSeJmXASc1FpqNI8LneAYk= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155572777400788.09784423513997; Fri, 19 Apr 2019 19:36:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:35954 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfrQ-000540-LD for importer@patchew.org; Fri, 19 Apr 2019 22:36:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHfl7-0008Oq-L3 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:29:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHfl6-0004te-9U for qemu-devel@nongnu.org; Fri, 19 Apr 2019 22:29:41 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:29387) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHfg6-0002Wo-1a; Fri, 19 Apr 2019 22:24:30 -0400 Received: from mail-bn3nam04lp2057.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.57]) by ob1.hgst.iphmx.com with ESMTP; 20 Apr 2019 10:24:27 +0800 Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB3943.namprd04.prod.outlook.com (52.135.215.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.12; Sat, 20 Apr 2019 02:24:26 +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.1813.011; Sat, 20 Apr 2019 02:24:26 +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=1555727070; x=1587263070; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=NkJ/2kU1GSH85AcIFvu8qBgmrltCLrn+8JpmQd0zqAs=; b=cuJJwekMZQ6eY7fml9olGWzxIN8+mwy6dLI7M3Y/lNeovJq8wHJ80xhM ugkliLbtvbCK/Z4KG0Yfn5akaFkA+/ggu9jBcVLlagoEinaZm+uIt+vTX F0+8WjHgIrJb/bD2jrcToCM9drzB21FCq9dzQOEl2j/as85NOEXTrh1G5 QSxAZqOvUBl5ZuMt22onUAkT9kBLC2TzXNhT4OtjfHbAdqbk6XsxkNdob Ker4Wpi/VWzcckPuP4ohfCDOTK9Lh0A6FvnYsxChwZLjwQY+aLnUgAskM NqFkMFfIxqfTSx9lUsadR6VzKef+wkVfTcvPOFqH0VC+HyIb41+n5zW0u Q==; X-IronPort-AV: E=Sophos;i="5.60,372,1549900800"; d="scan'208";a="108128384" 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=NkJ/2kU1GSH85AcIFvu8qBgmrltCLrn+8JpmQd0zqAs=; b=C54crRfPW8bJbcJ6xaLAkFet0CjqfFeStOzrQ0TTOxsMQGyU0KVvnf7XzlfqqI3WLxe0XuNgZwEZLF0uTOYZc90tY0/qg0iHjXi96kFwEeRlc/BjZhuYhyQ8moBLoFSHD0AFKqut1mwLxdQ0ZOoezy8BgFc+rCnHgS8BqsWtjnU= From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH v1 6/6] riscv: spike: Add a generic spike machine Thread-Index: AQHU9yAsjMR8QI0juEyy0+sYxzbfvw== Date: Sat, 20 Apr 2019 02:24:26 +0000 Message-ID: <2a8fb0e0822a5daace4ac443cbb1996422d17864.1555726824.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: BYAPR03CA0008.namprd03.prod.outlook.com (2603:10b6:a02:a8::21) 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.172] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 429dab33-9e5f-45ea-57f1-08d6c5374f28 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB3943; x-ms-traffictypediagnostic: BYAPR04MB3943: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0013079544 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(136003)(39860400002)(346002)(199004)(189003)(14454004)(446003)(2501003)(6486002)(53936002)(6436002)(50226002)(97736004)(5660300002)(4326008)(305945005)(71200400001)(86362001)(81166006)(8936002)(7736002)(8676002)(71190400001)(73956011)(68736007)(6512007)(25786009)(66946007)(81156014)(66446008)(64756008)(66476007)(66556008)(2906002)(256004)(14444005)(6116002)(3846002)(36756003)(478600001)(72206003)(99286004)(44832011)(52116002)(66066001)(76176011)(110136005)(386003)(6506007)(102836004)(26005)(186003)(316002)(118296001)(54906003)(2616005)(486006)(476003)(11346002)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB3943; 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: Mnoqi9uj+T9SxtNbj497lrCZ8eLPnqaNI6yKPh8/6b71LlGJGS5nJnlst7+fuH62ts7xZEasT8XJRx7w4oW3TMALjXLl/vc3Pauv9pU6UxsHXehSgNX2iZ1RsRLm/7ryCTsvgr3fenw/2nyooue08gP6imoLsZyI/jzITRb9xUz7TWxn588dGUA5ovlECL6LlwGXseKX1xoPjeFWxq5I1OReo/cpbau66G7G0S8KauEPYyCx61ABK5QbAkphoyf0S3lex6sWWshOfM/L/goR40GKlPmBy/i+n0zOTrPeNf3K53iWWCv6B76aixAqwRbKAJq6Xl1uMT43mGU2kjGYUjcZYLDEpDXBhGyEdtUpnfuQzzukFYjni7Gf9sJcvu1c1ulMv0pk5y684PUHHAANblrsOgM0w6iAj4AjP+JZGD4= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 429dab33-9e5f-45ea-57f1-08d6c5374f28 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Apr 2019 02:24:26.3922 (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: BYAPR04MB3943 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PATCH v1 6/6] riscv: spike: 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 , "imammedo@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) 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 Acked-by: Igor Mammedov --- hw/riscv/spike.c | 106 ++++++++++++++++++++++++++++++++++++++++++- qemu-deprecated.texi | 6 +++ 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 2a000a5800..5b33d4be3b 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 deprecated. " + "Please use the generic 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 deprecated. " + "Please use the generic 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) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index d01fdf9907..79454b2d7e 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -165,6 +165,12 @@ This machine type uses an unmaintained firmware, broke= n in lots of ways, and unable to start post-2004 operating systems. 40p machine type should be used instead. =20 +@subsection spike_v1.9.1 and spike_v1.10 (since 4.1) + +The version specific Spike machines have been deprecated in favour of the +generic ``spike`` machine. If you need to specify an older version of the = RISC-V +spec you can use the ``-cpu rv64gcsu,priv_spec=3Dv1.9.1`` command line arg= ument. + @section Device options =20 @subsection Block device options --=20 2.21.0