From nobody Sun May 5 07:19:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548886870409132.6786384923447; Wed, 30 Jan 2019 14:21:10 -0800 (PST) Received: from localhost ([127.0.0.1]:45008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goyEF-0003om-5B for importer@patchew.org; Wed, 30 Jan 2019 17:21:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gox1u-0001mL-SY for qemu-devel@nongnu.org; Wed, 30 Jan 2019 16:04:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gox1r-0004aJ-UX for qemu-devel@nongnu.org; Wed, 30 Jan 2019 16:04:16 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:45096) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gox1p-0004ZO-Rj; Wed, 30 Jan 2019 16:04:13 -0500 Received: by mail-pg1-x542.google.com with SMTP id y4so340595pgc.12; Wed, 30 Jan 2019 13:04:13 -0800 (PST) Received: from kaby.cs.washington.edu ([2607:4000:200:15:e933:fe08:dfc9:9bd0]) by smtp.gmail.com with ESMTPSA id i5sm4002584pfg.34.2019.01.30.13.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 13:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=E5qcTAjj1g0GdrU4NuOSJyU+zBydkKA9EPQSYNz3FdA=; b=Z+Qj9CCYprNSfwLT9/bW8KPMh2ZEpTgQc6LPCDorrNICtxvf+CcQ1tgXzetiub5xmo h3s+suGutu6NFCTDNj5lRpaANE9WfU+T41zYHgdoZePSpHc/Di6FabWTXp0YeggYsca0 SXTc0SVkArRtTFdsbI9h2YVwMWhQYchMLmPIwE0iMmiTgVjf54e2Ntj1ZDA02SFtQBci 6SuyRwQrLug9QBOkYbFAymH9Xn4X59gTYRgsAwtSfSG2Pc0wcl50XU1e20QgFMmazYj9 8QoNha+3KwS70iUHpqEb8vpjmDIeqZdRRA8xg/XqxMFHZAFMBCJLgslu1LdeUsYO5SHr 624Q== 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:mime-version :content-transfer-encoding; bh=E5qcTAjj1g0GdrU4NuOSJyU+zBydkKA9EPQSYNz3FdA=; b=c1XJDHbpfSatLkgudFE9zr8WBYjObsdr/WySUDgDNv82BbBfplDolwR3FCfrSkT0Ox 9IT2uD2JIO5zic89YaB5WCOpHqut5iXE6p2J6M8Ho30bq5K/SDmtkIv7HTyKEh83QmB6 SmvQ9bYT2csUEEd7lNL9SI0q2WRseXFUT60EnQ8lLL2SnQf9NLGtZuBy3kWiBzeWSSXq oNTZHU47tppq38epY67kX5snGN97rKP1zR4owoIUuRN6yL2GVfD1WfgARzPCszrGW7EO XBg9lulPcM2vtyLYrfnNo85NBl/4Efb7CCvnW4cceDQwkaX/AXFCoTH8iokaZG7d+Gp8 ++ng== X-Gm-Message-State: AJcUukfjjhxBqcuye+NMHEbLxO73qLNattfYgTO3oIyYcEntHedjbI2N EG7seDDgJmJ9B1ClBqh4jnIzVAQG X-Google-Smtp-Source: ALg8bN7tVpmaZpk2RGxycUTMQQGgNEaMe0sQhLDO0oca+DMY6qVcPd4kHQlxBnXGg6P0Skt2pPtkng== X-Received: by 2002:a62:8949:: with SMTP id v70mr31329104pfd.85.1548882252112; Wed, 30 Jan 2019 13:04:12 -0800 (PST) From: Luke Nelson To: qemu-riscv@nongnu.org Date: Wed, 30 Jan 2019 13:03:50 -0800 Message-Id: <20190130210350.16757-1-luke.r.nels@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 X-Mailman-Approved-At: Wed, 30 Jan 2019 17:20:20 -0500 Subject: [Qemu-devel] [PATCH] RISC-V: Fix pmpcfg register indexing 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 , Luke Nelson , Bastian Koppelmann , Palmer Dabbelt , "open list:All patches CC here" , lukenels@pm.me, Michael Clark , Alistair Francis , Xi Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" pmpcfg_csr_{read,write} do not correctly handle accesses to PMP configurations 8 through 15 (CSR pmpcfg2) on RV64. The current code computes the pmpcfg index using: (reg_index * sizeof(target_ulong)) This is incorrect on RV64. For example, when reg_index is 2 (i.e., pmpcfg2), the computed configuration index will be 16-23, which should be 8-15. A correct way is to use (reg_index * 4) instead, which works for both RV32 and RV64. Cc: Xi Wang Signed-off-by: Luke Nelson Reviewed-by: Alistair Francis --- target/riscv/pmp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 15a5366616..a1bee56c86 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -311,9 +311,8 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_= index, } =20 for (i =3D 0; i < sizeof(target_ulong); i++) { - cfg_val =3D (val >> 8 * i) & 0xff; - pmp_write_cfg(env, (reg_index * sizeof(target_ulong)) + i, - cfg_val); + cfg_val =3D (val >> (i * 8)) & 0xff; + pmp_write_cfg(env, (reg_index * 4) + i, cfg_val); } } =20 @@ -328,7 +327,7 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32= _t reg_index) target_ulong val =3D 0; =20 for (i =3D 0; i < sizeof(target_ulong); i++) { - val =3D pmp_read_cfg(env, (reg_index * sizeof(target_ulong)) + i); + val =3D pmp_read_cfg(env, (reg_index * 4) + i); cfg_val |=3D (val << (i * 8)); } =20 --=20 2.19.1