From nobody Tue Feb 10 00:40:50 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; 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=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1617971078; cv=none; d=zohomail.com; s=zohoarc; b=Zs+z0TwQxsxSXgYW8ZarPFDK7y/TpTKQxtH5P+z5tZp/1NvyewHOrDpA8ytYk8cnGaB834TNWKxkQnJ69UpgV+C8bPHheMSsJSNnhQPiajcfogYbQY+YLETYy/0lDJicsuOMefAJIy2/ApCR1b5kxBuFtApHH92gA0tztgnRM8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617971078; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YzqrMObVHUxDKPxHVidx59H9AlonXX2HTdbap3k3pzU=; b=FnVKIljrI+qvHLr+kidAdF+/W1zOCDpPE0BiLHFwMIPg0poVvp1piZjcAGuNcBY+WAnf7JA+kwCju4J2gguQDyJ5j/ScB4GE0w9kprrKlPFBYHG83V1ovAa8JTkXdRGov7YFIWBCE9opFN/fWtKHxGbLyX7dyC65pUlNsZRnxfs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; 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=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 1617971078080166.6952499569885; Fri, 9 Apr 2021 05:24:38 -0700 (PDT) Received: from localhost ([::1]:56890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUqBg-0002U5-Kb for importer@patchew.org; Fri, 09 Apr 2021 08:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUq9E-0000c9-PN; Fri, 09 Apr 2021 08:22:05 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:37640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUq9C-0000i2-1i; Fri, 09 Apr 2021 08:22:04 -0400 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 09 Apr 2021 20:21:58 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2021 05:03:08 -0700 Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.98]) by uls-op-cesaip01.wdc.com with ESMTP; 09 Apr 2021 05:21:58 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617970921; x=1649506921; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S0sfoUXLHQc/pUjewitz2fdpjNYtkwDNkeFqT57A9v0=; b=naJe8bwPP7fEDgMcw0q7OwucoSi26q2puqItm1hOVeHFG3jtjvKgHbzY tU0pAAn6aJRU+7KrYC4aitltq3GJMQuztlN90h40F76wFw1cIjIcQ11/s 8lku8WXrAQuEPG6r+xFXWRIqhOz1OsCcvqDh4bU04aDjcgsrtwHercr+I WWULIMMnJYHM4YNEsK2G/Rs3bQQX7e/eH5D25yoLKhRuWUMy4Bxb6Pwrk p4uuH0fcApLhOVRCYrHF1llvTj/XxIcDqzHUAXFDctK21zhh8+MCJaLGZ 2HFSqJgC2ohMBckak5IPZSoAgo2ArXczRCwI4Utaq9KXx91hRzFGAjs3t g==; IronPort-SDR: ObJHlJLPbgnV8akhjI4cUVKhd4aQpRwSPRZunNDBv3aZ+cHtUOYpsqss+S1Gm5tCFvme7CEZBW /IxP1HrTLVazzGZPs/XDCVNzut2L4fcPhWZ4sDK0RlOfefueWKQIXVxPJdrm0/yO+OKnxuDCai rxP7vH2EaEvWVjMMRkglK/m4F0DtPqQghjBbusA7/DO7eS6iYcjkX0MvHG2ahZOjaxzmaLbpaU S39j3MXY/V4qX1oS3ZiddmR79z2FGbVYARo0Tjx2eekP++jNebG1sV+dIyJS2Fv8zPYUsvDpuF hQs= X-IronPort-AV: E=Sophos;i="5.82,209,1613404800"; d="scan'208";a="164302800" IronPort-SDR: tNeagxNo/hl2h+/T1sGssYZWuGphPPMVX0UtIZeEB0S8fS+O0+gyIWzNmQiwssVbvwMASTBUFW +WDqeiOJIsm/S6TPUdami+0X0w1ejezqElIx5BHRXU4cCWARMrOatV+23p3RowtPo/ZelnHr38 mUeqXLqr+tALb1pV8Rl31F9pNYymjjTvx719Ap0PnNsgBgpPCq0AH+QaIcfeUTvQ9uQOJ47xnu 3oEnaQegn/8cFd4eAcxf6ZrwFPzXJ2ctouqNnsZJqY1exXbyqg+J3blg4PnXB5Rms9ggDy3N14 uSyXCJTEqT5URywkJgbHcf/w IronPort-SDR: eyetF5l9Ph57VP8FKcSRdAptUa2ascwiBYmOL6SjtraqgdgfxG2NCCtc0GHdbRJpKC26zLSSGX nN6Lvi+Tz86SzrygrMK5QUUJo7eYIyHlckACyXnKfNlI4+bntq25DFlR5iJJpt2tzrDYebtHFU /Etcc/pjMqKgEgpBHse5USgXOYGmvFoSBtwDUihDNQvQLj2cIE2lw5G3WMqc6JJYyB0wqxMm/R WxZyvMhx9dRfZacoRJ8DI3Tk0AUlHpkd6F5e9olfWQUecFFjA7F4ufeBVBo7EM7QZNYTQAe7c5 aB4= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 1/8] target/riscv: Fix the PMP is locked check when using TOR Date: Fri, 9 Apr 2021 08:19:56 -0400 Message-Id: <040c147d100a86e14007e4cabc7da22855f24b87.1617970729.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: 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 client-ip=216.71.153.144; envelope-from=prvs=726c96411=alistair.francis@wdc.com; helo=esa5.hgst.iphmx.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: alistair.francis@wdc.com, bmeng.cn@gmail.com, palmer@dabbelt.com, alistair23@gmail.com 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" The RISC-V spec says: if PMP entry i is locked and pmpicfg.A is set to TOR, writes to pmpaddri-1 are ignored. The current QEMU code ignores accesses to pmpaddri-1 and pmpcfgi-1 which is incorrect. Update the pmp_is_locked() function to not check the supporting fields and instead enforce the lock functionality in the pmpaddr write operation. Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/pmp.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index cff020122a..a3b253bb15 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -59,16 +59,6 @@ static inline int pmp_is_locked(CPURISCVState *env, uint= 32_t pmp_index) return 0; } =20 - /* In TOR mode, need to check the lock bit of the next pmp - * (if there is a next) - */ - const uint8_t a_field =3D - pmp_get_a_field(env->pmp_state.pmp[pmp_index + 1].cfg_reg); - if ((env->pmp_state.pmp[pmp_index + 1u].cfg_reg & PMP_LOCK) && - (PMP_AMATCH_TOR =3D=3D a_field)) { - return 1; - } - return 0; } =20 @@ -380,7 +370,23 @@ void pmpaddr_csr_write(CPURISCVState *env, uint32_t ad= dr_index, target_ulong val) { trace_pmpaddr_csr_write(env->mhartid, addr_index, val); + if (addr_index < MAX_RISCV_PMPS) { + /* + * In TOR mode, need to check the lock bit of the next pmp + * (if there is a next). + */ + if (addr_index + 1 < MAX_RISCV_PMPS) { + uint8_t pmp_cfg =3D env->pmp_state.pmp[addr_index + 1].cfg_reg; + + if (pmp_cfg & PMP_LOCK && + PMP_AMATCH_TOR =3D=3D pmp_get_a_field(pmp_cfg)) { + qemu_log_mask(LOG_GUEST_ERROR, + "ignoring pmpaddr write - pmpcfg + 1 locked\= n"); + return; + } + } + if (!pmp_is_locked(env, addr_index)) { env->pmp_state.pmp[addr_index].addr_reg =3D val; pmp_update_rule(env, addr_index); --=20 2.31.0