From nobody Fri Nov 1 05:31:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1708064098; cv=none; d=zohomail.com; s=zohoarc; b=j0820OqSKsG369z8N0yrA2hYnmx3/3K2vErDYaSwlAGd2DVZETnGudIN91uCc49haylHP6kL/xWlRfcQ+7Jc7Y896l2m+w0DxKEpl4f4h6lmrxvYmCWNFGKyMH5hyttPxBIbGDx3xvdV9rfPB4jvqYlvNdn6Qs7QbisTOnf/N3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708064098; h=Content-Type: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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=okc81eiIJ/fJfpiRbFLcSguaBz3X+yNC/DajIDVaoAk=; b=ZEC7nIPyaGpbOFDrBB3jrtsmVQ+B1Jwe11RSeCcYjsgJjUG0FkePmbTqB7ShNkkIV1b4hiQwhUq3akwYkvKe09brRC5AEhWVwEz1Nv0LIJJ+XzL6kfa3f3EYzTQhoS5nk2nz/+6Udwr2XcNjN3Vh9YrcXw9k7Txbscpv6xOZpuI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1708064098414661.7840768053508; Thu, 15 Feb 2024 22:14:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rarUR-0001LG-0S; Fri, 16 Feb 2024 01:14:27 -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 1rarUP-0001Ky-3a for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:26 -0500 Received: from 60-248-80-70.hinet-ip.hinet.net ([60.248.80.70] helo=Atcsqr.andestech.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rarUM-0006L6-W3 for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:24 -0500 Received: from mail.andestech.com (ATCPCS16.andestech.com [10.0.1.222]) by Atcsqr.andestech.com with ESMTP id 41G6E7Sw007706; Fri, 16 Feb 2024 14:14:07 +0800 (+08) (envelope-from alvinga@andestech.com) Received: from alvinga-VirtualBox.andestech.com (10.0.13.68) by ATCPCS16.andestech.com (10.0.1.222) with Microsoft SMTP Server id 14.3.498.0; Fri, 16 Feb 2024 14:14:06 +0800 To: , CC: , , , , , Alvin Chang Subject: [PATCH 1/4] target/riscv: Add CSR tcontrol of debug trigger module Date: Fri, 16 Feb 2024 14:13:29 +0800 Message-ID: <20240216061332.50229-2-alvinga@andestech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216061332.50229-1-alvinga@andestech.com> References: <20240216061332.50229-1-alvinga@andestech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.0.13.68] X-DNSRBL: X-SPAM-SOURCE-CHECK: pass X-MAIL: Atcsqr.andestech.com 41G6E7Sw007706 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=60.248.80.70; envelope-from=alvinga@andestech.com; helo=Atcsqr.andestech.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=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: , Reply-to: Alvin Chang From: Alvin Chang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1708064100466100006 Content-Type: text/plain; charset="utf-8" The RISC-V debug specification defines an optional CSR "tcontrol" within the trigger module. This commit adds its read/write operations and related bit-field definitions. Signed-off-by: Alvin Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu.h | 1 + target/riscv/cpu_bits.h | 3 +++ target/riscv/csr.c | 15 +++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index f52dce78ba..f9ae3e3025 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -364,6 +364,7 @@ struct CPUArchState { target_ulong tdata1[RV_MAX_TRIGGERS]; target_ulong tdata2[RV_MAX_TRIGGERS]; target_ulong tdata3[RV_MAX_TRIGGERS]; + target_ulong tcontrol; target_ulong mcontext; struct CPUBreakpoint *cpu_breakpoint[RV_MAX_TRIGGERS]; struct CPUWatchpoint *cpu_watchpoint[RV_MAX_TRIGGERS]; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index fc2068ee4d..3b3a7a0fa4 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -353,6 +353,7 @@ #define CSR_TDATA2 0x7a2 #define CSR_TDATA3 0x7a3 #define CSR_TINFO 0x7a4 +#define CSR_TCONTROL 0x7a5 #define CSR_MCONTEXT 0x7a8 =20 /* Debug Mode Registers */ @@ -900,6 +901,8 @@ typedef enum RISCVException { #define JVT_BASE (~0x3F) =20 /* Debug Sdtrig CSR masks */ +#define TCONTROL_MTE BIT(3) +#define TCONTROL_MPTE BIT(7) #define MCONTEXT32 0x0000003F #define MCONTEXT64 0x0000000000001FFFULL #define MCONTEXT32_HCONTEXT 0x0000007F diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d4e8ac13b9..816c530481 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3937,6 +3937,20 @@ static RISCVException read_tinfo(CPURISCVState *env,= int csrno, return RISCV_EXCP_NONE; } =20 +static RISCVException read_tcontrol(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->tcontrol; + return RISCV_EXCP_NONE; +} + +static RISCVException write_tcontrol(CPURISCVState *env, int csrno, + target_ulong val) +{ + env->tcontrol =3D val & (TCONTROL_MPTE | TCONTROL_MTE); + return RISCV_EXCP_NONE; +} + static RISCVException read_mcontext(CPURISCVState *env, int csrno, target_ulong *val) { @@ -4861,6 +4875,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_TDATA2] =3D { "tdata2", debug, read_tdata, write_tdata = }, [CSR_TDATA3] =3D { "tdata3", debug, read_tdata, write_tdata = }, [CSR_TINFO] =3D { "tinfo", debug, read_tinfo, write_ignore = }, + [CSR_TCONTROL] =3D { "tcontrol", debug, read_tcontrol, write_tcontro= l }, [CSR_MCONTEXT] =3D { "mcontext", debug, read_mcontext, write_mcontex= t }, =20 /* User Pointer Masking */ --=20 2.34.1 From nobody Fri Nov 1 05:31:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1708064111; cv=none; d=zohomail.com; s=zohoarc; b=gWyIQSEFutYKMxea8FXZGiwec+HEKWUo4sBqve9dhQOrnpDjhwqs9u+IhVyBas2QOQutEBSMFe7hPtpTuM12Ne5JlelXDTBcrJ6zyDPsZXtKBlcGLSvZxyTsrn+LvYI3X26aASvgu7BevAJioQcKFGTBwLkgqQzAbCYHq6090g8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708064111; h=Content-Type: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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=PcqPcK/TJD5PxhB7lvjv5d636OLywZ21DGQnmR6n6HM=; b=JpqfKCI0p+fClK53R29Qv5lSny1ahQjQER43BQIAaaYDP7JtWf2Jzhxt5ZkNsn+boTUXpW8UJBwNWaRRfQBSliIvvlyn0xT0weFAZMl8g1XhcPNFFHRppYBUOEVDk1ClYmBwph7mgIanMw+nhTXaOefmnHSNyU8ZIwlzTCCjsh8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1708064111983771.6342699840654; Thu, 15 Feb 2024 22:15:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rarUY-0001NC-1W; Fri, 16 Feb 2024 01:14:34 -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 1rarUW-0001Mi-J0 for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:32 -0500 Received: from 60-248-80-70.hinet-ip.hinet.net ([60.248.80.70] helo=Atcsqr.andestech.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rarUU-0006Mb-TZ for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:32 -0500 Received: from mail.andestech.com (ATCPCS16.andestech.com [10.0.1.222]) by Atcsqr.andestech.com with ESMTP id 41G6ECCa007728; Fri, 16 Feb 2024 14:14:12 +0800 (+08) (envelope-from alvinga@andestech.com) Received: from alvinga-VirtualBox.andestech.com (10.0.13.68) by ATCPCS16.andestech.com (10.0.1.222) with Microsoft SMTP Server id 14.3.498.0; Fri, 16 Feb 2024 14:14:10 +0800 To: , CC: , , , , , Alvin Chang Subject: [PATCH 2/4] target/riscv: Reset CSR tcontrol when the trigger module resets Date: Fri, 16 Feb 2024 14:13:30 +0800 Message-ID: <20240216061332.50229-3-alvinga@andestech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216061332.50229-1-alvinga@andestech.com> References: <20240216061332.50229-1-alvinga@andestech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.0.13.68] X-DNSRBL: X-SPAM-SOURCE-CHECK: pass X-MAIL: Atcsqr.andestech.com 41G6ECCa007728 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=60.248.80.70; envelope-from=alvinga@andestech.com; helo=Atcsqr.andestech.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=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: , Reply-to: Alvin Chang From: Alvin Chang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1708064113867100006 Content-Type: text/plain; charset="utf-8" When the trigger module resets, reset the value of CSR tcontrol as zero. Signed-off-by: Alvin Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index e30d99cc2f..e3832a643e 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -941,5 +941,6 @@ void riscv_trigger_reset_hold(CPURISCVState *env) timer_del(env->itrigger_timer[i]); } =20 + env->tcontrol =3D 0; env->mcontext =3D 0; } --=20 2.34.1 From nobody Fri Nov 1 05:31:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1708064109; cv=none; d=zohomail.com; s=zohoarc; b=UY7/Eg1BcXJTlLQm9+xs+l1w/5Mh7C2RLjJUYV63JQmad/Mh1Ztcw+F+i698+nt0c9YyH90M0r+KWN3E3hkhif70+D5pfp+h5ISne8zP8g8cdJH/7WqUtV8kDUcS9op3nQQVwo+cMQ07hzVmMj4mFoPUr+d8S4w4UoC5go8/UF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708064109; h=Content-Type: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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=itX+3OFXItueVSYXtwYhhb4zQIJ6apa53Hk8R5/2yuw=; b=cx4R3vAtqTyiKklX4ZYr2yINv2BM/XC4H4ZtejMyvwJHnccwDHRbr6A7xpGFJhvKxmCvBJvICCnQFGGAQ7AheBZu25H7idsfYAJr7ljoo4C/JizD2QNDUbygUxkQLSWxAmTzPqtOPT4WcOfMv7vHBbBfj/gx3r0iMB4Ug8hPWW0= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1708064109043589.234965881104; Thu, 15 Feb 2024 22:15:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rarUd-0001Qh-RR; Fri, 16 Feb 2024 01:14:39 -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 1rarUc-0001P3-3Y for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:38 -0500 Received: from 60-248-80-70.hinet-ip.hinet.net ([60.248.80.70] helo=Atcsqr.andestech.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rarUa-0006N6-8h for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:37 -0500 Received: from mail.andestech.com (ATCPCS16.andestech.com [10.0.1.222]) by Atcsqr.andestech.com with ESMTP id 41G6EIQA007749; Fri, 16 Feb 2024 14:14:18 +0800 (+08) (envelope-from alvinga@andestech.com) Received: from alvinga-VirtualBox.andestech.com (10.0.13.68) by ATCPCS16.andestech.com (10.0.1.222) with Microsoft SMTP Server id 14.3.498.0; Fri, 16 Feb 2024 14:14:15 +0800 To: , CC: , , , , , Alvin Chang Subject: [PATCH 3/4] target/riscv: Set the value of CSR tcontrol when trapping to M-mode Date: Fri, 16 Feb 2024 14:13:31 +0800 Message-ID: <20240216061332.50229-4-alvinga@andestech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216061332.50229-1-alvinga@andestech.com> References: <20240216061332.50229-1-alvinga@andestech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.0.13.68] X-DNSRBL: X-SPAM-SOURCE-CHECK: pass X-MAIL: Atcsqr.andestech.com 41G6EIQA007749 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=60.248.80.70; envelope-from=alvinga@andestech.com; helo=Atcsqr.andestech.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=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: , Reply-to: Alvin Chang From: Alvin Chang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1708064110056100001 Content-Type: text/plain; charset="utf-8" From the RISC-V debug specification, it defines the following operations for CSR tcontrol when any trap into M-mode is taken: 1. tcontrol.MPTE is set to the value of tcontrol.MTE 2. tcontrol.MTE is set to 0 This commit implements the above operations into riscv_cpu_do_interrupt(). Signed-off-by: Alvin Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu_helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index d462d95ee1..037ae21062 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -1806,6 +1806,12 @@ void riscv_cpu_do_interrupt(CPUState *cs) riscv_cpu_set_virt_enabled(env, 0); } =20 + /* Trapping to M-mode. Set tcontrol CSR in debug Sdtrig extension.= */ + s =3D env->tcontrol; + s =3D set_field(s, TCONTROL_MPTE, get_field(s, TCONTROL_MTE)); + s =3D set_field(s, TCONTROL_MTE, 0); + env->tcontrol =3D s; + s =3D env->mstatus; s =3D set_field(s, MSTATUS_MPIE, get_field(s, MSTATUS_MIE)); s =3D set_field(s, MSTATUS_MPP, env->priv); --=20 2.34.1 From nobody Fri Nov 1 05:31:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1708064126; cv=none; d=zohomail.com; s=zohoarc; b=AQGpjCDsj8vAnszLhOYgOxfJSY7+ztlC4k/J7TzKy3qJ9YNfyEQWvqI6ogobY1AuthpCXFMn6q6KaJELXTDARacfVir+WBlzyAnJan8AGTyoITDnxZdBpk1954Dr06GVhwU8ihsiu696kGG9lKAVhxBAnfXyHOYhN9foPFWUNuc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1708064126; h=Content-Type: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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=sqBKxE4fC+52zVhiqsDUPwQqzk9q45LwwO/th08plgQ=; b=UtFAo3IV0p+YZ74ABZvNY0MzRKSSS1+Lu4mXC2J2R1WyNFqnTHn4OLrWNrfimsNrvP/5Z876/wNTN41wmJzJRmNcoRhgdW3KiDsJcR1b7Xbrz6Op7J9XZaKc2rzP1Izb0DeK9Gv8rcMEUf4teS00pZIJLz8e1jDrzdTkLofDpfE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1708064126384481.28431071860075; Thu, 15 Feb 2024 22:15:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rarUh-0001SN-Cq; Fri, 16 Feb 2024 01:14:43 -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 1rarUg-0001Ry-AB for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:42 -0500 Received: from 60-248-80-70.hinet-ip.hinet.net ([60.248.80.70] helo=Atcsqr.andestech.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rarUe-0006Ns-EC for qemu-devel@nongnu.org; Fri, 16 Feb 2024 01:14:42 -0500 Received: from mail.andestech.com (ATCPCS16.andestech.com [10.0.1.222]) by Atcsqr.andestech.com with ESMTP id 41G6EN7B007773; Fri, 16 Feb 2024 14:14:23 +0800 (+08) (envelope-from alvinga@andestech.com) Received: from alvinga-VirtualBox.andestech.com (10.0.13.68) by ATCPCS16.andestech.com (10.0.1.222) with Microsoft SMTP Server id 14.3.498.0; Fri, 16 Feb 2024 14:14:20 +0800 To: , CC: , , , , , Alvin Chang Subject: [PATCH 4/4] target/riscv: Set the value of CSR tcontrol when mret is executed Date: Fri, 16 Feb 2024 14:13:32 +0800 Message-ID: <20240216061332.50229-5-alvinga@andestech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216061332.50229-1-alvinga@andestech.com> References: <20240216061332.50229-1-alvinga@andestech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.0.13.68] X-DNSRBL: X-SPAM-SOURCE-CHECK: pass X-MAIL: Atcsqr.andestech.com 41G6EN7B007773 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=60.248.80.70; envelope-from=alvinga@andestech.com; helo=Atcsqr.andestech.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=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: , Reply-to: Alvin Chang From: Alvin Chang via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1708064127854100003 Content-Type: text/plain; charset="utf-8" The RISC-V debug specification defines the following operation for CSR tcontrol when "mret" is executed: - tcontrol.MTE is set to the value of tcontrol.MPTE This commit implements the above operation into helper_mret(). Note that from tech-debug mailing list: https://lists.riscv.org/g/tech-debug/topic/102702615#1461 The debug specification does not mention the operation to tcontrol.MPTE when "mret" is executed. Therefore, we just keep its current value. Signed-off-by: Alvin Chang Reviewed-by: Daniel Henrique Barboza --- target/riscv/op_helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index f414aaebdb..12822b3afa 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -347,6 +347,12 @@ target_ulong helper_mret(CPURISCVState *env) mstatus =3D set_field(mstatus, MSTATUS_MPRV, 0); } env->mstatus =3D mstatus; + + uint64_t tcontrol =3D env->tcontrol; + tcontrol =3D set_field(tcontrol, TCONTROL_MTE, + get_field(tcontrol, TCONTROL_MPTE)); + env->tcontrol =3D tcontrol; + riscv_cpu_set_mode(env, prev_priv); =20 if (riscv_has_ext(env, RVH)) { --=20 2.34.1