From patchwork Sat Feb 1 01:02:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1232181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.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.a=rsa-sha256 header.s=dkim.wdc.com header.b=OARB27If; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 488bjw0KwMz9s29 for ; Sat, 1 Feb 2020 12:15:16 +1100 (AEDT) Received: from localhost ([::1]:34346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixhNR-0003Nz-UV for incoming@patchwork.ozlabs.org; Fri, 31 Jan 2020 20:15:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57136) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixhII-0003tZ-Qv for qemu-devel@nongnu.org; Fri, 31 Jan 2020 20:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixhIH-0006fF-L5 for qemu-devel@nongnu.org; Fri, 31 Jan 2020 20:09:54 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:17129) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixhIH-00069K-Cm; Fri, 31 Jan 2020 20:09:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1580519393; x=1612055393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=itGNRIfRlWXHjdpC7huP+A7InAJbWN6XLtFG+2hVFKA=; b=OARB27IfQ7XIiuuJSNGVD/rnuSRnGhR3wV6xhvuDIQJsqwcQAUb+/XgX 1fAWsvhekNft28uiHqRw11QQnohDwASzoDhC9IkF2KTFLBd4qfoyLCmCd V2ZBlx4iaTyRDUxkG6HfANsn8dKLsca3zmWh7pclQZmUEvWy2vlmf7C8c L09OTFch93zx4rP/VcUdwtT+9FX+Nx+/I44wZolhwllOILztMQGodz2lh 60xpmqfsk4w/40yFxwMxVu68LF8WAtq6K5CCZN4xhrjjLOsVWxOtcgeXI G6Vp4M+PIiUxzEm6ZkhjGtXf4F+kxAjv7dArLGAv/UadA8U7qJmyApUX1 g==; IronPort-SDR: X7hBGV4K/Vdd7DPwUliaz15TMhrc0CvDhwtfG385Wnnb+vxq9Auum8iG1nW9H3JL48L2SVIBo9 8iP2upmjMFiFuuRVnbcNoCaJlWHVCTPkXr+TQ7E1X6u+q7WoA8xfk8GrQNYwjDf/lfu6URTV5P bKXfui9wY3fh3KvnY0PF4FDIzEnI55iEQJphbkvE1HzTyh5OriKhhn5Zcas8HyUVJ/a++fC4h4 diL7R0ZwzQIT3xI9OlUw99ojUjn/pN8LGo9G1IpN5uMSlIz4DTQZHhgT77pMkQ8kF2Pk2Bbrk8 9pg= X-IronPort-AV: E=Sophos;i="5.70,388,1574092800"; d="scan'208";a="128872478" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 01 Feb 2020 09:09:09 +0800 IronPort-SDR: Puyyu6q4NxiX4MzudA8K2YapG7HTJY7u62SBruDidPrhXl1DMeSxKUNatDxvwSXcZxUtPFY//f SJgZc+T/a+oPT/ieyyCOuV7P6d0RezUcHL+sVk+ryiBVLVbhq9dBkNlCZ37pRQci4J+oP8+Dg0 QCirY3++rdAiD+8kFAYJk4lEHHONE2GhxDlGIv6CrXzYpv/yGOYPJ9bEk0qvqub84ltwg1Kp/h p8gIrdqDnlImrOit5Gjqy2oiEiMmEON1nzZ4oZlDeTbMlZeJLFN+RJv+zK9LttVEu6OSDBAany If9XvjvUjxTIbCDQsEtV1Leh Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2020 17:02:18 -0800 IronPort-SDR: dVAnwstYP0Ms5lFC1f/xrRdk4+28n8VJecpi4LthhUZL1ecYWyH69khHmK5svjJfEXSj3782Zp X0oTXBSSBgMOeMUzTXKWqiZ/4MsJVxNKCn0m3T6UmblXw83B72lZ//fEc4sIfD9Am4pQDWZu4Z 9766aMxdbDaL04Gn+nhRSUxCeJZYWyINWJzyT2ZIdJgUEAZHE4vfunCyzPTSHQqEUrfST/oa2k 9WcaphSvhAMmU97pgN2FlzccaY/SQ1Z0habe5Ft6shLmZtEgWSSG24G7/HjJ1+EUnXio3Ehlhp XJY= WDCIronportException: Internal Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip02.wdc.com with ESMTP; 31 Jan 2020 17:09:10 -0800 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 22/35] target/riscv: Add Hypervisor trap return support Date: Fri, 31 Jan 2020 17:02:33 -0800 Message-Id: <09e27a2e38afa585be6d2a7c32fa169cc1b89a40.1580518859.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 216.71.154.42 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: alistair.francis@wdc.com, palmer@dabbelt.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt --- target/riscv/op_helper.c | 62 +++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 455eb28907..804936e9d5 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -73,6 +73,8 @@ target_ulong helper_csrrc(CPURISCVState *env, target_ulong src, target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) { + target_ulong prev_priv, prev_virt, mstatus; + if (!(env->priv >= PRV_S)) { riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } @@ -87,16 +89,46 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } - target_ulong mstatus = env->mstatus; - target_ulong prev_priv = get_field(mstatus, MSTATUS_SPP); - mstatus = set_field(mstatus, - env->priv_ver >= PRIV_VERSION_1_10_0 ? - MSTATUS_SIE : MSTATUS_UIE << prev_priv, - get_field(mstatus, MSTATUS_SPIE)); - mstatus = set_field(mstatus, MSTATUS_SPIE, 1); - mstatus = set_field(mstatus, MSTATUS_SPP, PRV_U); + mstatus = env->mstatus; + + if (riscv_has_ext(env, RVH) && !riscv_cpu_virt_enabled(env)) { + /* We support Hypervisor extensions and virtulisation is disabled */ + target_ulong hstatus = env->hstatus; + + prev_priv = get_field(mstatus, MSTATUS_SPP); + prev_virt = get_field(hstatus, HSTATUS_SPV); + + hstatus = set_field(hstatus, HSTATUS_SPV, + get_field(hstatus, HSTATUS_SP2V)); + mstatus = set_field(mstatus, MSTATUS_SPP, + get_field(hstatus, HSTATUS_SP2P)); + hstatus = set_field(hstatus, HSTATUS_SP2V, 0); + hstatus = set_field(hstatus, HSTATUS_SP2P, 0); + mstatus = set_field(mstatus, SSTATUS_SIE, + get_field(mstatus, SSTATUS_SPIE)); + mstatus = set_field(mstatus, SSTATUS_SPIE, 1); + + env->mstatus = mstatus; + env->hstatus = hstatus; + + if (prev_virt) { + riscv_cpu_swap_hypervisor_regs(env); + } + + riscv_cpu_set_virt_enabled(env, prev_virt); + } else { + prev_priv = get_field(mstatus, MSTATUS_SPP); + + mstatus = set_field(mstatus, + env->priv_ver >= PRIV_VERSION_1_10_0 ? + MSTATUS_SIE : MSTATUS_UIE << prev_priv, + get_field(mstatus, MSTATUS_SPIE)); + mstatus = set_field(mstatus, MSTATUS_SPIE, 1); + mstatus = set_field(mstatus, MSTATUS_SPP, PRV_U); + env->mstatus = mstatus; + } + riscv_cpu_set_mode(env, prev_priv); - env->mstatus = mstatus; return retpc; } @@ -114,14 +146,24 @@ target_ulong helper_mret(CPURISCVState *env, target_ulong cpu_pc_deb) target_ulong mstatus = env->mstatus; target_ulong prev_priv = get_field(mstatus, MSTATUS_MPP); + target_ulong prev_virt = get_field(mstatus, MSTATUS_MPV); mstatus = set_field(mstatus, env->priv_ver >= PRIV_VERSION_1_10_0 ? MSTATUS_MIE : MSTATUS_UIE << prev_priv, get_field(mstatus, MSTATUS_MPIE)); mstatus = set_field(mstatus, MSTATUS_MPIE, 1); mstatus = set_field(mstatus, MSTATUS_MPP, PRV_U); - riscv_cpu_set_mode(env, prev_priv); + mstatus = set_field(mstatus, MSTATUS_MPV, 0); env->mstatus = 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); + } return retpc; }