From nobody Sun Apr 12 07:36:08 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=1775960560; cv=none; d=zohomail.com; s=zohoarc; b=g804n6rTLc2VnP6qBVLtPjPa2Rx3o6ePr+EHnPR2EreUZQCKuaf3AkItVaj3pujNuGZ0Z42IpUa5S/vhpKs7c7jRcuHsSLbtFG0WeZmTlji8D8xYvo7eqRqrvhU0o7QevaM/xeLRNKUAXwUF8sq8QOolwrSitZ++56wn+JSqmkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775960560; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=hl8wgT4CltLG6VTaxdvia71dry9BsZAG/SS1SHKc5qy6N4p7WXdJDnGaR+/lDJmCVKfETL4mbjSP7W4GX6BREPtHvWuQ0X7wFeSgSVVrSxPpxCU34CLxSMr0+eaPNnQ7BDqXKnl8AqvP5IjTQJQXFPka63N3a5KFsAoNngX/ogs= 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 1775960560399119.21379096183773; Sat, 11 Apr 2026 19:22:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wBkSG-0004Jp-2a; Sat, 11 Apr 2026 22:21:44 -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 1wBkSF-0004JU-8H for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:43 -0400 Received: from mail-qv1-xf42.google.com ([2607:f8b0:4864:20::f42]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wBkSD-0000ca-F9 for qemu-devel@nongnu.org; Sat, 11 Apr 2026 22:21:43 -0400 Received: by mail-qv1-xf42.google.com with SMTP id 6a1803df08f44-8a3b0242631so39291466d6.3 for ; Sat, 11 Apr 2026 19:21:41 -0700 (PDT) Received: from ZEVORN-PC.bbrouter ([162.244.208.119]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8aca05592ecsm15455576d6.29.2026.04.11.19.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 19:21:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775960500; x=1776565300; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=CjSdkGAuncLKJ+k1frGeTMPQool1+ZXS8zYT8H+3OeLocYGo12jELlCWE+YNbhu/dU zEkMtTORNfJNemfyqDq+MqW9DGI28U6CQ/63NRKoFl8YJU0n3HrUbXqfKmKYzEWkCGUR 8UUDKQifSxuNoLaQRtHxDRf8v1qeKFod6dglUKHBVR6bJ8lQ8IfaQ8WsVQfex+/yJMH7 x+HiS3EFPjixDB9xMz0Ss+qJU8frvqgI1+ojfoM+a3Bm6IhEjYglXdMfnAQ6iQ693uRD g7Zdox2DvrQMEsm1lzmccZUQvdxpx0Nugj9PpbWELkk0ZmODLeilSkyE0fKvdgeixejx P/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775960500; x=1776565300; 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=vazYcj8GwpUqusYCDniEwJxYizenODa1Oa0Jn+0NlQQ=; b=eoz9//NXU29s6DrTRqyXUz82n1HLVOKB8tlNaChqrovleq725DTa9ZScmZCgWCP5EY mn2dnD95JOTusdC4A/a97t68EADHzBdIJpFXaOga9CudbSzr6DVO0PMRVWqv+1afQBFV FYUgZGTKCI3RQGiQFJOW0BPPh6odLxRYW+MRfq6lSXx0rYzbywiJKU4COhDEeNNrEsO3 1ZIk3w6IOncWqD0lPSW15EImn/C23FTdP5CsCuRjlA5uXTY1T/ntIEr5umLkM1bVtcb6 KwdJGyo2dHIU49vQOpWNXUPmNvJJAiYP/YFKg8+vxU1bhTHtw5T/1BMa+lO7AqdWPMoB 9VMQ== X-Gm-Message-State: AOJu0YyZJT3MB6jye6wsuvXuyAc/OT/Tk2PFvz/q2+2BnI5Y1bOGjBUE jDwacfh1je++nvhTdJN2qeRSdX2tYXOA1Coko/2N/TgchQSehHvrtSTw X-Gm-Gg: AeBDiesRQZidFsxrGfWJJ4iYp2Cgl6eFmd+1plMBWsiVHOR/6U+qx0OPOBrhP5Iafbu wY35YBJ2NG2PsksOB93APSeqn9ldxpsVJWIkct2NRWS2OF6QsZxYIyzJ4frsiYoU/2rr4FkQYoz dfWULtmnc6AZe5cHEXtggxPHEIkqdzfEl2n9nTUASVr2uis6dRNhL8sxXgCvsoy0eGXrig+6ZmO mQTyK4pS312bOVvnwiv3tXOyLibXmBUo/mBJbY0bShLk3TQZAJrfjE6OQIa4uHnXMPc9R/eC1X5 aDpv2SB3Khj0/VN56W1SAe/LPrUZmji9JV3ULksf1vxZrpALErI+u93YlR9OSLuK0502b+p6Pl0 XgKIwviP4UJl66oMO+ICxvZOMAxUjMM5lS6oX3OZyXsXSRPzURYvx6MIXLJ2p4cLNgc1XkKoI99 DaxUbVsnNyZIsocv7gD+9JK5Q63ZXVbHPcs40NzETMXRB3Dq3Cg03lI1L5I1GSK71blrfM X-Received: by 2002:a05:622a:4009:b0:50d:ce35:6e67 with SMTP id d75a77b69052e-50dd5ba3bd7mr124645941cf.42.1775960500394; Sat, 11 Apr 2026 19:21:40 -0700 (PDT) From: Chao Liu To: Pierrick Bouvier , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu Cc: qemu-devel@nongnu.org, tangtao1634@phytium.com.cn, devel@lists.libvirt.org, qemu-riscv@nongnu.org Subject: [PATCH v6 7/7] target/riscv: add sdtrig trigger action=debug mode Date: Sun, 12 Apr 2026 10:20:24 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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::f42; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-qv1-xf42.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=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: 1775960562653158500 Content-Type: text/plain; charset="utf-8" RISC-V Debug Specification: https://github.com/riscv/riscv-debug-spec/releases/tag/1.0 Allow mcontrol/mcontrol6 action=3D1 when Sdext is enabled. When such a trigger hits, enter Debug Mode with cause=3Dtrigger and stop with EXCP_DEBUG. Also report inst-count triggers in tinfo and read their action field. Signed-off-by: Chao Liu Reviewed-by: Daniel Henrique Barboza Tested-by: Tao Tang --- target/riscv/debug.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 5877a60c50..6c69c2f796 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -110,6 +110,8 @@ static trigger_action_t get_trigger_action(CPURISCVStat= e *env, action =3D (tdata1 & TYPE6_ACTION) >> 12; break; case TRIGGER_TYPE_INST_CNT: + action =3D tdata1 & ITRIGGER_ACTION; + break; case TRIGGER_TYPE_INT: case TRIGGER_TYPE_EXCP: case TRIGGER_TYPE_EXT_SRC: @@ -280,6 +282,7 @@ static target_ulong textra_validate(CPURISCVState *env,= target_ulong tdata3) =20 static void do_trigger_action(CPURISCVState *env, target_ulong trigger_ind= ex) { + CPUState *cs =3D env_cpu(env); trigger_action_t action =3D get_trigger_action(env, trigger_index); =20 switch (action) { @@ -289,6 +292,21 @@ static void do_trigger_action(CPURISCVState *env, targ= et_ulong trigger_index) riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); break; case DBG_ACTION_DBG_MODE: + if (!env_archcpu(env)->cfg.ext_sdext) { + qemu_log_mask(LOG_GUEST_ERROR, + "trigger action=3Ddebug mode requires Sdext\n"); + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); + } + riscv_cpu_enter_debug_mode(env, env->pc, DCSR_CAUSE_TRIGGER); + /* + * If this came from the Trigger Module's CPU breakpoint/watchpoin= t, + * we're already returning via EXCP_DEBUG. Otherwise, stop now. + */ + if (cs->exception_index !=3D EXCP_DEBUG) { + cs->exception_index =3D EXCP_DEBUG; + cpu_loop_exit_restore(cs, GETPC()); + } + break; case DBG_ACTION_TRACE0: case DBG_ACTION_TRACE1: case DBG_ACTION_TRACE2: @@ -441,6 +459,7 @@ static target_ulong type2_mcontrol_validate(CPURISCVSta= te *env, { target_ulong val; uint32_t size; + uint32_t action; =20 /* validate the generic part first */ val =3D tdata1_validate(env, ctrl, TRIGGER_TYPE_AD_MATCH); @@ -448,11 +467,25 @@ static target_ulong type2_mcontrol_validate(CPURISCVS= tate *env, /* validate unimplemented (always zero) bits */ warn_always_zero_bit(ctrl, TYPE2_MATCH, "match"); warn_always_zero_bit(ctrl, TYPE2_CHAIN, "chain"); - warn_always_zero_bit(ctrl, TYPE2_ACTION, "action"); warn_always_zero_bit(ctrl, TYPE2_TIMING, "timing"); warn_always_zero_bit(ctrl, TYPE2_SELECT, "select"); warn_always_zero_bit(ctrl, TYPE2_HIT, "hit"); =20 + action =3D (ctrl & TYPE2_ACTION) >> 12; + if (action =3D=3D DBG_ACTION_BP) { + val |=3D ctrl & TYPE2_ACTION; + } else if (action =3D=3D DBG_ACTION_DBG_MODE) { + if (env_archcpu(env)->cfg.ext_sdext) { + val |=3D ctrl & TYPE2_ACTION; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "trigger action=3Ddebug mode requires Sdext\n"); + } + } else { + qemu_log_mask(LOG_UNIMP, "trigger action: %u is not supported\n", + action); + } + /* validate size encoding */ size =3D type2_breakpoint_size(env, ctrl); if (access_size[size] =3D=3D -1) { @@ -569,6 +602,7 @@ static target_ulong type6_mcontrol6_validate(CPURISCVSt= ate *env, { target_ulong val; uint32_t size; + uint32_t action; =20 /* validate the generic part first */ val =3D tdata1_validate(env, ctrl, TRIGGER_TYPE_AD_MATCH6); @@ -576,11 +610,25 @@ static target_ulong type6_mcontrol6_validate(CPURISCV= State *env, /* validate unimplemented (always zero) bits */ warn_always_zero_bit(ctrl, TYPE6_MATCH, "match"); warn_always_zero_bit(ctrl, TYPE6_CHAIN, "chain"); - warn_always_zero_bit(ctrl, TYPE6_ACTION, "action"); warn_always_zero_bit(ctrl, TYPE6_TIMING, "timing"); warn_always_zero_bit(ctrl, TYPE6_SELECT, "select"); warn_always_zero_bit(ctrl, TYPE6_HIT, "hit"); =20 + action =3D (ctrl & TYPE6_ACTION) >> 12; + if (action =3D=3D DBG_ACTION_BP) { + val |=3D ctrl & TYPE6_ACTION; + } else if (action =3D=3D DBG_ACTION_DBG_MODE) { + if (env_archcpu(env)->cfg.ext_sdext) { + val |=3D ctrl & TYPE6_ACTION; + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "trigger action=3Ddebug mode requires Sdext\n"); + } + } else { + qemu_log_mask(LOG_UNIMP, "trigger action: %u is not supported\n", + action); + } + /* validate size encoding */ size =3D extract32(ctrl, 16, 4); if (access_size[size] =3D=3D -1) { @@ -919,6 +967,7 @@ target_ulong tinfo_csr_read(CPURISCVState *env) { /* assume all triggers support the same types of triggers */ return BIT(TRIGGER_TYPE_AD_MATCH) | + BIT(TRIGGER_TYPE_INST_CNT) | BIT(TRIGGER_TYPE_AD_MATCH6); } =20 --=20 2.53.0