From patchwork Wed Sep 5 22:09:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10589571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9774920 for ; Wed, 5 Sep 2018 22:11:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1B292AB09 for ; Wed, 5 Sep 2018 22:11:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFC3A2AB9B; Wed, 5 Sep 2018 22:11:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4828D2AB91 for ; Wed, 5 Sep 2018 22:11:23 +0000 (UTC) Received: from localhost ([::1]:58256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg1C-0001t1-Dv for patchwork-qemu-devel@patchwork.kernel.org; Wed, 05 Sep 2018 18:11:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxfzu-0000m5-9N for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxfzp-0003Hf-8q for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:01 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:45361) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxfzo-0003Ag-Om for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:09:57 -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=1536185398; x=1567721398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=bIcQxnoK+srKHWvKnlxjYNUt9Q3L7v/5Mtqdw8Ny5CY=; b=d/WotfZGT1scjMHkyzhEd324o0lK/hJft3nzJ5xDvaDPdPqRE5fmyOe8 d0NgMVB6HYTyi0bXQbVnnn77dEWQ9iUil8/7yWB6jXYwrJ0dSJdXPcjD4 eT0VUcMFeOzq3h+lGILwDs+RKa9+3p+6m8MHjP2u4hW/veV3yoZFSaLOe cCsf+4xeMOIoWhurj46q7YVM/JCVm1tlrFqZ4c48az3LtvwcjAWU8Os9Q A/GEGcCAT4ul32Xo0QFjgSHIwkI8i+IkhdHApQ9qln0vaOlhuPBFHbWEK LswDfx+0n94g7mrlm5cehZ+VO2CBq9BocZ0he13tKS57Tk+t2c9HUrdEq g==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="89140610" Received: from mail-by2nam01lp0184.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.184]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:09:53 +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=NRUvUlCNYxjx1qvxtWD8jRiPAj4SjQGq5UPSaDPgE7M=; b=K3z5iVMfUekXGkAn3C2zurl4jtcgEannh0mm/poJtMPFmY4R56r/X9WW57P30H+7LFTA/02VQRA1weUvzjwl5TxMKZe7kfOZEEMjV9BumlNqMBEcb4d/um33L1dqY8MU4ZUWrSF9JKXrnHlkKQefdIdx3JP1M9mw+ALIFgAvFuY= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:09:44 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:24 -0700 Message-Id: <20180905220932.6152-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b6266bf-5fa3-4dcf-57e2-08d6137c4cdb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:dRKuvbVP72E4BOeBMtMYBeM57C6hnOpvLN0khhKZ+J9jVqFstlDsCb/lZDGYM2delzW3+SG0B96OHPXdIzvjnYbKszy+PWFg2iO5bA1rsyQ1f41HjjaWmpceap/dAcqH8RpUSW2ShxpRzML7jnCjRnqkhxjk1hpGWSBEKTw8woQiedReazE2styYOgONemlsdtqH96AmCNudmGgpUZs+ba8EFESHdcta4f9b8DRk5kRw/d7cUnhx3yENYDGUA9DL; 25:s/toJ5rcZjH5SiMJtGUG+tCel1V7/8dQkuhjuKOZLlmqQ7PmkeP3V+WrmD+rZXplXHtDjV/XnqNqK45M/lWayUbLIPmx2Z3SotPih20YMaDm9lDQBpXBh/VxPQpLLD5/BhunpHQZ8CHMRKGM2cRP5mRKlelBj5U8um/tPuxUjoWeUbrsROkrtcN0K2/Gw6hwdB7jIx9FGKuCWJnAyFr7mZWFH5abmLJluRzChPhV8lQZVskELyVB4DKYhNc6RQma6vGJMWIhVwJTtUFNMpfiQGuHDOLFf1yDMARksHQ5dGPYi5SjQ+mj5gIeZg6PAIcCpPUC+SzrdLQlxybk1UB06g==; 31:Yr7KDvO72RhgCmjdKeF48YnX3tVS9NV8bjy4CCgLfzu4OfwOdH4ivhGqKrUvtLMId42d+f37ByFswq/NLLx707aKrCLfvBDAI0w4XeF8jJOD/J80Y16uD53ia5+HK29QsRf8NZcbTW0lgm6XvPFRmOuCvcKE4Ez2OW4qPiZZHfBBTXyATar5ddkSs4ODLnW93+kZRUML51nuw744UVn5vtbVeWAUMq/zo9zM+Zq8KbE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:5mZsd2r9kb8jS5nRncXnb86dk/bK0eflhu2Hk9ayyad4R01Rqqbt9hHAgs6pfCvZT2sTY1T5jBlkzIGup5gA5peGvCkIJYPCvvRud+Xv/17CG9zaxs31dpHmOOluMRvY6P7nfHxFshCq1FL1RI8szYFyG4loCNjKYocAYzwAjF/jRmFkMbUr3LY4Pd8gHhuq4cvkU5hTmoNPUBxDo5GEWvkpDGfbTBHLSu3thjLpGVC2Uwwwl1gVAWhvpV1PXB6nixTU2D6MPyIiGdNDFj4O5W/BOgqMxd0m7R1fQ2p01puWZbNFmym/BcQ2q5yoayvTgA/nKeTITHanbDn3dBx2k0MqLDtKrs8QsFXJOEttTJZhieDqK+lS/J4er05fsCquzZF+hR4q/V4eFQeK8uyRLx7u0o7ZK4XBZjXCPza5z4se+NVTmvvMusuY+NHpVUVwUmyM305LT4FlwBuc9iD/0J+NWEzNviroNE/DyVlZZ6OxmrFJxk8W1u5n07UQYqrs; 4:Sp1sHKbBfs0asWH59PTSQ5ZnEm6Bfi1N4RllxgQc5sQSSolrccxDjfYoylPNyXK70x+v6EdtXhI91cisDzy6nP6538khbajRHrRCOvHjrAKgu0vDj2ZjvJGGz2YlbTYxyFRP7ePJfm4p6dUxViiUy4dyDWDwnllgWVg7nM4hfxKb0inDphkoqMP2R/5YKnN2QGrKOSGZyvZ4NfEoVuVqvupJTzPyajaRDXU/KGaLMUA+erQkfPYOy+EC16EdcA9ZMQg9hrfp1EqIftJGPia7fg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:oNsiIaPTqV3TWdSQKxZ2DsXenaphErskT6y3Ix/5X?= 3lbwzVjpQAHre/0kcg7vTnBPQyLOn8FtFktDnMgcIU8zV9RwLU0rNu1yNA2MVvb19Go7+eRCwiiOGeXqwbwsoUg+hC8a6wSzqGFGijlsrNItmGZh5BXZNA4MdVhtZKSg0DNk8tLoWDoQ2OKndRJdxRkUl+X6k5k19LiFE15HvKkh6p3tICU3QxYhAV8swxLL2JAax3Ap0zp61QcTTbjiGnXjHJ+gMpyTrWQ8jZbvtPwc99iTrWbEcafapicIT8hkcnmwFJHlTnl73hzSZmLCV+c7jU0DSNWtPyWFMTNivt6oTBz67cR5hPFAb9fXebMbivzyBpkaglFi93RTq/u8/oNEsF6cOhfOc9qWZHvXau2gM7HqT2OnI3oWDsbLBTzOYICV+QIkVp57QvHFVvbXHx73iwi4ne3WjQLng9pD2XyhAcQcELIen2+MKu/FZ2Swa4T6PIECo8TmhRefTwlkR2V1xtLBHA1Qu05hmOlB0E4bU0+X5pYMTpmeHUmsc25mXpqQUu5qBcElDUn+8fq/uvBYA/jUrKlofl5GPYpmi9bBC6AzIurWqeOuyYjwaVsxWPaBknmymbK1H2/WyJfys2+9EVgIT/18bzidARXUTt7lFCY6zAXkJQDM/s/8mPdSGxG/QL8h7CTImXNgZokD9Cf+h9eMY4U0ZB9qUHwXFLjpT1Wg2A5/kMbvN1wIdL+pQqAC2RooOywDVEg6Zr/G0FYlPL1g9YUv6w3Nme3Y8cvB2zMCygNLUGP849RiaDoKj6xRouByTbzyV5nDKbC+Njo6AzdlaP+zJ1znTwUSqq5vsmLiWC3o/F6sc2ebIImbZugd8umQGhsip67+EI44v9HehZ7wZo/OXUZbq5pd3h32tpWbBFFutIi79CnrnRsLZKEpNfUqNpJsCGGT4V36rxPqZxtHcFIbDJRprxGrrgeO+SH5elC3mnyZbADMrD4kJ/dY1vWoD6bU2u6OVptgg9wk8oTQFkRw9KpJWZjyruVaNemkbgpkOIomYbH4dY0QDZjwADZqnmylxX7ntVNGqweW4ha22dzLATP9rFPtxz5vscQO4tAc0MjBk1kzdcm9FP+P8nLj5B/0Igid9TgGIoXt+2UsvcLA/dWYNhA6EiwyJNB+I4ZpA09PnRqH88iP7RPya32UJU7fG29Oa4j0Sd3dMqwN9ZWB3fwfBvNYGt8BcUjpNdS4pSVtuNwSXjLLYJfh7YEiKGcnh1RfWfj75SQITu4wUU6+BO9VC0lBVBKVLcgb/Mkqc9tVjGzDhWbkEs= X-Microsoft-Antispam-Message-Info: hbISsdUflgZTLiZ2xEsssfCW2SPKO8oIUq348eNzWa1RGeSqjOBo2lCPXf2qPl/ylzRFHIQuPyN8rnlkhruRE5BBhF07/e2ycH4Y0gKer68TQSedjJI3cXBr+MUiAbIRCROK/tkhReHsMCi6Xp/HhDOkcmuEc7HCIzKE4PgbkeeMQotzyO0LSO4Dl09ebLDmv2QumWdhDupmG4KuAlvbv8jiIL/UuAI0Dqkxzrm6LI0XpFnRwNfPazTs8NKeeTxVXI9mvqlHYSWYDpSi3LSOdLc80hyq8Rp5+iZuO28Eg99atK2f26koafOsPtPciC4k3yDRiz7nAQ+2hrkaAe8UgRx+hAhaJo+12MNTjeLneRE= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:/GXszpkvl/8BO3W3dfh5Wmu7zUL0zFPUsDrPvd1Y65bU4H1lIUkLNkvgg81+vdgKTlU2KXLvsGJf92g00YAIyyHwLAIxWdRdOi2LgNYDQRsC5+40h8femZvH7JzL/ROBHDrtVrUEv4IWQArwnwcsTafyuvp3UrvX9jnfBgoZoNTiMlOiZHOCux3HdKreLt3B5QOeLtnVUiatyKShQAMhWZOKkJ3mTmuaUk/I5h4RfFv4JZkvPIQNMBF37M019oIlQ6wP5NQWolKgLMsyYvyle15/QcCLvI0jBRn6VR6NG0ptSlL+me6i0qUmlyU6t86WGXlK1Nx/DKU3CqjC/be5ZPemSqeLfmDfcSSczF836GNOOU4ct1WnjU8J+fEmFX80QoCbxz1n6uzS7+YRKh6ryw6ftYZDPkJTlFeZaF3gaPwGe5+ey/GdHUOKfzJvjgVU/dOlAolQYgwxXLBwOL21vA==; 5:TeKD/OAOxHoKsNhcVBo9xxBd+QyFwBfrWO3H9Rn1uFZYoNPd4VpjyHrdKHxKchDxkY9Rk3iLNP6b3mN6gjuWGwPM0OspLFruKSL8x7VSqZkaS2F/YTZI3ZUf5BZ8fauApuN9sVKcGic1Agtfi11cLwUTnLr/9HQxrX/1d3Ihwg4=; 7:d7/Nu7xelOBDXd9Ku2r2W1jggzVDlA5QSxT5xrHwhG2gdJWmmuuedqF5QFz4KZzVDB+UHBRoq5UJJd5X7pSGTZ2SHUTJLDw4s8tkkXpfdTtAygNoD1RcqsfGHBOGtfK7xKC5rxppYUCD2xp4KhruaYcubqSeXJqxffQTlAcd18Wx2eR+a/kzF+3r4kZKu6vwTt61yGul+Qz1duuL1nioqG8tWqVk+StuOeFudjsDUDmJBI8t6/S/RxISUWCYRhke SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:09:44.6911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6266bf-5fa3-4dcf-57e2-08d6137c4cdb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL v2 01/10] RISC-V: Update address bits to support sv39 and sv48 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: Bastian Koppelmann , Alistair Francis , Michael Clark , Palmer Dabbelt , Sagar Karandikar Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Michael Clark Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Palmer Dabbelt Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 34abc383e3..e0608e6d5f 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -24,12 +24,12 @@ #define TARGET_PAGE_BITS 12 /* 4 KiB Pages */ #if defined(TARGET_RISCV64) #define TARGET_LONG_BITS 64 -#define TARGET_PHYS_ADDR_SPACE_BITS 50 -#define TARGET_VIRT_ADDR_SPACE_BITS 39 +#define TARGET_PHYS_ADDR_SPACE_BITS 56 /* 44-bit PPN */ +#define TARGET_VIRT_ADDR_SPACE_BITS 48 /* sv48 */ #elif defined(TARGET_RISCV32) #define TARGET_LONG_BITS 32 -#define TARGET_PHYS_ADDR_SPACE_BITS 34 -#define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_PHYS_ADDR_SPACE_BITS 34 /* 22-bit PPN */ +#define TARGET_VIRT_ADDR_SPACE_BITS 32 /* sv32 */ #endif #define TCG_GUEST_DEFAULT_MO 0