From nobody Fri May 9 09:12:09 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
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=gmail.com
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734351585901886.3400372935168;
Mon, 16 Dec 2024 04:19:45 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNA4N-0002sr-Q4; Mon, 16 Dec 2024 07:19:27 -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 <baturo.alexey@gmail.com>)
id 1tNA4G-0002r7-RI; Mon, 16 Dec 2024 07:19:23 -0500
Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <baturo.alexey@gmail.com>)
id 1tNA4E-00008K-01; Mon, 16 Dec 2024 07:19:19 -0500
Received: by mail-lf1-x130.google.com with SMTP id
2adb3069b0e04-53e3a227b82so3890246e87.0;
Mon, 16 Dec 2024 04:19:16 -0800 (PST)
Received: from vmdev.asgard ([81.200.11.243]) by smtp.gmail.com with ESMTPSA
id
2adb3069b0e04-54120c13d0esm827143e87.192.2024.12.16.04.19.12
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 16 Dec 2024 04:19:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734351555; x=1734956355; 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=sAs/4bh1o3SRl0i7eZF/ICkLOILEkj/fHEwv3cGiGNE=;
b=EK6CoVemWSIWkXrRcXUTy8xS/clI0tDChSdq27WaZKBv/2WnBzSNO1gK4cfQHLOwYA
k4mcs11kgFzIvcY4oWgqzpGi22H5hi0yurRQhJ7TDqS34tvOwgoyylxTcPHCt0G84VZt
KrdBSZrQ1YrXenx2h2erxY6mbPhAoGFka4fxQxHIgQjgvK1nTNGbJE3gF8pI2pOpG79g
kDrSdUIC355xuESdWOyTkV0LraXeVeBe+mBzsHgyrAxpPIEPYz3uQ+IRWIjEuLWWi1/h
VwSqIXz1U7+R8NYgyiTpiyyTCg6u6Kba5XrBpADfpKAddhZqZXBYja+yA+Cv1yufiDYC
HEbw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734351555; x=1734956355;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=sAs/4bh1o3SRl0i7eZF/ICkLOILEkj/fHEwv3cGiGNE=;
b=t3d6HoCSFAKCmiS4UCTGXXqxsfKakVfUnYQlM71lXn6EtcpgNytgZsp7pIk2d5oUBv
g4VtyFc76mvb6AKh+GC+hFUY0bTfszlnWpWmM69I3WyilG5d+Twkg2OB6qTZFMqig6XK
6s+Judy6efL1FseJZKkMzqL5jujSTL+ro+VHQPSYBMeGHiXiHm7VXSUN1eR4fVf5Ao01
hW1lKQEcE+e2kTPllnQDhAxOljADghJdMC2TAD7KZmVfuvKdfL3F32o32xOwuDddxCLp
f5GX9OWv7/TwtL52LbYehQKh/toZgvzF4srCkIa1McY75VEh5Z/WXMWa1YnHwV7A4k23
ZT8Q==
X-Forwarded-Encrypted: i=1;
AJvYcCU6cePevzMNZTpbDeVjcZOTNzEt+OaqlhLRnuoWOaR3klR/nnzvtRMYE/bLEtX2cbhEjfIrP2zP578HLw==@nongnu.org,
AJvYcCWrRCMCJP4VJkQszi3TS9LnZz7633LbPTQtXBqBRfMC8XU44LOmvRJ9q3riaLpftG8PjwipyfQyVOgd@nongnu.org
X-Gm-Message-State: AOJu0YzcqY1wFyoOdMjBQJaYkzMK/4/FHulmIzfzI4khTRDkom3qRld2
bfv9O4hkEFbwS5b21WmrrHR2/dZ7OfUQJ7vM1t0hbU2shwWOmoqV
X-Gm-Gg: ASbGncv3VBb9+B2w16/oICRxwj8vXxeFogIkhvJkuEkxo5RKrAYabSbt4YYvHI5aXli
zScvLLByyOxRQmDgN7wBqcZEausrcCuC/F7NtmrYUu/7TPoB9+TyNA1665g0Qq282BP+gbeFpIs
ifxySuch9IVmamINPKXBLN8/jsZi389OJJnsGU2KMezKuMm+VkiCo8f0xCSIAWOVA4kAgaAUBwo
8twQMPX7GP8VKrelp3YdItUp+/RM4Ewu06p18jwProfdLcxTU0ukuHP+zgXQA==
X-Google-Smtp-Source:
AGHT+IEcSGEngEbil5gA5bKiuLb4MZ5/IvOErty+MeGAHi8KYBFfdr3GHoDIKSSLAG7nxmTsczc0SA==
X-Received: by 2002:a05:6512:e89:b0:540:5253:9666 with SMTP id
2adb3069b0e04-540905a7063mr3687180e87.46.1734351554582;
Mon, 16 Dec 2024 04:19:14 -0800 (PST)
From: baturo.alexey@gmail.com
To:
Cc: baturo.alexey@gmail.com, richard.henderson@linaro.org,
zhiwei_liu@linux.alibaba.com, dbarboza@ventanamicro.com,
liwei1518@gmail.com, alistair23@gmail.com, frank.chang@sifive.com,
palmer@dabbelt.com, Alistair.Francis@wdc.com, sagark@eecs.berkeley.edu,
kbastian@mail.uni-paderborn.de, qemu-devel@nongnu.org,
qemu-riscv@nongnu.org
Subject: [PATCH v13 2/7] target/riscv: Add new CSR fields for S{sn, mn,
m}pm extensions as part of Zjpm v1.0
Date: Mon, 16 Dec 2024 15:19:02 +0300
Message-Id: <20241216121907.660504-3-baturo.alexey@gmail.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241216121907.660504-1-baturo.alexey@gmail.com>
References: <20241216121907.660504-1-baturo.alexey@gmail.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=2a00:1450:4864:20::130;
envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x130.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, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1734351586238116600
Content-Type: text/plain; charset="utf-8"
From: Alexey Baturo <baturo.alexey@gmail.com>
Signed-off-by: Alexey Baturo <baturo.alexey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
target/riscv/cpu.h | 8 ++++++++
target/riscv/cpu_bits.h | 4 ++++
target/riscv/cpu_cfg.h | 3 +++
target/riscv/csr.c | 31 ++++++++++++++++++++++++++++++-
target/riscv/pmp.c | 14 +++++++++++---
target/riscv/pmp.h | 1 +
6 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index e11264231d..417ff45544 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -128,6 +128,14 @@ typedef enum {
EXT_STATUS_DIRTY,
} RISCVExtStatus;
=20
+/* Enum holds PMM field values for Zjpm v1.0 extension */
+typedef enum {
+ PMM_FIELD_DISABLED =3D 0,
+ PMM_FIELD_RESERVED =3D 1,
+ PMM_FIELD_PMLEN7 =3D 2,
+ PMM_FIELD_PMLEN16 =3D 3,
+} RISCVPmPmm;
+
typedef struct riscv_cpu_implied_exts_rule {
#ifndef CONFIG_USER_ONLY
/*
diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h
index 2a6aff63ed..d8f9bc68e3 100644
--- a/target/riscv/cpu_bits.h
+++ b/target/riscv/cpu_bits.h
@@ -574,6 +574,7 @@ typedef enum {
#define HSTATUS_VTW 0x00200000
#define HSTATUS_VTSR 0x00400000
#define HSTATUS_VSXL 0x300000000
+#define HSTATUS_HUPMM 0x3000000000000
=20
#define HSTATUS32_WPRI 0xFF8FF87E
#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
@@ -734,6 +735,7 @@ typedef enum RISCVException {
#define MENVCFG_CBIE (3UL << 4)
#define MENVCFG_CBCFE BIT(6)
#define MENVCFG_CBZE BIT(7)
+#define MENVCFG_PMM (3ULL << 32)
#define MENVCFG_ADUE (1ULL << 61)
#define MENVCFG_PBMTE (1ULL << 62)
#define MENVCFG_STCE (1ULL << 63)
@@ -749,6 +751,7 @@ typedef enum RISCVException {
#define SENVCFG_CBIE MENVCFG_CBIE
#define SENVCFG_CBCFE MENVCFG_CBCFE
#define SENVCFG_CBZE MENVCFG_CBZE
+#define SENVCFG_PMM MENVCFG_PMM
=20
#define HENVCFG_FIOM MENVCFG_FIOM
#define HENVCFG_LPE MENVCFG_LPE
@@ -756,6 +759,7 @@ typedef enum RISCVException {
#define HENVCFG_CBIE MENVCFG_CBIE
#define HENVCFG_CBCFE MENVCFG_CBCFE
#define HENVCFG_CBZE MENVCFG_CBZE
+#define HENVCFG_PMM MENVCFG_PMM
#define HENVCFG_ADUE MENVCFG_ADUE
#define HENVCFG_PBMTE MENVCFG_PBMTE
#define HENVCFG_STCE MENVCFG_STCE
diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
index 59d6fc445d..79a114eb07 100644
--- a/target/riscv/cpu_cfg.h
+++ b/target/riscv/cpu_cfg.h
@@ -128,6 +128,9 @@ struct RISCVCPUConfig {
bool ext_ssaia;
bool ext_sscofpmf;
bool ext_smepmp;
+ bool ext_ssnpm;
+ bool ext_smnpm;
+ bool ext_smmpm;
bool rvv_ta_all_1s;
bool rvv_ma_all_1s;
bool rvv_vl_half_avl;
diff --git a/target/riscv/csr.c b/target/riscv/csr.c
index 941c9691da..5389ccb983 100644
--- a/target/riscv/csr.c
+++ b/target/riscv/csr.c
@@ -575,6 +575,9 @@ static RISCVException have_mseccfg(CPURISCVState *env, =
int csrno)
if (riscv_cpu_cfg(env)->ext_zkr) {
return RISCV_EXCP_NONE;
}
+ if (riscv_cpu_cfg(env)->ext_smmpm) {
+ return RISCV_EXCP_NONE;
+ }
=20
return RISCV_EXCP_ILLEGAL_INST;
}
@@ -2379,6 +2382,12 @@ static RISCVException write_menvcfg(CPURISCVState *e=
nv, int csrno,
if (env_archcpu(env)->cfg.ext_zicfiss) {
mask |=3D MENVCFG_SSE;
}
+
+ /* Update PMM field only if the value is valid according to Zjpm v=
1.0 */
+ if (env_archcpu(env)->cfg.ext_smnpm &&
+ get_field(val, MENVCFG_PMM) !=3D PMM_FIELD_RESERVED) {
+ mask |=3D MENVCFG_PMM;
+ }
}
env->menvcfg =3D (env->menvcfg & ~mask) | (val & mask);
=20
@@ -2425,6 +2434,12 @@ static RISCVException write_senvcfg(CPURISCVState *e=
nv, int csrno,
{
uint64_t mask =3D SENVCFG_FIOM | SENVCFG_CBIE | SENVCFG_CBCFE | SENVCF=
G_CBZE;
RISCVException ret;
+ /* Update PMM field only if the value is valid according to Zjpm v1.0 =
*/
+ if (env_archcpu(env)->cfg.ext_ssnpm &&
+ riscv_cpu_mxl(env) =3D=3D MXL_RV64 &&
+ get_field(val, SENVCFG_PMM) !=3D PMM_FIELD_RESERVED) {
+ mask |=3D SENVCFG_PMM;
+ }
=20
ret =3D smstateen_acc_ok(env, 0, SMSTATEEN0_HSENVCFG);
if (ret !=3D RISCV_EXCP_NONE) {
@@ -2489,6 +2504,12 @@ static RISCVException write_henvcfg(CPURISCVState *e=
nv, int csrno,
get_field(env->menvcfg, MENVCFG_SSE)) {
mask |=3D HENVCFG_SSE;
}
+
+ /* Update PMM field only if the value is valid according to Zjpm v=
1.0 */
+ if (env_archcpu(env)->cfg.ext_ssnpm &&
+ get_field(val, HENVCFG_PMM) !=3D PMM_FIELD_RESERVED) {
+ mask |=3D HENVCFG_PMM;
+ }
}
=20
env->henvcfg =3D (env->henvcfg & ~mask) | (val & mask);
@@ -3525,7 +3546,15 @@ static RISCVException read_hstatus(CPURISCVState *en=
v, int csrno,
static RISCVException write_hstatus(CPURISCVState *env, int csrno,
target_ulong val)
{
- env->hstatus =3D val;
+ uint64_t mask =3D (target_ulong)-1;
+ /* Update PMM field only if the value is valid according to Zjpm v1.0 =
*/
+ if (!env_archcpu(env)->cfg.ext_ssnpm ||
+ riscv_cpu_mxl(env) !=3D MXL_RV64 ||
+ get_field(val, HSTATUS_HUPMM) =3D=3D PMM_FIELD_RESERVED) {
+ mask &=3D ~HSTATUS_HUPMM;
+ }
+ env->hstatus =3D (env->hstatus & ~mask) | (val & mask);
+
if (riscv_cpu_mxl(env) !=3D MXL_RV32 && get_field(val, HSTATUS_VSXL) !=
=3D 2) {
qemu_log_mask(LOG_UNIMP,
"QEMU does not support mixed HSXLEN options.");
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index a1b36664fc..a185c246d6 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -575,6 +575,13 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint=
32_t addr_index)
void mseccfg_csr_write(CPURISCVState *env, target_ulong val)
{
int i;
+ uint64_t mask =3D MSECCFG_MMWP | MSECCFG_MML;
+ /* Update PMM field only if the value is valid according to Zjpm v1.0 =
*/
+ if (riscv_cpu_cfg(env)->ext_smmpm &&
+ riscv_cpu_mxl(env) =3D=3D MXL_RV64 &&
+ get_field(val, MSECCFG_PMM) !=3D PMM_FIELD_RESERVED) {
+ mask |=3D MSECCFG_PMM;
+ }
=20
trace_mseccfg_csr_write(env->mhartid, val);
=20
@@ -590,12 +597,13 @@ void mseccfg_csr_write(CPURISCVState *env, target_ulo=
ng val)
=20
if (riscv_cpu_cfg(env)->ext_smepmp) {
/* Sticky bits */
- val |=3D (env->mseccfg & (MSECCFG_MMWP | MSECCFG_MML));
- if ((val ^ env->mseccfg) & (MSECCFG_MMWP | MSECCFG_MML)) {
+ val |=3D (env->mseccfg & mask);
+ if ((val ^ env->mseccfg) & mask) {
tlb_flush(env_cpu(env));
}
} else {
- val &=3D ~(MSECCFG_MMWP | MSECCFG_MML | MSECCFG_RLB);
+ mask |=3D MSECCFG_RLB;
+ val &=3D ~(mask);
}
=20
/* M-mode forward cfi to be enabled if cfi extension is implemented */
diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h
index e0530a17a3..271cf24169 100644
--- a/target/riscv/pmp.h
+++ b/target/riscv/pmp.h
@@ -46,6 +46,7 @@ typedef enum {
MSECCFG_USEED =3D 1 << 8,
MSECCFG_SSEED =3D 1 << 9,
MSECCFG_MLPE =3D 1 << 10,
+ MSECCFG_PMM =3D 3ULL << 32,
} mseccfg_field_t;
=20
typedef struct {
--=20
2.39.5