Message ID | TYYP286MB1439D2AB7CFD5C0E58107ECFC69F9@TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM |
---|---|
State | Superseded |
Headers | show
Return-Path: <opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> 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=<UNKNOWN>) 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 <incoming@patchwork.ozlabs.org>; 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 <dramforever@live.com> 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: <TYYP286MB1439D2AB7CFD5C0E58107ECFC69F9@TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220804031706.2197187-1-dramforever@live.com> References: <TYYP286MB1439C5C64BCF8E9DB7883772C69F9@TYYP286MB1439.JPNP286.PROD.OUTLOOK.COM> <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: <opensbi.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/opensbi>, <mailto:opensbi-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/opensbi/> List-Post: <mailto:opensbi@lists.infradead.org> List-Help: <mailto:opensbi-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/opensbi>, <mailto:opensbi-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "opensbi" <opensbi-bounces@lists.infradead.org> Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
Set hstatus.GVA for traps going to HS-mode
|
expand
|
On Thu, Aug 04, 2022 at 11:17:05AM +0800, Vivian Wang wrote: > 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 <dramforever@live.com> > --- > lib/sbi/sbi_trap.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
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);
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 <dramforever@live.com> --- lib/sbi/sbi_trap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)