From nobody Mon Apr 6 20:30:47 2026 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=1773801818; cv=none; d=zohomail.com; s=zohoarc; b=NCVA9QRzxJl9yPgztd7Ok3gpxdhSty0jXj/mcQjaKtyFjXSHv4JOq+hLjaSneWOXUtMFqScRF9Y+VcpNKI9pMc8OA938WyCjzvzVJQBhC+PE0baczSnfN02FogcegXRlwYc4EJyyQ3TwIPhhV3em5b/kUvjDoqf4Sj3wKx9nN4c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773801818; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h5HVr6oMXmyyZo/7M7vYBpkPmDpvrpR169IY4RgXgJ8=; b=fDelk6hPtDewox9LAUdlQzyMEXRhFlOv935rPzlMiiEZjELl8l7dIYggF5mK75MZGkpsSaZbBS/jqVgeyzR+W372D1CeY3OdH7D4Tm5eZwcDEf28LuldsoEyZ81o82/Mi6Xo+4HeaEAJEYOKSpS4B8/V2NrbPXq4gZtFB2l/BjI= 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 1773801817944326.6723889505396; Tue, 17 Mar 2026 19:43:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2gry-0002Nh-Ev; Tue, 17 Mar 2026 22:42:50 -0400 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 1w2grw-0002N3-Jj for qemu-devel@nongnu.org; Tue, 17 Mar 2026 22:42:48 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2grv-0002DR-4A for qemu-devel@nongnu.org; Tue, 17 Mar 2026 22:42:48 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-35b95e21ccaso232801a91.0 for ; Tue, 17 Mar 2026 19:42:46 -0700 (PDT) Received: from hsinchu26.internal.sifive.com ([210.176.154.34]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35bbbedd0desm462732a91.4.2026.03.17.19.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 19:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1773801765; x=1774406565; 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=h5HVr6oMXmyyZo/7M7vYBpkPmDpvrpR169IY4RgXgJ8=; b=GLekj9WixSVv5nlbjUKZEKbGzsp3Oa9+IWkMg/kftMFj18KWXGAOax21PQlEsBr9tw McNeyzEJijyMFhg/olM6HRYN7UQ9Y1M7PyJFj4O3+4Vpa7d6XK/NMRx3m8mnPwh1QfO2 c3/YQtN4Ig0A/6An1WCNmBu81wJkmt9SvM11vshnKZKqt5qx2zGE8XnJEOY59e/XmBSw OU1cQcvsMi+z+RVfylBWmd3GozglaujCGU4+gvnI1VJYCqPf56lZqte7wIbjAG002TmI bSYcPNf44FjCVhLk8SaAA5jdYWa8mYhIBqzlTJtWERnqkL/MuA2nM82uz7YTZJTJY0Hg cnUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773801765; x=1774406565; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=h5HVr6oMXmyyZo/7M7vYBpkPmDpvrpR169IY4RgXgJ8=; b=syztBjlQ0aUDAestnue8uvzYjvpcx5/WfzHfPHubWKQYxCP5u4Q6G6vZF7ZwlcJOvE 3zS66hbFqJV/f9B5gebtpecAzC40Q9DlF3vdjq5Q9rC3u8mGoRYKiSHQXOB/Yaf0oTg/ mxq8+n2EJ4M1S0Qcy6EeeO40kFb6cL+J9R9Tf+4iLR/Oir1Xw6o4H3q5Ct2JeUVcMTJA SFHlJBv3soW1yiVe7IF4Xj4QlOtYNqYexsP15+feW4nW/u64IfBVN1A5MhJMEN9/TwEr +ojseDfGNIGisjawiTJBdNBbDdtCSKFcPSnLuf7U67TECyM9hkkDGri5KLAAnjj6cNFK kj8Q== X-Gm-Message-State: AOJu0YyAd1WfKxhdkc7uI4p6UaITaiTIfui3rT+FDhzsw5sjCvn+qJwQ f3ahgPDKgORPEU3irPJU57Kv/XnmBXFOOBvSmwCq4PlHXz3mSyicUDaHm2lHpEGE5Pyf3sdxcOX BS1srVK4FtbY11R0yHI4/zLD8zRBzoKdwaQJanETYGQMac0SxiOClVY7LzQFLBrtpCyZp1kDuqE yTLYw1zZ3q7A+6Y1vFjnpXbBgVlAwNxfHKrPN9rdA5 X-Gm-Gg: ATEYQzz83dTkzLKaYP9OSWs9zMPVp/zA+JA8cMraUNtgNwjlUYXeRDBemo9ePvuaWga cKEQMQV1vBrtwBm1gQwKdPUyOVSodQEztc1yey8+wfM0XQ6dgoCCi/fy4tZZ3rc2pE9mf8gIlld wo6ryAZnXzBIVF1B56hBVOQwmjivUfKr6LtCaSz60TvPDsL+e0cn5cp+HUUhlUgLGz5/YgihG9n 60F6AGUMLKjqSuuLYOLYIndbPJ2uL8mAgG/6dA19s3F68LV4sgSlYggAN+ScYVZjwT9NR7fOUQn FNa/yTc5Ru09V1zund7Nw/aY1BOe35iyMLPgwj30+6C3mfsBGE6XcUWqQWvjRO5wsekwEhd+Vrs KNWVPhpl/KBjs/owoQ2WLNbUsgnLLGfGJUvZfeFYo1vgxsYbMbdl2ltf35KQvmC3eA66oevrdI/ C0pe8N1XnBPd1w5JCotGCaHbdK3h1B584ZygFJwBZd/w5a X-Received: by 2002:a17:90b:52:b0:35b:9d0c:a2f3 with SMTP id 98e67ed59e1d1-35bb9a41281mr1478191a91.15.1773801764524; Tue, 17 Mar 2026 19:42:44 -0700 (PDT) From: Jim Shu To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Jim Shu , Max Chou Subject: [PATCH] target/riscv: Fix scountovf CSR behavior in VS-mode and M-mode Date: Wed, 18 Mar 2026 10:42:34 +0800 Message-ID: <20260318024234.2772480-1-jim.shu@sifive.com> X-Mailer: git-send-email 2.43.0 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::102b; envelope-from=jim.shu@sifive.com; helo=mail-pj1-x102b.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: qemu development 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: 1773801822118154100 Content-Type: text/plain; charset="utf-8" From Sscofpmf spec [1]: - In M-mode, scountovf bit X is always readable. - in VS mode, scountovf bit X is readable when mcounteren bit X and hcounteren bit X are both set, and otherwise reads as zero. [1] https://github.com/riscv/riscv-isa-manual/blob/main/src/sscofpmf.adoc Signed-off-by: Jim Shu Signed-off-by: Max Chou Reviewed-by: Alistair Francis --- target/riscv/csr.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 5064483917..a75281539b 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -1599,6 +1599,7 @@ static RISCVException read_scountovf(CPURISCVState *e= nv, int csrno, int mhpmevt_start =3D CSR_MHPMEVENT3 - CSR_MCOUNTINHIBIT; int i; *val =3D 0; + bool virt =3D env->virt_enabled; =20 /* Virtualize scountovf for counter delegation */ if (riscv_cpu_cfg(env)->ext_sscofpmf && @@ -1609,8 +1610,19 @@ static RISCVException read_scountovf(CPURISCVState *= env, int csrno, } =20 for (i =3D mhpmevt_start; i < RV_MAX_MHPMEVENTS; i++) { - if ((get_field(env->mcounteren, BIT(i))) && - (env->mhpmevent_val[i] & MHPMEVENT_BIT_OF)) { + if (env->priv < PRV_M) { + if (!get_field(env->mcounteren, BIT(i))) { + /* no mcounteren in S/HS-mode */ + continue; + } + + if (virt && !get_field(env->hcounteren, BIT(i))) { + /* no hcounteren in VS-mode */ + continue; + } + } + + if (env->mhpmevent_val[i] & MHPMEVENT_BIT_OF) { *val |=3D BIT(i); } } --=20 2.43.0