From nobody Thu Apr 10 21:51:51 2025
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
ARC-Seal: i=1; a=rsa-sha256; t=1740499341; cv=none;
d=zohomail.com; s=zohoarc;
b=OtyClF/ubPOYf3zCn6l5YxGeLYyZW0RRhredvoDEokQQxoSxm1n4Whg/eZpn5J88pSJ2PAphxc1cSiaUJDRXD3LXle9xhqeMU9gBPf0I5hPOf2rY5KwCzdJME/MPyKfkrKS5mKLWIDnahYfyGY2byvnUGLf4x9mR0/Mikbgxg3o=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1740499341;
h=Content-Type: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=dajlQOoRvoQV8eXeQsdm+0Ep1VZ3BLLQlzfHq44Vuqc=;
b=DVKl/bG2heH60v1A3HG9qr0UH8g2ZxzWpgNxV1By8DJHazC1fYLFXggFfnfrg2gx89wJPEq41EdvSjc1tY2AvQ3z00GZUiY+rVoQsh5yrNiea9tG6BV+YvQR2wTuR4vXzeBkCw88zg6HU2hrxzAMgxzdTQnqllKnDYHVhk77vFE=
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
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 174049934137060.441948397627584;
Tue, 25 Feb 2025 08:02:21 -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 1tmxNe-0007NK-KH; Tue, 25 Feb 2025 11:02:00 -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 <loic@rivosinc.com>) id 1tmxMz-0007Fk-PU
for qemu-devel@nongnu.org; Tue, 25 Feb 2025 11:01:17 -0500
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <loic@rivosinc.com>) id 1tmxMt-0001wi-DH
for qemu-devel@nongnu.org; Tue, 25 Feb 2025 11:01:17 -0500
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-439846bc7eeso36864935e9.3
for <qemu-devel@nongnu.org>; Tue, 25 Feb 2025 08:00:58 -0800 (PST)
Received: from llx1.cad.pilog.net (lfbn-mar-1-50-94.w86-229.abo.wanadoo.fr.
[86.229.28.94]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43ab1546df4sm30530755e9.17.2025.02.25.08.00.55
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 25 Feb 2025 08:00:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1740499257;
x=1741104057;
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=dajlQOoRvoQV8eXeQsdm+0Ep1VZ3BLLQlzfHq44Vuqc=;
b=QpOLiPYeMG2eJ7ud/9ztyh6+BYNj2vj4y+712QrrvikdbU8JSaiLEWb+L0EJHM4pzS
AAMrV6h55jQuufZ+/C0tIzwQ5REDyPuXDma+oafts9J0gaviTkWd+mj/frnKqz0NwSU4
KG+FUqqOOwTiVpGv1vcaLFganRgBpHgMjDZHYz9Zv3/VMxJa8V9RB76nTpRr5nFHgJzy
dtDN024UjJ9Lcm5tv3S5fEHa59rhdc5R/RA1BitDroCHzt2cct1FSrIloa+m+pIP83xR
3I2fBJPb3g1GFoBt4NSjI9q28LguTbiAhqvm5fKymQHJikUwvqHrxz1vrwr8v4IvS8KV
h3QA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740499257; x=1741104057;
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=dajlQOoRvoQV8eXeQsdm+0Ep1VZ3BLLQlzfHq44Vuqc=;
b=OxuUtBDW2PiyC70yMnU79npa2vKPCHQNYmOx3wU3pEp/Ez4q4/w0W+Httb9j5lTSSG
PUfMNXZdpSW3QbH5mEP/h4sBk7BSf1G+N/EdHIVFTKAZdkAOTkdQlQTzduSpRaTZZcfd
foICM0ALrGGnqw1zkHugeJAZafJ1MnKydepc2aQEsFCpB7adRwsRorHmyiq0BP3LNZZp
S12At7yFkdr/PT7GNPjP423wAvHxoZlaMUGtXpQ00I9stoopWQ4Ppla9lVZpYUcRyV7j
9PIw7stSscN/FtiVIvoWHu89P+I7jvjTAInjcKQ1qddI6E/eOfdh+/XCals4kSAmZEkI
UhuA==
X-Gm-Message-State: AOJu0YzAf+AVaz/se/ZTYbwjC6R6pJTkz4inMk2e675NySP40jsVFnZO
hi+BLMj7BGR/KocX+wLPyr9BqntXnqzXPPnVQYuB/S6n1Q6cX4pbgWQUOnidGsUzecGe+wHjqi7
gnIUIVg9a
X-Gm-Gg: ASbGncvVaukqr84Lep2KwKbMpWHhXEeJuJN6e2PvLjShdUGby/q08MWlrMlDJetrsKP
lGBxERTKJKoV8P014jYI82/R8S/h8T8NNSc9oSwEc+b1KxqDz1aJ6zBKRSMMuGqmFJNXc/2Lu/U
4g8X31sCiTidFzms85waLNUAFXWCGvqxhcZq3VbUL/xEpMwRCcsyL0QIYb3p7BVWUeErOWcZOAm
0z4RMXLO5JoHLbiY0Pjcw36oSziFuOX99RSSew7mQwGd8zoDQYYVix3q8ubEfkb+TCFM66r4Yix
9fWMpj0CjpLyTJ+tqRh85G/rE5lkcaV1yC23FMz38dFBJq0dUqowMmLNHxE2CcLkFEklcf1cyA=
=
X-Google-Smtp-Source:
AGHT+IFUr/WlrbZLLx9gxZm7xca9g+gDD17sYS3lfk02dfE1n8u+q6vptoQT3QiGSyBQtVFlTy2DKQ==
X-Received: by 2002:a05:600c:190d:b0:439:685e:d4c8 with SMTP id
5b1f17b1804b1-43ab8fe9461mr730105e9.15.1740499256670;
Tue, 25 Feb 2025 08:00:56 -0800 (PST)
From: =?UTF-8?q?Lo=C3=AFc=20Lefort?= <loic@rivosinc.com>
To: qemu-devel@nongnu.org
Cc: Alistair Francis <alistair.francis@wdc.com>,
Palmer Dabbelt <palmer@dabbelt.com>, Weiwei Li <liwei1518@gmail.com>,
qemu-riscv@nongnu.org, Daniel Henrique Barboza <dbarboza@ventanamicro.com>,
Liu Zhiwei <zhiwei_liu@linux.alibaba.com>,
=?UTF-8?q?Lo=C3=AFc=20Lefort?= <loic@rivosinc.com>
Subject: [PATCH 2/5] target/riscv: pmp: move Smepmp operation conversion into
a function
Date: Tue, 25 Feb 2025 17:00:49 +0100
Message-ID: <20250225160052.39564-3-loic@rivosinc.com>
X-Mailer: git-send-email 2.47.2
In-Reply-To: <20250225160052.39564-1-loic@rivosinc.com>
References: <20250225160052.39564-1-loic@rivosinc.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
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::32d;
envelope-from=loic@rivosinc.com; helo=mail-wm1-x32d.google.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, 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: pass (identity @rivosinc-com.20230601.gappssmtp.com)
X-ZM-MESSAGEID: 1740499343793019100
Signed-off-by: Lo=C3=AFc Lefort <loic@rivosinc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
target/riscv/pmp.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c
index ddb7e0d23c..b7f1430ff8 100644
--- a/target/riscv/pmp.c
+++ b/target/riscv/pmp.c
@@ -31,6 +31,15 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_t a=
ddr_index,
uint8_t val);
static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index);
=20
+/*
+ * Convert the PMP permissions to match the truth table in the Smepmp spec.
+ */
+static inline uint8_t pmp_get_smepmp_operation(uint8_t cfg)
+{
+ return ((cfg & PMP_LOCK) >> 4) | ((cfg & PMP_READ) << 2) |
+ (cfg & PMP_WRITE) | ((cfg & PMP_EXEC) >> 2);
+}
+
/*
* Accessor method to extract address matching type 'a field' from cfg reg
*/
@@ -357,16 +366,6 @@ bool pmp_hart_has_privs(CPURISCVState *env, hwaddr add=
r,
const uint8_t a_field =3D
pmp_get_a_field(env->pmp_state.pmp[i].cfg_reg);
=20
- /*
- * Convert the PMP permissions to match the truth table in the
- * Smepmp spec.
- */
- const uint8_t smepmp_operation =3D
- ((env->pmp_state.pmp[i].cfg_reg & PMP_LOCK) >> 4) |
- ((env->pmp_state.pmp[i].cfg_reg & PMP_READ) << 2) |
- (env->pmp_state.pmp[i].cfg_reg & PMP_WRITE) |
- ((env->pmp_state.pmp[i].cfg_reg & PMP_EXEC) >> 2);
-
if (((s + e) =3D=3D 2) && (PMP_AMATCH_OFF !=3D a_field)) {
/*
* If the PMP entry is not off and the address is in range,
@@ -385,6 +384,9 @@ bool pmp_hart_has_privs(CPURISCVState *env, hwaddr addr,
/*
* If mseccfg.MML Bit set, do the enhanced pmp priv check
*/
+ const uint8_t smepmp_operation =3D
+ pmp_get_smepmp_operation(env->pmp_state.pmp[i].cfg_reg=
);
+
if (mode =3D=3D PRV_M) {
switch (smepmp_operation) {
case 0:
--=20
2.47.2