From nobody Thu Nov 20 12:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763463657; cv=none; d=zohomail.com; s=zohoarc; b=egWD3AI2HQKNjL/iLqBigR+t+FU4Z4vDjE0ftkDVIJkKExJBH6rCCXYvxFFl4UMOF58dtSBmFH3/VtODowsCIuWwjXDdEq+ldnoAUBAVp+OUgCs0Qk6y/eyIlZn+Bww1Bo1Kpq6vuM8AsLIcBqj8svpVRh6GKd5l0NGasUL509w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763463657; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xYm/oafUQ96KV1KrJ5UIi5YiWsP4bo/zOXkfAj3wvwo=; b=ne5j80QllQ+ACVplhrI8J8X47nZ4RFWlGTBDQxqeUxLgEraoKjVX9yYciWli6VJ0XdN5lDjE9E7sEfu+UHyPHmK9OKtdbEfTVVn4BebD6E7vH8MEdi9j6Nk0oUPHjiUOooYYFfvB3sPlecgkyrG7y3N4P9FOZAsevP6O/cYZvvc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763463657194440.0972127334503; Tue, 18 Nov 2025 03:00:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLJR8-0005BW-9C; Tue, 18 Nov 2025 05:59:50 -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 1vLJR6-00057P-IZ for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:48 -0500 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vLJR5-0000A6-AV for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:48 -0500 Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-bc0e89640b9so3680116a12.1 for ; Tue, 18 Nov 2025 02:59:46 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2a49db4a36asm43989903eec.5.2025.11.18.02.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:59:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763463585; x=1764068385; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xYm/oafUQ96KV1KrJ5UIi5YiWsP4bo/zOXkfAj3wvwo=; b=RizR/oj4piycARk89LIg+OFMFELZGSh0HFqjzY83Q7o9PUudATtn+Ut0zOy+SdLSGc AkXunBSOBph3Rf1hhNMuXyztsqRzSCYzvNCqLZSn9yV5TSx8nYOvv8Rsq6Zv+oTcxH4F 9R4Dq47uYf40WYy/JTGim1fQZX+QMvEqiAMwhAfivQpyjNAlJS6MxxgDGLn1vGG4TbnJ ClTvG0CSpG+UBoTBsJ1XWZgCGz0He6KaZqopv2RmUywLbPYqTjZ33N8AcDq4ShYxV23L ZQBCFD4Li/N/bUao1TQvaMKmNzBYNGBnNmbUXCDPfHE729BbjNQ7Okl6IM14UZGYA7HQ EKRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763463585; x=1764068385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xYm/oafUQ96KV1KrJ5UIi5YiWsP4bo/zOXkfAj3wvwo=; b=n2dEE1rjbr66eXRFZbOlVOZCQCanbnXRjSEJa+rK6GYp6Rs1BOxRkUBlqG5tC6MmLX l/PIQMmBPpj1OQJo94BQLzRDBgNUi/7cl/hhaPKu3sI/jUZhyBI1Y1P1vrPX3+MajYLv eWVJPlEmNmhr+Q9aR1AY8oFDZOMxMILcYTGueNWsWHqU+ZNKBU4DN27rVoEilBOnrcwe NpU+zP7zcQsBILbW+Ir/0KBwXFLKkF6wcj9Ub86QedMkuMM+13EFSgCKdf+QkJR1FTZY +ht5LvbiL+3QVdf3W8+usiMQ6hunvAqRKpbMl65Ok4MNcO+AUrqAgCV1B+s1X9p4bUWH HZ0w== X-Gm-Message-State: AOJu0YwxhPT5B45l44VfAg3GtGFVX+SKzfadXyxFSRFGJujlwYs/fFqL 5N22A/01oCJdSVvcjHCh0CVboIS+RH1UKwdGOCmjSC2o3sqMnnKKe7JCr66hk62F26Bhmj/OcKC hMv9AykHcyzj/JEfTqyJ7DiJSKRf2WGzM6gUI47nNWj5xrnmdws9A30DBOd8K0x2hDB/9q1+9wQ mYS+3lR0r627klV78NnWPa933oGK94MLpNOWINfI34rHc= X-Gm-Gg: ASbGncvDy32nfL+1ywyKInoNpGT+iCew/6nX+YI5Y/1QyeVp9uMcvQAa/XMKOR1JuMW 3wxJOPdiCzoZAzJGcPAuwQqT49l3IboZ1pDJ6ESlhA4ZgitM7RF2u62LLbTpWWVmO4d7p6VB2Gh iqWAM2JBqxeyC4Ok2+HehdvXfWn84FyzMw5Uqw9pe8TVtxI9uNUBrX4n79FQie5n8XNKCArFPHE /K9NbarbyPbnXtODaHn31UXo9MJw27BR1tCcUbFr1hCti5h+hATutBO3ct+jfo6SUYcWW8CFhLt NTf5fnC3YDwYVSWWKrRmY7r8llS5Fn6P1p7L4PLMs9O2yTKwEFFXit9j5WOrN8rc4gt+Dkz0rGp JiRzYy7VwglrPieiGAV2I1NXbYmz1TiXgm25ylJE26GNVkNdAyE4ms/Eznayu0oWM/Hiq8tirDY LPuxLEBqPAnhhCne1u8VOQGRuR5/qb9X5TZX91eI/+hCXA9cZe X-Google-Smtp-Source: AGHT+IH/Zm526KDj+WaH8ttm5/E8z62aV1zhs++U9UuITo2EzODoxGkPnBboZmi+SkuqkF0DLGtuwQ== X-Received: by 2002:a05:7300:d581:b0:2a4:83c0:6509 with SMTP id 5a478bee46e88-2a4abb54ebamr6282350eec.27.1763463585179; Tue, 18 Nov 2025 02:59:45 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Yong-Xuan Wang , Frank Chang Subject: [PATCH 1/3] target/riscv: fix address masking Date: Tue, 18 Nov 2025 18:59:34 +0800 Message-ID: <20251118105936.2839054-2-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118105936.2839054-1-frank.chang@sifive.com> References: <20251118105936.2839054-1-frank.chang@sifive.com> 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=2607:f8b0:4864:20::52d; envelope-from=frank.chang@sifive.com; helo=mail-pg1-x52d.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763463659926153000 Content-Type: text/plain; charset="utf-8" From: Yong-Xuan Wang The pmlen should get the corresponding value before shifting address. Signed-off-by: Yong-Xuan Wang Reviewed-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 172296f12e2..9b3f01144d2 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -203,8 +203,8 @@ static inline target_ulong adjust_addr_body(CPURISCVSta= te *env, if (!is_virt_addr) { signext =3D riscv_cpu_virt_mem_enabled(env); } - addr =3D addr << pmlen; pmlen =3D riscv_pm_get_pmlen(pmm); + addr =3D addr << pmlen; =20 /* sign/zero extend masked address by N-1 bit */ if (signext) { --=20 2.43.0 From nobody Thu Nov 20 12:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763463657; cv=none; d=zohomail.com; s=zohoarc; b=H9SikkLMMQ5Jmgg1u/nM7vshK+YMDkTFp0VNA8SYrYefB3SONeYhw0kV/XXShFHjm1c9nuYjVj/3EuxdjCC28nnrASSAQKFbt04TA1mLohzuy31cdJLLT058ZJF2a+nwpciwgctoPk6Gag2djoHpMPrRtBJdyGa0SStG/0gcPFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763463657; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BeAfhzzwLoezXUW4QEKWPyiXQiwrmDlOOpUfme2j/5E=; b=fRcbTSgpHmOxCSbOY6zSocWWAnkuhgK84+7kMgYexs3XXrAIXJ/lFgQX6ubOBqs6zFIJZ6fxZ72fO+rksNwl/2t08hEF3+ktPigSvwkgVli9YKEHn2VHr4D7sWeD6SM3JNgFRPWicQs6+21jvb/OYJgYVRjysDg5hTN7RX4JrUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763463657366888.2709241098248; Tue, 18 Nov 2025 03:00:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLJRA-0005E9-Vr; Tue, 18 Nov 2025 05:59:53 -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 1vLJR9-0005Bw-9Q for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:51 -0500 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vLJR7-0000Aj-Lh for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:50 -0500 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-7bb3092e4d7so3875552b3a.0 for ; Tue, 18 Nov 2025 02:59:49 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2a49db4a36asm43989903eec.5.2025.11.18.02.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763463588; x=1764068388; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BeAfhzzwLoezXUW4QEKWPyiXQiwrmDlOOpUfme2j/5E=; b=hkDzl0KkPTBCA9niuMj60/rQJeTFJt2weYmIeYVS21IitekMwW4aJ+20l2eHEerQXG ltGAvj0hZDj+ZN8dgC52smvdWoW9rmYi2OU7HyzcE/vcC8delO9Tj3vfzU2tJdlVSCbq lszNyZR99yqBbbmLE7AuI2K5H8k4A5fuF6MWEgPxi/LE9Oert+NFLxco7i1iiakq5VJU Dea8cLT6xS7qayeYNiFYetTpLSkH94IQtLFtT/UpWw9N+gMKShOIu+SesxCokW3/lQdm DyJtEgoOqVNBRPJLDshXKk561KH+swAHoUUkq/No9cv/VF3hHhs0KuSOdN/Ok5tmtjft 1+2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763463588; x=1764068388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BeAfhzzwLoezXUW4QEKWPyiXQiwrmDlOOpUfme2j/5E=; b=G0xSl1ewncW2EFy+TjPdN5kptDbA8N4fjqRCYkzuwkkztiuaNkwN6tza7pFFPcK5z7 JYF/Rzj/58HqCfH80oxzDhDt64WzdKLjCg2s6taTJniHEGnWMqSExIM3RG5SzOjboFbf k7t/NcQz9Fsp0xnuWB4VkgeUm+6ec+imybye605JGAdTlfw/S+u1ugWahrVGXiP5dhLt Te1Fai7h5leABL15ruGfrpYaDnnGsYGITLjOmmJ4litI5mT7S7JISwz66cCUUfBZun0Y oq1VXZNKCnFIJ7+XVtOpBK5qpOkm0JUQD6VMebOGEjxsaBmIBxu2Ex5Z2zVbDlpk3FeA rNZg== X-Gm-Message-State: AOJu0YxO8WyqEgLUZ+koRva3R4qIQcnxg8Eo3UV2vsk2MzWXLjM2Zzz+ gE/p5xza5bwxBkV68Cawonb87uhq+kJFNZ3oXReKy8pZrdFnWIEZeqBMfxBVfK3TGTUQpVbFPAA R4AAm71d8/DRD51TkvCq3j4n44s+PtNKAqyzHD10JseOMz0ha5qDjNYxoS3NfPdjkzrhmm/E/43 md+T+wmML9O97kYmP2nISlDGqmBbVVbXdcWkNWHXHaB7A= X-Gm-Gg: ASbGncvouzdh956Y8/CCjNOe8wEkYy+yP8zoZwM7czn1k9dp/j6fousZX9o/JaUzP2s rvWwnqqHXnk3SI39o6mAXEdw49m8osTeQhn9kJp/VLbQW8hfohjO2hA3EPZcXCDVtYzAD0EDR3b HlnAGxkjflgTcnxAMjhIbWJcfv3+tXbugeYjk24pPfPBvW17aufCiXW3w8+97fQhXzBrjTnUpzD YFnUCOc0rhBPNwsGnLWtLCZ3jsKbq98McjCuy3OgYNejrqlTyRwtakfx0I/naS+IBXysWBXLMVb ILm75p2WkyPvgIKzJnE7cQ4gG9dskIylYnJAM+s8N7TNndVPlxdX4BTwsm0kUgFmoff104TOEZB KszqL3uxmT7pVEEV4Cby0InG7dK+RitT1qBUAs++juTKlnlrcgz/jx5vqqSMncclloOdYVC3RIH KvgbLloMS9F4PnEUIDFLYUAIwQd4z3qyHSUNY2jD/2BfF0RlN+ X-Google-Smtp-Source: AGHT+IEc2MitcQABfhGMFRlWqEWvpt1XO2zEb5HfUNZCS7ZD4azMbbNnUkXzpcZLGtupsytJpEP9SA== X-Received: by 2002:a05:7022:1e05:b0:11b:c2ea:daed with SMTP id a92af1059eb24-11bc2eadc31mr6464311c88.32.1763463587625; Tue, 18 Nov 2025 02:59:47 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH 2/3] target/riscv: Fix pointer masking PMM field selection logic Date: Tue, 18 Nov 2025 18:59:35 +0800 Message-ID: <20251118105936.2839054-3-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118105936.2839054-1-frank.chang@sifive.com> References: <20251118105936.2839054-1-frank.chang@sifive.com> 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=2607:f8b0:4864:20::436; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x436.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763463658848158500 Content-Type: text/plain; charset="utf-8" From: Frank Chang mstatus.MPV only records the previous virtualization state, and does not affect pointer masking according to the Zjpm specification. This patch rewrites riscv_pm_get_pmm() to follow the architectural definition of Smmpm, Smnpm, and Ssnpm. The resulting PMM source for each mode is summarized below: * Smmpm + Smnpm + Ssnpm: M-mode: mseccfg.PMM S-mode: menvcfg.PMM U-mode: senvcfg.PMM VS-mode: henvcfg.PMM VU-mode: senvcfg.PMM * Smmpm + Smnpm (RVS implemented): M-mode: mseccfg.PMM S-mode: menvcfg.PMM U/VS/VU: disabled (Ssnpm not present) * Smmpm + Smnpm (RVS not implemented): M-mode: mseccfg.PMM U-mode: menvcfg.PMM S/VS/VU: disabled (no S-mode) * Smmpm only: M-mode: mseccfg.PMM Other existing modes: pointer masking disabled Signed-off-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu_helper.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index dd6c861a90e..112093012b0 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -154,22 +154,30 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) } break; case PRV_S: - if (riscv_cpu_cfg(env)->ext_smnpm) { - if (get_field(env->mstatus, MSTATUS_MPV)) { - return get_field(env->henvcfg, HENVCFG_PMM); - } else { + if (!env->virt_enabled) { + if (riscv_cpu_cfg(env)->ext_smnpm) { return get_field(env->menvcfg, MENVCFG_PMM); } + } else { + if (riscv_cpu_cfg(env)->ext_ssnpm) { + return get_field(env->henvcfg, HENVCFG_PMM); + } } break; case PRV_U: - if (riscv_has_ext(env, RVS)) { + if (!env->virt_enabled) { if (riscv_cpu_cfg(env)->ext_ssnpm) { return get_field(env->senvcfg, SENVCFG_PMM); } - } else { + if (riscv_cpu_cfg(env)->ext_smnpm) { - return get_field(env->menvcfg, MENVCFG_PMM); + if (!riscv_has_ext(env, RVS)) { + return get_field(env->menvcfg, MENVCFG_PMM); + } + } + } else { + if (riscv_cpu_cfg(env)->ext_ssnpm) { + return get_field(env->senvcfg, SENVCFG_PMM); } } break; --=20 2.43.0 From nobody Thu Nov 20 12:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=sifive.com ARC-Seal: i=1; a=rsa-sha256; t=1763463657; cv=none; d=zohomail.com; s=zohoarc; b=fxFC1p4A7LU9R2HQUVy15Lny0aDXUJITOaYSKgNFoW9jnWiy2LoI6jdVIJ/TB00LGJZV2EfqCi6Kk9Bn3Mp9/zzwRr2LIEP3jFHG6z3419GkvnamVPPCC+z3rfSz5SKOesd+294DIwUu8arOwwmAcWRZw/VZwKkXfplKlyi02/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763463657; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=c9Gr7L5oeBq63sdEzD0yI7lWtqief3TcLbZ7sPE4Otw=; b=UN7i4+Acm6MEnRS1kJE0YZnX5kpWl08FWxzMzmgEXkKadMoANHw5BJLMIRKXxn/nxJH5jqEjcfLbdPA6yltc//MRvp4GkejDur9ebo7KzVEo1ZY9s3Wi7y6jhUHPg5HJdVUfeHmhH3l0TW25uMuin50Qbqf/W+l68f6YwbSPoRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176346365727310.70004362960924; Tue, 18 Nov 2025 03:00:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLJRD-0005Jn-6I; Tue, 18 Nov 2025 05:59:55 -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 1vLJRB-0005I3-R7 for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:53 -0500 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vLJRA-0000BU-EB for qemu-devel@nongnu.org; Tue, 18 Nov 2025 05:59:53 -0500 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7ade456b6abso4719694b3a.3 for ; Tue, 18 Nov 2025 02:59:52 -0800 (PST) Received: from hsinchu16.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2a49db4a36asm43989903eec.5.2025.11.18.02.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 02:59:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1763463590; x=1764068390; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c9Gr7L5oeBq63sdEzD0yI7lWtqief3TcLbZ7sPE4Otw=; b=EVlSM+DYjSnWMzmhWUgflImTqSNTI1yut/xDsp+EXL7Q1SxAQxmpeBNmcA/eHeONgd 8+S/uoWE+CEM41Hunc/06VHABtnIk6jascoqvhe606QmXYRzShrUKwHi4mIfjx7yctjt FVzx2sFoU729TjSSxSEW0TB5XtPCMvdXGsJHSBSvsYxMBw8LeyIxsGymYuXN1q53O1K6 eu6JTHa3eIbY6TCqjjh9Lw9XpTYszANrbOyCEp4H861nBfAtqmQbYEXfC2KxIAnF7zAs 4TCsjx+eIoY/1o/mHeKNjs0nCS75hiL+m1+nr+ZG/YPiVzCl9E6gN0opo5pRPCp20tvW R2sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763463590; x=1764068390; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c9Gr7L5oeBq63sdEzD0yI7lWtqief3TcLbZ7sPE4Otw=; b=iGUM6idjEYXgPM/DSmhR61SaKbUN41BT10nST0pNPzDwcM6xKANuRG9AQ9ERzJIDvg MYl53dfOsbu2+amqrLTfVZb3ezRpX0oMDd+fiA2fpE90+PdZgoN8Pr1MFjyZ9yyKC5mp FgQAUWhIa/FYHn+o88ZKBieZKP4lA0VK3Dym/hWHrSUqM5QQctDpp1VAVm89vwMAl7/C xr1gcuSWS4fDfZp29Ncbq98VHPjP4R7BCtcZPwM1UA8+oYHR9hLVBgKC2+X+hcn2pp6J nwR3qDvX1wjvPRsSN3Enq7VYqT1zF0E4CdhNghv1fnFttxjZA3Br1lP/pimEwhNvphA8 PLKA== X-Gm-Message-State: AOJu0Yw+aKwgsEaAHY/K2BXamUiKO1+lVEI1NzHGlAR151yr8VroNOdr ZsYEX4VNtWn6ZgKQDWdxSsUsVJchdmwxAlC/PdxYg05eEI5aUOvp/izXs5IGx5/4pZ7FZZy+IfB DcLdR3U4g+Cdu8va5+iuSrvwQ18fHJD6hs7wzD5c/JOIRqVZEg5c52V5G0/293v3MQugn72/ici hX6Mi6PRHlSCg5qid/aLehlXnN5hPWISvI8Pw3rmQSNxg= X-Gm-Gg: ASbGncvwMy+0eaK30NzzgH6MHd5hgBTBZmQh4E9hGvAmeCfur4eAqlVZaTpLGYohq7L qVMWYPt+FM7kViXJpNAvqH/hXHnD9aDnLuMB0BbtjOadj/UhaQTK1Sdnjwn9bW3+l7JKJoN67HY w3ayhKD/+w1an+3fIbWawwg2LQyTuSXXAxK5j5CqmNi0ikmw6bKidZktFD5gHGjEyXgeXsfLA+C /KBZlchhHj5yyeQX2c2zd3LgKNOTOziH4Xo9r/Wx4XzuQ1msAMs1/8wttEAmMVCuCm+uf0wZ4MM UVC9vwcYvSQ54b8ivHN/1uEIcyXc+5fnXwnUkiJ0PvN+3DbtTDqVpTaFSdD3HgFdUbNTw6f1T8d ns/G/dsOFQ1Pws099hEh1OuyXCs+6yMLqec04bc7lw+Q+FlkwfdFOHCk6sLy8uhvk0WSjmBDQJ8 48eR4JDosrRB8HVE5LF3xOogc6yuqFdd7+BjqNIMQrM62yVFpH X-Google-Smtp-Source: AGHT+IEHFoQgddtd7tByF9qHOpNzZTVPQDJJro4H3PEe3qvDwYnPLuRxqAAFAECjo6gcovMpLfd2kA== X-Received: by 2002:a05:7022:f513:b0:11b:a514:b63e with SMTP id a92af1059eb24-11ba514bb4fmr2633008c88.14.1763463590162; Tue, 18 Nov 2025 02:59:50 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs), Frank Chang Subject: [PATCH 3/3] target/riscv: Rename riscv_pm_get_virt_pmm() to riscv_pm_get_vm_ldst_pmm() Date: Tue, 18 Nov 2025 18:59:36 +0800 Message-ID: <20251118105936.2839054-4-frank.chang@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251118105936.2839054-1-frank.chang@sifive.com> References: <20251118105936.2839054-1-frank.chang@sifive.com> 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=2607:f8b0:4864:20::430; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x430.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @sifive.com) X-ZM-MESSAGEID: 1763463659922153000 Content-Type: text/plain; charset="utf-8" From: Frank Chang Rename riscv_pm_get_virt_pmm() to riscv_pm_get_vm_ldst_pmm() to better reflect its actual usage. This function is used when checking the PMM configuration for virtual-machine load/store instructions (HLV.* and HSV.*). No functional change intended. Signed-off-by: Frank Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu.h | 2 +- target/riscv/cpu_helper.c | 2 +- target/riscv/internals.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 8899bf7667a..abc87e64648 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -846,7 +846,7 @@ bool riscv_cpu_is_32bit(RISCVCPU *cpu); =20 bool riscv_cpu_virt_mem_enabled(CPURISCVState *env); RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env); -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env); +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env); uint32_t riscv_pm_get_pmlen(RISCVPmPmm pmm); =20 RISCVException riscv_csrr(CPURISCVState *env, int csrno, diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 112093012b0..40b1e8da471 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -190,7 +190,7 @@ RISCVPmPmm riscv_pm_get_pmm(CPURISCVState *env) #endif } =20 -RISCVPmPmm riscv_pm_get_virt_pmm(CPURISCVState *env) +RISCVPmPmm riscv_pm_get_vm_ldst_pmm(CPURISCVState *env) { #ifndef CONFIG_USER_ONLY int priv_mode =3D cpu_address_mode(env); diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 9b3f01144d2..b17b661e2a8 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -190,7 +190,7 @@ static inline target_ulong adjust_addr_body(CPURISCVSta= te *env, =20 /* get pmm field depending on whether addr is */ if (is_virt_addr) { - pmm =3D riscv_pm_get_virt_pmm(env); + pmm =3D riscv_pm_get_vm_ldst_pmm(env); } else { pmm =3D riscv_pm_get_pmm(env); } --=20 2.43.0