From nobody Fri Dec 19 20:37:31 2025 Delivered-To: importer@patchew.org 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; 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=1575915690; cv=none; d=zohomail.com; s=zohoarc; b=KxnYkw5wiHboVENmjhq3R1IHjYYM3niIRhIcLmZdQOL0H3XYgHxzdi8h2bra8h7Vz3ZmQ/zSAAyHf97A04+dsLxb4XZX3o82Vt3rVfQIv8xfQ7rtkuQvdtHyyZorW0uPFHNVOVpduJ3ux16uvcvbDqgh3NnhKLPEQEeFwggRaB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575915690; 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=IzV1EiEQnT2EJ+URAhsaTpXCs3F4f/iEgQxswxADErg=; b=PPXgzpia5/rM+q6jNvPNnROVqHg5zOtCNttHnkK8DG65l1rQdqR5+5NNK8oal2qk/f5NAeLvBk2go1MsSUJ315nMO8Qkyfz98Jlak/MtTUYH+VeaZgr5iTy/pJpUoStbXPkbP/An0+AqZP9kimWNi4ftV74DDPhlSM5qKuEZJjA= 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 1575915690795582.0704848775025; Mon, 9 Dec 2019 10:21:30 -0800 (PST) Received: from localhost ([::1]:44321 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieNey-0004RX-PA for importer@patchew.org; Mon, 09 Dec 2019 13:21:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ieNak-0007JX-W7 for qemu-devel@nongnu.org; Mon, 09 Dec 2019 13:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ieNaj-0007Q6-KD for qemu-devel@nongnu.org; Mon, 09 Dec 2019 13:17:06 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:52960) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ieNaj-0007PQ-CZ; Mon, 09 Dec 2019 13:17:05 -0500 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; 10 Dec 2019 02:17:03 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2019 10:11:41 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip01.wdc.com with ESMTP; 09 Dec 2019 10:17:04 -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=1575915425; x=1607451425; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d7/DY+YCNJVNKO8sD/VIkO3osyXJIDJnRCYpQIAVre4=; b=EriJ7HZsIslk/w+utMRt6CVgTN22YZ/xxUC1noKZKjhM4ajBsFfHUNyt hlHTFRkm2/3dY6/i9lxtYQGyMCToPA55SOgb8eaOzGcaYMOYbOU9mJLuR RyLAYyE+iUNfF349Jlq83wdS1d94k6d5pRM3g6dGX4JQUbU1tmokxHJ90 IBuSP/weyPUO8wdobWeYK0EP347HjyukNXLluO7fL2p/xpL1IvdWT5iz9 BAi9j5UjPTGd56sv/Zqu976NVuEuM+eZJ5/IkRC6UrE2ArnSRXSFHqyLM mHvXHzIjXo/mf4t9wcfkNuO9RbUCBq6tZb14Cw3nOYRiBwC/l45KmL3wE g==; IronPort-SDR: Co8hraGMzuXUfWbnhGykLaNvQEQiX/k7ipBqgpcTMWsU58drwdLFmuBHJuVtIdrzKbuPwP5pd8 E5ZwPoBX9Gv+5Fmp4pOkB3SoBVFXLx0ZevhrwftLTP1/DVeZa6m3piS9NSKCIKCsskbIuOvHdM bf1pTm+SkR995aZ+I9ay2oas1rYsRWP3qIgoa1w/DkcOgzPno+1ILwA6uAE+52th+vEROSfiWC C7v2YBSafQztuHBJ//ixgIdyKhxuqy9S5BFU5ORZcoHb+9359eXGZirMin1jCKCqd5uZzhy7dL Aew= X-IronPort-AV: E=Sophos;i="5.69,296,1571673600"; d="scan'208";a="124925569" IronPort-SDR: s9HLKL5b/07ARHm61McD2IF4xA1m9bJ2FQ5Zoo0Ogqw+kuO3aynAjdR4cdYHMMnExzqsgmDCoh x2XhdlYeh5Vc/m+E64ZINVUd7PoUDJ7G8zlOZ1S7htrBz/uuVJBYaxU6Up2+e2ITl+7FE8xUEk jMG1C3VVsf7X88RB9JsnAlK7Sf9+R1xCS+ifVOa7oPgIh+CvcVcoRqOmw/7O4CEBkC+FrqEpa8 BZ6SwiCtk2+UGS+OeCb7bPF9eVW9FYSoli/GqFsvy2c3zcC27OnA6TxDIhnnvHJ+t8ZNzIYuc5 ktO7ycxy2LIOOw42D3+hdgO6 IronPort-SDR: o84C/8/0LrcMBEnlvWHdrLfp41yu5lLib25NPBlEF6y6O2AzvWEknTdwB2UBLIF1zoS5rscr4d p3Z3RKnljlhCaGJfw+UXspQ6lt/tBSGMM69Neyu/rQZMj/2XZkCyUTBJaouOHmMDZ5Z1M3Zj+2 NXoX5zg8MtjwFhzf/d7M45UESMKO7QI2n1eQ35Zp+xTZUGfa5T0YtlvsjNVY/7t8KU9MM2FHlk gXQzTMBL/IEGz5aftgYhBHZ3nJ1yyMC2895U5iqVKDaySm9L8lt+oxrkOQxDGBPpLXuZ0jMlsG GWc= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 16/36] target/riscv: Add virtual register swapping function Date: Mon, 9 Dec 2019 10:11:22 -0800 Message-Id: X-Mailer: git-send-email 2.24.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: 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+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/cpu.h | 10 +++++++ target/riscv/cpu_bits.h | 7 +++++ target/riscv/cpu_helper.c | 63 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 9dc8303c62..eb089fbdb6 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -125,6 +125,7 @@ struct CPURISCVState { target_ulong *mstatus; =20 target_ulong mip; + uint32_t miclaim; =20 target_ulong mie; @@ -173,6 +174,14 @@ struct CPURISCVState { target_ulong mtval2; target_ulong mtinst; =20 + /* HS Backup CSRs */ + target_ulong stvec_hs; + target_ulong sscratch_hs; + target_ulong sepc_hs; + target_ulong scause_hs; + target_ulong stval_hs; + target_ulong satp_hs; + target_ulong scounteren; target_ulong mcounteren; =20 @@ -303,6 +312,7 @@ void riscv_cpu_list(void); #define cpu_mmu_index riscv_cpu_mmu_index =20 #ifndef CONFIG_USER_ONLY +void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env); int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint32_t interrupts); uint32_t riscv_cpu_update_mip(RISCVCPU *cpu, uint32_t mask, uint32_t value= ); #define BOOL_TO_MASK(x) (-!!(x)) /* helper for riscv_cpu_update_mip value = */ diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index ad6479796c..a24654d137 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -553,4 +553,11 @@ #define SIP_STIP MIP_STIP #define SIP_SEIP MIP_SEIP =20 +/* MIE masks */ +#define MIE_SEIE (1 << IRQ_S_EXT) +#define MIE_UEIE (1 << IRQ_U_EXT) +#define MIE_STIE (1 << IRQ_S_TIMER) +#define MIE_UTIE (1 << IRQ_U_TIMER) +#define MIE_SSIE (1 << IRQ_S_SOFT) +#define MIE_USIE (1 << IRQ_U_SOFT) #endif diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 9684da7f7d..63439c9370 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -82,6 +82,69 @@ bool riscv_cpu_fp_enabled(CPURISCVState *env) return false; } =20 +void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) +{ + target_ulong mstatus_mask =3D MSTATUS_MXR | MSTATUS_SUM | MSTATUS_FS | + MSTATUS_SPP | MSTATUS_SPIE | MSTATUS_SIE; + bool current_virt =3D riscv_cpu_virt_enabled(env); + + g_assert(riscv_has_ext(env, RVH)); + +#if defined(TARGET_RISCV64) + mstatus_mask |=3D MSTATUS64_UXL; +#endif + + if (current_virt) { + /* Current V=3D1 and we are about to change to V=3D0 */ + env->mstatus =3D &env->mstatus_novirt; + *env->mstatus &=3D mstatus_mask; + *env->mstatus |=3D env->vsstatus & ~mstatus_mask; + /* Ensure that vsstatus only holds the correct bits */ + env->vsstatus &=3D mstatus_mask; + + env->vstvec =3D env->stvec; + env->stvec =3D env->stvec_hs; + + env->vsscratch =3D env->sscratch; + env->sscratch =3D env->sscratch_hs; + + env->vsepc =3D env->sepc; + env->sepc =3D env->sepc_hs; + + env->vscause =3D env->scause; + env->scause =3D env->scause_hs; + + env->vstval =3D env->sbadaddr; + env->sbadaddr =3D env->stval_hs; + + env->vsatp =3D env->satp; + env->satp =3D env->satp_hs; + } else { + /* Current V=3D0 and we are about to change to V=3D1 */ + env->mstatus =3D &env->vsstatus; + *env->mstatus &=3D mstatus_mask; + *env->mstatus |=3D env->mstatus_novirt & ~mstatus_mask; + + env->stvec_hs =3D env->stvec; + env->stvec =3D env->vstvec; + + env->sscratch_hs =3D env->sscratch; + env->sscratch =3D env->vsscratch; + + env->sepc_hs =3D env->sepc; + env->sepc =3D env->vsepc; + + env->scause_hs =3D env->scause; + env->scause =3D env->vscause; + + env->stval_hs =3D env->sbadaddr; + env->sbadaddr =3D env->vstval; + + env->satp_hs =3D env->satp; + env->satp =3D env->vsatp; + } +} + bool riscv_cpu_virt_enabled(CPURISCVState *env) { if (!riscv_has_ext(env, RVH)) { --=20 2.24.0