From nobody Tue Dec 16 17:04:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643999009462852.1642729764668; Fri, 4 Feb 2022 10:23:29 -0800 (PST) Received: from localhost ([::1]:51678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nG3F2-0000tt-3E for importer@patchew.org; Fri, 04 Feb 2022 13:23:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nG2g2-0002t2-5W for qemu-devel@nongnu.org; Fri, 04 Feb 2022 12:47:18 -0500 Received: from [2a00:1450:4864:20::42d] (port=45742 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nG2g0-0003jg-Ne for qemu-devel@nongnu.org; Fri, 04 Feb 2022 12:47:17 -0500 Received: by mail-wr1-x42d.google.com with SMTP id m14so12659684wrg.12 for ; Fri, 04 Feb 2022 09:47:16 -0800 (PST) Received: from localhost.localdomain ([122.167.157.188]) by smtp.gmail.com with ESMTPSA id f13sm11381876wmq.29.2022.02.04.09.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 09:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brainfault-org.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KFWdAc24R5bk/lz7ZOcbeThuxCwHiUHamVBHOFjNars=; b=pCW0HCmHe/BmNfrblSAjvA8mR6Z/pkledRmVDjmbfIpLGuf+Txk3ZwB7SyPrTUVimy wutwSKl24CXZlVs2oXudK5rmEzYTbBn9czgXlqhck2x8sKb+FN2PT7CdeM+ScvW0hxIZ PxJaLj8wZYSFclkwcOIJZ/xuxCbrmwismSOix1xYyYjtzvnP6aoK7zfdZQRN10iOkV8a BkBLPtDta1WeEJMsp6QQzoM0cuiQZBc0c6n4PhvKjCohwrb6HAo447zpVaR9xSvWn3Uw ukXDGIt4DlSdvFMwDAYT7sebsdLnYVL8+M3CVQYwbRnPddYoLDEwgYZG3YLeksBKi+hj rn+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KFWdAc24R5bk/lz7ZOcbeThuxCwHiUHamVBHOFjNars=; b=i/Eoaiu1nqOs6Sf+XShoHeGSwloklxi5mUMgIJo3w9JiZwsREJ5EsjZduNYwqtq9Ih UvipYPJ0ntDGBiPcoOJLuICcGVQI7mYrlYJMXWSYen+4ucIkaZB+XG+QEoQu564g1Uzx Fs/Yn9NyQNdkTLsGvBxv4PTAALihnKmZFGQ0Jz7sCBh59gN1AV7oo+CDojHDowMo7r0p C2q9GWH4tHQXNGENP026zjOW0dcm7H+sb09Ydzcmcdo9/6yl+3jH/xLXrJFUNJOreTtc cNDTg7KewOLMavR5e0rVYqY3gnzDwnyQXFOM5t60ovVo0BiBF/kjz4rgnCwnp7L01FWI XHMQ== X-Gm-Message-State: AOAM532v9JyFhWtjE9w1BXLWP2X+21KNWp7oV5q/YzvaKfIulhrMyrwd hnZ+cviVQ2zlPYLI1k2EHObTAw== X-Google-Smtp-Source: ABdhPJxC0AQUwvgOJut1U1gfJQ96umnXzR/RnXM8LfPetQ7GLlCMseKq6Ru4xr//VF7nCx33IY001A== X-Received: by 2002:a05:6000:16c8:: with SMTP id h8mr3333366wrf.693.1643996835388; Fri, 04 Feb 2022 09:47:15 -0800 (PST) From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH v9 01/23] target/riscv: Fix trap cause for RV32 HS-mode CSR access from RV64 HS-mode Date: Fri, 4 Feb 2022 23:16:37 +0530 Message-Id: <20220204174700.534953-2-anup@brainfault.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220204174700.534953-1-anup@brainfault.org> References: <20220204174700.534953-1-anup@brainfault.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) 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: none client-ip=2a00:1450:4864:20::42d; envelope-from=anup@brainfault.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: qemu-riscv@nongnu.org, Frank Chang , Anup Patel , qemu-devel@nongnu.org, Alistair Francis , Atish Patra , Bin Meng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643999010981100001 Content-Type: text/plain; charset="utf-8" From: Anup Patel We should be returning illegal instruction trap when RV64 HS-mode tries to access RV32 HS-mode CSR. Fixes: d6f20dacea51 ("target/riscv: Fix 32-bit HS mode access permissions") Signed-off-by: Anup Patel Signed-off-by: Anup Patel Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Reviewed-by: Frank Chang --- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index e5f9d4ef93..41a533a310 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -186,7 +186,7 @@ static RISCVException hmode(CPURISCVState *env, int csr= no) static RISCVException hmode32(CPURISCVState *env, int csrno) { if (riscv_cpu_mxl(env) !=3D MXL_RV32) { - if (riscv_cpu_virt_enabled(env)) { + if (!riscv_cpu_virt_enabled(env)) { return RISCV_EXCP_ILLEGAL_INST; } else { return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; --=20 2.25.1