From nobody Sun Jul 26 11:50:57 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=1782375439; cv=none; d=zohomail.com; s=zohoarc; b=UruidBsdyLHh9Z5cGgNIoj02+xjjRbVpECe2GKpAH2doo+4C+a05Ay8jy+IdnIyAH9R6xR/5BxEeV4Aix3SjrzNNeRRyimY/J0y40nVomyFjIe6Y2oI7S2wlqBHLXgKoRLkZK7UDF0IQHoOv7zLEi+kpxitFSA1R6LcSQb51OG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782375439; 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=2o7sKN6n20YLRxgIgS5cX38Zxp20rf7inv0GaVmEH7A=; b=lRZ4R6ALPTtRFb+bbGNTW8QHtM6aS2z0n21hmTe+0tF5FLG+5O2KeaIL6tZs9ou+pgcOY7oouXUrRZKyqsrwe3gp8BHdGf2MM7bHJpoLR8kDf4PqGhH1l1gGmkvb8yj8/+QL1KudxJz1YfgZe5RAr/An2wOlG7J6Ghr0NalEs+I= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782375439058661.6108622815365; Thu, 25 Jun 2026 01:17:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcfG8-0007Br-4o; Thu, 25 Jun 2026 04:16:28 -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 1wcfFh-00079y-GU for qemu-devel@nongnu.org; Thu, 25 Jun 2026 04:16:20 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wcfFf-0001e0-HQ for qemu-devel@nongnu.org; Thu, 25 Jun 2026 04:16:00 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-c892a0ef503so1097174a12.2 for ; Thu, 25 Jun 2026 01:15:58 -0700 (PDT) Received: from fedora ([61.74.238.173]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c92bc1e0d10sm1188683a12.21.2026.06.25.01.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 01:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782375357; x=1782980157; 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=2o7sKN6n20YLRxgIgS5cX38Zxp20rf7inv0GaVmEH7A=; b=ld9K9fG4irz9kDSyzyvCvvvM+yf0YNPpFoM1t4KweROEHnmrvwi5B9mEKNtRSvkf8d HUNRWfm+a733wEzYr7vR6El0NEnr5OcukXR1p24ynrPFCSB9RGdvYemdcbuns1Tx8lkK Hv/DNF+WlAwHBZM649WdLskwecKKAD/ekqfx6vv2pgihjIitXpvUs0yRqv2kXgzIQfAM 3GESnavij5qr3bzBJ/+rLn0DCwSCx2w/Jnxpkg672/J6FY+bXpgSe8B9040Vm8yWF1+C L1nawFnj0Udzmv73WcV9B9MHRC22e9nYyNNUNhBlSFlmfEK7SGidYrOy0NxzFzbuwcoi vJtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782375357; x=1782980157; 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=2o7sKN6n20YLRxgIgS5cX38Zxp20rf7inv0GaVmEH7A=; b=YEnTas0zPxaPBI7pFO4z3kjvS5FmmsWqbuUEJIQefN7pBeagBkFxxxeJJpluyJsut5 x/+0dqevwle1s8xL3yIg+7Qqocvf8pxZMFx0b7ffKaaQz2LGXnq4+JMDRr+h1/IxJO2o s9B0segtUZZgTVK7uPxgPSu2hNgXdC4+V/E0UHwuR+6Bfqy8qozTxWLSMEb8ZQ9jOIiY cUjxASD63drfX1nIc+qSrLvhGKAuTKYkwR8U8ppkiODhf09HIpEf4yplM8cJtRXPspM9 kONKOy/FVtrb3YyxnLOOyLe8EHbUrXH497yFsav45XIFwhaR3VO7HTnuPrT3iYCPs7wc 9FYg== X-Gm-Message-State: AOJu0YyOlH9QdE4BmDMimXp5hQ8IMlWa4KgbyoP/36Ikie8h93wrwSYC 7W0TEcAqVl1KnC2xNQ7BRNTvFlGdsI0a4yVE/rQok4v/0Xv2r4MobnyR4yHf/g== X-Gm-Gg: AfdE7cnxMLiY3rEv1hZcZe0mNrWeJ8v+sN+anP4yUSuF+px6fbaLmoHDCXFYiwcHIg1 NeQeRGC5cuZEglhz8ILQDkK05CA9LstKs4DWwe1iUl6X4+kIu490j14ptXWSpHf2q2QQRM/3F4t 0RHjbsl7JoTEcy09LtD5MivF/BZ/8PmAZoV+JQGiuvNueBnKkLCUyArvB0cGYxXSOSmxQX+UO0K xWKgLtWRIk4iQ6kM+mCo49/ugDM11CFwTRhzkZIkxJWkUCO67T6mSEvRheNItgyyTzLYlaBB0Un Uk+OSgZhvDBD2KGXEcpt4nzJwGLvpqqPgxpMEKntcdaPv6Mr2OT3D9npqMJB4OWOQdyTGBP1mnH qQjlNzjtWCN9+y03xSltNW10RZ5RiTktQtagshz3QLDulyxw5JVzZHtESR7HRr/pv9Ewyz6elgL nrPEsaBMc5CsTJk1vd68hxU8vgB7XVaDBYrU3K X-Received: by 2002:a05:6a21:8cc7:b0:3bb:21ad:40d8 with SMTP id adf61e73a8af0-3bd4afac2acmr1982946637.39.1782375356831; Thu, 25 Jun 2026 01:15:56 -0700 (PDT) From: SeungJu Cheon To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, SeungJu Cheon Subject: [PATCH v2] target/riscv: Apply UXL WARL handling to vsstatus Date: Thu, 25 Jun 2026 17:15:21 +0900 Message-ID: <20260625081521.595683-1-suunj1331@gmail.com> X-Mailer: git-send-email 2.52.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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=suunj1331@gmail.com; helo=mail-pg1-x534.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: 1782375441457158500 Content-Type: text/plain; charset="utf-8" write_mstatus() already handles the reserved UXL value by writing a legal value instead. Apply the same handling when writing vsstatus so that reserved UXL values follow the same WARL behavior. Factor the common logic into a local helper riscv_write_uxl() and use it for both mstatus and vsstatus. Suggested-by: Daniel Henrique Barboza Fixes: f310df58bd2 ("target/riscv: Enable uxl field write") Signed-off-by: SeungJu Cheon Reviewed-by: Daniel Henrique Barboza --- target/riscv/csr.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index dd9726fcf4..12f1ce5180 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -2012,6 +2012,20 @@ static target_ulong legalize_mpp(CPURISCVState *env,= target_ulong old_mpp, return val; } =20 +static uint64_t riscv_write_uxl(CPURISCVState *env, uint64_t val, + uint64_t field) +{ + RISCVMXL xl =3D riscv_cpu_mxl(env); + uint64_t uxl =3D get_field(val, field); + + if (uxl =3D=3D MXL_RV128) { + uxl =3D xl =3D=3D MXL_RV128 ? MXL_RV64 : xl; + val =3D set_field(val, field, uxl); + } + + return val; +} + static RISCVException write_mstatus(CPURISCVState *env, int csrno, target_ulong val, uintptr_t ra) { @@ -2058,17 +2072,8 @@ static RISCVException write_mstatus(CPURISCVState *e= nv, int csrno, =20 if (xl !=3D MXL_RV32 || env->debugger) { if ((val & MSTATUS64_UXL) !=3D 0) { - uint64_t uxl =3D val & MSTATUS64_UXL >> 32; mask |=3D MSTATUS64_UXL; - - /* - * uxl =3D 3 is reserved so write the current xl instead. - * In case xl =3D MXL_RV128 (3) write MXL_RV64. - */ - if (uxl =3D=3D 3) { - uxl =3D xl =3D=3D MXL_RV128 ? MXL_RV64 : xl; - val =3D deposit64(val, 32, 2, uxl); - } + val =3D riscv_write_uxl(env, val, MSTATUS64_UXL); } } =20 @@ -5226,6 +5231,8 @@ static RISCVException write_vsstatus(CPURISCVState *e= nv, int csrno, uint64_t mask =3D (target_ulong)-1; if ((val & VSSTATUS64_UXL) =3D=3D 0) { mask &=3D ~VSSTATUS64_UXL; + } else { + val =3D riscv_write_uxl(env, val, VSSTATUS64_UXL); } if ((env->henvcfg & HENVCFG_DTE)) { if ((val & SSTATUS_SDT) !=3D 0) { --=20 2.52.0