From nobody Sat May 30 18:34:28 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=1779259013; cv=none; d=zohomail.com; s=zohoarc; b=N4TdbyVDLfphNsaRziPBnHiHQtdFvgYz6G0Ef9dSq8K5C6+/+i6G8A+FH6j2kaxzQ7e3BuKpqdzEnBX8L8W4Zv7am5TxMy8eI6o6bh2jhuMmKnKMp5Xf204bWyDpqj3FLlC5pfKDP9DhrxTZDpaCGwarqTLzzM+9vez7couEePw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779259013; 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=aKdfc2h7NZHnOgY1DbVORnQopa5dghHu9Jngv8uC+5Y=; b=HyK5j60LyD+rwrDh6gcd5L3AqeXsVZwQxhM9mk21+1l5RTOcBlOOdDgRc/74cAaIl0mohhnstWc59Ku7wk7xFrHpg+trZxseiXjmswggRxccgUqXqlUL9WHsxeAmNaW6vWAi3GsNWaa8r0KaxeKJ3TCImzRPTsj/LScfeDYYX9g= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177925901301045.062036690762625; Tue, 19 May 2026 23:36:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPaXt-0007km-9a; Wed, 20 May 2026 02:36:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPaXs-0007ju-39 for qemu-devel@nongnu.org; Wed, 20 May 2026 02:36:44 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPaXp-0006ZE-OW for qemu-devel@nongnu.org; Wed, 20 May 2026 02:36:43 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-3665a90bcd3so4647321a91.1 for ; Tue, 19 May 2026 23:36:41 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.181]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36959ca0fa5sm8364342a91.3.2026.05.19.23.36.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 23:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1779259000; x=1779863800; 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=aKdfc2h7NZHnOgY1DbVORnQopa5dghHu9Jngv8uC+5Y=; b=OPaHgAo05oog7K9yeDNZzQDHSyMURCsYJJKhSSyZLCcc7rf8rHgMf+WxEOGyEmTi0s HRkH11vl+wKvJa4KEbCDGdFWR7ceJaLJth4q07mYMI11tY9a7lxX2pX4izvSIOhEIk9g 6ENF6Iw2g/ovtKiLAJeudfV1ADEr3yFEmxfFxkKbaFY9hfEf9uFJQ6qWzWx6LMPYfhu5 0l0kqciVDVFd0XPIRTUMbjY9jfp/4JxBtt9W+QcK999SU1escN5hvv7EBnosxqo2cos4 7xkwRWMQfFHvkTAoRCqNLnY2dwYTigQ9bp16PDexbcV9jATgkl3wzWyDEnuXkUbX0E32 +F4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779259000; x=1779863800; 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=aKdfc2h7NZHnOgY1DbVORnQopa5dghHu9Jngv8uC+5Y=; b=P5v70eZxgTZP7rZa8Me3uJYuC30ZOTrdMaoce+DNz/8COsJ/WClXYwKpn9DT/cW49l h88AaQ7bQncqxLVR9AIwIcmiXGq3kcz9q8E7VwfmXJoqSTzSrS5E/npb//GiYDJsHSZI x1TKLcMQZ51RtDv6/ySCifWC0I4iqcLJdi4fKrOHIO1147MwnpH/vxosHKABvN9g31Ar WhcGxDH2PTMEPQ9a7X0RFsFagiEN7HfnLulB72PB07hdiCwaLDPqowcVoi4svSoZQl+e PnIuIDiaiVBpfWXZ8FDvxlR3Wk3TK9gpbtpPON3qmokcIyav/JPgNorJp+0B8/Vocq8r o/EQ== X-Gm-Message-State: AOJu0Ywyku06S/GE8qx/OSbcEbGBMEwNOM9GxYjIsqQjeahRBXsy72Zt uQEFNSEdGxFpWraUUiLQOcOWfPzKkXorCzGWgvuteQp/nwUaT+mK6zsEn7Kk4Y1ENwPypyWi5ZY nM7Cznws+6enbwVIMPHGf9o1NNxwqAKIVi6x3DgCpKtRA3urRyyoT3H7BXpeMhUnnd/gte//5u2 qITEaSrCaTcQcJ853EJ+Ukex1DyEkOsDOAXLZb1i7e9Pt7ng== X-Gm-Gg: Acq92OE0DMn5c/70EGIOI6vFZMTZhES2ciMAXO8W+DgitNPjUrs7C2HNZyPf3n/FMvj 5/5ZJ8yBMN3OUBgKe9BvrYoXXekURUDuYCUnl4sqkWyDrTPSEyoj+FH3FNLg0/BnQNH8abf5mo3 hozWotqOn6UFmdFNQHOpc8PItLgTarHTpTBbizz7bhtXZXERM0+OFsGmcP+kswzG+I4+DFdF+Ld ExFx4KHx7upVLRCM0jhL58Yep/saEgCqx8tpxR2QsUuKm/gcGWmO5Pnv0U2UWMbKzVmXxo7ukRS tBtRZi7vpToV80Zsnt3XCyGOf9Nr7o9C+lBQc8Dj1GLwXysQInzk+XKnUw11tR0HNI7W+VaMkh0 vPZcSDf9IhEnAszbhH7wSvEC388wys6t1MoWbzOGFXPe2mEGE5OopPnhdAf78YIVW5/5RTdCzfg lAyvTkliEItbYzCmX3z60j263YIVD33YU9nBlr+Nwj3vLHK7OqH1c3sI5Avs05/FHFB+WBX9+X X-Received: by 2002:a17:90b:5385:b0:369:de03:29c8 with SMTP id 98e67ed59e1d1-369de033084mr10009537a91.23.1779258999873; Tue, 19 May 2026 23:36:39 -0700 (PDT) From: Jay Chang To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , Jay Chang , Frank Chang Subject: [PATCH v5 1/2] target/riscv: Align pmp size to pmp-granularity Date: Wed, 20 May 2026 14:36:05 +0800 Message-ID: <20260520063606.36600-2-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260520063606.36600-1-jay.chang@sifive.com> References: <20260520063606.36600-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=jay.chang@sifive.com; helo=mail-pj1-x102a.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: qemu development 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: 1779259014158158500 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 Reviewed-by: Chao Liu --- 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 a71091a316..8adf7c9719 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -179,11 +179,12 @@ static bool pmp_write_cfg(CPURISCVState *env, uint32_= t pmp_index, uint8_t 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); @@ -263,6 +264,11 @@ void pmp_update_rule_addr(CPURISCVState *env, uint32_t= pmp_index) break; =20 case PMP_AMATCH_NAPOT: + /* Bits [g-2:0] need to be all one to align pmp granularity */ + if (g >=3D 2) { + this_addr =3D deposit64(this_addr, 0, g - 1, -1ULL); + } + pmp_decode_napot(this_addr, &sa, &ea); break; =20 --=20 2.48.1 From nobody Sat May 30 18:34:28 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=1779259020; cv=none; d=zohomail.com; s=zohoarc; b=CfMsDdcTWSDVPzXNdlBYFvgArhfbI6doTAMMAFEfz2dHKxmasMTuG+Qv/Ea2qNt60/6HGGgpj2N9UtuSkd2kCk/v12+bDs7cJEVyBlKyoJznQcsnmKI4adu8dNY4ah8Bi9wt0scNjfLn1a416ZTFfDImVcl57FhWBpDmXVZVBe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779259020; 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=93MiGTcduLfIDsBpe5BIrK9Tw93sePZbkjobcOPHdhM=; b=QXnCfVXOt+W7fP0Lpjs/HAgirigOIZW1gonkmjytLHRRkoyVLA7rX77N9hp1CApnthujnZOOZGfWk/q4hfPxVUNV4s4NB8qcfsHy+c03WxJ81r5cBYu2u7Ccn7H5tEMkktp5+7GLI/6Y0kVOCX6B6XxsLLAmZM6gW2Sn5ViRZQs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779259020721273.11057735445036; Tue, 19 May 2026 23:37:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPaXv-0007nC-4v; Wed, 20 May 2026 02:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPaXu-0007lK-0d for qemu-devel@nongnu.org; Wed, 20 May 2026 02:36:46 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wPaXs-0006Zj-FG for qemu-devel@nongnu.org; Wed, 20 May 2026 02:36:45 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-36643b96b99so4157767a91.0 for ; Tue, 19 May 2026 23:36:44 -0700 (PDT) Received: from jchang-1875.internal.sifive.com ([136.226.240.181]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36959ca0fa5sm8364342a91.3.2026.05.19.23.36.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 23:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1779259003; x=1779863803; 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=93MiGTcduLfIDsBpe5BIrK9Tw93sePZbkjobcOPHdhM=; b=PYp8TSSm1KVtZFNYlzBPAJRqIBla9A2Kipqr3gUmu3jpnu/Zx2ei3PjgQnvusQ044J b2nJ68oe9ygA5Ico+XR0Ioq4ha2qxicOO7rnuHpC2w5vXEVW8PPAKq+LgwAYTBZYIonP TA0rjElBG/K5Tq86WUurJfPs1VKfgV70kF+A3t/PxAnpQW/kAj7Ch72AnFKb5vSAtqyH uJbmy/6jlnqIKpTl7FXrxIsfAynp7C2yBjVlCyIFP1hw3y3kWHHfvFfMzuZRzC5hkM9f 1FIFY5VkyACZb0bPKbs2gCUs7l7iAOaJBfvIqjs9MIemMAy1sknAeDynHKZUEyZkgh+g FkZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779259003; x=1779863803; 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=93MiGTcduLfIDsBpe5BIrK9Tw93sePZbkjobcOPHdhM=; b=P5pYzxgAQxA9LvJcSAj6s0StsYBV97D7Nq79XEYq3ohsF3WZdpRSzvYy2mNQZi/Kwq T+1asPPeGGaFc7sQ2/pZE43/yMzvzRe/ZvMjVB/TRqt21WJBJ3/SpRGsHOHjr7i+gkbJ aemU4M4rkRKuxlSc0GJv5+uZ4rYqWBwW2eOiEKI3qvHmm6PrgrhGrjkc9O6Q2un2ZWj7 HNeuVFEzR84w/f+MbWs/tTWbFHZTxNUKsTT3VGSakHqnl9TGAigIgnmba3l4KJnDgowi jIYgitiF51pVbiHcDdOy830OYNY7eDWouzOpqLnKF/1Dlphq5Hyg1eVKnPMNbWsoH+VU YW9Q== X-Gm-Message-State: AOJu0YzlaPbJviPwq6jeKnyy5zPR9gWghQA/d/viaWf51lHp41cAuUVt iY2fSfrbeUxllnqSnpDnlbfc9bfTYJOVtwzEz3WWYME7R6lHyiG0zZ04cjYdGRGk/rHSVgYvkPn 75w9i17mba5F64ljl8Bkd2qayNhNOs19ffGyS7qZQhtYn2CrMMDArKgnM83AS0RGapotix+JtzE D0lGbZLbEtjx+dr447dYvUtMxCfzbOD3TNxJsiVxq5xi8hYw== X-Gm-Gg: Acq92OGgJAO0Q3to5VgNjivsrKJuFjsHIlWDt7XK2CyUj5zJEHq+NQXOzwhXiueel9A fm8wFDkjIibRH7rItj0b6n0qeTiX44f7SFB0tXmBQnOXLjSEu6qMpO2nZRD0TYfLu3iHA5u2QTZ x0PU1b66veZp8q7yoCy+HAo+amvC6KQy59auoZ4o2zxRH2fXWE8CuSjvjaCvSjekJFUqNLMvmpZ D740xWQHzeth1CYyGbmfE/PbysgsByRUgABOgoBjdIoVRriCIdiPJ98IwJGql36jgWnO5WozdrH jxHnTs082r+7pvT9WCRgN/c8jmprPg+NCMbyYn1wB7BBPj9VUEjs51z0YewXz6ec7u19t/7u4ty HbeB54PuY6pIYRA2Y5BrmZ/FBABBzCyq/UgsTQt6E1KO6sg45dl1VQ4vFENRkgUja7/BDvyk3UE DM1VkW5Jvg9RN2dXHjQ4jbTYbw+4lZonStdce7P8jfVEtlsIrQdV3xzqBAYu+Rbg== X-Received: by 2002:a17:90b:5290:b0:368:f0d0:1ce8 with SMTP id 98e67ed59e1d1-36951a11701mr22183100a91.9.1779259002767; Tue, 19 May 2026 23:36:42 -0700 (PDT) From: Jay Chang To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , Jay Chang Subject: [PATCH v5 2/2] target/riscv: Improve PMP address alignment readability Date: Wed, 20 May 2026 14:36:06 +0800 Message-ID: <20260520063606.36600-3-jay.chang@sifive.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260520063606.36600-1-jay.chang@sifive.com> References: <20260520063606.36600-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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=jay.chang@sifive.com; helo=mail-pj1-x102f.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: qemu development 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: 1779259021892158500 Content-Type: text/plain; charset="utf-8" Replace manual bit manipulation for better readability: - TOR: Use ROUND_DOWN() to clear lower bits - NAPOT: Use deposit64() to set lower bits Signed-off-by: Jay Chang Acked-by: Alistair Francis Reviewed-by: Chao Liu --- target/riscv/pmp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 8adf7c9719..58a8923d0d 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -247,8 +247,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); + uint64_t 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; @@ -641,13 +642,14 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uin= t32_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); + uint64_t granule =3D 1ULL << g; + val =3D ROUND_DOWN(val, granule); } break; case PMP_AMATCH_NAPOT: /* Bit [g-2:0] read all one */ if (g >=3D 2 && g < TARGET_LONG_BITS) { - val |=3D ((1ULL << (g - 1)) - 1ULL); + val =3D deposit64(val, 0, g - 1, -1ULL); } break; default: --=20 2.48.1