From nobody Mon Feb 9 09:16:11 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=1766082875; cv=none; d=zohomail.com; s=zohoarc; b=S8IHp9QUvAivYsbk1Yg1kYgg8eBcho5LsWS85XxyOgzKHMVsZwR4hHwUMMG0an/9PBRa06XD5itJzRokhYQMhKZbq53eEcHMCfEgYEBCIjgrQFxt5hgPIFIRM4zAHukrccqbthSXQXNwD3knz/Q1m3ZSEdP3tI3cJzVN7VeHuGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766082875; 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=bvdG33TRWp8WNQPzYXmaerPpkmBvUESr5mSsOVtQ4Q8=; b=UnAC4oiFScLlbipCRiITctfZxS9pnEKvPlm5fjW3A5MjSEzKBa4nH9D1fJCV9XeapRi4gJw3GPUXrjsw5MVTMemfYCIp8TVcofvbgypipUNdCogcMqGu3pGDQNDY1DgAGKmGko2loBUOa9PaGcEnaxoLbLCpoShF9pyzSdpSk38= 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 176608287520872.85689021737699; Thu, 18 Dec 2025 10:34:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vWIo7-0003x5-NF; Thu, 18 Dec 2025 13:32:59 -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 1vWImz-0003mY-3O for qemu-devel@nongnu.org; Thu, 18 Dec 2025 13:31:49 -0500 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vWImx-0007LQ-6E for qemu-devel@nongnu.org; Thu, 18 Dec 2025 13:31:48 -0500 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-59577c4c7c1so1742053e87.1 for ; Thu, 18 Dec 2025 10:31:46 -0800 (PST) Received: from NB-8855.Dlink ([81.201.19.27]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59a185dd229sm46777e87.22.2025.12.18.10.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 10:31:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766082705; x=1766687505; 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=bvdG33TRWp8WNQPzYXmaerPpkmBvUESr5mSsOVtQ4Q8=; b=BuLzkFvwzDkO+rKme4VWoYYghrwHYh0nsrrwPp+YhneQ5Z86FTvg2FI+NYBBfykawS tM0gFN5ZIxHzOAMDqPapwbHNvBfr2QYdAhWOEaEc2YPWsIgPal/RQtsZijISpkM7Z//p OCt/xziRh4IEx7+MhfM7mysqS7y+TCtzDUqL8silsHtBG40ZW5MEhgtNUheB1BthMQYJ GhfNsJ5xAl3szc7EAzZXuHZtoXm2m74mPdEvMMCxpSdmGQm/zOism+tNZ3Y5dWuU9LIX dm26OmL7eO+/XrDeTxwfhaAcFazGbSRsqmySqmgBLep0hBEsSKH+Xo3EkY41UmqSDmsa F63A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766082705; x=1766687505; 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=bvdG33TRWp8WNQPzYXmaerPpkmBvUESr5mSsOVtQ4Q8=; b=pDC0huw1ssAvHwGEYNKZe/XT38y0tCNsamM6+gjbQMVPVyHZMbCd7bNKndoDSCRV+S bJv8KIO/U35vDjMJJaKBXZoZ6w2bLpBbaYNUly6Yn8ePIZCpEjNuqwFStAbET/4qric/ RnNhlC50JW+5nTeD3QjDrjzma90KVzIx5KF6icGSF54eqKADCDxqmfeOFEo6gMcb0d9H et7R6y5kmEN9OSZkUtJ2yfz8l6Iuc51iSTlwu6wY/uGANceUKVKZY1ZuI2jXR8ew+hjm FcBZF4XZHDmTF8WZU4aXPUMY0dBwLekgqVqZopXd1eirWX7bYtXi9lzB2NaUisT8v9Sn kkwA== X-Gm-Message-State: AOJu0Yx75gtKqsKK6S20070LlYowoR6SqHF64RsT7npEyfhyBO7J6z8t bFOnbJ125MeOE58pq4CkWFvAQcmBg22RmuHYKGITFSFAY62r/K4DM4jFD/uLaf9z X-Gm-Gg: AY/fxX6uY8zCMT8xviYrT3AW3Lyy8lLMLI7X8E+Ya2Re1Oy4Y8m5rpFpCmtDEKhxc/X MTkTwKSO8tIgjkD758WUMIIcLZcTR3POFmD0wLdpqIwfUxFHauwi+MukKYBzp/X4pAR22c5HJ/P i6e9yeO1S1r4LajGApZhVeoSiC/Qhxmg81ZUva2opce/7MVCvwbH66KrqBz6kikmhsY+026jhJL aUyEO0yUtctp83cr4DCkbgVVGHGco8dTFjyL2G/ytJfe1O868IbfdburDGFvJT5pmTkukC9mcuX E2AipUhZDpRy6rdIwvM3fA+mdHPAgJNzIYTx4JUOg/m03RgHPP2+OzWj15EQKvycJF42L9ZJFHY 0GuGkUcNY99kXUioP43TDZ76FrWe5RHuQu63rEIc7aoGukhubbXXh5kEitHOidwAdlmOeBMsu4k KBqUM22Aht36PL X-Google-Smtp-Source: AGHT+IEBB/Rsoe4o74O4RaCcS/gINOdKEL5eskNgr6M0dfB3klPawtUMVkEz7op//XGHFJr55NW45g== X-Received: by 2002:a05:6512:3d9e:b0:595:7d7c:59a9 with SMTP id 2adb3069b0e04-59a17d6bb20mr161845e87.22.1766082704953; Thu, 18 Dec 2025 10:31:44 -0800 (PST) From: Aleksandr Sergeev To: qemu-devel@nongnu.org Cc: halip0503@gmail.com, Aleksandr Sergeev Subject: [RFC PATCH 2/6] target/riscv: Reimplement Smcdeleg/Ssccfg via read_*, write_* methods Date: Thu, 18 Dec 2025 21:31:17 +0300 Message-ID: <20251218183122.408690-3-sergeev0xef@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251218183122.408690-1-sergeev0xef@gmail.com> References: <20251218183122.408690-1-sergeev0xef@gmail.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 (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=2a00:1450:4864:20::129; envelope-from=sergeev0xef@gmail.com; helo=mail-lf1-x129.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, 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-Mailman-Approved-At: Thu, 18 Dec 2025 13:32:41 -0500 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 @gmail.com) X-ZM-MESSAGEID: 1766082896993158500 Content-Type: text/plain; charset="utf-8" Methods rmw_cd_mhpmcounter(), rmw_cd_mhpmcounterh(), rmw_cd_mhpmevent(), rmw_cd_mhpmeventh(), rmw_cd_ctr_cfg(), rmw_cd_ctr_cfgh() contain the same code as read_hmpcounter(), write_mhpmcounter(), etc. To avoid the same logic being implemented twice, lets re-call methods from one another. Signed-off-by: Aleksandr Sergeev Reviewed-by: Alexei Filippov --- target/riscv/csr.c | 80 +++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 58 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 8bdbc71160..81475ec9a3 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -1419,9 +1419,9 @@ static int rmw_cd_mhpmcounter(CPURISCVState *env, int= ctr_idx, } =20 if (!wr_mask && val) { - riscv_pmu_read_ctr(env, val, false, ctr_idx); + read_hpmcounter(env, CSR_MCYCLE + ctr_idx, val); } else if (wr_mask) { - riscv_pmu_write_ctr(env, new_val, ctr_idx); + write_mhpmcounter(env, CSR_MCYCLE + ctr_idx, new_val, 0); } else { return -EINVAL; } @@ -1438,9 +1438,9 @@ static int rmw_cd_mhpmcounterh(CPURISCVState *env, in= t ctr_idx, } =20 if (!wr_mask && val) { - riscv_pmu_read_ctr(env, val, true, ctr_idx); + read_hpmcounterh(env, CSR_MCYCLEH + ctr_idx, val); } else if (wr_mask) { - riscv_pmu_write_ctrh(env, new_val, ctr_idx); + write_mhpmcounterh(env, CSR_MCYCLEH + ctr_idx, new_val, 0); } else { return -EINVAL; } @@ -1448,31 +1448,18 @@ static int rmw_cd_mhpmcounterh(CPURISCVState *env, = int ctr_idx, return 0; } =20 -static int rmw_cd_mhpmevent(CPURISCVState *env, int evt_index, +static int rmw_cd_mhpmevent(CPURISCVState *env, int ctr_idx, target_ulong *val, target_ulong new_val, target_ulong wr_mask) { - uint64_t mhpmevt_val =3D new_val; - if (wr_mask !=3D 0 && wr_mask !=3D -1) { return -EINVAL; } =20 if (!wr_mask && val) { - *val =3D env->mhpmevent_val[evt_index]; - if (riscv_cpu_cfg(env)->ext_sscofpmf) { - *val &=3D ~MHPMEVENT_BIT_MINH; - } + read_mhpmevent(env, ctr_idx - 3 + CSR_MHPMEVENT3, val); } else if (wr_mask) { - wr_mask &=3D ~MHPMEVENT_BIT_MINH; - mhpmevt_val =3D (new_val & wr_mask) | - (env->mhpmevent_val[evt_index] & ~wr_mask); - if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { - mhpmevt_val =3D mhpmevt_val | - ((uint64_t)env->mhpmeventh_val[evt_index] << 32); - } - env->mhpmevent_val[evt_index] =3D mhpmevt_val; - riscv_pmu_update_event_map(env, mhpmevt_val, evt_index); + write_mhpmevent(env, ctr_idx - 3 + CSR_MHPMEVENT3, new_val, 0); } else { return -EINVAL; } @@ -1480,29 +1467,18 @@ static int rmw_cd_mhpmevent(CPURISCVState *env, int= evt_index, return 0; } =20 -static int rmw_cd_mhpmeventh(CPURISCVState *env, int evt_index, +static int rmw_cd_mhpmeventh(CPURISCVState *env, int ctr_idx, target_ulong *val, target_ulong new_val, target_ulong wr_mask) { - uint64_t mhpmevth_val; - uint64_t mhpmevt_val =3D env->mhpmevent_val[evt_index]; - if (wr_mask !=3D 0 && wr_mask !=3D -1) { return -EINVAL; } =20 if (!wr_mask && val) { - *val =3D env->mhpmeventh_val[evt_index]; - if (riscv_cpu_cfg(env)->ext_sscofpmf) { - *val &=3D ~MHPMEVENTH_BIT_MINH; - } + read_mhpmeventh(env, ctr_idx - 3 + CSR_MHPMEVENT3H, val); } else if (wr_mask) { - wr_mask &=3D ~MHPMEVENTH_BIT_MINH; - env->mhpmeventh_val[evt_index] =3D - (new_val & wr_mask) | (env->mhpmeventh_val[evt_index] & ~wr_ma= sk); - mhpmevth_val =3D env->mhpmeventh_val[evt_index]; - mhpmevt_val =3D mhpmevt_val | (mhpmevth_val << 32); - riscv_pmu_update_event_map(env, mhpmevt_val, evt_index); + write_mhpmeventh(env, ctr_idx - 3 + CSR_MHPMEVENT3H, new_val, 0); } else { return -EINVAL; } @@ -1514,21 +1490,18 @@ static int rmw_cd_ctr_cfg(CPURISCVState *env, int c= fg_index, target_ulong *val, target_ulong new_val, target_ulong wr_mask) { switch (cfg_index) { - case 0: /* CYCLECFG */ + case HPM_MCYCLE_IDX: if (wr_mask) { - wr_mask &=3D ~MCYCLECFG_BIT_MINH; - env->mcyclecfg =3D (new_val & wr_mask) | (env->mcyclecfg & ~wr= _mask); + write_mcyclecfg(env, CSR_MCYCLE, new_val, 0); } else { - *val =3D env->mcyclecfg &=3D ~MHPMEVENTH_BIT_MINH; + read_mcyclecfg(env, CSR_MCYCLE, val); } break; - case 2: /* INSTRETCFG */ + case HPM_MINSTRET_IDX: if (wr_mask) { - wr_mask &=3D ~MINSTRETCFG_BIT_MINH; - env->minstretcfg =3D (new_val & wr_mask) | - (env->minstretcfg & ~wr_mask); + write_minstretcfg(env, CSR_MINSTRET, new_val, 0); } else { - *val =3D env->minstretcfg &=3D ~MHPMEVENTH_BIT_MINH; + read_minstretcfg(env, CSR_MINSTRET, val); } break; default: @@ -1540,28 +1513,19 @@ static int rmw_cd_ctr_cfg(CPURISCVState *env, int c= fg_index, target_ulong *val, static int rmw_cd_ctr_cfgh(CPURISCVState *env, int cfg_index, target_ulong= *val, target_ulong new_val, target_ulong wr_mask) { - - if (riscv_cpu_mxl(env) !=3D MXL_RV32) { - return RISCV_EXCP_ILLEGAL_INST; - } - switch (cfg_index) { - case 0: /* CYCLECFGH */ + case HPM_MCYCLE_IDX: if (wr_mask) { - wr_mask &=3D ~MCYCLECFGH_BIT_MINH; - env->mcyclecfgh =3D (new_val & wr_mask) | - (env->mcyclecfgh & ~wr_mask); + write_mcyclecfgh(env, CSR_MCYCLEH, new_val, 0); } else { - *val =3D env->mcyclecfgh; + read_mcyclecfgh(env, CSR_MCYCLEH, val); } break; - case 2: /* INSTRETCFGH */ + case HPM_MINSTRET_IDX: if (wr_mask) { - wr_mask &=3D ~MINSTRETCFGH_BIT_MINH; - env->minstretcfgh =3D (new_val & wr_mask) | - (env->minstretcfgh & ~wr_mask); + write_minstretcfgh(env, CSR_MINSTRETH, new_val, 0); } else { - *val =3D env->minstretcfgh; + read_minstretcfgh(env, CSR_MINSTRETH, val); } break; default: --=20 2.51.0