From patchwork Thu Aug 4 03:17:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=iEfQ8KEv; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=k5Ypm3uD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lyv6y4K7fz9s2R for ; Thu, 4 Aug 2022 13:17:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v26Ymp/eKHw3V1MMlR5PfYeEYeLNW4CZ2wYd1sV5T0c=; b=iEfQ8KEvvNFMPF 98x/lSE+f/eri1M1MuRqW0SEB7rUXHU48oL6OIlToAesZPGLYrhXz8305B8TJwikYw3nzjh+kFmA5 Y/Bq3H8nHZqrt2LZ69bISXmTFzen3jOGtGsoo5p3OsMjS6jbJIFDzOpWFMHxVdI3S0q68n8iFAzcq tPTMsCFjI9duaHPjXvEovDfweHWiES/G+5koOADj1TVy9SS/K+cgJePmTt9j55SpUga6rLW8kVVda kCWdl+oIN8ujFjRZIoiFWnSbZYZY176ruM8NKw03qALz1YtBGfimjwEIKF7KN0lll37PA4/NA4/pj GDWA2ocMXUxnHVZuMNow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMZ-00Fl5M-O5; Thu, 04 Aug 2022 03:17:31 +0000 Received: from mail-tycjpn01olkn2067.outbound.protection.outlook.com ([40.92.99.67] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRML-00FkfF-US for opensbi@lists.infradead.org; Thu, 04 Aug 2022 03:17:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XHQtwgCuh1CM78mNtMSQD2qY3E8TQpDBM5pDhqQbJ/3UdkCvr7YvoPsqqqVKAXHQtwlP2etehnVUxA1LxDKkk0RLE1plrCTHZwmbraFcvC+MbnX9v7D0RGxnwAcDMsQuEPAMcFgeXkr6zx5mw7ffbCwbClMIv+B7q9Ca4HhDGRLTQjNKCf/btpyoo6OxRqbPQNGzNaSyHJidXKGDXDuxyS5i9pI66e7wV3AXWv6QpOe1tAVWH8GS4BOkKE3OqES5r/9SsCsEdRHqLKZ/DFnnFwoDgz9rxqJU2646yGoo9nTF+jiaxrOxJhfVUOiZHLaRKuoFaHMEb1j/mjsEzBMsag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qjYjf+jEucoU83SBMN05jWxPyC8ijcoMJqBP3Uo/8pA=; b=X3+OJ4BjzY7yUptDiX/eS4NRPmufHcUfgZ3AgIzczxvNQyaaLIg9mda9zoQMHSKIrVhUs5amwagtDvhGGh/Or9EsxvsZ7/fw67kO+QfKj8KMgiNCqbYwnSy//4oQLekpsHN6TqLUfXH/JQZRWxbKms8boy3rLS5ta/8hf7jY3a27BC85YFbMfYimgN6aciYw75bnJCd1SyXV4g9WNRQW05yvej+GJ00IePeItMZRKtwLXDhZoDdvI/GuZToSa9St/+rvAsyzd43YTGp9N7QyXSCDgUE2Uv4M+ggDqAy019H9xfLkSOklPQ5wiTy0BoXgi92hdqreSEShTV7zztzIzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qjYjf+jEucoU83SBMN05jWxPyC8ijcoMJqBP3Uo/8pA=; b=k5Ypm3uDyY6mMnAZfghh928fW4NXshhzh6UUknYB6ElJhUdjutk3LV90fTh81RFAgaDUTAU+iSWjn0NP99BlRyiTOAOQj0Bn2CZgs/6AnfEv3DJo7ME5tDxM6x7kaO+VKzDXKK2NhEmGcHLz8dVckrfOWJq6gy4waQJRLBF0LRDxDyuqFH1SfFK7QT7fPIZc2h5lauzsnJyB+l1RmkQHSrjrWRvjJ2dzfPYx8redjxIoiJPutbl573tITes4jdutSJTcnv8zQ85/7qMMtDqiq9uNfFPXjOng139JHjnTQMfCKrYP118bgmMhYk+3Mk0Ru9LequNDj41ImpT9ZozHJw== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYAP286MB0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8037::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 03:17:13 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Thu, 4 Aug 2022 03:17:13 +0000 From: Vivian Wang To: opensbi@lists.infradead.org Subject: [PATCH 1/5] include: Add mstatus[h].GVA encodings Date: Thu, 4 Aug 2022 11:17:02 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: References: X-TMN: [qbw33/gNNkJfR0dv0tDJVFFzJPhfKn6k] X-ClientProxiedBy: SG3P274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::24) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220804031706.2197187-1-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c48d825c-e51d-48a6-035d-08da75c7d33e X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEujs2MIq33Rz02YJPfMmdqKkUsItMwTrFRUJdYIlFBhWXc++UjkRXpuSS3Y9+EIXehQJe0CUfcTgxw1T64dtkn/u3FKI/ngU2vph3dEebNNLa47aPtSWVaZD1Q4tzgbrVjUiN2lP38qvIZUbj031/gex0SK6xTY+e5tuqHWt9hqjgdVsAZyilWwqQYDK7xhY3oqrxNYJTTfBfOpFtFkEzdJugsSBOgnNiIyEMwiwczfWtxPwCY0BzRdds8f1odnBZLv157vntyF4tpiQHPwq/dGDpeckmg/w9iv5+aGfMDo/vOA/rF3+AGrNmrC15QOGd9dStaVhLbz0Da0fmgQNu9gBLUOoAzvWQf/eubyK6wgIz0Jt1fSHh3+nKpdVPn+/ZAY38JCCAc2yhV7wD8fy09eUnUTj0dXEnOsfMIsCvsaYwJSbgNso/vitQz942I0mcUY90+L7hP8ALxYeKpiThkdX9Pn8Y3ACry2q+VfYfAJUfmMaNu5SXBkQJp32JGlupOZAOkQw+/QZK5T/O8+DnTzgJpq2qGfzf5joosFzkZWgndxKLMZIbgyvA5evrNbZqPUg5HcxX6COdiEdsoyKXeU9A2CzzC3n5Hhc4Ohf3t2cSyAvW9kH2lJfx0250kj+wM47T4n7Nz7Vd+uf2S5XmzSac1JPrZCgUL916m4/cumet79VaUg2FDte4C7eYqoe+3B9uDOZZPzNHukvBTXvFVdV3eobYOhjpZaBvi9KUFHuChtjJhUPHCc+JqpYHeyho4WpDlGJ1RDxC+bf2b1u7Ht X-MS-TrafficTypeDiagnostic: TYAP286MB0092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c6Qm0MkUZEzgtGIlI3pwxnR4UkkwUWYtzOiK7ieo5Zi+wq/8pQIiWvESMrlDyOKsSPGJzdUO73vhNtVw3vHRu3knMqUNVmns2cFa30IFgppsDEuAWN/RqBJXXNZwJ/v4D9ktiF9UccD+yWeO1Impbe1uaFTCCr/ZmYwsYrukngAG1W26m3iA9bAq/4pOMuM+nfxN+2Uk8Zyj5aKNePFKu5KIqYD3gwJZXySs5Lv24Np5uur1ANnUuL6TGZt2JTy+Hkxq8bDEeainIbhrUzHqmm7qW2C8OVyMA8D1eFuq21MpqVlLdciwmuajYUOaJ3I4NhMoc9QL/WDosnpsNYcg/uuuRzqX+E8TmnzdiQh+Z+AyWLoxgDr3scjpI3guV/2DNyVynW5CuDkiNQQTuoAYBHkDq0d66VeqgAObg2OxG9AtXXtUeL3NbsQjTt0xFuvzsEK06UnWgHNMkfFiUT4uDj/SKPPys3emPuRSuNgXkmu/0GeY+nwF3Q1o92aJDEbbGaGHtfcbiuvNl9qDTPcJvxPBhyOZrbZKS255Hh3JFr4lLUdRxjMcteBJ5YPTUPHLKfgZWeV8F6Yv/2L0Mdwl0EAQewo5L6yztVc4n4rqVcjAs1KyE8TlKKE5p55BbI4FMbzbd4A4q3PhJ7KCXtLykw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h9O49uMPRsOfj+rSUujpcTdAbldV0OYZhg5dixW3ZcYNiclHihGd+fortkRUf4sVd03g0ZwE3CazSxtbcyuoAy4HXXHzNHyXGgRYXMccNrVXPDu4oMd9aGxxH9NHd05ONVRbC+FveRUANOUOSGFnYP464YDl3BTgpqk5odbbA+fDsV/B5kkA2X0VUYijOENtQjidnJddpbRC8lQ9hKGq8UksfNNiu2iIx24xjaUz/yYe/wH4JYppz7K6nn4jH0kr245Ly4e9gfthdSC3iNks9R+bv65x2wnrWf/OdtHoAVA55N2aMuR8TrX75ie4cYBVG8kG05earrtNiSbipYVqPQ9bQ8+77q0T8JWn1PJkz2eNxV0x1i31ssyIUpltn2Z8JVYiWbD0dFi6baW1H/OWaprVhORSiX4UDnbLs64aif543CGNWBdGFSYQBt+2w4hCVNrfrHuct+c/WVHIpzDgUHniyDR21PGYd8TD9Qj2WAXTTZl2Scf+a/cgcnC+G0LNR7IrYukKGXA0ZS40qJl3QyA2VxdiGdjLRHanVDh6Ng+BtLAus64CwhurQjuXxU1QQ1F9WsnsUoEyZrnI6vDT/KRs3UsoE68dIqv6TcylSBI1s3tHJLalgxJ8o2gD4pCsg4sMdQJ1WXblt+hvR4IYvx3mc+EaXNhj0zD445de9Smm+MwDIZ4HZ9exDBMOEKg+pU07KwNx1jHNDn21xDGSNIOazpLC780rDmRLLO6KlYilBfY7wMBk7qwr/9POT+GRJTmDsqQ8cOl3WDJIS5YEyC5VdbT7VIZOqFUkcQcMMdEJRdMMuLMDa99SPXkydLURgglW+9F94j9W7yCth7amsd57L+R8jPTqSX8Uy4JKuruukijGuwT483QD/7Ky50LTicc255eb6r3rOuUdPZ0KpRia6RcMDRw+/geV/YHGkzfHbQkmGG5pAJ3VCOkp2Np25bYucwaYw7MRBd4oDx16ZrPUraWO8aiJhzHukhX3ecadCiaXOZYLmEGU6iJM+6MYRegBFCXdlp0B4zUCkKb8Ht17Y/Xbm/4Y6wh905GmqzaSnr5a16JxwsLnGFOWWEasbZkZSHXQXGWQAih6fykI8VqBHxe78MGJH6HbcYylj0kxrrkBy4kcEkSVEAAu5wT5NfEvpHW4OMvKPHU9uqBr0aKUGRK5GKpMVrIElZqA/mC0dMGdz4zto1NRfxo372OvnNx+3yfu5OcNvzBWdd4m7eye2d2aLOo15Lh4xiWCbVgF//jfOoGbV/XkuxxmLp2MskXsqahuwUcGi+aJXUvG7w== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: c48d825c-e51d-48a6-035d-08da75c7d33e X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 03:17:13.1531 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_201718_025048_04595EC2 X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The machine mode GVA field is in mstatus for RV64 and mstatush for RV32, and is available if the hypervisor extension is available. If an exception occurs, we may need to redirect the trap to HS-mode, [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.99.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The machine mode GVA field is in mstatus for RV64 and mstatush for RV32, and is available if the hypervisor extension is available. If an exception occurs, we may need to redirect the trap to HS-mode, in which case, hstatus.GVA should be set to same as the machine mode GVA bit. Add MSTATUS_GVA for RV64, MSTATUSH_GVA for RV32, and their SHIFT encodings. The SHIFT index is helpful in assembly code, since field extraction can be implemented in only one register. In pseudocode: - For RV32: gva = (mstatus >> MSTATUS_GVA_SHIFT) & 1; - For RV64: gva = (mstatush >> MSTATUSH_GVA_SHIFT) & 1; Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones --- include/sbi/riscv_encoding.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h index 798afb7..8884301 100644 --- a/include/sbi/riscv_encoding.h +++ b/include/sbi/riscv_encoding.h @@ -38,10 +38,14 @@ #define MSTATUS_SXL _ULL(0x0000000C00000000) #define MSTATUS_SBE _ULL(0x0000001000000000) #define MSTATUS_MBE _ULL(0x0000002000000000) +#define MSTATUS_GVA _ULL(0x0000004000000000) +#define MSTATUS_GVA_SHIFT 38 #define MSTATUS_MPV _ULL(0x0000008000000000) #else #define MSTATUSH_SBE _UL(0x00000010) #define MSTATUSH_MBE _UL(0x00000020) +#define MSTATUSH_GVA _UL(0x00000040) +#define MSTATUSH_GVA_SHIFT 6 #define MSTATUSH_MPV _UL(0x00000080) #endif #define MSTATUS32_SD _UL(0x80000000) From patchwork Thu Aug 4 03:17:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=2wxaRv9W; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=qmm75fxT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lyv703R47z9s2R for ; Thu, 4 Aug 2022 13:17:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GLfX0Ym+Qu/z93tjy2tRx3Wzu9xzKIYz0Rd5gaOQ6bw=; b=2wxaRv9WukF2nb QLDZHmr8fftCp2i+ZOeijZAvq8NNSTY+qLGX2sd1YVy8xBGbJLCx46I+K/zYQzVbctQFUb+b4u2rT xRD8jZ74zcDZuCt56h3m496ZR9E7MwS1p0+0TwHOmyRyijl7Lhye/DEXYPj9GgRRxJUn8O55pe7fq xJ5WUo036VNEZsueBVMbab8DJr+J6Hgz0vZSVi111NJp8O/KrQ+lMCdBUIlUOgja4tsGWRHBvwwmg hR1VoicbtdFuXtlqsNaOLEyyUsS9NaW8zFkHInrjplVO0AdWV1L/ghV35rbyBO2auvXLbth8ZCvCu TJeRyE9ZzeBCd+Fz5EBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMb-00Fl8F-In; Thu, 04 Aug 2022 03:17:33 +0000 Received: from mail-tycjpn01olkn2067.outbound.protection.outlook.com ([40.92.99.67] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMT-00FkfF-4w for opensbi@lists.infradead.org; Thu, 04 Aug 2022 03:17:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QYwrFi9LXtmjsz1enCJlUUlQSxoUR79Qa2NXe2gl87z0DOMsIIWE91PeSM2v25AA1Y2RhRIqsWvsWhSA49SU3VNMze4tAKxid6X8XYfefr9g0bDYlawIsynO6/CbmLay/sKZhjc7hKelOgY9ZxBURrZK/cGxR3wC75B4b8WNpQ5n4zrMqWdEcdO88Ha9iIHg4mFQkeCkF3AHOyd4dsuP4WKjALVAPx83dd/3BJ1thdRz4O8SBFSnDWq5SbmI4A6tu7DM5K8F1o+eCONzsoir5V7cQ8RBFEdBYU9cpNuI+q9LiJcX9gf60H5TJ5raC5rdy27F4waXX2AmYY6SuWA/Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CTPFbu2fEuS2DrVCQy/beb37Ey6cs2OCsJOZ/oaawjE=; b=acgbRU3wKdQLqNSGBek6C1ItvzQdnF7hTaU0pUrBtzlGEgXpF/HF/eUxdpYRvzC+UYhT5xhw2k0t7Lmsl0/6j587V4C4qPtyEtTSd8AVl+4V5ADfFUOjnsuu03ngoA3+wDlEtQruiTz225DhRibtmtd/Hzx+99cSRgrBq2ZaK8Rz0R2K3yy/oW+xoGIAA86NfGahOmadykKLYQXQ+zvwUUfWOQfveshqo8Fb0q1rzZfb1xFa5R0AfFl/7h/QXCV2QVaLxojSaydwmVAXtBI4OEMa4Wa1RpF1aL+HCJjD8c7Uq/JLyW33TqSyTHLKTnYYSyJWy7is2TOL3o494nfIvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CTPFbu2fEuS2DrVCQy/beb37Ey6cs2OCsJOZ/oaawjE=; b=qmm75fxTygL301c3guSylgx4Oyiq9TnL2iBhn8qoM1Jav6YtqhvV5e9Z3yxdI6o/gHpWatFOcLgB+BHtV1R5q1RuC22mNH7EiQhHzt70Yb7lqtBfdjxrwWRMdVVhSv8iZ3s8q9eSLbEXRZDt5mdr4QE0UGjzvr/AGgD+fJRuZJ5MaTOph9GCb8TiuwrmvQjKG7LQMNYiL/qlTDxQbYUDKQ1CWThpH1Z7pQiinhuEYa1sVOozM4nSr1JZiz9hnQn7qLiwDx79osP1atXxEJIyfoUuITXmqsobCZdZv0eNFdCHnMlb4KsD7BlZzlKYHvsdHL119iCSIFbfgzZI6rZgyQ== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYAP286MB0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8037::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 03:17:16 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Thu, 4 Aug 2022 03:17:16 +0000 From: Vivian Wang To: opensbi@lists.infradead.org Subject: [PATCH 2/5] lib: sbi_trap: Save mstatus[h].GVA in trap->gva Date: Thu, 4 Aug 2022 11:17:03 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804031706.2197187-1-dramforever@live.com> References: <20220804031706.2197187-1-dramforever@live.com> X-TMN: [wp5AMSB4IfZ7zpUsLHmCLEvmcSK6lmW8] X-ClientProxiedBy: SG3P274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::24) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220804031706.2197187-2-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3171028-669e-40f2-f344-08da75c7d51f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEujs2MIq33Rz02YJPfMmdqKoCRZdvLePxLodE8XzcKQYOo5MysCmVz+DJJV6OwEASL04/pJoRoOf05u4tVI6ifr7fZY/8mhelmGKWPEESD/xosM0TxbQo4vp5AQfzOjpKmZMCqc9JHjDKqx2smMR2JdMg+uhsa6dDgoKIK6B6TF8XA+Gt/FG90eyoLLUQHJci2p6Ajse/7hJYDscHpabvayyEp8vYUPRbegUWxEE7cgKCttvRq6pajv8IpC4V3LvqYp3MWWcYjPRGhUiKoV6EAB3kKcIbstVOw06X5cHqFC8fR/N/MgHtqxO9NEiuMQ28lVBMC2gWPCPvjxEI5lJboZBF8y0QOjQbn7OqHeSSOPCjS8y5UqxV6Lwpgy3Z0lj8j5uKLb83Jb7wgwRtA8uEVbbwh/MEZ83/IlxzhNiTdIcu39KcYH9oCQS5yATAslC2Hqs2A20WIeyCv69YVsTvoOzV+L3KW7bZ39AI0L8b/5bAZ4OrNRipS8pTL/J6DlFD44KarI36ogoQ2BaIKlk7IFKpjZHxTiH5Cf+VVQAShLRuCQvxtRT/ceCkhS8rspyh7ifenxIa8XhyBeWkdRDglO18HmtX2VlKOkphkqewgh24/tmUtis701MTlp4gphVWD70NIIOwrb84ZmokEF+l/umTo033TktZrVuMzMdLTJv67DxNWF2l2YH0vzljB84Pmafz8wgkiqmbGpNrbfVbVSrehH6tUON8+z1xyXTE2xt9oC5F90nj/9D/ZdoJTcCPUzH+nu84YxGfDQjXp4+kAp X-MS-TrafficTypeDiagnostic: TYAP286MB0092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A489u/fpy0kYLAJS517Hj4fy7uJN2EORXObUSKGLoFo7WMpeJScPdu7s69s62XcsuVyLBxuWccfTO15n2NQ5v9Ze/Ws+heZAAC6JdjgH8xmqxKXtpDQX/Goq2jcEdkoGdbcJtDCnfOr/S9RZKnKE25daDSu9TPNVxs1mZk0TTEEP2H/t8dJTNhBLXU5w/MzHRPZ1slAi80SOzwdfdlVROCGf6pvnLbXuPSxYx1/nLSM/piDlv6xFNZ27pMShJFgALFouH2EvtTP47QNsvPhPfmNy2nFJU3tnifyTNhaErG48IaSdfnENJ1dFoPFfXViXxTxIB2TE30vYK9PtjTjQ3dQtAAPoI4Er2PAVQ4f5ssOKSWMziJv5BAJEXKRcHEUcwF80+na1JOKTcF6eNgG81R5qdRWuNwBwZjICixKEqRUOeCuka9dd9eB7XDTEAGgrDn0P42YWWDXe4mgfDRqVv97Qm/pYr7fARUEkwX0S9PWqfSsFlPyAy7RFGtguDvqZeJrqqw3wWJfLa9StoH8CwbDF8wf+eD1/CZIJcrY3nTcfCEhh4FM8V8OqBjJJ5u9VDc2mlo0EsREVwHfaAkVg2I4hbkmr/989/y992g2vRdeYcFT8zMCkvvGLBmgqD6kla4+s9sm2giSGeglhhi889w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8zk+mDxX9SQB8klqp+b1dKhzv8cXcIhwcA9YmtYml8lKPxtx0+B2K1uCx0p89FTKBIAY+6cU1+9R7zaouBBmaxJBScPz9BVwcbarEugHOwr2OGpq62mXeGVtYhscLQkQYxVxVJSo/FLTi0b6AizK3aNKJwgpdASAyBWK6+e6EYvDz7Nxykal998Op5pVFwUEetzErYg/4DmMMv/IL70hhpcwWR0XikQt5EUGL2kzbu5Qqll7FWHJMVcCCwIoZPN5exqx3fxApYn6DLnT6t82gGttJdFic56DkCjUc1LJxUPpa4Or9rmTJKNhVt0jAFB9xpoEeqFqIkrZ+/j+wwN9KVE7Tw8/Qyco/4Pm/Sr9/eGFrHXg8IDy5qGv9k0tLzNt5ViYvsvwFhLeMkKYeeS7leQCITMzxBlVtGJvlI6ZZnPZk3ZvdzuD4ry9SbIYQJ2o5bI9gqvQIrXcx6N/J9lfiU/6Ac4h9O1ul2vaFP6TJK/lQnC8vYzpyNiYO7iM2FyW2OQpolEeSjcGtGeq7Y+jA+wMZ53TwlcMAPULlHcPFeMnSCjJWalJgDd8+2/f5KNnBcEQEK9f0XVWzDodAr1seQmJ093aAt3ar5krUTDLo80voUh6vFlQB9FssLAqV53OFub+t21cblhQDsgaiDXnYDEGMh1rV1hj9+n9dfKPH02Q0Mxm+rWCj6Lj9IQsJUYjXBWMiLc+RSbYZXN5Yrsy6Xp0qgTztrn6SNlOAQZttkP9vBg21A7pl7HLUDJwJP5QQpaajEAz779ifIOUe0kT90lbqjd+VQMMKKcxtjWFFWPpZLzUH8wUyoVO6P/XvrqFcUjRsw5BEwbW8LXIbvHU6OMUooa7W3nHY/yeIziJldT8dKAKXp/jKXUIUlc2BL5nT3XUj7UBsJFVRlGXI9Gte+dUH54WYeRbZH+iVlWTGNh/g2ukWuHIsyQJyCuEksW/Qb5wO2NURuCrVSjEwPk1MbXTJE8JBSoYe4BSsJrIDsTvNF7TIK2IPTR9RzIgOVrzcg1v8cZMK82BJQuCh3vXXg9zK5kKCF9QM9Jt9/OWwjDvSG1yx93GibygOODDugpRaZGehGYRvOgCeeJMYroLhR2QkxX21u4qzpLeOZN1tA+qEdl2y/7xkO8ciVfx5MD6T8cdZiS556aa0YX8sjJAm/aVxLdkIKIIdn6VuPtwnz5FzDEd09OpRQTfYMX1tFvIswyDGvVpnfAwunABT9v4DQZf7dLySOfjeM5RneJeGcycg17ZVVVExo7JSWQVNiiHglZw432QOTi+aU4kQ0MEYA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: a3171028-669e-40f2-f344-08da75c7d51f X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 03:17:16.3116 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_201725_303319_0AF7647B X-CRM114-Status: GOOD ( 10.67 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The machine mode GVA field is available if the hypervisor extension is implemented, and indicates if mtval is a guest virtual address. Add a gva field to sbi_trap_info for this, and in __sbi_expected_ [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.99.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The machine mode GVA field is available if the hypervisor extension is implemented, and indicates if mtval is a guest virtual address. Add a gva field to sbi_trap_info for this, and in __sbi_expected_trap_hext, save mstatus[h].GVA to it, so that gva indicates if tval is a guest virtual address. If the hypervisor extension is not implemented, always set gva to 0. Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones --- include/sbi/sbi_trap.h | 6 +++++- lib/sbi/sbi_expected_trap.S | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h index d205056..fe3640a 100644 --- a/include/sbi/sbi_trap.h +++ b/include/sbi/sbi_trap.h @@ -95,8 +95,10 @@ #define SBI_TRAP_INFO_tval2 3 /** Index of tinst member in sbi_trap_info */ #define SBI_TRAP_INFO_tinst 4 +/** Index of gva member in sbi_trap_info */ +#define SBI_TRAP_INFO_gva 5 /** Last member index in sbi_trap_info */ -#define SBI_TRAP_INFO_last 5 +#define SBI_TRAP_INFO_last 6 /* clang-format on */ @@ -200,6 +202,8 @@ struct sbi_trap_info { unsigned long tval2; /** tinst Trap instruction */ unsigned long tinst; + /** gva Guest virtual address in tval flag */ + unsigned long gva; }; int sbi_trap_redirect(struct sbi_trap_regs *regs, diff --git a/lib/sbi/sbi_expected_trap.S b/lib/sbi/sbi_expected_trap.S index 24891c7..a5ef26a 100644 --- a/lib/sbi/sbi_expected_trap.S +++ b/lib/sbi/sbi_expected_trap.S @@ -22,7 +22,7 @@ .align 3 .global __sbi_expected_trap __sbi_expected_trap: - /* Without H-extension so, MTVAL2 and MTINST CSRs not available */ + /* Without H-extension so, MTVAL2 and MTINST CSRs and GVA not available */ csrr a4, CSR_MEPC REG_S a4, SBI_TRAP_INFO_OFFSET(epc)(a3) csrr a4, CSR_MCAUSE @@ -31,6 +31,7 @@ __sbi_expected_trap: REG_S a4, SBI_TRAP_INFO_OFFSET(tval)(a3) REG_S zero, SBI_TRAP_INFO_OFFSET(tval2)(a3) REG_S zero, SBI_TRAP_INFO_OFFSET(tinst)(a3) + REG_S zero, SBI_TRAP_INFO_OFFSET(gva)(a3) csrr a4, CSR_MEPC addi a4, a4, 4 csrw CSR_MEPC, a4 @@ -39,7 +40,7 @@ __sbi_expected_trap: .align 3 .global __sbi_expected_trap_hext __sbi_expected_trap_hext: - /* With H-extension so, MTVAL2 and MTINST CSRs available */ + /* With H-extension so, MTVAL2 and MTINST CSRs and GVA available */ csrr a4, CSR_MEPC REG_S a4, SBI_TRAP_INFO_OFFSET(epc)(a3) csrr a4, CSR_MCAUSE @@ -50,6 +51,18 @@ __sbi_expected_trap_hext: REG_S a4, SBI_TRAP_INFO_OFFSET(tval2)(a3) csrr a4, CSR_MTINST REG_S a4, SBI_TRAP_INFO_OFFSET(tinst)(a3) + + /* Extract GVA bit from MSTATUS or MSTATUSH */ +#if __riscv_xlen == 32 + csrr a4, CSR_MSTATUSH + srli a4, a4, MSTATUSH_GVA_SHIFT +#else + csrr a4, CSR_MSTATUS + srli a4, a4, MSTATUS_GVA_SHIFT +#endif + andi a4, a4, 1 + REG_S a4, SBI_TRAP_INFO_OFFSET(gva)(a3) + csrr a4, CSR_MEPC addi a4, a4, 4 csrw CSR_MEPC, a4 From patchwork Thu Aug 4 03:17:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=KFbCEnAw; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=TRM0ech7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lyv76043Fz9s2R for ; Thu, 4 Aug 2022 13:17:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A83Jks0Ri9dAjeCqi3FY4d5itn2EGsIfmoN6I0QDCis=; b=KFbCEnAwbixxHS Y7rPNrbQ4ef83RpPqABnuTPgIhMt9jOhSAJqO2MM5UyK6ob7ax7FEg3jpaoR83cOC2tMBCvTjB+7l tXZkZe32I+K1p/2TOuw8EIEOVRu3ZpeA/gmOKL7dVgf4vHJfk2WxpZ9hB0LZr2t9p+/TR3W1Oxe37 3J/6j4WfZ42U9O63PHn92nRi9/2m+c+kYDj4+dxaa6BpglwZwcxCVyZIAmKacZVcKy+iNCIPjMNbY TdcqEyDgtdvh9uHRFZee+AV5RHieLSs2JqgFKQ8ifHbZpieshHfbdI1tShCuSJbKN4vXs7/piZ2Yn 7ZiiQTSnHWYM0Da7tACQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMg-00FlIW-OG; Thu, 04 Aug 2022 03:17:38 +0000 Received: from mail-tycjpn01olkn2067.outbound.protection.outlook.com ([40.92.99.67] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMX-00FkfF-3J for opensbi@lists.infradead.org; Thu, 04 Aug 2022 03:17:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kbH86bC6dDR4Mgs5/S1ZbGnOclCBiFStreRdmSwL5TkMNUqwHmEG2w12Jj3gq8HjRt9abJgsS6AdIyIZ/QmJOhdFwb/y19dcj8Q3qBDVK4+CH4luhFCpbnWq6GyuT4uRDtLTrwSaUDTCSdUqJ3l93dt7sD13ihmaPO1RtdbLjGjo7/4nPsNSLGPEx6DyenULd7IBc+MKg9BEPdRUT5nKE/i5VofF9JdTGSt0mxtjBCbweY6N7DOJAqXHouAt/AviPT2CazGjMIFERAumIA7wHPwtpTPu0yMFA+/Nzg2zRxYia1Pqs0CEnAMaMBwws9S6U5jQ6hlg+xx28ROa9behHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jHxyuhcPHoUG9qNPgY8Cz6hRuDKS72ZTMZXSY0r0QzI=; b=i/Tp7f/ERbvBDJgrW81t92VX2Rui/Ent0J2WjOEFvRDII/FQzcxkNgWQhgrcBzSN+CjQKkmsWv4CnCcDfMDNRMKoaiXdqZpM/PEnzWkK4rZ6UabQGcimsNlUBGNR91fMr2SintZW8tBSuFAIk7RX3v6DsJ+YgeNL4Bmh3p4+I7y42xfWgWUpIxoBxUVp0UbkZyHYG2ZSYN5TrBM4MJvSiaX4Kbu0n5oJyyUHh/ftAaiM/gkVoc+We2/rjUv6XDSFgSt5yWIAHHeP9j+gilr6a06VK9Bu+0RRJL1aLWIAf2vJ/5cF8ibTuCyadadhzHKhGE7S1EqerGrCemeb6qqBug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jHxyuhcPHoUG9qNPgY8Cz6hRuDKS72ZTMZXSY0r0QzI=; b=TRM0ech7lzn014KAW34YnnAh3JT4tVXj0nwzyikSB6c0KRRUgeYpb7u8g+mKK+JrRq5W0zEIJMgV+YB33dSQroAWNvr6+LLNIGAvMsASwVvtYPEKVWXZr5vyLAzriPwES5GD+SSuYRvr+VL8ogld9mdS1pz3ZWslE+XSKa4mq3vv+SkehSSeL0uIXHsPv9pE8tM+j6r6I5Vzrdbiw0BaGufDTSMJUg1gX33b1wwmNuSy0JecL+Eps3Y7MtcPtnU4FosZgXFj9eGcEqU5MQhQjqt9qpH5yj71ryC4WQXDOOWlSyOj/exIt7Pu7K6sn9+cWwZO5BFr3FuLdHP77DXrZg== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYAP286MB0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8037::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 03:17:17 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Thu, 4 Aug 2022 03:17:17 +0000 From: Vivian Wang To: opensbi@lists.infradead.org Subject: [PATCH 3/5] lib: sbi: Set gva when creating sbi_trap_info Date: Thu, 4 Aug 2022 11:17:04 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804031706.2197187-1-dramforever@live.com> References: <20220804031706.2197187-1-dramforever@live.com> X-TMN: [m/XVOlCgAqywb0EryblOhD2FCbDmlPiM] X-ClientProxiedBy: SG3P274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::24) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220804031706.2197187-3-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6362bf55-93ca-45cf-5892-08da75c7d5d0 X-MS-Exchange-SLBlob-MailProps: zswcL9HXbeVE1gFvWpUFRhfmECV4T/HYyLguR0/VjxXoWaZP2c2A0qr9v0ealQN11tExwsfF7QAA1qo4Hun5ezqEGSsyHrnNaX/PB5GCR8jZqJfAm/ZPEPFRbr5AKJErgX3xRK7CS+JtOPqeEhACwTcgDNLBCpvJYXTnSZACko4s4XbCctEqCJFNxOuYgnfehb+e+ys4qvdZc8n2d/gfghxIE2Be/aHrtaeq5evNB42wqwJ6Xv/zIakMGioYbBt2PbWinH4FvFbe+SA9U+H9Pzo2H2Pjc+X2CzjUVIJ0aNPSPLcH/B2cTKv4hLgq6f5CuWSBa4jkzrcvLe17SZF3d+Rbbl0lzzW2He3BPhBIOWLdcC8Hcsj+VZWI7saMUxnGvv8PpENJUOnMqrg14NCxBnwbyhKAzDecAWkFEnCKHh8eUdWQZ+ztUEIYw6rXXhNr19q96T18lnj5Nq6gZe/tg29UyUEcJ/5AWUmLXkaBW3xPxmyHFcpyxMnOdyYth57GqyobICcZMT+Pr/cBXyYQSCqCQDpMvnev2jSU7jWk2u7KBelX97/LT5MBAl0wHVmh9QISdVy42StVW6ap9PwCQU9UgBMNbGufO8wU8W3orYaEcmnvUOOI/SPEy6fPU21kS2UeqEn/BKl+9J80Vne34DvVUdyaSKTxID/ezwZi77zUV+3u3AqklPBaQI0QI4Qv/8PD7Bd7Bm5d1624KOUI0W+dohXr1rBCSH+HljD1+eyqDcOaJDsUurjXp7lX25oD X-MS-TrafficTypeDiagnostic: TYAP286MB0092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2QSqWMezqU2U5xEe4GoCHpwZHb04kJOv0uc1E8U1YOjM/SPwAb9qqPi8M0s4biWLXLcPf3j0eqN0/IrDkS8Ip4jWVTMmu+OqaQck+z4ImXEYt/7UzT+O8Y1bkjhD5R273MUENLxP8gY+gIs6Gud+NdnaB+JbZsom4CGU7LcawL4JStnWQ4o5Fq14ioJG+0kwKgBDL4Vcpy2jAChNqDZiLTWgMCI5PZWMAzrlnUhHwdGdw1LkgjQLyDN8+euoHU1N8EK6iKUEYYoHNzo5m5rK1fSGsB3eQmFaCxg8aSvajOjghtw1KOA7t/nT8T+nqNXmCoX7EkiQLsTaGMAj+NAj89aW4x0xBXaBaa6xWaYQUCWdmHXmQ3b+3xjeAcySvGO5V/L7EbgdLCnQ/faXLEVchFtNmioNFkAUojPbdEd5k8hp/d+kxF1EuwZrATXtgPoE20JZaK2o5sl5RzLiKCYIiSM6B/ToLn43PlH8dMM9gD8RX1WMuFIOi1UfMgwcv36BophpQjlgvjYnUea+2LKOvS+e7H3IHdggfrUbdN1Xm0S1WDyT2re5RC4gkurUVykxXg3eOQcDST6faCAWe+7U+CtW3Z7wqDF4GEG867BM66LmvQTqqUHZ3pyKL5uE+2n5dCwBtY351Va+cJAW1cqy0A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E4QK9jU6eMThVr7UsBNjO09z87eXnSANXig4ZcYc0c76crtE1Cmn7KOUROeFhRmV+s7MHxb8OMWPANvwLDFpk7e9Y+AB5aT7aWg8sfQnEpxLLq42Uwvz7QjC3N+b5g8DkcE6UOJuAIRomXJDC6uiG3WrMGGf5+g8Cqws+bGuZPzBIqq43LCMO1Kv29QZkE/McwievLsXEftzmBgBjTTrWOWHVENX21PO5PX96oeAJgZ7VuKwFNEAFsVqHwWjL4PxHc9jTaBSA2QphjBOLdhTdTpalPpYoQ94AFGMM2tT8rC8wqK+hlVzmNn1QPARUNJg7xfwriyuKhZmSUz5kCSuDu0V6zLOaJWOY8t0kkVNlbTS4P/mi/JAkAp4jyF5F+oShsnt5WaqaDcLAQ1u1hLvfcTSzEg83nS2wj9qao/Gynl0Fs32TMQ43j41+bxQDQArRS2hyt/HoV7LCEwwRxl7vOhEmL3pacwZhrV71s3ILwCnOTEdMj+i3kSVsFKn89chZlEq42ZVn4pWAVXmg4poADSMRSc4bffnpmAzofiyJradKiXE3C3lqtXd1XcbzWJg6Zpj+frbJbKj8u5PxpuLMBnNzRYt/CfF8xCajSTMkphdlygW2+qPX96ZGQQdfalMw7LmLvkn5DyP7Ipxim5wKJFRvmqhzP6cHue7sb5IRGXKsbK0UwSLo2ohtohBxwaDJQ9rRyBYO+8+B2P8I+LKnuei/BhAcDJv7n49zyySkDp7V6CVweUnK48jEPcBkQIntnYU+j3CFLZ4WH4qW+shuRcgDIM4V0Jx16ncJ6zquKaqXTYaBMff2qG6KieUgnjcwexalD7XI15ADJf2Wt/Xj0beguSNDswptRnzrK9AJwPY4kYbKYAhIwq77oYgQcXBI4ZbjTSHBTVkG997ouvaVn+iHBNJ/rAWJ5KE6RBD+zMoxXFrpD3s0a4a9Ud17bkLWkv9wUSSrgxQH/r3yj/4Efbh/dpVdduEI4cG2rFYpgLZ3qE70/3XnYOPwlnOErsCLfNA6l1bsF6Ug2h+U5jlmzjxQbGc/nn3HqkVUfPLjMcjcQEY7FM23Ek/hfCKdD1A1PWCgK+7kxNKbQDkodJwLrDWKbxEfQ1Y/JSqCHxprNvf2bF0KAE3INprXwKnSQh1JkVDVwJQC7RtfQGSgo6vh9nclMTOxovg3GF+0YtMjxbWA/OpCmk79yDrqGEsVZWXTQSirlRUddewUGeaYoS+zM/fP48PvICP/PtVeImFSmNxEjCerODGhpunTE+Za5Xs/0461PoEzULjyy1hfQItBA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 6362bf55-93ca-45cf-5892-08da75c7d5d0 X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 03:17:17.4676 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_201729_177552_4F2E8C8E X-CRM114-Status: UNSURE ( 8.62 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: In some cases the sbi_trap_info argument passed to sbi_trap_redirect is created from scratch by filling its fields. Since we previously added a gva field to struct sbi_trap_info, initialize gva in the [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.99.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org In some cases the sbi_trap_info argument passed to sbi_trap_redirect is created from scratch by filling its fields. Since we previously added a gva field to struct sbi_trap_info, initialize gva in these cases also. Suggested-by: Andrew Jones Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones --- lib/sbi/sbi_illegal_insn.c | 1 + lib/sbi/sbi_misaligned_ldst.c | 2 ++ lib/sbi/sbi_trap.c | 7 +++++++ 3 files changed, 10 insertions(+) diff --git a/lib/sbi/sbi_illegal_insn.c b/lib/sbi/sbi_illegal_insn.c index 84c04f8..ecd3508 100644 --- a/lib/sbi/sbi_illegal_insn.c +++ b/lib/sbi/sbi_illegal_insn.c @@ -30,6 +30,7 @@ static int truly_illegal_insn(ulong insn, struct sbi_trap_regs *regs) trap.tval = insn; trap.tval2 = 0; trap.tinst = 0; + trap.gva = 0; return sbi_trap_redirect(regs, &trap); } diff --git a/lib/sbi/sbi_misaligned_ldst.c b/lib/sbi/sbi_misaligned_ldst.c index fd11798..92a2393 100644 --- a/lib/sbi/sbi_misaligned_ldst.c +++ b/lib/sbi/sbi_misaligned_ldst.c @@ -129,6 +129,7 @@ int sbi_misaligned_load_handler(ulong addr, ulong tval2, ulong tinst, uptrap.tval = addr; uptrap.tval2 = tval2; uptrap.tinst = tinst; + uptrap.gva = 0; return sbi_trap_redirect(regs, &uptrap); } @@ -244,6 +245,7 @@ int sbi_misaligned_store_handler(ulong addr, ulong tval2, ulong tinst, uptrap.tval = addr; uptrap.tval2 = tval2; uptrap.tinst = tinst; + uptrap.gva = 0; return sbi_trap_redirect(regs, &uptrap); } diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index ee3e4e9..f782fbf 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -311,6 +311,13 @@ struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs) trap.tval = mtval; trap.tval2 = mtval2; trap.tinst = mtinst; + +#if __riscv_xlen == 32 + trap.gva = (regs->mstatusH & MSTATUSH_GVA) ? 1 : 0; +#else + trap.gva = (regs->mstatus & MSTATUS_GVA) ? 1 : 0; +#endif + rc = sbi_trap_redirect(regs, &trap); break; }; From patchwork Thu Aug 4 03:17:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=T/b+xnk3; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=aDdZXlyc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lyv792v2pz9s2R for ; Thu, 4 Aug 2022 13:17:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Vot3ERG3OMz2qzJLKLK8JWYJXKaU7Ung2JQ5igbpiB8=; b=T/b+xnk3iEZtPV aOCQT37vA/GHi5FC/zkfl+slQIy7Ho37E+kNPFn1NFil8bwbYHQ/aLt8ioP6xnccVwEMe84K5QRpv 5BWyg4gnpSWLbx2pfFE9LGpRVNjjTxWVrRmMx6M5eB41K3CsoqUilxuoczJ6+eEz0Gl0Z+sDiEBwM XSe2PnhUE+0lVGK2SXUp7kS0N/BlGutDX4YVRkzn+AqSQsler+GnlecaKvo5zLgKX9i0+mFhSjCdi 6vnOklklRBU5SD4nx+zNIHO4DpZZp+6ss0W890vRPeBvRQC06f1uGc6dJnrgOOYDy3HyOBKoniRRM V2R8AhMo2lVFXFNB9jsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMl-00FlRm-LP; Thu, 04 Aug 2022 03:17:43 +0000 Received: from mail-tycjpn01olkn2067.outbound.protection.outlook.com ([40.92.99.67] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMZ-00FkfF-2Q for opensbi@lists.infradead.org; Thu, 04 Aug 2022 03:17:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BdoEtGf3DgEXEkAxUHej6vYrZ2tkutTnwC6Zhg+rpfnUodPggh7MB5tytn1t7ylgVMTRjvxQ5icb6Z2vAu3nIIZEHXeUTpXPfmxAkuURixSmHe+hr+rktjpsHnZ3SwHB5LOpIapAIvcF+M2Wj9EiOcfAfq2F45O2bfHnWL8smHhM00r6OVpY10/nvR8hoS7xy05Cn9jXVAkfYk1sXky7hm5G3OSqIwTSRn7N9l4UlZkxUIooxfAOBulIzIruNVrZU/zOpA3Zu/CouJ8tCue9aOPQuMPljzqjKBSOCRFFtZSFYMcs5o5PBwCCaBSmgvXU/HPFh1pKEPHeRFGIrN7rLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+ls+FhLKvNo+GqZNXVE5QLP+ggU5BsdDSR36udPvy6M=; b=kX5we1PjD1AFyYmmguPerAP5C1nXZoQ8NJ7mX5+ZP6mjLY4wJ1HIPMK4LAiSpzWtOiXZibGaa/U5Z3DwvY8xwPjK/AnSW52/Wvp3w3UsL1Job7GOS5ngBZ1np7ignHiOvzN6o/VQMucYdwKn8bTkpSz88GA98rRiDCI9SlaTOgH2rDhe4mh0iaSjqt/jeaq3FGvXyHywJv4e8NzrfWE+o7uXBYaj+JYGgwNb3zhpNcORLqkzeg/hf3bJdyAOPMS0/KLTFqUCHDNo7LVgUrIiPS4dpfJ2/RVJWPddq0WRoIMQ3Pd4HAePNqtZ78wQ2tJFME3gy8XDTo0PD7UnJoTz8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+ls+FhLKvNo+GqZNXVE5QLP+ggU5BsdDSR36udPvy6M=; b=aDdZXlycTCDkdIyrqwh7Tx5q5PoXceMEKEyn2icUbumSeKIuHi9nr3ArOha//7F0rfwHW2QI4A7yE8kfJBE7hRXXDWorHNV2nfa3/hueLDtuDzUzsm3yorMFVkZE+DabEtTDcq/qId9giZrTReJv86MGRpVldsrRk9HeY6UIGeXgAt9wnii+qgcuvUO1DjGBJOUIT0gbviPoERbCvNy2lDqYdDV7Pnsiq0FDWmAyKzjTDV4umYllO8IGUGE9CXWGf3mLxp1xKIcToASrL87oJzRlZuIAB4SqzAPJwnsZ/tbZUsmzyG9jXN7SODw3MvThkuuI8JCe8PaCZeWWPjCitA== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYAP286MB0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8037::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 03:17:18 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Thu, 4 Aug 2022 03:17:18 +0000 From: Vivian Wang To: opensbi@lists.infradead.org Subject: [PATCH 4/5] lib: sbi_trap: Set hypervisor CSRs for HS-mode Date: Thu, 4 Aug 2022 11:17:05 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804031706.2197187-1-dramforever@live.com> References: <20220804031706.2197187-1-dramforever@live.com> X-TMN: [oZoTQIH+KiL9aKqI0o+/8/7rXULZSWyl] X-ClientProxiedBy: SG3P274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::24) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220804031706.2197187-4-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4c109cc-5402-4b57-2ec5-08da75c7d65d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQg2lYDA4pebzoYp6ljRgvta4dhCb9nr5rLF+QkVlHVac8jMQmBjdSWSeWxbh93TmTLhiqwrW2lTap2ybLTnyZoNt2/A8GmVSswWxzXS5bvfnjuneuSo8uC5uvRLgORghkdumKR4dPpQrQE7vpmdMphzWpT3rnkIlUA2h8DJCJpf6kp9Lg305S5axDcGj7YW23DuPwiqCd2kvLEXN8CuFY5a7IbREHuBXrcUBJ1akrMlfprhxtc9toxBL3l0SbxSuLbLehjnxb66tDMaGrUF4303SiwCxeoFBYOIu4NPo4d8Z3kpKZ48fUMIDMsE8Vv4camr1WsDqCAhPGwBV4loWYK14ZlMj7y5Y4btlkx0zay1VC3Y7HkjKr+yXLdnva6LTDtIZ3GCLyTI1pDqsQG6pr87oYpOn3YB5zfoyV52wSWjElpgg2A3pVa9oIj88scBgYHSkfi2lrYrLssX+JYBIghvqR53y8u/jvwc2IDdrGkuD1DlplcCiDRd8mDbWrcHxlwy8bZ2HqCc7yTdAUvHH2yEqJdH6JNdahVywL0ky6TjOy3ozKQe7hTTE+1n2LOeXl0NYHALkDGPjYYrH517q1Gt9Aow5mz6IaN3FTxxTklAivBVx2ex03f+F97C7lnlzqAE0V7bm2rngE895+Er+ndtzXtO+SsRUm7CDih2+q4vvOeQGVGsSe8Y/SEnRDE88aSQmFTLPDuBd5Sb7liVLqrSYAd0wCcjHDc7Cl3PqA3MUgHn0dpOhtrn0SlcdkMDak= X-MS-TrafficTypeDiagnostic: TYAP286MB0092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /tgvBpO+LNayixOen/WnjYO84Bn2GblEj+HYCuTv/x+Ayo5N/bAPwbjuwptWgX6jVN8JHdskMWwasOHlofJ7t3ZbKU4vLmHYQfcw9iykKOEjVAaswyJS7rZtdrNrvxLHXrkUJf/+8SudIT2yM80dG4la9DhF2oHOI6VL1TXkJSFXfzV2seOqtHcYrn3ijLLZqsWtaoCocuBV/J2FC5d/ajmOUfQEjrOPVo34XP/wp+BZIvMwjmdWGJjpc9TzkBAKSCLYd4JJFtdLZUT969d984Ww350sZvBIXDYaQ5LuQPpqcJqS5/GGFTHM/KPqmUJkOuZaBcNdtdy2w7AbVg0UI3PccAVGol5ZhrxFq51MXrJkJ6uFELcj+YI42B/r4gdhwBLnnTC+k3l9LQSptp2oGutLYkrBdV1NQE9Zfj+nFiQi8peOqRloIwasUWd7OQ01qMAZ2GSYOgBgTz/zwIncboVvhMpf+xG0F/fYqlSFIY9d+AcmJRru2348vn875YPTCvEwQGkTlniu+/+r65gdutgpgb7u11+b/qVXQOadeiMXuvoNameNGhFuQ16qFw68w0gjiZ0i4Ejoli2Dk4OZXnjGcMnJnL7ENXpxLKrzphFiZNLOsNlhAZrlZIXJ7Sp9VvZ5ZAyZ/t9YnDY44m3Z2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: epy6MmlpAASbwnXzOmXAid14WMBMmK6H9FqjAMyw10B0r8XKlf9Nojpc9/Wxd/VVJYQKBi/PKJTm66diefGiNZV7Ul98I199CojUc2nG66Di9oHZwtyChs/vFK3VHUWkuALqa9U0KCztThbIwBSGpB7MPcnO38tCPccvGb4pg3B6GFaDZzie3apbwssQwsEky7tpdGAfhFSUCzyJtwPa8IGtryq+3OI+RjKe9r7cKRa0tp4TeOE/URmcrCsG8867Pn57lqh28hVWdG208oMFB5mn/PTVLr85JC87y67uzK3d8tkjPDvrNmotD6DAiGauVpm8yyWXvulPmBIbQvQ+ouinCMFVkzOs7zJ7cj+b1aks8KwE+PZSR9xT48Kq8qbdZqfg75moFZ/lmp79X6YPSw5+hp9cJpJXpqqUZ/2vSgCMVr4YcdWcgkyKvsKJNbApus40Xdgp6d2nuO1Wo8/MQhNHzUSW6WE+NJ+mXZP4QZMRoWf3C2i1LsS3lCWU/3xrsWKry+SAkAKXgHxXrP+B5W72jMQQ00qfDmr/LJga+C/h/iTiC/L9bj3GXgXwlxSS7nFm1k/C6UXTD+1hbq+GQcZUGKZ9vHs23YGmeIsDAZ5e43FqLaJrHUGTPOCb0uqFzwviDiXwB5JsNVccoNUBHpp3f1zNEIpVLFTZyfIYnR9n7gyDUclU+7jcJnQa3iW71lyJALo+yIbL5SBE5DrRBGzE5Ev/xNagdcRQlOH0MCONMJMOrgr/EIstP0i7yrKM+e0xJQMVZi4wAL9RtF7vNgT8uwcmVRuN+j6CMtO7kgtLJnS03v9R8MEjBLawuslhjALv7Nd0UJForMBkl/ZABlnntcK73tDFVvhqiXg4ay/qDrODjl5noMDakt5pEXV4mfdmH7MWzCFlg6SDD6C+hUSoEr/g9GguJU7U437L/9WNPssyfE9XtsIYHBz2cQXHXz6/zqIN+FLkG940m9ima4cQqchljal17+iwYVjNX8c+xMNAdivjhW0VCP6j/lhqU95sAgt+qXAcQSzrh9YNacCzQ2k7bZTO/Uc+ClUWzQbZbJ1alBO6lpv5QoarYYnymyVTTd4a2bNcD73CnAI+abe1+PvyjpieMl05B5yipPIkeniBYMiZT1zQqeHQOwOBHGJRNQe3kln5JEtPpKFZqNcKU/0TOX0lwo91md1uRE6rPBwNWR/SvmKpeEsN4x/buWnMFpLjXEYYQz1UW/302G1CsyTzrSdiNII6vy17eILsnnMUzRnjETU/nXFGr/11F/b597igcdVkPHb1hHJ7Mw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: e4c109cc-5402-4b57-2ec5-08da75c7d65d X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 03:17:18.4375 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_201731_174164_72E97E7F X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The hypervisor CSRs hstatus, htval, htinst should always be set if the trap is to be taken in HS-mode, regardless of which mode it came from. Signed-off-by: Vivian Wang --- lib/sbi/sbi_trap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.99.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The hypervisor CSRs hstatus, htval, htinst should always be set if the trap is to be taken in HS-mode, regardless of which mode it came from. Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones --- lib/sbi/sbi_trap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index f782fbf..6e3202b 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -118,12 +118,14 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs, regs->mstatus |= (next_virt) ? MSTATUS_MPV : 0UL; #endif - /* Update HSTATUS for VS/VU-mode to HS-mode transition */ - if (misa_extension('H') && prev_virt && !next_virt) { - /* Update HSTATUS SPVP and SPV bits */ + /* Update hypervisor CSRs if going to HS-mode */ + if (misa_extension('H') && !next_virt) { hstatus = csr_read(CSR_HSTATUS); - hstatus &= ~HSTATUS_SPVP; - hstatus |= (prev_mode == PRV_S) ? HSTATUS_SPVP : 0; + if (prev_virt) { + /* hstatus.SPVP is only updated if coming from VS/VU-mode */ + hstatus &= ~HSTATUS_SPVP; + hstatus |= (prev_mode == PRV_S) ? HSTATUS_SPVP : 0; + } hstatus &= ~HSTATUS_SPV; hstatus |= (prev_virt) ? HSTATUS_SPV : 0; csr_write(CSR_HSTATUS, hstatus); From patchwork Thu Aug 4 03:17:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dramforever X-Patchwork-Id: 1663532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=K85nDP5n; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.a=rsa-sha256 header.s=selector1 header.b=LrzL3jeI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lyv7J3WFhz9s2R for ; Thu, 4 Aug 2022 13:18:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=idnUz8GeLzH/rw7uaeAjnF5pExwGfLydozKTfPCkdN4=; b=K85nDP5nxE3PsP 253uAcJtQGhsDwjKiVF+2s+UZp4NFxU1Z57DOVAZm1WiMUT+1QEKBOCMQXTG65r9NU8H+Hvp2eMD9 J9i5T+QkXjax0D6O5jStBkIdbluESaUcRcFj4MdQ2a4OKJkv5aghAqwxTZEU+mxmoC97zQhioXC2W 548LZLyTIKLLns+kVYr4N1tH3b8s4A3UWz4DcU7ltP6nBdKo1fTsC+E/ywEnE3+4iXQDKxUezCFAY Q3RrwZ765N5kQJXLwW4GlbAeoIf7wcRNnQB0n6agVdB4zip0sPc8xKE441E96HbN7EyzeD/u5Hsgr 2X4mdwGWMRiZbDcLqhzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMs-00FlaE-6R; Thu, 04 Aug 2022 03:17:50 +0000 Received: from mail-tycjpn01olkn2067.outbound.protection.outlook.com ([40.92.99.67] helo=JPN01-TYC-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJRMa-00FkfF-P1 for opensbi@lists.infradead.org; Thu, 04 Aug 2022 03:17:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f7b4Ub7AfgvMu9DFJ58iWLmNjyHLiGZ2TX//dcZyeDFPAJW6Y62Jfx+pc3psELDP8A/Fnm6TBFtIfUBIbRxMNNIMu7xrkwyCeWVvXwPmzSEEC+gMSlvPDk0xXrcRkBCQ+yoQJCw9gBnwGsMpi9/dvOPMfsIzSd7KtahOSONT9dGSHEwM7TDjm1ZjK8+YQHiOgCZlLJvHQ6OzmB06CTadcJScAypkb0xEY1j9aaQ3Kh3n48ZWD9wlziAw56J6vSRmM+7xQgvrf6dzJDkBfm0Aunl8B+M18El2H5PS/n4bxxV5XbUW1eRp3R4upsnsfTyvUOR2lFtbzMtC+vfa3hI7Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BVAcXK986N+S4tmQOB8BxhRc41GVlfI5R1k5yqhtQuM=; b=Thsz8y8nZvAdMpgz5Gx0CCyt6egVLSJhMqcr8x1to1kCqIr00SJzEWcyBc8b3I2ZYRxsBrMMYaKnvC2RNw1nwYaDAYzuzUinnjXv0VFyF15psQs29Z9Kryp5kcbQSMc3xVHHvvKrgi8f6iRDHoBcaKXU1G/OAwHKclXDEC5hNLJ3TxGgSSnjABkntlzjD/f6WaZiMxqLJDXJT93HPCiU137lDouQxOKrjtBudaEl+rl3NiuZa/ndLg8PrtF5u9p1qcwON9jddW/DeQpZCgIQWeQ8TLeZysMLcONy7RfOUIMQpkoLVwJgUNFQAxKa+LXNLIgJH9U2QGbajW5L0Sid7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BVAcXK986N+S4tmQOB8BxhRc41GVlfI5R1k5yqhtQuM=; b=LrzL3jeIK5Y8dRV2lYcWeSq40hpR6uZQy7zSd2/6uTCCLhqO+8cQiVC4RaKB84UN+LGKUhI52/eVnb9fdCgLGDlrm85lCWMAhFvYS4K7JGsI3Z9KC23rp055dTcSHYsaRRUYhmG1bXpvZ5P2bSEnFTbJAIllTK6zNGAISMbrO4yL8wiMHQoHeAMQBMiF0xH3Su3GC8iPKX0Nuk/jpJtTgBW4pJuwN86BIWdBk5nJuw20VWhzDnkhSAefvkd6EnIfTi9YZxZA0OUVodJbU5VPR1PE8vA3HVxvfU9OKV2M/L2n5diFL6uc3L8fK4nh2JqPocHWyK1BRhseJ1kC9A/Ebg== Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) by TYAP286MB0092.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8037::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Thu, 4 Aug 2022 03:17:19 +0000 Received: from TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36]) by TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM ([fe80::ed1f:7f05:2a4a:5d36%6]) with mapi id 15.20.5504.014; Thu, 4 Aug 2022 03:17:19 +0000 From: Vivian Wang To: opensbi@lists.infradead.org Subject: [PATCH 5/5] lib: sbi_trap: Set hstatus.GVA when going to HS-mode Date: Thu, 4 Aug 2022 11:17:06 +0800 Message-ID: X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804031706.2197187-1-dramforever@live.com> References: <20220804031706.2197187-1-dramforever@live.com> X-TMN: [sux3dlXOVRHkvhcEJBEm4RLrSis5ksll] X-ClientProxiedBy: SG3P274CA0012.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::24) To TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:df::12) X-Microsoft-Original-Message-ID: <20220804031706.2197187-5-dramforever@live.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f4e3734-e28c-4311-be4c-08da75c7d6f5 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEujs2MIq33Rz02YJPfMmdqKB6azCI4S2wB+CvVP8mSy7iJOK5kz7E/IhhN+3T9LCXGkRPPLdhx1hv05zbslbV9Jfw0ftVRBvNrv+SpqGFFIjiU8bBhQ0w1ei/V2bDW5mvQyXau5mojLE1iJqhiQSJoMhkEkEWky0mpUulDjCxjItM++0pOX9RLj/FysOLeeJZj2AC9u0XDv9KTYse0Ae+O6sVqaepSXCjxaYv9bx6bhfU244CWAkzYGh57OKUU9yqqgGY4x0X7Dt/4YxYG4ZKNl218CcPLLAGxqW0ex0XbFwO6IOHF8nXk8K6uxQh/WyeBbmZqT/PTnHNTBq7oi02zSBQnxGHsuq2yr6DKn0VgqjGHrzKe68w1sOaUz6IXp39hL/TNlOblW9N6jSeEgSn7cFJBtUzwZ1VjhwApaNF8PSNAsbuGCoz3lCWDqVu5aZll8CecpYA/iVsYPtYA1CGs0Pjvyi79WXxObdfCVAGHR3nM3FeVjRH8Yr4SyK354TtVh0IU8nfT7GBjOSKWf5w7wKXuEEFN9FWd8ap8pSceKzzRNw9FTZDI3Mxyt+XwV6FHknzQXnRNnJRS3xbiKUTClhO8gvayEoxi36GBfJKYrJkQU0Z6stiNzNc1Q0cWpS64yorJchdXkt5KZWSs76KPilIlqPH/qKGaB9nl/ZeEV/WstZksDeg6XotqCbZvuq3d3UfLBfiieqQiOQ5KvpK5HlilYwWY50xsVzofJGQpLJv1J5dQGJxO7uh4t1vo0Ukb3VOfDK+KNxoTCjZHTOWUS X-MS-TrafficTypeDiagnostic: TYAP286MB0092:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KYWBfW6826jXkBjYHvaH04fuY5YDzlNlZxnPsGgnoUl5h4xAyVTaZvbLaHeiQJgSb4KxyxT30G9J8kennSjvTi1PBNu8hHI9A6LccxIgtT3w0st4hhL6/zndlkDunTmiKn3u9jpmxyrX+i3oWq/ZYQY/YqdqTfeOfDao5wIXkuoKv6TXU2xQTqBYKAiLjMVWiqQZvwrKHXfYxYQxaxDsLVVuVKo4/7EQ3Jq2J7pB4EAyMWV/Ctl6vLwPjE237nvJxdDHckopKZHEJxXA4xaVcGf8gaIHaFZxDLx0CsCSbSc3bZkhhXjulepynYCqShw7Ix6OupzwhQVctTHHgIGrnGNw8ykTLhCavAvM/7wkjIkGNzltHLHExJCp4QLWiNXClFS3MVkxPDy3GgdKRZQIGTkN+0l+foFlwmlFs8pNij5PP+Sy5XliswEZzAOKlH/c7o12NLRscpi+yZ92Ntiq6xvJYWwbaQuBGqEqrEglynq+M1ojNkCZUqlxK9oNqJT9n+yl8cvElgRazendMk5BPKaMbRwJ+wU6n0DkqznxioxDbdLSkI3WMy3b53fKwp3/rov+Th753QZN4c7jYbCpHcnYS2Z+sF6yHl6aWa6R2Jrt2xDbTwDzsK1h6WCAzOX2HKjedkcNWeu/TvABkp3hiA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3+9lW6w43b0wY2vMFYC08Pb9iJBxPjiMe0tG0zNQzhQL4lZCswMPMK9qLCUJCQTXn7ifEUSOsjizQt4qDkwystoQVc4eEXgnOy5405IX/mBorkmpTw/C6M8G4aZfkKrBWij3HLNXqYlUjOryikCuBaVZZBKD2HpYjMLXwb8LAgOt+c5lMY55qt1r4yMEWhxOVq9Amrq7+5A7uA+9h1ojwSHZy0ip/yugdXKkAupDNjVKjO+gdjiNJs1jrQUj3jL0jy1GhoX2r0TMGdnKxcSYgl2HniHSNRuzgFRgA0T1nPAlsWc6HpvIL7lB7LQXOu9DRolyAnUSHptySl4gpiPjAIPWk7TLs9W0v1RbL3nBAO6W3PhTCYZwSfePF49zXZImzdJAkMQNV9hz8OqAMUqtgVuVO73k+NHMuKQEamxk2wJ72mM6k6AverC41E4Nc/uGNO+Yf1b3BxpNMzuNEXXuVMfrpnndt2rxXOQwSfz21yAOIeppmFgNdhwJ7ljoCpPeNa5KUxv8lQYwnjb3SZpSlMAMutbju0kRpfFOovHh3L3LDlaYjKDx2gOtvewJ4zCJb5u/gDeqBSehL2uSLewk1ovjxPBHlxux52SC9WKBzuLH8zXGkHGmB9jy2D/MFPsQwkvi7zLW1CV/2EQnAOMua6P2FFltwaZ0RKRMM+RgFkSiD+8APoWyLxFm0vTh249BfAIwDgAhTBJ5L7CSH0RcKw/TggFsvlaqehC5c8QDbmYbDydzRkw//7tkbrDvbTGWObptjkeDuHznaihhpaWxaVMA9CY0oa8Y7W7IR8KDbibs7FSg1WcpvOU8OpUHKILjvRkoKi6xXgS0/k9nbvXBHX4JiYVaETBVI5gg09JVMnMrBEss24BJIZmMIkVIj/lVS7BXTOF2cU8P1goJ59TRl1EzesRXW50JPMBkYgyUoxX5DFL8Ve8oIjOLUL58RbmHFUeb8pcm921YJP3NiJdRppKZPj0fd9GHDdyYpLtcCccZRFGoREM/mFgjw6T70l1IozTKnFs4RjQkNzo5BSbuzAG/VZU3n6JRsz/UpjsUsgH9q41hlz2bHRRRCaiBj2n/iHMBINt//Tvt8T5yXa6+X90G2wlSfiYVYYju9Yq2G0gyYEgUhq1aYRfpnBRYTps+VPvD2reWhoruYhD2JcWt8PzhvX+jz/5fcVfPaoFFLxNjUQxQQEZLYSi/HgaexsXtA7m+nidrqvDvb56N3mxeMdTxLNBTL5f0Ii55dvgnF8rwKUeJlNm2XCw0OAxOQx5PFvLK0pbUVpTN1IdLVT3KJA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 7f4e3734-e28c-4311-be4c-08da75c7d6f5 X-MS-Exchange-CrossTenant-AuthSource: TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 03:17:19.4373 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_201732_860965_DB27733A X-CRM114-Status: UNSURE ( 7.98 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The privileged spec specifies that on a trap to HS-mode, hstatus.GVA should be set to 1 if stval is written with a guest virtual address, and to 0 otherwise. Implement this by setting hstatus.GVA to t [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.99.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dramforever[at]live.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The privileged spec specifies that on a trap to HS-mode, hstatus.GVA should be set to 1 if stval is written with a guest virtual address, and to 0 otherwise. Implement this by setting hstatus.GVA to trap->gva when redirecting traps to HS-mode. Signed-off-by: Vivian Wang Reviewed-by: Andrew Jones --- lib/sbi/sbi_trap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/sbi/sbi_trap.c b/lib/sbi/sbi_trap.c index 6e3202b..65408de 100644 --- a/lib/sbi/sbi_trap.c +++ b/lib/sbi/sbi_trap.c @@ -128,6 +128,8 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs, } hstatus &= ~HSTATUS_SPV; hstatus |= (prev_virt) ? HSTATUS_SPV : 0; + hstatus &= ~HSTATUS_GVA; + hstatus |= (trap->gva) ? HSTATUS_GVA : 0; csr_write(CSR_HSTATUS, hstatus); csr_write(CSR_HTVAL, trap->tval2); csr_write(CSR_HTINST, trap->tinst);