From nobody Sat Apr 11 18:38:02 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=1775755620; cv=none; d=zohomail.com; s=zohoarc; b=jLscirsPG1HP469VLiBi4xL6cYwjBNKvdEL5sB5xs0I3VIgIW2LolVb95OdLMXHqSgTU1K2FjYwSDN0ZRw4UL/lok1NXivJSZws+mkLKFEVW2PyIbRURCvpIV6oHKyz9meC76MUMUjz6/Qi/Zx7y9LYawOYjs+36QK1nVuH17yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775755620; 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=4uNRjVzBrfQNBjxA8Suax0mc4RuGUSF8x1sHTO0A3nY=; b=l/G+4uL6FLELMcUsSnBFYU8x06PZ94SAXs5a6natbJyQ7lurEHLWwi6XAmlS7NIk6h2wMIGFcwYSIR8EFnIhv9lrhoyOHPsJM8yDMnJMXGAvFVk/bFU1rEYNwHclLhsZWRYGtywJtwa6QC2ASFItk4tUuHbnFVYcO1T1SfjZ2b4= 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 (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1775755620096423.7757403144783; Thu, 9 Apr 2026 10:27:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wAt9C-0008R9-PQ; Thu, 09 Apr 2026 13:26:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wArho-0000Ob-6v for qemu-devel@nongnu.org; Thu, 09 Apr 2026 11:54:08 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wArhm-0001Zh-R0 for qemu-devel@nongnu.org; Thu, 09 Apr 2026 11:54:07 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43cf73bbfbdso660560f8f.1 for ; Thu, 09 Apr 2026 08:54:06 -0700 (PDT) Received: from ninolomata-AERO-15-KC.. (89-181-36-85.net.novis.pt. [89.181.36.85]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e2c5468sm67259292f8f.13.2026.04.09.08.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 08:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775750045; x=1776354845; 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=4uNRjVzBrfQNBjxA8Suax0mc4RuGUSF8x1sHTO0A3nY=; b=KbvZJwFOURByk9ME58wsPt6iV36LaKvgpsKikptm+v69i1eREDyMHBnIesCW+VDf99 qgFaSQyp33TIcxaVmWoClHII/LZ4V0ASP+Zh5hK2NDocMixgxEO+XsgivwH/MTyKHL1l cDOXZ1CWh8po6Ngl7kk3SZYMhQFq5LIfDalDRVEsI8nE1QdS7NCJsAM3bHAewL/PoMTO Ysr1aUmtFFVDdSKvJvx/6zmo3eJ410+kW+4tpsdbALGPCfu4cc4n/kbcAca121QNBNnn KlR38xtnGTVx10SFKRTKYIGEYEtre+SIuJ/hxbki38QHvyS6P838Lmcq/9Vhx+QMCMeL uMYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775750045; x=1776354845; 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=4uNRjVzBrfQNBjxA8Suax0mc4RuGUSF8x1sHTO0A3nY=; b=NG+Papdo/YSaHtBPSMIdDAqaEA2Uhnxr9/ujmcQC0NMueZZWnkCLe8pBhVg8uvx7+S r3kFDKFHijzvsksAKuT8febU52kEPqA3G2rUne3bRO2iWf4kHBsXpB3vHqKno45Br+8s ACB/5SZBo9yP1gfLMctTztau6a42n6gJPeTkJBU8QnLk1uVyIc2erBxHY4m4Xt1o81v2 yXxkUGfF08NKlYys2rKU0hTh9ATiPPT9UTczOVkCwC2qZmSoBCQ6x7dSFcMn15dqPd8C EiAueFb0VButvXDni5c50CvMsJjYgWQ/hOXIo9lqUexPVXTuWbXYzPQigK5aP3AjV1ZB xdKQ== X-Gm-Message-State: AOJu0YwSDILslu/OOswogJ6QMNQWzKOio7cXjhAP4258BBTdBUH2vDKu AbM9LC/Ou6zBoGF4JYeQbBYyrY3HaT2y2OxWI6d4qTdSZY+z2WXmfzy5L986mUGu+yY9YQ== X-Gm-Gg: AeBDievPgYqJljTia4Cl31L3pBqOF5j/A8AIK7b7eUP5UgSBjb0n9KHW3NXc76lq266 wE+SYxmKz4y57PM/OXv5X1/wnaTh0SBVpQXfSORMDiiKyyaH9uOLCZF6Cz8Gce+HQViT0aWz4k0 pmjbAcuXdnOZj8Cr1a6d3nFzGbGKo35gKCag2Z3IkTL2SOJ9jGxI1EUQ0wTOzmhW4ueneQYQaHi ykiOHO2g/BswNFr73ukcnvElpHOjaolj+irMJKvWlfSo43o17QlfKC1KvBTwETi9LKELWBtEQ9K bXar+aBllI9yd3R4utxKvSY5v1wuHRghFOqdq0oom9l1Kcf1pG48mDUg52BbXspFTD8RsjZo92x eAIn+NlMkr1RNsg8uHEKw2n6bm6sl/VwbsyN6dhMvBnfUVzUef+MCB5+XvnCUPWV96aBiHOpgV/ M62FRpSytB9r1ufI8ExuAXR8f2s3P5fGrJ2SRoW4L54l4H5e2TKLazQTnm3Aa31y180cOP X-Received: by 2002:a05:6000:228a:b0:43d:4e2e:368b with SMTP id ffacd0b85a97d-43d5a1a28e0mr5380211f8f.40.1775750044995; Thu, 09 Apr 2026 08:54:04 -0700 (PDT) From: Bruno Sa To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, Bruno Sa Subject: [PATCH 1/2] target/riscv: preserve RV32 henvcfgh on henvcfg writes Date: Thu, 9 Apr 2026 16:53:42 +0100 Message-ID: <20260409155344.2849233-2-bruno.vilaca.sa@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260409155344.2849233-1-bruno.vilaca.sa@gmail.com> References: <20260409155344.2849233-1-bruno.vilaca.sa@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 client-ip=2a00:1450:4864:20::42a; envelope-from=bruno.vilaca.sa@gmail.com; helo=mail-wr1-x42a.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=unavailable autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 09 Apr 2026 13:26:29 -0400 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: 1775755621827158500 Content-Type: text/plain; charset="utf-8" On RV32, STCE/ADUE/PBMTE/DTE are implemented in henvcfgh. A write to henvcfg should therefore only update the low 32 bits of env->henvcfg. The current write_henvcfg() path overwrites env->henvcfg with the low-half value and clears any bits previously written via henvcfgh. Preserve the upper 32 bits on RV32 henvcfg writes and keep the existing RV64 behaviour unchanged. Signed-off-by: Bruno Sa Reviewed-by: Alistair Francis --- target/riscv/csr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 7948188356..d322bdbd47 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3326,7 +3326,15 @@ static RISCVException write_henvcfg(CPURISCVState *e= nv, int csrno, } } =20 - env->henvcfg =3D val & mask; + if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { + /* + * RV32 stores STCE/ADUE/PBMTE/DTE in henvcfgh, so a low-half henv= cfg + * write must not clobber the upper 32 bits. + */ + env->henvcfg =3D (env->henvcfg & ~0xFFFFFFFFULL) | (val & mask); + } else { + env->henvcfg =3D val & mask; + } if ((env->henvcfg & HENVCFG_DTE) =3D=3D 0) { env->vsstatus &=3D ~MSTATUS_SDT; } --=20 2.43.0