From patchwork Wed Apr 10 23:10:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1083684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="U5UOfX4e"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="iCusMDvE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fgDf745lz9s47 for ; Thu, 11 Apr 2019 09:22:42 +1000 (AEST) Received: from localhost ([127.0.0.1]:39052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMYD-0001R3-07 for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2019 19:22:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMV9-0007i8-Ev for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:19:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMNu-0001kh-4X for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:12:03 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:20579) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMNr-000102-0f; Wed, 10 Apr 2019 19:12:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1554937919; x=1586473919; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=VhlFS4wWGVfvKnjFYtcxDbBd75J46iCic0zcDF/h6UM=; b=U5UOfX4e/GNc/j7MUT3OtAgPmtT808rQHhbPaqDLs0lxHJMDa9MKGdM7 HR4wWi6ZNmMpTc+72Jo3D142DXW+dSXgIZ+JS9UyoBgskE6FHE4deOdKG oAmDYVelIgDLDb7sNaUkIMQfyjm1vzSCqJMoSmyCr5wWbmst6K4c9InMa ijbh2iVHmndZ3lIxsL53P+0hI36iI7sjHcnHMgZqmdeyBI9YR+IFBHT31 QdBoOLXE5laZkuUvdtV9/IdVDFZ7u5GNS4U/bHKveL56SO4M8F3ISrPJi dR+PZGdT2p1trzXOdSga/s2ZN+LiW0DibQnQ7ouE+3NRZavCA0RfXnYM6 A==; X-IronPort-AV: E=Sophos;i="5.60,335,1549900800"; d="scan'208";a="106823580" Received: from mail-sn1nam04lp2058.outbound.protection.outlook.com (HELO NAM04-SN1-obe.outbound.protection.outlook.com) ([104.47.44.58]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2019 07:10:18 +0800 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=iCusMDvE0PYdLh1ucYsAL6p42vk3nkvhsk5aBUhUGeeepC5mwcE2ZRJg9IsVnxNAc1X/wBVrnlS4YppyipNALWwwuZlP0RUuBOL1rty3P0aNS6pMvSyBwpYVGkkg78fR3hbNy00eTiVoUbOIi7MrlUdETg57d9eXoNNbVQHeFVU= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5334.namprd04.prod.outlook.com (20.178.50.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.21; Wed, 10 Apr 2019 23:10:16 +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.1771.021; Wed, 10 Apr 2019 23:10:16 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v3 1/6] linux-user/riscv: Add the CPU type as a comment Thread-Index: AQHU7/KP3Y4mDg+ShUiCDIO6MaZqaA== Date: Wed, 10 Apr 2019 23:10:16 +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: BYAPR01CA0013.prod.exchangelabs.com (2603:10b6:a02:80::26) 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: 198307a9-7c4f-4117-bcf4-08d6be09b163 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB5334; x-ms-traffictypediagnostic: BYAPR04MB5334: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 00032065B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(136003)(376002)(189003)(199004)(99286004)(11346002)(8936002)(14454004)(2616005)(4744005)(6486002)(305945005)(6436002)(478600001)(97736004)(446003)(71190400001)(118296001)(2501003)(66066001)(476003)(4326008)(256004)(44832011)(71200400001)(486006)(86362001)(102836004)(186003)(36756003)(81156014)(72206003)(3846002)(8676002)(25786009)(386003)(6506007)(5660300002)(53936002)(7736002)(50226002)(106356001)(105586002)(2906002)(68736007)(6116002)(54906003)(26005)(316002)(6512007)(81166006)(110136005)(52116002)(76176011); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5334; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: YzDCSSM2FyYTyPeF7t4P1uh0VE73I87DnlKno4imYGtr2JcpRmI2CjS7FhfjtV/yhDDcwYVNPm2XzOXZHqp0YgUeNn/kWbdxupQcgvEQY51j7Qoy9J8SfwlsYBXkmaMqgh3DRljEVJ1fCUbU3R/5RpMim3uVyfjLfAtjdE5qFDap8+OyVuRKZUSC0mYa1PovnJZzCmmeUP5TC0LNjudZg0I3WMsXWIGYZXFCX5CpeGXdzNFs5tKMk/mHpA8yYngUIpAsP2f2DO4FmE5TN/FmAQWiXhbxFpceSmUs4oMN/P6RfD7rrF9C7SxeVrHoEdMbx9ZI66yh2g8ZFKvyNoroY0AnSwje0TsnVSpdPYjm2I5isClxpJRrA2GxxsfF5idetnRTyzG3pgsPPuZz7BfuP7FDuOSrxjAxSUOC5WOPRAI= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 198307a9-7c4f-4117-bcf4-08d6be09b163 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2019 23:10:16.3162 (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: BYAPR04MB5334 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH for 4.1 v3 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 , "ijc@hellion.org.uk" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 From patchwork Wed Apr 10 23:10:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1083685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="phgnm8pH"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Pe0MZN1I"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fgDj0PZ8z9s47 for ; Thu, 11 Apr 2019 09:22:45 +1000 (AEST) Received: from localhost ([127.0.0.1]:39054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMYF-0001T2-1T for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2019 19:22:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMVA-0007jM-1X for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:19:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMNq-0001iJ-Tp for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:12:01 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:29481) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMNg-0000yF-Cl; Wed, 10 Apr 2019 19:11:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1554937908; x=1586473908; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+5E3HuMPpgPWZVNHr7cnMoYJBKKTpSGQ9wDj3jayeAA=; b=phgnm8pH1fmVuSKcdRlVk1GYxGKflZcuyoz8XRQNVhh43PmvkrLwsrQ/ dw9tN1a3ePtUKqyV2yZgmCIudoHTowudMJ5gSYknYyaVswL+oKaGcvEd4 5kfXmPQzr4xm58lfPjMHPjJBpQDtrQFmmSn3OO8DbGbDPy68rhSy6HHJA vuTq+jeRu6k3WNMXoSudywkTWmGGD1iEXjrMbAHP4/c4LaF9vypYb3mUL 1sWHQgj1NPSWbjr/ijAF/wpRgbhWsSE3hKGifTd9lCfuuQmrbFTDV/E+X IvbYoT+ipqnl3VIJ5JcHkYlGCsbJWEX1eS6HJdmMYH/Wbual9T0h55lke Q==; X-IronPort-AV: E=Sophos;i="5.60,335,1549900800"; d="scan'208";a="107205876" Received: from mail-sn1nam02lp2052.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.52]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2019 07:10:27 +0800 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=+5E3HuMPpgPWZVNHr7cnMoYJBKKTpSGQ9wDj3jayeAA=; b=Pe0MZN1IL39k7KBLQO2+YGolx+tk5alt4s6SsZlZNpg4hu1opAKrrjDJDwB+BUCObycLZfeS4eE37ZEHKL0Z2xrKnmIF2F1wAiO1uL27m00uGftbOu7CRoEKujZkGlrK9MyXDlPt0naRM1gTQPkE65oRUCYDq44p0md5MFy6Mi0= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5334.namprd04.prod.outlook.com (20.178.50.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.21; Wed, 10 Apr 2019 23:10:25 +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.1771.021; Wed, 10 Apr 2019 23:10:25 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v3 2/6] target/riscv: Fall back to generating a RISC-V CPU Thread-Index: AQHU7/KUeywJFduBUU2FCQ0yom2eQA== Date: Wed, 10 Apr 2019 23:10:25 +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: BY5PR13CA0023.namprd13.prod.outlook.com (2603:10b6:a03:180::36) 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: de7438ed-fb20-43a8-0696-08d6be09b6b6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB5334; x-ms-traffictypediagnostic: BYAPR04MB5334: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 00032065B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(136003)(376002)(189003)(199004)(99286004)(11346002)(8936002)(14454004)(2616005)(6486002)(305945005)(6436002)(478600001)(97736004)(14444005)(446003)(71190400001)(118296001)(2501003)(66066001)(476003)(4326008)(256004)(44832011)(71200400001)(486006)(86362001)(102836004)(186003)(36756003)(81156014)(72206003)(3846002)(8676002)(25786009)(386003)(6506007)(5660300002)(53936002)(7736002)(50226002)(106356001)(105586002)(2906002)(68736007)(6116002)(54906003)(26005)(316002)(6512007)(81166006)(110136005)(52116002)(76176011); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5334; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: s5Agq2vgv8Xt0/VsHQgMIP1iaN22Gl2OgDPeoOLsDpW4VG7X4WF4SfOHoajlvbcgWn8nGFU1Y8rhD0fWKNOqFT8TWaYMhYVYWT2J3lXJbWnLBeee95UUv1b6Bl/5CFvfvbppRpym1Ei+s4TXKXCOXNqnNeJDlJ6ENGW1SZR1XU+YasHHkkeFftWt1qSqg77Dvtlv2TQ/WdP0LLeAv6WxAjfhFQQvHtT4Wndhb2T5tHhNZSsW3TB1qt95nkU34O7ZZCaSZPnytZf/JqcF3NFmhxquXLcIXdkSIOVb4oGWQENE3uUs6wR85r+XABM/cU+GBGjtdX0cgicwH01tDWqQFWVSyOsPXRMZgKoFJmX+kQuCVU8cMzIX8Hm/jIDMTgCBnJh0IUJnoKFV9ZzYLDgIOKv3ziLPnpU7QTyHqDFsKq4= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: de7438ed-fb20-43a8-0696-08d6be09b6b6 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2019 23:10:25.1631 (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: BYAPR04MB5334 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 for 4.1 v3 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 , "ijc@hellion.org.uk" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- v3: - Ensure a minimal length so we don't run off the end of the string. - Don't parse the rv32/rv64 in the loop target/riscv/cpu.c | 101 ++++++++++++++++++++++++++++++++++++++++++++- target/riscv/cpu.h | 2 + 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d61bce6d55..27be9e412a 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -19,6 +19,7 @@ #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,99 @@ static void set_resetvec(CPURISCVState *env, int resetvec) #endif } +static void riscv_generate_cpu_init(Object *obj) +{ + RISCVCPU *cpu = RISCV_CPU(obj); + CPURISCVState *env = &cpu->env; + RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(cpu); + const char *riscv_cpu = mcc->isa_str; + target_ulong target_misa = 0; + target_ulong rvxlen = 0; + int i; + bool valid = false; + + /* + * We need at least 5 charecters for the string to be valid. Check that + * now so we can be lazier later. + */ + if (strlen(riscv_cpu) < 5) { + error_report("'%s' does not appear to be a valid RISC-V ISA string", + riscv_cpu); + exit(1); + } + + if (riscv_cpu[0] == 'r' && riscv_cpu[1] == 'v') { + /* Starts with "rv" */ + if (riscv_cpu[2] == '3' && riscv_cpu[3] == '2') { + valid = true; + rvxlen = RV32; + } + if (riscv_cpu[2] == '6' && riscv_cpu[3] == '4') { + valid = true; + rvxlen = RV64; + } + } + + if (!valid) { + error_report("'%s' does not appear to be a valid RISC-V CPU", + riscv_cpu); + exit(1); + } + + for (i = 4; i < strlen(riscv_cpu); i++) { + switch (riscv_cpu[i]) { + case 'i': + if (target_misa & RVE) { + error_report("I and E extensions are incompatible"); + exit(1); + } + target_misa |= RVI; + continue; + case 'e': + if (target_misa & RVI) { + error_report("I and E extensions are incompatible"); + exit(1); + } + target_misa |= RVE; + continue; + case 'g': + target_misa |= RVI | RVM | RVA | RVF | RVD; + continue; + case 'm': + target_misa |= RVM; + continue; + case 'a': + target_misa |= RVA; + continue; + case 'f': + target_misa |= RVF; + continue; + case 'd': + target_misa |= RVD; + continue; + case 'c': + target_misa |= RVC; + continue; + case 's': + target_misa |= RVS; + continue; + case 'u': + target_misa |= RVU; + continue; + default: + warn_report("QEMU does not support the %c extension", + riscv_cpu[i]); + continue; + } + } + + 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 = &RISCV_CPU(obj)->env; @@ -178,6 +272,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; @@ -188,7 +283,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 = object_class_by_name(TYPE_RISCV_CPU_GEN); + mcc = RISCV_CPU_CLASS(oc); + mcc->isa_str = g_strdup(cpu_model); } return oc; } @@ -440,6 +538,7 @@ static const TypeInfo riscv_cpu_type_infos[] = { .class_init = 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_init), DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_10_0, rv32gcsu_priv1_10_0_cpu_init), 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 #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.10.0") #define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nommu") @@ -211,6 +212,7 @@ typedef struct RISCVCPUClass { /*< public >*/ DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); + const char *isa_str; } RISCVCPUClass; /** From patchwork Wed Apr 10 23:10:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1083680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="iAA88j1l"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="FvTeeykG"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fg9w3pQ1z9s47 for ; Thu, 11 Apr 2019 09:20:15 +1000 (AEST) Received: from localhost ([127.0.0.1]:38987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMVo-0007nQ-Mv for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2019 19:20:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMV3-0007i8-Bv for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:19:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMOA-0001zX-Ig for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:12:26 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:20591) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMO5-00012F-NC; Wed, 10 Apr 2019 19:12:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1554937934; x=1586473934; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=8US91+wrcXdFSsSG/aFlw54dANhJAyMsmteQebGTF+4=; b=iAA88j1l+zRxAaJgFFP8P0seutwys6Dts2h0/6qVthLM13Yvf98OGF/z b/OmBW9wKdQO5xnoR9LcocVa+Ai8D2Cq/yHGe8kdxozqwyTvtp2Tl8lCl 2QtvLuhna4RIlEDMsKBsoQbmjVlaqlQ1TCxZcSacYBE50dPoESsPE+7+E ynpEscolhavRqv2YH+mKw98gQig73z1JDEoubM3nYw2OMle7nytIXUltP 0NbpmdQgk+gV39OTmM5TjuHRrGaCPQD3DKCyefKPRL07fzbIgZLWgBEGi 943+CUKvFwSzBBwTZcfmvrgvRc1GJVeqYHptA0x2jq24YT4dyuRWmcT/h w==; X-IronPort-AV: E=Sophos;i="5.60,335,1549900800"; d="scan'208";a="106823596" Received: from mail-bn3nam04lp2058.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.58]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2019 07:10:36 +0800 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=8US91+wrcXdFSsSG/aFlw54dANhJAyMsmteQebGTF+4=; b=FvTeeykG1Xx7zWEZTP7grgj9w6ONyanE8ccQMczPRRq83ScutCIdKttJMfHnYfxvPYO6R86dk3gB+SWM0y6EhGjq/HIgjfQKYYGP4JKIa9sn/r5DVSSfLbEox5gWbH6qkiudBHdUOoBuiRLBx8vq58g+nR9fVFpJkzTq5u10mIs= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5334.namprd04.prod.outlook.com (20.178.50.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.21; Wed, 10 Apr 2019 23:10:34 +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.1771.021; Wed, 10 Apr 2019 23:10:34 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v3 3/6] target/riscv: Create settable CPU properties Thread-Index: AQHU7/KZVDqEvlpNvEG7d4RwzPYOrA== Date: Wed, 10 Apr 2019 23:10:34 +0000 Message-ID: <101609f0bfeb395344729ef4189103c1831e069b.1554937288.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: BYAPR04CA0017.namprd04.prod.outlook.com (2603:10b6:a03:40::30) 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: 16529355-dd07-4011-88f6-08d6be09bc09 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB5334; x-ms-traffictypediagnostic: BYAPR04MB5334: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 00032065B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(136003)(376002)(189003)(199004)(99286004)(11346002)(8936002)(14454004)(2616005)(6486002)(305945005)(6436002)(478600001)(97736004)(446003)(71190400001)(118296001)(2501003)(66066001)(476003)(4326008)(256004)(44832011)(71200400001)(486006)(86362001)(102836004)(186003)(36756003)(81156014)(72206003)(3846002)(8676002)(25786009)(386003)(6506007)(5660300002)(53936002)(7736002)(50226002)(106356001)(105586002)(2906002)(68736007)(6116002)(54906003)(26005)(316002)(6512007)(81166006)(110136005)(52116002)(76176011); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5334; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qo1ZaRDgOHTER0kDlIPo9whlr8Ds18Wgna5I4JsGfrF0fRYvW7u9KJLJSUPah+uattuYawX2vkHCZlGH++mlOx5nlgEBSm8aDvKfzAbvBA6YYcsw0gWm7rr2an7FUvlOiTf90n3gbvuypEMQLUaUXbFFlWW9k3KPn60WCtJK6nfnVeIZRkW2xty9NY1C9c9p2J+i036Hh6LqsC7Cgi3lY1HaDgZFrT2c+2kxnOStyr0GF18O2KCYVKyCrqjEjjvLCYrih/nGPYZ5DaBqmJ4/WuqyGKg9cdd8fZGPnMbpYc84u+Yy53Y2ELVLKxGvQK3GxJrH7yd5nWif0zsQRBEK3F419elqfeIs1OcMZLdFMVDkvyvMQZYb43/VeQfYOvzTcAnVCYCIv4uqAJ8uVdumQVTlzfES5ywyvbebx+UWYPw= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16529355-dd07-4011-88f6-08d6be09bc09 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2019 23:10:34.1360 (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: BYAPR04MB5334 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH for 4.1 v3 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 , "ijc@hellion.org.uk" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 27be9e412a..c792bacd24 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" /* RISC-V CPU definitions */ @@ -191,12 +192,9 @@ static void riscv_generate_cpu_init(Object *obj) } 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 = &RISCV_CPU(obj)->env; @@ -394,7 +392,11 @@ static void riscv_cpu_disas_set_info(CPUState *s, disassemble_info *info) static void riscv_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); + RISCVCPU *cpu = RISCV_CPU(dev); + CPURISCVState *env = &cpu->env; RISCVCPUClass *mcc = RISCV_CPU_GET_CLASS(dev); + int priv_version = PRIV_VERSION_1_10_0; + int user_version = USER_VERSION_2_02_0; Error *local_err = NULL; cpu_exec_realizefn(cs, &local_err); @@ -403,6 +405,39 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) return; } + if (cpu->cfg.priv_spec) { + if (!g_strcmp0(cpu->cfg.priv_spec, "v1.10.0")) { + priv_version = PRIV_VERSION_1_10_0; + } else if (!g_strcmp0(cpu->cfg.priv_spec, "v1.9.1")) { + priv_version = 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 = 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); qemu_init_vcpu(cs); @@ -424,6 +459,14 @@ static const VMStateDescription vmstate_riscv_cpu = { .unmigratable = 1, }; +static Property riscv_cpu_properties[] = { + 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 = RISCV_CPU_CLASS(c); @@ -464,6 +507,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) #endif /* For now, mark unmigratable: */ cc->vmsd = &vmstate_riscv_cpu; + dc->props = riscv_cpu_properties; } 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; static inline RISCVCPU *riscv_env_get_cpu(CPURISCVState *env) From patchwork Wed Apr 10 23:10:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1083683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="X3wbXE7n"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Ye12pCOU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fgDX3Sjxz9s47 for ; Thu, 11 Apr 2019 09:22:36 +1000 (AEST) Received: from localhost ([127.0.0.1]:39044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMY6-0001ML-EI for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2019 19:22:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMVA-0007i8-DC for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:19:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMNq-0001iE-Th for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:12:01 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:51657) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMNg-00015Q-Bt; Wed, 10 Apr 2019 19:11:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1554937909; x=1586473909; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=tbqoCDILpxcBCCuIoVd8GeoVvBiRJEO+FeM67kvU/KQ=; b=X3wbXE7nLqWJXUuBW1yLZgklLsEBAILzN6yTEliC2dJY+qhveol+6JL/ TNUUgb1PGx0uOiummj/5SXfKuaSUkpZnqiLggY68gtovasmWOxYkQlPli B/179y+Qr9bIkEFbnFnSJOFpfVA2nQpTrkdFBiBsYJE6AnA9NkuCaXqwy 4ndau++9RR8ZGez9ej4Alk+CrXnpvnJQeZF/zxHEs8ls5Bs8V40jHFYI1 /UwhsG6nbsD23/VC/ZFRM9znlGjM3WwrsX4sFeiU3eoGLPRlIwkLgncFF DR7d6ZfPeykV2UmwvWFV6P2X3yG66F8EzbIuLFIvbGp7ylJnq5opC8VLW A==; X-IronPort-AV: E=Sophos;i="5.60,335,1549900800"; d="scan'208";a="105472601" Received: from mail-sn1nam02lp2056.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.56]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2019 07:10:45 +0800 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=tbqoCDILpxcBCCuIoVd8GeoVvBiRJEO+FeM67kvU/KQ=; b=Ye12pCOUv0L9sqpXWbAHCk+PxsXfecnPf5HJ6HbE3Ns6g4pwxXHWpAUEQSFn9cZLoxV/8m5/8JThlTINHLbTCjtFbzaFQYQZrhvF4mK4SDSCe7zoxCgVd4RT7iUcOxjapRxfGn0fqCRE+D/34cBJA4xi+qQpjW2zvIxW7CCl1P4= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5334.namprd04.prod.outlook.com (20.178.50.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.21; Wed, 10 Apr 2019 23:10:43 +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.1771.021; Wed, 10 Apr 2019 23:10:43 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v3 4/6] riscv: virt: Allow specifying a CPU via commandline Thread-Index: AQHU7/Kf57Dc9HHL00uEkHQd6kr7/A== Date: Wed, 10 Apr 2019 23:10:42 +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: BYAPR01CA0005.prod.exchangelabs.com (2603:10b6:a02:80::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: 6f37cfa8-0176-44ee-1f9b-08d6be09c153 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB5334; x-ms-traffictypediagnostic: BYAPR04MB5334: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 00032065B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(136003)(376002)(189003)(199004)(99286004)(11346002)(8936002)(14454004)(2616005)(4744005)(6486002)(305945005)(6436002)(478600001)(97736004)(14444005)(446003)(71190400001)(118296001)(2501003)(66066001)(476003)(4326008)(256004)(44832011)(71200400001)(486006)(86362001)(102836004)(186003)(36756003)(81156014)(72206003)(3846002)(8676002)(25786009)(386003)(6506007)(5660300002)(53936002)(7736002)(50226002)(106356001)(105586002)(2906002)(68736007)(6116002)(54906003)(26005)(316002)(6512007)(81166006)(110136005)(52116002)(76176011); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5334; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: jmakVeVbvoiud9nXyl7vT1IR/NInsID0TQiGeRDSr6y7dshf32qSspdu5V9CBqdevDrJLGEb4G7759eqSUPiJ3NYrntg+s2CZgSvFig06/SG428mtV6PKiYq9kTj/9U2fuD59F7TTRkASBHklH569hnwedgd2EXVTBhazuDxM3ullVSxBhjlpEMwydJrNQ+oCezRX7qdmtQuIjghiFPRBpBW9QdOdd7PR0N21dWE1VC8cTP/A4sYVOWTyTvpaupHO5T4xtbFxoZRb3RfDdGUeqwPYKh4IE9L3rzud6Vhw3neu2egatkPVoasF0G5Mw0s9Z2+2KxIXrkjUFZB6eLx/EEatIZlficQbjFUROewtg2uPugkqXZakQs5WAI20WUO3rebRP8uwmGRrAEWi8OvPZPQ2fSnnJk+aFqFRGUJkS0= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f37cfa8-0176-44ee-1f9b-08d6be09c153 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2019 23:10:42.9869 (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: BYAPR04MB5334 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PATCH for 4.1 v3 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 , "ijc@hellion.org.uk" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 = "RISC-V VirtIO Board (Privileged ISA v1.10)"; mc->init = riscv_virt_board_init; mc->max_cpus = 8; /* hardcoded limit in BBL */ + mc->default_cpu_type = VIRT_CPU; } DEFINE_MACHINE("virt", riscv_virt_board_machine_init) From patchwork Wed Apr 10 23:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1083682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="Rz/TY/31"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="IJMYGihe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44fg9y5jGsz9s55 for ; Thu, 11 Apr 2019 09:20:22 +1000 (AEST) Received: from localhost ([127.0.0.1]:38997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMVw-0007uV-Nh for incoming@patchwork.ozlabs.org; Wed, 10 Apr 2019 19:20:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEMV8-0007jM-VP for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:19:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEMNz-0001nF-NE for qemu-devel@nongnu.org; Wed, 10 Apr 2019 19:12:09 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:20607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hEMNt-00019X-94; Wed, 10 Apr 2019 19:12:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1554937921; x=1586473921; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=DjKD7cpMge4SvSYHv8hgsIO640+8XOJ8VMVQrAciRLs=; b=Rz/TY/319IqGOOQe8tttZmsLHLEKi5yLYuMnyHknxtPTzVhKBDAWDFrz j63c6+v+C2/hkKNQg8X/KxnX/Zj/4trm0dz4SfHz/K54mUVgk9cWVHnpL N/sGnGy+i/PGswg40VkhuDjHJKXWx93ji8WI3NCLKXN/KeOvt+vPbvwvT aVyFKuB5hT17MV4X23BD6sTStFBhqprKEqqeFLwnxqYF46f6AkmT0ejGd HovrAusvB1W4/UuXSXvWSIJtc/EHFpBEUWJUfvMhyBpmSbO7gFZ3kNt+w mqC9/wXaFr8JM/C99o67JZqLDOSxPnHgMPjZIjeSHxohJx7Dt4UruTyHB A==; X-IronPort-AV: E=Sophos;i="5.60,335,1549900800"; d="scan'208";a="106823615" Received: from mail-bn3nam04lp2058.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.58]) by ob1.hgst.iphmx.com with ESMTP; 11 Apr 2019 07:10:54 +0800 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=DjKD7cpMge4SvSYHv8hgsIO640+8XOJ8VMVQrAciRLs=; b=IJMYGihe8ZDBndZrbjgVkIQqTicgFG6ij9RV09LkP6hGrCcgbXz0Yf+zDErhiB8zM5tNsfRkrsJDVtFvJTOudoT1dEPOmHOX8xVutBSCKHRLHmc+7tyaNT+PVUlSd+cyWuRpvC7PWWHm2NpJG08LLiQCAYzA/RHOwUUEhseLl3I= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5334.namprd04.prod.outlook.com (20.178.50.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1771.21; Wed, 10 Apr 2019 23:10:52 +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.1771.021; Wed, 10 Apr 2019 23:10:52 +0000 From: Alistair Francis To: "qemu-devel@nongnu.org" , "qemu-riscv@nongnu.org" Thread-Topic: [PATCH for 4.1 v3 5/6] target/riscv: Remove the generic no MMU CPUs Thread-Index: AQHU7/Kk0WHFPQ2/oUeDzGcSQbqUZQ== Date: Wed, 10 Apr 2019 23:10:52 +0000 Message-ID: <749f3773e5b9d199ecd25909043fde40747e992f.1554937288.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: BYAPR03CA0009.namprd03.prod.outlook.com (2603:10b6:a02:a8::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.172] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8e0164a4-5417-425d-682a-08d6be09c6bb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600139)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:BYAPR04MB5334; x-ms-traffictypediagnostic: BYAPR04MB5334: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 00032065B2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(396003)(39860400002)(136003)(376002)(189003)(199004)(99286004)(11346002)(8936002)(14454004)(2616005)(6486002)(305945005)(6436002)(478600001)(97736004)(446003)(71190400001)(118296001)(2501003)(66066001)(476003)(4326008)(256004)(44832011)(71200400001)(486006)(86362001)(102836004)(186003)(36756003)(81156014)(72206003)(3846002)(8676002)(25786009)(386003)(6506007)(5660300002)(53936002)(7736002)(50226002)(106356001)(105586002)(2906002)(68736007)(6116002)(54906003)(26005)(316002)(6512007)(81166006)(110136005)(52116002)(76176011)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5334; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: BIFB2SXT8Q2nsLCbw6D+MK8rVK6dXLpDspNJuvxNn5FrTXwDc6BCItDVuUtJUkk+sXSssH7mCGbNftK4hTo0VVGsaxOkdHZJq7O/LOE+bxcXHv6Jl6ky8efrSwyckr/dKOy3ShyOTWwbHkoalnE8sAWWQeRPPndZ+Bds5cZpdE8WGahAUP8yJjn+EX5Z22jYKpWqtkfhDHOa542ZVeiBgAU2TfXt2I3OgoYN60vsycu9RyYjaxCmnlqZKkfv2n5ji6XLiGrelLF6//CH8BadrTQorHNJFLrns4qdDX/t4yh/dy6f672lf55p+l8StNTtBM/KqovCJJ/ts+U3UAOg+QIyh/xllNoTTP0HtO+/X7upwZf5FM7C0oq8f27MfHC1Mrlts6LopBgSG0xKdyCXabYOrKW2REXGJePmUcUfXbc= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e0164a4-5417-425d-682a-08d6be09c6bb X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2019 23:10:52.0379 (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: BYAPR04MB5334 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH for 4.1 v3 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 , "ijc@hellion.org.uk" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 c792bacd24..9ba77a1983 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -586,13 +586,11 @@ static const TypeInfo riscv_cpu_type_infos[] = { #if defined(TARGET_RISCV32) DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_09_1, rv32gcsu_priv1_09_1_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_RV32GCSU_V1_10_0, rv32gcsu_priv1_10_0_cpu_init), - 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_init) #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_RV64GCSU_V1_09_1, rv64gcsu_priv1_09_1_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_RV64GCSU_V1_10_0, rv64gcsu_priv1_10_0_cpu_init), - 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_init) #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.10.0") -#define TYPE_RISCV_CPU_RV32IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv32imacu-nommu") #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.10.0") -#define TYPE_RISCV_CPU_RV64IMACU_NOMMU RISCV_CPU_TYPE_NAME("rv64imacu-nommu") #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")