From nobody Thu May 2 12:40:52 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=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1569386978; cv=none; d=zoho.com; s=zohoarc; b=AyLoIwJIGF+hWeKe0jqjjbpfh681GWhDK+/yurnDmxotOnI6a9u3kErBIVWc8v6M8Sd2ZsBHnHfnG99pYUqqXB4Fi/p4/kx7Yor7KmvQYLUp8Qv4tLjxXF0qm6EKl7fR1VHjtMJi14W7w2BJ0EKTI6gJNjtFRkUsmdyo4EQXQ6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569386978; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=HB0LVO50HXu8D2noJFIpRa5yYW85WRKS4gsdoAu2FH0=; b=U7JBj/xYIdp/CtBtVtcQdjpEsrh6m0kFqKzyn5vHcpzC/Sy5KkwramOcCJO+GV/Zl/lmiC9jZmjDyzqe6Lnn0QTWYnILmAxTjm5zRUBQs2uuiDRObXgf5tQ7YW+y1ry+rDwuALRk1lE3Np67Cj9uCwfHccy6Ca/F5TlxmPm5v08= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156938697840961.345143017673536; Tue, 24 Sep 2019 21:49:38 -0700 (PDT) Received: from localhost ([::1]:45404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCzF1-0005gM-6w for importer@patchew.org; Wed, 25 Sep 2019 00:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53443) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCzEE-0005Cs-W8 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 00:48:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCzEB-0001lk-Uf for qemu-devel@nongnu.org; Wed, 25 Sep 2019 00:48:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:36720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCzEB-0001lN-Ob; Wed, 25 Sep 2019 00:48:35 -0400 Received: from guoren-Inspiron-7460.lan (unknown [223.93.147.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E6B021A4A; Wed, 25 Sep 2019 04:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569386914; bh=GMapcb2WUHqhsll7OX2TGMlEII/fxxpk18SPz1OiNHQ=; h=From:To:Cc:Subject:Date:From; b=btfWax6XT8Qss02p583ulK8ekt0bfbP9xQn6wnma5yluT6oaT0Agr5n0xdURfPh1r BRqeyhZ78ASME5v1ZVHCF4l+5S4mCPJE/ZDSsLzj57LGgt808LU67C/KP6mwGB/qKM gGnaNWZyGy7qgRhftjQEV5m0oJCF/b2uEnYhGKeQ= From: guoren@kernel.org To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH V3] target/riscv: Bugfix reserved bits in PTE for RV64 Date: Wed, 25 Sep 2019 12:48:15 +0800 Message-Id: <1569386895-8726-1-git-send-email-guoren@kernel.org> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 198.145.29.99 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com, Guo Ren Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Guo Ren Highest 10 bits of PTE are reserved in riscv-privileged, ref: [1], so we need to ignore them. They can not be a part of ppn. 1: The RISC-V Instruction Set Manual, Volume II: Privileged Architecture 4.4 Sv39: Page-Based 39-bit Virtual-Memory System 4.5 Sv48: Page-Based 48-bit Virtual-Memory System Signed-off-by: Guo Ren Reviewed-by: Liu Zhiwei --- target/riscv/cpu_bits.h | 3 +++ target/riscv/cpu_helper.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) --- Changelog V3: - Use UUL define for PTE_RESERVED. - Keep ppn >> PTE_PPN_SHIFT=20 Changelog V2: - Bugfix pte destroyed cause boot fail - Change to AND with a mask instead of shifting both directions diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index e998348..cdc62a8 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -470,6 +470,9 @@ #define PTE_D 0x080 /* Dirty */ #define PTE_SOFT 0x300 /* Reserved for Software */ =20 +/* Reserved highest 10 bits in PTE */ +#define PTE_RESERVED 0xFFC0000000000000ULL + /* Page table PPN shift amount */ #define PTE_PPN_SHIFT 10 =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 87dd6a6..7e04ff5 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -258,10 +258,12 @@ restart: } #if defined(TARGET_RISCV32) target_ulong pte =3D ldl_phys(cs->as, pte_addr); + hwaddr ppn =3D pte; #elif defined(TARGET_RISCV64) target_ulong pte =3D ldq_phys(cs->as, pte_addr); + hwaddr ppn =3D pte & ~PTE_RESERVED; #endif - hwaddr ppn =3D pte >> PTE_PPN_SHIFT; + ppn =3D ppn >> PTE_PPN_SHIFT; =20 if (!(pte & PTE_V)) { /* Invalid PTE */ --=20 2.7.4