From nobody Mon Feb 9 22:37:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763701516; cv=none; d=zohomail.com; s=zohoarc; b=FDl2l0OJVt1NAQeVN0t/24og5lAybSl6P64FUdf+I/x6smlJBMHY3kthQ357fDtSgQVCeUnNOJjV9AcyzdNnCs5Mw28oWP+Kh7fOlguklPbq81WZuEVl1b++1uO4T3T855R+xip37cF3ysr8+prQAMww/6CwBp3+bqInGSaK5co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763701516; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=VYPc6BfChlosybrmXcPJgr/oUjaFJ/34iLbaAvOMSAjqZbsXsauzAV9YYu2qE5fWiI9469srQbmyDQDKag8t9JYLt/AusTH0HEgDT/6+4OyYlh6vJZmAJhTsYow8L5Rv3a36KDUrZKvQzLpVP1jJyX0myXiIP4kAgvGFk9ZRgwk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763701516537230.8540139918681; Thu, 20 Nov 2025 21:05:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vMJK5-0006D7-Gi; Fri, 21 Nov 2025 00:04:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vMJJs-00066R-1M for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:32 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vMJJp-0006n3-PH for qemu-devel@nongnu.org; Fri, 21 Nov 2025 00:04:27 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-298456bb53aso20527955ad.0 for ; Thu, 20 Nov 2025 21:04:24 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b26fed2sm43384525ad.69.2025.11.20.21.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 21:04:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763701463; x=1764306263; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=MFqnH57Mmsje0oBqHEye0RmigGjl5x48E6Ns4oBEq2PRo3mnshWG0aI7B2gDFgiKuL IvkBsl8uWZmpNYY+rqg+XWEyk/LDkAFwEPdbnIeU6AzqfwVvwK9jzvQpnMB4p0ZRGiZK rn07D4Al/ondgDKAW9hXGuQhm5BMcRJXbC5/CZJYFnqmIeDKup3IXaD2XqSsG3OY+V3S c1ZdQAgnRZR5XQfc0AZSyahG4pM0SJ1FJb0WRzJUV3+8S3mbMhCbUOTi/49cfKjqSXHl wcsadgUCzuf+/1ues94T6+S6qaDgyl/FUcuNZH4f7n7npt/xxYq2sXWeVZg5kE7byyKx iCmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763701463; x=1764306263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=v+Vo75nBxgljZp+vA5zxFb2iMeyrZvaQZGA+2VSeTK0=; b=BnRm+TTBR/Gap3xXpnHyrwK0qZBj53amVG8YaMOfSTYWC03rLNWFlAFcaxZ1tEgw4M HWp5faXEBOC8i98WSmsVD08N+Odf2GH8ffNsN5rlJG8rK9s5dxmZcmdUaSHqjTnS9yVS /sl4TC1xNERhakvmOv4TCeLuHp1dsmFq8eYlF8lAtNiURAdOsqVUTBgkdEOEhf1HsSHj Hvx9DGFpVobq/OIpf1INVCWNjrJ75J+62GZiqBDdoVBSqyOncraiIYmTr9vS7iNiG5JA ZOya7xVUtpWdNxnLIyg5wvq1Ldc2X10rjroOLSMSShgIcXiGVRS6bSeT5/m6Piu547Rv aHmQ== X-Gm-Message-State: AOJu0Yy0Pvm9oQf5XgRJaIN6Nyvjc6gf1oVr5CelHmYv56Xy8e2RD7gp yQ1EIISA1sEZ9k5SyeTeb5bdqd/fcbWCndxN2+NS3scqsvQh37xr9vsLgRGmOp+jK/Di5UeQTM3 T+Ps0e0x3L2AFuSZ/zxIXvFNGvUv4Ldx60FRJqdRTHjlN/8MADvlgejSxCsPlEzgaKmYV+ycatc BXQQp4G8BWD8+khacqpZ8SmLSz5DdVZ8IHTwudl6SfTls= X-Gm-Gg: ASbGncv3UfX9p4ZSfW89v9ZnPzQG92YTrwYmtpZhV1kbHbQDvf81aGj3rYC79BimnVv 3LVld9s+GsY5+9Yt1NNZkb5yHDYN/kldAht3gzy9NmGErHak0TAwHKj9aJhLFVR79+2KZlog77t OUvvzhjKV5vjUnVKKmwayy5ftmTJi078n0dyLG53YjnvG9elWV0qRsc/HQJAQle/KdOgIzmWw+t kSkCvzMndGscJtW4bbiOv32Bwyugg2fAMsu8ERx5Vv/InxI1RGaaBqo8+ZAk781kKzrKeT78Hvy JPhSRar9JJFQTDTrWSrZvnkypspFK88F8m6WSneDGuRwtCRUpZHlcwdhDgkcDqiXp9uyzNPR+Bd AHJv9B1qqW97MoRbuitXKmMTsrjSgrM+2UmyCYPbbtnP1KCBjVeHN334b60MgwQub3IDL148SMT 8HG6RdQr1l5iQRvZEJl8EniXX0RboXDouOp7bzQQ== X-Google-Smtp-Source: AGHT+IEdJxDMYO7PFeUCPlBgGplsfGU2U+FTDkztOeCj0cJmnNQKN0Dl66lZiB6s0XGYDUgQbvF5lg== X-Received: by 2002:a17:903:234e:b0:295:9db1:ff3b with SMTP id d9443c01a7336-29b6c3db5fbmr14313405ad.6.1763701462929; Thu, 20 Nov 2025 21:04:22 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH v2 2/6] target/riscv: Add a helper to return the current effective priv mode Date: Fri, 21 Nov 2025 13:04:09 +0800 Message-ID: <20251121050413.3718427-3-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251121050413.3718427-1-frank.chang@sifive.com> References: <20251121050413.3718427-1-frank.chang@sifive.com> 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=2607:f8b0:4864:20::636; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763701517136018900 Content-Type: text/plain; charset="utf-8" From: Frank Chang This helper returns the current effective privilege mode. Signed-off-by: Frank Chang Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- target/riscv/cpu.h | 1 + target/riscv/cpu_helper.c | 55 ++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 8899bf7667a..ab285d7a6d1 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -607,6 +607,7 @@ target_ulong riscv_cpu_get_geilen(CPURISCVState *env); void riscv_cpu_set_geilen(CPURISCVState *env, target_ulong geilen); bool riscv_cpu_vector_enabled(CPURISCVState *env); void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); +bool riscv_cpu_eff_priv(CPURISCVState *env, int *priv, bool *virt); int riscv_env_mmu_index(CPURISCVState *env, bool ifetch); bool cpu_get_fcfien(CPURISCVState *env); bool cpu_get_bcfien(CPURISCVState *env); diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index dd6c861a90e..fbab8177092 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -38,6 +38,46 @@ #include "pmp.h" #include "qemu/plugin.h" =20 +/* + * Returns the current effective privilege mode. + * + * @env: CPURISCVState + * @priv: The returned effective privilege mode. + * @virt: The returned effective virtualization mode. + * + * Returns true if the effective privilege mode is modified. + */ +bool riscv_cpu_eff_priv(CPURISCVState *env, int *priv, bool *virt) +{ +#ifndef CONFIG_USER_ONLY + int mode =3D env->priv; + bool virt_enabled =3D env->virt_enabled; + bool mode_modified =3D false; + +#ifndef CONFIG_USER_ONLY + if (mode =3D=3D PRV_M && get_field(env->mstatus, MSTATUS_MPRV)) { + mode =3D get_field(env->mstatus, MSTATUS_MPP); + virt_enabled =3D get_field(env->mstatus, MSTATUS_MPV) && (mode != =3D PRV_M); + mode_modified =3D true; + } +#endif + + if (priv) { + *priv =3D mode; + } + + if (virt) { + *virt =3D virt_enabled; + } + + return mode_modified; +#else + *priv =3D env->priv; + *virt =3D false; + return false; +#endif +} + int riscv_env_mmu_index(CPURISCVState *env, bool ifetch) { #ifdef CONFIG_USER_ONLY @@ -45,19 +85,14 @@ int riscv_env_mmu_index(CPURISCVState *env, bool ifetch) #else bool virt =3D env->virt_enabled; int mode =3D env->priv; + bool mode_modified =3D false; =20 /* All priv -> mmu_idx mapping are here */ if (!ifetch) { - uint64_t status =3D env->mstatus; - - if (mode =3D=3D PRV_M && get_field(status, MSTATUS_MPRV)) { - mode =3D get_field(env->mstatus, MSTATUS_MPP); - virt =3D get_field(env->mstatus, MSTATUS_MPV) && - (mode !=3D PRV_M); - if (virt) { - status =3D env->vsstatus; - } - } + mode_modified =3D riscv_cpu_eff_priv(env, &mode, &virt); + uint64_t status =3D (mode_modified && virt) ? env->vsstatus : + env->mstatus; + if (mode =3D=3D PRV_S && get_field(status, MSTATUS_SUM)) { mode =3D MMUIdx_S_SUM; } --=20 2.43.0