From nobody Tue Feb 10 14:42:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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=1604466860; cv=none; d=zohomail.com; s=zohoarc; b=XkvrIN0+NgEbh6vYC5PUUKgk12ANhKKenQGaf+wF0loKcEzYiv/5OtbhI1H55hOpNa2GtAgZeho00ewimnyYY6lY93L5LXU8HcgvZY7JN1hKdwgh3n9V2XtVvFGU2J+IBq2VVPyjvKUNj7MOxxirjXo7Fy86jVWO21tdjdd1aWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604466860; 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=7Fpp+86I3W394QPSXP89qMVh0wIBHjHCwK0JsUpw/9A=; b=bLjWl/XENc8jZmOV72cK7RxIVPWgLYL1YZdA640mnjgk1+86dWoRpWZbVUfLqlcHbuLF6sjsgzRhNWotbUte9Gotg1IA32fZy+tMbJvNP34Jr17GkXbxDdE7d0yKRVrME87zDvyqvT6P+VY1Vic/KneKvn4p5PEoLXnSeqXjIEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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 160446686062920.58420517401248; Tue, 3 Nov 2020 21:14:20 -0800 (PST) Received: from localhost ([::1]:57718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaB7j-0005Ym-Bx for importer@patchew.org; Wed, 04 Nov 2020 00:14:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaAp5-00048B-1s; Tue, 03 Nov 2020 23:55:03 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:17620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaAp2-0005k1-Lc; Tue, 03 Nov 2020 23:55:02 -0500 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 04 Nov 2020 12:54:57 +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; 03 Nov 2020 20:39:55 -0800 Received: from usa003000.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.60.113]) by uls-op-cesaip02.wdc.com with ESMTP; 03 Nov 2020 20:54:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1604465700; x=1636001700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0cnh9t+t9g0YgjdwBXPqSgwt7Z2fQx44mGqfUiJG5h4=; b=LBgzK4NMj61/Mrrlc54etyPUyZ9T5YH0Be5H+sDoRStVhwqeGec1rxGy hTWXfY08BrbQtxQIXJusUwNcVUGEEp/XJaL3FZbvvlwE5pz4wr00U5aJ2 YoG7zaRvOeSNxditNeugkpiAg3ChlGbh29p6S3hMjqhTprIepZ4SyAlxG 3WljHPXPhxBK2aL5aKj9smkgbcXAl1RdVXONM3Zc07T4rR3zK3PoireZN 796yyK+diiH6rjOZoeA4pQM9hyl8MAJ3MMuRo8ULjAQ+FyzeK+v46QAI3 pG7HqxDE1h0lKXylS3vrfkXvM4d4ijBKAlbx/gsqvI7RWoFA2RqoZirMS g==; IronPort-SDR: eiaPOCjCAivFnCOlz483Sbn4q4yHIMhg2Xiv7mDWCfLewDuaNJA+r5DnCuVcUpEzKJpwtsh00S YeDMuPV4MXD7WcJPimlIuo1pwjD3HdmUPGOoyV4I0rCzTvResWWcafDljOR+4DwhfQszdLLd3f F9qN6nHyyFUa2eEf1dO9YYecJO45YnR8ITJjZ2rpftpcbJnF+cP5Eisz6gMMumEv4R/E9DCM0q s+FJTzuSzYmn66DLc+yBOsDWc6HccQgiLDSwN9e5Ez4njOMdkZDQQ+wjr7ler9VhZLYE+hfbMt ZZw= X-IronPort-AV: E=Sophos;i="5.77,449,1596470400"; d="scan'208";a="151656930" IronPort-SDR: zxU5t4CJ2It1i320/2VAHK97/k9/+a07ol9lJIbJfv9dFDKhayE1AHGUYA6gww65GrwnWw7V7a BMQtzmTToeOq3rG6/pRnDJb8hbXDcEFm6LRaiPmLepDKGrsOUb/cAPoTT1LFH34W0N/SyUkDjf h11mX+M1sLBQ0jubCMVppU15ru+jj2Ap89uFBxBU5vRSMioAhy1syZzk0Xf0QDdZUKhm+rJAZD M1uNmiFIPG6BfrqNWY0mlCsrACLgMF9Rk6qmRS+GiU4yTsFMzXhY0PAz+SyDf6hFMBUMJO/IRS x+Q7eyo2XndUQ8AJ/DxoggGv IronPort-SDR: NkRqUrVR00i4zen0TVFblCluK3P433CpMjAj+Q45c8EFfvZoILllI2JOXT76+iz6BAHdbOhR4p Fy9ynpOT2SGeyUfHQ62HyxPeu2RGcrRfEf7yRBcqAXUO58NzEvHz/1rQJixBdlM9VN7mihlClU 3+ucu4RM/wR7XxpVw2SIGguUoGTborT6/22agaxrztLA9zN4B8+fx1TkWxO5Z30XBslffX1WQg HVWqZTVBjHvIoAFrfYfQRy0j1mDHnlNjmcgIWmSqdPl1MmdQqfjGudNaL4IECZG5Evjs48o0yu eu4= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v4 2/5] target/riscv: Set the virtualised MMU mode when doing hyp accesses Date: Tue, 3 Nov 2020 20:43:26 -0800 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=57073d1dd=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 23:54:51 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, richard.henderson@linaro.org, bmeng.cn@gmail.com, palmer@dabbelt.com, alistair23@gmail.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" When performing the hypervisor load/store operations set the MMU mode to indicate that we are virtualised. Signed-off-by: Alistair Francis Reviewed-by: Richard Henderson --- target/riscv/op_helper.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index e20d56dcb8..548c5851ec 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -235,30 +235,31 @@ target_ulong helper_hyp_load(CPURISCVState *env, targ= et_ulong address, (env->priv =3D=3D PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) { target_ulong pte; + int mmu_idx =3D cpu_mmu_index(env, false) | TB_FLAGS_PRIV_HYP_ACCE= SS_MASK; =20 riscv_cpu_set_two_stage_lookup(env, true); =20 switch (memop) { case MO_SB: - pte =3D cpu_ldsb_data_ra(env, address, GETPC()); + pte =3D cpu_ldsb_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_UB: - pte =3D cpu_ldub_data_ra(env, address, GETPC()); + pte =3D cpu_ldub_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TESW: - pte =3D cpu_ldsw_data_ra(env, address, GETPC()); + pte =3D cpu_ldsw_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TEUW: - pte =3D cpu_lduw_data_ra(env, address, GETPC()); + pte =3D cpu_lduw_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TESL: - pte =3D cpu_ldl_data_ra(env, address, GETPC()); + pte =3D cpu_ldl_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TEUL: - pte =3D cpu_ldl_data_ra(env, address, GETPC()); + pte =3D cpu_ldl_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TEQ: - pte =3D cpu_ldq_data_ra(env, address, GETPC()); + pte =3D cpu_ldq_mmuidx_ra(env, address, mmu_idx, GETPC()); break; default: g_assert_not_reached(); @@ -284,23 +285,25 @@ void helper_hyp_store(CPURISCVState *env, target_ulon= g address, (env->priv =3D=3D PRV_S && !riscv_cpu_virt_enabled(env)) || (env->priv =3D=3D PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) { + int mmu_idx =3D cpu_mmu_index(env, false) | TB_FLAGS_PRIV_HYP_ACCE= SS_MASK; + riscv_cpu_set_two_stage_lookup(env, true); =20 switch (memop) { case MO_SB: case MO_UB: - cpu_stb_data_ra(env, address, val, GETPC()); + cpu_stb_mmuidx_ra(env, address, val, mmu_idx, GETPC()); break; case MO_TESW: case MO_TEUW: - cpu_stw_data_ra(env, address, val, GETPC()); + cpu_stw_mmuidx_ra(env, address, val, mmu_idx, GETPC()); break; case MO_TESL: case MO_TEUL: - cpu_stl_data_ra(env, address, val, GETPC()); + cpu_stl_mmuidx_ra(env, address, val, mmu_idx, GETPC()); break; case MO_TEQ: - cpu_stq_data_ra(env, address, val, GETPC()); + cpu_stq_mmuidx_ra(env, address, val, mmu_idx, GETPC()); break; default: g_assert_not_reached(); @@ -326,15 +329,16 @@ target_ulong helper_hyp_x_load(CPURISCVState *env, ta= rget_ulong address, (env->priv =3D=3D PRV_U && !riscv_cpu_virt_enabled(env) && get_field(env->hstatus, HSTATUS_HU))) { target_ulong pte; + int mmu_idx =3D cpu_mmu_index(env, false) | TB_FLAGS_PRIV_HYP_ACCE= SS_MASK; =20 riscv_cpu_set_two_stage_lookup(env, true); =20 switch (memop) { case MO_TEUW: - pte =3D cpu_lduw_data_ra(env, address, GETPC()); + pte =3D cpu_lduw_mmuidx_ra(env, address, mmu_idx, GETPC()); break; case MO_TEUL: - pte =3D cpu_ldl_data_ra(env, address, GETPC()); + pte =3D cpu_ldl_mmuidx_ra(env, address, mmu_idx, GETPC()); break; default: g_assert_not_reached(); --=20 2.28.0