From nobody Wed Jan 7 09:26:51 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=1767075232; cv=none; d=zohomail.com; s=zohoarc; b=kQVPu8804kuIh1mBDUS5zjGOJl+J0ABrlpAZnt2m8TL+K91vnqeiVHcUYLkrcZ+uXOloG1O1pRbuiroJPaM/Ft/N0UAdvFHdTB2CrrDk8wXW23sgY+P0ISABk/XXS6WK9WMhjoKfSJzOZo0gPdxY6thMbkb6TlSd2qcBhCR1aUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767075232; 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=ttAWMQ0gKIkTdIzv8pg1GpC3gksBpHCGYQzy6KD8wSQ=; b=Hk9CAmjUcySjKksaygCiX88pZGgktxHST9qAyekyV1knpSaB9WnAb/wOMFNkohw6VHzSL6itP0e7u3UuMX0oCiC5uP+E2WSm5zIBiOj8UNNQjcGnpHRnGy9vcIuVDYI3GE/m2Wao5XJROG8pNmFwlqSjSsq61wHE0cdrOiphrMU= 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 1767075232590231.80154430871028; Mon, 29 Dec 2025 22:13:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaSyq-0006ow-JJ; Tue, 30 Dec 2025 01:13:16 -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 1vaSyj-0006na-LJ for qemu-devel@nongnu.org; Tue, 30 Dec 2025 01:13:10 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vaSyi-00047c-6n for qemu-devel@nongnu.org; Tue, 30 Dec 2025 01:13:09 -0500 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-7aa9be9f03aso7977364b3a.2 for ; Mon, 29 Dec 2025 22:13:07 -0800 (PST) Received: from jchang-1875.internal.sifive.com ([136.226.240.181]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c1e79a1778esm26960906a12.13.2025.12.29.22.13.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Dec 2025 22:13:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1767075186; x=1767679986; 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=ttAWMQ0gKIkTdIzv8pg1GpC3gksBpHCGYQzy6KD8wSQ=; b=i9xOuOC/w7EG9UKUBwlK+hUEZNy4/HvQcQWuJR77n2XHfMKQ9YLKUtYFj/JZlwiujF YdDUvY6It4HukAK4Fj/pdEw2j/IYKA9PyJexcl9ZhZVG2PO4aYIPy1+ATGVNK6NMHE/g F7OAdHBRhIoWwhESTfDmsGFoxdaEt7F6ieTxSJ17fCfd/E1qUKX1kWMJTTx8J6YxU60I Dy51rxGw+j71r9aUYkdvpezQllQnfPtXIGb/hDdiIZe0vYaEY+wE+bvMcyiz+9/z7EEM F//wKbJEcydoqYQ3YybMGrb8BQCKVXWxXlJ/wZz5julXwkaG3e79pf+2l9Zkpuw44YF6 ccgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767075186; x=1767679986; 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=ttAWMQ0gKIkTdIzv8pg1GpC3gksBpHCGYQzy6KD8wSQ=; b=pKM1b6qlUpInFz8PzIfXhuvHjryehBVG0bLVpRonJuw1W5q3Ue63S6sHLXpGVKFPCr AS1nPN7js3PGhbANy76Av8DlKJ2+b1yVA27WjGIwrCJuhpyXEiPh/82HJ348v/1BJHuz oF4/H1woyBkkJ55T8X+b7J/dkjTTQI4p2Af6rLNCBmmxkQLMCsl0qWHTB8b+p7WTlj6c LKXVTItdllZwFJO7svJO0hGCeIIL1cn2b6zT235rvym0HL1tpLgPvg+/CFK8wDU0VKCE bEb4jcVvnYSVqrpW3QvxAOaQMCje13DPJYr83k/96vLCCrF1EV/O4Hfz0+DdU7fUhtyu gJWw== X-Gm-Message-State: AOJu0Yw0D9WBepNtq1Y2sEIwf8/9b82T5+IVe4Bqn7dzcWN6df98hApG N5rS4vGFVCx404hPGAlNG9JxckuJke/+h4C2WxwAK802ElzND0MApMchu/M0NhzcJAZzKBS/md/ sfOB7BYK4HkairrS+xlSndSI8VdAR9DZ8Lk4YmNuCqQN9i5EGbEwZDmq+RmTaxG3nlHynONbGX3 49wGk6VDEyHhszfAV7QusfoW9I6NMcRLh5WxWS5KiLkZA= X-Gm-Gg: AY/fxX5TIaAzSqKcCzkxL8+NppuogA3tijC2GfDE5OuJrgZkVV9Xns+43uRV7T54D9C mxZQ0oXeGEsDNIHmMFlZQ087SfKv8U039poYhLitTqeULUd2OMLX+PeHxSsPuu0UpJG3aDZumrS hXHLKr7gIqLpVBPdNLeU4fUQ9905wmVjh3irrCbxD0DJo5oFzE3uV/8kI/pR6rVCw2DLwYIuGGP jQaV1HYyhCos7KgBJCZINplY9sGWzKCrdyxiwvODL+Mjo4G8QJVT/Zeylui/C2rIs1hkfSmiD6B RHPUqDPWzrK5vf4VUqHz85ANAwEZz6zW81LQZSA8MEQ2SshYd38PcAM5Abg+zBylSMqAp+YGHGK jR4JPItQEYhouffG5Xxe9Sf1TEUOFZlgEc/XKfwTpnVcK8SGa+Ggt6b4RqPM8Cs1LAPrNwgfR/2 mUVHV4rlVOYKfjRO0WSgPEs9cX1t19UlL5OGGdMrQPgaXXrRuxdQ== X-Google-Smtp-Source: AGHT+IHrpYL3siDp414fDsuZY6VQkd0i1Z9w4nDaCN2zKgO6Bf/yVQsbA2hyAFBW0NMOzMyiNj3kvg== X-Received: by 2002:a05:6a21:33a2:b0:366:14b0:4b02 with SMTP id adf61e73a8af0-376aa1e7c2dmr26394923637.62.1767075186401; Mon, 29 Dec 2025 22:13:06 -0800 (PST) From: Jay Chang To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jay Chang , Frank Chang , Daniel Henrique Barboza Subject: [PATCH v2 1/2] target/riscv: Align pmp size to pmp-granularity Date: Tue, 30 Dec 2025 14:12:57 +0800 Message-ID: <20251230061258.15596-2-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251230061258.15596-1-jay.chang@sifive.com> References: <20251230061258.15596-1-jay.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 (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::433; envelope-from=jay.chang@sifive.com; helo=mail-pf1-x433.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: 1767075234106158500 Content-Type: text/plain; charset="utf-8" When configuring pmpcfg (TOR, NA4, or NAPOT) and pmpaddr, if the value is smaller than the PMP granularity, it needs to be aligned to the PMP granularity. Signed-off-by: Jay Chang Reviewed-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/pmp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 3ef62d26ad..01b337f529 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -167,11 +167,12 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_= t pmp_index, uint8_t val) uint8_t a_field =3D pmp_get_a_field(val); /* * When granularity g >=3D 1 (i.e., granularity > 4 bytes), - * the NA4 (Naturally Aligned 4-byte) mode is not selectable + * the NA4 (Naturally Aligned 4-byte) mode is not selectable. + * In this case, an NA4 setting is reinterpreted as a NAPOT mo= de. */ if ((riscv_cpu_cfg(env)->pmp_granularity > MIN_RISCV_PMP_GRANULARITY) && (a_field =3D=3D PMP_AMATCH_N= A4)) { - return false; + val |=3D PMP_AMATCH; } env->pmp_state.pmp[pmp_index].cfg_reg =3D val; pmp_update_rule_addr(env, pmp_index); @@ -251,6 +252,11 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t= pmp_index) break; =20 case PMP_AMATCH_NAPOT: + /* Align to pmp_granularity */ + if (g >=3D 2) { + this_addr |=3D ((1ULL << (g - 1ULL)) - 1ULL); + } + pmp_decode_napot(this_addr, &sa, &ea); break; =20 --=20 2.48.1 From nobody Wed Jan 7 09:26:51 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=1767075251; cv=none; d=zohomail.com; s=zohoarc; b=BOHLBtCCmMuhDlKY3gbpVc5XPPFcSr3gcjzGCPUOYa/gWUdEDi4reNwJhfgB2HyjTj3HoueoOd0LguL4x2J6AlICjbcmzdHWTETc33YgYdPLmuPU/3l8v3Zo2g1h/IPvvc0ZVaZf9D/l/BPVSdUqiUAq3WaFb6UfDUNN0+AOirs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767075251; 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=Ldf2kbdgnmOIY67ePy0AhhoIYKjLiKyp8sJYjnWKUkU=; b=YfaE+YypmD++cHhME758YzrIbGYTGy3wfX+KTUAydyb0aS6kFKBtrS58gIfiMaEwgtTp7+o+6Ov74dQQZBp82qq74KJ1rf2ehBdptdYmu/4AOfVUyDbDaTqzMYwo/ZN2AEeEKN08YL6tIRHQ+w46UUewwEvSOITfBVgnKsRT9/Q= 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 1767075251108170.85146239106962; Mon, 29 Dec 2025 22:14:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaSyw-0006qP-IG; Tue, 30 Dec 2025 01:13:22 -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 1vaSym-0006oQ-EW for qemu-devel@nongnu.org; Tue, 30 Dec 2025 01:13:12 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vaSyl-00048M-0E for qemu-devel@nongnu.org; Tue, 30 Dec 2025 01:13:12 -0500 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-ba599137cf8so3156380a12.0 for ; Mon, 29 Dec 2025 22:13:10 -0800 (PST) Received: from jchang-1875.internal.sifive.com ([136.226.240.181]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c1e79a1778esm26960906a12.13.2025.12.29.22.13.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Dec 2025 22:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1767075189; x=1767679989; 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=Ldf2kbdgnmOIY67ePy0AhhoIYKjLiKyp8sJYjnWKUkU=; b=JO4P6InE5otQ3kAvu0Vo0NH5bfKbjL+MrNWXcPziIi2EsxGXHy5p/FwCxxZRGpe/CJ JpM/LArEqvTmoOCxafUtqmEZ+NlRfgBOBdHQ+a/O1S+se7k1+exVESNglSVxXaePUkbm YwtHzPEJxtHhirtukUrohMZ9t6PsTVP1RipZ/KC9B1SZDxMAL1mpOGv0FVVcjNcnbj/j wZ3Bv8qJXlkEbfaU3nHGQgqnaFObHJmxDZUJ4EToBpMali2swGfuibGqDonj3Ol6HE+4 UZxjV0uo7rIKBqrhGbx0VEvI3JXBtvSI4Bs5tv5JWLjItiL0QgoYGmCHKUPQS+j4neqc A+Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767075189; x=1767679989; 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=Ldf2kbdgnmOIY67ePy0AhhoIYKjLiKyp8sJYjnWKUkU=; b=sWQWSf6FfBRH2uC5pOok8cZdXc60+YMz4+rfOXGn1Az+ilOi/9eF8QcYYp9zvSKaIh 9MEaG51DNztH92XomZlt9GpnfRKu7DcrfKHSBmz8Bt5h1dvOUu2O22XQQ+IIWlwWwMmY 1Ti0x9MA797Gp+QhATX6pBmrezw82XI3AeI6tCdhy4JGceT5Y5giM+GP2m4RjqDQronX CNY40l2ns6huNKyUx3ECy7pgk0ZSQ0L3fkHK/QEhdkmJoB+ggaGjs+kGvlSAX/GRo9f9 wJtmDLjM3m9CqRYhm8e4ohosMOcIX8KPFJKTB7BvQ+E8YYsz01hza3Gq+/eD+JeidEaz 4kNg== X-Gm-Message-State: AOJu0Yx6Nc+tG1QMSLoFGrHE32hYdr88LJcYg1At//jfXYw+wQ6qUwdE ECrVogEgs3rlpw+RcA5+PPVTlRFcOdPk9PovbAVtMKjKa+ooTjnTCk8GoPpO3nnduIupSQ7e6iG V4zUyxJYEAX403ZtFhURj1J4eqljgznRab5xMRTCKuF1yCNf82IPZceI6d67wOZtNfMoc12GzwP TZMnleNwIq8porYNXOj+l8P6lNp4ZHjIYxhAoiog5BObs= X-Gm-Gg: AY/fxX7okmXX0E8pkX+9/Ini0qy1uiX+c5Dec1YYi4cCbrUQyMGF2wI5ShQmdkc/P79 bTNJ4fvWWZmejct6AkIjnW5Q3LRQXDN0RS7J06D/rX0bBZlLCA9EuytQW2C4NQqEAvsKlB45lYr 19NsDM7SkxZcHKKecH7Zpwx7seSdODOEZVftu99IzwYACXXaoWVcEuFSy85MZgudblT1cIk75Ok WGTEyTzIZDCshcrBQGTgsUvcaB7SPID8v9L+yfJy+9dnM2jYm+KI5Bua1H2S4pWzDGW4WPRUsfy 3/qXK50tpCTYMLtp8uqV++sU5Q8zmh3KBUGCDasZFec4+9YhDvpIW8F9cgPRuzI9gb+FB3rEjrQ q2XmMt7cThGQSlE72aNeB1mMza76HRO+oVP6Cv/WFW9EZRl4PH1bjSsgyd7mPE4fMfS/5z+ABHf ZoKHHOGqnREaVLQOQoJV+HuqAoXffBgxvhhvvPSUQ44Qe99Ha08YgwUzdlYGkE X-Google-Smtp-Source: AGHT+IHksMYj76gJ5tO2uFaAuwxe0pWIqOBUjvIFGQB/KzzPm4/ozfoKClvjfgqpwOpbabLyDuuCrQ== X-Received: by 2002:a05:6300:83:b0:366:14b0:4afe with SMTP id adf61e73a8af0-37554a4cceamr37636847637.37.1767075189245; Mon, 29 Dec 2025 22:13:09 -0800 (PST) From: Jay Chang To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jay Chang Subject: [PATCH v2 2/2] target/riscv: Use ROUND_DOWN for PMP address alignment Date: Tue, 30 Dec 2025 14:12:58 +0800 Message-ID: <20251230061258.15596-3-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251230061258.15596-1-jay.chang@sifive.com> References: <20251230061258.15596-1-jay.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 (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::531; envelope-from=jay.chang@sifive.com; helo=mail-pg1-x531.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: 1767075252085158500 Content-Type: text/plain; charset="utf-8" Replace manual bit manipulation with ROUND_DOWN() macro for better readability. The behavior remains unchanged. Signed-off-by: Jay Chang --- target/riscv/pmp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 01b337f529..7ac5cbfae2 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -235,8 +235,9 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t = pmp_index) case PMP_AMATCH_TOR: /* Bits pmpaddr[G-1:0] do not affect the TOR address-matching logi= c. */ if (g >=3D 1) { - prev_addr &=3D ~((1ULL << g) - 1ULL); - this_addr &=3D ~((1ULL << g) - 1ULL); + target_ulong granule =3D 1ULL << g; + prev_addr =3D ROUND_DOWN(prev_addr, granule); + this_addr =3D ROUND_DOWN(this_addr, granule); } if (prev_addr >=3D this_addr) { sa =3D ea =3D 0u; @@ -625,7 +626,8 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint3= 2_t addr_index) case PMP_AMATCH_TOR: /* Bit [g-1:0] read all zero */ if (g >=3D 1 && g < TARGET_LONG_BITS) { - val &=3D ~((1ULL << g) - 1ULL); + target_ulong granule =3D 1ULL << g; + val =3D ROUND_DOWN(val, granule); } break; case PMP_AMATCH_NAPOT: --=20 2.48.1