From patchwork Tue Sep 4 23:14:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966113 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=208.118.235.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="KAJ7wlIH"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="N/MJTpF9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jPw2LvMz9sB5 for ; Wed, 5 Sep 2018 09:16:19 +1000 (AEST) Received: from localhost ([::1]:52970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKYS-00004s-8N for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:16:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXZ-0008Vo-3C for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXU-0001qa-Lq for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:20 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXT-0001hj-Rq for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:16 -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=1536102915; x=1567638915; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=bIcQxnoK+srKHWvKnlxjYNUt9Q3L7v/5Mtqdw8Ny5CY=; b=KAJ7wlIHj88/tVvZSVT3vAbwnk7swmFxMWpo+8SWnz8xOwKBav15x289 Ur5NovekFnzDe3/MA7Dr+ZNbyQdKpKA2sFwP1aekX6tOomN1UNy39jQec TRR+kUsOXN1zIAySXcsI9myOpgYA+DbaNwzSXcdWzF6baF5eNPngokXAv fMD2+Fvmyg93jNkHeSyT+/wO0vxVsMCEMAW9IqCLf6VxIqn6RmQHGfe+Y uauS3+1Nz5drh/cHzJ/UWSvvbtMBgDBcjl8FwbKN+Ylx1KvD0LxFowHwz W0CSBRF4jysVvIhv+vGClKG/Cj61kk7jr0bSd1xko2IazogQ1ntfOn6nK g==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179286" Received: from mail-dm3nam03lp0023.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.23]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:07 +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=N/MJTpF9tiIGMI4qN7K7d+YLJ/CNfY/WDgbRnieMDSi3SO/dAni3NQSazanZ0L6W2ZIVyQ5VcQDzhOtFlwRMmwe190c7YP7sVZ/waiuZ20db9d9e5C2CSukJA7kOLjMloZXE/bjxZAiwhlezkoCbsJ2o4qfgTBke5V03QVJdoNI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:00 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:34 -0700 Message-Id: <20180904231442.18932-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 662064be-ed06-4425-adc7-08d612bc404d 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:j0FzueVoMq4KVzYJx6KUzD6Fwn4yOtLxf7gJYej9xLya3LJjP0F7Ji6/9u8MKHuGHBUmBArSRp5Dn28VNOh/3VegUFwQ9p1Tgtox6/deGGkF1NOzq3XGIb4/VkVG5tZWzYnvUt5mmrLyKUdzbxgRaDDyHGFKlu6XTDhGPI745VpACvrM4GA6vX8yIV2agitIBoY7IFfC3rwnXT7XX/2XBgQp/YU9X6PCMkDaBiVzwQyz4zIGB1A281pGJ9HWAwkE; 25:yFQ+f9ZX+/v7moWK6Lrl25T/6PVLgAorEmMeCUWQSoJ27xy8AJ/CM9ktp7la/w1hd4YuH0alqOg8/lOAJiVnUE/GQv18q0QYGiQXoHazJErD/67E1WxGWI2dp4c9m6Mm6fESpy67M6ZR2nVbrLF1aGn1zqMZ1oGFGxlYOUyNxD2DQEvfYU246R3Qhlvb1NWbwfsHzV4yiJqC5jbXzVjNLK0ZtYI5SRB6m909zHA4GT+6uygTdBgOygNVUP6B6BsSLt9YOYdKxqqfTJ50uf6thu2VN28oWZpRHlTZVqGE62TfVrE3GreBL/JVBRbwGQR2rShdNUo/MAjVFynv7e/SwQ==; 31:xrzGnRy0AO+TA+U1FWaUb5Uqpn+yhAHZBoqqGeQtCiIP2Jq57fcBjyd8D2vtwuVPqPtPstJZ4RHHnOr5/OLCXCkFwbwI8V5SDIHLD1b+J8Hkfi/DlOqUK6SxoXNcOBVseOkm5J5VWavt4jRVTMT+VD/3zJNVTkX/H7fPPc7gsvzZ4bCe5RV4y030gATOMvqGM9fHAPog7DSKRzACucOKbZ5PSGHRfdRGg/HYdY5lthQ= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:13BxCe0+z6tpDZbWUady9AOJcPCk2EcBjoT2GFsTZkeExfPPsspXV6U+UfPYFI7Iwdxe/+xyzxvFFKQJdI5Fj/ftY3+Nm8E/TbtIu+MiY/Vy3lhNA1VG0XsF9j8fd+kpasn28v1Sv1DQRjBSvNtdC+N4hVkjgOK3wT6p+vlRdkONIRiM56ortLq3CcC9xY1Fwqu7EoBMRSkNjRRwC5YJDqObjYiEdHI4R4hA6tsa2Kspsa0gZm2AXY6SP+AN3Rtc7sTXW8jKbxftA+AV5xApnNJlSkQMICPDHZXgBOqDjDW2Lqjf808armeusDko+eLaN77spZ//iHkKmgNDEuD06CBXCzSS19h4vIng276b3fAAb2lEDnQTYha5NsrSbCfNeE33BbmiaS7VshORsc6qz0uDkmiGVvnR4QHKQuPRL56p5XRuNBeb3l56aU8PHTA9pjcZaAQArGit4JT8u25DDLzfpIUEtqgJ/SHJoda3xRWdYmQ95b35xjm2GdExMDOe; 4:j6pLAh1ok0vNJ/ygWw/MDNhlcxWUw/X/+s3kH4fm7EmNOi6BfsPoLIxRNZSt+lt4tf8bt4JsAQ735j9Cq320MzNUqEtCEhsXe6gJQTw6oUSzg5tLSyJnBKzPzHQtYt/SySWOw4cvJ6aP1wYQ+qKjNNANN+b7bw2CUXKudWLHMxtsOk0s/dW8BauNGu4DuQloBN4uhp96seBcHsIWSeSxsXejlCIK5niiUZPcjd+dNc9ygtf7YxZX2ixZ060b5uZWE4sKnVlNq5OQEH6saeWGtA== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:FwI3sREkHwga3Ru4uzlB22AnKtHv3Y01FTwD1lKBX?= G3sCvtlN9O5uxpAkJ2dST8KZmlRjJTBtJhTanQ0Zm888aLeDMUq64NcK3dTVFYrhJiiPy0HvZa4vQto1PzNARGPTrRWxd72KEfeiCbAHpUWy30zJk2HBAyish5EbUHpHHKHQhw+GSRPhFBvyo0HG5FYi+JQnDK87oK2xawjTb4p5u4njc53ZtMRQHZGxD/t+ybRCj9G8CbSPuHqcDUMIwd5LpHfx/MJ2/fqmSDHAqWw2h6wyRlJRPweEDLBfwx7/FrcMix5BL5vypIqU3i9JrFiOXFqspEbdr8JgX6mtgNmjoSBrMIGrRV02Z4q9oxQIw1HMMh/WQxzWqJzvXUXZdVTxEJXcR6XM8o6SRS23N4KRXVqV51VjsA0JLmmi4gsExzuzvHVvI7hFyB+JCu7BJeMTlcRyjIXlXluyrl/ViV2l7mOuXQVg/6H791h6LjZ8hYrwS4afWmVRYwSrDlEnoYZ9m/LuNxRCiPXheN/6OsRGOANBRHNLLmivRK68C1Yv6cVNSYqS/0uSAnvdFaKiKxMjQOtGns6dzzPDuGHE/yKPgW0/4gIrtT4Zm/HPP+Y0GsK1TD6NUjS+CdvO4PBoghqHNKCDIAobOIzk7/dp1XbxtfaTuIjrnNAIMWwi/5NLoTWynwxR4ya1+tmp3+TT2YVqdWZseZl0EqhuABLUBzW5VkvPq3vbxaJWaMJIbGzD+crygBKtgtlh+ylZYmNc0vI8aGwnMNch5jsHXADu7uvToJMRdWLBiUcRJdKHiOT66zGJmzAwrOffKnqdXvbhy7+xeDdSxvXrBlzSZJO5yrMB8qizCuNvphTrQLflyaqvtmvFvsu4trwEEVZ1UY40MrFa9YSvdAR4R8aTJswKRCLrS6SQY6KBcgGpz1MJgXW/hb0rDeMQlMbtxC/YX/gocsvH/w2+HuJM09Y3cqkOqwgQoEFo5hvZPX0hxXEOkuu+kjmtU5nj9kYyfB9WmIQ4BaXQpXxgZi4eln70jWqwzYAeOJLkXf0mLpvq/warqAZP+5STBX3lhJ4FNDPZ8ltB1S5AxlZBw6tTZ3eqktUcI0v2gMFiW7AqptDCb3bOB45evSDpjzIgmHqYEDZiMYh9utxY5oxfOY6sjzdT7ojHj8Tnw5Q3qAfnTjkbyH0N+CN2+QcqlRtiioNs+nktzj9BYNqNGWU4QEUyQFG9J4Gbou7RCqJJhovpGlH9OtiLLdaaBS6ZW/KmbJCtN/v6QhNOa/aYsxPO3g8/0KWM4nELhFfvw== X-Microsoft-Antispam-Message-Info: mEP2gCI6OvyCtXoK5FRdwbfXqgkVH61lRbs0T0DXzFMSDbRv2WIT68R38OpX4BrUS2IKCsdF13VrTu7Px8hRVJBTUS929g5DmP2oLQN3Hl6ZETG8t3vU2qYFIEYzmhr+faLSOs0qvtl5FIQ+GZxYhrIWRyORCUITX6ZupYD7M4Jvn/Mr3UYox7bWsS6UX+YaXq3GS+FrLB+SB4mjmUzcsGk/5gbHMClTTpfp4kBUVIlB9LYUGWz8AhcAfsyG5M7rtYxxbZs+dNRbs2cLvezq7T2ZoqByRCSlwblUoxMWStAUS1hNeOiTzGEa4K4dW8dJnlzFlUWYJuNuFnFaPEgINXhakGzyZVO7N+eoXRENfK8= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:DMk7ajne06WCyDDi80v0rSKWVj2RPfrlK67xC1X8Xw5wAuCgikahHGSqfBBAg1X5NhARbxojCdBfQqlcaY8hyLZmG1zUi347zqzZBaK1lnXSCLvzGbRHqXF8KGsOnTs+admVoI/Kv6ApLBgSfs1iKGgQIX18aZhnZsqv4pOLw/Lpu2pjE/WVnNN/q1oExJV2PwxNHCL3QAn3cYkmmMu3WeqUBjwRGAssSf55MvqTrnyKl4Pq2KgB2rmPGL4IeGOi33ucIISA/hrxBcfbQJvM5sQXyoXk7pbl1z8ApBz6RKW3QitFOSpcN/t7llBzpgx90Q1v57HrUpqsSB8RRa0NhmHTlVJVDztzWQsKz9SnLPMxcGlSW43Is6n9jDDhCG9VottZY5BtIkhyGJU/ExdRcLH3uTJNW2rij9oO2nuthFJ0Ija+bK61UVAgjq7SV4pB5zJ/SNheCev8Pr3FR+9NQA==; 5:J84uoFsnUYTNJLZrtDfbrvHLFjOR/9DJrdPYBe2n/cCeFQY1Y84jtqku7vZyj4J6ufuiQ8R0BOZxEjh5UeSCLG6Pa/XKqcoJD7O4jGyfS47Nc2NW0qB7IyblyRl/ujoX0dPZhdQQOKWCmc6L3de+UM8G6d0wUR1/9a4VE5pHg5U=; 7:YppnPdhk5H0w3x1La5oEGsdfGsns2LeHGPEQrAhIgnxlh9ZqF0U76PKpxisIEjqSPXwuGwCsPyZlwpP/p1bKOn53zViHGNuDJaMNk+qIylCfMR6thO3s/bup7KoGT7QAHeJGqiU1g2LIxMfSMfudwM25l6Gs6qxP2rY+lQSqBbJVwxveeKG1qlYqTq3+3KPwvroNcQwo0djwfxgDZiv8pH5yhT6eOpMphsdJdj+5DVXjgCdFCBRraynEsVcss5q4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:00.5393 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 662064be-ed06-4425-adc7-08d612bc404d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 1/9] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 From patchwork Tue Sep 4 23:14:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966115 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=208.118.235.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="pelygMJe"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Pl48a+Sq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jPw2LmPz9s7T for ; Wed, 5 Sep 2018 09:16:19 +1000 (AEST) Received: from localhost ([::1]:52969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKYS-00004q-3V for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:16:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXZ-0008Vp-4a for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXV-0001rR-75 for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:20 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:27807) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXU-0001cF-Jb for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:16 -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=1536102965; x=1567638965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lwca9t1+nDg0F6GuVLYbWuIUyAMn+u2+4eXGZEUYqY8=; b=pelygMJedfKxbQgiAB1NN3q89o/fmRZEnk3cRpIiMBlLUHVT+gSuzLvJ HFDfRvVJSvX2ZrYm6vWfeUTOD3LYT/7VkafViKMbjaD3BCmmWDgRWL0NS nyp5rR0rv65afq9te7w9xkE0EPMClQJORGGFGxfTtjgtimaRVoFgz3afT OA9VETrnqu5+zMSfI/WDzRY99Bsg7jJfvI2DArFX+9kCwTiPsvZ49jSxB Uj+iiYNqx2T+XBrS2komtudXfNRsqMADMGxAJmExYWvKYrzwzUd4RKhOl WGyjE14xacLsImvNVGoxZuTpoiRl/W9KnyYxj6WGolEmwVYmlaPpjd453 w==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="186541886" Received: from mail-dm3nam03lp0023.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.23]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:16:02 +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=YaZw2XM1x9YOL7GYhd4mphFT6b4jR0fzfWKQZA4ZGXk=; b=Pl48a+SqQ82tpLaGDj9ClSvtuF0p/1Y+y11gk9h2Vi7bs1pmgleqbhghWy2Pkzb2ViW7UdTlXQOKDzJ/11N+h05seIg8M+nO0EVZflC2EtaBDIuYaOsw6I/Qe9hX1mLO1d1KMVfs9iGvpp8DkjpWJwJ9PcK5Tc0O923yG5lfBnw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:07 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:35 -0700 Message-Id: <20180904231442.18932-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ea88342-8b95-4a11-f991-08d612bc4461 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:NbFIP0IKlmNsxtGKvK3u7w40qOos1jxeC2YG9d5C8tLHdldLip9VaqJ40elKxkVwfxvPdBuf6k/V44qByD6OrbWqFVrmHsSfnn7iTrPyquzwdGMK/oyxqZ4HqScDR2rSu1v8CS/GXZB6tcllu7vXZt7lRCy11yOBpHF5RpbMVP0gQ1xVz2EzUE+3TQpBREkW8UfAehUPq2ww9cF/d9L8xjWfMK0iKyZjp2SyqeJGAsVFk9gIhR5t3WZsevRKtIRw; 25:f85VRZgMfpvy+6+0RDsDjdsvaA65fdRi+TFLJ4q8DY6hP/+7NhYuSLMbIm6VTC02XX2VW00pHiyeTvSsOY7phGrY2Uv2JFYBWz0hg1uGgFFsiWKCy6JsILo/DcdeCIK+JdcO0xGr2vfIAP63YeWxzjIQTx3Ri147Fouv0Lf17dXgvIHVUirXiKTB6zfSCEUjFBjvWBPNPshGnA0di/KvWiWSVFcIoIsmYusMOrnZ+/rXYKMVHtnZcTBB36CodMp8jM2zQR/WsyvEHec9RW1zxflNsXrwJNIYPzYHEikcUuEmzTL+vPxQdRpGI0LJ5v0dryCIZFiSJnp1Zofa8BdHAQ==; 31:jJKPbr3+mUM/FXfJtnrIP/d0KbdrSvWH+K194F1kDF+khw0s7/wUJtnJyWrTOa753T/+jQ1bwtsmMxOFlgeUjJPQ04c4p2n5LB8+dGNlo0jXbNBv2OI+TTSEonjlTi7ii9uIfC6PT3xp/BV/m3UaH57P6G9Q25k0XR6VPUpXLQdiTW0ZSBZ9jpybO+d5w41T98QnNKdMtFpQM4Ma1ug1QMp1clvpIeplr/+oy8p+Zyc= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:2t3CfclFYOV2hqMbdzOpYowlq4CJ6G812f8LxkRieOqQPojhLRyeytyEBwrWVIUHRULvy6S5ejCFjaypRi/nwhJDtG0RQ3ak8UQM4F6jAo2K9JCX0R99tNn68BkXNO42nIdaNUkp+TVvOYZjO967n8/VZzluvS1Eb06pSAK8yWKxhn/iHzfmjV+kl7Jsd/DASLiYrgKwXF0Z1cqsxsky+57DoENp3WXnEEzVtni8NUWc5KqjZ3rKQjqFg/umAJXEEqbOLfPY8f2vM5qPOJev9jO+Q9+B45ILCE8kuFD9lFMTNWhoEvrXmu4h4KAAYQ0fFNEyEeiKE2zpsh+2P/ARJo+XcuDEfOdXVPyyVBrmT+4kaM3CMUZbPmbAle1w0to+W6bD6dvqMadoAe9OGTviadVlN34ff2SKcMlSpl4LzCywc2TVcGYqgH9Cpm1pKjviA5rqlFkLTzRj5ZzoTTlEDpHxx2qYaek6mwsiJsb+IS6DPuioFo6XARA+r7Vpm1sN; 4:avBj/iyXmMX5oJaqWWSJci64hz1nbpPG2+IbV5GIT5Q7oj1NoGTdP6YJFNBxhE/vB0KGvQrmp1C6IpTjpG88+kls978MUuqnYMukk5c16IcV+N8Gj+lvwPtb6bEZwTPqT/9H7xr0z1R1bWgRgN2wiSN0qMce+u7/VnzALZfw3A87gtQ6byhQaYqfNDfhtYRtPqeptscrM8q6WHDX5KVr7daWw4CggjBwifpzHhi9wpRe1M8XIufcYHkLY+yF7XjUXlfD5LiCoznIC0UimbH3Kw== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:v45Hf6s4GX/uwP1oUJRn00argOSi8ERH0AHNv8+qo?= IJSy90SVbWaunRzuCpt9x8AmgLN971xLbmgSOOtp44+uHNzP0uus1UxvctCvjTNAQ3EcMKhgrIMdhUAodIVxk8xkBhen9c/ldrLOVzXCesopbTLaZV5rs8bsChXjsFb09J0pJKOEQXadzFwx3r1EnDr3W9Bh75qeK5no3sEcN9i+weMsyUABHdgSiWGgUWJekTptJz5aQ350Mo3tYDdW7wdRwlzrHgfLDsPwKNDYR/DcyPAGjpuMmNMjerVUGfk6r7cYNkDwgh5lxC60c3hMKEv6mj8w8FTaceWfEUUJKxlG6yRFvwi8TdFAm6m1gVHeuFh5ghJ2ilSDXwhw+NxcFQsvbMOlC1+zCxL38bj/G/7XVnplnwsfrij/bYkeX50yLnjcNotD+/xCNvRfjLIwG6LtQxs7uKWA060TyibibXmEhezpe5QWrc5KN9WNQF6xd9Sk5HUaPI5GlfCmqiYwkXTEsm0YxV2lgFn1+JyW2Rr5ex3IrkEK8+iGrleIrE4Xe7rizPPa9YkwYQbcEo+3W8jIP7ZmXr6yFuqjjc9uSXQvqk2gQKs8PVOrbPmay56dNyYaDQ8YdkPdGTKNj6ql9/aum59WVyJFzZFFSRrcHsqobAMwqTFBuXFsyvHJ/NINylr91K8KmTC/GZMvOeYLXCbIE/HnDML0LhCqvSJek37+GmDwATZeg0KRl0xzoR21+Tb5q6+B1u+YDG0ptlABMehS8ouwMrIIr/5L58O1VTNPgJARGq0OjhQFiZNiq1ps8/FgJMWRdEC/F+92MWhPVQ6dzeEE8QV8S6EJrgBwnEM3B0Mc/NUpxLsqSaFLWbvpsF9f1+NvJUiLqZuXuqmFMbAvbduy00T2bu8AgqKdgC4rQgTbHHj3KR0dRU0eoFnWFVfSJOWK03Xidn4u9US+sGyF+mtHm8nH6akEuQHxYNeWYH+vQSGMvVhf0/2Eeu4ERRuDvRXbi7WB/K5Fk7cD95yGdTohf1I1dZbG18jv+uXMI044M0WpgvxMVtXmMWGpZNj7EKixSvmstdPNkB4+eUtOki+sjKXdp4y/ppF7ejhhDCiI1ZXEdeYUs41ewvTSn80WGzVw9GvJAwpaPPq8QPIcSQoFkd30GziG6FWAW6StNrWV18pDuzblGdtr8ITzjikPSI1CcXfaN1l569v6nKUzngVccAzGIIHSjzS0QEQv5PGaAdB3R2hz8j/vP0j/JPYczJxBRKV3mvROgandXvMjKu1E69jWJalJki5s8CqElrb4ceObP35hGfEyDSNVlE= X-Microsoft-Antispam-Message-Info: Vl6pjoacf1nOH551Ll3ldVXAq0vBBDxr2xEblJUcw9hX3gofOw6D5ityRBLabrZcUbeJr0wm/0NmzWXS7yb2bVnSS6lUhouZ2C2/cD3z26KVesCRFH8eLoFLEKCgVUaOFQlABaPMBEsnMzjEJEuEO9OmZT565nkRrVH+S/Quzb63EWL9uDI1xgDhCScIsMpThUSHqTqxeD0ykSOuoYM7radntqKCbJiPASbN5Eyj1aEMSwc0FYR1iXismptrNwftgUJr05MqbPiqtjEmfIczg7lhLkOX07AqlmtdCXrCm5e+pvdFl1GXm/7GcYJgH+FJBfhbnJ5jH4alpKVFbAva/bfHy8Pn7AHfEQx32NNZkt4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:/E5H/rwuY+giAswcvbSf7ynqrff2LH93H8QoB+w6kgZwGkbOz0IGFWmLPIDNTymuMlGLNO7DMp8p7FB9V+NTw8M0fgbKrKzI08nbIE7MWohyp0PYXGPLE3t0ab8RS8+eyj96rAp5euXJysiS0j9TPXz+h4XrpQX1PEEVthcDhYN1DLMrYIhKdYcxXaCO1kTrO1X1mvkf8LTJGmjzTqNlo1oCIK3bCeGsBUlDgftnC1MmgvUfAEMlKKUB+zvwJ2MmhWaNWEBUqbg3sQdC71Fhi1Hoeb8vnlwrBm4dC3PjxP9Fm7XZE6rPSZ4kxHmjJ+8pvzUbKckBfIHCiupP5a86FnAFSpyaMlJM53EYckLZL24SmRAb6oQzhYtJaMoNlq68TTGRtTKH5l7+27SCrcD+87mqoZySrm+vg0pmiHd8hCYKkwJCwu/NxXGHHADXal4XtSJkMiRsqXaK2QNTVfh2LA==; 5:tTsDPqmffvh7ydmna5tsifRqlC2wdMYsxuD+6by2JzaDDVHRVsZqj+5N7QUPdJLQeyIXpLhu4HMlvg6Pj8KsKefAKfSnLkqZdnYA5Odrgu/WoWiT+PvneC9QES5N45rwdWPEK7BxIzMTo7OEG20+2HVxfrCmwz8roX3uv6lRtc0=; 7:R+uHikU17a+LbumIs6rQI5U2CyB56IuaQlvEyONHMwJQZKkMMfTfAPSIskjGuGpZtIExSrOyMpLydgUYBzkmqfExFTcwzVcdo48toVKTWsugDVEAr88Thb8E0ZRwNpODsNBzOreHFRuqsjArdjnMoblPtOuXX2YigblBpOzFxbBjZyU4Dva6C/y5+zey82QVg/aeevjsl+bjcbLmzipcSn+EhSNt5LjPlofWP6VqvV9nj10ebJaDkXo/fHnq3HAP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:07.3988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ea88342-8b95-4a11-f991-08d612bc4461 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PULL 2/9] RISC-V: Improve page table walker spec compliance 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark - Inline PTE_TABLE check for better readability - Change access checks from ternary operator to if - Improve readibility of User page U mode and SUM test - Disallow non U mode from fetching from User pages - Add reserved PTE flag check: W or W|X - Add misaligned PPN check - Set READ protection for PTE X flag and mstatus.mxr - Use memory_region_is_ram in pte update Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- target/riscv/cpu_bits.h | 2 -- target/riscv/helper.c | 64 +++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 64aa097181..12b4757088 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -407,5 +407,3 @@ #define PTE_SOFT 0x300 /* Reserved for Software */ #define PTE_PPN_SHIFT 10 - -#define PTE_TABLE(PTE) (((PTE) & (PTE_V | PTE_R | PTE_W | PTE_X)) == PTE_V) diff --git a/target/riscv/helper.c b/target/riscv/helper.c index 29e1a603dc..1f0527e07f 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -185,16 +185,39 @@ restart: #endif target_ulong ppn = pte >> PTE_PPN_SHIFT; - if (PTE_TABLE(pte)) { /* next level of page table */ + if (!(pte & PTE_V)) { + /* Invalid PTE */ + return TRANSLATE_FAIL; + } else if (!(pte & (PTE_R | PTE_W | PTE_X))) { + /* Inner PTE, continue walking */ base = ppn << PGSHIFT; - } else if ((pte & PTE_U) ? (mode == PRV_S) && !sum : !(mode == PRV_S)) { - break; - } else if (!(pte & PTE_V) || (!(pte & PTE_R) && (pte & PTE_W))) { - break; - } else if (access_type == MMU_INST_FETCH ? !(pte & PTE_X) : - access_type == MMU_DATA_LOAD ? !(pte & PTE_R) && - !(mxr && (pte & PTE_X)) : !((pte & PTE_R) && (pte & PTE_W))) { - break; + } else if ((pte & (PTE_R | PTE_W | PTE_X)) == PTE_W) { + /* Reserved leaf PTE flags: PTE_W */ + return TRANSLATE_FAIL; + } else if ((pte & (PTE_R | PTE_W | PTE_X)) == (PTE_W | PTE_X)) { + /* Reserved leaf PTE flags: PTE_W + PTE_X */ + return TRANSLATE_FAIL; + } else if ((pte & PTE_U) && ((mode != PRV_U) && + (!sum || access_type == MMU_INST_FETCH))) { + /* User PTE flags when not U mode and mstatus.SUM is not set, + or the access type is an instruction fetch */ + return TRANSLATE_FAIL; + } else if (!(pte & PTE_U) && (mode != PRV_S)) { + /* Supervisor PTE flags when not S mode */ + return TRANSLATE_FAIL; + } else if (ppn & ((1ULL << ptshift) - 1)) { + /* Misaligned PPN */ + return TRANSLATE_FAIL; + } else if (access_type == MMU_DATA_LOAD && !((pte & PTE_R) || + ((pte & PTE_X) && mxr))) { + /* Read access check failed */ + return TRANSLATE_FAIL; + } else if (access_type == MMU_DATA_STORE && !(pte & PTE_W)) { + /* Write access check failed */ + return TRANSLATE_FAIL; + } else if (access_type == MMU_INST_FETCH && !(pte & PTE_X)) { + /* Fetch access check failed */ + return TRANSLATE_FAIL; } else { /* if necessary, set accessed and dirty bits. */ target_ulong updated_pte = pte | PTE_A | @@ -202,16 +225,19 @@ restart: /* Page table updates need to be atomic with MTTCG enabled */ if (updated_pte != pte) { - /* if accessed or dirty bits need updating, and the PTE is - * in RAM, then we do so atomically with a compare and swap. - * if the PTE is in IO space, then it can't be updated. - * if the PTE changed, then we must re-walk the page table - as the PTE is no longer valid */ + /* + * - if accessed or dirty bits need updating, and the PTE is + * in RAM, then we do so atomically with a compare and swap. + * - if the PTE is in IO space or ROM, then it can't be updated + * and we return TRANSLATE_FAIL. + * - if the PTE changed by the time we went to update it, then + * it is no longer valid and we must re-walk the page table. + */ MemoryRegion *mr; hwaddr l = sizeof(target_ulong), addr1; mr = address_space_translate(cs->as, pte_addr, &addr1, &l, false, MEMTXATTRS_UNSPECIFIED); - if (memory_access_is_direct(mr, true)) { + if (memory_region_is_ram(mr)) { target_ulong *pte_pa = qemu_map_ram_ptr(mr->ram_block, addr1); #if TCG_OVERSIZED_GUEST @@ -239,15 +265,15 @@ restart: target_ulong vpn = addr >> PGSHIFT; *physical = (ppn | (vpn & ((1L << ptshift) - 1))) << PGSHIFT; - if ((pte & PTE_R)) { + /* set permissions on the TLB entry */ + if ((pte & PTE_R) || ((pte & PTE_X) && mxr)) { *prot |= PAGE_READ; } if ((pte & PTE_X)) { *prot |= PAGE_EXEC; } - /* only add write permission on stores or if the page - is already dirty, so that we don't miss further - page table walks to update the dirty bit */ + /* add write permission on stores or if the page is already dirty, + so that we TLB miss on later writes to update the dirty bit */ if ((pte & PTE_W) && (access_type == MMU_DATA_STORE || (pte & PTE_D))) { *prot |= PAGE_WRITE; From patchwork Tue Sep 4 23:14:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966117 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=208.118.235.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="bHGkkGcE"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="fXla+7em"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jTZ5lSPz9s5c for ; Wed, 5 Sep 2018 09:19:30 +1000 (AEST) Received: from localhost ([::1]:52980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKbY-0004jg-K2 for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:19:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXg-000090-L9 for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXc-00020C-Pu for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:28 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:27837) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXc-0001z7-7f for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:24 -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=1536102976; x=1567638976; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+1EPoLbQqT9ZINHYGqU/aNOk52IqMR5O5P8892Kmc68=; b=bHGkkGcECeugs9fs42zzTgaty/gOWzLbZMlJ92DnrOi3MgTy5R2RIFnJ O4vDNI0eBwVLNplxN0XS6gRo4xQsqxwfZAtst4IZZ3FhFJZz+8JKI0zBu +tCJmnTEZfyx1bGsWs8XOD1t8TOa+tbu6YCzWfzZZZTE3/gZpV1HxcBoF xYkHgJCV+zjd0V/VjaNzjOPw8MJLjXUrKMSaBQ64Ha1qsQsa/l5SjfJPI kyQ6238DnrG4idbDNdZ8bxPVsE6fKCKdaWzClg8JusYG8ozOiM/mbShKB mbkGJ0qrVcOdn+r/DLOhk4Xm0jD3rNZRRa9lJoN98YAvZrdnBFEl+7ep7 Q==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="186541895" Received: from mail-dm3nam03lp0019.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.19]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:16:14 +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=9dMqjRdnBXE9cTbujCH1RGXpvOyI+eFX+KLI3Lcy3Ms=; b=fXla+7emjgrjYS4hRW0NDdas/K0MzPWwL5yyfEWNATf/CmxR+JKJPTAawwx7wtPmsgNGRG6b3kIDiz7S6JNs+nJqiVj9LkCkzYJyj19tpyh8n/tBOZzKWmrLKnaW+SwipPxb7MSyjZPWtWxH3Y9GivPuQiq1eQ0KppBvrdynP64= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:15 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:36 -0700 Message-Id: <20180904231442.18932-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e529c5d5-9899-47bf-3dcf-08d612bc4930 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:kBT1So/AJ3PgU7GXdW/OwI4ZzSM7rDcrOE1q3tFTfoPFjHxzXe2ikPepQg8xpDxzVGqwuLen22WR5XQu8+Kizi4/7i5MZASAgkVqbM6BC0t6SclJnaGQ0NmFWtlNs/cKv5eD2X3qsEAeaz/8Pv6/iUN76SdlFmJSirGto24rWs6Zo6/b9SNdNXyW3Fi8Z8Ht8548nUmcEWuW8LgIdvm20pzYG/V8QRkcF2gum4viqhhbU+dRLyy+ZkShabN/ycf4; 25:vZO4kE+Mjqt5uYKvs4CMt0BynwENzYJ2GmCTCqTPKPWCoLGbZ+iZp+IUKJ33A6MwR2R+7EvZ5K44XGuowKnV+j1GraLOFjBW2m5qem6uXvGNrpwEl3wW6NouXPV97LXpeg4UiCLf92uVe+D9FTIZhEdebMmLytox4dm1lg5rbkzwJoqpEZpYq78xdFaYJNtX8fmIG+TxfReiYrwP3vsJ2zlSzMMSp149PKRlICbLTsxRmR2HTAdQs059s7HrZjyyI/vi8n1NN7hxU3jBtVSHLzNICSWBuvbNtGoGGeZ0OgGO1LAuRjUyFGvyjQBGG5+DIrAwV2gqfw8onCeiCi758Q==; 31:P8bRwO+dsjiaQPEtcKKFeOWxL2KsKj4DuSCWjeiW2Be3pw3efpDom+7P+nA5COfjPzUTNaBVwiXoYjcB7FbLoo8OGdA9Zzud3Xh0NmXK7lOWHAPyYjWlNLpqaYt6CNshPkUjgFtW3ZmcJvq6drObC61XIJyzzR4u4myZ21IFzHKtFDzQ7P3mBtEiXm33NiB0ubj3QRVSK1y/gy+hXIpJy8ux0mtzdpqigl39C1d8M0E= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:ZvQVHW0r1bh0HOzB137CqEk0nWECAyJaKfJvqCH0zhhWpzV4UkYsHxI9lxZwStlBNDOVfGLE9BAjSO+svmBeL5daMNcSa34hz5M9h7ATPQVruBkW+ojaqZvjSRNTXGCLAbkNOAC5TW6SlKX/l1FYnEeFQpXRd37yNPld/cT7y7ip5LCcSNyX8eAHgXthhewNs0T4qkj3zw5IxRxjVSb4P+yD5iCS6ktZKCnzujIfljN4zqQZBIHA+EQ80nOfQV/uiptVyNG80gnLns9fG+fPRNlS+bfkl+IVt3zUnsPTf06OV3hXkbdTqroFSoE6Q1HBvxhUPTLAxHZA+tT8nmHnwj8eTJ51pIr+aDl2cY+JJQ7jQ6FkshofHBbwgN9lTSTfdaVIaeiRVRRXe2cgSCeywWzZQLehmdFayCZ87PZKAp3sZD8atvGxFiM5zrlVP8x1tlTvY5FHK31TyLoO1HsvDT1CbqdOTMOYzjMvS3uH2Ez5UKHiMYIuZQv9kkMi1XNp; 4:l1fjRYty/Nez1nGijg15fM3Z6JJw10Q3y8AUtWmXhG/+YzYLEoDo7V1JGDJiqJFFpFgu4cgJjKvmM9fsZierL4RLty56PV075XKY48/PjwL3bml35QLoPCnOZVg2Qk3sCgFPB0P/QXvqBEIfFjKEgVeJK7QhCceJuJ09cPKvN8afYSQcqLSWObqJ2PDqTE5dGI7oz6jrL8eAheSMHKiW+OfDDr9P8f6Yty5H779Othdf5+IYcuFCfWjsYPEF/+hmczR2qDoYJg4gK03h49ihlQ== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(15650500001)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:CqtrEvuYUuHR3279oBRkqF+VKiEG6KH451l5OY4rM?= W57xvXNmON3l9OzmfQCxr05AyGl7s+VWka5+JLZoEd0d+VinDptLqr9kGYNDNSbQAO2ZQfUzEBTyzDtDLLhAFzC7o0VW0WUu4/PX1fNGJWBXWN7pillCbt++jPt/EcqheZW643l3C0NpUGfiqv1qarfPxpONdpG0Y8Om9m0r+POh5sM5lDZ5n11K6U83dgIbHA593054+W/ti8mYhhlZgY7ZlFkTDS36IfyMkk27CWLbf8J/Px4hbU0WZ0EWgeMnRJfsKxuje7zxQr9nve9pbWkmcE/OXbh62MKu09f0BIKhJvLdskBrAImmdeT+lHfW5JcUaNHXUpZes4XejWzlRODxzCTWHAQoJYTIgFqw3or4oYjNscfJXDsUfc0paf91UmgWd2gn1SQ/WspaLqMvN26A4BXHVuKVX9ej39u73KhOhqlMxnxzHEx8pBz4HrmleBYYZUSLK0Ys8Us9Dg8TAaEdi7lQcRvDq/ssvnwJ0qFuCvoXxFxeI7fmfG5lGkl8JH5oj1VdDxUQqbSUiyIrP5vTKBzwFZibUaXDOAmjg7y3bF1pZcvZwMtceMRZZkdRijgbZL7MGcbFaZBzLo66YUj16SUK2TKhtCLyQfHHKs6S5DWuc+nCKdDr+ea4qzdK4mchxcrJyjWbgSuXiJmu606oELxvimqkcyMQmyD8zklRPWCwUxZtGvlePMiShcAZ5YV1f5UqpchCGHkwSzuDd8cm3F8+RbwvJCrOOaBd5rz9LJb4ILV5JUYIinD+mzB4xx2fykCEHRQBdtqjlY2eGxm4TUc9K39d0PfZDI+vMXuxTYR0oZtoTH5+vc08cpOrT87n5fmNCqZQAnnRA2pfvMtcp+NQK1dGm2OuT5MW4YK6eJZHF0T+7E+S2jxCMoD2MBTUXlQ9zu8q1s8ERPwWnNYzi3xO6m6Vip7io4of7C3rNVxMRe690DO90Kef1ZDP9r/bqUZKVqFYVqZFCEWTMkksZeJyA7OeiMZ1ixurqkBIT97x8RILk9FaUMk3BKSai7Kx4gMyDm1tQ3HeE9tPwxgawyyXHaMgheFqlB0VvuVV/4mfjy/o82Crrfno3XAF8R+IoKfSjLfKorEb7bwiasNt+W5FwDsNO2zsfl8u5xw0UHh+Brqb92ipHj9tGdPkOHCaBOxlCKiSZWeE8bmPEWGzJx3b4Uzbaw0pehZAPmZCXfqLtT1sFNEZqQtxOvaBjbm4Eilq3bV8jVXGjmCU8oGcoEpPqXqiu0+QZ1XDZVaECFfaMznRYxjFzt+CYUxhMqXngmGutuBFQGGttADHfUt X-Microsoft-Antispam-Message-Info: 0Y2bF1Hul295P0ZJ6rbsBoTco4DVAoWPCtGZgN1broU4BDQhKL6DUTwL4RofQqW0XbeNUkQLhB+rZDJlGnrV43tBpJZHysmSzyrTzGCdqgPxf2K8XkKWQ0GE/XYZytMflL1pdEJe5Jm2HNiIh22Ul/ydIK29Nqb1g1mWOD/C3HPZ1PXfylg3K/v4zRlY5Ze3UaZ3TBp2jqZdzG/eyLPAVjvW+ojbFNH92OrlEX1aaVRQ2piiWhXZE4UwYYanp3WM8sjKzmm4EuHjdng9+PM8dTffR4GcMDplI0AeIQ9xxvGoIdkwZsa4bfhAXXnPcaB27H3ZGDZ/AsLqMez44AkIpUAk+v+uIF8jVyPKn63RjyM= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:DRnf3i8dyGEUyLTwRbST0+AkATMdY5T7OwEK+OvFe80bd3n5ojgFv51y+5xFuZPVHXib7qsJVammglRsSpWz4nZvK4KkQra/5sgdlNra9B8l9pt1rjvSAuatOYjhLS5O/ZAhJuYxpXKersvxz7YLamSh3prMkNM+eJNbN0e6cSYmnJAn2faLuCYSzkpA672Q4n4rTT2bDSU1jILHnjbAG/9JkVKIUycTlUtUjB9vz6Cql99f5kV/SW7moHk+3JhCGpF/Vd/ieHl75ig7sNo10Hacl6RXSzVyBtciv2Q9I9t9gXTrZIIYw66p7MyN47n472JI0KYtMZC5PlKegBGMM0DoSSXDkWvclFKsU9Rwe0fP/JF1dV5pbipZ4m1QxGi9ESmJw/4omDokXjSYrH2VyrObnh1oY/8l8ObbwUnJyCK89Tg/k4dU/ApH3S8ABrrp3mA21MZx1Z4E4uUZZmsimQ==; 5:MXkhodOcODy8BydwmAyWrRoLtZC6+m96JBcQ57KbhCxJ4pd3ar4lAawyw7i8hIF6dEqzpaPX9X77/x599zlg4tM5KG1yEN6SqJYBNA97bQOgFVm3jKbYWce+XgKUGuQaNTbu9Ls/Pem0uwkhJX0zLjDglfTaxsesCBz6aC8VHIc=; 7:IZn9/HD+oN8Pf1m5ouDGT3dmL+C8ki+uiJDsp8TthCHT4PkgmbLk9kFjGIfhbaC+4EpFcg+e0U4FbwCQDWgiHzI7y1Vmi1POe8MzlOlzroo95+OdlHs8UGJZKp+uqoNgs2kCoW8gY5nZqyRVgPzsgfj60GIMmVxys32VEPLpBPuxyWdTjUqctsjZDgZw33UVslne7468r+xJgh1pf4fmnuBgh28Ipi8Z3QSU/hQ/echRAiCAUX1s+aTkL/Gc31In SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:15.4615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e529c5d5-9899-47bf-3dcf-08d612bc4930 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PULL 3/9] RISC-V: Use atomic_cmpxchg to update PLIC bitmaps 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark The PLIC previously used a mutex to protect against concurrent access to the claimed and pending bitfields. Instead of using a mutex, we update the bitfields using atomic_cmpxchg. Rename sifive_plic_num_irqs_pending to sifive_plic_irqs_pending and add an early out if any interrupts are pending as the count of pending interrupts is not used. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Richard Henderson Signed-off-by: Alistair Francis --- hw/riscv/sifive_plic.c | 49 +++++++++++++++------------------- include/hw/riscv/sifive_plic.h | 1 - 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c index a91aeb97ab..f635e6ff67 100644 --- a/hw/riscv/sifive_plic.c +++ b/hw/riscv/sifive_plic.c @@ -81,36 +81,32 @@ static void sifive_plic_print_state(SiFivePLICState *plic) } } -static -void sifive_plic_set_pending(SiFivePLICState *plic, int irq, bool pending) +static uint32_t atomic_set_masked(uint32_t *a, uint32_t mask, uint32_t value) { - qemu_mutex_lock(&plic->lock); - uint32_t word = irq >> 5; - if (pending) { - plic->pending[word] |= (1 << (irq & 31)); - } else { - plic->pending[word] &= ~(1 << (irq & 31)); - } - qemu_mutex_unlock(&plic->lock); + uint32_t old, new, cmp = atomic_read(a); + + do { + old = cmp; + new = (old & ~mask) | (value & mask); + cmp = atomic_cmpxchg(a, old, new); + } while (old != cmp); + + return old; } -static -void sifive_plic_set_claimed(SiFivePLICState *plic, int irq, bool claimed) +static void sifive_plic_set_pending(SiFivePLICState *plic, int irq, bool level) { - qemu_mutex_lock(&plic->lock); - uint32_t word = irq >> 5; - if (claimed) { - plic->claimed[word] |= (1 << (irq & 31)); - } else { - plic->claimed[word] &= ~(1 << (irq & 31)); - } - qemu_mutex_unlock(&plic->lock); + atomic_set_masked(&plic->pending[irq >> 5], 1 << (irq & 31), -!!level); } -static -int sifive_plic_num_irqs_pending(SiFivePLICState *plic, uint32_t addrid) +static void sifive_plic_set_claimed(SiFivePLICState *plic, int irq, bool level) { - int i, j, count = 0; + atomic_set_masked(&plic->claimed[irq >> 5], 1 << (irq & 31), -!!level); +} + +static int sifive_plic_irqs_pending(SiFivePLICState *plic, uint32_t addrid) +{ + int i, j; for (i = 0; i < plic->bitfield_words; i++) { uint32_t pending_enabled_not_claimed = (plic->pending[i] & ~plic->claimed[i]) & @@ -123,11 +119,11 @@ int sifive_plic_num_irqs_pending(SiFivePLICState *plic, uint32_t addrid) uint32_t prio = plic->source_priority[irq]; int enabled = pending_enabled_not_claimed & (1 << j); if (enabled && prio > plic->target_priority[addrid]) { - count++; + return 1; } } } - return count; + return 0; } static void sifive_plic_update(SiFivePLICState *plic) @@ -143,7 +139,7 @@ static void sifive_plic_update(SiFivePLICState *plic) if (!env) { continue; } - int level = sifive_plic_num_irqs_pending(plic, addrid) > 0; + int level = sifive_plic_irqs_pending(plic, addrid); switch (mode) { case PLICMode_M: riscv_set_local_interrupt(RISCV_CPU(cpu), MIP_MEIP, level); @@ -439,7 +435,6 @@ static void sifive_plic_realize(DeviceState *dev, Error **errp) memory_region_init_io(&plic->mmio, OBJECT(dev), &sifive_plic_ops, plic, TYPE_SIFIVE_PLIC, plic->aperture_size); parse_hart_config(plic); - qemu_mutex_init(&plic->lock); plic->bitfield_words = (plic->num_sources + 31) >> 5; plic->source_priority = g_new0(uint32_t, plic->num_sources); plic->target_priority = g_new(uint32_t, plic->num_addrs); diff --git a/include/hw/riscv/sifive_plic.h b/include/hw/riscv/sifive_plic.h index 2f2af7e686..688cd97f82 100644 --- a/include/hw/riscv/sifive_plic.h +++ b/include/hw/riscv/sifive_plic.h @@ -55,7 +55,6 @@ typedef struct SiFivePLICState { uint32_t *pending; uint32_t *claimed; uint32_t *enable; - QemuMutex lock; /* config */ char *hart_config; From patchwork Tue Sep 4 23:14:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966120 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=208.118.235.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="neUoDEzd"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="KkhVKnKU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jXp2rHqz9s5c for ; Wed, 5 Sep 2018 09:22:18 +1000 (AEST) Received: from localhost ([::1]:52997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKeG-0006Zx-3D for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:22:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXq-0000E6-DF for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXm-0002BI-2x for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:38 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXl-0002AQ-NR for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:33 -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=1536102933; x=1567638933; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=a2IpJ1Qa3B7KQtef8cH3YqtQU+X0C+P2ZGaICmoolaM=; b=neUoDEzdENHpImwK7d9dNHAJmBPTfB/wHlMNidtCFs+ItLwu15FOY2q0 lOYNVzIlsT6MonNULYrawQWU1ERP7YzI9aSepHTxl2ngNjl6TdQTWCQfR pSePn0ei6+9F/ENG6+FA5SOQIjgeywfZCll1tWYWwUl7VKRuSlpk9in1J rcrQbc9fZdB9SGFb1uWbS8m2eyzKfzlt2Cvc0ZOWvSpIQk6FOup9SlAuu jXv+IYwO4f2wN7E1Sg8TrgenhKWEPhQ+yuC43Y/UR1i5FRsy0YZfh/0g5 WSxwkvtfHqCXQkFUFndZLpXY4SVMXXyIlhjd+m93EbS75rI5HF27wgMqS Q==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179302" Received: from mail-dm3nam03lp0018.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.18]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:29 +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=vL0sVr8SipgV1ie+zBP9woPBR5U1Pmnbt5Iazcuf1k0=; b=KkhVKnKUk98WHCf+ZUDMEkv+XQieE3MtfjxG2iZ7TNSuvvikanlKpVGAQpztrUBJExKe4kXsg93eb2fSqwOpzXzApWCt+nUK4US/qcQegAuKXrDmszC04aRgkvWoP8MzV2oW5GpqhzWe8ZPsFGAH7eUV9LgYXMMg3DaEsIhFwqs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:22 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:37 -0700 Message-Id: <20180904231442.18932-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26319b87-28ca-4a31-2751-08d612bc4d42 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:a85Hk3G5/JRu74pa+c64HAl85Uiq0kmjStxjlNoS4uz2S9j5Zdf1wu9yuVauqq7yuf3Ib2FDrYfHbkyeJ41K6QftvEFsWTOgEhkdg2T81qr2FThjnloxChIOzr7ApudUZq05as7FMhSr+6+VKpEFZ854EyMR9DHg3me2sjX9wY1uoopbtlkRUXvZTGZKel5kijpwxfsrciCwHN938joTNsc5D6jT+Mk5h+3kLCM209ykbPdRruEIWAAhpzBJ6lQs; 25:jF6Mk6SLXPaeRt3jH3TpWNCXnDNSU/cdcmOYLQX8K6nmZ9hwDb0raNTqDDcBYQPZG8yL+U7nV547uINu7v3mTCgfsovSAagGfkf4Fa+7MowknfJF8Wg35oHHIBlA52BtLuKPnn3frMThth6OpTqahlWvint6YQcIk3VCLlVsiVABwYYvru1EtC0zBJkU/6XS/h2+NIrdWe66pw8AEYUHV5jvq3Kpkf4M4bIuM22P3umJV+BuKkhEa4U6E5lVit1KokN4pULgqKJRMYe4Shvmh/9eXOuByURQxGRGwjP9BpcMwpB3lq9gphMe2UtAurRgmc7E1G7VYUt71+ocPNc04g==; 31:HDQjJF7FPNV/kqbYBHRyFfGRwFgp2655oYN/w6tyFP5sJTgJFY0UA30Q1wcIt8LC0fqu4vxFjAwCJeQu3KOZOlvRZelvhoFENXblow9yiCmwW9ndPtG23WOu5KkdP+cyrVoSXDhv8D8JKX76on2P+0MHUpcK4q+ZcpbzYhCxv5QXEII52fUX+56qEMSlC4IntRN05shin/tUpe7jSsMbI/JDTC4EMFErjuCsCur0v+o= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:5xOotFFcMKm1cSzNMC+27l2Vix/VIHQJvpzNI7H1z2FnVQqSDbh4FGwHUDck89H1+HS2T9M+kltrayGMP7RJx8GU1tHGjrPFFF8X1WFtinVHAWU84lw6x2byoHXS42k84KBLbA3FNceeJngihRXaSqQLgMkiod9HkyYt2RlBG75LLmt1qIg6N2Zzl2Md1J1/Y1l8WEUCnplh55qWMwGk/xIoVX685qETtARHuvwqWWvUu6OQKTuwuEs9AIEuY/MX7COA/ggTOEVi9lOVKFWasn7OIqUXCMyKHSFxByTXMrsers2yTGHALqkaS/mGfSCZlJ6mm1s5jAhkB0abZ7FlfKaaRv1obGF3en8c0gbd4/NuaiQU+HGwTCUceDKcgBAmgNPm8t+ANgn3rs4JRK7Ooj6aTWooiHVrCJryFN/Ri8RhNS+KTDcM4Ri56sOobgyHFe1I5FOV88orveJi9+bo7tZvh8DKR4P0FtU8YXNWizBQOjgsqxNMvRRxcfQkFhW+; 4:t3uMJxOLwi50UdqzEAsLasWq6c2bvhNxch64YzDWMgB1Lyo2W+/wprpRTv+remrZRTgGpN2GJYeaovUqsQNBeO/waQdyfEuEtLnUIFted855vhnS8xaLlgrouD5/n+HiHg32bsMzRD07RvZATV5FF6Z4gOumUWMxVIty26ES/2iFItF4fSfsWBYiWgpJAU0GsdwOUs37n0xp43T8gFxVlYZ4gvFOt0Q/9XaKTkSz+2U/ANFY/K/3E7e0ASBJlqWtKFvWM0i4WwGkTprC0Ymr6g== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:+VayDgkAkqy3eK9JYKUO9urLIXSz8nGbCGMGR5Sj7?= nM1+LQSn2FoTuUdTR36zCNTVkJ88nzQ8qUwJLYGS1257ACl5J8P0WZ26Dey0aZXi+b7RPf+3Eidpl+AYwiNQYzqVBwjC9rDh9nHNcY7LN7itSv5egKuweBbXMuaP95K4pW+ijcE5UfCI5+VFDmFbcqDEenxQxKmf6yRjL6IWM996UUFBTkpqIxb9aFC9JKE/VnJjX3WKwYlNax8ycBmRK0wv6KxYLCYEyMxEWI2E/oT5lTxsO2y2u/yNZI53DWKkQPK1Vct3/AnrC/29ppinFW7oO06QdENLPR+FOQ5c7JFWRxCPYg4VxvwryWLs2KzOTcUMWsLjUVpOOA2qMlNhJcoRfoKRUbOEuZC/BjY3W7P/JT1/F4hciKqyPtcpDjy9WpfobbMnRtCKI8aJfox0sIYZBXYlgCNwvWUiT4L3fG3neXzBObHUdC7ow4B/xIQOlRZxyv1mdt69vkhEa+sZx9oSILq58Hpk1mTOsb+nKgrMx2xRlk2EG51X/UGTYqJG5eMODH3lmBaroAAX0Ba4Wb3Oq/Rgxl1n9kJMCOZSWr3Sp6nophCVJM94pZYnVCRKELnTK1mBxrNKMG/RZjIkiyse7lizyiPp/1S417Fa5V0nQHJNpBu1J97Yg6unKgPrV6md8BlJCG3i9o6BuNqK9IDe1ts/Cakke81P9MSheSkwDkpp17QE10u2Fi6czLaKAmMdGID1BTnCxAra2LtApAErs6uC3aRMZG18DU7VK2EcTVhXYdaqQGquNRja3+33vx7WSco4CGNYbrjzK2m3b7nZtsAcBSaEecVPL45kh75bmBOK6OjaD6V1C/eoRR6O7koNkyc08MA8QzPJWhRkmYNZglE1O3TN/jk+SPOgmF3McBS+OgGFkOJTRAuM9x/dNzaR3vV6TTO06i3Zh0J34mNlZaftCqOI3Hd/LSbiwddrGS9ASarpufIqfIZwX8vRaUVjFiMBxUoXLqz+k1zgVcEkLMsBsA0taH2rAIAX8MlXp4TC5eIMJrp2VLqglZMN2+xiAhdCU/mNjWUVIBRzBvGFTQ1XGOg2A8m+T8nOlATUZUWV3TM2KioZlWI56WS+w5QCvQmQttqLpRYu1Y0CUOUk5aJyxFNgRSG2tC6MIAaPv4xNdLzuhaXa7fCXBzfDnC7NFvGN87Iirs+x60cyG+vePiJJq1KuclKIdk8r1Sx6YmC2QaAxsUhlgFFfmAdRlt1Rq4BPf5W0ljvaWBmsMoX1ziOO8naqX1ain+T8mwfVcdQR2lACOJ+c9rn9M91/UQ= X-Microsoft-Antispam-Message-Info: MgiPMcJvYzlvZWgWBAieMUsYtWAfNZ4mjFISF4FhT+gNM2O5tbZx7PmOFOfRU/28h+5fubGWkF/PLViTBEcPVvX3IllGROKd0CP/jzknk22IRpB2kXOnW4CXD9xFz6nrt97lhRkCry8PNW4BoKgigLMUbOgtXHIdgTbvOn9/s6fahUghpZ2JkmFbeMMWvk/AFR2X7Kf5HVZBKiNKoZKtBJE7ndVn0kCMhdoVCN6ea7Z/phYQV+SljrPJ3z2ylFUmNlKmQl4O+lrx9J8a7R24sn1RNfGw8+CArhU7PGfbuo4AAXUTy3KHhQNiJJNYTleEtRjOmUXslvONCg8KW2FOtf9Gzns9zfxzkOzLOCf/Y/o= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:49OJ1znsQhPiTnfVuc5584vQz2Wn9RrSY2qHaGWI7g8oreJfkgPAWQUW122WuNQVBYrfUlM77lrvRCmiituSpJBS1M7IwLoPU/Hvt4qT/Gt3Fbh4w60EFJwdlfvCN7ReSLsER5LG+dBLeLihHZe2xWe7kQF3pDKVrp1vUx7L2u04M6ZNvGIgEOjGH+lfw9n2iVlCDabwdeYQCQ4aLk/m6Xj1Uykh0TABYuaaAFLEvyx4vkfmhfACk3ngsDcOFkwivLynecjp8ZHAGPM/KEJoUCMsh/oekcPdUXv9ly42Xc6acYfI4ZV/FFWiascZQxqFWYLOUNwA7ZLpckb7T+EtAD/cwbm6ds1AZ5DLLaNYnz6CBCTn7n5a7cb49g838/DUPI0qyqamoWpd6BwbvZJf5NWTMm7UcUR52zcrbBCDlJWwN+6PQC+4DJ5B3zxoZ8LRR+apq3aweLSX4F2bg1v4RA==; 5:ZjV6kKoFJ5yaAXes1um7KqXhl5poH3gr3wlzCQCakUDhDji5N1S0bkqRn4EmCfDNiD55rP0GVS0XDyXjEcMqpA+MWE7HqJLXUQ+j+TySoymOuN8vn6xpDbLIpU7qMUxyHK9dV0+Igg1ODLwMRPOOc5RZB5kRsPcfDUwKOSF61to=; 7:F5wbFtvAZV1+lohkAd4Z+ETImy/pd4eGLMGSvEIT8+9I97v9YnG++Z15xSqNe2+dC861NA2Vk/fOTh/W8Z1HLixJUUJIchPnn1tBmxJCDhYUZbr5Q01pDPUPK3j0V8lXPzUAyKC282np2PhMk8jwTZesz7Q3nH6aB8UUPaCumQTzj4fHGAe2ndPHsGw4SbHjxlm47WskPw060W/hAiW8FabpUWJLKuK08MROqYrSCvp1DUH/CczIJlakEwc4hO7u SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:22.2741 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26319b87-28ca-4a31-2751-08d612bc4d42 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 4/9] RISC-V: Simplify riscv_cpu_local_irqs_pending 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Michael Clark This commit is intended to improve readability. There is no change to the logic. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis Signed-off-by: Alistair Francis --- target/riscv/helper.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/target/riscv/helper.c b/target/riscv/helper.c index 1f0527e07f..63b3386b76 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -35,28 +35,18 @@ int riscv_cpu_mmu_index(CPURISCVState *env, bool ifetch) } #ifndef CONFIG_USER_ONLY -/* - * Return RISC-V IRQ number if an interrupt should be taken, else -1. - * Used in cpu-exec.c - * - * Adapted from Spike's processor_t::take_interrupt() - */ -static int riscv_cpu_hw_interrupts_pending(CPURISCVState *env) +static int riscv_cpu_local_irq_pending(CPURISCVState *env) { - target_ulong pending_interrupts = atomic_read(&env->mip) & env->mie; - - target_ulong mie = get_field(env->mstatus, MSTATUS_MIE); - target_ulong m_enabled = env->priv < PRV_M || (env->priv == PRV_M && mie); - target_ulong enabled_interrupts = pending_interrupts & - ~env->mideleg & -m_enabled; - - target_ulong sie = get_field(env->mstatus, MSTATUS_SIE); - target_ulong s_enabled = env->priv < PRV_S || (env->priv == PRV_S && sie); - enabled_interrupts |= pending_interrupts & env->mideleg & - -s_enabled; - - if (enabled_interrupts) { - return ctz64(enabled_interrupts); /* since non-zero */ + target_ulong mstatus_mie = get_field(env->mstatus, MSTATUS_MIE); + target_ulong mstatus_sie = get_field(env->mstatus, MSTATUS_SIE); + target_ulong pending = atomic_read(&env->mip) & env->mie; + target_ulong mie = env->priv < PRV_M || (env->priv == PRV_M && mstatus_mie); + target_ulong sie = env->priv < PRV_S || (env->priv == PRV_S && mstatus_sie); + target_ulong irqs = (pending & ~env->mideleg & -mie) | + (pending & env->mideleg & -sie); + + if (irqs) { + return ctz64(irqs); /* since non-zero */ } else { return EXCP_NONE; /* indicates no pending interrupt */ } @@ -69,7 +59,7 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request) if (interrupt_request & CPU_INTERRUPT_HARD) { RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; - int interruptno = riscv_cpu_hw_interrupts_pending(env); + int interruptno = riscv_cpu_local_irq_pending(env); if (interruptno >= 0) { cs->exception_index = RISCV_EXCP_INT_FLAG | interruptno; riscv_cpu_do_interrupt(cs); From patchwork Tue Sep 4 23:14:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966123 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=208.118.235.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="ZHwE56P/"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="Xwfvd5Df"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jZR5ssrz9s5c for ; Wed, 5 Sep 2018 09:23:43 +1000 (AEST) Received: from localhost ([::1]:53007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKfd-0008Vi-Om for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:23:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXr-0000EJ-6h for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXm-0002CF-Tl for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:39 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXm-0002AQ-EW for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:34 -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=1536102934; x=1567638934; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=wqRPVazd9vUezoA5O9M+tCIxBQYUvV0ILi0qyl/1YMs=; b=ZHwE56P/Io1oPWAc9FPVfIEH3ItmSWAsyPzEnixgC/MjLrqdPxtfGiIn KSc6FHqLOoZPp7KeA/Xv0+eR48QTboOtqMcaGc3Ni3O3D+RbTMlkufaxS EOaQm+GlR7VJG56UAMcal6jngfqocecCxhO+eV9azDDaiOi1DF7FKuT/T x8vrgAEiGi+vQ8Ktv/Yuhohzg6/Rz6LSIqwd9R9njCPZ9my18GWZWyYZp WPBDA+Dwg/A0+NL4THEpmWCAqqBLj6u5mlhBoxx4xIz6v4lshUpEXPvPD tWur1BfxjG1kKH6H2uKxNTA8mhKD4hkC9qcB7GTbX2yYKsjarUvyi89eg Q==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179303" Received: from mail-dm3nam03lp0018.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.18]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:30 +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=wbdKfoa7qO7DzzlJ4itTMpQStKlv7624aoQ6+9STDkg=; b=Xwfvd5DfM4EAB9W4vvEX4Gs22FU0hHxMePiknRRo5BzBZ3PAuEnTG7E0NHqVMATmvutrlpQm/ldUinTbFydSDJPmrnQwJ9FdBwsts/UpgYspVQF1c7+jwYBQFWBH0S3Mbv+8P44JycOj9GeC9sQnY9TPtOQxIPDbZUHl67s7b1M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:29 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:38 -0700 Message-Id: <20180904231442.18932-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 631bdc2e-2dad-4ae9-a802-08d612bc4e24 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:f72MQoNwzsnnTOsNTikf5apDprd8hOIaBH8kblAZ/MyEJEzqpnaMJxEeMRGIviTAXcKUnCS1qsZygdYpaCfx4SjIz+tC9FBYA8MC7dYq9W7Ku7JXaGsbcrliy635wWlq+wrVr3mRe6m9Z4xMKXty/9wjkovRR6PP+4yJete0fVS49lbWYXHTr+cM66MFqyvAqnwlFIgN/bFdhPknYUREatONDY+LlHCGsPJRdyYcRHwQFWjpFlDFsJL7KTERi7cf; 25:k3B0Rxsq2xu9o4k+4sEtdoVUwk7nbIFyTXxKfidvz3WMKxLGeVvBZWNcDYlEetJfuY6o1AMgqZcRCl8crh1Ub2CAnjC3+uY2Nz0/CbMgfvcA1dl/+PSQu1NlReOqx8t9scf7pxaVSCmlm0Qc6lqPHmMCh0S6Dl8THv87aUkHwuYAxm8LJVg7Fml/2kQFJxPtReNFNnodFEj7XNkZ3VVOWMj8iF5y5Z7qEVEvg1vqFXFN5JW4Uxcu5SmSuECTLjl1KUpzqSq7NarpQIWLfT9zeHkTnrGXqOV8mY/k8j5Gg4dfFSbX7fMihSZTsAObr/SDKILGdyZwOITNymGztLpoFw==; 31:9zE8bKn+KqqhhSZYM6WpqD+bOGyQL9WG3riRhIR0DFifrmHZCUYo+b+Kdeuiu8hSVK1mUvjdNLonOSLDCmcnOf5cFG3BmROtCKcNS3O7/aGDz+iUBXMe8vF9REM3R5fLDgA49Oi4U9F88yL716fz7++FkEOoGGCbBks3eFo/evOp+UFjcyHai77Ah9Ec82xqHHu1q0jvbtT4b0dehRrtMybGSex/IQoc7wqamVC5ueg= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:LhqYlMTnjMLzncGai4FzsWmYKUXWo0sGzlY30GZeUgl0DJedzU2wTSNA79JIuPEy+vCHDbW8HbIgJY/KCf/yCUz4Wf9SWSRmb8hy+YM7Op55g0fpGqAIoJjRce7mzwpYdG2opslDN3qbImpiXLVG6TtUxp+4/Lhh5scAWBDI19lds7xJ/hdcyK8YnXY5nfcLDoNPpmtlyFl61bV4GlV10i3oYSJKa9XAhmvipdsx5VtTf3uAkyg6UpsJyg+jP8PFvqjinaSSOGk4UgIcydp7MsTe/d51wdYJeJty5YSfD/JYFO8le+0Fi0RuEjGPbuH+PSQnBzP9cF1j2QEaixjGfgUEB/rZUB4rdvptCzbJVt07FAc8efI4HGGWGhQ2/ko7UxmfVRzdsW2sTxJG4MmPrhkM3lTQqF9FFDjTYWQicNQ6VepfsaiDeHHAHJ+aaLRj+vUFgjQ4tc7qdcf/jdsL8jvJ9z+C+iQcTcw1c7/5wqRsesoQJlrniYDhrx1MiwVz; 4:x8tVc/nCL3F1RSSehD2FR6TZiqByv+apG1k6xCFI/DmjqA199aHaBr0nWyHTssRGJntvhOK6x/0sP0dilj0czcw7IBXeeLYe0WvgaTs8sRqKH0UbWCr9t5ESuwbqo8yNCPv0MfOSOwW3BDTFv15YIxYGJRHObBOXFOWXWJhWhBq4beKn+5lkB5M4tVBIrVt85B2WqJLRfU7lDbZUwI6Zbs4NTc8XmQYraQtDdTsuFacSU7kTrZ3Z//rYagxPrl2FIZyymDvb/rVfqdR7wmKtjQ== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:13lf7GE+FiJGplkyWZbWWTUxTDlc3+2o6lqQpkrid?= twJRozbLxBXc0CYFT1H/X4KsxsBGGBweux5H9TvJLV7UMmhXSjA6TbYzYmhU3/AEXBRF6LeXU9XudKtWunobfpyIctmES4uue2flU8upKE+bgH2WYDT30Vz9wLhFKJzut7dXrhntXN6C2I9bjSh6Ie039kX8J9BR67L00vOonQgvP7z+j6q8WR4KVE/2cLJW3VO90vwreJJc/o1d6jfSw+LmCB/r59mD7ucV1jH0Rl9Yx+tuiLV1GDJwM0tICI2/EvPjZpWYPAFyZHJ9wyAGy7f0Wuuc87msjr/eWHC9BuFU65q5ZlRoUKaPFowRHQu+zzgCK1vzDTDjhePn17h6Bca8t7Jai5XhfswxoljLguDsyLOPgwkz7pClt18i+RFqfCoAOlibg+c8CW56mru/SKKzkn7NIiY022QA0+Yddzy1d6ZvoeekA+n4WJKhP+Xe9Mjcec/wkGsuK6M5ViW/4okCGCbWeW0UuG4rqmFMJ/dH36jykt41dM8ItmRF1mS94yrCWI5plo85FyDF1Uba7VMeYbM3fUiHoqV9lX9IY0/iStoq/f/p48L3kIR1JRkv7S+cINxZviP6B0npelhuqqgwzbyPcESsARJ/vxH4dcePCy0uOrYggfsVAQtGHp+je3RPxp0Gr/xlD18mU85lCKIs2InxPMZsbauhlMS95O5TnJHW2WCuHranjXQDSsIPInxq4Lmr7dlvy+N7sJTFzfXlwPy3HM50KskRpP9mC0kG3oynRmEeGWFegnMW5O7EDEegTbcp/TdnJCDXAzhDg0twtqMlXNofKFFNqZ7u/LOV33yMXP9e9Cz/tUw6qJ4KUX5R79W/DlHI2D+rAkRX+CVrqIw0w8pvbB/k+n96xKxRHZ23r2bRBM/VvjrULzQPpmz2t4eR6WGF3vt/Vnj2gGoOWia8KDFuSmUQtCQyJPPNLs1dhjVncSYSylqiY2uB5T+KKRC+i9mp6rk04E46QgqwhtDYPdu3TCRyB/ODE4SppUJuiyP5rZseds2Smb0tz7toPIoGVWKdE9M0YGvpLMvClc7ROwXUxJr6YyN4LrhhMjD4oiKYZq0TRVahMZM113v/qaJw4pV0QdPo0D3VVPiFqTkBl6O2fGfoBTITfXryhkS9Hxg1fEOJCbWsrShNj9Bbv7U/0TguIyUVXtNqAxgNAkCvph+ZH0SFRrkYz2okOS23kQFPtfbELPYzO8eL931qCuMD/6qs7+KcXyqKUcO6xUJdiqqLYoa7JmqdjUdG83s8onJuk2/LDUFM8AbNqc= X-Microsoft-Antispam-Message-Info: HvC7+KcjlnF7yi7+Vap3F996V91bT5VTDcKmv/OEKm9+2m/pWB1/Catvb403TTOMN68LKG/JyznabG+edkdDBJuDnXKvIFJBEB1xzBq6v0BEF2oINWXiRwaxwP4ikBuhavX0XSc6UfvDEXNnWXSNeTmNJvlq0+To/LgcJgyYuL0X/FgcyKWoe3qzG04sY8alw9wcnI+yQIjlf3vmO3VnJXdbuJFxDJas/ZsN0J4AWMNc/ENpDBz5QSpFbGEM60MHRA404mxRAOGOIdHuAiNsZsiNSVgzpYFjvB+a47cw/icecK/PSdf1mqVVCzBuohoOtyePrhZc9ntHCAe3AaBQiLzTWiyjHVmEQGsG+c1klnw= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:Mg2KWNJbatoLseTv2zQAtztaAfFfiSJElpBzz/w54SsmCZhNSatMAMqdK0YrJyfUyGEkO4z0v0dvCoWDGo/7DdZHUmmp3kSp+syW/u9be9bEv2/c/Hc6BVtankEfDEWGfcu+fRLPzUqS4Jogb3GKaYjQZRrSvniJDwZrZnAtyBAc0B/YGbI8zFUGzH4Qy0kcqJfCjdJ7CxJYaeH7M9Vx4SRPgNKZJCPaQM6ZOVN7zIYXMV90eq8OWPzYBIg/SoIRg+chBfiabDcGc7KiVifRajxoVJADsmAn3NJIYKph2KrH5NvprSmtFwJeTDCVWZC45U1gZAmri6PvpFwrZI5Xt/WCz504pwmIW4Ya+YS9+2JqKMsk6fY7eNx3M3gw0q/O/LCiHO0v94GtXOqP/teJV11tPGDzIVyEa/Ik0d2WSv9joao1siqP84OOtQEK5Hklle5uU8OxdE4ZPL6aJeCZtw==; 5:jKUaIq3By7Oe2rDs490yF3mbudbK1cBUJjzynb6RLRNcr5l8lfda2UNiu07qTQ6QO1a55gekjvPMD1amQ5y2P4A/EGd+jWXV98zCybrCE1zNMZyZm96PpBUT3MbF/3M51x/ktZX6Fw8UMRTmS4F8MRJMVoT7K6yaWJBFTqQtIsg=; 7:T9E79tlOXZaL4Y+Ip1gq1qU8epfvpUtiImcJj9imR5AD2uwJ1o9UnVeVMGXw3A+MDh/1/4PYe+ySw86yxj+KXt6YseMKz9nCmpf42bUT0c0tdsyvHea6fY5SpLa5DdKSlyRQ/x6CRhPafs3IpD8aOJ7z++C+l6t+1qhRjiGFbYtPe5H/Mefq4PKWxIF1jaDx1yNTAdxbiBte3Z7KFG4KE+jTI8OpIx+5NRyI1zWqe52YvRoXQIKFFdTnHENLwCvb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:29.0399 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 631bdc2e-2dad-4ae9-a802-08d612bc4e24 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 5/9] target/riscv: optimize indirect branches 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: "Emilio G. Cota" , Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Alistair Francis --- target/riscv/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 0b6be74f2d..c769edc359 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -548,7 +548,7 @@ static void gen_jalr(CPURISCVState *env, DisasContext *ctx, uint32_t opc, if (rd != 0) { tcg_gen_movi_tl(cpu_gpr[rd], ctx->pc_succ_insn); } - tcg_gen_exit_tb(NULL, 0); + tcg_gen_lookup_and_goto_ptr(); if (misaligned) { gen_set_label(misaligned); From patchwork Tue Sep 4 23:14:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966116 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=208.118.235.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="G3KtmFyg"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="maqv51Te"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jQH5pQ8z9s5c for ; Wed, 5 Sep 2018 09:16:39 +1000 (AEST) Received: from localhost ([::1]:52971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKYn-0000IF-Ky for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:16:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXr-0000EK-DR for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXn-0002Cz-Ku for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:39 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXn-0002AQ-7X for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:35 -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=1536102935; x=1567638935; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=dDGKfa+j6KMJV1KE7hDNjZJv/RoLuIytIqJzrzBiuTY=; b=G3KtmFygD92s2haC/Of366PJNlPePhUcbeA2yWJOcjtosNBnWJIBtL2w vQPPZY2mWyprlpmYLIr2YpEKE+j7/8RX//7vyuJa+YYg7HtqEszkjwywO LbD8PaWbLiEVyYLPx956hLj+aml0yebw0mS5PYGsvNXtzfPit3iAjWLse hTb6YzTYVxeYfm6Q4wV0M9dMfhn4QK8yaC+PeUX9LMeCUzgUshxFc2P5J BwJPeXy61ZhCC/iQhgbBfgVOuX4TJGQlxbQ7sL1abVCbyo6Bf7eo33s2F yvKhMEIikNtJPfNk0gvDUn74RAx0k+gts9K9cbnP9miv+5CWfPbPkbPaE w==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179307" Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:32 +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=PvzC2fLIz72zoFPDAI2Dk+eTPwwW5Jzm9948mOOAxDg=; b=maqv51Tevlxokvdwa2HwyjGm/ku2tTbZ/qCzUBKUWugLPThWlUfKO38HiOnSKSbcpQ2b1TXbT32fR6szKWoS9OhqhW3whgtTNq7cRFpruoQ1ERQ9z5D0ZM3LD95rS/omvpDIgNYxfhjfEITT4oq+EBnTn8WCaZt2g9T3YNZrTYU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:30 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:39 -0700 Message-Id: <20180904231442.18932-7-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 61a070d0-254e-4a25-276c-08d612bc4f26 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:W03lMzcsrr5sl7k2sdfOXIyi7Hva+B+pQzEVNqJNsDqDJiwvGx8LE5Awz5/qaQfIa2OpqHet/RVvzvQdtFIGv8GQ3ge1zUwNkLp+I0OA2XCW4QeeJfcCFcRBfkghBpHUYWCMlfgPLkiwdddNUMFQy4RLnY1edKfAOzzuuu/gWGK4yS8GrEMmDajDZjua2ZInstgvrpO2GroDq3NTsrG8jveaLHNU8O2tYf0UzzU60ipjxaAABQvZGKeltRLVu9x7; 25:00ppP9aTiq7nLKHUFOyxCcvBtSBoS0Qtt9YgYEZPsYd2aoxjMG/7yVsUi6rh17NicqoPbX2K8skyWFZ5k9/yKqlCV8ANaWeRQt61nA8DxCj+w8ZGKOwPEhcMdwCl2XnMQ85cTFDQgoG2kC8zTKadgEmDfqmr2JtRjO9VSr3v8p9kovT+vIkldUdIz6zmzdjW8HtBUjcG56FxXE+h4/1K3gHW8h7g70K2tuWIQoIIPRFAnwGDqrvwk6WUuR6PEqt/Us+TsMF3PBhi9DQuqO8Ws4sVKdEKqioMEjXCIKz68N6ruUFbZJetFQm+xZfrbajo2l5M206aXPQgNccfzbAfLg==; 31:F65GMUCM74SL5N2lYN/FJyejibAJwbLIaw6kTgrlv31UnhpZfxWaArQpCm+22T2l/iKrSZqH3CyCQeqamxWtjlbYCaRyWteUcTVyRe9Ny42BwQLFjlIP36j5K91LcJ2naNBcJqzSAH1PFOqHLwUCGfmi2Byr/PMMmt18k7t9ubROmzL6+1puk02kHPd9JEpWMnMJOuc3GsDPxre/rGI3Hkj+nZUaNMOsT12WZR8yuGA= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:UVV0Qho5fXg0RBIZeqA7+ZdlgsNi0eOlWHdkxVMN/pSlMqTE+4L8kpZ7tHk4qLEIcB1H5yUKrIZj+94+3LYqOQpuZhG9hf8Qc7pl//Lm7pL+Rkc9W9sPQahMDr27PucLu0jBmeE7OVqtkS4qVioG+yxzaSNAAC5qi1kMtztkEjQFeQGs6sDm1kNUU4iqBgx0BdAQC1zsiBAtV3mQqwDCGcQmNiGD4NR6d2tPxqpkixQoBAmDnzzz8YqNLvrrt1CyY+HwBEdqTCzn78Y7e2QPEk8kUYDrsthKNDSnY2kKDVGpfQAJut+QHTzT79ckyTJYg5MExqv0zqWu0eG6qG1cx3b4FoAXlsXkFjg+TOu3ecp4ZIc7U0y+4NIu+Kiz2jTw+PlZJfIZrtm0hcXzs/SoB6sCkjMICRJCzXJBqJzftKy9YhnJXmu+Xg+m+ML2OnC9B23skw686K3JD/NlfNcVGbYOOyAbwI3mmoC+bSVlvLkNviJ/WlwEPzCuEHTz9lUz; 4:B6HD/l+gEr/4niCsdtric5t94dEC2XPA34WgzX19M4SXgDMf1EWYOv7GqAxHBOEIV1c8lj9B7RUFldVdooWVHamG3HkmF9pDRi+hZpGxejBJI52Bbk2OmR6n+tTr4BJm+iKiJ4SEG4DQXBIPf6OYZ9gn7RuaxfnL8BaRXfQ4NAyYFCN7N2t5UJIfSBBTFRWehaziOLLhijuWHsEHC9ooNMOsKaRXsMflTfi30pPpgcP1BOHDuwGuz6DkmA2NuBu0159qCmEizT+84FadcC2LtfdwNDin54K+KHdj5sPf3FtWh0f+39oi9GP+ke2ijwv7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(166708455590820); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(6306002)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(97736004)(106356001)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(966005)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:M5XEXKgAGydtHUDE2gjT2tyjcFrUwagbfnlwVvtCP?= DTYbDxZAzRn/izNwHXb6q8FcaFjclsU1aZ18MuoC9ZiqfmrHoIM1zTAS7qSIcVnaW1uzEwy5uAjOP4YNXAa5ztzpqi+n9J4CHyARMuPp9s/PFsZkT5+uBXu/2RTHcQHqUl3YpJMiIKtQ0msLcuhRWkyIEwck7HTD6RJ/zwmv2xFParEhx5AYfFEecZ5wukSeChkiR1mgARvv01/oqPRTSOC45vGLt472f+Bw2hHawCdxv5Tz3OfNlrhIJd7Qw9yb1KWXhsRI1KzctYeWapqBYWzq1U71uRQ3C6A4XyUynts7EUdoS8JDAMXILHixnf+QZHlVrtmOBraJJlRdx3TLhSzhP4Y7hx2eprn6s0M9PRneIqvFN28CCv5RZFtOy+gOFjhuTEgSjXTam2VFIKENqfT+ChMiisgih3r8nqREGTeSHrT4bWrf+chYyFCVXcXMQQtKnGwCEBZgJpi8yIRIuoV5Di6Qn6OPG0nyiyzWFOaESpyXN1BKiAchFyE/mur+Y0HTFZtcHFpPiz/M9pekmC/Yt/ujDOIqKcELOPvHGu6hD0yXuPcT/bSuro3ua9Vvcrz2ZlvganfPqscqrNht5DFuDLzrbZo01UoByQ6e8sYhLjU2XLh6Sdeqod5yo9mHq9+amrLoemgzB7yTZBBwuFbcJGLPka1Gx5dDawrWN7a3Epl/Yoxd9EiGlzBKbTczbvWVpptFA6PFZZeFQwQkuac/6cabHDGv+ftzLGMmBWtqx2/4VI8rapnrc+TQZde4u+k968cfB82Kn6skeutvrqJldoE0+WP5hXrQwhd7jhmC1uo08q86W0P5plmO726d0G+XcZ72Z37y/bW68zDpKpO9HZKnF1ReFZKCIPSU8F+oYyDHekOwPC5+JXqrcwBio9Pq5Xx+U7/UqjuOL4P+QHNKT8d8KYyXMucdN6OjfPcB0RIKmgdpvAt4d88bEqgEsoSUitijvNmXPcjXPZ3kyVHLrPOfCLsI3XxNAPl+ngYRN7ndzc6mXy/Eh68+gGb2kkmAfSpcP7L0lZ/bNxnewyInQyhzKQuUUd09J8M3YgAloz7vQve3pUzp6+W2lQc/Q9QpG9YpTDAcFtato4lzoGvDQt7gylfCbS3PH35atVb+C19+z24Qbw6l4qI6gidv/srO/6+3xU4Vtb3w1znNllmUcYMXQ/7u6boizuDwj0tQSwytE5ZdxysStBrpn6V8Lm2sHKtg6Iw/awrkBOmpUsU54y0uefF3cIV4sJjOpg0Vcx4ekQuOjWA+4LBWIQb6iE= X-Microsoft-Antispam-Message-Info: UXRDdEpK8VCnXm/YrarEYPh2SyqXFUBUVCeqLnboy3iANxVEP6uH+nQa4+8JjQJXZXDJiHGvagNuXJZ8mKC8AYXK5gByt86tcred49s9ZsE0KzkEKKc9B2v9fziYltC/6GKTIbQWJkrn3CsIdNAoVx/qTPxjHwBJyVZSrPA0sm1x610sOKr3/9BGDVf3vXqWjfk9p6PR+IC6PPUF32G19j1SOYYYinjJfV+h2vbXCSpQe0sJ6peFUgjLGoZ2KMjNU75ksojjaNNdLUdOTw9N1Rhsg9zjS8ZYi9FtNXGccyPTdMiOC2XuJWm1Kf9Xdeeuri93e0mq44mkrWSlccIvvPeaG0m9STBzRYTZA/RcrzY= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:6vIu01gWiirlrqinOYseQ8jt5Et/b1WvAI5fM9KMQd9ApBn1wpE0Zsvq1Yluo5ZyN5OVfsdj0FJmb+P5/cr4dOF8SP0jcjcI+EHOHGP9C1TBeIlLf/N4boTysQVMBC8g46b1wBXgrPVh2wx2UlMXrVMOqaYfYUKEsdWk4gK9TciICKa+4clpcFE4rHgiWjwb8tkxbj295ruHV3W6WzOvxmQcytANHzre4nBrLsQjzF0bneJdqWKlNYKJzskjqTNEVLmeq2xbNN0ExaxQEvS0G3t3Ei0aFms2bbL8ZAePxj1H+ZalGFEE//A/qqG2T1DE3oRMsnhEr+Ej6TMMHEsuPZsdjhld1IoaT58M6l9LbsZ/4PlmI2iVGeOS6Gctskd6NQU9Hb2S2m8inglBOsUsr/rg9pHR9NX2+0A62TqnF0YuOrQ4o6vyte1Hios3CESu87EpuUhEojnKSQW3adWWrQ==; 5:sw2kiwrmRvz/ej8JdGl4bN/jfD6HCyl6aw8Q5IsKHICfgu2VIaEmVLcxB6OvNt5AXsEGJTAFQwVamm1Jh36wrFW9DhIwj4J0l0YuweVSQPy+XPkiW561ZfiImTD5qlXVPaPHY/rlQTgAyizhfcefweu70MeaBd2IncZ8fulBqlQ=; 7:Y/bDJf0pGy1N81ZltVgNJ/gffaSmCUTc+Jgq1vB6I382fGIPcZ3P36bMZ+mL1i3tN2v/LP0KnCRopQcdJd1QEqV6iAo3t/1C+CmmuhvEEV+8REOYcMDlMFKmQtH4p72ipmfIJ5GmLR0y086FS5bXeux73dUIZiP0ZpfH60YFf/5MqLST+U9y96KEqlKfAMTUM5P2YYu9+1FheKCnC9MDlpM53CU0nqwczlO/WGuIfJICdX7taJNfihTh68iWJNYv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:30.7118 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 61a070d0-254e-4a25-276c-08d612bc4f26 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 6/9] target/riscv: call gen_goto_tb on DISAS_TOO_MANY 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: "Emilio G. Cota" , Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Performance impact of this and the previous commits, measured with the very-easy-to-cross-compile rv8-bench: https://github.com/rv8-io/rv8-bench Host: Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz - Key: before: master after1,2,3: the 3 commits in this series (i.e. 3 is this commit) - User-mode: bench before after1 after2 after3 final speedup --------------------------------------------------------- aes 1.12s 1.12s 1.10s 1.00s 1.12 bigint 0.78s 0.78s 0.78s 0.78s 1 dhrystone 0.96s 0.97s 0.49s 0.49s 1.9591837 miniz 1.94s 1.94s 1.88s 1.86s 1.0430108 norx 0.51s 0.51s 0.49s 0.48s 1.0625 primes 0.85s 0.85s 0.84s 0.84s 1.0119048 qsort 4.87s 4.88s 1.86s 1.86s 2.6182796 sha512 0.76s 0.77s 0.64s 0.64s 1.1875 (after1 only applies to softmmu, so no surprises here) - Full-system (fedora): bench before after1 after2 after3 final speedup --------------------------------------------------------- aes 2.68s 2.54s 2.60s 2.34s 1.1452991 bigint 1.61s 1.56s 1.55s 1.64s 0.98170732 dhrystone 1.78s 1.67s 1.25s 1.24s 1.4354839 miniz 3.53s 3.35s 3.28s 3.35s 1.0537313 norx 1.13s 1.09s 1.07s 1.06s 1.0660377 primes 15.37s 15.41s 15.20s 15.37s 1 qsort 7.20s 6.71s 3.85s 3.96s 1.8181818 sha512 1.07s 1.04s 0.90s 0.90s 1.1888889 SoftMMU slows things down, so the numbers are less sensitive. Cross-page jumps improve things a little bit, though. Note that I'm not showing here averages, just results from a single run, so with primes there isn't much to worry about. Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Alistair Francis --- target/riscv/translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c769edc359..72d34cd4b1 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1868,12 +1868,7 @@ static void riscv_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) switch (ctx->base.is_jmp) { case DISAS_TOO_MANY: - tcg_gen_movi_tl(cpu_pc, ctx->base.pc_next); - if (ctx->base.singlestep_enabled) { - gen_exception_debug(); - } else { - tcg_gen_exit_tb(NULL, 0); - } + gen_goto_tb(ctx, 0, ctx->base.pc_next); break; case DISAS_NORETURN: break; From patchwork Tue Sep 4 23:14:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966119 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=208.118.235.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="IlQtbcnM"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="jlWrTjlV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jVn6yTYz9s5c for ; Wed, 5 Sep 2018 09:20:33 +1000 (AEST) Received: from localhost ([::1]:52984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKcZ-0005JE-Pj for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:20:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXs-0000EM-HU for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXo-0002Dm-EU for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:40 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXn-0002AQ-Vu for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:36 -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=1536102935; x=1567638935; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uJ7jgo9RsPUtkEsJH8ArOOdO4ODpLH7TDFpV/X6kGi4=; b=IlQtbcnM6CvQqfykz/39H8Dtucm92bTH6fBgnrWS3Lc9chkVwaXHToWq 36qiSnHBk9o4LYAERjENLvpXdyl6oXsYsS1CVRLYMc/rpz31W5+0juSs+ YgsJjS81zWNMVAthH2v9B+6DNG1C9LjU0c2/7LimvB/OAOEyg1nhC1S+C Ufgg6dE3a5zrZSMFAZIxZbl8ZdkPMdxcO1WznMAdEJVFXtuK+beaTVRA6 acyXQwx1QltPv6Ogo/nMpwgJur6Y0VqNKuXz2Hpr1MbzAsqldHfKWeE1F iXiZzL2elYYOX/SmwSQxmTBPMS7T0z/0IL1n8m0WC0K9SoFv2DPmgiTfe w==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179313" Received: from mail-dm3nam03lp0016.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.16]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:33 +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=1R8cvhmxJG01iNyNR3VXa2P8Ada99u5rB9veeCdcBl4=; b=jlWrTjlVGmI1BDnh5C0EnakS3KURxCtSLI/eCb3sOe2t+NH/6J3hACW/V4B+BDw25LhapI+AS26S9xz+yJrBosmiyFfJjVoBociiuTUKwqwYS9QfeS2c/SoPnwfdA2XbDX2/NjfEJFvqCoET2dkMcnXSNcu7Hidc3XWebe1d4rw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:32 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:40 -0700 Message-Id: <20180904231442.18932-8-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20f350f7-705e-4008-1d63-08d612bc501e 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:jknSAu+BaOPLej3fCOKCqpDJuR1ERL1myCeXRFwoX4pnSGlwb1EUPozicPL1oR3S3iAuALsBhcZtY3EbCE6s/PGh89wDxf7mPwpEhCkHZzPlU004gNgQyvEJ9UPD4Khrq1nJsXfR3OejCimfnRAojxYRtJvPgJxQ4+MXXQISuq1NmNn9xPs7gRTCmvANmrqc98bbO7LGEv408gh/Py8WzDxie5KgfD2yqc/nsK+dcI746uYTqY7x7CAZ5AjMamQT; 25:FLkfJxKuEfBJ4iw0oy5aPNM9T9ujdysR0x7Zi8cyYMS+YIc9PtjMJM+yv/Bt772wVIVyq8Z/hw048FMvifBdDkHxxjOlMTA5PA/EUV+Rulvm3gboDd7CUBYVycEs224lTokAlt0scskx/xOXiwcrngmFyjZSBVjOB+pQH587sz6W6r+DI1oJBubxuYSJfr1X2/3sacJ+X1uLbO46oUoD8p6KoB/vNqN8jDN0krDDLEwloGVJbgpfiX/Ziuoxv0CW1PsiL00FjQoHncCK9mdvgdFuBlzYOWpymBTkL/NdnQwZ01b7v9gGXayc81swMVegFizkC9LokzbAT+6ePZDoiw==; 31:Y1ldICcQgF1K8mf80+dVTETJNERo8BvWoScg2OR8zTyqyNa9+rZD3rAfAEoIf7tfjY9wC3Yji9UAaW4o7mDg4YBbAp+mEP3EBbBqh5TxkDySnuXBAP1BLk8rfa2lkecf8CBco+AsYNDwO6pmiEXsa1ALNdAxY0CPIxx++ykwoPUmZF97eTeoGs6Cll6On+9IsQIdNRaBjWYWEcUhyfMgScN5HboxHryAQWRhROm1opE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:7FhEkqAqkA0iJYL5jFO5Xj0t18RT4Py7VM9AzcYHYQxXtHzU+E5AkDUlY9Opp6AIvRSIZ9bO74DRacKUB0eneCCZlnulzeUG81diLGEghlDwzeUIMDEU4pBOmvT/0TMEoJzzqDxxxTDllq+iPQD6e6XTP9VjK5XG1lii22Q7Gy6uo36eszJIfkS2kVnqYKhVpC7XjOyo00+WMzOnk+mgIpPMUVao6olOz/8xzOQjQvxOpfUXB7AHLf/GqnqstVGcvSBJTQJzN5pEcG/VF3bbVoq1yUgItNHpwXfBjtH+mtyA4MieMQCPSVOr+0F4Kt2i+NtnelY6HPwpjHOb61mX0KUhnkDWaJFJRFFSL6MEFL5iQ8YZCtd4DvJ22FjIaIK7Vr/VQIHzyS4k3lJftRBkFrMlszdYK+Ha86iiDC57V7kWGAepTwa4l6lbEXYJ9IgW2R5C3ZRyiZqsPAZwbAs/ApnT/R25h8ND4mY1OoPsxg3DTpKwbjzU+BWLYtnd8OLw; 4:IhIQhnH5AD9Fzd5JCQkH/BhoImGULLCI1EHCVF2lVfD8yW0UzRE4/Av099O0hakJkdMg77D6GtdgzFPKSbejTR7n89s5MiCfYb9XF3lcDh9CvvlJg3aHvqo+bttH8/8hZkapLa4NyZL4V1K1ClPGlkI/tnBXtz1ChackBfPmRD4PQJTDFYOY6NO9BEV9VDDwZK+plCtDH/YyIVPSyYNRtOHj4T0oiMul79ySQhOGO1/AZSePE34bYlfXRibD81wr/cv7UIw7WizEMJyP1na0gg== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2870700001)(2906002)(486006)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(23676004)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN6PR04MB0389=3B23=3AZTvq?= =?utf-8?q?WpT3m+8PDpGl3eC0nTAYgbolJtwrx5sKK3d0XKEQqYPzoAFEg3Cqxa2Y?= =?utf-8?q?cILsRAICR5dTRIqCqvjI5W5gUJInG7HS30PE02ThpYZ+bknebzvUgjSK?= =?utf-8?q?hBa6tV2tn0rkfs7MKtAZeknT1aEKwQoTYKxmYGzDzEConqaiueax1Dx9?= =?utf-8?q?XaCw+8nSqr1SFdBebHERxeRdsTdAegXHg6n3PRC1RyqQrKrOXq4aw1qZ?= =?utf-8?q?3cNgqzXXTrn7N52UCsd5jCQDSPCBp35I12/8pTlsYp6x93f5WbKAwbay?= =?utf-8?q?LY4yU89iYAp0O8+PzcmcLNmgT/Rc0R5na1LJdJDd3pw3MqZiwvoHQjOD?= =?utf-8?q?pBailjT6fYW0giWaTVb925I6HA6SOqaHCxVYgWrJXDhMtT4YJLB7PYJG?= =?utf-8?q?bi/CQCgOr/haAh5yiRHaAPg3P8z0+hiCop6hDIdC8cCq7WMgASutQHMm?= =?utf-8?q?buqGMpaRVe1V/E9MuWqk6d71dHkxXi4KZ7IB1P8iim8opcMDLfAYtEoG?= =?utf-8?q?Ra8fST1BOu7/emvUn7bsJESWOdXjUa+OLvSXvAPYorU2LAak8vO5/HKO?= =?utf-8?q?rgMtycXW6iKSjBPXtnE2lVNaXi4y8FkyzvdH55ok6Oa+rMpZIdypnB0V?= =?utf-8?q?7zTJ9NGrq2sMqFmtENzTHyJANAZyHLLIP+j0mR3saGmSTpAXNhw9Tc1X?= =?utf-8?q?/POemI+yM4XZLrMUcDwf7arRlqINc0AGJ5RGYt9BtBaNO9UZLk90W9Qj?= =?utf-8?q?n+Pwx84SdhlJs60f6gs88GuhtJgHPpA+++2ED6S5z5ovVgSbDU+Lqqwx?= =?utf-8?q?Fb5Aucf6wnUfDV9L8a0tPewhpLt2qxTLPtg49bcFj1/KK5QhZ9YxNHyi?= =?utf-8?q?w8eP10PQjjyvb73cBAvQVoI8NHHXQ0n4xX2oRg4ss2DXQ2OgxccpcNdf?= =?utf-8?q?V+hk7RHMXOHtVV49Xu25eeWNENVOMvo0juY6R2VqGG4wQlEycqC6lBSu?= =?utf-8?q?ztG5lct+Yb7sK92Ns5lNemZDtnFNp0/qpNXfyRrTtjmfzcVsF+bSrWy6?= =?utf-8?q?mzbJmIFNIhFE81jchA/BhYw1Zwie/UGJgfa5TfKB9fyAfetEvu+vk+PZ?= =?utf-8?q?9J+DUwK8K/MbjIZlZXK4cfGxmWCmyswBU4bue4DdqRB19+rZnqRbjJU0?= =?utf-8?q?fjRwRW4Fyk/dtCxCg7rDujONS845jnp4+mkvfg9ZGTUAiN/3nR2WSQL/?= =?utf-8?q?+2D3zEoEHJd1EpQWcQ20jAPZlTWOPJIykRtE2yqu6NA9inNd/H3S1wMm?= =?utf-8?q?/9Kz2BYUOGbyA7MtNO7yUJdNKAe4ubfB9h4YudnU6M78?= X-Microsoft-Antispam-Message-Info: G0FjDcv8ri/FepAYi5WrCBH8SByeL0ROYbaiY2UDgLqipWgSWSnWtghUDEz1rwLhcf7zhoTyWZLTx4NpV3wpLkHkCj5iHv5zs3ykGOFCoBUdQu1oeBAMDZPvxOSLHs7BMG1iabRh3OD94mAp6et5wpjpsBvpcRCdf1EU/sdZEFfxLuHaJ6rfYQoEd9Y/273xFuuqCs1/ZjS46R+GaXxNqS/dRcIU5NPaEnigcSh4xTPgNPz9pA6OF9Wka/pavfK+CjSN+Jpg4/rKk56EbLD7vpXl+dFv3T8+4OHL+FZVmHt0gH2pquJkJA38YyQMv8PybKqFLrCMBFjn/GFIOANVsJcPzO7BIFG4Esvr2Cj13DU= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:/gKX/bNfakUWMZ+F/sb1QAjMcjh67GvZgI8FzWg1EY0jC4FY2bwGoTanVSmElNll3F6vReVO3ucpb2w+MKx/NK7K27kZ5VqqPTIjbGzVvg2h9jR3GMivOprWi9IxZfih5xpUtlIyka6gir2nbhqJTMmHAN1j3ch/L/9KIQ9nU9UIzAX6edK+2sTOXOrk0qRm8Zy+9iqbili1L+ITPlgQgAFriJAA+fNyDyiBeTLJ0G0xX7alPSQbvJ2PdkbSOgBeeZLiskU2b0glvexeJSjzeHHueltdwItGoQKXoUFNZVG8I8nWAMa5ansyI58qRGjYEv0uHX/kFokIEJWPWFrb/PCrIy/ADIaDlRG9x7pHUJXNgZlvXJZyVbTMnsIgxFciNeHOa5OWc9ln8RJoAHAhyUF+Fz1TOTaiuNucrcMcueTJFv6Nyx2rQPSC4W54DOQc7Pxa47n21mKjTpHmakFxQA==; 5:V5vGXz5RLJJYZ2HZbBSRuWcgM1dhUHuioa0NFRWX1JSIDoN/PtSlAjeEr6n80VJ7ezoCQnWPXIGCzie5wJk3axFxHtEs6/B8OJqHDHpFyfHHqntEGMgImO8diLxdThK+GJL5HOAE2aa2qcHrPpWF6DIWDqYwGsgy03NAJb6lUmw=; 7:bE019E18PbnrRFOQutRRjhUy8VRQR5EA91quLDWcTj0hGUaaM078Vzs0coU4lBL1iDjO5LYkJjELQb7UXTuHhhg7zEfcas0wej0Xl7ezbBKVHrBs1JNY4Sb2vuTAyeFGBck7XoeRyzwvwh63uDrRb9SlqMylF0/TzhHP7yF/Et/eLELz4HbDiKavkvT/XgVx2iwn5EGvYwaTU7qJaIw7KM32+WaL89L9lBbSBA0o4y81RBEQK+JhP+7Dk5Tf2tB+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:32.4306 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20f350f7-705e-4008-1d63-08d612bc501e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 7/9] hw/riscv/virtio: Set the soc device tree node as a simple-bus 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: Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To allow Linux to enumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé --- hw/riscv/virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 248bbdffd3..e8ba4d192d 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -121,7 +121,7 @@ static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "riscv-virtio-soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); From patchwork Tue Sep 4 23:14:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966124 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=208.118.235.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="eDvoB/42"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="MPYYZnOa"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jbw6kBZz9s5c for ; Wed, 5 Sep 2018 09:25:00 +1000 (AEST) Received: from localhost ([::1]:53010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKgs-00024r-2X for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:24:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXt-0000ET-Cg for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXp-0002Eb-5z for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:41 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXo-0002AQ-RI for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:37 -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=1536102936; x=1567638936; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=benC03lmwJIzz9c5DVIbfQZP27HsrixbgMqUukS8D7A=; b=eDvoB/42hT4di9bxdNsUn1GTH/765WzmeSVYF83mAcp/9qXWD3+oyjNk j6IohXsVGz9LNV1TqNWL9NB0w5Rpq3A0XtG5btmFv8wQD25UdUAxWDeyE VHvZ0F2etPFoc28YLXKLZO8MlWZL+vFG2NO465JWxIM0SLtzBEBYCwKhL fpKsvMWJYZLRjuq8W4umMUgGccOE3BohBkYQzk78on6jQanS1ABtqOaiJ cb5+jguvKNbt3USo+QNZjSukG10Am6exVcViNYZFaotwCCs6O+kmHbwFr cgByo5UvwNvhHaHPzKpBqH95KngeEOCUU1Jx9Rp6HcE8R44lxefMQ69Yb A==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179319" Received: from mail-dm3nam03lp0017.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.17]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:35 +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=FMmbsWZNTUCz7r+VpzW/JVIhqn9uiPAkQYQHQwDEcs4=; b=MPYYZnOaoD46PmjmC3fgw8Y6UdGGu5Pj34Tzbfuj99YDwG3DHAFpU2DFvJn0cZOJmJfzvbVmLdN+gal+4TWsydDTfJu86uQPr0MVP5l40Xxxm5EvqB+jMmyPKIIAGSTA7H1I2JDkSa2jBrldlkH2dpXp6dQcS2bdkTr8pgxVD0Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:33 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:41 -0700 Message-Id: <20180904231442.18932-9-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 633eb9a5-5737-4712-76df-08d612bc50f9 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:xl1c+xvNT45q9DOAvI6aKbCrnOn6xYtC6ravuq2Iuii5AuDWgxhm6xvHjb3UWo4QKfA5B5vDYi++Ymp0iRdrwNk6FFCYE5lEcseYb3Lpts+jntciafsXMCd1EvA2u8JZ8UemsRDrL3CX3H5idFiASxz7zcOdanW83/PiCnZrXCRXZJaaRyxIX/WECEzPdbZiIumLGpIrMSgT0lhVtbIRgSjyoboa0STW7DknjY3IM0Q6/g8rjQNLVaqlIp4zl/qL; 25:zMaEYQepewSsyx3TsvckGYXv+i3WMnJ0ZTtwJZVXuVcCwvQ1Hj2nW1jXRioJlps7dmyDXZBrwQKz2mGTC4VrYISBctm11rr1bpT62n7HueSZRyNgSJco29Jh/TtAD4HZkNlrTeDou9+eYqisxTHzOES79tmeM7F2G7SlItgRzbixXK0uiY/ch7FlLxtvZI96BKaHb68QW+GWiESt+JcJ4ISYvs4L/pwJGmi4UoNhbFxqJ7i7gy6JW0cr3iEiuHbIwPlxxhW7BZ4u6llT0eeFMmfj0bzf0HFDrlMCn1oisvE9VU/BZABU5pdE6SnjXW6SA4PyVibJNwGRde+Qxlyetg==; 31:Jl1ScNXbKqI2CxNX16syAtEsH0J54eggyL1GpLOtqNDxeEou9YQNKqOHESxA8XowDg4i6JlKJOT4/8kY4R/rPkMsLE4eCDhvXMz5o+vUkRRijhCi8zLPq5Ry/zr2L8ogISZK2pACLSvy/nhC+PUgA+Le7rKUuSPA8OYS0bZ2qyk3VPUbSoT/SuTdKdr5FngJobpOZRS725aVVwZcltZ+qsMIXAoTykOmu8g+6qlbwhw= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:V2zlwNdI0F91GId18wsjbKNdAbYWTskydOEgzW33/Sx9kK/87tZjGFrpwq4C8aN09NEU3WfeV2pcmLHGJdS+eWVXR8AC8LnN9Kq1M4WVQseJ7Uwsc9mUTnQpQEyPHBMUuxlYFUwKfmooNXBNnwqHiCPGY6ILnGXTH4FkQMxxQnXKABmJ6dEeYzRIl1aMi9yzgO0zZl75/9jkVacMttVEfqbzBVpZ73d+tSvWGkaPNFRRHuiIKgVl22imTDYQjJsZjNoGIc8vHEJwlWorO/zv4/WI+kSmqAkmIJ5ikaEjCvYzH6C0ehQR//zxFoHnAJ64es+NR5BXhkmhahrFNPloizwx+s4t7aAd91abMx4N33kKqtvZ77RlhXiXVxqjpmvSPczMbLuzINE5LPI6BlqcUHmyNlBOeD986tz3CmWCT4gkr6vQznj0h3LuV0PgHnJYNkCWnMGczIhM0TLAupJOlf4BSZ9GhMLxC1BdEMPtd/IFmcxnj6V/z9sEzaMVt+FJ; 4:x4PB0pLkbq2+t7bdlPrkGpqZs+3TjcDOCdMwhKhXmV7fs/hHZim2FCBEd2qtqPTgQwlfJJBlc0qq422Nip8hPwGJNZWr3dGKJiGLUYmBcKiXeiT6uHhXIKsbm87lxxjIezr9YSqwBv/ULRk2XMpgSzzgwkwJJEWVpqxTQ8ZDYPNLUzk+rk4JZX9sMEkKiNmvLB5QFuOAdoNQ2Wj5nkaotLeUO2y0qJY9UJoTnfB65qBOBJKZHLHaDogIyCuvARQoKySig5XwAcZerZopH712kQ== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2906002)(486006)(51416003)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(16586007)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0389; 23:BWR+2l9ejtY68CszizD8Uk3jVHPUqAXwgfMkDnPUq?= hC8eIRLNLplFKcoscW4UkPGceDapLw2eyKVjM/glNfGGEb0cvwBEqOhfc4r09cvhq1X6BdfIZv07hSifQbYdw2MC5iX65f+Fou4R3FBEiLLxgq8pLSSAlKRzwtvFEXrKYpi3zCP4Arj57Gchi0qXoyaGIVTKVy8WyilY9Ti2pdw04ssWgFD65XUC8r20xbgbv010LqTeOOd6kncld0cuFmn+xZhKml+GsJ9KVjYWZSJK3ic8LM4/ZQJ6GJ2PoKiBNw14qBUA4VqvgMPgd+yUHPxVfUgkLXjQmHYPz6Wjn5EtdJbfE+74YgFUdf+lGCqgl32DLgmf2cNm9wIhCBg7B+4ufIHULr37WEeEGKvZuJi9vXB8deWjKorG0ATCR5x0Ywh94HFhI4YvhIqF/ZYQfysxpa/Vq/EftdGqc72L6nFWP/GMmMoD8crYV34s9zxU1MLBdGB+SblR+ucSXBWy4+ctC/9im9koPOVN3B1B8/Dw345tKLLpQ96iLZCYtgvXc9WSj4ZIXzdXJHjIZVgpDSClyh9GIBBDxUJY3FB0lNn3CeAJaJ6ef7pzjmlenMF7ckHId2rOWoNvMNiAUM7Oic1bvBaxmTJG6my1/Uv0KaPMUkAML8HJfo7pVrx9YE5Q3PNpkrabsGlS1M02GVFdgt+hOFo5SOxL3UYMQf7Ri+fkMq5tXhijvHBu4bzOmzW7fOgH7WQP0x4E77DCtydvwh6ZrQV2rLU73wU4E4t6gZMpq03L9qJqroRFwT4I6nIvFitCZRfKSF+3td4ni1uNIaHIM8nJvPppLoNxziIjg4m3/HUdzaeGRVg1mFO+cLTsDLxZwcW4m7u7BP7iTw7gDXFlCh6HYRmXiZKONXylZCK4hElSL9yB/2rHE5ukYTVtVfHQhu7XbWtyf/MxVHK0Os8pp+RSDaW6KBl680zOZ0jhOMehWS1JaNYxtU10X7ysNlutlCnRgT7G7pfAS4c57qXsoESi7J8Y+HO2pBtx0q0Tqk68bS8G8AjO9Q4r2nXDMWD7N44XoHDUMk3KQWuF0SjNU0ExjSUzJyY1u9WbuGqEGDGULhNBYnHdpiQKAtAq6F4/6ZM+kUTEJk3kiDSFqQS8/bXIU4HJlSELDgPSDuaPpz9qN+MRsk0PX8z8nmUF3kJvOPp1Tm8FaEjO3yrdR7sI8kQU/ZcbFnfsaTsRGdiusvl77G3K3keDuxMEmfWz66fgxObTrY72V1nmONP4sr6AJ3O8pBPdTH6Gg/StYOQyQ== X-Microsoft-Antispam-Message-Info: Vet1Qemn/EEt/tFDBqfyHrwgTCQrNOc6QAaogwa6yaVIuYXWvV3UICn6GFIOMxbkkAmJRSfIn6rcEZDY5cQI440TP32o4yBVoBFKiFB+FxkTlrFAMhM8C3stHTbsIixuZ8RvO/TopQHldSPRVvG0/jVNfySB5kpIfAmoTGh+ruNsE7uNxq6PqlfQbhTuGPmQ/Kj+FgrLYrQUFPIglFirH83vbXXyGqg8HWcnCnzuA7gi7FeH/U6qVbrtAHFwnF3GiPaQ4ehep1SoBXgykn36XypoyUguVk0XnkHFSe+scUjmTvXp0MnOv9jAYtTu+5hKY92SHpdQQy4lLX2RLC96KN/JN2ht1xFcSNfFCMZOo9k= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:aC9P0uct+O8CB53pBAS9MroSBsXPlI3A2Is2JO0+oKH8wDlxEoYhiyS5Grd7RytXjgII/RLX3t6QHX7ReXIYR3WNEZx+zTuxV9teF1xH1uhvR1V9sXq3pXVw0m8EwSkov238JuLbD3VN9D0mf3FHoM+w7W+uPLyfWS51r4M313VDyVfuA0Jo93PSaX39YT43KRV74KeH9vw4PXk0qyaSp3d8Cdn0B6DmEE5OdFa3vVZRnPcNkbr3aELUTPghgT/hwKySRkWyEVs4v8HKbqqGiNczknRUXTQ5aJ6AD5aWkhaj95ASpMAJsUh9x1wUapb1lr9ewkLBLYwoAQ6Khb0dT81UYMwynR0eiHUZaKNkX2gLOWAm9dzi24C7Y3ktVf+6NQKEcGGuKYbDzmza3jCBKcYtt2/hXvhYErqdwoSGBvZuNSuy+5BPMnEBqDD2XJ2dg5eEUhcnGVuOxjmGpFLHig==; 5:zPIVlu7mM7yU+636wJ+UmZz5sHVrbkyqSwTrnK2yuXT6Hu8uII709bL0tYwozd63m1fxd05VtMUSCkAlsfoh2Ngl4KMYPRdUPje90QjGdPo8cj0zFPrln1u78BPow0VPqLRpPOqhU/N1xiS3R7I0RZY+YfzuPR+bpsBL8K1dN5I=; 7:CE1TTFZIL4qNlORUFaRNz+gSVllLbnU94+piUQm0Q0ALjzSRqh4k+j5VVD3Vmkt3bzMalyC/PofdLYm0eWdvOmqMyli+ep3k2CM++HH62MHe7nqew5iy8K4h8+wOnDeram94lOYtA99p2QPpXhzsvQa6g1kw2kv8QjkciZEI8Y6ks8HEfbrBtLRQtt95ioH5NBI5fG0NS9YSMVn4haJ/0mOrFp8IXV/0jHg7FSY+gpFRBN9yN9Wcm/1s7PbWTmHn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:33.8525 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 633eb9a5-5737-4712-76df-08d612bc50f9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 8/9] hw/riscv/spike: Set the soc device tree node as a simple-bus 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: Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To allow Linux to enumerate devices on the /soc/ node set it as a "simple-bus". Signed-off-by: Alistair Francis --- hw/riscv/spike.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index c8c056c50b..eb857c434e 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -90,7 +90,7 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap, qemu_fdt_add_subnode(fdt, "/soc"); qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); - qemu_fdt_setprop_string(fdt, "/soc", "compatible", "ucbbar,spike-bare-soc"); + qemu_fdt_setprop_string(fdt, "/soc", "compatible", "simple-bus"); qemu_fdt_setprop_cell(fdt, "/soc", "#size-cells", 0x2); qemu_fdt_setprop_cell(fdt, "/soc", "#address-cells", 0x2); From patchwork Tue Sep 4 23:14:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966118 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=208.118.235.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="XKg3o9zq"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="HdWSTSbl"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 424jV40sLNz9s5c for ; Wed, 5 Sep 2018 09:19:56 +1000 (AEST) Received: from localhost ([::1]:52983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKbx-0004xm-U2 for incoming@patchwork.ozlabs.org; Tue, 04 Sep 2018 19:19:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKXu-0000FM-9r for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKXq-0002F9-Cg for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:42 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:45245) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxKXp-0002AQ-Qh for qemu-devel@nongnu.org; Tue, 04 Sep 2018 19:15:38 -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=1536102937; x=1567638937; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=459H7Kdh+x6HYjC7AnT393pXGA+aDVN6UcrW3+N3zMA=; b=XKg3o9zqW8n0i4Tn5vAOOjayhs7e+2x3ObjTcgTZe1o9ifkCmVE3TGBo MsQeUuqAOGFeJGyrOcfpnIFwfi0HdWXuttxz+4c9Sz4hkwhoLoHhjzb2W eevnmUy1aFv2RLx3gMfyIb0gNlzvVKZg44hxLdZqtgb098AMDgAFbGY3g JpsSCYm69BNnn+FAWd+RYn2jXZEig0lNJx+eWrOS/bV6ZbvSJJOQBwPC/ wfFw9BRP9pWPA+FeNAaotilDrEXf9qDx4qZDZNsjo7S+i9Sr6Bti3Rx5S 7c4CYcZwWBjrlFIcRN7RJNF0Jwv5dp9RhzZCOzlXo1Hqq+MbokmprZu+S Q==; X-IronPort-AV: E=Sophos;i="5.53,330,1531756800"; d="scan'208";a="193179323" Received: from mail-dm3nam03lp0020.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.20]) by ob1.hgst.iphmx.com with ESMTP; 05 Sep 2018 07:15:37 +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=JmKrM4bQica3f7RYw3JMsLS1KnZRg8niG+YlJ+iyAzs=; b=HdWSTSblCyYgb7O2FDXkScrJ0KbSODDHhf6VOeJi0NRwllaX/4hbDkPm1oZtqTgeqiuyoPH2HPhhIz/EjAEsKk0j6OsUoR/7UxvTp9mSmFQ2v6Pys1jtMcbN3pRD6WXbI2O1I3iiTjVWz4UAu3/yoST4m+6A3C1K8b1m8B51nlc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Tue, 4 Sep 2018 23:15:35 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 16:14:42 -0700 Message-Id: <20180904231442.18932-10-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180904231442.18932-1-alistair.francis@wdc.com> References: <20180904231442.18932-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR07CA0023.namprd07.prod.outlook.com (2603:10b6:a02:bc::36) To BN6PR04MB0389.namprd04.prod.outlook.com (2603:10b6:404:91::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9975ef25-15fe-4a48-f77d-08d612bc51db 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:BN6PR04MB0389; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 3:EEqiXg8ST5gF5vhSYPnJxzBqloFDQ8Ev14UiYlZADMsRN2RuofJ7ma42RvmcpOA5cWI1dEEyDqA+EZs8mQdVkvUTy64lkE9885eLbYzhPGcAI2/lPVsYlJuchpgKzdrVKj9EDjNGMN8h3uv65YBlB0E3DyLnueO6qDW+ctanZuj9tYkICq+IbstVdB/+LocKpmul7CcuyhA1E2Cq/doK+njCCoc4ABlEspBZVIBdIUItWi2jCyn4IjGlOsi6Jlqk; 25:/bxhfcAniGkcvVFgQ+RQ4U+/BmbtXgp6deVVa/n9PUF+M+DqPbjzS60GyvIY3ZY68f4P7KvxkIbhV/M3IB9bIxCW1tZF9I4O/Ehqr1Je2Lopsu+HV4uERywfo2xZqLyItUcnVX+ChF/ssQMIAY+o4C2vg1eBWw6PPReyMAu/5xjMlUV8pkKQ/xBZi4I7ZAv38Gq0Av5mtCUd/7aoKd3pXZPnwZ5+7LFoFGVnnS1GgsznvLMxf3G5rmI3VeiN+sBTs/hIl0LR1WhLR2a2vRnaqOJvdwG3khnAUBZt9h3olwHRyG8PHCP2UPjYyjiXT8O9uglw27AJczRyQw4EO9WzFQ==; 31:j6nKl7drOA1OnoyTbUTKBeItcIz8HmnEyT6siRNLoXSSj019VX9OJYU/eJm2OLdL3DGeu9/Q01UeLaZkiA39Z6HoL+lUFysJccrwb0mewECv5O26Egl/VjkEybuzSSqw0PbhOIN8XsVzNt2R8WC/lS+KbbIZNg+zWV8efblhk89HY/P94fbDlhyfoyf6u9cX59qCcLqT7XFkurWOYeEwTu0C1ljJVLEeTMo/1ACR+rU= X-MS-TrafficTypeDiagnostic: BN6PR04MB0389: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 20:9WYlGnwdE1b5cb6FRniwFg0ZN92Oad4OUFugpkxYzhwNbE4M3K7pA7rtj/JlaStclzsDum/BBfc9ST8L8Ljx5fJOl1ySi+/erhc+qmVGvSWeDkAOi77bwV5Q0Y01pwA2ENdGQJSzpyulUvyUQUQNoMGAABw8BA9isz99ipHw+SQ6obiRnK45Uwqo11+6Jaa3y7SNunSYL7PnJ/YMzT8EWYvCBlN/znT6emaqT/n3KRos7VKuh/1dg8b/Cyjn9u1VQRJ4+sG7SzYMb6kWUG8KL1sAEUjM5sHUS9FXcr88WszUdVo66fck+c0nHs6YlmunKUNHZjzy+4c2WF4r+d7VN4lHlN99Y2+L27fWNcITTGYmsM6OE2xLip1KyuYZq3Y7OEmjw3dY6n5Efvhx/4kdQpEv4XG92T3MrdjOKya4Y/w0vsd57IoZpQz7BkzJTISZxB20XEic+fc1nGA5INiTS38YPyYQAqXq+K7lZIyWnU8niGkKkUgrB/+RJVFHL6rF; 4:6jLJp6h0eyg/Gd+MmShhT+hALp1lwpcX5EbkyCix5nctsLhtJ9fcbUZ9eVHVJQzvpCg0+O3e+z0JCrE8AJiPT3VS9LflJxCoq+AOZttPSwthy4PqkjPEh2cAwa2CK2G7vrqGLbBPO7ak/p8xWZThmzDll2Gwk9iu60tDDTUNnvJZmCHZ6qPX29SyDYaSaayhw6CoF3GF8TBSOyHNICcfCjghtP7Vln1q6oLgnpcNnpYKTfgLIdj5gT/nqTsqbdOfTl7sHKcfL2j1i70y8L4Mkw== 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)(3231311)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:BN6PR04MB0389; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0389; X-Forefront-PRVS: 0785459C39 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(136003)(346002)(396003)(366004)(199004)(189003)(6512007)(2870700001)(2906002)(486006)(76176011)(4326008)(68736007)(5660300001)(2351001)(44832011)(23676004)(6916009)(52116002)(6486002)(14444005)(97736004)(106356001)(6666003)(2361001)(105586002)(478600001)(36756003)(3846002)(1076002)(6116002)(386003)(8936002)(305945005)(11346002)(7736002)(25786009)(26005)(54906003)(81156014)(8676002)(2616005)(53936002)(316002)(50466002)(186003)(956004)(66066001)(16526019)(50226002)(86362001)(81166006)(72206003)(446003)(476003)(47776003)(6506007); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0389; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN6PR04MB0389=3B23=3AJsjG?= =?utf-8?q?GkYnoPx90RYp/11Ai+VA/2VhF1vz3sTPVlX7uJlcsw0oekpk0gqjCYgn?= =?utf-8?q?dwuuBcjGQUcRiZhOaNUXXNGfa/G2jPSqnZG0SzNVadYuQqH2B6R+O1mv?= =?utf-8?q?Z2KzwhQU/PFNSKzpz+iY+y3USLuJDtg/pQA0nYY6zfa2omf2VNjFtMVR?= =?utf-8?q?3HAcebX62S5nyOX22VYevanPqhfU//l95r3nqJrmuAgH7qmvS0D5FXAD?= =?utf-8?q?Y6KdxJeHbBM6disusTMet0Z39SJf4Jw+cGwgycWtYc8tOFqApnwGqWAM?= =?utf-8?q?AjmX9sVIe6qzsOu96nf2o9bdUEgcdiqDKz70WL2wNUHfdYgAMS1v8X94?= =?utf-8?q?kbqa+4zgyjvOVvYBWfAB16COknQOVE+WIbXkmrV2t+MEtZrd+Sb93hwe?= =?utf-8?q?hZblCwikse6wjCHcm/RUhqkyTzjtkS5Gvi/LsjZV2n5Q/dl9XylJuL3i?= =?utf-8?q?1dQSDQbhS26h+nD3kqAjEPHypL/ohouMpcW5mHElGCfximRB+3IWWNH9?= =?utf-8?q?oemz6fgJBCp8gnIkpSz8qYxiX9fgdVXWzCnoCiD3i6D/WQw8HoBGPccI?= =?utf-8?q?9kMk38Q5TGtIomU4ad7iylYwrmrxc2h1bu0VMVGL+l4SjXCIpvCwlYgy?= =?utf-8?q?dC+HnMQZ867G/cibku9Z91wQOXf0QTL7yl1Hk6M/PsD/f8A5L5rrVHnk?= =?utf-8?q?0V8xGr2cykysf9C4yzxjVY2PD7tVDK0jr7bfeoJNBueNddaM2S+pPS/t?= =?utf-8?q?1j6rj0Nyo4ItDNCVapr48S3lWz7dePRgGayjWh2rV6oh9NaUAnRgtzO6?= =?utf-8?q?J93uZvEjhFf0Ul77yxtWTw6BV3DR2QpJXzsbPW7HG9DowfBetrpozwmn?= =?utf-8?q?n1eB40YLNjyfBQRAZ7XixsQ3ciyXgx9cLijnqlfI19D43plp6FkabXns?= =?utf-8?q?VcD+DZz2ybT+V0XXJPCyKIdfdVv1CkQ9R2Uhj+vpNOrKuWDYIKKpIlrH?= =?utf-8?q?p59/jDM9L2fpAOrABMH6Lej5LdJDcM8Lv7XcXI/w0KGpqir667U9pPvu?= =?utf-8?q?ydJ9Ty2o+W3YKl0zOfgafxt+/oj9sbAo2e1z/q4ipIEv0Y2YwLoq0EAl?= =?utf-8?q?9K4t0DeWtZCOWO4KXI63zsLIPldUZmMNs5GPugvlT/N/VNSuNjG71G8h?= =?utf-8?q?K6t+brXFDvAjnGrDafmw1KCIy+vVUeaI9xroKc+KlZHo1GyTs42GOy80?= =?utf-8?q?8FuoL1fHuwmM95KkpAfObWYia+zsj9FNuWp1H3OzONqqFqQR+UyMzzU4?= =?utf-8?q?M/cRGWwZJNTMW8lrI0dlgYs3iZOr/1aYEMtpCfp4MsYE9kb6d158GPtK?= =?utf-8?q?iqZNcPBZZg=3D=3D?= X-Microsoft-Antispam-Message-Info: 7TRSPuD2EUDPoatzDrkWMx1982AZgW6G1rXMoeNo0Djz0hAU22nDoQUBVUcPwIAVMpPAkJ7KGlM0BhCmZnEuXelAW5/5aSqNhhmkV6usjOmXpEO6uTFZe4p0bB1AHpc8bNw2m8JrnLOdqvpJdvoBv7FCHBQLmfGwlIcXpQEDm96k9da298ucWpLgLoV6hC5sMFZRG0jCMXbIeVPLUeVMJWhA0cJ7uGetXFjEWhOQrYre9trVGDV1Mvu26HmAG1fpZP1fDDi+cbIcuheQ0dkeVq7Kwf0oCkuCj1VQ4qQhQFOR2EHqcbyM0+OTlge1LELh1tFH1PjYVJpIrVZvrAmqxpYbbREqt2FpIWM0n123a34= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0389; 6:FGUo4Ncjum8SVxNc2h/KPFO4x2rwMvrwviOibRFzn2NBw1uKk8KcBYVvDPuoSPmN5Z8JyPQvTO33j/XAjxDy+liEuSP7tXe301nPUhWgDsbgclchOoDbtgzN3E3rNn+J/h/pzTUqTpYQPcjSzN7ZnZlhh0m4qjAh25zgHIlowDi+dBknfYy3m84LwTXugcNVyM+nOuE/uA553H7QADbOtZpmTvU3K0KGwKj9cglTSRZNAcq0JAiIFILdiYaoHH2fT1XGKtMlcQ+jgy1d/Z4J1x7pQGNmSx0pJum3q5Nqf8tOsOwlBkzQMo0bIJD5lWgv1wxJYSVHEKrkI36UBRjd+27Ja7bpKS+Iwsveo4gEIiw5dKnq+hq/GfLpZMSf2qpY5kO1+SeQkFXEmRw78FYvshP3hkmodY6Crz6HxQ+DQTeSudaa8pksYlU98R8iQn0zf66J2pDafhB1vL3JunH1IQ==; 5:thrI0WqbxM+mK1G4acYx2wQYI6VHqSqQ1+0528dvsxcu1uJljU5m5ZtVYddtHUgbuo0Y22RzEYdo0zrp26etyd/ZWqNs0pIxQzR3nPZZyPV0AlYwbpyJKnDREZ0386RpLRjLThsgkIuRt4k4mfp5OsbLcERgICXDa0wi1mTCQ+g=; 7:/q8RzorQytxd8pVt6q+NuFQOuhfMQo3cTkEYWz/+wI8NyZ+Wmn1Qdf0SiHjfnMGu2J2hQAeHoN+WT8geIeFuSKFIWfiFww6/F8cdSyD7rIJRx6+++MhQ6//bEnh4ZDiLbS4LOoTcMmGx3fCv6+bonzBprOmIlIY8cMUgOuEqzfpNDt9mlb4LWCzIed9wiLhomoCWdX5JN3y+SXb/eWTLf14uJ8KLVz7hZK16CTdH7HaBgen+r/UB+vQgXZ41sIAq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 23:15:35.2744 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9975ef25-15fe-4a48-f77d-08d612bc51db X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0389 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PULL 9/9] riscv: remove define cpu_init() 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: Igor Mammedov , Alistair Francis Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Igor Mammedov cpu_init() was removed since 2.12, so drop the define that is now unused. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael Clark Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index e0608e6d5f..d4f36295f0 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -251,7 +251,6 @@ int riscv_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, char *riscv_isa_string(RISCVCPU *cpu); void riscv_cpu_list(FILE *f, fprintf_function cpu_fprintf); -#define cpu_init(cpu_model) cpu_generic_init(TYPE_RISCV_CPU, cpu_model) #define cpu_signal_handler cpu_riscv_signal_handler #define cpu_list riscv_cpu_list #define cpu_mmu_index riscv_cpu_mmu_index