From nobody Tue Nov 4 23:49:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531869244165946.8701426291409; Tue, 17 Jul 2018 16:14:04 -0700 (PDT) Received: from localhost ([::1]:33702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffYZl-0002ES-Ic for importer@patchew.org; Tue, 17 Jul 2018 18:36:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffXA8-0002jI-W6 for qemu-devel@nongnu.org; Tue, 17 Jul 2018 17:05:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffXA4-0003NL-Oe for qemu-devel@nongnu.org; Tue, 17 Jul 2018 17:05:36 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffXA4-0003Mu-IR for qemu-devel@nongnu.org; Tue, 17 Jul 2018 17:05:32 -0400 Received: by mail-qt0-x244.google.com with SMTP id m13-v6so2227295qth.1 for ; Tue, 17 Jul 2018 14:05:32 -0700 (PDT) Received: from ip-172-31-33-50.ec2.internal (ec2-34-206-44-154.compute-1.amazonaws.com. [34.206.44.154]) by smtp.gmail.com with ESMTPSA id s39-v6sm1462414qts.42.2018.07.17.14.05.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jul 2018 14:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=berkeley-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=XNEJCMjbEw8ynCa4S6wMQTdjGGx5gP2bTKLOZ8BCxmU=; b=WzINIHZePRscY28etqPM7R12otLvgxY6r8JpI5SvpsOnUhOazZudZogkUjDEPzzAhO NcMY2UOJdaicV6hFnYt8+rfnpOljsKpiaRLuO/mYrzrJNp+GhOsvVmnu8c/vKqXrA+01 j3gSynIdn/+WU4tBcSrLXl1gCDOjvgXRwfAS0Rh5fvO9Q7CK53VM8CPyGzzWKs+2++sd jVl9vhfFMasZfdal6RRugWF6a0aipYAOo6N0K9dZrrVU6xJZwveDmnqjouvvhPXXqPP7 O8+QtawNbIg5qDo+SY8b982nnnWOGMVIEoH6YxpZylsgovK4CV0rXxgrrENVQE4FEiqN /5KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XNEJCMjbEw8ynCa4S6wMQTdjGGx5gP2bTKLOZ8BCxmU=; b=UZNBshOIWMJmoqSwniWnU1pIP7s01ymMH7aZquuJuQiVSobu0gj9lTrqKXx8N4F2zB 0L6zIhFXrNi9f+jFD2iRZ2ghVTYPpRzmOixZo5JA1P/EktSCn8H5P0x7no/tpZURixi9 XxGGdZlTSVb/XHStmbHnNGqI7ilpCAD05jbbFPj1QxjlN2KWxHV6Uxx0/T0vO9u8nZO6 2fzkrqGdg8MVkEorfTgSJzLVOoxBZWP8GDNq6jrV3bjipXkR2UXmLz/iA2vN8KoFRA/i 1qPioDxmLhDrsdr6evotAniyoqzuiyVgQfiCsZxzRqEKAtwYercSeujrN1zu/2E5xSD4 mG0Q== X-Gm-Message-State: AOUpUlEW+rwYWc+5LVnPAyO8QvigYxR1p+e5zmXRln/fQgQWmTqNNCJG gU0UTa3nCZTpVfShRft1q7qBACnmY0M6Yq8lPl8= X-Google-Smtp-Source: AAOMgpd9z7arpap1vEjqTJmE2aDHkk3HI1WXSSuaCTYXTumsdF8pDmjHR94bpHfeBoIkYLOZOTInMA== X-Received: by 2002:a0c:c90d:: with SMTP id r13-v6mr3605867qvj.45.1531861531337; Tue, 17 Jul 2018 14:05:31 -0700 (PDT) From: Dayeol Lee To: qemu-devel@nongnu.org Date: Tue, 17 Jul 2018 21:05:13 +0000 Message-Id: <1531861513-6549-1-git-send-email-dayeol@berkeley.edu> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 X-Mailman-Approved-At: Tue, 17 Jul 2018 18:33:53 -0400 Subject: [Qemu-devel] [PATCH] target/riscv/pmp.c: Fix PMP NAPOT decoding bug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Dayeol Lee , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" According to the RISC-V priv. v1.10 ISA document, pmpaddr register stores (base_addr | (size/2 - 1)) >> 2 for a NAPOT-encoded address. However, the current code decodes (base_addr | (size - 1)) >> 3 which leads to a wrong base address and size. Signed-off-by: Dayeol Lee Reviewed-by: Alistair Francis --- target/riscv/pmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index f432f3b..c4c6b09 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -138,7 +138,7 @@ static void pmp_decode_napot(target_ulong a, target_ulo= ng *sa, target_ulong *ea) return; } else { target_ulong t1 =3D ctz64(~a); - target_ulong base =3D (a & ~(((target_ulong)1 << t1) - 1)) << 3; + target_ulong base =3D (a & ~(((target_ulong)1 << t1) - 1)) << 2; target_ulong range =3D ((target_ulong)1 << (t1 + 3)) - 1; *sa =3D base; *ea =3D base + range; --=20 2.7.4