From nobody Fri Dec 19 19:16:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1572047650; cv=none; d=zoho.com; s=zohoarc; b=IGMI8eL6jI4F5IOVE+AowQaiszqmBOxyDk5Ta+Y4mc+xHBfGPWtPFOkZSd1K3gyXqI4LxIjPtmHMIfIdlmDs+J8QoY/3kEPukv4/mQSAlK5RnsSbnqBKMvj/dXD3+8ff3G8GXHKS1+lbFSIf7cxhlFyPi+RmOBIxyNfldFjKlHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572047650; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V1/VvSKw9Bmq1A0R+h72GitfTa8QuHoW1rxmwFr3gU8=; b=jzgJY8H3a1OajwogOntOQHnolMVbv9z5Uz2NoQ9P1KdQ8tahLYMFVfmNn9KbEneTybtG3Q/p06kp56x7xMOe31IjuqESi60mgZmoZE/UmuGUIrI5IS0F4Q3oT7cnp3p6XQtuC4r3kILTM2YS3JAdU7E1ipqfKsJeFmoXObuqjSY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157204765062640.47088936188993; Fri, 25 Oct 2019 16:54:10 -0700 (PDT) Received: from localhost ([::1]:37210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO9PB-00040x-DF for importer@patchew.org; Fri, 25 Oct 2019 19:54:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49821) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO917-00057t-G8 for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:29:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO913-0004Rt-2b for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:29:11 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:49531) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO912-0004OP-04; Fri, 25 Oct 2019 19:29:08 -0400 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 26 Oct 2019 07:29:09 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2019 16:24:37 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Oct 2019 16:29:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1572046153; x=1603582153; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bMeqtbfW+9JJ0VJKdr9KVccHLjaihEfmrV++mdO5OKc=; b=MCoHMJIFwmYaZvwahltfNFIqBTEjwjT3zTad7TjX73UakzjFyFIjRgtR rUsrf9Qc4pIlNZ9V0UYKS9JHfFV17N5fslSuiCtbFwIxBT2y2iCPQ3Svj byoraSw2yM9iNYDoRA6WsHZ4V4xBrml8w6cCbBWaDPfPD8WUfIiCs6h/g X3xEkTvmAdXdtJq/wkq3XfFyaolbtgIY/SzhmvXWAgt9iA9KUiehf0d3p TtjJL8suUEmaxt1ktnxCvf3ufzOzwmmlBSjqFdYEkQEn1QwkDosI5P2zb Nj0X571PxmiA6CpMjFqi+zy2cUQ2pZorEWTk7MYqKMLZQoskDlRqEve8t A==; IronPort-SDR: 6CvtZbNcC+HJdzFu5AhKbuydRY8i6FJ+6afNzap2yIeqQeABum9h5Y1LvVHOktpJ8p4qIlS33m EB+g1z/akHlcolEdiNE66gxvRFgmS0RNTqRf5zVWAy+TYDRtDpFReYUgfelju6WjSvPxo4cFvy q4HjLtdyB5W35a6Y7+k4GwQxYh44HzoCuEMKGk6ZsLZcSwehahfnnkmKDeK68VmR9buitlw21+ 8JC3CedxYWrOsYbKk9binI1/3uB0NbiSTeHcSEQnsfFT6AzEkZ7X/smR0d5RruQaqMM4W+zRhF PLU= X-IronPort-AV: E=Sophos;i="5.68,230,1569254400"; d="scan'208";a="222508982" IronPort-SDR: ig+AI3gfw1w8psFMoHyN9kVq88TtNesyvHo/nZI7+BYaaCBnfcjCKN0N9TOhg28ZbL68UZq1RV jXJEfPTJapFY0ulL8f+wY0RiwzUO3bUBK6BVhLcbBTktqYyPzq3cSYZNCSFLZwOAT64WvO7V0a n1OuGLi2E9Avjp49jlo8mtR2IsVTaTAmLUuCnWGpe41bwRIDJfmQtWh2LU5KHGrll+kvY+Jog7 PJ8Y3xokzvQJp7pBZVHd0Z4/iUHGGMujbAs4wIVwtzwXF7lgkQvpIve0wbXMM795AkFi0X/kHH Ql1G1ckjI1ZpnJzV2dt4odsX IronPort-SDR: aVDC+lYXPtcx6LG5TNg9FyAu+vsmWuJPolmy4fRORhMWFYL+4+RBSe1GpdpmCwrphhyDlwdUZK SVZTHEpERZMIQ4KCvRBVRYAT5V/luK9r8mU9rRV8R0r9hOmSB8QcU+MlgH/eCdjzdhNr6N4D08 SdFAeW66CC+4g1BaHYU4YX27xQlvy+N9k9gdcVkCA8GbtQDiIpLo9K6JjKdL1GOfl0m0GqPClE dwsIcwSCgJkgfSIAaklbB5LVN99BcYIW7HAp5Shcwsqo/GRiT8fdGxfEvBmHPZI5esXiltAjbO PZk= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 18/27] target/riscv: Add Hypervisor trap return support Date: Fri, 25 Oct 2019 16:24:09 -0700 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.143.124 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt --- target/riscv/op_helper.c | 66 ++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index beb34e705b..e5128570e6 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -73,6 +73,8 @@ target_ulong helper_csrrc(CPURISCVState *env, target_ulon= g src, =20 target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) { + target_ulong prev_priv, prev_virt, mstatus; + if (!(env->priv >=3D PRV_S)) { riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } @@ -87,16 +89,46 @@ target_ulong helper_sret(CPURISCVState *env, target_ulo= ng cpu_pc_deb) riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } =20 - target_ulong mstatus =3D *env->mstatus; - target_ulong prev_priv =3D get_field(mstatus, MSTATUS_SPP); - mstatus =3D set_field(mstatus, - env->priv_ver >=3D PRIV_VERSION_1_10_0 ? - MSTATUS_SIE : MSTATUS_UIE << prev_priv, - get_field(mstatus, MSTATUS_SPIE)); - mstatus =3D set_field(mstatus, MSTATUS_SPIE, 0); - mstatus =3D set_field(mstatus, MSTATUS_SPP, PRV_U); + mstatus =3D *env->mstatus; + + if (riscv_has_ext(env, RVH) && !riscv_cpu_virt_enabled(env)) { + /* We support Hypervisor extensions and virtulisation is disabled = */ + target_ulong hstatus =3D env->hstatus; + + prev_priv =3D get_field(mstatus, MSTATUS_SPP); + prev_virt =3D get_field(hstatus, HSTATUS_SPV); + + hstatus =3D set_field(hstatus, HSTATUS_SPV, + get_field(hstatus, HSTATUS_SP2V)); + mstatus =3D set_field(mstatus, MSTATUS_SPP, + get_field(hstatus, HSTATUS_SP2P)); + hstatus =3D set_field(hstatus, HSTATUS_SP2V, 0); + hstatus =3D set_field(hstatus, HSTATUS_SP2P, 0); + mstatus =3D set_field(mstatus, SSTATUS_SIE, + get_field(mstatus, SSTATUS_SPIE)); + mstatus =3D set_field(mstatus, SSTATUS_SPIE, 1); + + *env->mstatus =3D mstatus; + env->hstatus =3D hstatus; + + if (prev_virt) { + riscv_cpu_swap_hypervisor_regs(env); + } + + riscv_cpu_set_virt_enabled(env, prev_virt); + } else { + prev_priv =3D get_field(mstatus, MSTATUS_SPP); + + mstatus =3D set_field(mstatus, + env->priv_ver >=3D PRIV_VERSION_1_10_0 ? + MSTATUS_SIE : MSTATUS_UIE << prev_priv, + get_field(mstatus, MSTATUS_SPIE)); + mstatus =3D set_field(mstatus, MSTATUS_SPIE, 0); + mstatus =3D set_field(mstatus, MSTATUS_SPP, PRV_U); + *env->mstatus =3D mstatus; + } + riscv_cpu_set_mode(env, prev_priv); - *env->mstatus =3D mstatus; =20 return retpc; } @@ -114,14 +146,24 @@ target_ulong helper_mret(CPURISCVState *env, target_u= long cpu_pc_deb) =20 target_ulong mstatus =3D *env->mstatus; target_ulong prev_priv =3D get_field(mstatus, MSTATUS_MPP); + target_ulong prev_virt =3D get_field(mstatus, MSTATUS_MPV); mstatus =3D set_field(mstatus, env->priv_ver >=3D PRIV_VERSION_1_10_0 ? MSTATUS_MIE : MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_MPIE)); - mstatus =3D set_field(mstatus, MSTATUS_MPIE, 0); - mstatus =3D set_field(mstatus, MSTATUS_MPP, PRV_U); - riscv_cpu_set_mode(env, prev_priv); + mstatus =3D set_field(mstatus, MSTATUS_MPIE, 1); + mstatus =3D set_field(mstatus, MSTATUS_MPP, 0); + mstatus =3D set_field(mstatus, MSTATUS_MPV, 0); *env->mstatus =3D mstatus; + riscv_cpu_set_mode(env, prev_priv); + + if (riscv_has_ext(env, RVH)) { + if (prev_virt) { + riscv_cpu_swap_hypervisor_regs(env); + } + + riscv_cpu_set_virt_enabled(env, prev_virt); + } =20 return retpc; } --=20 2.23.0