From patchwork Wed Sep 5 22:09:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966710 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="d/WotfZG"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="K3z5iVMf"; 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 425Hvh68wsz9sCq for ; Thu, 6 Sep 2018 08:10:40 +1000 (AEST) Received: from localhost ([::1]:58248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0U-0000nL-FP for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:10:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxfzu-0000m5-9N for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxfzp-0003Hf-8q for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:01 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:45361) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxfzo-0003Ag-Om for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:09:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1536185398; x=1567721398; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=bIcQxnoK+srKHWvKnlxjYNUt9Q3L7v/5Mtqdw8Ny5CY=; b=d/WotfZGT1scjMHkyzhEd324o0lK/hJft3nzJ5xDvaDPdPqRE5fmyOe8 d0NgMVB6HYTyi0bXQbVnnn77dEWQ9iUil8/7yWB6jXYwrJ0dSJdXPcjD4 eT0VUcMFeOzq3h+lGILwDs+RKa9+3p+6m8MHjP2u4hW/veV3yoZFSaLOe cCsf+4xeMOIoWhurj46q7YVM/JCVm1tlrFqZ4c48az3LtvwcjAWU8Os9Q A/GEGcCAT4ul32Xo0QFjgSHIwkI8i+IkhdHApQ9qln0vaOlhuPBFHbWEK LswDfx+0n94g7mrlm5cehZ+VO2CBq9BocZ0he13tKS57Tk+t2c9HUrdEq g==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="89140610" Received: from mail-by2nam01lp0184.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.184]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:09:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NRUvUlCNYxjx1qvxtWD8jRiPAj4SjQGq5UPSaDPgE7M=; b=K3z5iVMfUekXGkAn3C2zurl4jtcgEannh0mm/poJtMPFmY4R56r/X9WW57P30H+7LFTA/02VQRA1weUvzjwl5TxMKZe7kfOZEEMjV9BumlNqMBEcb4d/um33L1dqY8MU4ZUWrSF9JKXrnHlkKQefdIdx3JP1M9mw+ALIFgAvFuY= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:09:44 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:24 -0700 Message-Id: <20180905220932.6152-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b6266bf-5fa3-4dcf-57e2-08d6137c4cdb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:dRKuvbVP72E4BOeBMtMYBeM57C6hnOpvLN0khhKZ+J9jVqFstlDsCb/lZDGYM2delzW3+SG0B96OHPXdIzvjnYbKszy+PWFg2iO5bA1rsyQ1f41HjjaWmpceap/dAcqH8RpUSW2ShxpRzML7jnCjRnqkhxjk1hpGWSBEKTw8woQiedReazE2styYOgONemlsdtqH96AmCNudmGgpUZs+ba8EFESHdcta4f9b8DRk5kRw/d7cUnhx3yENYDGUA9DL; 25:s/toJ5rcZjH5SiMJtGUG+tCel1V7/8dQkuhjuKOZLlmqQ7PmkeP3V+WrmD+rZXplXHtDjV/XnqNqK45M/lWayUbLIPmx2Z3SotPih20YMaDm9lDQBpXBh/VxPQpLLD5/BhunpHQZ8CHMRKGM2cRP5mRKlelBj5U8um/tPuxUjoWeUbrsROkrtcN0K2/Gw6hwdB7jIx9FGKuCWJnAyFr7mZWFH5abmLJluRzChPhV8lQZVskELyVB4DKYhNc6RQma6vGJMWIhVwJTtUFNMpfiQGuHDOLFf1yDMARksHQ5dGPYi5SjQ+mj5gIeZg6PAIcCpPUC+SzrdLQlxybk1UB06g==; 31:Yr7KDvO72RhgCmjdKeF48YnX3tVS9NV8bjy4CCgLfzu4OfwOdH4ivhGqKrUvtLMId42d+f37ByFswq/NLLx707aKrCLfvBDAI0w4XeF8jJOD/J80Y16uD53ia5+HK29QsRf8NZcbTW0lgm6XvPFRmOuCvcKE4Ez2OW4qPiZZHfBBTXyATar5ddkSs4ODLnW93+kZRUML51nuw744UVn5vtbVeWAUMq/zo9zM+Zq8KbE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:5mZsd2r9kb8jS5nRncXnb86dk/bK0eflhu2Hk9ayyad4R01Rqqbt9hHAgs6pfCvZT2sTY1T5jBlkzIGup5gA5peGvCkIJYPCvvRud+Xv/17CG9zaxs31dpHmOOluMRvY6P7nfHxFshCq1FL1RI8szYFyG4loCNjKYocAYzwAjF/jRmFkMbUr3LY4Pd8gHhuq4cvkU5hTmoNPUBxDo5GEWvkpDGfbTBHLSu3thjLpGVC2Uwwwl1gVAWhvpV1PXB6nixTU2D6MPyIiGdNDFj4O5W/BOgqMxd0m7R1fQ2p01puWZbNFmym/BcQ2q5yoayvTgA/nKeTITHanbDn3dBx2k0MqLDtKrs8QsFXJOEttTJZhieDqK+lS/J4er05fsCquzZF+hR4q/V4eFQeK8uyRLx7u0o7ZK4XBZjXCPza5z4se+NVTmvvMusuY+NHpVUVwUmyM305LT4FlwBuc9iD/0J+NWEzNviroNE/DyVlZZ6OxmrFJxk8W1u5n07UQYqrs; 4:Sp1sHKbBfs0asWH59PTSQ5ZnEm6Bfi1N4RllxgQc5sQSSolrccxDjfYoylPNyXK70x+v6EdtXhI91cisDzy6nP6538khbajRHrRCOvHjrAKgu0vDj2ZjvJGGz2YlbTYxyFRP7ePJfm4p6dUxViiUy4dyDWDwnllgWVg7nM4hfxKb0inDphkoqMP2R/5YKnN2QGrKOSGZyvZ4NfEoVuVqvupJTzPyajaRDXU/KGaLMUA+erQkfPYOy+EC16EdcA9ZMQg9hrfp1EqIftJGPia7fg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:oNsiIaPTqV3TWdSQKxZ2DsXenaphErskT6y3Ix/5X?= 3lbwzVjpQAHre/0kcg7vTnBPQyLOn8FtFktDnMgcIU8zV9RwLU0rNu1yNA2MVvb19Go7+eRCwiiOGeXqwbwsoUg+hC8a6wSzqGFGijlsrNItmGZh5BXZNA4MdVhtZKSg0DNk8tLoWDoQ2OKndRJdxRkUl+X6k5k19LiFE15HvKkh6p3tICU3QxYhAV8swxLL2JAax3Ap0zp61QcTTbjiGnXjHJ+gMpyTrWQ8jZbvtPwc99iTrWbEcafapicIT8hkcnmwFJHlTnl73hzSZmLCV+c7jU0DSNWtPyWFMTNivt6oTBz67cR5hPFAb9fXebMbivzyBpkaglFi93RTq/u8/oNEsF6cOhfOc9qWZHvXau2gM7HqT2OnI3oWDsbLBTzOYICV+QIkVp57QvHFVvbXHx73iwi4ne3WjQLng9pD2XyhAcQcELIen2+MKu/FZ2Swa4T6PIECo8TmhRefTwlkR2V1xtLBHA1Qu05hmOlB0E4bU0+X5pYMTpmeHUmsc25mXpqQUu5qBcElDUn+8fq/uvBYA/jUrKlofl5GPYpmi9bBC6AzIurWqeOuyYjwaVsxWPaBknmymbK1H2/WyJfys2+9EVgIT/18bzidARXUTt7lFCY6zAXkJQDM/s/8mPdSGxG/QL8h7CTImXNgZokD9Cf+h9eMY4U0ZB9qUHwXFLjpT1Wg2A5/kMbvN1wIdL+pQqAC2RooOywDVEg6Zr/G0FYlPL1g9YUv6w3Nme3Y8cvB2zMCygNLUGP849RiaDoKj6xRouByTbzyV5nDKbC+Njo6AzdlaP+zJ1znTwUSqq5vsmLiWC3o/F6sc2ebIImbZugd8umQGhsip67+EI44v9HehZ7wZo/OXUZbq5pd3h32tpWbBFFutIi79CnrnRsLZKEpNfUqNpJsCGGT4V36rxPqZxtHcFIbDJRprxGrrgeO+SH5elC3mnyZbADMrD4kJ/dY1vWoD6bU2u6OVptgg9wk8oTQFkRw9KpJWZjyruVaNemkbgpkOIomYbH4dY0QDZjwADZqnmylxX7ntVNGqweW4ha22dzLATP9rFPtxz5vscQO4tAc0MjBk1kzdcm9FP+P8nLj5B/0Igid9TgGIoXt+2UsvcLA/dWYNhA6EiwyJNB+I4ZpA09PnRqH88iP7RPya32UJU7fG29Oa4j0Sd3dMqwN9ZWB3fwfBvNYGt8BcUjpNdS4pSVtuNwSXjLLYJfh7YEiKGcnh1RfWfj75SQITu4wUU6+BO9VC0lBVBKVLcgb/Mkqc9tVjGzDhWbkEs= X-Microsoft-Antispam-Message-Info: hbISsdUflgZTLiZ2xEsssfCW2SPKO8oIUq348eNzWa1RGeSqjOBo2lCPXf2qPl/ylzRFHIQuPyN8rnlkhruRE5BBhF07/e2ycH4Y0gKer68TQSedjJI3cXBr+MUiAbIRCROK/tkhReHsMCi6Xp/HhDOkcmuEc7HCIzKE4PgbkeeMQotzyO0LSO4Dl09ebLDmv2QumWdhDupmG4KuAlvbv8jiIL/UuAI0Dqkxzrm6LI0XpFnRwNfPazTs8NKeeTxVXI9mvqlHYSWYDpSi3LSOdLc80hyq8Rp5+iZuO28Eg99atK2f26koafOsPtPciC4k3yDRiz7nAQ+2hrkaAe8UgRx+hAhaJo+12MNTjeLneRE= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:/GXszpkvl/8BO3W3dfh5Wmu7zUL0zFPUsDrPvd1Y65bU4H1lIUkLNkvgg81+vdgKTlU2KXLvsGJf92g00YAIyyHwLAIxWdRdOi2LgNYDQRsC5+40h8femZvH7JzL/ROBHDrtVrUEv4IWQArwnwcsTafyuvp3UrvX9jnfBgoZoNTiMlOiZHOCux3HdKreLt3B5QOeLtnVUiatyKShQAMhWZOKkJ3mTmuaUk/I5h4RfFv4JZkvPIQNMBF37M019oIlQ6wP5NQWolKgLMsyYvyle15/QcCLvI0jBRn6VR6NG0ptSlL+me6i0qUmlyU6t86WGXlK1Nx/DKU3CqjC/be5ZPemSqeLfmDfcSSczF836GNOOU4ct1WnjU8J+fEmFX80QoCbxz1n6uzS7+YRKh6ryw6ftYZDPkJTlFeZaF3gaPwGe5+ey/GdHUOKfzJvjgVU/dOlAolQYgwxXLBwOL21vA==; 5:TeKD/OAOxHoKsNhcVBo9xxBd+QyFwBfrWO3H9Rn1uFZYoNPd4VpjyHrdKHxKchDxkY9Rk3iLNP6b3mN6gjuWGwPM0OspLFruKSL8x7VSqZkaS2F/YTZI3ZUf5BZ8fauApuN9sVKcGic1Agtfi11cLwUTnLr/9HQxrX/1d3Ihwg4=; 7:d7/Nu7xelOBDXd9Ku2r2W1jggzVDlA5QSxT5xrHwhG2gdJWmmuuedqF5QFz4KZzVDB+UHBRoq5UJJd5X7pSGTZ2SHUTJLDw4s8tkkXpfdTtAygNoD1RcqsfGHBOGtfK7xKC5rxppYUCD2xp4KhruaYcubqSeXJqxffQTlAcd18Wx2eR+a/kzF+3r4kZKu6vwTt61yGul+Qz1duuL1nioqG8tWqVk+StuOeFudjsDUDmJBI8t6/S/RxISUWCYRhke SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:09:44.6911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6266bf-5fa3-4dcf-57e2-08d6137c4cdb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL v2 01/10] RISC-V: Update address bits to support sv39 and sv48 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bastian Koppelmann , Alistair Francis , Michael Clark , Palmer Dabbelt , Sagar Karandikar Errors-To: qemu-devel-bounces+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 Wed Sep 5 22:09:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966712 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="qH77w0Fm"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="eSKYUuTT"; 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 425Hvz325Bz9sCh for ; Thu, 6 Sep 2018 08:10:55 +1000 (AEST) Received: from localhost ([::1]:58253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0f-0000y2-E8 for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:10:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxfzz-0000oY-Fz for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxfzv-0003Sm-BT for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:07 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:45376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxfzu-0003Qk-Hx for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:03 -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=1536185403; x=1567721403; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lwca9t1+nDg0F6GuVLYbWuIUyAMn+u2+4eXGZEUYqY8=; b=qH77w0FmWe/LHMvlsMrI5GoSVFXr4wulVVSbgPeHLuvVi7nqhQXYIijS NgimDO0WgXOx5Kc/nUNgcHTWMVIlBN8IcmPHVesFr3QemVXQBBexYOIu2 Ho5ifRPr+TEGYKz8uUCW5MneX2nSDhMPFAzQ9pme4/AGpbQwZDR+4k4js 7F9V1/is2RRhjykG5EOA9Af4odPPGSFaH6A709+8XrNgWXuCgNHRFAs1c 5cGRrAyrgTOKm1/IOvNHe15x8Pj7Bgotsbo/kyh2b/PFNPLUINtYDeF0A WvCllwQtAxqtUFCX2dalIiuuV6RDAHB22SmoD1Qcc+/xpx0xXwFnSp+vW g==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="89140638" Received: from mail-by2nam01lp0183.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.183]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:09:59 +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=eSKYUuTT5/o2KtuyazwQdUgxa8CfXiD9cmyZUuJhBSHwIC2bCBo4sLlLPp0elBU3i7flwsjXawNa1c/Sq3M/61WeRtZVL6+7h7cvQXbfIqea0l8d7UN6iIfGWVYLko9UvH0TyEOUsEjLnVlPqXqEBlgkLUMmE9VfjRZ7JnfdNns= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:09:51 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:25 -0700 Message-Id: <20180905220932.6152-3-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16558791-1ac4-4e46-bcb7-08d6137c50a5 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:mhf5oEC99cWFExXwn04eNigo+7jrzzwcxCkEPrdZJGh/2XezSVZUpVRsEb/14RcWlNigqK3GOjCdF030Xypo8MJzorRo/y3WkLM4gQvu/UcTDJEldqGqNnAZS00M82sjZg1pWzUUYXBI1l0WVMV/TAuVbd/zwqf/LFDdpgOLwTfT4NDXtw49HXhjBculoqa9bWoby2IRjHpbUIy7ObQPzb6F28KmXU3QvNz/orWj5CKEcQT/lYnYPmH8FTEjREGD; 25:srQ9nk/uX20BP6DHd680FRXQqhCYmqbpZYAYcDp7+fr3wt+u5i8fKaylcvSH19NznoQXEIz3K54kx8WjjkR1hWKxlws8ys95JKhmmXfTjk6d/fXFt/MQiOQVqDblKHPGpjqCVKQok3TJEykAnWNdhdfYerWHjxLNmg7U/0tyB8gRmwF99NN+BZswpWJPBWYZPIAM7x8Zgd7fV/SOaHJsEgA9Pyb+80x0MmWI9J4RnhwAFfu5+b2bmZr055GwgXbwOoLRivxxtSbKR64vxIpg77LRp5exheD1T8lW7Pp3LYdB9KsGeaphxkQfHT9+EcdwAoDLtS37yKkmFiNsP8H51Q==; 31:31snj/lhesKwN4e9e2GUpmbYEEpTgQ4VobvCMMJz0ieQSr8kctcrtEQ16Y2cloghLeRXIRYXTnx0C4I4VAl+FBZRQDaTz+r5dDSn9Ojw+ThMI0hK5wMzq71kacYEyp1sxzf6LBUXqQD1ACV5co1v/oNsT9Sp/ucnNusN7++0THt+mEcjeDZWgqQwHZp84CLEVVXSohSEEh5ShMg9BaIBsDq8m59U+/4rOarNBMTUF5I= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:dozHYBjLoVVYP3QhTxTFozBDgu+JdmJkEqTgdRJlWGsJGLf373477AWohfgxP/gyK+kO6guajuPmLEb5EiV4yiSml9zAf7GYV8EjWVySV6uSmBgt0Rbe7pIoOB+34A4KOj/YXqfvktkVFV7aiRBDf7Tr95aIlFRZHuf2QpsjIJgzoj3w0TIcQfPxX+Ov8ORdrQR1o7H6YMNX4LFuRWFyjxTdl7wvctdw3reroUhJMdiVWwJ5PrUz6dW8aUlXv/9T2bzr5LsX7xHEk3KKmOJWv7hWb9LRL1fOr6OZaRxrE/20j7dAV/kzM4adfTWuOT1VjCqYgc+gYKmXGCvnTSn9xsAht7YyTk5DH04OTQnEB1hZ6LyZPCNOOvCZ6zo5Tk99TKQwbFpoFAb0hNg2ptCIEWFsaf+j5bIPrAPZBx4O5DbM9OkBXGVKCLgwa5ibNyWPg7MAgV6qPfTdbBaRWCm1hucbtjUq2qE8VXS0v5B25hTkYPPpLmVLhVKySoDWj/yv; 4:iRlKZ8Cu6UnH3I+OJnD6rAndCPV1Yxo5R60p6N2cT7FMxIxOl7ucYl1l7TlcmDmWA46Nyg96nZUEQHQVA4crTiSLnGHXCHcxxJmcYy1hmXNXXTlCV6JkKFBcVZAbsBvT870tIzwFoCmhy0weeb3/bRCDTQeMPHs7H99XO0jZz8MEwluxK/jCqdmopbT4VK0WyN6PwTxncncGp+UqfjQuJ6XQKM40cb1tILfhqoGfU97znRvJOuC4WSxCxzNNohwEnFnccvANozGos0O5JOQAAg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:NuyoGoHVtwBGvNNbfb1MzodlIeJIMPC7R213kQW9T?= EeDfFnuunG7Zvz4QSmvEx0o73Eaar+LmqL+ufPB2jf7zQcVgvVPWjdpxtzvKO2ZXs8/CWXSKpUWnMLP2GelM/V1wPrqwKt8xiPwsfgK49c78gacLB+wPKAOWJb2A7faARev9VmtLoYyOa5Vu3we1HMHuSMFcUinh3ljhAdHytfyDBZqDkbvFqIPmdkZLuB+MhKrqy9BlQaU9AUP68vQszba7mf1tzQLwLfC0+MC1Cznar3BTVCS0jvmvxEC1Wf+Bqul9Z0YelrrQyZFSGH3vFKxUbnnRlT6cUod+B+XiOee8h3zfbKgGTY3xyZ3HNSuD9D2+AHotEszYhr4pMTVIu+kK7M/1JraY4ydtfgIDF71JmyrHpZuprbb6gMjOpkfgULJyMeOkfh1YJlV+N++ybQADOX+vzX3BnKBGkLsYbC3oX07C+1Kc2gNDYOyY9a3zoqcCnc8TG96FGkkjT6o05hfxJ2b4g/mDJNNXk7kxPRadkZIDv/vJu95eCEmORYbawfoxfCCC4VJxDyzAUh8ixDvI93iGqVKzXHjzoltUIs3dkD/ta+lEGB2lV+uEanM1ENhPfxxuxLE0zBMqnBYM3EnT3W8Ub2sOIMk3TLfa9wJuo4jcaDZZEj1JHiPP2OYaNpweIvUbbSm9sj7Fn5LJdQmAOadQqC6bg6q5QzWmmCyHw0nmZYhVsf+CPszsXdlNKvEve4TfaZ05Lfao931pkiC7HmXi0pV1Lol6wcD3E5veb3z5Ks4N7RlyoekELyF0+mmOXf/JcQnZ/5C+v3HTzG9xc/sYbAGt6m/mLauIN6f7TSvLHwmHXsbm0QOjyrRxpyEXz3FjE2ZA+ULyrCSpsDPySH5jvzoifJYVhis5ZYyswUMHa/TjMnvTMxVrXXxN9CVixMVPw8JjfdP6B6nmGMUsNmWVjcCcTuOF/+XfNgW3LPUg67kEf5SFwl/7vTt+AJOY7MAGGxX1Oy/7GXT45GdNzfnRsMoFc+/94hv9cWifVp/4Cl6zGY9sFRNyu45dYwfSHRYNCbsl9d+BiEbwGcBrvvkYkE5fhHgriUfZyQ2on8+UmuzoXOVQag/FMrW8JHlmwPiBW8bsNfL89rDq+X9tqyOvJpKCWfIArsaLdStqjFcZjeTixux59DFei9a7IQgy3hrlpzax+x7UoiXWEk4/XL7xLzJOdNmw/s3SReuiBGoynCTECppbUDFRW5VO76Kp8aaexSnzyyg0MQMaYE4OwneuF3173iFD7feYSH/qqqbuoQ6WftmL52GA4tKVw2O2Rt4c5I9L2AcImo27bLM X-Microsoft-Antispam-Message-Info: xd1eui3BrO77APQQ0E2JYrLFdO71A129H/baMlttwDh4AsINOgdz/Gd/XjLtEfJdNZ2kp1wcAXO+HzCGFUz1IF8uwwOK1S8BjRjt8UON2kWxmsKbBq3fYHvzNzUdmg3uV6ChkGUnCgQDS+qWF9fgYOJ3xLdLMLTQ6D9OsPfpUWuqA7JnuylmG2dLIk0xqnKUSNAvLnGjhTimoGIw0spc1gP7P6IJI1Y0nlTQK1Fp0UV73I1zuoqZ8foujt2sNNk+wQ8gVUaDvEmJqEmAmE5RozOrOo0PQaTC6L16G8oZ2ldbmKmNE/He13kqtN7j9THSv+uf7cPS+Yd10vD1S4riTVkyj+4Ib7Kw/kRL3NjBDSQ= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:eUYLIyAsSozWItPT0fl6Y+Afw2spgXRThkP4pLdNG034pROgKV85nVY0EXg3Ernl6ZRNh71okuAF6V2gJxfQzhFsKY2noAv8S1kVSTNnfS8rvMRNNQMlBiV0ktN6cOyVYrAisFUX2MFFUFRUZmcErxE2KKNhBZaqe9DecSlzBhfBRsEYYjNRl252SCvTAxG8V7Q5Nrj+s8jRXVaDnJ6ANArWVrhn9hjX2EgPwlbPL2D5foEufS464Dm4eErnGY0o9lu1eXjfDKd/HsgRoSgo6OnKcgN4lZUyMrHqC6LdGUxCrHaDW/hCWz2cZ0ucfTQ83fScSQmr0w5jReekoiM1OkfILREoS4A0YhqAJtH8FOJ2eY6VoAP7cz1KgAeVRGbm0HUNnSmKbrtiZV9tbfaj/fGvZvee050yPST5mEj1MmsZ51VCBYA1q4goTqPqdIzPuXR+ZxRjTh5doMbO/N3BuQ==; 5:sSUz9U/rwkmgUVQThbUle/RRoGS6uBtA+/TdynKMVAwxVWgWJwkiYE7buRc28kaj714D+Kvv+f91MlR6GdNQnsx8gI1+WxTW0hriyaJFcjsV/xxcClh95z5pu9kIsYnbhkdHtBSbmzORGTFA5TKZbn01Ta7GoZ86858SkYQAtCY=; 7:5wAwzXqR1UfHADicSvqh3czdZQlZKAa/C0IelxN5jsgTtnKyv4tdXxR/yrvD5jeQl8TpY4ZFEpGnPoj0k0XCrxhm8FTUlecJqzjfV4g+UE2rl3yAf+wEyJzGrJUEXlfGpYuf5tJ9ZfDDrih6+QbUYJh9TC017NJdshkUkx7Jj6OELFm4Lt+4ElOXwMNY4vebKmhWVdXAGqRGEWEiGjuD3JAs6j6jRehi79q7RKXkM9uxkbcBL/leagOp2rtXa+kY SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:09:51.0663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16558791-1ac4-4e46-bcb7-08d6137c50a5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.42 Subject: [Qemu-devel] [PULL v2 02/10] 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 Wed Sep 5 22:09:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966716 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="Gu6Q6MGJ"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="GXj8xTm8"; 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 425HzD4xBPz9sCh for ; Thu, 6 Sep 2018 08:13:44 +1000 (AEST) Received: from localhost ([::1]:58265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg3S-0004IZ-E0 for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:13:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0F-00015E-2h for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg00-0003Zl-K5 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:15 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:54205) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxfzz-0003Wh-KV for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:07 -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=1536185418; x=1567721418; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=+1EPoLbQqT9ZINHYGqU/aNOk52IqMR5O5P8892Kmc68=; b=Gu6Q6MGJKzBLMIil5OmlfcRr/Uuj5oeEY0NcKThuR3Jm6hNEqYYJFbRV VAsrHZ6h0AQVll2Qk6E+S7YRL7zqkKhLyu8nJotKC+85yF0LS0pGaS8Et 8jqiW8Sbyp/WdfuuwBBCF+byH5hfABQusZ88iBEAgvdj1k2uXK05Oshc1 SekglA/S0E36Q8RNFS09vDKepSHPjWMxOakIdJ3C55i3hjVXVw9xoWY1V YAnge6umvqNU5NkqoFG13gezvqLGWllWTEomZcYrruvwP24+0cUCzWH+O 7e/1I0notk93KQNUcjOg2pt21+7tJ3PApa2YwqTo1gMY1I2rWEXgz4sHv Q==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="186638768" Received: from mail-by2nam01lp0176.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.176]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10:15 +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=GXj8xTm8UE6aRKAq4okpWhXt7ZI/5IPrk6XjoL57rJquy25IvrZwcqK6U+2x6Nq48M+yrCyxirdBFJe0sF4Ehw+SCCUxYgsz1rtPqGNH66QXfr3vD48Kczzswx91zNq4K8B1ZCsuK/289tb8VSOoweDsuow353YNFuct6fMGoVM= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:09:57 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:26 -0700 Message-Id: <20180905220932.6152-4-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 013132b7-1bdc-43c0-0d63-08d6137c547c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:Ai57Bd+mnZNERsj05WISLn67roeOBDUAHlbafUGvxKr+NFPXR3MlPDyVlLA7WoOd/WoTEIwZZYIhSRtq2iyEEfQ/ToxPJ/kr03jVKBID/v0wFlip4VYSu/Ga348j7ylSxudJHIPHdnjm2MzWnJvxg7+74h4l5fBQp6m60ZhylwPOs2HJwop86IHRIO9rHNOCa5A0dUiD1Xi3J8lGAUKq5ZvQWlxDGbBbC7UCzA4zsDqeqhy3Yv3t1ZjI+w0OuBU5; 25:u+XiBxwa7MqPxJY0MsD2NXiVudLg5PnGQ+MCTnO2trAakJ7aZy1UE3wMCC7Dpu1qWZKM0frtV7B5ja5DBR1vDICjgAh+iL1Y/TMk7pMCTXkQMOoZ0vjQDAuDQN5dAHvv9DIOjaDnsG9RVxMueGz+KFZrnFw4pgsNx4KhF8VFkUsX/gYB6K011Fdu/Az1yk8Eszr90wvpEQiz9QYcIEdkEzaL9flIZ/4pdmp3zasGrK+E1IX+ysYb3g+WmSTlayVjJnDn0NPTycTfeDM3bdGV+h2Bx4p4UD1bH6DPJ09UTu/d16iSxaZWYLDyJEIU1c23JgZ/ibAbHMLGqHYdgeVZNA==; 31:+mUVIbmXQUKYsQ7DVzUHJub9vphjAJQrbpzpjR1Z+ivOEYY3n0rfC+VCstfimLgN/KgzbYbNhzS4NH7JZklsai5WCWq7eqeXqgDKk2VQ3XiSZR/hBl4gMLQZ7a4bP01ns7udsVnv4ZNObvOWn0wfCS1uer26MIdARnY9duoJYOGAeuFk97JzEzkGeYMWXbE2FQ06wjSQcnJY12SSCzuMPMqwTbFDytelFbUDodxTgKQ= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:lHqZJlPfSwK21xDdMHVWHjfMlFoVGzk6RX7R1CVlUiwR85skaOsp6Ij4264AQFSOddw5Z1xspD7G/wd4YtcnzADpjQ2oPkh5rW7i4md3VuscsvMEyb6AGPdz/sK7VgQ2LiDYELQ0/dHhy1Q15Q3Y4xEN1V12Zho/jrpRXse0E22QcM0dGsmzMVW8lybmPvrG1EGazJx0GxV7Dfdjj4TWJQswRFiIw/cxW3pXjLQeKjSYNEdMlNALqhZVHiUrlgRB+KDiFsAc24JFFLOfneT1z0hvNEd6bqPi3PQmGty+B9RygPXlHKhuIvkZbrrBE0evehVIqKKB7xj8AbZQ2VQBcxkpb1WC18qLo8Tjiod0O0unjH0o8MhjwyijHxA8SpjiSNsWuTfYP6jS5QG9k1lHi6B5O2WQVZk+v24KlLSYsJCO+1BzZLPxR3KxaaTanTSiHc5blnGoDw9637gyJ/clEP591oa6oKgPYYLUyVBZPw5i9vFYsfliWVLc3aLll1BR; 4:H5KT/h8wChzIkoTaHuxSc6eqXZGEWFEGRYiIfHNrjT6Qvm6VWlYsOW88O3RRvoioWLcX2ujalwN0KfB0h0SAUA/Tbc1j/KHF/OGvJ0pYKidRnIFF88fWi6awkivw91BQ6cVJ0Bsx4Zqdsppb6nbYlUfY1TPavsdbtnGgeAicLR+tE2IgDOEnV+halrAxhL7YwNY1oKXnikOim+etfKXXx2Qp4IIKcUDODfOtm6NLVUtq7VYzunr+6fy4h/if9fR+Mk4rm+uS3EY50+2DQ6zbzQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(15650500001)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:vgKPsWS90Y2g7DbPMS9tTyAVma+cTPJtu6Uk32r/n?= KSAd/6mhuGCuXfSSA0SoRPo1uzUojHGTx5aFceotWPB9DkuC8gFaXrh2nicGvFmhFBwQajVVlp/eg8ejiB8ndscK8MhjKrA4eO9qhIW2bB1VWpBonmAMty5o/csL4GJs4MPXsQ0ZhXmgabuAWlGbrCdBsWzCfvEdfnQxVV/pWkN1CB27+XHln7Q6987JmLbwgAWjG+aGsSOxdBza462mnMBrkbA3JEvxGwKHl/qf8Yj1ZtHgjE+Jau8UcjtAuitMqcGQjtwYjkkDl0Il8cY0eQKB5wjSdTlJJ5kf9rpSoEPh/xODszGTf3Oy4BDh9TN3k++Ngm8fn51GWMHJLZiaChbvv05pA3OElt9ATJ5oInBA3NvvOMJh4zjUY2szXRL9cPQMiOxCM0DhmJlFMggYUS8jSdgQRBUggp2dNNIs6Ve1Ps2IwBTYlehY3wbJOqBREVKPN9ckrkU89nuhlSEJjGyH2TBY2neoJHjRsRBrBC4Mo9VswxxCWajFGxTpbwWlqlZzzf4rxHr4YlnCOtOQmlkv4hiFEmOTZ8NZ2rWhVpZWZF6AZlv1hCki7g519OgN20uXWnMdUVVOdwiP8PZYfa5xH8on3k5OzFGEHsHggXizCWBnSh1HAzW4/Hb9LaBNIvYSiuWpQ/+StZczCApYjClFLQfK4XN07JP/pWzxFZ5SfElDrpkSbsWph5xuZn3R7vyydN9dCVPpmiXzj5RpkY2r+OleHL7Vi6sEda2jfILjzeiXZuVR4OCWxDmLvXKB7rR3YUGIJTKORNcmRwFzmDK6By2NU9CWOLLacgmrx9IFX6YJXwbsL1AnBI94tDsPr4tNAG9qOF+Cu8XV0u6TnY6fp7wk11TCA8ZfLDARXp6vHa1sKS8SRtZtNVaaPDitiXUloN6sX3svdDHe7FAg9a+pWf1TbVc1DAguvkLL9HPqmwbNLdUuNHSdjKftwG5bmvMWTXxgJT/FolzTWcgwBibGbiiJZA57KEH2PEIXLouxHAN1/HCA4eoJOqOQyvt6qHrH0VgiS6k7r7dMSF6HawuF2qP5cf+YC1rtBwoXcOWZnL3rmx5QQ0iCBtc2R64iG/4HfUSHR/uSm6lWoKA+AtIvBCZI6sLiwMrF9iFm/2RaFDx4b/DLiHfljCQYS6/DOBkAE7H6286vmajaGfamIjwnlruV+qljfMIecKsfzIKsSxwgZykSFd+o9A3Qvl//9GSpM/W3CYONU50qSmiP58YOLO4upjxi4UerXSWTHIxalWBKLEjLkI7JQ2J/Tw1I8zZgZaIz/GQ4LJHPyUXFoLBXovKwieEOi1z7E9HHh0UyQ== X-Microsoft-Antispam-Message-Info: Iagoe7lIi0hejaLAfaV8NcfWBvdd2O8F7/g4ez/xaw4YAnJdQfrhaPOFsY3SNj4eJ2ZOzoYYpld1+3DHYYSFnxjnv0PcphXfTqelvavE9GY+rdrsbkeQYGzCHCxd6JsFWQhTLQu/0ng4N8Q8PTVu1s8uUIlcwKaQFViqTr90ALNZ4fNXPV1R2TrLZmt2IumNtRv3CGeU/VCP2J09wego2pX2uHdgwzDMC5WIYLnG6KcLQrlaKQWnaKZ65LLjj4GcAKHMBQHb2y/mnA8yNpbWCSMw89420NhatAHFSFEZ6XFYA34dyJ7fqRYX0XAUzRallXGZkN+bLYmEuOVgT5Vs588O9BqaVy7IcW1OiGTrmZ4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:45KBpktQJKO+hweaYGmJjFmihUjlcumthFg/2R8lBqfN14KbienQrW/swaZb+BtGLrVn1ysASXEdZHQQNscHHrkrpLjfoFv+CbrlF2MOt7tB4GvImVbUdGvuZSNyLSd6Ngo60KWBMmwoBYDF2czLLq9k9CWpZzcpklvqkoD0KALJO/YsszRza1+p/LO68n5JRTt3MNsmyhUjPszMn8Pqgqcu2c7QjbyQlk7JL+NsD1DremLfAe4DCRX0Zx5TshMUjyHYVcfVkrkeQfXFQhhQsdqXPndzigNLhRX9cVvRIuvXduStbhDqKbJD8YRzJGGZhspmpA5MZlgUpSU1u/+3a3uqs9uY5lPxDWRfhrQBBJND5R6GngpW3AIVsQ7O2yul+I7fAIB6+iWf4YjGFPfCix1hA94NnKfBTXtgRtkq/72Mo1ioPmuHjGI6MZLKLH9Tvc/kCu/bowai/Fh71haZmA==; 5:Yfvb3yEqFv3/tyowXppxHxqDaoI5Iomo25ERr0M5ytH0MHi6Rf4FGAE1FlByCIbqjij9rj1nK+xj5DnFVUPKVdVurv4fId2sdl+x8f9zpymaiXV96+AxR/8PP0AThrtpLR9WQzmG6j4yYCLhq3S7fgcyuCMiJcjYCidQr2xZzvk=; 7:NXdVZjXsfpQkmia9nkglBkOwnksn76Hwl+zq0Pw1A+Wo3ULJNqbFjoDWiNI5YeTPCQ1QqLyvFgHzB55OXsLfUPpTndlc/d0Sp7s8s9USwTilJRNuF339CTERzw0DCnrFMfRcCoFQUIQHMkppPDdGxp2mLXsVRdaKdM3Y+A81wFmMKWtqnYGTxMqwrOYMdBkYC3zjapfymLdFOhYF4i/yRgn+47mmnULhbd81mergY3lVJYeKyjMHgOLuc4VwYGOe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:09:57.4571 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 013132b7-1bdc-43c0-0d63-08d6137c547c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PULL v2 03/10] 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 Wed Sep 5 22:09:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966718 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="aMOuelT5"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="TgdULGFI"; 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 425J281NmMz9sCh for ; Thu, 6 Sep 2018 08:16:14 +1000 (AEST) Received: from localhost ([::1]:58279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg5r-0006RF-RN for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:16:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0P-0001C5-Ai for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0K-0003zx-S9 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:33 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:48173) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0H-0003le-53 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:26 -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=1536185425; x=1567721425; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=a2IpJ1Qa3B7KQtef8cH3YqtQU+X0C+P2ZGaICmoolaM=; b=aMOuelT5vva9NjO9L9dRTQXaU+3QbzuwY5xnR66FsdVF7qcrbxXTefTS R7soZKTYLB7FN87Pqevm/U+40MkU3/YX+yEBOnO5qdzgIMnPVMpc8l42L X3zycYXi3Ix1jtehfVD4OD1DQE1GkbURaNlKH1IMlaqaqkzvEDUIeIS2l 5KEhUnwyfHihHpBkDMMbjUDlKcx1WMUjCqFTl2o24LbYQfmaWiNua3NkE M1FDx2mZIT6DzsZABS/SfPXZ/A0YxWGVBYosmoxO1f5Wzmg0jTmGoIAoe ozHh5Y8XGrCfFUXFpZJuBHYt2RitChbud7hwz47BH3MiYc+2gSN7KE0m5 A==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="93247423" Received: from mail-by2nam01lp0178.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.178]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10:11 +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=TgdULGFIv/XrI3Dno65ztos1IbvzqOb7QTBspyll+146wIstYLzwFEN1h3K9hlHRttkFS6OPeWJ/jbVexUxi+0i2L44EnE2O51X3UsJV5/c1ctx28vlt2aQhOw3WagckiPIf5oWWOptWcT8awFEA78EXhgqOb0ZnJMVTvcBmgcw= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:03 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:27 -0700 Message-Id: <20180905220932.6152-5-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5062bed3-007f-45e2-d49f-08d6137c5848 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:0zBVSrNXoJo8J/CpgJilNInhIKDSRbp2zddn/n7M1Yhsofk0rrE3GH8gt6KEaDtj1Ki2yPXAq0Jk1BN748lU2goCpC3QaxfZRBTZLFNiQInYqN7dNA9pCuMSs8LtbiJbT19j8Ra7i2y/fUGXtOMewWC0INO8jWtcrCm1x6zYA6NxDy+KSVPdnFYTKWzE/Fk4P/7IX9CM6lW4k4cRZXCXBnXQbiQDABnyd/0Fd1/lHnU4433pwde9zyPDQWrsQPsx; 25:ifCmQrKnwlpTJNqRy8tQMTiOVkP+PZXzcYFB0yRJFMVXT0LZS6C/x1gC1PmFAjG3w4+6Otf+dJNwZdwNm7wKGYksUnqPr4rcrSQPS5ICfk40wDNjCKWZfiCuuIkA9ppFpRxLFuEc2hrDiF2lCXfUB5BkwVJi6SgnYMvLAd7+AjhjD9QkJETIimJIn8l+D82cyNkH9/A4y4tFBd+Po0DfmCI9lXusTzg9zJSu7GcFmYdjtWsqGDU7lQdiyFStQL99lEWm2BmX/LrGtw5H1rjPjRqsL8EOqdyyTcXD3WRqtYR+PECZUVaW8+2S+bdmFgMos+RvnOBlkr1yNaMcx/CtuQ==; 31:wDoRE1IvqzpZbRV1E8uDoVi/wqWZzyQ0LaMPjfTbyaWdX2s8ut3yboC245pLLmZ+W5tBzK+zaunhPhnCWsN9FkbBR+ebL3sJMcLN8TSf4mq6HaY32Z3yzzXrf0KfnGUU4pvS+i5WymAGWa736gMr5wk9g6Zn4IW7iGVHKK8c5E9LpoTkmQpZTHKsM5iU8Qvkz+vYnwfqMi0ZMdF9CkUGtCj0b3DSNgjV0iae45GFWfo= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:BdmMINLyfnXyPYk4b4KgNhAvA10AfLDbd69UxFVDDWkJKMOfa+jaiVFGTUbrWNKytNVcrDHx5Hxj/cJdKXHdeqolkU3as9zx8Vh7TxMpb+fylIp3hWy7JiolxZqRi7cXfZWmEG8lqQbSSwMyZBafD5IpUtPZBmkAG7+HIzDPJIoy+hXvP/CoWse67QeRhK0IpzgeJxbrOk8YdxBhZhFg6JYSpK2i82z5+diJBqjad5+dVM0bFxBv2iLTlsOe8ODiSR7sLRflD9VOy7C4lmecr7BYmCq5qPiUZ0FQmmJy2gjJ8xkBswGa7PeKSONyiarxbFTVbQrNhvGlZq6z58Y+BJXNWA0irGILbcmQRYgh3eVdUVMRD3E1/fMWlumr4OsdybaYjovNuXrcTFVaOjcyo1ssdZXy3Ps52YRH85PINdu9I7HL+LuEej6jbdhDMXA2yd9sVoPEBFa/hSOXr8q0SoQLaX8hP5sa9qAEHcJDtOIEhphW68fLZETnzLIlV1yg; 4:TtwaeQZ+/uX//OQciggFv+O8309Dn7dvMwevqA5C7i0pOCrUrUdlCrA/ou7oceN3VybjtAkWiAiemIreBuvmuKZrnUzIPUcquvI+0NPaFu+0IvM7ByqCVISd21KYKm4lRPZqPla8Yia1C4XWdvZeC7FXsBj3LPaSXcQKd0h2vZfOs4DghUHgYc3NDGg0WqgAGeJNZJB48zxubc8iPP4qJL7spK5hbDMrn9iqAXzUJr/oGQC6gWUBbu+Bduv34fqPNbGQEY/7R14FcpdLAxMgXQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:ELhEGwamoYF5PHXMiihrsnPGiBcMJpYZIg+qxwx3g?= m5CVk3KvHR60/emilxOb3xoEk0GzVXNZ727tLYv2MsK7mAAuGM9lPQhI5mtWQGcEhBa1WDqVXSfIPnnBjh0RRlm5QFGxNYzmbLjc0F2Q5BKQ8Fp0QSSst+bMlBT8lMOyriEhRC8+bfz8vAweCTtJ86CP4xe5w/TH2AeSti7JfHDLZihNAnED7P3WbDdEv7g2gePryUM6STmKu/PfDz9aEfK9ThznJ1OsJ96wPe89nKmrGAQGvNxLPMlXdJ7v/ZYK/HLTvooX38eb3FLx8Phe2xZpsFV4RvYCetE4/LQyvtrKB8McIs3+RkwporR9cGLtIyeLEHqiDzb8QVmQekY5lTbcIbANtff/RvNhGSJh9Rmp6xZn54Q+MJ35tb72abJT4k6XHCaYfPVa8RU1tWCNSPO7gDy3y9tpgCnk5Ud2qByTa/3KIXUqo1h1X5rkyuCahKohU3nyegINMHB13LPEnX29WQpggo6UWgQkoORY9hjoCgr1txghYxW6+DUtqP9dTwNjyI5nZlYa+N6kit95ZzEeJuiAoui9Yvl+I8uy0Fzj7lZnnQLACTsho8Co3lbu4bjJfH3hg4c8eI/URIY3/B1bnGcsiRVeoQxiQJDcOh60P00al3Vep4z5PvgD5aHqr5WdWjfIYRaOIyZ0HKC3+VSHaPVhvRPwhs/uUiTix04EPRtrxocKjnTfuvBYi5M7ieHsr8AiCEUeuysP6bTJMQtux9Qvup/E+aESLkUGNim9KhlP2TFZMSzCmnPGikPb2HdGcvoCK9F1roJzZqEX1KWQtZzLstQCXkVeBxPYs6vO7cqgjx3N2Yl/1FnMXF1SmfVIwixsg9CPqvOHG3e/9dRDK8UsxhJJJIi/tFNnNn06IsO7fz1p/Q0SOZ1WPR/wAOgdckn9zHRobtZITmlrlr1iZNfB4m0ATbAo9GWWRcisIaukES9pnTz797WaXX9B0B/sw1JQ3+HvQMVeGGRXbx+PEWy5bpSBqZy0wHp55ZlkEMdud2oKO8pBwvWi6lh27L1GWJkzE2wU3eY/0C50RaRI8LDegCqx2WeUQRU/cfXmP29iAUhAn/Jd69KOoudUNfr/WDBeb7Fm8YlnfoOX7KzYvBUdHysaV0JcGq8vpllLL1DB4hijMZbxZW0bVNnGACWPIwOWl9hsuaEl7dtPbPEmBxioPF0XdGs3qOEHmRQ3TQC+BJ4rIkAcB3tnAbKvFWf22FrdUtEJx+acBoiVSqmVQkBjVbl4XTqSfqTLsSQ0X/0pBAVkL81yjE1ht2yYTC+GUiZSHSEkeRBjgw6KOXH X-Microsoft-Antispam-Message-Info: jUjf+yCGl5C5zbvQHvqLeOPwIHyPwCr14VODYYaT+mHk4hMPlivGKRmgcF46NPooh9KpBJ6x9rWqimCFfztMXuDOfEG01qgGraEOOjqQ7+c+VnVHPJlf5knCoSqsHNVFpT61Y6Ar9shvUvi75bYTNZHExzUdsn2bWPGVOOzscarYWtXagnVFHzbYtmwz8Ouet7cpjSfZVGnggTrqq4sKXQoy0ZZr/GRA5eG+SKdQr1q6mlQDx5MLGNqOV4X+5xkOJ7r6UTg6ScPRaIwBQm21QJs/qdmSNTkQiM9EHIhv1RZhkyup9t9URaljWO701sLMeH1EN6rVE0gp+TODd0ZzvsncdI4eSiAPaf7jWTFtBgM= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:UAebNJqw2zogT0A1iluc97iz06wIeCo8DwVjh0SmuAAa5O505wJAK3rvvgWM27dQk87vinQ+FzSUeQHZ483iEjYuRZkqWODBXdgs0hS54ytrNwpLqaC2ETjvLIwjo6CuRqEN2g0/9ORSAgOHJ8Wa1f60sFZeq0367YVpXrupdo71VtUDcG/f5RU7nS+28HwKhf03Z59En9IKNW1nWzqc0f5k9PYuf7LcOa2xAcqJ7GNPE3IGmcaWz2nCbs/3EtnP/J1luNfAblAQ06nFLRdj8rTh3WeRIZAzbZU2WcswiRBdEhfTtVGcdA/9VQZAz2UZzt4lOu7gWNCHHhz6kzZjFuDKoaeLbjsXlwYDWiciJwiHuSLYFN04tVwmiaqvHyI4B96PTJrt3MEkD5h3lEaV+QvuWMdUakh6rQ0j+f4XVhfh5kVmJlu1arIhObSrixRPpt17KC4eVw6H1XoZBIKawg==; 5:P+CgkNfEsQvqsDs/PtOEqi1zMzf+H8LOGz72gPu00RR6DarD3wb89igUNA8zClnnhrzKkWcaZ2N6g2hQqvhZqwDoWxPF6tfW7fsTxWtQgWeFjY16y+xcSmgjam7zKz1SdjpAYc5s5ekprzE7DIx1e7WFSp2X6BParNB4JWdbDGE=; 7:W7dDC1fOHh3naHy3dK/UK0cWqIzbiqDcUSPXayRwbkOYutIuvnQghYkM351w6R4b+GY/g+Tw+fzyRE5vMwNeKAX6mktdfBwjFgPHHbMss77Zztk/oec+nBGrHdx3S+johpSblPVEbPfkL6owEJlUwz/HQ47F2JovDuIqxJdE32h0bRIXd0shgbsNCtyDCbLq4UxqAyIVUmagfmpK2uIxssmlQBwN7yYZo3g3t1/b+8Kv+3Qjmrc3YkbePaymnbQO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:03.8636 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5062bed3-007f-45e2-d49f-08d6137c5848 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL v2 04/10] 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 Wed Sep 5 22:09:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966713 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="Z5uX9sQr"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="BtB7Svb4"; 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 425HwR5Q2Xz9sCn for ; Thu, 6 Sep 2018 08:11:19 +1000 (AEST) Received: from localhost ([::1]:58254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg17-0001El-Hd for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:11:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0P-0001C7-Bc for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0K-0003zn-Qb for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:33 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:48176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0H-0003mb-25 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:26 -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=1536185425; x=1567721425; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=oFh9CI//H/LCFBRWegSsKwAwhOtMmkVNQ2o/llSKXXc=; b=Z5uX9sQrXZPY0dX6QEDT/KBdg/u/lZnF3jEU9wZh1ahjCCu3Yk1UVRbj 6epP6t21PuiJ2M2ZWA/JJpu7M6keM7baPsAj22iZO2oZfzqiubyQs1WVB 4nj5lFLbefhbCmw/upnQhj1yaCOyz/gyc1SCrOcuvCOP3hNcht3FyFTDi GiTKMh8rnSUo83NJx74+kIkbOy266kV7qKI5ougAeK+Wip8xtjWoDJygq HQZ0Ee8gHTDNW8DZEhQbESKXGTuIwovTu4A4TkmX0qVZ03dSYPDek/Sl0 Ybz+mls0IsJz8hAVZNL14VNtvcpixl3IMbAsV2s4AWqPRAQThOjqVLD4B w==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="93247424" Received: from mail-by2nam01lp0178.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.178]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10:12 +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=30caszaoO6pb/DJL2CnATzPnidi80o9N3Nt/17kgUf4=; b=BtB7Svb46fmG0KPQHI+fTIIP7Kx6D7GlTy/CL/eLqgUxFlQ57iAcqqhDPkeRqxTzKCO7ElihrAy8s4ezmlHn4UW10HnIy3R1mMwRr+5dIdCbS/VIN3eWEYZzkeKTb/0QgknFEFfiw9aWAAwev0Xw8cqxPnqkI/TBFdDNemzs3aE= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:10 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:28 -0700 Message-Id: <20180905220932.6152-6-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20341310-1836-4e13-a78c-08d6137c58dc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:buXR/nqHzvaqsWkgra2nWNc4N9P92uho652ZUXL7LkIPMl9urjrUtFBloP7lq++6SOpgzFtVr7CS9Qfe0KDgMYJcUdLXh8hFgK/7Mwjz3fNeuW0fInTsDIzrZXicbIn9QWoLY7MUzPZVs4DUteOzlWly9+gQ2dYEiBxQ9mp6H7eH01MemIL/zZHf7Q9mJOBO38UqdmES4t5MaJcNHLZGVKKqAmnalKKXCz/KUrraDP/J1Wt2imHKCB1uOeTsvlJI; 25:afbxzTDMfSVdn9Zvy0PQ0WVP3u3jy4wZsx2vabeL6WSyMYVhJqkvkaC9EG7k42IyK8SJNZD2Mi7KR1ufSQXZJ3PG4FsDXzXfXhyybNVjc1qDubbKcoTcIR912thZoml74rfjghORmE1POOXlGy8Ee38KQlWpnVkiQJmFWS4E7anTH0KhHE94zTzK4ZpGzFaskVDMfEhLy9gZOLFj5o+M5IVwdzFgvrnsyDd93sX6Vi0r9pvRk83bK73IWyl06GBipvOenkX7xtHYTNPU4QHWfxGgLQEM+9lKsZnBLOvjyUMOTdVxqldZQ6Q/pKo7SwkHgDELuuUb78gmhF/L99aC+Q==; 31:SIehXghDPpTqnpIStHyJpQ6ZSb5I4LMDSI+Q3mkUWIg2/gyjM5cLu4XJS2DENARsRIgLUtk+9DH+E/pp8Ef0wn7X4HXFlIsJsrX52a0cBqwUz+FfUMGxWbdpBu2uFm+Xi5OMkf7euXls1rlF+11mKESKS3JjhBNlaKVYf3jOIqVo8v4dKPsMLMZZBZ3p8kHxCCn7gPKwPy6wqTbg9WxvqdcAhPas/ZBZA/1+Aw/IU7U= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:Bq7KoU+ai31TDJtlluGYXIZNLxO0Mj0ZaHOMpyrpbNKEULaXbiBvr/9rr0LIQOgBauA+nHWBFbXLk2ik+tNvR7cQ6cxoHdT7M5Ycej35ZrP1cISu3j6BZlAo9o4oUWot5KURAqDNO6CB9gZn9fE1q+CYLnFSesgfTJ3Z4o8Srp4nLeX1ssjrDWvmWttt1ljrcEE4F7T5Qdw5zb4HnvP6B1mnbFeLLY40S7820TwtpG4z7G01nHardUdVdwr9ZdDQECezBVjhFxirlrb2PV3ZlXGJoS7XG5fSghr5VCNGykygNE0y4peprweQH/fqgY+W+CIDDcf/72eyMhXfgyXniDJhXq3W9VlNWkYz1Hq2V890XbtYUAcYdrkXE7/jCIHlglWiktc0dTS1B1Z3v3i9qmEsLlPFF3BfkG51XhvB7xbKrnPNRoKPS9EUJuACAeR3CazZdMTvmipCNi2qlbdZInrO8DXb1HoPyXq4gi/gfBsEnuvH7wlKECOGox80bFO9; 4:toekHqYZy978T/EqbRkSXA9H/BDRtRb2XvgLSt39BUGTDzqjzy743ywlJqd+hx5ouda9xpVJl9fZmX1C+2Opk4w423U0pkjJthTKqah3IkSbIM5O3QgxY57jvrg81gATTinn9Sy7ayoqvxPKepCEBbWOjZfYE/bc+95vWICQP1vi2+fY+MwdmGDTzBakPcV/X2lkOvMe6VX+R6n4MUA+Xwe3JiMlLqogpSbBeztZ7KxS7wwW8LtOM0rW4C5Pu0bWtjSt1cAZzEWSvCG+XCSmZg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:PG3bywZDSgbvtvzF43s4O63Xop8StesUkT5M9KKi9?= ODLekdcGbkCip3q5SRN6sUVOOkOJLdCoKbe8nflfkszUm4k5KKLE7k6OlUHR2D39MkINbddOdH5SyveqMHQFV/2YUp/+JyoqnXeHiZXcxzcfrvbUQ/odvMzJ5v5OyZvIZ6Ae7f+A9O65J01dnn+xxnDNv2jFYmVXZOSbk3k1RimiPMlY9pfUwQmUA2bJfzO5jxH10ODNfaCUdnmgoFB9bc+Ec6aALUMMLhKq+kbQwq0OkRow0fwh0EfhUzBezzw3GaihNe1vs9C6pTe2FeRmcenGbe7zTIxUCQA1yquNs8v3qgz+Xo60v1AifB01xVyEv4R7PcmrpnU9dy0FfG98YkiTzy4OstFLO2Xv4GAiTKFWWavuMpLG6avYhzZE4ep/O72bfP6Hkudwdcfr81S3VUu7cf9E5RDnQNTCrKSkSDbMtUrKWS+aUMb8bMKK3Ho+3vOJ/6O4uLdOic3gHfBlNeEIiJvK6yEaxk/0HLwu/UtkXgOU+a/6QbBB6YQNJPX1poQTnzT8H6idrudq6Fwr/7a5CNMO+ohYGWrw/Kd/jB+A0BNedWWlZ/vZPKMY4qCKlZhYO6ZcFJAH0wgsPqb4E0+TPXVc4bR5n3y+C0Q0RDGT6QTKrSvcuhv7uhd/oTXhXGDdMOCrbcNfoDuiBgtBvrKHo1k1LmXR+c4WhiHfT7Q84J2N0Bn80tBFW0EI5rlxHKyDWdlDMmwfwb1kglYapTcqr+8N5OXTgNTCBOL+RJeyC4jkHe9gOKqvQT8pRgjzXhf1jxsb1+Vg+xMD5Q26p4O8dqOQRfAFWqkWT+nCkW21mdt1UK2hEgrhuY6wqUrIqcMV97HX8D2J6J5OpWh7I3TlFCc/ea+c39o7/VZ/z5benV48cJxQC2d1MyNYRxYJ7aUjdEqkmNqyKvVy7YJxB4vqqT2Q4AEwB3cOLgnz5UGR/XIt4GoPoJIZQ7w1ESU2OFiI7FJYM6FCCnu0NBMj/uH15gRLvXGOWjBE8BnTqRjBztbnifAntZART6V2QruFCkUPyzAG+RpR8xh7lqJnC6fTCQwvgXTTq0bxl8jJoPdDwelah4I5cGlfm3c011IhyU33TFqOnA4w7X9zA5dnbJHnUlv00mdw0olQxFzX/P6Jxa41MCCPlXS/lzMp0DFpf4Gg4nLKiT1ZmND3CK+K6ucq7v4b9D7iz5SByRRXmlX7144EQb7or96nMkxGFhn+szF+rHW+M8GcrGn5p28fQWB1CyfBPIjEJlOvEYMK2t6I1MqbcwpIf4fXZnzc59uKv/JtbP32LNONpvUX0saxIM5 X-Microsoft-Antispam-Message-Info: BvBjYWYc2vjrJeKvrxfFkNBLXCL+z6lyapW87WbxbOguQshEZNPC2knQUsZg1RZ6ZhDwo/AArFiDthHN5o8COq/bQUjN/JxpRkj6lY1XmmDsz4otl3KfW2+AHFFCNPJsMLjCEGV0EOPgrHa83UNL9PICzMJMCMjqiVnej+Tz/e+K+ilIC7TLxkXc7m9XxukF3o3AEmvDm9vT2+u22oJPEpvJ/blziynGgsIhbJusptC28wAXZEhNM2OIOYe01LLw2FlSoanPGvXNwuXxeBnovE9Aqx7D0Wf1INIHQb8y8UK6BZr/KhA0HOpjQBkHPapUUrY2WzrpGjRbNJVejybXEO8oa12qrQ1c8aTgHRe3Y+g= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:nI/uZ6WnyOCSnv0hwXYGDsbmmK24AswQ0SmTcgVlZj34y2CWxmObab7IkhzQOOSLpmKpSfGYtbm2Tdpb+g8RwjTMt/Kcee4Svaq8r4CSQyzXdXjn4rVFxbVxyshgxPukckFZUtVfQDJhCP7iIjkDq6pUjiedJQzhrXkexJUSZWiF0ugXGOBpXwzPpp8vlNS0H2JVxwyTmw7qnekZ598HzloA9U8gKNOViabfOxelcZPT03jRPVtWWGYbWuRPcSsywWsiNi3hI/8jgnbU5nzg3uheX84u5adfqPVpAfuH17MGlKY9crfDqKWRhaBnEV9VjtdgVllhn28COktxU22SVzBK9ECB5HEFq6gbniJFd/8ZqCH/3SPkrJ/RNLf5XdlFlXfM0nnCGVANGcigxhss8IfgS9Qc9xc1C4PyfyR5yGTQlbuP2L/5biZ3NN7ghfWZqo1jeDcupTIwaGEVU08inw==; 5:mkvt1DXDhLQ4JMH5Xa12GAWa6aPux6OxCS5nlFhiVtFszaanoRuRbESXAFSNMI75oWCNz5+5wHw/DjyFSep8gRAfeognyp5CgT2WM/HvN1Tla+lemZP09GrZN64ZG1wfJrPyqNvmtzMne2Mha+17jwB++AWjDznkJ0qxWc86Oqs=; 7:ZmStbCEps3Zdro/n3hV12GHT6Sk7KJKWsGEw2IIWe/N6/ZyXzwX18JwYpXCiOOyKZYnQfv6ZJT7ToBMB6zSNgokL+VIeq5H1A6iWBQaVk0bTxqvINqpEyO/iWw7SAEo/8dQh6+CV97Es/+tabAYC3P66w/Nu8JJscdvZHLGtD+drQlPAY6E5Yw4CHW/z+yKvnTnwdrYiERSXUxig1XNba4ziFtgc3bdEdS0XmkEtT0j7/QUm+rxveOItGgEELohv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:10.2388 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20341310-1836-4e13-a78c-08d6137c58dc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL v2 05/10] target/riscv: optimize cross-page direct jumps in softmmu 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..ec2988b4f6 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -135,7 +135,7 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) if (ctx->base.singlestep_enabled) { gen_exception_debug(); } else { - tcg_gen_exit_tb(NULL, 0); + tcg_gen_lookup_and_goto_ptr(); } } } From patchwork Wed Sep 5 22:09:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966717 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="jzUvA9MP"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="gwT4avDF"; 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 425Hzh2MHXz9sCn for ; Thu, 6 Sep 2018 08:14:08 +1000 (AEST) Received: from localhost ([::1]:58267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg3q-0004e6-3A for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:14:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0Q-0001DC-02 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0L-00041r-Nc for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:33 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:48176) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0L-0003mb-41 for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:29 -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=1536185429; x=1567721429; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=pMtw0YhcPl7Hsw7/TRrD/kfLT0Fdv14M4wI9pwHrFtY=; b=jzUvA9MPz/VcRgChZorbqKdiJ5bofCa6SH5aIvc3sm8EZi8WnwdLA7dv BJ0Ama7lJnERx++AQpi2DZmt4AhQMsicdX7opuCXkm7jXgrqiGuQaOjE6 rVjJ1XKlrEOL2dPXejJTlFi8d4bxZFccweeCNhWhD+cqO6ALJhI+euP8Q RaQImXD1JUAqFpC/Q3ILZ+X3Qa7jjMmaBhpWixcaEknDCF+DjZMjldgCh exD849N3kGG7hOEAkKHzYvz+w+PKVvFiD45JPz3CQ/CTPr0dbBhFXy7MX GtPp/OWJascTT7Ia/NbKUNx9L5Xg/XcsRFzswwSJ6JNenr1s1tI1cS+ZW w==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="93247427" Received: from mail-by2nam01lp0177.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.177]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10:13 +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=gZQ9llgJn7maP0jurLh66zOnZKzazUmfJ6pi5M9BRRM=; b=gwT4avDFk3yo4iPiSY8+a2FX/Y8AdiN5GiL/VDaAIHCZK2q1/YoFbMRi1vh07dSh1IRJm39XefJXn77w29CSnNZjfPGPKcgap6OCgNKX08VhT5UmKl6MkRNhWwHcZDGparLoPh1ht4aQFVzsxrZlb6hfLgL8gZy+Q14R8NpgsmM= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:11 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:29 -0700 Message-Id: <20180905220932.6152-7-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28d8e86c-400d-49fd-dcea-08d6137c5972 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:PRT1Y4zwVByfFycc9wDkGa9J5x/T17xxOMYTYUor+4Kv7Sw6193F5NaIkYMYbIdFcvMyA9LZC5R33u9meug6z0s4uhvKy/VYHiLz7vZ9mKvm+BlQbEB6ZMkpAkX46Ot00Niz/XLcdAT+JT++FdP/S9qU2NAVVln1+ntY+rxsj7q4Aqlvqa2SaLgLjCxSHmHqUhb96ggEmvKL/ZRjUmJHBYyIcY/tSpwOM7FHUBhJA/krSUFj8PerjqYgTL38Jyyh; 25:4XbNciNTHYbwCTmQxx/CldQSMC60BuANhopnynkDTD/7ZwPLxsW3Le4ly4McAeCHQHegmze5NAfjrLW/kRO0uw1g2Hin5Po6aRP/SAJzC8uTf3z/OG/jvDnZuNZjrGNHFvErvhbNq46smmC7+QXuuf6KmINyYQSuV3celXchSvqNTHmjv75KvKnwQbSdeNKzpbPCPijSjXLubsnrToegff1pXGqcGJDZfrgz7ZptDana9fD6trVXQExL22Ej0lgYVURpMnQX0V5gGLkMliChElagYW2Y0vgDN4rSfFkXVpcDk1p/hw1N2B2l0+lKdf5ReMj2wvU7+npRGVbBrGoyeg==; 31:V81QAmI6I9UUYt40antlCySUKTXwZJFrm4MXfaWT3hZFgNL5GmxCpfgQx5bY0uAn1ySfv3K1xrs90nYoW49380iWS17WH8a7BnKJt6DWjIO3+aTR5gQLR7rjkO6uyGtkdrwcwkrSQFig+7eLHFOAOCKAYkQSxghDf5zPPcW3DkZJQTakFMBrkmtxHwuCBhDVYJHgEV6/fvZkphQxNfaBm4GhQhs5N5qNqPbx2Uz+N2g= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:eIElGGsBL0Vs2GJZ8hvUA/ioN2qxpV7E+gCArybXsE9yFwEBkFKxVdBjGDeHeQbBPf47q2MBn1TKovQMIqOTmO1cZXb9ZvPi5KEkpTpjNxvfRjKVMNTeSz+lIZoE2Q2EPfFkVkh3Ho4/93kjD3bp7AKb366HJG1vHy1Cb7rGWLIyWh/l+/ELWD093QWBl7XNUXgiEA4ewA5MoqehdnSEeWAgoCW2Wo+gAREVqqMiXpNVl1+2B7yqqhlQ/JJ9QItd/ODkTVDL54MZ41nRkTi2ee3+JOkRDoyKNwCDdKeFluW0bkHY8vOjPd+lIoMGBOzrR0ZPk28HDYM3O3NmZhS4deRS+KrWyYC7YvKwMpnTAvAfxMtjQlJ7q80emDCMGYTNXsV5wdYtNgaITGT4Kmj/3cGMydi+t3C/n7apOrcDYjZeN0HF3OzCxvPhdcBRbKQIa2mtkPT5O6g/L5hkEU22NiIIeRm080ewKje9ur6vh45aeuZX/vXo1jqam6T+NvI5; 4:u+zYlBA8C2BNcJvqfyeDujrsqlzH+9uW6gtkVUKtiXv8bx87nmIgcun6Lro6akKZ8c481PP7jqXFU6XWEYE4v7bJxt3f6ogizrS+Mw4dokqynjY2Pc1P62Y/ph+k9VT+uq9AyyyxPKEZCQj1RXrTGKafMxkKaOSKMNedRO00B5P0cDrelfNG/Z17UBppncNFyioxHYB9+jR6w/nXzW9+LDTrEp7gYrUtz9WML+gxWVaG+D4c+ogQ5M3PVqxzCZjZbhzdYMDSrQ0LH0k4RYwntw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:Wm72w7X6vbHAtscNvCSlu+oYgm6TdpNBu3KOSlFFk?= vYJ1/Ht7CIvIhIYPl1Gj5E8iEfq16D9nXnBcBXxdOn0iI77aciLoaaLMgU5Ud2MUmGL8owj5HEg7EYQHUjV6MWH+1/mzW9+i/F9yhAjdwSDyxPb7uehSoKsA2Rnbh634DEXUAJv7u1gpbK9chTUYNEHU+eRIIOCRIAR9x6YCbbFSTH6QtfvGm9gC5sBWbaucgtHq2IksjvMQa/qq9ygdC606Z2+GKkL73wRNXz+bl+BUtXaETwDhhP54ayhmMi7kLxqpYaAq9PpPx7tmd2emHr6tekfM0Q/XU54T0wudP0vT1SvfgrhKCAtWRxxPIInwQmhBmNij+HxygyZV/t/QIMB8Dfg3ufARu1L9dq8X7XP/X8oOVmrasoNNHmxwcgQGEPVkMWRam8M8hjr3i1bfDrBz/BgCfhOcAXY9nH03jsp5/t5QnaFtDBJeyLu+TJXkKioYRiFV9pK0b1bSd3Ncva5rnEuYeyvjk5hggdlXoIqjDLH4V/4EgRUx2IBNQeLXUZdRbmHao11HSXV8xfxVxWtfS1a9kojlrVz2HMLuRXf4PGxWKsVrsOB1NyOpEUD96Y5qC32g0jmNfGCtJANxn3FwGq4ToH7SxrqQ5isvBNg8t0BOsb1QMyPz7FcoAdtbpMXXbwcMSnMZH2ImKot8WwfiDGCnP/Wx7HkwVc6kqCS9PeHb2kd+0/KsL5k8u0U3H97+LwQdHNWo8o5PyhNky57+zA5fprHrEaGSvJJkMoJBiXV81Ma0UGQ7zgUihMueh80dekazQ3rzHGb1vduc/KwVHEny6v3h0wBJaav7fwSaJ/njzn0M7fpqkd/IhukYiRyOjCgJ/Qiak9o2jldiduWnz3rPEiK6HMXeuPydIXHtRP5SFS6JaQU0PsFbfS965nj7JzGIloNM/5X5iajrQ9lsUXxn5pM4vh8kzHKet4AI2dhoDJ4f7Mci/5lhqWqxAHLftRTRjxj/dFEcwK4/wCmCJvz921g7e2YV03dEFskjDpDsOLr2dT4Yqg/jHsHOBKjId+ccFSVFKgL93ukh7WBnaWptw1ypO1GRMxWCn+WNS4yzPcIJ8EnGC9/n86kHv4xbhGltVjtmqVVgsdlUTasPY2upQstvHT/FmKQrV1lfhbGThUU8xDU3E3qEjzwDyRaKP61FGXsm08gNZnd0hb48X1SuCJQcluAqvkUOIybJlyVHq0CT4CM2a5o3mybhas5pNMuQJxESEmk4I8B/pJs/IQS0qP/9Y4rYGUSjlxo5VJn7AcEYdMIdE5/hB14rsOZVya+EBAb0XPVwzK45i1P X-Microsoft-Antispam-Message-Info: fniD5tO5G7pyrfDj5WiP++ZJ6RLlPhZ55N/eCWvaDEes2XAHgN4zImbTmm8VpzDBx8C6lyneSr17bcyhmha4G0DhgC91nVUJCpHGah11blzuKKAVdLBtp8xjt2A2e6jN7tpKLXX+0slr4WY+c2xdpglkmbVJ/7+xntikHC+rEYIhkOIYOCH9vJC9jVdwpRYXKBd3qhHeL7yjSSaDqdjSJ+2SsVgABs2BQ3vJflNrZ8uWu8OZ6d5QAnNUPWtt0laemJO9M8XMbFMgTYS5rXnoSXJi1Jckjxtour0voG4nW/r5HD+Zy5pXtXjZeObR74MF4fB+vi1A7hgB5IIUlBX0hjJN1toOpR5d5fBSfJsFBvU= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:xJVaolkmpl/w4MnFWslMDC/OWDptxxjS7dOEuFDiiCnIzjejUVuOLczsxEy7NSXKDlgfyMt8l17Kv8txCFBr1PSwW8nXXlaV+bY+1HJF3Hk6UFzlnxIIvE85j33mwYwmr5PAbQ5+6w+NjGd6IU2izAkvPOFjRwegzXr+3z7T0JZz69V0NsN+KEEBZmbb3nMVyPHgrqCHO47x5VAY2qId2bmkYV1DxRL5V0CfPMLzIw1YBQgdyyghnFyBkODn5bGSTdylvCZ4KOx7I138ZX3aWckTREVrjbUgQog3JjlZeISADI1UGWQ8OT6W0btB2TopqhV3vglcP90jCn3k05UwTw1rgBJVPaA+O9tNARNQ2LmzH8zHlO9EQ4RnfKF+xh1Ir8rAYekp/EH+bg1vHxpaPC8/RiqTD1dDyImDFUCe0UprbJLRpLekzHUHZ1D+1ms2aS0krQMEFMz16rpZsPJcog==; 5:TCMI+2txIqaDO5bfbMuSCpWTUJxtAmg83UvkSWrocILU6U95cfzE7ExHdQNRC9ezXnCRXswrSflmBZZqYhic9HE5Lw2YV+HL23L5kPhSkcVZcYAl8gejFTFtov/COJv/t5x5XRR0dpIn0qopmHe88X2SblAtuEZaGx+rkfFcxYM=; 7:lAcqOff2ROBsFmqA352nQG97BXJvmk0ajXJKKQtwCkjwh8592C7xYgVBC/8MYtwdqtXcXfYrI5jfOlpDLiNkK+FDWtSyIRzoOWr6c6wWObxop9T4BpJ26kqbBlA6q//N/FDuvLCP3zjy6hNUr7QOfODEjuAlj5Ne3WFSjjFwW24x5IqvFcczh3XJFZJbcPM4LwkyN2MJVgZaC7kzAtyPXauMYzaKsH+TI2ZUWZBe1i4Yvb9kp/z72mlRgLnb6yHc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:11.2076 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28d8e86c-400d-49fd-dcea-08d6137c5972 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL v2 06/10] 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 ec2988b4f6..66a80ca772 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 Wed Sep 5 22:09:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966719 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="EN5Ej0EB"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="SNLOZ/hT"; 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 425J2V2yw6z9sCn for ; Thu, 6 Sep 2018 08:16:34 +1000 (AEST) Received: from localhost ([::1]:58284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg6C-0006hC-8E for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:16:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0Q-0001DG-1D for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0L-00041W-Kx for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:33 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:48173) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0L-0003le-4q for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:29 -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=1536185429; x=1567721429; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=xYGuRkJ1QXCJ77Fbcaf9wzqfmy4ZrgdVKMtyutItGpc=; b=EN5Ej0EBx/n4g8EUwUc0L86rNtrM2R9SFD9ODVlX7z6yuNbmZLE4cKuS LdBR+y4M49pi2jYB91f2Fi6rGumivDQPDLniekqYwrj3NXXdkwsu2mhwN BgjnkuxDKDbR+HB9n2q7w8b6AV3REHdbxjiHSrQuC7qvDY2yCStGb5xCm DB6LS64uj2xhcwUMBXUdlWR5s1i0uLfMLQ8kPROeFeWrQvrmVJGDWHRA6 /DvG26hjf2U82A92GJuNQnfu90Sr6y0xkhL/vMIFM7RwBPcvqQGlXsL2B 3lYvBGDrjihrXk7X3qy3DaagiQiwXOKZR9QYXtJFRGVc8HBvUua3h9jIw A==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="93247428" Received: from mail-by2nam01lp0184.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.184]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10: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=RWpSmPfpVxjYqENRZAI47YUa1dnejfhV7fkK77Is+nE=; b=SNLOZ/hTBaHJvLvje6npqpyN5izsctsohP+dVlW+7IaR8EdzSmAeQGGeYymY9uKFeby9GVPOVP6lOMbb1NdbR1IHeWDNVwDkB/UFC7jFdyYph3x4lDGHLtU8xbR3MXvQzXNMbV1Akhj5YY7hFNcMnaG7g7vf2CHHlo5LyKFwATg= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:12 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:30 -0700 Message-Id: <20180905220932.6152-8-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f9ca6d4-ea28-415b-3963-08d6137c5a10 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:pW4wA+m48x7nIokscTm+IWxmO0/o0G/86fvSI9m+JZN+17ePgizwqIoNyIlxQfP3Fzk2pG3LhzMOoA72orBvoVG3keD8mg/KTbWaU+yhAOOHcD5nICs97E6oQaTNIoMiDcxwFZpC3fHxoxzkdVBe/RhJslakMp0D+pazmF7q/Ifh+gtr/GY2/pafV4xZ2gndygykN0xM8eG1/IirNtuTMYN7yNhlEejEsWLyyutPaDsYPaprNTOIHgkCM/jEwwzo; 25:TiH0hclaRDLnLtJjOjhNQJNXm0IHJnb3stWUUXV6uU53Ga9QNrfq+hmBCQbay0PVgpgUfkSQJWHoH4oZ3uGa0Q7dbHI993fjYXHuMN/1Ds2bdcuJfdaoHeufiYeD3JBgIgpQfNg7ZgKumGp+YDJUeH5WFo5ll6jEogEupOqFOM43Af0TnOz1d2Gyc5Lk97ypTySG+WHuYa5T9Ml1alrsCFXnuDpYiLOMrMP1pnbjCBBvQYHxvS69GA7CJEtp+5nQnz7MN5C9MycRBzIzINd75K1EOWigumcdG110HPLauJZGGzR3/k3Sk58yrzEBbsaTifTDP1XVyk2K2e39a29IJA==; 31:EHOlep6lvOvaSPTalA4VErGfJVVG8aPnvEZRJBssqFRp98fo/I3/zWSaRVjCS4h3agS5E8u6lcUBbiCReDtVaLtiUnVExbaBUuNjV76Qz1uwlAWb2CD0J4f2CViO4DjpFKkUdExOuBL1dI36TWGVPo5cmwEsjRZ9gXn/nMkCxGCTxWwZh4M7iedKPkhwoSdEStcYbHzwT5SiT2OQ4SLoEfJNrCHrKAe7Skte4jA4J8I= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:JPV3S33dV+VbwZ0M1cFqeKvvhhYuYse7OMrigaf0a1ORWLHViol3JcoascHvW9mEJ1PsumuWxo1sVW2ACGC+YChpaYZniJ68TYmRPuOb5eS55XyoZeINtOkwLnPrpDOqNiRX1JI1uq/t1w/rBp6vdPX5WllD+8TveiAVwpkV32N3rUoy9VETKD7rknaWBWz2PmjJSdu3yDxsqnIJ58kA9bW/pOPuwXMWAI5oOT6mA1yszMGumfV06BhhTzzG/YvapuSjHfEQYhcayJzNfI8lzo1BHyLESNGGfzt3cqYDTG4sbIqLnXUyLbrXdZKsKnGYsoP9Mau1l29CefmrZOlLMNgn9sLWxavKG8DmuAIBkVJRuXb6TvfWe2tWiWRlm6aCVq9e3a5oClAsl/XanvVzl/CyO/OrAs5WDmz6IvZ013gHziIn1rPDZP0YWcXLgDokWEr6tBZMc2NTkBBR6MHvZAkaIC/QeuAEpAw1B30NkPXTMiTeIK9SPbmEgRk4IOiK; 4:XSlYU2DcJk8kV9Xsh70kr8WiNy0sfqJf9G89kYtwsx2t9o2/ZsWZv2DS/3edA35DmWsi6KZh0k6WYr/iLFB+S1CLXkpwI/MRw+tGhM7Lfds2JqhPkKhOLqS2rlRwtCnJqPSB26FoSrmHUBskHO/g2skYVE9g6OW7O6pyY1S4tdNSMf7tTg8rQ8WeNTeX80aXRdtV1MFq9/7L7FrJDHeVv8xUGk27c+TtRPHER9gQbhkkxbFfLSiFiHS8h96eyBlmoOtissIBwfhOyHzRTnh/C1CCkWFlb3TH/Pa0eOufEo8Uga6AcOI8yA1ksIB/iggo 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)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(966005)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(6306002)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(54906003)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:HkSijiOzRa585idcVABrqxABq9rLKK7Qdpn1GaqHl?= bGWpP2UG5UV3N7LwDgpeKs/ka523eO7FzsnIdlSWfgfTma8kVBQWf2SfNaeGhwt94ECiL6r6cKf1ASKeZDhmzLdrMr2B+kIpJOMnZyleX4qKJ5KeL/byUKbld3BXhX8WEwcqQFERrRCht+lF6uJ83QNnka2nO9HmFMxN3bR4IYT7j9+k1VaMOxgcIjOxKY3i2ryF89BuGq3ZM0MbV2gnV2CTpuIaxQ4aO27iz6U/PQbpuJN0BEcZPct78Hb1PF4wqdTiDFXmyOFrVZuOm6cByVGlPRzGBOwsXNnJkgJqPur7V2eSr7DAgYK6zgTNlfux4cdCgcDx899sZHKvd1WHcUTpHGWJWQe7jMQv6OcfR+lWJAmxzfslGoIoKhCdt8HLqhGpEd19KqcRPnd1SAcnO/Br+pWcbJ8KfhQoQz8fSO8exRfW8ypNJVThaYW7+PPg6sfiXkR8mLzl0VM4IOAd+74eepXBfas5XoCDkNOxkOGhr1AXcRew7CnEdqitqnvJnlqBQqhGve4exrYGFbTe2vmkRMRIqV6f0GVW3B3ryTF+EpwgE5JT/h3AgYiy45lrWvlhkWVWunBGaYYTptvWxXpKbu+QjF24cpJabNYBGHiyTZOD3ajQv6QYJcfOgXELmC7E5jfb7keGPd3O1dIyIWHWrF+y36Y00CpzpndZlUVuU05DKfE28QYLzRfbIP9Zyl86LolU/f5aIFQE3neZ0UXlvPLhi3G7gtUhrONpZa8M5N8a8zcP8nyXzXVA4XL6UDhNlQ7d/FH+AcCXQzUO3nV33MjNmtACwGsVu4YVrN3Db6GoIXUftxbu/i9acWgnEH7QDnjTi6s+XV9a3wkth9+AyxvMeK2OSLv3HPvMmrw+J/1wOvu11IAD5bnen8biFFnK7i6w/VMSFDZ5QgdXI4RI47vJNQ4Tfg3nFh3JtP31oXoQTDL/F6RfRcylsY6627AwzdHGjpyp1hXh6EQ8+JnEoc4XypHf6qjXwvZ0YKDt1ZlXw7f8AfUIuhgt4JFBX8eLo30wugCSzRhZf7NdmjFcQi+NTgvDP9LBqroIPDLjRRbs/nI2mcsXV/W3jetw+fANG/32vr/nzVFBgV9AoMAhzGrBWiszl2E9/em56XsRPkaY+SENl6JkqosIwF+zIZnE1TGxXwRRNGSR8N8hjLQ9OkE0hVJiA1za9/ClaFmT7B56unNMSvGgdjgiBR8x2I/pmjWLpxAnl898Of5coUFDALB8Mm0pHCUtQ/CyGatTeoTYLTtZsDMJxBuwns23OtDnA3EV/9neGYihfEsMkeK X-Microsoft-Antispam-Message-Info: PG1fMjZ6qYot73C52cssci1W6SOnD0m8H0z5lXYgrMHlmDHJsca9h5BVemMOQRzbc3k3fyxZLAb3MZh9EjW349cceq1pqrULRMrR6Usa+Yo5LFdlm1B0HIu5wb5XJzcYBlnLxGg8EZfOShphArQf9o9USezItk3mMpcCrkEHqNyxPu4uGV7RZYrAVmacfRLOn51KMYtuqb0sdb8qUFxhoAelksHNRCryhC0dmcRYRIRjIqvm0Gy0E1/uOzREyghx0eWT5zovNWnOkwEeN2me4DiFwcAW28g8WFxy3l1JYHuaWwpBJtzwwzn0ULagGcC2mZZf/fWXZqP352PDr23R6oCVBRiQpc8BwBqZYV6n0U4= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:+mOxnzRZYF1agclY6fnZwUcHcBjLD5V3Z3JCXfg133iIPSZzvrZoy5vLwGWVqbS7/DRXhyZAnUlM2dZAMpNGFtRdk8ACUSSrB32Hp0i5tQUHdxRMlgMTsz7QXzVaLdew1lEcGiGJLpzwmevVwkuoNqk0aPw5dTbvDUYRl1wLPqNlbP4ZnO9UXjSfzUiiMtxWAmEPrqfDqeoLLQWHAzDHiXPlXBz/ToszcKdzsJoIVW4Wo30vWxc71B1xTNlDQPyIDXSF0dNRk601Y7qE1L+T5MJ5D6NP3bhPKvsmDtnZ1aN5lkJCZT+i8Vtoai8UY+6uf7txKFbwqqoBUjZEc7TQt2dO2HpnZAIXuFpHXegEbK9YH0NNRK/afMAgUdhIclcTccL4exWSx8f/skTm9818tRfL+YOwkO73iiNHtWjR/QygQwOsBXBY9/PiQ/DdNXndAEsuTn/rMjUk6ozdb58KGQ==; 5:S1aagC5a9okhud/11Hv/7VMhcylO85Y57h6wxbWOXzRGXA5XOZ1zZPwn/bjmDkzTczze57lBr3sQ7y7ncGrI0tNpTG8epLa4HPytbNTrIYtqEQUDlO6ih3uz0kDWW/3/NKhCjFo0ND3QKXvB5+TzYrV0ZxFu32+2G/R5fbFRdU8=; 7:0C3Cmztphl9K9P14hlcYLRdFye9xbdORNvZnwv0rN+z9d8UBOnAtN5PElPpMhzjIpfbRwteKijVvsP/Yl8TJQ71WZQARHpVRpsdHA3kt7+EZA84fuWEJzMjkmXrNd/tTXdvrzG1oHDUJJrvZafZz0WbKobx19AjARM81mrM1AJcCEkBqWSH2SImpyODzZyk8cTN2bAMHSnhI5mP/TK6JnL7eSTkW2XQ+KUAhYdHPuiZOJsdWhI2q6CcIr+r4cb9r SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:12.2388 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f9ca6d4-ea28-415b-3963-08d6137c5a10 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL v2 07/10] 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 66a80ca772..18d7b6d147 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 Wed Sep 5 22:09:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966715 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="HJXvMN5s"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="UWBYSJ+L"; 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 425Hyv5XByz9sCh for ; Thu, 6 Sep 2018 08:13:27 +1000 (AEST) Received: from localhost ([::1]:58263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg3B-00047i-Ic for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:13:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0Q-0001Dx-Qz for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0M-00044S-Nm for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:34 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:48188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0L-00040O-Ur for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:30 -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=1536185430; x=1567721430; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uJ7jgo9RsPUtkEsJH8ArOOdO4ODpLH7TDFpV/X6kGi4=; b=HJXvMN5srk5DmRHlZYKFTWa6u1xv5jByLg9qwedEbqcKn3h0Wrh/k8gp hL50+S9vXiSqduMaxhOqQkjVlhvVe/22laoXBoOQVVW1vVufUzLekw4To mEKRFQMOLUCpUoyeQ+x25cxyzcwcVKRnWHDy3tE+AQFbchC0vl+crMkrA IA4ynmRaRtKVKc4hw81CLAutzn4G14gjUzFwMOEn3Y9lZGRCA++6HYg4W 3Ps3Wt3e3RP6n0slNkTdAYuioPjIfACtQpyrYPNLXVn0ovh+qhrDuqnvM 9TUrA94wuR/gcpRF4rRQ/Zfyru54aYDCWjGj7gTCUdH33BQH8U40v8w/a g==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="93247430" Received: from mail-by2nam01lp0184.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.184]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10: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=1R8cvhmxJG01iNyNR3VXa2P8Ada99u5rB9veeCdcBl4=; b=UWBYSJ+Ln8KhN+RdHbnDTnqfjfFNYWji3QmOchq4e0mFNz0WiVQIesIZ1lcLSpmjPc3LOhcK/prOPr5ZGQ91hYnFQqmf1AGboJkEyTjJparpgXPUG2GKTRWbbSt5JK/bc+6NosmPHerjUwDkZogvbW9tmndB8654pYtrij8lmms= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:13 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:31 -0700 Message-Id: <20180905220932.6152-9-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58689106-358d-47f4-82e6-08d6137c5a9a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:Q+AWJvmVZatEOeggchk1dZBPnSqg7+UXljsNtdbrtrjnAz50YkD8kM0hwX8+8QdF0Fy63d8G70d095V6ZkvHWKwpf+r0d+NMzv9seyxiyRwBkCGhBaYFC1pBxwUSvYbsBXh3q0mGk8vVYn89GwEF7Urn/GuN/wbL9XVajqSRoJW+65yTbJZWaT4WMgCAkGP14+/hXjwhM0NZY2JDnJtD0idRs/nw67Z3/vfFlM8N76xS9d7IfUYuyoOhqabJvGRT; 25:9K+VkUC6VYmdCl+rQ8+WQIQRLGh4nm+8XN0K+2OrD+bQm4KZMr5nUis7kVUXhYbh0ACGUmBET5CSeg4dstLjb6yQ5CmFOmYHzcFnfLIpTeyIFkYH6iPZiFUJz0LcCOhansFsT0nAIrF0gqrJW7+ujctb7HxtuCiRj3kD6ZJLgmvJ/ma9d8Me36NwBT6hzvLlAv5pOpcD0H3HQdbsNQt8hh/E3gcn9D2NFasMiHynybX5VlHd5OrXmGkHOW8vb9xoHM09pM5errXwswyyKvmlgzLjaYCZD1KWM26NZGdTuFXllNPL835zNpn6SgM8WiYv+psCsSt1UhBP8q5iLtmFSw==; 31:/fQeIPtgBUsJFVnptiCEeZufrh3I8X2X5RJBGH3gF5I6M0bA/p52XOFDJeM4CXhsW/hmMjPsWIA6ox3/CXj8o02Ho+UpEZhwoYSIKSdcoKHwfZu6bxgaVcqkcNAEEoVek83sjn8BbvZ2EpXegWTolTF/3TgUDM64lT0gPXr03jjzn+lGvHiksrktGtgxgvqDz6ileslDUYzX78nrALyHl8slXuLSP1wtHW5bwLw7pc8= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:Wy2BCM/AITbX24gEdh+CplwXszpD9NSU1tZnDU8aFy1UH+K9D78/u4dG8S+QqXCdJEb1OeQf+wW3w4S4BH1t+JF3wFuGyA4q8IjK4cWjpa2I2sAuzSMJHPiXi4jdLVBr8zcZthFGtkkeayFNMlQJ011VgqFrWdBppRjWTw0WtErsI1XeiwnThcSRehSG+SqCVQpLOps0M+uCKYhG/V/cB9YQyzBS5WRSybU8ItlUgehPVXT9oSle6RW0eBYRgpx2ZkD7L4Z5hjc2nTxOfdd452+siZ1fGz622k52LjF+Qri9wC5iebaTWJlFSFQM1A1uUdNAWpDaDt1gwKlzbyFDIMjRDN6NSjei4Lc6JLtMzUTMQ4YjrwwBTHVXCpqChkb0FYHWt8qzw1CIY9IYvcKj0VzF+uJVQCD2Lo2CoFSB9hHWb8Bl2yDKCDQgbGK04SX+FVqobX4Hik9c/nyEZwy1uls9XHaTi2eqEVmiLUP83Bt5dp7r7uwBEepiqlXkPvu1; 4:L0sIqtYjBTZakjpq+2VHO2Kt3Gi2StsEMCqyZYwJTBIKJUkyP+Z9g8K7dTgsf3a/BfvRYxQrj+H71HTpEtyz6N4IQDru0kIZEisQJNw212gy+hWZFNjqtq+nbj2CJ1dkG6iFISYH9MLfUzkCi9Dd3g7l6Fe1w+k5yqmmLi5X2fsz8eaN85hB8YEA9WELbNBis0fv8QaZA1o29PLdnUdBn9xR4fiLK2I/kj/TELMtBHUzTie2UqfYpUconv5D8ED4fCPeCjPvLqvQBaCwz5xuaw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(2870700001)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(23676004)(7736002)(2361001)(4326008)(476003)(76176011)(81156014)(81166006)(316002)(8936002)(50226002)(2351001)(52116002)(25786009)(305945005)(14444005)(446003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBN6PR04MB0386=3B23=3AzDnT?= =?utf-8?q?SI3Rtygq2o2uH09KaidA8NAL4HCqNciyxBWlAxvNt3i0+vqjnKj1UdMV?= =?utf-8?q?yTJpmv0lyBNSf2ry3PgfnvHo8AfH+V3zbjccC5lCdYCrKasZvhSUMB6r?= =?utf-8?q?fEeJ1ST7fAfIyQTcC31VbORznJGR8rLDF/fdBBT5WUW6Ol+HilLXBBce?= =?utf-8?q?ubXa2hG/qz34huf5HkjL3MeJ6v4OUqLjWr8e1zF2NzUk6AfSTCKhDbHB?= =?utf-8?q?oteyByFgAo1skXRsnJVnDEIQMS/6CZGOK/+VMq1McHufg78/BlVg5CUE?= =?utf-8?q?TxvFh57QHFf+28rYCL8P/DNOOGYtdsm+J6LkdeGWJiFWe8yoFWgy7ZLh?= =?utf-8?q?KIP7fbrEIOlvMHV25D8qukS+ET/GI57QWTQTr+FwIPtuJ4yjuSx+tDfd?= =?utf-8?q?5shj1fj8olzWv982oKjkd8ZvbyYAzmxzavzD95YOmnNu9QufIWV5iTWV?= =?utf-8?q?GwhZV/aOl/x8yfhcp0nvH186p7nFlqLYIqwAJiUG/DoPaX6KusqiHmX3?= =?utf-8?q?Tqx6kM+get38EbHhcsbE2wx+5kFBwvBiZJ76DJ7D3Z3raJdEek4ISuD/?= =?utf-8?q?dCPBGi5FefP81UAlzYmkLftN7t2MGgauRnLLAoH6qP+JIOil8E9KljoU?= =?utf-8?q?rzIwlI+XNWIfff5ElJHB3/Bd0BjNZOqswrrszMpQu92LnqU5LdXzcqBX?= =?utf-8?q?vY8fJr8zzKVOxdD1HzILPmZxd6MYTZ4qKnUS2odDMe6adqlahUijTPAN?= =?utf-8?q?sI6ldKeOW9Ffv4mDlYChyJcb958vHbpH/b3YmrsWkf07A9plbTdEusJ3?= =?utf-8?q?eTEG8uavQX5YfwzkUTyOc0XQnW7PsYM600LcrR455M4p5rdq4jEubyfV?= =?utf-8?q?wVRevONokbFtNME7HxdxwzN8gvUufBYykIuG0YyEqdroL/zVW0SEMok6?= =?utf-8?q?h/zmF0KEYJqqqiVagJxgI4l3rx+IlBms6BaZI+OAQ1/cbdf8m5v50Epd?= =?utf-8?q?oTiKX2H2SPbP0J+QqsD7OEbhg7tTbWxxpC1G27sA3fJULtMLVNrHKTx7?= =?utf-8?q?kkiW84YCJrrmfSSyOGDrmBYlW/Fwxn4oAfKBzJ7NTA75/K46q/uVNeJa?= =?utf-8?q?+f5bpAGrmW593/CYKUnJWiLFeAzMuWkskfFFRDVspCLh18JHjxDiScvI?= =?utf-8?q?On7aynsLhf8KynErPWsvfRfd3yLQ/ifn1Vv1bjdFLx9jKkuxx526k7+6?= =?utf-8?q?xplzK+WaiJC9bz687MnU9LlQBqkPFzc04oV3MZ2KdKGpWDzXZCzs4Eu6?= =?utf-8?q?NEIAFRzRL9sxVpRmJHzsDBcpn8XaX/jcr/ymbhMmhsSL5LsebLBqPrGW?= =?utf-8?q?mHfzbY6GZKioCesYMOZlND9iKkm/qDUFpCqhDigrNtaRZUc4xtm5t1mC?= =?utf-8?q?ZTcFW4jvAkPFvZGNn54LojlQPDN/DImbNHS+VFU=3D?= X-Microsoft-Antispam-Message-Info: nQZieieSDGiagT3iP7Ve6MpZMCD4yW6ze65ZnJqfsaYDYw2quohxJj561qQjEm3Z/QL3ogO/liDPPvdy0YybQj4j0aqzjX+nlCO4EPwbNUY3Xo94TOZjgkpsvOU37r6TZyaE7k6W4Va6MVNhxolaLAXHnuvkmr00mPvCcmXCcVCC39JtaHroX0SljwULirbSQ3l/+QoxKvQ33uWkGwGKsQG7HyAB/iN+GeIz/ELZCXgxJZ4pyaS3uXQlbJVG2OWOzsiMP5A/eyqxvDGFYm/YDssEBYczl+4d0/hPIjXXC3d8hSURef/HqrlXpGBkDvQsRfo8A7GbxxX6KEmdj4GsatRIv1bk2j9Slbcwwx39XnQ= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:H1eAcHAwASkqW0XJCPDGc2qKtsXDfQ+KcIH6P5JF5UbvBlQ9HnrzWIr1/MvG+goh5UM/JJJ/kyfDgen5ONebJnGf/nkEBEFcVXKHXgikbBxJcsgbafXnNr3t8Vzj8XJnhW29ZdS4fXjzoyHiGs9bZLjbe36LI+QjiOuoFAGUd9ICHzrwS4xpT0/4ZMTsliwBJOSFTbTsmgH6Dagn6tf2gUj81vCXyKEkbZ0ToUBDcgiwdwjAv2yURG707Ag8SkD2jjZelJWZslVQZ6OvuNs2dYkZ8KyDG+lvl0VbnkUf+FLgpD6Js5hwh1g1knUVQXYUu8SRXPpTbJ6ESlHWhls6KBotPwEvOQbLtJukmvi2fh3x4yWXy5lxPh0tEMjEDIafG67aJVz1kr/hquHA/Ne390Fv2sek3ESjEyGOgNBRHLmmgKKtDzTg0iCRv8D8U9JwXiVKCfs38aaIsDHo4oV44A==; 5:bSIL0FAZRrqPyXQSc2vPBlzJ8OXtvLymI/fZyEP/A/Ocq+lu1NDxuytUjEE2o8aVyQXh5ozc6BQwhkZKcgzRRnH6YdayLg5Kz8T1AaTllWrHZoduXr0InRkSDqc+Gag5u3ChTK9grQ0YHC5hDdPylK4yNq3s3usZe8u3EyEBK50=; 7:DqvnR8AKzZaohqU4w/Xa3bTfditoLcszGnmkwBCTwaOe1jBmsvfNsg63I300ZZWIn8zyJD1siRdSgIJrungmKS9UgJE/hlAA0EUBUqkY2wNDgYjST6HdmWugLFqrJJG70/qeamTpOAPWaTMp7trhFAdVV0lGwHd2snsMLrSVN/cZs6NKrqM5QAKYfWlPAROu+NqGCE+qLCJdtnP/e1Blp9GS3wWvD1/AjDbhB7QwDFQ4gHdQN/mR0/uzZaxPfDcu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:13.2232 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 58689106-358d-47f4-82e6-08d6137c5a9a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.141 Subject: [Qemu-devel] [PULL v2 08/10] 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 Wed Sep 5 22:09:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 966714 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="S+wx8sSI"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="nLNZSlGT"; 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 425Hyq6tcnz9sCh for ; Thu, 6 Sep 2018 08:13:23 +1000 (AEST) Received: from localhost ([::1]:58262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg37-00044P-M4 for incoming@patchwork.ozlabs.org; Wed, 05 Sep 2018 18:13:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxg0N-0001Ac-5s for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxg0I-0003wT-Rn for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:30 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:54216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fxg0F-0003j4-3q for qemu-devel@nongnu.org; Wed, 05 Sep 2018 18:10:25 -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=1536185442; x=1567721442; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=benC03lmwJIzz9c5DVIbfQZP27HsrixbgMqUukS8D7A=; b=S+wx8sSInw1bWDPBMaFV8VVl+FruFkJAiTWLten5hAj26zt3KPDFnnYl 8RJhc5zWKDpEjrd62ZM1gVSLL8UgmCtBX6hDEzacGxnN6A1Z6qh02VkxH 76TSIpDqV+mibnNA/ToEV9MaJMq0jOqRSkYEgfsfdNri+XhYUiOl2I7Dh 2ouWiAcEJMqmFQ7V0IQMI8vQvn1GL2/rVmigFODOlteCVn9B194H5Ahyb 6lY4RCL4WOTeJlNCI18vyYDRxtDjQ8E+44CeQS8Eq/bZegpr2XYcDvJ9W JiMowBHdDuKqdiIU7EgEddw+VXPGNaIum8QYQAIZ+uenT17ZO1nH+bXBL A==; X-IronPort-AV: E=Sophos;i="5.53,334,1531756800"; d="scan'208";a="186638776" Received: from mail-by2nam01lp0175.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([216.32.181.175]) by ob1.hgst.iphmx.com with ESMTP; 06 Sep 2018 06:10:31 +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=nLNZSlGTm4AzxNE7CEIngByyCZiZDUTgbrEKpSeXqQI2K7+YPV39sCpX63bZlIk0FN5+BxV3FnQs2ERVZbwfdH3ajae9NxqW002kt9c97yTlJsLxAPe01WK/+UnQk3k28DfRs2VPDFJ7S8RTXFlwZz7c7T6PxT0cGyKkJJkMak0= Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Wed, 5 Sep 2018 22:10:14 +0000 From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 5 Sep 2018 15:09:32 -0700 Message-Id: <20180905220932.6152-10-alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180905220932.6152-1-alistair.francis@wdc.com> References: <20180905220932.6152-1-alistair.francis@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR06CA0060.namprd06.prod.outlook.com (2603:10b6:104:3::18) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6441450-c756-4811-2ebb-08d6137c5b27 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:j5UtgAzsOLpdc22RdxMmx/QBRttJl9S+0zvgC1o42EU2Q13bmG5g9xo2w5YBGKHxD8eRu7x2o5vvRkBVayxBaE4Xfu+B0SvlLCR3xiAUXtZvl95uSfHI8A+yStOvmJDrPY94wSMwG1x4cJpH8mFzJdFplSPJg236DUSKTqixqBGZO93k2Q0GUqN72IE3e/llQPrOIwBleqEuRVhqqBf9OOCDnrahsaWGoA6DSuwjScAmykFNsiy5qhSBY8L/n2V0; 25:ll1sKYsHe1F5gof0QSr0sffSBSfS5xGeDuWNS1S3pFZpVV5HAxPcl6xdxKv5S13N+p9/CR7Xtqpsnb8TyidKuTzgOqgiXPn+jxqO0QLBF2CtA2CfTI4s2S6630PTqJp70T/TMsLBlG8qWsE/nfO/2bzdM/eVmp9yWG29fuGf+BB+zgoymSHxyz1cYiqiODc3zYXaUwQIGwabP/giJgbX3kHUw1I2r9Cne7kWmiD6i1/45h8BGG77JlVSUJL2RoBrGD9GaCuI09Q40C71spcRh4gdeVbx28off94DFykTpOa2ABeijdlwM/RCn1ohkoe65buSjAWpa3+BxdgQqYqr5A==; 31:lQfu4XIkkDBDLR5gxy+jQ4plDnfAY9dczeqa5VTnaKAdYuETWfgTbs/8/bgealKLoP0iaTgGv4oZzFol3HsxqHTlrqSMDLa9Y8VtpmLtrfEJ92sRUATU2jck9PDvxEgglWijJxgz7dH0K1Bydu0eyr8kNbq1F1XT7ySkw4FMbjXGpX2KEhpK7FB2XVN61042CWbEJJLYweH9g09Mg/SDQP3dllHoaD/MC3xCNEEX8pU= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:7Mh3kcfuiT3rmXOawtWEW5MIyw4SFiY9gXop6tMuAeYcBnzUWhEyo9x6BDxYaCReh722brUYpnZLSzTptqq0nm6BIJ+5RYP0Ku2iTJutFb/rlFSTUKhlyb5LpDUWjC4fYA/cboaWLCR9N+/BjaB0QfllTNfvFIA51IVAIgyEXlVi3Y/rurj6ifhGqee5qtQWOtk2moek/cTUBXXrGR3ko0L/ED4T87AC07ac6rnGQBuGg6J6BYw0wUUw8jPOoEIiyZdsqJL0ONb4sCnDdubrVeDqBFwgwp4IV3wdeGjzinLUHU1jN17YLtm9d4pJ1MsrwH0ijxr1cEv4/rZp2UvF1dAqcFe/+TY6Q3zvs1HZeOoH0+p8xnZ+iKyIdZRqroxoq1OJzlQhaEh3E195SUlwuvIGIDQwMh89OUTguCiXp+Cjox24D3+mW0KF4tZ1hNeKuIPu4OFYXgNtFL4a4evFLyG2dbarwdFxDHQd+UtE829S+GBqMNxPDq1e+IXTTJt1; 4:IsxOJMMdmpqz94G5WlWfEPST/1w43TSquiNkr3Fmef87LWDSJ25SF5AYFGLyfDk634TRRi2m1YVOgeBunCqZX2udytbzWlEVnrkf8kHljWA059frJ5N2//I6b3vKlWJMwdwkj/c3BCxDaXgCY78e67cxqtHHV+olfL2GLVClfMaoimEzXCRwzJ6LyQGbQeXJGubzXtdGyA51Y4nQ8fE9nLAECP/AFc/sOGaTOwhJWQGzPjRpXvlCphtVTXCKSV/TSpJKn9T/pe9bywc2107r3A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(10201501046)(3231344)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 078693968A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39860400002)(346002)(396003)(376002)(136003)(199004)(189003)(44832011)(53936002)(6512007)(86362001)(5660300001)(97736004)(6346003)(48376002)(6666003)(2906002)(6916009)(50466002)(386003)(6506007)(72206003)(186003)(26005)(1076002)(478600001)(36756003)(47776003)(66066001)(8676002)(16526019)(486006)(3846002)(68736007)(6486002)(6116002)(11346002)(956004)(2616005)(106356001)(105586002)(7736002)(2361001)(4326008)(16586007)(476003)(76176011)(81156014)(81166006)(316002)(8936002)(50226002)(2351001)(52116002)(51416003)(25786009)(305945005)(14444005)(446003); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:c+FPpwYjVYWl7mVcM2aEetEZBEJw30AUYfXLvwJn9?= lA4379K3CLJTM2mUOvIvQczXg7R1TRnbJA0zCT0IoaHnWtA9yLaLmurWCMAAdE0KiPWEw0cW2/MPIbEJ0seAd0lz83X2dtQIQ6pXLKcxLbcN3261ISFpNtmju05003l+Rn9lYwIB5m5qvnzI1oqDrUxfpEd3D0GlNuyalQffGWIR0k9AKaui8FFB+V7KR1xjwSDjQQADk5sNa9o9OVTdI8MkZljUe5/HGA1BOKjMYmvttPouGOuctVNu1xtPdNoo1xbq2fBilnL8cA//ZkQc0Y9EUXYqAPdgUUlScXTcrD5Uy2rIJEcSNp4IzdBFvKSEHk98lUJM7pmAKb44h9SoyoQFwAUzR9TQo1rsyyc/dF+DbBkQvcV8FRZuxwymANzDJU3dD2HI1EUmDzCEKEUx3cTokKP5oEqDM34Y+ul7fP3mQG2WR9HaqImDyJSRwR3ZAQKQif7zsCxhN0tePCWA8tE4UJAekTZ0KVKNbm4567HQ1wzgtUI3Oeg4r37Qyp43fV2UyJEkucVnQbptemuOuQRTbY2A+IzVHn3wKzZHAmr+mEmeA77pg3Ct+zVzwJAnzjnSuVdm+8y8JvZ4gwjVt38rs6GKT+0+gxZ3Va5ri3gxZ6qcVsR32CFDwxxFvOc2w81BCQZrMpA8nhgyOmNfXoSExn+Xs6782A7ida2VTyGG3qCPH71tH1+HhdPZIGD547r83axXsURezvxjikKI/bIjHR7ieOBw6QlXinDGmTHs76YfsJU23bUps+5e5mq6wewJiyjS27vP+LMvueZ7dyPdJF19T1ONw3mmWIjSiPT3NXhRWOcOwMPruJ+v2cwIkO2IZV9hgrHzalmf8WZEN63D/A3qALrTTfWOmOP4c0OA8fHCMOdpdmljAQ4uT8A4ayxlLtyj/fYuSTNcETH1TVBhKvRk+I58c35krBtHKERudZAIALSpdSIe5RUNpVZ88ySkofHjRLKkiiqCxZ7IJ26D309eWbrCJnbzeoCMvg8Rr8e0Hf3mwCIp0ncyEaz2Rg7EmGuMtsdg5fmP1z6demReUDOI7hjdulYzDowsucm00jERrshQVVWVRc0WSm3tE3IV6Q5nvtKpykoogvDq7lWo1CNh6/lobOzCLaWo+VAlCOSFPZmFVNDUB64N3ZKGb0O1i+vCe/Qf8r2lZNdTrild3/gbqyaWA1EQKn6RDUcEz/P6GOO6gVNTK4J3sFE7bE4GzHK1YgtEKKm8qsWuvgR3DyQjbrOROYTmGX8Jmpip6sGU/zdhGuhPgtmKq0SoMY= X-Microsoft-Antispam-Message-Info: Xs8u53/qNY++wddipV59m2OR7yIPUFKZZ8wx3OLtjphehNkE+gWEEe9hkE3pwA9feOkuGdC60scPBX/hTUYqgDWTbEGCsfI0/ETxsz5W9XUbHavooUFUOYZQ9NjmkwQADIU7d7oxwUWD3/qv5ZvwZze1Fqzo+GTGWVoUInFhEl7AK4Mcqmz8aL5IaoUiRbPL+jP1M0wcaz/zsWTwdbWoGVAGwT5Fs2JN3ZDH2HTFRc/N4HzflU//oVo7mP/oW9P1D6CG/5RyyPv3MCWfEPCxcVMMJ1S6mBK7Pq4tREXRDBLUG27r/wTL1YwmDNSiKNcaF/WuQ3yfGyX1bPTtfwzDaCSrMjT/Zdv/MEYnzPWPYCs= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:wIv9bJl2+liTNgSCHjWPMHcQvuBmIYOo6TFtUl7xYqJXK3Lts6BCS8WsTTfyufD34TRkN92omKKbLBBSSGraxY9lXuEsMhARGiXLr5z2xMnat/UH+RF0nu4EYzqXjhTTAZV5ccRGqAkcWwR/8zbW7R491+Vm/K9/hj5zNJAmgCRbH2mSOd0NQaXd1FKZbp9dLg7GZbXONz+OUR40/EuMIo21a2mTNGogAQ50EwwlxlwuOgMW04ep+fBwbshphPeHNZSdfcdVHmSQJhCAx6kTrI585nQa+7z2+RWXgVmnVWGmcNIfI1T8fSetE33V7XzEHLHRcNQFj7QDyQbSpFLJo752PsfjUlF0gtxAQKjtVo9nu+fFzKiYl+//u2NmZvheje/9ctGg3hnQphdb7zA4t3SPMyO5aE2q0uZzmIzF+7bODJ8uW0PBD8nZ4BTGfY0r2xkyzYi4hfmeax0pCjJH6g==; 5:vg+9zs6ghAFgqfBdNmy0x4L/UcHCLkTmn4eOL/ovZ0j98gyyQVt9uqtm8pC58T7eliGvibKzLBYIdtcLTyk2qcrXtToQLX3Or0cAIOC51tMaUQuULoaIPByZ+vulp62mRITMDc1xUaRYDkdU56jbyjrcygUD3oA4WOGo9q8gt38=; 7:4ZPFFf6JJKz+EqtPsDguvFwhIQTwvo+LSmRFAxjsYlju5WO6iIKlCarTeaAVzorQb0Y7EsOMstegpMX+zW6y5eOa6atwnkmAaWWL1K6Mm64MjSe4l4frNwofZ1Sjj+KpBY+xXE4fnfwfmOBQhhJRVcidDT652lTox1BlI9eJhnbgP8iflMdPqdbQP9XF6R/bkJ34pN29SV3C6oXA/n9vj8oLeQFwVCzwiNNR6e8arDQSqyH3YlcWxX3oF1PWlIzx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2018 22:10:14.1608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b6441450-c756-4811-2ebb-08d6137c5b27 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.143.124 Subject: [Qemu-devel] [PULL v2 09/10] 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);