From patchwork Mon Feb 10 15:37:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Bradford X-Patchwork-Id: 13968081 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3D8A1C02198 for ; Mon, 10 Feb 2025 15:37:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thVqb-0003mE-M6; Mon, 10 Feb 2025 10:37:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1thVqa-0003lk-0A for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:37:20 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thVqX-00033g-I6 for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:37:19 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4368a293339so50589525e9.3 for ; Mon, 10 Feb 2025 07:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739201835; x=1739806635; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2FNj/lHt1BHjvndFs0hjsvwi65QGfXgWDRzZ4lr18ss=; b=stvKsbrFmJmtvaIEvY605+7ECpMGTXZkSI03rLerkGDVq8S/h3tPdRBC0FMccGdMh0 l6gMNpBfVyN151/DFE7FU2tn2r2bj5ZKaXmnlUiJOrd3FwrN+wJMkaBYRZ04Qd2s0DJV gLUEK+VZ9dyS6Ej3AQ1E4SjPvgbb92O6RzC+Uy49sUL4y6xYAzv7KVyqMSf5olqWrNx6 6rV2cAXHgY11nbxPvZiTQMzouGK7Cyn8Y8Cau3CX0UC6YOtf0u7+ABG2f6V1yagkPGLK VCpZf8+V8muAh6uzzhI3UWWXeATK6ha1RVQIXoGzNXrkaiehUe8NpZpzIE1cpkPfD8sa u/ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739201835; x=1739806635; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2FNj/lHt1BHjvndFs0hjsvwi65QGfXgWDRzZ4lr18ss=; b=UED/6AWE80Inlx64V4TGWI0mFjXdk4haOnJzJlAoDXtENlZM95V6bZeljxGiIu5VVw qht9Zc1tf1j4U4N/EoH0YHQJq08Nj4OUL4Pa6X6sZqeZsU5PvJknYCmsfVO6Uv82cBfd BjcPCvtEupFQIqjpcHLEZ0M2F4xPBCyXOnZK2GYf92PWZT70cl/B6juzpQO4zcLJUYOo C1SifJI398hsX1QMPcaaiAWF/em10hsajEOufGOXPita7ocJomJqTCWi7lRuX1PNYm8C i1Jr8CckARllRN12ct6Eg/6B2WbbT1SpttqNVxsXZ+JP+2N7S52Mbj2w1akOzDJlIhd9 vrdA== X-Gm-Message-State: AOJu0Yy1Sdc7w/zcltSsWseLBH5sJw96VKqINAiUjZJRuTSLq16dgt8z 2bcpxbHnNdmMfwkliCe5YX31RBSSe23cwHCZlFkjwcBi/9UBftJTgapBmMuPyukyZMhJiT5zMmH E X-Gm-Gg: ASbGncuARclPpgvWdxlRXg7IHHqHREopwpc3IH12NALEyTnDe1uZ0ZnPBNFjL3jusSM mV8hbAZf01YnR7lt7GHwIZKG2INVgFbsGUtXUNNUr0Uaa8S6jfZrKYgzrtRU/VpeESonCw6Vo0a +wwPtNbC2a8ip6zoyqrTHlsHl8h7vHHZHso/CLTCdgm4u9QPXiVTSArKI1GGKlMJwuxJfAeK/ch ZaXtrYqgLXzzX+6hZRkK9EmIAD0WC8DrBcgg0TnpsP6l8TZW1fPCCJHdbykliKtbYjNCgwsAhu4 rDdGi/a1hJlYA30hbbYE0Ucb90RR/zRRZw+V+zhXTvjkMRevuCXuPrBAAAJW/2c0Oxg= X-Google-Smtp-Source: AGHT+IGNn4as9Kzn0sAxjtvPebvPmo1u/I/U9IP5mAkw+2WGT9e0lMcrRG+vVDjqvSzusscSK8qnAQ== X-Received: by 2002:a05:600c:83cd:b0:439:44eb:2db0 with SMTP id 5b1f17b1804b1-43944eb306emr34707505e9.15.1739201835055; Mon, 10 Feb 2025 07:37:15 -0800 (PST) Received: from rockhopper.ba.rivosinc.com (214.11.169.217.in-addr.arpa. [217.169.11.214]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439471bf782sm24052565e9.39.2025.02.10.07.37.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:37:14 -0800 (PST) From: Rob Bradford To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Bin Meng , Weiwei Li , Daniel Henrique Barboza , qemu-riscv@nongnu.org, Liu Zhiwei , Alistair Francis , Rob Bradford Subject: [PATCH] target/riscv: Respect mseccfg.RLB bit for TOR mode PMP entry Date: Mon, 10 Feb 2025 15:37:13 +0000 Message-ID: <20250210153713.343626-1-rbradford@rivosinc.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=rbradford@rivosinc.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When running in TOR mode (Top of Range) the next PMP entry controls whether the entry is locked. However simply checking if the PMP_LOCK bit is set is not sufficient with the Smepmp extension which now provides a bit (mseccfg.RLB (Rule Lock Bypass)) to disregard the lock bits. In order to respect this bit use the convenience pmp_is_locked() function rather than directly checking PMP_LOCK since this function checks mseccfg.RLB. Signed-off-by: Rob Bradford Reviewed-by: Daniel Henrique Barboza 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 a185c246d6..85ab270dad 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -524,7 +524,7 @@ void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, uint8_t pmp_cfg = env->pmp_state.pmp[addr_index + 1].cfg_reg; is_next_cfg_tor = PMP_AMATCH_TOR == pmp_get_a_field(pmp_cfg); - if (pmp_cfg & PMP_LOCK && is_next_cfg_tor) { + if (pmp_is_locked(env, addr_index + 1) && is_next_cfg_tor) { qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpaddr write - pmpcfg + 1 locked\n"); return;