From nobody Sat May 2 08:18:55 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=1751628013; cv=none; d=zohomail.com; s=zohoarc; b=Z+HdzGrGHokX3epUfsH2VGFdtCc1c53jpCTN9jU5g411kfQLx1CR8kCPBUWZsZaz6B48P9gyyt0pDGL86cXehoP4nrRpGz1WnGWuaLdtb3EWuLaFqk3taHlUuLfy8GSPGT9KrpeR8OMt0LsCY1Mdn8hx4Jmf7S+2NZgRRgnN9Qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751628013; 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=ONjmGA/ciZhqBcIWB+pcuvZnH4RBOoReODO2aO4hpOQ=; b=AmkMKgIa2fdGlhLcBlbl+eadKnwVcBAOWfoMRYckKR5KoSn019bPsuF0UEh25i4M2DPtblDrUyi65++id8fAYPLfV5SjF+ugdWuuKGZZZwNnvGK6gNY4/+Zx7WPn1AcXAcmIZ9/SNheAZsfaPBhZejZcy4xfk0MNbuGOBoJL7Bk= 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 175162801366298.84324059240623; Fri, 4 Jul 2025 04:20:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXeOH-0007ex-1o; Fri, 04 Jul 2025 07:15:37 -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 1uXeN7-0004w7-I5 for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:14:26 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXeN5-0004O2-Mi for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:14:25 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-234f17910d8so7527465ad.3 for ; Fri, 04 Jul 2025 04:14:23 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c8431a206sm18002655ad.28.2025.07.04.04.14.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 04:14:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751627662; x=1752232462; 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=ONjmGA/ciZhqBcIWB+pcuvZnH4RBOoReODO2aO4hpOQ=; b=D20cpfIcBExfpHU4SEeKFm0LNOe0PcPacNqutXH3FRcLCyGuLSLJZdbaFp/WdE7IGP I2qSmxn8xLyX/evLzKmOcHeiMqfvXOrhr73QuN9koZ3sphx1Cje86XkLjyTkfmW3r6dZ fxvQlSKxW2uP0Utir7pI/VWYQRLRdmvmLxLrSjCbNgIPiOjv0PJZYyfvd+1e/PoYTDOd JdWsY64gdZT/Q2p8mwfGE6+aD3Wpv2Bb20drmdgT1lWLH7VzxfYzMHaQ/y7WxDAV7K3/ Z1T3ZMyStMuyylMj++ktV4MyTHOT1ay5IhcnUqlZkq1H1S3lPWUGL1HNnOyvLZWmg40s WhXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751627662; x=1752232462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ONjmGA/ciZhqBcIWB+pcuvZnH4RBOoReODO2aO4hpOQ=; b=GqY35zKp0UTiVV1IJ7SZ6fJs4PGShtrD2k/ZgQvyOZoq5+o8S82pZoOQmbWNrXYXlm hkqq2spGcJ445fLfeaGAiyfZT2olFdWLoA+rC/7BZW0ZqQN2woqQOdDkXIZU/CjDhy8y OPszhfZaInXZmkS2LCbXdd1N0isS11XqgJxgGcx8in7bLCL5G6m9XXV9eo7IGx65qVTL vR7uXg1/2IhgS/QdGEBqsfAcMGIZTEJ5tm+cne4b7X792CvbcOIzJ3wK8ISMxwtXV65a lR1E7gwOZkPe3kElUm7+dgXnIL2e1tp8zh4SUD7na46Et+33BdLOeBlDmfh93qJ5i385 /lLA== X-Gm-Message-State: AOJu0YzNXskN/6bKaYa5lkPzhsaB0LU+Q6UlQ/BCM2OCuGGi+gbJOzzC 7dmY0m4DQNz5VT6L5fwE4j/sW0EPaZSQEUTCB5TkPjVYwUOrL9WoR9DXbRJEyQ== X-Gm-Gg: ASbGncsJZtlEqdyrawVjE+UHjTGbO4iJv39AaJwzBcrL5k7Vj1UFk6/ZoHGUR/uKTqk qmYim+YCEMYqiz1jPi/jtv9BboqRsfsbsOK2WKGsO63E8//lgt6Cjzp3vZDA54wTQS3hrV+YQSQ S6miFd646ryVoCQo7B4enbcAEUoTtud0OsPZ42baIBSkmfi2FkFlTRDEneFRlhpPujOIzjZHNdB rsimKLA52xZ6JCYyXjqKgkedxUGTlQQVv9Rf4c/vAC8dljsWPnlqpUv2ZRF9ORbsujMRZ6FvpdE A56aI7Fr/duzb0pKPgcnbEdjkaFOGPIWXzen1Jfro0kTVnBqHO37NsQyWiijtC1nXQ/VYOftTUy nWoYJoZWsu0LSIf4OtSuCiG0pspRTMBbzCKIjoOc4vrl6iyY1FMbStiZTesCgA6/qoVY= X-Google-Smtp-Source: AGHT+IGJ43Dtnc88RzA7Q+cI8EGrxx2rdkV506T0e7Cb4gnxSyairFv6cTrghVTaZU2TI1jn5unaSQ== X-Received: by 2002:a17:903:13ce:b0:234:f6ba:e681 with SMTP id d9443c01a7336-23c8606b87emr37720535ad.5.1751627661984; Fri, 04 Jul 2025 04:14:21 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Charalampos Mitrodimas , Alistair Francis , Daniel Henrique Barboza Subject: [PULL 37/40] target/riscv: Fix MEPC/SEPC bit masking for IALIGN Date: Fri, 4 Jul 2025 21:12:04 +1000 Message-ID: <20250704111207.591994-38-alistair.francis@wdc.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704111207.591994-1-alistair.francis@wdc.com> References: <20250704111207.591994-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::634; envelope-from=alistair23@gmail.com; helo=mail-pl1-x634.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: 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: 1751628014180116600 Content-Type: text/plain; charset="utf-8" From: Charalampos Mitrodimas According to the RISC-V Privileged Architecture specification, the low bit of MEPC/SEPC must always be zero. When IALIGN=3D32, the two low bits must be zero. This commit fixes the behavior of MEPC/SEPC CSR reads and writes, and the implicit reads by MRET/SRET instructions to properly mask the lowest bit(s) based on whether the C extension is enabled: - When C extension is enabled (IALIGN=3D16): mask bit 0 - When C extension is disabled (IALIGN=3D32): mask bits [1:0] Previously, when vectored mode bits from STVEC (which sets bit 0 for vectored mode) were written to MEPC, the bits would not be cleared correctly, causing incorrect behavior on MRET. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2855 Signed-off-by: Charalampos Mitrodimas Reviewed-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza Message-ID: <20250703182157.281320-2-charmitro@posteo.net> Signed-off-by: Alistair Francis --- target/riscv/internals.h | 11 +++++++++++ target/riscv/csr.c | 8 ++++---- target/riscv/op_helper.c | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index 9686bb6208..172296f12e 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -158,6 +158,17 @@ static inline float16 check_nanbox_bf16(CPURISCVState = *env, uint64_t f) } } =20 +static inline target_ulong get_xepc_mask(CPURISCVState *env) +{ + /* When IALIGN=3D32, both low bits must be zero. + * When IALIGN=3D16 (has C extension), only bit 0 must be zero. */ + if (riscv_has_ext(env, RVC)) { + return ~(target_ulong)1; + } else { + return ~(target_ulong)3; + } +} + #ifndef CONFIG_USER_ONLY /* Our implementation of SysemuCPUOps::has_work */ bool riscv_cpu_has_work(CPUState *cs); diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 6296ecd1e1..8631be97c5 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3129,14 +3129,14 @@ static RISCVException write_mscratch(CPURISCVState = *env, int csrno, static RISCVException read_mepc(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->mepc; + *val =3D env->mepc & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 static RISCVException write_mepc(CPURISCVState *env, int csrno, target_ulong val, uintptr_t ra) { - env->mepc =3D val; + env->mepc =3D val & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 @@ -4169,14 +4169,14 @@ static RISCVException write_sscratch(CPURISCVState = *env, int csrno, static RISCVException read_sepc(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->sepc; + *val =3D env->sepc & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 static RISCVException write_sepc(CPURISCVState *env, int csrno, target_ulong val, uintptr_t ra) { - env->sepc =3D val; + env->sepc =3D val & get_xepc_mask(env); return RISCV_EXCP_NONE; } =20 diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 557807ba4b..15460bf84b 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -280,7 +280,7 @@ target_ulong helper_sret(CPURISCVState *env) riscv_raise_exception(env, RISCV_EXCP_ILLEGAL_INST, GETPC()); } =20 - target_ulong retpc =3D env->sepc; + target_ulong retpc =3D env->sepc & get_xepc_mask(env); if (!riscv_cpu_allow_16bit_insn(&env_archcpu(env)->cfg, env->priv_ver, env->misa_ext) && (retpc & 0x3)) { @@ -391,7 +391,7 @@ static target_ulong ssdbltrp_mxret(CPURISCVState *env, = target_ulong mstatus, =20 target_ulong helper_mret(CPURISCVState *env) { - target_ulong retpc =3D env->mepc; + target_ulong retpc =3D env->mepc & get_xepc_mask(env); uint64_t mstatus =3D env->mstatus; target_ulong prev_priv =3D get_field(mstatus, MSTATUS_MPP); =20 --=20 2.50.0