From nobody Sat Apr 11 23:08:35 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=1772954470; cv=none; d=zohomail.com; s=zohoarc; b=e5y3YttOcFdDyyfR7X8H/8+CCbHDUrcSI0QCUOpXzNjz+AccZRCMWg+bUchjLX3QSMy9VSNE1RCjGDEDiX+1Ml4kpIowifgAs2xDumXQkGcziRDgmebFtn/7+cMbJ91YN49gRNGbwE/RTdEnsDXipiIKbwoQNOgn7KFVFmTxgzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772954470; 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=zwES2RO/KEYppoyZt0FJTIF1i34Igg6OFEnsCwkhiD4=; b=Bb/FelhHz7qM9lNT3YqeAbbIwR2ZUWttX86RSR6V010IvDzcjko910DqDIYyBe8LJsAe4i8YPW5llZtVy8T9uV1i00jXHl74wMKpcLK7VVBmxF4r43SmzFwVxV8VIfQKKzqOYhJ7tXtfAqeOWcXwXkBb4p+88/H7m6LBE7p0hTY= 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 1772954470744143.93757441032062; Sat, 7 Mar 2026 23:21:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vz8QV-0007v1-E0; Sun, 08 Mar 2026 03:19:47 -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 1vz8QI-0007Su-0q for qemu-devel@nongnu.org; Sun, 08 Mar 2026 03:19:37 -0400 Received: from mail-dl1-x1242.google.com ([2607:f8b0:4864:20::1242]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vz8QF-0001oC-DS for qemu-devel@nongnu.org; Sun, 08 Mar 2026 03:19:33 -0400 Received: by mail-dl1-x1242.google.com with SMTP id a92af1059eb24-128d2e3074fso356232c88.0 for ; Sat, 07 Mar 2026 23:19:30 -0800 (PST) Received: from ZEVORN-PC.bbrouter ([38.95.120.198]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2be4f984ceasm6014081eec.32.2026.03.07.23.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 23:19:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772954369; x=1773559169; 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=zwES2RO/KEYppoyZt0FJTIF1i34Igg6OFEnsCwkhiD4=; b=RYAP6W6mifDjeOnxer3IQzTpMwGmgnEXSYniSekQwEAl9uGQMjiDOueJWsEkTSKaGv TjfouSsl7zOwC/Caflj85Hzk8maNXKeRd38oyKmNH+Euyiddn+APB/WBwpyfWhdoVvRp 1DyqrZj8dt8zq5bdxTwIv03/Pfk8FEDODvLCqWn5SmaeZ0Fwgy1Th43iivGpm5KU6TSP cgtDmDg2Cn6f+RyCHAaYE8RBDPgRe/qZIHbzdKcB683J9EYp633eTMb3abWQ7au4fRaH SBCIK9iztbiKOpUigAYwKnFNinlU+faQtmD23Dg/88ZSZXcSRgg1FXSjhUwaYOpufoHr //GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772954369; x=1773559169; 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=zwES2RO/KEYppoyZt0FJTIF1i34Igg6OFEnsCwkhiD4=; b=IXyA9Vuvgs0vLvzUQPCbhxjW+OUlx8rPdPkYh7J2g/FeTm+U0j8u6dtoOASTYRwoIh HO6Bh114astk9UaNYN05Ryxy6FA43XFfR7ZRb1LzwZ+1THSelotFwjKAUquVWdi3fDa5 6z4dZALvAugERp9pzdvJoOWD2vAfUUO2YMd6WFFZQ0L+aX8joufv5mV4T5CRGFVQrbiJ YTED0fZ7/muqoeUQjg0SJmFBc3Tp5ENwaOdsZ64d1CM+/cdxAnUwpm1EVe0ZtEMjkE1v EEDUE9T7Xv+PSxZPzLSuURofNf3tDUCmsy1BwqDLx3r/YKiArorbZjB9PHHBcjDCQ11L 3LDQ== X-Forwarded-Encrypted: i=1; AJvYcCWOzCgUuI8HzxBC7i7/d0P+iMlBXIH7bn8bk+nIiwwRBV6ASKs4VzZXaF2I2VTwdCE47ekTubPPCkKf@nongnu.org X-Gm-Message-State: AOJu0Yx6dYCuHfrQgFsHIr78+g8ZFbb9ydW50Zn2lYE4MuGHM3+T1aK+ 6kVFLp87ZMX/R9KoP3ciuSgSJ1oPuF5x/UX/hrA6TLUZRx3ME5xabcz5 X-Gm-Gg: ATEYQzxHJsXXK5UgJ1gddvVNH3GPYM2H3emayGpPG1703nI246uDBesBcZy4fjONltl 1JxJmEa1HVTQC2wsL4LyhwiXygE5XXR4TzyVNnA/c/yJljWsk3uU2yH6Wk0HvYm0ULVdJfAdkTc cdEryoLAlR56BLEPI+oFOgBWwiEMAWacNARV4rLX+GSz1bfyFOel7oWoYTvAEQI2xvVyLqpd6Iw 8ae4x3nKafgH56Y647SYV3wn0Xg0oN5D+sS6HkAjRa0c3rPt4UqZsZgY4kCtLSJ0GHc1wOhzfy2 Qb4hOfsKrY6t0xF7Zd2Ifdq5h3l1GU/c4OsXNPnfIuya+GRCZWUZHdudyCqHW9Zfp+vRJFHjhLA vfqkzJ75ovMIM01MlMjtEprzj7kTSh2dFYUkP0DaNFZx3alJQQdyi/gWOrPSnXuCGD9C0yAVZv/ O52o/AkVYhZmZowWyQjXfm+FtYFEUPzl6A3umWI8eiWuYS/yHSauxzdrfrFUw4dx6CFt7gXQnxu QK9xfjuohYq5QWteKKgx7mc0So= X-Received: by 2002:a05:7022:239e:b0:128:d084:e921 with SMTP id a92af1059eb24-128d084ea53mr1045105c88.14.1772954369400; Sat, 07 Mar 2026 23:19:29 -0800 (PST) From: Chao Liu To: Paolo Bonzini , Palmer Dabbelt , Alistair Francis , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Chao Liu , Fabiano Rosas , Laurent Vivier Cc: tangtao1634@phytium.com.cn, qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 10/28] target/riscv: send trigger debug-mode actions to the DM ROM Date: Sun, 8 Mar 2026 15:17:13 +0800 Message-ID: <786eda45594a916e59d100c8edbeb141c5e8d79c.1772936778.git.chao.liu.zevorn@gmail.com> 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=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1242; envelope-from=chao.liu.zevorn@gmail.com; helo=mail-dl1-x1242.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=unavailable 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: 1772954471263158500 Content-Type: text/plain; charset="utf-8" When a trigger configured for debug-mode action fires on a hart with a Debug Module ROM, redirect execution to the ROM entry and suppress the legacy EXCP_DEBUG stop notification. This lets breakpoint, load, and store trigger actions feed the same ROM park loop that handles the other Debug Module entry causes. Signed-off-by: Chao Liu --- target/riscv/debug.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index eb03f306b1..00fd75f15f 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -298,9 +298,20 @@ static void do_trigger_action(CPURISCVState *env, targ= et_ulong trigger_index) riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); } riscv_cpu_enter_debug_mode(env, env->pc, DCSR_CAUSE_TRIGGER); + if (env->dm_rom_present) { + /* + * DM ROM present: redirect to ROM entry and restart the exec + * loop. Clear exception_index so EXCP_DEBUG does not propagate + * to the MTTCG layer as a spurious GDB stop event. + */ + env->pc =3D env->dm_halt_addr; + cs->exception_index =3D -1; + cpu_loop_exit(cs); + } /* - * If this came from the Trigger Module's CPU breakpoint/watchpoin= t, - * we're already returning via EXCP_DEBUG. Otherwise, stop now. + * No DM ROM (gdbstub path): let EXCP_DEBUG propagate so the gdb + * stub stops the CPU. riscv_cpu_exec_enter leaves debug mode via + * the legacy shortcut on next exec entry. */ if (cs->exception_index !=3D EXCP_DEBUG) { cs->exception_index =3D EXCP_DEBUG; --=20 2.53.0