From nobody Sun Mar 22 15:45:18 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773962865; cv=none; d=zohomail.com; s=zohoarc; b=JsR4n/hbCpqlsIlsEuf2y3d9pdVWZEuVf9osxoMOcvUvf+j0ziXgKWofcXx4xBusw2a39FExlCA/rG77JOxoj8nfFkz1Od617ftp1cnX7gmvZRqDidXsUmUOFHD3PDFXSyeRqqmgy+O/PP0L2LGMAmDd1qlJy0kkDHUth1RPekQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773962865; 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=RYB7pnWPDF09kxM2pVeCxMznDuYzQx/e50Ubr54oZJY=; b=aBIsu89xDYEeDMlf3NHxTrv+bcFSBe0RM0ZKDTaEW445yKh27dgMKPTZB/WuLile/koV+NWGvAeeHCtBuo9kGnL8aPhPr2sGc9OfaMBq1Kd2UX0Vmk6yVRxTgJAEU3TiN950JoxJqyT2rd36vrpIm2llTu6vPr6WpFti6Hyy63w= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773962865354270.73003574230734; Thu, 19 Mar 2026 16:27:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3MlV-00020j-9D; Thu, 19 Mar 2026 19:26:59 -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 1w3MlD-0001Rl-1O for qemu-devel@nongnu.org; Thu, 19 Mar 2026 19:26:39 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3MlB-0007jI-7q for qemu-devel@nongnu.org; Thu, 19 Mar 2026 19:26:38 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2adff872068so274745ad.1 for ; Thu, 19 Mar 2026 16:26:34 -0700 (PDT) Received: from toolbx.alistair23.me ([2403:581e:fdf9:0:6209:4521:6813:45b7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b083516ae1sm2979165ad.13.2026.03.19.16.26.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 16:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773962793; x=1774567593; 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=RYB7pnWPDF09kxM2pVeCxMznDuYzQx/e50Ubr54oZJY=; b=XLpZJGAEdls4o7FiLQKpDqhaTrzTxJWVbLTmscYyW/Iv/dCCAN+hxa6IDk45lFVE0Z hCkhlXmvSympn1Z8M0g+d3zXMQDiq5v19OE5rChvvLRVt4sLr8hjBznqqM681tiR4imZ GXSe7/d1ilDKzLJ2R0RhDdT62QuVphMTPleSjmyiMVmwmOUMy57YXkOdwId94kVg7eU3 tTW+lwlb0vmkvhHzzF+NGXv2nUrN5gZ2waoWeyjqwvXUTDY0KSSv8EGlygG+nM8T3Qm3 k1VQFFW9j1evhV7MauUtGgQQVNE1CSr8bu1k6MOMVnZjrY8VcHtotxGpCanG8/VlCDVk +o+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773962793; x=1774567593; 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=RYB7pnWPDF09kxM2pVeCxMznDuYzQx/e50Ubr54oZJY=; b=TehzG2OFDkbvI0qOSB3Vsab3v/dLdNQQVIHyVKZNrjr3Eb4VtsTtROVTweBVEm1/Er nmfSgRXq3MqTp7n/BpyXjjQ6AalnJ5yNOmQETfc+woXm42teM4wpq/i01rPso5LZUjWW QUHYhtxWyvVVO/i4VLFN8s+sFyJC5vuBmFTn2r6TPS+oS/FwR0+T1c9KutcznoUwDW5M bQax6GvTWtegkJlY9bntXrS/dRN22cTqjJojcOAddtC3JlgHbCCZHhMPvNz9hliA9I93 llW2NFnAdkJjNpMmDvcHh9L8VWO/gG6YLrLN/qDjHxleWe2Hr8TyYPwbX2VsCy4TNgfE s11g== X-Gm-Message-State: AOJu0YyDcdN1EOgAlWTWVNUNLvlSlHsEyFkCpohSl1ySXsedjlQwNUMN KW4ZQsl7hSCpl4z6LH/81Fa9UXshgWaau64Euvteyh8ThOL15I9tug1S3rOpEw== X-Gm-Gg: ATEYQzy1FQXCYMA9yPXYV1kWahD+0VTnlGm8Bzhu5hOo40VscNoGTJxI2vMjH6AsmOy JjNl3FQ4FwtVnq3INm5QKqVBZOrWDE5BLs+VYeAxB92Z7u6pnStkpr/8WaydqQC+ur0vuFNQOfQ 8dXkDvGOqEK9ZblIJ3TS4cc75NvuZJzhprptWFae3uuLpZ5hfNgDwSpCyVqWnXXYugtEgH8MTNJ gB8S7Z1JFVCsXv9itNWaL4VLk5BwCcGFnS/b0TNqFBD0jOC2Ubzg4MOsLu2gTXcLTKeY7rzfZ2M wFwORP+fXNdi6ut/udG05jRq1NK86rLc4B20JqG2SH/pUy9Tal8GaviXszoIUcl6pGXc8Bfkm04 JES4mul3J21iZnJmHx17zZ4wJdeoQ+aN5szvVwee44Q3ILtv7h+P5FJS+P1N+WuBi2hOqMpSA1C U5ipDT0XsmdUj+NeCB0ES1Eez/tP6ztWKJ0V9KtUGXgw== X-Received: by 2002:a17:902:dad1:b0:2ae:cb0e:fd5e with SMTP id d9443c01a7336-2b08275878cmr8524945ad.23.1773962793541; Thu, 19 Mar 2026 16:26:33 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Jim Shu , Max Chou , Alistair Francis Subject: [PULL 17/17] target/riscv: Fix scountovf CSR behavior in VS-mode and M-mode Date: Fri, 20 Mar 2026 09:25:22 +1000 Message-ID: <20260319232522.1867400-18-alistair.francis@wdc.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319232522.1867400-1-alistair.francis@wdc.com> References: <20260319232522.1867400-1-alistair.francis@wdc.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::62f; envelope-from=alistair23@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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: 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 @gmail.com) X-ZM-MESSAGEID: 1773962866460154100 Content-Type: text/plain; charset="utf-8" From: Jim Shu 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 Message-ID: <20260318024234.2772480-1-jim.shu@sifive.com> Signed-off-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.53.0