From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205495; cv=none; d=zohomail.com; s=zohoarc; b=LV6IyJ3FG3RccQGewa56CCw46QimLoujh5WtDUloZ6d6XSrhZf9yX2opGgLxAsByxdsJxJHxPCF3IguIciNo8KFAj3HDbgaatHPtM5SxglV5y8RJlpClAY4FCYHxpeIYziWBoPtrX+b3LOQtMa5wJhJddBjmSS3qtF8ESczImiw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205495; 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=IEmOH+y3eJI/+UHqBYKVlHFvW5x5P24mE84XXeY0tUk=; b=ESpzVGqHWF9rQdumMFEcoyyJjiUc+Cy3GtMGOk5VY8/vJd90HRYj8igjTv7Icj0XBQTbcsL114EcvNKGiP5XjB3cfpSvTErJ3xmkrntJUrhrz+WJrym/JWn+oVwJ4SLERfiwALhyPSXl6b+Vgh0xh596Cu9i1g975llZ7ASeBPM= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205495096317.9723159347509; Thu, 16 Jul 2026 05:38:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJf-0002g7-NB; Thu, 16 Jul 2026 08:35:51 -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 1wkLJe-0002fL-G9 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:50 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJc-000734-4i for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:50 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiZfE3747257 for ; Thu, 16 Jul 2026 12:35:46 GMT Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feq3pj54q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:46 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8eac2620cb0so65214396d6.3 for ; Thu, 16 Jul 2026 05:35:46 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=IEmOH+y3eJI /+UHqBYKVlHFvW5x5P24mE84XXeY0tUk=; b=ZD4wUBgjdDQ0vyvwqjb6ewg58BY ZlpERv/51QA0FT/vTUHoXHPVQaYxz6NBmEWKog5biH36gXoHbD/jTL5TL1AmrsY/ UThnwz8kFtDAIxiC+hfxacCN1INS87QDX81DxBWr2iS+XlLNzsva81S6FPrHN/d6 CMa+ObZ7yV7mltYyOKsNClqtVHe77O/W2KurL6052/vpjlkWUVxd0GIRb133s94j v7grGoogECE2vs0HXn5M6nuAm6NR4qJPELGN0rNvNSA3rnh9icWvPF0EqiOR+fNS BbtQ8d0LFcl9AWU5w0fEFdqthZN1MJakgzrmo1NouD2VuGB2kZi59jQ8pbQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205346; x=1784810146; 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:content-type; bh=IEmOH+y3eJI/+UHqBYKVlHFvW5x5P24mE84XXeY0tUk=; b=AI3HmYUPRHxZKM2FMOkw15uBjBArkJUE0NxkvicGCwFY+26mxJ3+LYAvAn+09B8N4n 3gI+ipFo6JHYViIw4XUf7Swzo+0l96BiTZdMC7PW5GXC3z1wDdAin01G4vN/T5BcUCQ8 E9Vnxdb5TYXz+cGpkCQlM7rpCzdz5mNHgeRSdWBq8w/jRDMFnZZJk2d1rYseMK8tpXyo sjvXMFbDSK59Edgzpj1Pu3vnzOmhGHzC8i+hELNR9G1pwI8VHFpBKPvPwOybL91DU0xN 9Pb1rN0lLPPvuyyy9WFwVx49upMwVOMK9O0WBXH1AknaG6u+AOawB4wMZG98Gw7J4DWU zA+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205346; x=1784810146; 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:content-type; bh=IEmOH+y3eJI/+UHqBYKVlHFvW5x5P24mE84XXeY0tUk=; b=DAWntuB9fKAkERS9qU7y03pYwTslsu/2ArBka5wJp7EkX5KSvLoxUrb/u4TJhX3bEH 0RPLNqc4GLZaUy8qVI4la65E2omtFfu5plsZch8ISUIY9ffhzrftNWCAwdeWg8QjQ/ie gApCIT6MeIAzCg9j06tEEtBBwB7fY1jid4zdFg/wmCo6wR94l8pmwJ2N/yGfRJr5HOS/ c4B0RVW//nYAs+AjX3Nv0vEk/tl+wqBfEZtFVeATNEwuFcji0KgSNiRq4jAuYfl1rLtV XwhORDTQ7igK/oEU/zoZ0XatF8tF6dlN0g3jD40+gsHwXVGEEIo67rm+EmrQF+ErTegV xN7Q== X-Gm-Message-State: AOJu0YzX/pGaIOai2Zyx08YfA0aJ5/BT8Zn66LoOhgjEOW+WXH11IyeH IoO03XaHh0I/3pgtd/4l/l/h1nLIvzyg+xvygtA70DWO7gXlecCwrzrIOo1y6wa7UfFKJO26iwO slU1gpHyZ6YXdJT/HlMx/CSxTJ3NGaKgpTr5JZVKf5zmMipNqTv3l9M+CYP4gLAy4ug== X-Gm-Gg: AfdE7cmmrFXuz6LFRHvLjDWCen+hDtfyueNaFLkRizvxWMZIorncpAJoSUUEAqPhTOt KbdtvNj34N5xpvWAPvT34u1DxnhgiUcWPb0/Z/QoDuSfUwpFQJzs+z7aSWKkslSnOd0wiJFGtKd gH6zLlpE64KBWjx85bkFhel/a1u5wXNYTZlBrgL8rUD5thF9ZiajSRz2J5RptztWtCIXGBDEQYy QrzIT7jYwD05QciURZM+WYis8ZpK+jYUsAjjB50cV8LtXCOmHiur3pUBm2l8Oq2vTh0jlVJ+FnO +3w+3LOnVLLOEjQ1a82jpG0huIkw4JgAviDhxy9TYl69gU5tpMu5uCrexyNonS4sGeH1Q4rXIeF kbU1gsm+tVWsAevnvUx19EfyVkJhqwsZrSR4= X-Received: by 2002:a05:6214:8110:b0:907:4850:d191 with SMTP id 6a1803df08f44-9074850d6e8mr130114856d6.49.1784205345700; Thu, 16 Jul 2026 05:35:45 -0700 (PDT) X-Received: by 2002:a05:6214:8110:b0:907:4850:d191 with SMTP id 6a1803df08f44-9074850d6e8mr130114476d6.49.1784205345092; Thu, 16 Jul 2026 05:35:45 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 01/17] target/riscv/debug: Check only mcontrol triggers for break/watchpoint matching Date: Thu, 16 Jul 2026 09:35:18 -0300 Message-ID: <20260716123535.3709148-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: Cn0g6R4c6XgtbyZwMM8KNY3DwAz5SovH X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXwwDXkPcri+zo 8rOtEoZGWLgVhWvQpmiVy0hAOjeiFeYdKPYaUYUMFfsdAIpvbmtEsuH1QOmcZyYHgYV6Wgj4H3R DJLuHgNhh5buf3DyP4yLXj9oUW08PBs= X-Proofpoint-GUID: Cn0g6R4c6XgtbyZwMM8KNY3DwAz5SovH X-Authority-Analysis: v=2.4 cv=PN8/P/qC c=1 sm=1 tr=0 ts=6a58d022 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=uJK--5DT46cJm71gjCUA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX2jWs4k0Goc4k tXTzPnd22+4O4Ae0aSgbnczs+fA684UPFGe/pdSMIIePfZkSxvWpAouK7ZAlZrSCIOiypeQ1P8P lEaLaC6JM8YDOQMGNrfvkwVUtQs26rObyN2h04ZnkdmpXV2qOGEyiNFPtNL4Oo1oCaQybdudMNV FMVVmC9fRFvLssFPPvPCXE6qK0cr1jqn8FPAlhN9NvYPTHCIzdgfiTL2uweSWW+v/6ERC+oNs3Z OrVzDzkF8COLJ45GQqCj/cOEDt0TaSYs13Vm+V5WqKeW21vSL2fMSi7YPPxg3m24DJchWQIdmBw fdZYOLWA+f4p5Zky+sCSYroQuvazAQIa5mNOXTqyw9DKcwaTAtVRzjKo4jicGWebvuPa8Xr3wOU YQ3M2ocul5XhXXz04Xb5Z/T8oobg/mWY1cTN+uW6yLcNAIy2xuJIyY8wlWp2onNu/Xd63ITJ8yL 75gY2dOF4K9WBUYG3+A== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205495792158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin trigger_common_match() has some warning log messages in it for unsupported triggers. Don't call it in BP/WP checking except for mcontrol/mcontrol6 triggers applicable to BP/WPs. Fixes: b5f6379d13 ("target/riscv: debug: Implement debug related TCGCPUOps") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza Reviewed-by: Chao Liu --- target/riscv/tcg/debug.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 3c0fe70101..3ee598b86c 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -954,6 +954,14 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) for (i =3D 0; i < env->num_triggers; i++) { trigger_type =3D get_trigger_type(env, i); =20 + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + case TRIGGER_TYPE_AD_MATCH6: + break; + default: + continue; /* No other types match breakpoint */ + } + if (!trigger_common_match(env, trigger_type, i)) { continue; } @@ -978,8 +986,7 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) } break; default: - /* other trigger types are not supported or irrelevant */ - break; + g_assert_not_reached(); } } } @@ -1000,6 +1007,14 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, = CPUWatchpoint *wp) for (i =3D 0; i < env->num_triggers; i++) { trigger_type =3D get_trigger_type(env, i); =20 + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + case TRIGGER_TYPE_AD_MATCH6: + break; + default: + continue; /* No other types match watchpoint */ + } + if (!trigger_common_match(env, trigger_type, i)) { continue; } @@ -1038,8 +1053,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) } break; default: - /* other trigger types are not supported */ - break; + g_assert_not_reached(); } } =20 --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205518; cv=none; d=zohomail.com; s=zohoarc; b=i3y25yWr0qUl6xRJFmqRb/qk/Ti2qA6Fx+ueKPqmtkI2chXYjghuyQDNZyyPL55IBZNhYgldDkH9OZZxKcKgrqVYSoEY5go7S5vr3Qi3wVB8F8MODfbx8pLG5c6iECyxT6htvjvCO00NJIBJo2Luc9vXXR1OeMr8Cpm7EoINvVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205518; 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=DWG7HDrKOjTmw538tEqDnVNF1v1AB+BnKiUcwYxSw+o=; b=ENSFkh3pSlpUXVpm+jpyPEc4vZ9mF7BaXi5p/P2K7thLId0BFQ4GSHVDmYWmKXk5w+ZiITSios3ly/iLh+zCg/EJ5d3Rf2oRq7Iz8yu1yJPZ+jIeKoXtB3sKNLQkSekI0ldJqqdI2XO64jqmue5QLd0RwTZ03lXrBtbhWjJnY5E= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205518259278.3688096685162; Thu, 16 Jul 2026 05:38:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJh-0002gx-Ld; Thu, 16 Jul 2026 08:35:53 -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 1wkLJg-0002gE-3E for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:52 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJe-00073T-BG for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:51 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBihxr2637874 for ; Thu, 16 Jul 2026 12:35:49 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feuex13bf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:49 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8e934385db1so125149226d6.0 for ; Thu, 16 Jul 2026 05:35:48 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=DWG7HDrKOjT mw538tEqDnVNF1v1AB+BnKiUcwYxSw+o=; b=FTgAoZg5Cc57d6d6K0ch68hatXB /PztpQNBPy4hmNJ7CtDy/nuwVBV6uIQepdP7aTIxpHNV4WlXaHV2uIYb1FJqQ9tR BMNs91JaPohPM6q4naN63o1Mhp3tFWwqDmO2hcPCSmu7s6XwuqIKjHdmJmslnpMH QodiEI8+JKXULf81eUtKd05SkrHpChl0RoOZ6jer32l3Xwu8AgywFgljdrYOdxnP n1X+hZFnCZ6d5W2s4gPIHZHC3A1qZ1mErGJ9zUzMtAe32HAqMmTjm+O1Q3T1GZxX CYUSufMfzwryD/RZGtWKypcc46GuHQQ0kCyq7AMj84h90RUfC637KCpl7eA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205348; x=1784810148; 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:content-type; bh=DWG7HDrKOjTmw538tEqDnVNF1v1AB+BnKiUcwYxSw+o=; b=QmIfXQ5qJubRSlBcGsIQnZhlbDvDntUsWoDicmW78VAAE6+2T138JMO2Y8PFmp6fSk saY8gS94dKQd4OIZZcsmOdJ5ZVq5I5FwZglO4y2Q8BD8eWC14+NIvTcTxVaaNwoxzdkD C8JzE8H6Ufuds9UzOGqD7tUNFNIiIf0wUQTIgGIOszgWsV9btoefo+DHmp46Hqo1vKyC ddlEqdUgYC/OnJmChGAwfVR8XwmMBqM7N8ZrD/RmraEAGqMS8YCM+I6XYwvBTm/xOS45 uWnVjzT+Py3oI8BvLmco/KIEO/xhVJvsTUpb99vLg5+BquyN1ZXTAGVclGNhTgWW9C31 gTRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205348; x=1784810148; 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:content-type; bh=DWG7HDrKOjTmw538tEqDnVNF1v1AB+BnKiUcwYxSw+o=; b=okRb1TTOJpFpuyFNP5qmRs7Mw6quzMhK6V+XbwYuAqU+CBembbYXdOYZhI1b/K/Jyn WhVZzSipcMwN/D8fUpZL6h7duU3iWd1kQ1nle5xtkGgL6RrAPv1vbkcEblo35/2pTNtw i2sayPqYHb900Y+dMermbtV3QykZClaac2/4C7ywQlPgwzjrGObMTtR8/FOqSfMXGz0e 6ofIZhq70ShFp8W8Zks/n1GgaSIbpAPUSMoGc7nd15QzN9gFZVODzFx6VlmRHqMkhlzO 2zCHSRJM79jFUIgEGuhp2SQfwUBXGwRMKUU68IBiQQ6Tm0gzZQn7aU94owtizH0vRN9O UYeA== X-Gm-Message-State: AOJu0YzH0WPiKSsSp+FXpw4bSPY9+LETz6Ggzbsser79aVC/Lv/O19wn +e+O9oaeT+c/GjR3Yg6cVTo7F2PXuVKN6eBIQbZuqQeFAUg+Pyfb444uVTd6nL/1tCcXc+LWJKg Zt1yBlhfVksDNyg57snWfAQnoUuwkiwzh/MeTGssWcQmfJMqqrpgT8ZqmyN2EKmHl5g== X-Gm-Gg: AfdE7cnrdXpkf3ScenkswxPrZCJf17Hb+6zoVAD83xsiAp27QXH3+OJjer8RREU6NS/ xYAP0XZQ4XCiSiyZMPJaDhwRkpVHoF3Z4hVsgz30t6h/Z3FI3dvjNByyyTsbax+bazw/qOj1aFz P2oIxnt5+eYJqepG9EdEK4FYpm9RJh/oEoVYPM2Nqk0vhvtPQi/kV/gEOAh0MObfb2iB0L+n3Dm BaWk9xStKQvodn0ID0KM5nhfoCGHmKxFmvg7AxL/QE6FD4qrufkAoxDXFrPHYM0ooQbnZSzN7OA PVGilFXK+YfoHCQn7VJxgdse47V9KoEaxO80n2dwqvPLUPCpKdFcFCwQC1PINVfltyBh3jpTXI4 H8fNqd+ZqL045oG+S1UPelihPfPQKDDeVjnA= X-Received: by 2002:a05:6214:4907:b0:8e9:f5de:d604 with SMTP id 6a1803df08f44-90747cf480amr150349666d6.49.1784205348411; Thu, 16 Jul 2026 05:35:48 -0700 (PDT) X-Received: by 2002:a05:6214:4907:b0:8e9:f5de:d604 with SMTP id 6a1803df08f44-90747cf480amr150349156d6.49.1784205347739; Thu, 16 Jul 2026 05:35:47 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 02/17] target/riscv/debug: Handle changing trigger types Date: Thu, 16 Jul 2026 09:35:19 -0300 Message-ID: <20260716123535.3709148-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=JeeMa0KV c=1 sm=1 tr=0 ts=6a58d025 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=a3NOPWvn6jD59UKBmmgA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-ORIG-GUID: vNUZUHIpGp1LElW1-hJaw0KmuwlFFWka X-Proofpoint-GUID: vNUZUHIpGp1LElW1-hJaw0KmuwlFFWka X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX4Nt+9fuS5MgN ibBnBZF1xR0VjGarEfdKdm5NmTkoGVIIGBCCXolF0jR5Vo9XVf2UtVPAN4+kQOe8lMuSfapnVxO KQEkObL1meDhHXa+HzuocriPMWg4KvU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXybo6RZpWSBTr DtqyrxVB5rkiJwH1DGjZjJaFQXCdgt0nwGkx2lmapABv/nzBwWWK0wa210UwRXuxMPnAyYjs9RV FD8tLM8Zc2PFyp4x52pe/D7+n25iPxq458X1G84PEtOHEj6rFRr7PxUo/zgW98ULGkqKqx1htqM 3cEL48U05Nf+6S6rJoHaalTF/GRjOv0L5T7Ka2ZsXtXJ1NyagD4M1ELPC3p+VSm8jINTzwYCYYt xqYh39mBdviF+9d9/VzmqTlHEnozAWlsIx3eJnQSwrDzTAFlOQ95Y1mo1OJ5TtXWKWQHHuqiees 4DyEl80epkLheaaGSMlxdNuLH/3106QmyYpONp57IAU+Iu5zSIgnLE+VNWiEF8ALKr0Zl+cINr0 xR8kWB5O0MKiecPnWgL0OO1Ohi9sU+wAFwEOO+uEtVrd9YijjV+uEisbSZ45NCnJJe0KhLhfzFA VLrh0i+G+JALqxRzRNw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205519964158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Updating debug registers will first remove the existing TCG breakpoint / watchpoint, then adds it back with new values. Writing TDATA1 with a value that changes the trigger type attempts to remove the facility for the new trigger type rather than the existing one. That is, it will not remove a breakpoint if the type is changed to a non-breakpoint type. Fix this by removing based on the old trigger type, then inserting based on the new type. Fixes: a42bd00166 ("target/riscv: debug: Determine the trigger type from td= ata1.type") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza Reviewed-by: Chao Liu --- target/riscv/tcg/debug.c | 64 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 3ee598b86c..9e6c907742 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -530,23 +530,12 @@ static void type2_breakpoint_remove(CPURISCVState *en= v, target_ulong index) static void type2_reg_write(CPURISCVState *env, target_ulong index, int tdata_index, target_ulong val) { - target_ulong new_val; - switch (tdata_index) { case TDATA1: - new_val =3D type2_mcontrol_validate(env, val); - if (new_val !=3D env->tdata1[index]) { - env->tdata1[index] =3D new_val; - type2_breakpoint_remove(env, index); - type2_breakpoint_insert(env, index); - } + env->tdata1[index] =3D type2_mcontrol_validate(env, val); break; case TDATA2: - if (val !=3D env->tdata2[index]) { - env->tdata2[index] =3D val; - type2_breakpoint_remove(env, index); - type2_breakpoint_insert(env, index); - } + env->tdata2[index] =3D val; break; case TDATA3: env->tdata3[index] =3D textra_validate(env, val); @@ -554,6 +543,8 @@ static void type2_reg_write(CPURISCVState *env, target_= ulong index, default: g_assert_not_reached(); } + + type2_breakpoint_insert(env, index); } =20 /* type 6 trigger */ @@ -644,23 +635,12 @@ static void type6_breakpoint_remove(CPURISCVState *en= v, target_ulong index) static void type6_reg_write(CPURISCVState *env, target_ulong index, int tdata_index, target_ulong val) { - target_ulong new_val; - switch (tdata_index) { case TDATA1: - new_val =3D type6_mcontrol6_validate(env, val); - if (new_val !=3D env->tdata1[index]) { - env->tdata1[index] =3D new_val; - type6_breakpoint_remove(env, index); - type6_breakpoint_insert(env, index); - } + env->tdata1[index] =3D type6_mcontrol6_validate(env, val); break; case TDATA2: - if (val !=3D env->tdata2[index]) { - env->tdata2[index] =3D val; - type6_breakpoint_remove(env, index); - type6_breakpoint_insert(env, index); - } + env->tdata2[index] =3D val; break; case TDATA3: env->tdata3[index] =3D textra_validate(env, val); @@ -668,6 +648,7 @@ static void type6_reg_write(CPURISCVState *env, target_= ulong index, default: g_assert_not_reached(); } + type6_breakpoint_insert(env, index); } =20 /* icount trigger type */ @@ -833,8 +814,6 @@ static void itrigger_reg_write(CPURISCVState *env, targ= et_ulong index, /* set the count to timer */ timer_mod(env->itrigger_timer[index], env->last_icount + itrigger_get_count(env, index= )); - } else { - env->itrigger_enabled =3D riscv_itrigger_enabled(env); } } break; @@ -883,12 +862,30 @@ target_ulong tdata_csr_read(CPURISCVState *env, int t= data_index) =20 void tdata_csr_write(CPURISCVState *env, int tdata_index, target_ulong val) { - int trigger_type; + int trigger_type =3D get_trigger_type(env, env->trigger_cur); + bool check_itrigger =3D false; + + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + type2_breakpoint_remove(env, env->trigger_cur); + break; + case TRIGGER_TYPE_AD_MATCH6: + type6_breakpoint_remove(env, env->trigger_cur); + break; + case TRIGGER_TYPE_INST_CNT: + /* + * itrigger_enabled is the union of all enabled icount triggers, + * so it's easiest to recheck all if any have changed (removed or + * added or modified). + */ + check_itrigger =3D true; + break; + default: + break; + } =20 if (tdata_index =3D=3D TDATA1) { trigger_type =3D extract_trigger_type(env, val); - } else { - trigger_type =3D get_trigger_type(env, env->trigger_cur); } =20 switch (trigger_type) { @@ -900,6 +897,7 @@ void tdata_csr_write(CPURISCVState *env, int tdata_inde= x, target_ulong val) break; case TRIGGER_TYPE_INST_CNT: itrigger_reg_write(env, env->trigger_cur, tdata_index, val); + check_itrigger =3D true; break; case TRIGGER_TYPE_INT: case TRIGGER_TYPE_EXCP: @@ -915,6 +913,10 @@ void tdata_csr_write(CPURISCVState *env, int tdata_ind= ex, target_ulong val) default: g_assert_not_reached(); } + + if (check_itrigger && !icount_enabled()) { + env->itrigger_enabled =3D riscv_itrigger_enabled(env); + } } =20 target_ulong tinfo_csr_read(CPURISCVState *env) --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205411; cv=none; d=zohomail.com; s=zohoarc; b=FljjbAPYeK3a+BARygouIL3yp9KhuKGQgCluMRkpbZ24qjFsXT6/A5DYSSgB5h9881CNfhMT8Ngtw5guCm6vgcc0v5bbMM2Skau+ejz8wUv+aP18SGtuxpzFjtKkfGS/RNXDRQswdu5HTGXjLjr9tiebn37DebZKesgpwkhxmfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205411; 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=dqyPARbkh64mZ2RIOOLnv5zdbrEo4chMNue1KyyBAxw=; b=JsdXyp+V09WKr5sTS2EyOLdUYkrY70CaDZo9vj6pPBtnQ5wqYp2nmcuT9UEWFVtbycQ2tuFmTRv8OBU6hA0qQnE3uMIe8OVzKrWZt6TGyAUVo5y4SaUHgCXzY+ln71k9YSlAoU3qFfhBFI6yUSFtF2gDruOXM6FWBIPxm6earKc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17842054111901006.681958980397; Thu, 16 Jul 2026 05:36:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJl-0002iT-2B; Thu, 16 Jul 2026 08:35:57 -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 1wkLJj-0002hZ-6y for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:55 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJh-000747-HW for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:54 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBibhs3747325 for ; Thu, 16 Jul 2026 12:35:52 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feq3pj550-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:52 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e623b0e95so819828885a.3 for ; Thu, 16 Jul 2026 05:35:51 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=dqyPARbkh64 mZ2RIOOLnv5zdbrEo4chMNue1KyyBAxw=; b=LVYQNupj2926xBgCnYjGOjHuZ86 WM+GhzooHKSSU2AUJ+g0aNQbrLhQ8OoKnZG6c9zEvVSklZ4gKtP1E8M9Mbyy8PaI RNt0B60qrBIGr+hCC1IoEv74fb2wg/K6nG1zM1Is0aXz+LIwaVj4PqYqhQbOZ9Pt zLrX3Cw62zIl0mmoWfCjY4nls3tofGABmTcbiFmiZs6qPScU+8Jh8sBOk7kTpVoq /UdOzP74cP6dq4xqgVMSmkvpurIyRTtw/MLjl6yvoxff/43fXFm5FXILMdtGoQ8Y 58dcCvwXRwEFZy/JaBWWOrD+tXRS82V/U+JpiZvLf2tT0t4N9jg8vVV6wGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205351; x=1784810151; 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:content-type; bh=dqyPARbkh64mZ2RIOOLnv5zdbrEo4chMNue1KyyBAxw=; b=knVK1JnfvGnoKcZidkEV1WUYBwTYBRTb4JXrUWsSCgu5uO42CIyblE6tn8tHh/HmdF MEFpR2FMUJaz5JuihuUCBa6YrkIkshk8tKyTgwyZrKZdVzZ8g4hH8a4UA194W2GAnQS7 e5SpUdMX/zkg4X6M7igeYRd7aK6ckBIw5OWeCRFjW1QHoAkb8YZRD7HGOnb08eq4G7iN 2jP2c8Kd+qG5f/4thUJ8gmmpk1Gkg9RbtOdxxxp7Z0Wgk/X5PJiZc5+3sCz67WRU6GZ7 QeWi8hUPLu97WqaIq/WOOK4DvTIF9P33sIV0/K4R3uJT0PtbZCLQOVP/BA3VdXht+jQr 5K2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205351; x=1784810151; 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:content-type; bh=dqyPARbkh64mZ2RIOOLnv5zdbrEo4chMNue1KyyBAxw=; b=Vde0avcIduW+Nk/6fhDWwMSEezq3B644i0AX+gOS/qIgWeioLaePzolqNkB/lgwvGg +MDcwlAwXqsr9BnhbmB92AP6kga8Jc2p1hGEpdcDf5H1I+GjpbVu8clFLjP7hl6yphP3 avCWeYHWnfn1yc2Yx/W43Zb0zSubPVTSgm4Q/Kgfs33MGd2j3qg/u8Cx4pEoPhl2VGwS 76JlV4LALGDJAsj230BIoCxwP1Jb0rM3tcVZZrITz9wcESVMk4pa9fWnGPL/MvBC8yoO CdT6wsvVZY9vEUwZzzxTROFhyvSRezNSE1JoYnRf1mwBEN78pHF+/I6MNZdAqIxe//q5 eu2w== X-Gm-Message-State: AOJu0YxVV9sYa0dVJtZORIkkl7zc/bcirejIDCdqdLJYufwg5r6EOAmO /Sc2B7nzfMMbMcsNQ8ZUh1zPStE9CyxkVU0+7aMnS4tGmvjFq677nJq53LD//9C3+ZahphkgF98 VsbMk0LIU9sNumpxYzrVX6piVHqGR+gWoYS+JnAdxbo4LvcBXqOG3p6Zq5+q7hTZ66A== X-Gm-Gg: AfdE7cnXXHBvf70olnlSANpKP8h/HBbNrhBQvaV57GC2MfL3Q8FjFDWQ1yXC6L1oE8P W3aqpe3dqHia6RiQ8XjiRE6FqIKX1RUskRJN/7FasZX3dP0jMkfBcxkwvv0QL8BBQqPZyFMABfn AA8gg2s3XFVPJSWJladzDyO7oUDgtNGNEqeRQgHthn8aK1fR7RWG2SCDHI3IZ/1VclQJwSg99hl 6PTj8iFzlb39hecibtke8gJqfN8U9lNyj8p8MYDzPHynFqzyMQJSl2c6Zu+m6TAyx5fS4z5ufGV dE9FCYjrmLzWLnq8n2udaTGLXXvhE/Km+y5f3JzjaTLiAkXYWJc0Wic5iD8PZYZH8wYBdbXHZhM WtJPB1V7rBZZYNfIKVI8o75zrIsKNgX+8jPI= X-Received: by 2002:a05:622a:4a8b:b0:51c:1408:6c13 with SMTP id d75a77b69052e-51e4f0baafdmr73387581cf.44.1784205350954; Thu, 16 Jul 2026 05:35:50 -0700 (PDT) X-Received: by 2002:a05:622a:4a8b:b0:51c:1408:6c13 with SMTP id d75a77b69052e-51e4f0baafdmr73387121cf.44.1784205350314; Thu, 16 Jul 2026 05:35:50 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 03/17] target/riscv/debug: Implement permissive type unavailable trigger Date: Thu, 16 Jul 2026 09:35:20 -0300 Message-ID: <20260716123535.3709148-4-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 45DSxktg6oTph3Vxc8TvQuLj2MGPFw1L X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXyYLAkI+CnIFl zTfAW9GMD1EsPGGv6017ptbapCGtdtiLvFVio8BiwN2WtiU5M11Z2vXk7AJ5i2Lt8yBF4T9YPJC C4rgV+giZZWqFiIPIOmJLrWAs73Qrlc= X-Proofpoint-GUID: 45DSxktg6oTph3Vxc8TvQuLj2MGPFw1L X-Authority-Analysis: v=2.4 cv=PN8/P/qC c=1 sm=1 tr=0 ts=6a58d028 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=8_OeMpcRU3GNJPBcLSAA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX/5HT/hy+Vduq N/V3UX+iIX/ji+t1KyC7nQRkankbyeVSGwqJu4FMkMkxw5GIh25zKjW6AZJS3mibYnfN7AYkuXE 4h4vbOCfNHK9CL6DZeg0RDG94Sw1TG0yxLK54c3jHnZVssIwoYSweSdZpcjb/ZTRdycI4/6ISH7 pHuTQRcQF8qG3Ht29fa5B0WoTDaeO/EKNAkELFnPat63UyC5G1cxeudeqH2rRceQS8+swGmu5T8 7ZOh/SSwuz2Y9s3VDfKUanTcMLyVN8spqs7VfsGlwBN+8JnsQS6E68tiUBX+0dJTQisQ4oBm5/4 oredl7Y5FDX8xTlaoLSr3YaSKe3k0aK6TEkTc3kobUQmMgjKH0EQq07O2wlNL0X/PwUXb1GlBFL 53xnp9caVfDIQjEgBH50TQELBli3R0wB0Yh6lIjZDHzJA1RO1lqF58uKJkM70i2kCmPvZDY2ZTm p+mVedoorsoYLBLJgWA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 suspectscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205413382158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin When a trigger type is "disabled", tdata2 and tdata3 must accept values that are valid for some supported trigger type. Additionally, writing 0 to tdata1 must result in the type becoming "disabled". This is important for the prescribed sequences for updating triggers. Implement write tdata=3D0 -> disabled behaviour and permissive accepting of tdata2/3 values in disabled state. This implementation could be improved by checking tdata2/3 values against supported trigger types, but it is good enough to be usable by software. From the RISC-V Debug Specification for tdata1: Writing 0 to this register must result in a trigger that is disabled. If this trigger supports multiple types, then the hardware should disable it by changing type to 15. and, when type=3D15: This trigger is disabled. In this state, tdata2 and tdata3 can be written with any value that is supported for any of the types this trigger implements. Fixes: a42bd00166 ("target/riscv: debug: Determine the trigger type from td= ata1.type") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza Reviewed-by: Chao Liu --- target/riscv/tcg/debug.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 9e6c907742..c7cc67e244 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -829,6 +829,28 @@ static void itrigger_reg_write(CPURISCVState *env, tar= get_ulong index, } } =20 +static void anytype_reg_write(CPURISCVState *env, target_ulong index, + int tdata_index, target_ulong val) +{ + /* + * This should check the value is valid for at least one of the suppor= ted + * trigger types. + */ + switch (tdata_index) { + case TDATA1: + env->tdata1[env->trigger_cur] =3D val; + break; + case TDATA2: + env->tdata2[env->trigger_cur] =3D val; + break; + case TDATA3: + env->tdata3[env->trigger_cur] =3D val; + break; + default: + g_assert_not_reached(); + } +} + static int itrigger_get_adjust_count(CPURISCVState *env) { int count =3D itrigger_get_count(env, env->trigger_cur), executed; @@ -885,6 +907,10 @@ void tdata_csr_write(CPURISCVState *env, int tdata_ind= ex, target_ulong val) } =20 if (tdata_index =3D=3D TDATA1) { + if (val =3D=3D 0) { + /* special case, writing 0 results in disabled trigger */ + val =3D build_tdata1(env, TRIGGER_TYPE_UNAVAIL, 0, 0); + } trigger_type =3D extract_trigger_type(env, val); } =20 @@ -899,6 +925,9 @@ void tdata_csr_write(CPURISCVState *env, int tdata_inde= x, target_ulong val) itrigger_reg_write(env, env->trigger_cur, tdata_index, val); check_itrigger =3D true; break; + case TRIGGER_TYPE_UNAVAIL: + anytype_reg_write(env, env->trigger_cur, tdata_index, val); + break; case TRIGGER_TYPE_INT: case TRIGGER_TYPE_EXCP: case TRIGGER_TYPE_EXT_SRC: @@ -906,7 +935,6 @@ void tdata_csr_write(CPURISCVState *env, int tdata_inde= x, target_ulong val) trigger_type); break; case TRIGGER_TYPE_NO_EXIST: - case TRIGGER_TYPE_UNAVAIL: qemu_log_mask(LOG_GUEST_ERROR, "trigger type: %d does not exit\n", trigger_type); break; --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205421; cv=none; d=zohomail.com; s=zohoarc; b=AYjv14Bdwjcd9Lg3ImGafN+dZyQDdVOXwFDB4oXlNOWCZuu3wj/QXeYfSIACfUbo75zwJlWnRClP/cMgEmuYELnou3oukPZNGFn5kWi4QefNOqKZFTOQvwihu/wy5CPaXu13QUPCa+O9JI0sKy+h5lX4XvjsEBi9vKGLX9hh7WY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205421; 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=xVKgmhrQqCG5s8l5RR3FoMoYNCYBbCj8oJ/t0N3RTyc=; b=HDUT7LTADrKcWvXImmLneratz6jX3SRWqV8acbGZqC3wugM1O51lpNFGp/Hg+il+TM74GvDw7DMrtmEfkkW5pqNB5CdthmgbEoPk3Gjiwse8G4vbJYgUlxtHN9G8oTcprBL3h8IzH3SZZ3CbvTQ/NFeCeRt2D4tX0659WK7gCxo= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205421199950.5053822410899; Thu, 16 Jul 2026 05:37:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJm-0002j2-Jg; Thu, 16 Jul 2026 08:35:58 -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 1wkLJl-0002il-FC for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:57 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJj-00074P-Q6 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:57 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiX2p2475183 for ; Thu, 16 Jul 2026 12:35:54 GMT Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fetb7scds-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:54 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-92e8004d60eso646558385a.1 for ; Thu, 16 Jul 2026 05:35:54 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=xVKgmhrQqCG 5s8l5RR3FoMoYNCYBbCj8oJ/t0N3RTyc=; b=SakO2QoPkyZ4fAb7Kd0zWOJ5Sfl FgyHZ6P6YL1rlyKWk1Gz/bcitfpaIhVm10iqmZ8pz21viYZG9SZEPp4Kums6wQ+V 1FOHV055cgsgbdMUb2OyV8/YsI+g2aQ8eKLUa2bSIl/4vl0noDw4sEmeCTNwb1DA Pc2jal5oLi3ez5fdbgX+YyKDZ2bduKNgP7lWIXTN9HXMnFTFifKRSZ8oCqANi2dY m9qCLjmL/8t0vrq48rXtDd9gQFUB04Up7M20UrIhN0Y7aJnUrfQODDK9IO7dW+ar Hd+AfUi0r+Su1ZH8Qf7b931SpnGslHgYLdk+OjiS4nMFJp+zcbGTGCsUWKA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205353; x=1784810153; 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:content-type; bh=xVKgmhrQqCG5s8l5RR3FoMoYNCYBbCj8oJ/t0N3RTyc=; b=TYNhM7+qU7tlMpVhuDeYxCuWp8GG/tS/ldcRTD4w4O2nGi9xe8dj2C9W9lULsjc27n TFNHajzA3bmo1oVtIK3nrYW58Iqe1RIJBydk45KYsJvOCXnm0Q7oGhHNk4DAq2XRZ4JQ qB8HqG1/Ym11jHdCsJLCKP4ZldjyWZDFxkhNjVFsN26QoqtdzC7HdDQJtgaqLraXD+eP XDmA/OmfLE9KmB9/NSkEysSr9sLYtn7ytAUaCKl7JVOHJJ8goP6FQ9C/Y/9o4ixloPZD MHntNayXM1ddCIPVvYDE+fI0rVwMPGA6EAmD3xTAjH7+fM/RsbQgH3LpmeqcBT+rEPvg UiRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205353; x=1784810153; 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:content-type; bh=xVKgmhrQqCG5s8l5RR3FoMoYNCYBbCj8oJ/t0N3RTyc=; b=aBI+RKLu2AJd3mswblPWtMRjSuT/bPTcdl5K4cgXvDSKMk5WFQQsIU3fIIhqvViMx/ q8N70UvBCaUJ2RgCcrvltX0b8JA+lRABTrWSDBxT7BCErlYZwl2thEmwbF0kR8drkJCM jQlJwYvqHOCdOvkQeOeLIYOZAiQfLXK6ttjRPmrUrLonxL9zUl+kl4jaTfj/RxvkmsUY accpwaXRCNitKV9GSSsEMNiLhmmEMEuIWUlo1pI+nIpAkIpL6sKi8SXG8iKi1urnEfM1 yByZFCs9LbOl8MqP8Qi2rScdPbWNwQ6dA+MfH1dUrMsr50b6IvrVHu2xEofqn+5aaHko 8U3Q== X-Gm-Message-State: AOJu0YxCuSRbK6c2nuxOTooTA1KVcY7xvGXC+tY6CarCUagN1sXAHzm7 XYkMrdC9EunCX8Ut7r1jNAjUWleuX5RiJnc5+4cIILQgAsvKDURs8i32Lp6medQo2Nrh+jq5Xl4 /1cr7oRBdCQMPXynylpuVlGcZLfNTQikj14TzFLWgYVx8AZITd83nMIr9wECeo3qeHw== X-Gm-Gg: AfdE7cnP1USbgqOcWB3emk88IQpU7vrpLlN1HfmJWVCvWdwfvSeSjThzXdj2pVJ9Yly frFt99MrGdMA1I2MGIGVWX3d8zimyXGhhUDrexFxtr/iayyb018JRQXLkrbi3rWifOTxTaboNfc 8ehksFpwwj4d6oUSaiAiOnBbZznkS7bI1lQ3WyLIEfPA+eVeH2gdQC1ikeZSTBslNJGdG2KWDU9 sX/dG6sekB33zMQtP/5OZ7PAufmy6evtEsFEHtuHxKtTfgDMj+nVdwtTFwD22jGsHJWYamuFGiT JkVUIUN5NDlyiJB77Can1RNujSBjOPKBZidnFrd1GAbnzwqMRwlgZ/9PlkBKO7e+nO9ySaWnDXf /V8usyCoC1h250Gf/C0dGJPY2JSnDnmohP78= X-Received: by 2002:a05:620a:28d2:b0:92e:c118:18a4 with SMTP id af79cd13be357-92ef2c825dfmr2250868385a.87.1784205353330; Thu, 16 Jul 2026 05:35:53 -0700 (PDT) X-Received: by 2002:a05:620a:28d2:b0:92e:c118:18a4 with SMTP id af79cd13be357-92ef2c825dfmr2250864485a.87.1784205352911; Thu, 16 Jul 2026 05:35:52 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 04/17] target/riscv/debug: Fix icount trigger privilege check Date: Thu, 16 Jul 2026 09:35:21 -0300 Message-ID: <20260716123535.3709148-5-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX9boGFYDun7j+ lMAlOhlRslwlMjdtKAp4/vTtFCqFKfxy1wPTp222+h5HpOh5BJMdHpvLrqkCRfMM9I+Lux4hMN2 Fny9ezljLnNqcgbh7W/afYkfjT7vMvI= X-Authority-Analysis: v=2.4 cv=dM2WXuZb c=1 sm=1 tr=0 ts=6a58d02a cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=lykhd8fEm9kB8mzSwosA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX/EExipYk1tmr sKX05op3Y96CeoTxALOFHE9Lbx+i31cVsmbNNQcHboPnZ2MBJjBTdPv/894fyrKQysCOVn8hXq5 itpewdB38Sy9Yce6KJFwj/33O26gQlw3ubpjuTmU7STcGxMoY4HVyjBkMtW0LGER0WjdwLY+5u3 S4zCqJfPt/mHM/vfWiICt63NJpqyyfx82scYZ0vQtBU2POSENAhYAfv1ofzIp+k4g1pdTPS3Q3D At51dtf0Aui5IM8CF44hf2t1xbj9G71Lo7fmcLHwjTX6KuhzrU4IU7quRdDjBt74gYizhEVnNse yxRNni1828LlBgduu1Vk+6M4YZHuatGwMHDlug3nQ4JfZEwtJl13qLZB52nxPOZoA0APllCAziH JclPeJRVjXaO0hp817fHQTbC9CoTtsE89vLMH3gybYBbFjlLBCGFLK2OWGnZ4w2z/KGjjX5uZ5V GsQ6xxuhHhkKDu1GNnQ== X-Proofpoint-ORIG-GUID: rUgk1tSq9KX9vhfDVtK0NzS9u0bXdrLb X-Proofpoint-GUID: rUgk1tSq9KX9vhfDVtK0NzS9u0bXdrLb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 clxscore=1015 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205423385158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin The check_itrigger_priv() did not check privilege bits properly. Move all priv checks into functions and have the icount check follow the same form as the others. Fixes: 2c9d747121 ("target/riscv: Add itrigger support when icount is not e= nabled") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza Reviewed-by: Chao Liu --- target/riscv/tcg/debug.c | 82 ++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 45 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index c7cc67e244..3c777694e5 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -308,48 +308,50 @@ static void do_trigger_action(CPURISCVState *env, tar= get_ulong trigger_index) * Check the privilege level of specific trigger matches CPU's current pri= vilege * level. */ +static bool type2_priv_match(CPURISCVState *env, target_ulong tdata1) +{ + /* type 2 trigger cannot be fired in VU/VS mode */ + if (env->virt_enabled) { + return false; + } + /* check U/S/M bit against current privilege level */ + return ((tdata1 >> 3) & 0b1011) & BIT(env->priv); +} + +static bool type6_priv_match(CPURISCVState *env, target_ulong tdata1) +{ + if (env->virt_enabled) { + /* check VU/VS bit against current privilege level */ + return ((tdata1 >> 23) & 0b11) & BIT(env->priv); + } else { + /* check U/S/M bit against current privilege level */ + return ((tdata1 >> 3) & 0b1011) & BIT(env->priv); + } +} + +static bool icount_priv_match(CPURISCVState *env, target_ulong tdata1) +{ + if (env->virt_enabled) { + /* check VU/VS bit against current privilege level */ + return ((tdata1 >> 25) & 0b11) & BIT(env->priv); + } else { + /* check U/S/M bit against current privilege level */ + return ((tdata1 >> 6) & 0b1011) & BIT(env->priv); + } +} + static bool trigger_priv_match(CPURISCVState *env, trigger_type_t type, int trigger_index) { - target_ulong ctrl =3D env->tdata1[trigger_index]; + target_ulong tdata1 =3D env->tdata1[trigger_index]; =20 switch (type) { case TRIGGER_TYPE_AD_MATCH: - /* type 2 trigger cannot be fired in VU/VS mode */ - if (env->virt_enabled) { - return false; - } - /* check U/S/M bit against current privilege level */ - if ((ctrl >> 3) & BIT(env->priv)) { - return true; - } - break; + return type2_priv_match(env, tdata1); case TRIGGER_TYPE_AD_MATCH6: - if (env->virt_enabled) { - /* check VU/VS bit against current privilege level */ - if ((ctrl >> 23) & BIT(env->priv)) { - return true; - } - } else { - /* check U/S/M bit against current privilege level */ - if ((ctrl >> 3) & BIT(env->priv)) { - return true; - } - } - break; + return type6_priv_match(env, tdata1); case TRIGGER_TYPE_INST_CNT: - if (env->virt_enabled) { - /* check VU/VS bit against current privilege level */ - if ((ctrl >> 25) & BIT(env->priv)) { - return true; - } - } else { - /* check U/S/M bit against current privilege level */ - if ((ctrl >> 6) & BIT(env->priv)) { - return true; - } - } - break; + return icount_priv_match(env, tdata1); case TRIGGER_TYPE_INT: case TRIGGER_TYPE_EXCP: case TRIGGER_TYPE_EXT_SRC: @@ -667,17 +669,7 @@ itrigger_set_count(CPURISCVState *env, int index, int = value) =20 static bool check_itrigger_priv(CPURISCVState *env, int index) { - target_ulong tdata1 =3D env->tdata1[index]; - if (env->virt_enabled) { - /* check VU/VS bit against current privilege level */ - return (get_field(tdata1, ITRIGGER_VS) =3D=3D env->priv) || - (get_field(tdata1, ITRIGGER_VU) =3D=3D env->priv); - } else { - /* check U/S/M bit against current privilege level */ - return (get_field(tdata1, ITRIGGER_M) =3D=3D env->priv) || - (get_field(tdata1, ITRIGGER_S) =3D=3D env->priv) || - (get_field(tdata1, ITRIGGER_U) =3D=3D env->priv); - } + return icount_priv_match(env, index); } =20 bool riscv_itrigger_enabled(CPURISCVState *env) --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205543; cv=none; d=zohomail.com; s=zohoarc; b=Uusw6iB1vbbQigI71KzWWIVUBGRVDUypmwJmyAF0tAw8fn3bcV103qiupCF2tXZQuyS1/XmgTB7TRkMEyGnhzJHQeTw5N+Pag/A+MtB4L36LEGJ0zFK6VUqgHYacsqvIKGDGuuyP+/N1pdmyPds+l/CLBlXVjTmJhvrn422iyM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205543; 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=EwwBYvHtwOVuP6r29PDkDTpXbGkGPBuCEacn7qqfsz0=; b=IjQXtgzSEJZCmOmG4ZLHg9kQFUA8qSfU2mGvcjWU58Vs0k2dNpX9WKMnB0mZxHQu2hxHfpH9OHmekN0Zp42PcKzqOZMjBXuRSoGhb5+nF6Ra7Ki7E/ZG/XrTJHiIQoCCD4kAD1F/VxbtFgMFWkPwWAI4V0PGf9K2gDWdVT+sMIE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205543465458.1696316863233; Thu, 16 Jul 2026 05:39:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJo-0002jv-Gb; Thu, 16 Jul 2026 08:36:00 -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 1wkLJn-0002jA-AF for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:59 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJl-00074u-PA for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:35:59 -0400 Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiOis2518328 for ; Thu, 16 Jul 2026 12:35:56 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fevkv0ss3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:56 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8ef18406878so116635836d6.2 for ; Thu, 16 Jul 2026 05:35:56 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=EwwBYvHtwOV uP6r29PDkDTpXbGkGPBuCEacn7qqfsz0=; b=TNr7l98osvHvTOMGHPYcrilC6P4 lB2+ANSpRyT92PUI4XlBzP0gyHcVaUdFPIgWOSB7AJm0Lk5ncFHodEl6weMr1Usq xY+nuOP5FJRz36S0M1rzi0hHMgCEGdaEtOEvtv6SxY3UB35COwutCtCvnzG/I2J2 jDwsnhtfgNneabRQ4hPN09z9cOPFvxDuXG62Ebo7x8bE5siF8b8Y1EIy0kUu06hn 6iYb/4QIz1ptnygavxn4t5NYg6OmXqmy4K8IzrWs0ny6KgLgcPFPOd2c8iktLbJw tr09QQ84ZjDleaYE1R4WYT+fX/aZmnOD3+yf8XAU0xTeH2kCb8XlMIwID3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205356; x=1784810156; 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:content-type; bh=EwwBYvHtwOVuP6r29PDkDTpXbGkGPBuCEacn7qqfsz0=; b=XUv/M7hhni9YKMWRZrtbKWoiI4Tt0rjhfV89WhEonWA9N9b2rqxJAZfX99gy4u7V0W 8LK9JGiVAIKQfAUmZroGNJX8/yt3WRJQDh2JynSiICthAnI1dvJXGuPMDeg3AZhiETwV xo0GELNc5Zjk7q1M9JeOs0lcCP4U0Qla3lr10dH+6wfrkSLrI02CG0qH3k9lOdR+SDJE btjAtbITBPucJn9wrsGJRhXRXQb9nC54DulPabLDOHZtzQt+NA9uDnOeJWUt12iGe2/c 0LepcABhE+fPQvXa3fTTVxItijO3aoVNoxcS5h95SfbMS8FV3QaIptkjYIR/5tVxVVav QyvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205356; x=1784810156; 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:content-type; bh=EwwBYvHtwOVuP6r29PDkDTpXbGkGPBuCEacn7qqfsz0=; b=Z8xYaWVHybX4yvAz+LKxZLDk4Kix6icYhO+rwagfK9AHdKhrhcm4k4/kDHp1Ki6RA6 /E90gFI96X8mBBzx4w24F6EOeDY97BfapxizGpqeYy+hzY2m+uD9MgBdfOtRw81DpIws nZeRQvv9i3T2LPWKqAaKP8bWxfZe9v1CwL5wqyYuD8U1Jr6pUo3MGwHjOKxhUHM26vZA 9l0VqlHjRwey5sSXQ+Gqz7+PhJey8sSx+JBjv+DMF2atwSakqng4czZiaFWxMgRLFQgH PWZQQy+7FlszCEaTYMF0lBDLnrKwMsQHPifOz9yByqN8cpj7a9JpVRYkv5Uc5WWtB+Lq 8PqA== X-Gm-Message-State: AOJu0YwBeJKy0zHGtbooMzcKKW5BgSBgTyyYnWC1odvdgATvM+gRrUig 8XptpFKQLCZqjyvB8rYAmSvnRzpMxq6gv2GABHalnr2rLVuB+uNZqPP5ASnXJ8/gimV9WegLBaj 38lBiRpQy27fMawddG2NZZR2X31Qv3QYNT1z4a0spdvYfa/he4UI8B9ML+1xc9ehl2A== X-Gm-Gg: AfdE7ck9m4i8cZoxEtyBNwP6Hl5I8VsCtzY4Elpl56IaBJPtLTRFv50SG1bgOoWbjuQ uf5wGuEN370r7LL8l/Yt3T+UVkx+KBbesHlcNAxeeZVGJPZXqIJMN0HArEem8xeKlhLGX+/8QRc yrOBA/LUudJRQRlGEkhnGyiJMnhQCGPbdtAF7QitVoZScOId+AI4tcMcBcGIcQVwLpMoAKvQiuD 6DT/2n7CXA5ZIkbzDNBtk1EQ2z2tO52JN5/PJHksH1NmdEgoVph/IdMZqSseCLGUdXGjuE90yK3 oC3H8fdoOFXGtYrj3gPn+FVk2r5G0WtDIbG20jPK0huDtwav+kNu6RqV7Y8IQbWS/G2Jjn++0H0 +joLL6nI3wTfp5TbvFBHghv8T3JXr9YK4iD8= X-Received: by 2002:a05:6214:310b:b0:8f2:d87e:29de with SMTP id 6a1803df08f44-9074c7564d9mr135326796d6.27.1784205356060; Thu, 16 Jul 2026 05:35:56 -0700 (PDT) X-Received: by 2002:a05:6214:310b:b0:8f2:d87e:29de with SMTP id 6a1803df08f44-9074c7564d9mr135326196d6.27.1784205355475; Thu, 16 Jul 2026 05:35:55 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 05/17] target/riscv/debug: Update itrigger_enabled after changing privilege Date: Thu, 16 Jul 2026 09:35:22 -0300 Message-ID: <20260716123535.3709148-6-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX5VoXC6E0HflX 0QcVj8ZrYGVswIzig3MLeeRCbE8bPGZTC+NAjwkG8puHnqcqc9IcmzYKXIrk+paUatQJGuOLJu5 5zHEYX4sml+qA9FGKbhVG5SjR5Vy7hhrMToa9WquV97X1Oc1coD3ObtHWsujeoddRJ1NCPbdqsV LXbA4Zzrs6O9nofxxXgWwX6WIf9Gdnk3A+ysA/vZgahCsTy5n2UgQ3iYLsb8zIEXz4uv/ASo+ij cKep7KWAR3s8YhVErLz7rT0c+DTQiGfVmxH53FbhzFBADOUGzj5ZLP6tIH1WBlQ5SOoaHcOpmdc u9M1A+KtchUJiMMXT0tWpsIjndgCR4sK+KODBzbXLo2i5P+phQqNdO3qEXS4w7klOliNrp2cw2J we4836go7pRmL9GUV8XBsrgKBTy+YX9JNylyLdM0PgW59Ds7BmFZeSLBYefz4flcjSBHA+4vPRf 0H3QuHYoMuUC75PSTwQ== X-Authority-Analysis: v=2.4 cv=WrEb99fv c=1 sm=1 tr=0 ts=6a58d02c cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=iX2v3MgVREIc0uGqDXMA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-GUID: Y6l9vfCUyVU4OKz2A5oKG1-vI79tp0Xn X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX4oa+vnjTMXBU PocC6RJ23mIx9LWNGs86wJbs3H2kykpLKvPMlI9pdCoMIb8Srboc8LVEVEGULInZu98f4dBIrSI JSaQMBABWEkAS5UD2rOX5DrLVBRLYXU= X-Proofpoint-ORIG-GUID: Y6l9vfCUyVU4OKz2A5oKG1-vI79tp0Xn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 priorityscore=1501 adultscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205544035158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin The !icount_enabled() path should update itrigger_enabled after changing privilege, which can change whether or not an icount trigger is enabled. Fixes: b2d7a7c7e4 ("target/riscv: Implement privilege mode filtering for cy= cle/instret") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/cpu_helper.c | 7 +++++++ target/riscv/tcg/debug.c | 7 +++++++ target/riscv/tcg/debug.h | 3 +++ 3 files changed, 17 insertions(+) diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index 07d9222652..6c18526c49 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -844,9 +844,12 @@ void riscv_ctr_add_entry(CPURISCVState *env, uint64_t = src, uint64_t dst, void riscv_cpu_set_mode(CPURISCVState *env, privilege_mode_t newpriv, bool virt_en) { + bool change =3D false; + g_assert(newpriv <=3D PRV_M && newpriv !=3D PRV_RESERVED); =20 if (newpriv !=3D env->priv || env->virt_enabled !=3D virt_en) { + change =3D true; if (icount_enabled()) { riscv_itrigger_update_priv(env); } @@ -889,6 +892,10 @@ void riscv_cpu_set_mode(CPURISCVState *env, privilege_= mode_t newpriv, riscv_cpu_update_mip(env, 0, 0); } } + + if (change) { + riscv_cpu_debug_change_priv(env); + } } =20 /* diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 3c777694e5..a0222e178b 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -1121,6 +1121,13 @@ void riscv_trigger_unrealize(CPURISCVState *env) g_free(env->itrigger_timer); } =20 +void riscv_cpu_debug_change_priv(CPURISCVState *env) +{ + if (!icount_enabled()) { + env->itrigger_enabled =3D riscv_itrigger_enabled(env); + } +} + void riscv_trigger_reset_hold(CPURISCVState *env) { target_ulong tdata1 =3D build_tdata1(env, TRIGGER_TYPE_AD_MATCH, 0, 0); diff --git a/target/riscv/tcg/debug.h b/target/riscv/tcg/debug.h index a25d099b37..88d34ecac9 100644 --- a/target/riscv/tcg/debug.h +++ b/target/riscv/tcg/debug.h @@ -153,4 +153,7 @@ void riscv_trigger_reset_hold(CPURISCVState *env); =20 bool riscv_itrigger_enabled(CPURISCVState *env); void riscv_itrigger_update_priv(CPURISCVState *env); + +void riscv_cpu_debug_change_priv(CPURISCVState *env); + #endif /* RISCV_DEBUG_H */ --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205446; cv=none; d=zohomail.com; s=zohoarc; b=A8JQmAUtCB0mEmyogGz+f+rLbtFace3hTyw/BztBslzaAO0PC8ZqZylXwC5soD1+Mwkr3o6dMuwCVZJZc4Gs823SnGOb+e2ahPXKDPxmvB+cKywJYwdBRvjkDyYRLWCVl7rx+/rA9g7hrs+NEQVoyVNZMgPPvteO7NamFf0P8qY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205446; 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=3U5w+q5/RVeU3CUxIewmMLTwjtkYf3sNkyjj9YwHRGs=; b=hGEcfhx9/pIwqP0YMvdopcbxXhqDyMd5vV/QiXw5Xu9iiEE4GIz8dJBXWLP51jC6l/rNz0/dXyjkvTKMV7pj2wYHORvElkFPvG4/nB5Dpg0WfReLD2NDTZxov/tmunxRPq0mW3EguxnOWdebVVuaxFY7FI4y2s7vaoOcQ+y2USI= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205446538135.61809209816852; Thu, 16 Jul 2026 05:37:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJs-0002l3-11; Thu, 16 Jul 2026 08:36:04 -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 1wkLJq-0002ka-Ha for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:02 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJo-00075c-HY for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:02 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiSvc2754590 for ; Thu, 16 Jul 2026 12:35:59 GMT Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feu10976m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:35:59 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8ec3314f65fso113943936d6.3 for ; Thu, 16 Jul 2026 05:35:59 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=3U5w+q5/RVe U3CUxIewmMLTwjtkYf3sNkyjj9YwHRGs=; b=QLOAUfh+xpVPFVG8M4ZgunnVvnH DKmuYayXGcYEzH4Vau2T2kXrA6pXD5K/LzoWv/aBFnXmUgwTmrgO8OXxrqp+OnuO KNhGEgp/z3+g+uq3I6UPK4qskwXRXw/r9bhjqbnYD80Ewu2eturV11AXFrMHEGxs wTTWrf0DraZgzu/xUpV8TnL+2V3hl1hkCrEN992+IgKGSI6wBjlg/GMU6YnAJvcL sEw9WYcLD+dIzkVSI/uZVjmhI0bjN9R6387ilQI0S1ftMCsEBo2a7+LFflOdNBfm crU88kP/BV+guE+SAQbzbBJ7KQ4bRB5u0jxuHZTDixyI5snMwh+AvsfAb5A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205359; x=1784810159; 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:content-type; bh=3U5w+q5/RVeU3CUxIewmMLTwjtkYf3sNkyjj9YwHRGs=; b=I4VPa3GAbsY5NkoLmiNeuOR0zO8nldm8rvy//AT0VO8hreCZ9CoJhEqo4yKhkUiXmQ Zu9wWxgF1GsUyVsffokcn1mdLeGgsOhJX6jOGKgOaH8NSKPHuWshW4GdAXsu/iT0xz7G G5U/EXnYEJuJ9X+f4hxC3FcQENQPTOfD/1HgLUUClWyOGbZoF4HNSXUJLUbTjsdLh1jW FmjcdeMd6KSDboUNBuED+A9AJw9XFaOjeCJ712dR3b0bfSzmHJQaG+teq9hjGcT+0JxL XAPITnHIcs7Ql57hi/bX3jX5J9IDc5yFKQBvsSevx+3DxRIT/7OP8+a+RWHW1i1f2Wkg zQXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205359; x=1784810159; 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:content-type; bh=3U5w+q5/RVeU3CUxIewmMLTwjtkYf3sNkyjj9YwHRGs=; b=hivU1c68DUBHsNdq1SFqB5b+j47p/+yJ8pDzQI1WiVUXbJsy4jMJQMemoPXFPpnDI/ YyJnRLJ8gwzDROiDwFZ8bubef7VnyNN9fy+swbEYPrQ+hcm5hkuOIlhqk/8V/vdxnqwC LFzkeKI1SOO1MpDHvVmbKagmwaigH3pG1sUUH7N91IKpSt0ZiJwyrhfK2gWU0QO0LFqZ RmJUtgiV/i50ZgpQcnTmaMtD5/wk0OrZGWdbELCRP0cGEhG/gW4qJq/UvJR84tVrnh7l brh23Ia9bRN4zfJjcG37qjHtfqliZ9Ut9L18hvT2INJvRfzxcKs4c8IuukTaFnonLwTs Jy8g== X-Gm-Message-State: AOJu0Yy9ST/9lfWbiBGapdhdZpUWmOyv7CN1GA/NFDgDmMzbd7L3bkae 47lAV+cybhKdT/In2HVBbvsgtNLHG6DGVe2IFKT4yaC7bONIOb+O1C6smtHHBpp8/9OHH3VXc8q Lwy0sg4wuphFLl8eIji7faENdHN5XMmjUG2xcDmp0Z4PNF1y+WyabOSUEeSW16j4xNg== X-Gm-Gg: AfdE7clZsz9bqm6npKaGPvK6rPqOT+SmvaMuOOUCR6GfGXPzSNHQToyuHIub9eW6/a7 1PAXP8bOXs4aKVYUghLxNgltoQek6hnK7HZ5IBs04jsQ/l0ATLcFetTNG4JUq58r0svP3yfLc4S A1oRlObCMqyF/Gcd4su2eO8vmx/gMXQegVzTukeUD17wZsc2vjBpum+F21By7EJkRTk8bPEmuIY 1t+tifQS6WGBSy86CtAOa45PWiCW6DIZcKdt9+r8zkwTqhFAfkO3VfLgqTkvttgaQAfZOb2z9ZH eF6cQJNz1eUxaLY4jWTnsSpmY8CBeyCrSwaVTN9qIP6IXGgVF63t1da4sDkNWr/OSbYBw3C+R/7 JC/C27duNWqgCWGxsm3+ieJAc1REh6J/HMBA= X-Received: by 2002:a0c:f405:0:b0:8e9:f5de:d5be with SMTP id 6a1803df08f44-90758e355f7mr72517226d6.53.1784205358677; Thu, 16 Jul 2026 05:35:58 -0700 (PDT) X-Received: by 2002:a0c:f405:0:b0:8e9:f5de:d5be with SMTP id 6a1803df08f44-90758e355f7mr72516786d6.53.1784205358139; Thu, 16 Jul 2026 05:35:58 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 06/17] target/riscv/debug: Implement get_trigger_action for icount type trigger Date: Thu, 16 Jul 2026 09:35:23 -0300 Message-ID: <20260716123535.3709148-7-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: -vmFd5GBPIdE_a7mLWEjdmjyJG6EAFSR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX3W57lZNSFZDo 02wpXaplPj9JjQckfl2PpfILS4Ts69jN3NMyx3e8JVklxDS2YHfdEgMrWeGHS3oc+8M/gz2KIVr Ayzw6a9fOmZqnyjHEwZX20gR86OwBOURcajXUXNN2og8A25Lf+Y4BLfMyN2fByQbrad40j08B9M KbDpX9QKnXGfMAB/lwWev0VvK3PxRWjdREiRFuwshOygrhWrUFRA1fjs5hBHLA8MLFiZT1P7qUO GPPps4n1nJJCjN2sp86dfX+XOGdzqEOAmN7SejYQeDNYDDk2NRSNxkWsYuaRTZVuoVhh3O7GuWQ 8z6bELd6yBaRfuw5dk4scAEMIga5hXm3nM95XTAkskckM/nHdB7BCqYUAhf/mS2l5E0bsQLbau2 f82mMbM5RtDmnhpMY5tbE9EXcoyJmTTe7HII2mye+CHHE0dmzHnDfoSCIfOzRZyvk/neypgL/SI nDYVCSfr+ictETsZnnw== X-Proofpoint-GUID: -vmFd5GBPIdE_a7mLWEjdmjyJG6EAFSR X-Authority-Analysis: v=2.4 cv=BPODalQG c=1 sm=1 tr=0 ts=6a58d02f cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=xP8YGnA5bjBj5bUqXB0A:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX6uHZmhE9GeWV BGAQhmtNCsp6is/1WjZEvnERKbp3zqp6csCb+HmpuXUOZyKDBPfGJ/X5e5EPOxg7rucnciL6pAI ttXOUqFZfjKGIUmdBV+RNP+lOPRiu7M= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 bulkscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205447465158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin ITRIGGER_ACTION has been present for awhile but get_trigger_action isn't implementing it. Fixes: d1c111411e ("target/riscv: debug: Create common trigger actions func= tion") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index a0222e178b..6aba7e9e12 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -112,6 +112,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: --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205421; cv=none; d=zohomail.com; s=zohoarc; b=libxGXid1Tc1oEr3V7oJZ88mBmj5YRQKj0XMBoNKk0tAiyEFO2/NKP9sFwR8PJLVgyDtslGJj5GYueLTovc0ak+kHYXHaiVzRu48YTu1zsSz2QGkHRrCvMFR0v77hUTJhA/CG4Y6BseSWKeFbCFZXVB70Zwy+bB8zvYdtZLZlbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205421; 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=p41eQAD03Mog206u+s1DnOIZYXGjLnr4ZfV6a5KwsaQ=; b=epzMIW6EidkjyC7hVDDvj94H/QPXqdjYpLcN+qjmac6PwNFbmzfInCzSja7q7V9N4xPjb2v5IqLYB9+YJO6Ppju6hdKgS7aCpdNRYmeJo1xRVMR9zgM5AHjLmWEzXghxdr1LUx+uta11J46y/69au+2ptVRnkfauqUoqKLwesRE= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205421561667.5221821039926; Thu, 16 Jul 2026 05:37:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJu-0002lf-JV; Thu, 16 Jul 2026 08:36:06 -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 1wkLJt-0002lP-Hl for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:05 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJs-000768-1P for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:05 -0400 Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiSoe2824231 for ; Thu, 16 Jul 2026 12:36:02 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fetcf1bng-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:02 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e6ed4fe99so1194284985a.0 for ; Thu, 16 Jul 2026 05:36:02 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=p41eQAD03Mo g206u+s1DnOIZYXGjLnr4ZfV6a5KwsaQ=; b=LVJjYPHJ9/zFzc86ccFvfnkKAiY 0NB9SmvWNkJa+SyM57bXybDu01/1YN/ZjAPka8CYJe+gnmYNpJuipOi3BSwGr8rT ovlHLcsVhPG992Ipxpvhsl4Xf8U+ff8XJXJGi8aleAw8mF549iIOQlXlIWItzhdb h2xX/rPC90EHx6X61o4QbkKKlXq1eUKXdZ9d2ppMOgOE0eo69Aw3Jnv/hB5qfXDS uO9q8mdZ1v47oNeXRJgR9DM+yfg16AzoQLJ743GH/iwdXY7Cp7XsC5gAsmVo58lA XoLhOLWs5w9+/qfOQtTi4cq/yhhEnLmuROiJ4AmvEkXtw/7lfKE6Xh+E14Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205361; x=1784810161; 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:content-type; bh=p41eQAD03Mog206u+s1DnOIZYXGjLnr4ZfV6a5KwsaQ=; b=G9X1oEAqr0HeKaSQ2WhlnGa4UJXoOm86FyKhqoUE2b/GxCtnWQ+XejmRECIE4D5vgR RoGUlnqLA1NKTFkx7gMFYpShY1tCjKaUwUJj4GlwKFiWgFVlfGXHu1oUyRwx5qcLmezQ N6Km2/e7NQK/BWGCJ58wtiHIHTrX+UMsBq3l7/HhlqYUFgu3/qNftGx2ZCXsSvbAIM6x J+p0Z5uVOF6xPxj1twpccyCh9xrtNCwnnRnvRjxXTEsMQYnxNxwIfQeVeYgsRrGNBSwg U8tz3/fbRuHAptCTDeAq/q/uPoQlrKjTBsWE0fln7IZQbhmjcKoXIj3AYUmYs9+adYYv dbtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205361; x=1784810161; 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:content-type; bh=p41eQAD03Mog206u+s1DnOIZYXGjLnr4ZfV6a5KwsaQ=; b=ioEslQwMs/mjeOH8gBxf3d3hty+XdZxvV7CIx9wK4TkGGBLrH9MRbvq7gjPZLSimpN gMPbjpAEi+FvgwlFqFT+ZPMW914GSSJ05JU3gMMf1RwU7RDim62sGD5z3WRZDXHr7f1v qk014oWb5KfwE6bE/vghSaQZkqOmOAveaTpir45aAQijw688fWCHgAwnkKC9or4ERD4K TipSIiDtXKk+Zl3cAaycfmERnb9dIHUObtx+TZCN5nSh4o4XVxMfSCOHT1+kkz/N+h4G +Eeop+zwqV3Tg8O5N4szW3UMgYv8rNqL3+3pe9nFGQI9ZniW1biKA4f5NN03FgI4wDzz S23g== X-Gm-Message-State: AOJu0YyMA0nX8WTkgc9yEeGJHajQA7rEvWP93DzTP3QLV9gGUwqyLSWw Teg8VULiaxLd+cl8l5iOwX2cfibFkKseH2xFDgrNZ8I8kHnHG9Dfs+QLuS5lvXnWF1n5n4e3JDJ ULW6AMwYakYMoMVf0KLkOke5SEPllI9Yi6xZm02/iP21Yz1tKMh08o24jjUH35pdoGw== X-Gm-Gg: AfdE7ck7zekKQo3JWsIGOR07fMP+glh+qlomuAJFdIkIWWwf+n3Imj8wdljnK+K6GZn d+fiZVEs0+GuXJXrU7xNx9yzzE9EnAAoIvgPil23aq+l/0IInLtosM7HoHcoVilyP03FwPobzv6 gDAZW552Y+apdK1zHM+ew5whkQlCQJrWrzUnPWkWuFf0luya2RGQArekqOhFLa2qHvF97L0YtHY onr3B3EIKR2oY5PlYB4/19m+D1sYMLTBYTSH1tFAX/C4NjhZ83w9HeTCA+O+K4jm54a9bcweaN/ /rGkLb4C7UGk9o7Dp0S7hrq1p7X63yqQVY+MQiMiFnK29X7H+BZAVis+JqBvKMK5m43DpsixalX G9m4/GDb/lIpo2unQReaQA9qAnVLvN49oa0c= X-Received: by 2002:a05:620a:470e:b0:92e:cac7:9706 with SMTP id af79cd13be357-9309636ebd5mr786544885a.52.1784205361077; Thu, 16 Jul 2026 05:36:01 -0700 (PDT) X-Received: by 2002:a05:620a:470e:b0:92e:cac7:9706 with SMTP id af79cd13be357-9309636ebd5mr786541085a.52.1784205360666; Thu, 16 Jul 2026 05:36:00 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 07/17] target/riscv/debug: Fix icount privilege matching icount_enabled() test Date: Thu, 16 Jul 2026 09:35:24 -0300 Message-ID: <20260716123535.3709148-8-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: 4rZeTTBs3ueryfjUDK9WG4LwrD0ndeQo X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX2OdjhKCPqZV5 GJTsd/sMx8fZHSOim/iPAUISwrlFCd9TvswiKsOsFaI8F0gdDcwiWdlSCrs/KTR0bi5FR8pCPYJ Rfn8rZMTzoLO+aZNllGN9EJppmg3gFBeYeia4bcf/SnwNq7STk6QAuCJwXYfXmTC9UfYkmlDgzK 71prkF1g7kfoFfqMGcA1N1x3fItfnKVu2H3YVbOUuz38aEkV/buUNsnVsOA9an+gQ7L7KUQKIEw LUrEalugtqPwKe5NPcURCQT6N7H3z+QrzrJ2QLindN9Rq+qXkT2Q1Lw/YjDu9ObsLhyiIXvxTmW vC351uZ8F69NVQcWGygljjDOLqd5qz7PZyKSFPYwyeU+Y6NIOPooGePX9G1KtVTCpJ/6aSc7hoT RbiLqphgcIRb6OOV53SJVokVt6LgdwhAcoSNdQ+TF99tnRdM0Fqf7zCqHVyKYsH6Kw2QqaDb9wU l+Vy0vHRHVWmZ71da6g== X-Authority-Analysis: v=2.4 cv=f8R4wuyM c=1 sm=1 tr=0 ts=6a58d032 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=3jnf9fXNQdWrf285FekA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: 4rZeTTBs3ueryfjUDK9WG4LwrD0ndeQo X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX4Y63svIVr/n6 sFyC3Zqm/eONb7/+NCptG8IGT8Ys0dxCCk8v2KWuTzqWiBA65Zlj+FNYa9uNCKWZNJa0l3XdntQ k6vw/mIFhmpdSFxLyTpYjG95NPX11s0= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 bulkscore=0 phishscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205423326158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin itrigger_enabled should be set if the privilege does match. The test is inverted. Fixes: 2c9d747121 ("target/riscv: Add itrigger support when icount is not e= nabled") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 6aba7e9e12..3edbb591ca 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -681,7 +681,7 @@ bool riscv_itrigger_enabled(CPURISCVState *env) if (get_trigger_type(env, i) !=3D TRIGGER_TYPE_INST_CNT) { continue; } - if (check_itrigger_priv(env, i)) { + if (!check_itrigger_priv(env, i)) { continue; } count =3D itrigger_get_count(env, i); --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205424; cv=none; d=zohomail.com; s=zohoarc; b=cybA18hPzIi76F/sp8r/36fCoA23q+OrvyxanuPhxcOuPFiswvy5OYsUikfEi6e/lRP1grLqqzsHeXfs/4LlUxzQzHabyo8KyN1RLQJtpLJKvbiA7aISqJ4JfghdO/MQogHXyig2U31sUEvZ7znAWl7WUbwLRGCUYj98woiAldg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205424; 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=oWst/VlSzeHr78zJf/0h46yr/Sd81639ox7uwOej8hA=; b=G9XySlst1SZGsYO4IQ77wR9D4TVCvyuydxRlw/Q50bczTKxaTYEBGNDG5j0JhZqF9Z8Wr37LW0uAM/FgSjvY3QKo/y8zN3GPT+/AS/Rkq64wpSFa23eCO/zCD050P+ltn8Ya++zDPSiUpmYWHoniHwCKwYx5G6W56CdOrL5iIJs= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178420542409679.62567565897382; Thu, 16 Jul 2026 05:37:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLK7-0002pA-O8; Thu, 16 Jul 2026 08:36:19 -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 1wkLK5-0002ov-Mb for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:17 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLK4-00076Q-4p for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:17 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiaA42475287 for ; Thu, 16 Jul 2026 12:36:05 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fetb7scet-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:04 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8e9489f62bfso136531956d6.2 for ; Thu, 16 Jul 2026 05:36:04 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=oWst/VlSzeH r78zJf/0h46yr/Sd81639ox7uwOej8hA=; b=kTYHKCzh1W2v5iFacA02CUouU7m r9AWEDB4mZJbh+iDmZC9tKH1Fk4FljbAVVVJfJ1cZq8mQ/FeiEG+zjei4TwqqJXB PIB6lf2X+3LxG0tXEc7xBMc/5ddP4WGuxfJbOPaKr5g3S5dKSL08BLFd7HYEpGsj R7fWjQeCa7gkWit3/hky2rAQdgxxwv+kK92+W6bNSg4fJ6H4kFJvaayI+k3mdMOs 5pSwUvo1QNewb19J7iw52DEknh6FGincPt/JWhKeX4i9lB5LzO4XAezLnAgWDZR0 jxB/AWIJlbJiIIIVu/P1yZ9OOLVragL5s+F3wmgV2lNfQOP/wBs6GzivaRA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205364; x=1784810164; 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:content-type; bh=oWst/VlSzeHr78zJf/0h46yr/Sd81639ox7uwOej8hA=; b=Icw+8VxntFcBDjgQ2xaYHUy18LPzXjTjWgYr2LYPdxiyDcLqpX6/prb+geFeSNXPJ/ +Qegq2KYYGAYKVAnPevtSTrePWXvVtb1WSQZF8V6llqhLcKJRR1nAY+J/eaqUorffes+ UGo7xdxbeKzSnH6elNjEgUjBBobn1gwO+WU2DJGzM5gyNUkafAmfHu+SWlDp8vtXr7HD ekzgYcLw3SCvrDJ6tHhS1Si3lvLh7/5n+pDzrxpNzndsm0TplDqi27t0f+GN4udohAKS Xl6vmWRJN381mBBLC4agcSgNgxxfn+a/WsrKeEsjCStMMm+qp0U0/tvMB/VoPeoBTx0A p2TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205364; x=1784810164; 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:content-type; bh=oWst/VlSzeHr78zJf/0h46yr/Sd81639ox7uwOej8hA=; b=CLPLT0GvpiLp627PbM3wB1LOhbVc2WGIFgyw/BoI4Ln/R+4UzcZDVPqDBQaZxVsFDw UJyrkLWuqyr8L1b48p72lMv5VZ3nLlNVX2CuC7h1kZDDUx7vtr6wbYQktbIBf9CTyr5G rw+CF+GVktfQOIypBq0vMAFf8HHrBzbQn0dReyihdJp4QOopYBSxyEscqjjcwv10X0Yr KnNGod7WfUcX0njb3NiIBBo2Ayt3NHbEp54QCOtNFUEl6D1HwZDIxs1gFBewCgVcq/uf nQG+Mznu875Ux8x89tWldOe0UF+V2VhZEiLbkzcn5LmmTHNeUkWch4mNC7d1OAdajf1H tIUQ== X-Gm-Message-State: AOJu0YyVyqEpiX5p4S7TpBOUzy+fh+RXguWm9TLXmXABOKi53iyoa8a5 dMeCrFcL9nxY+GxHyd95ejChQJ4cZ4NFMLo4OARlaqwtIxEevAM+TZaAIppkh9Kb3Yvajv+g6MN W1/+sOMWwzHXcnTvF3DdshJZE7MBVElB5npKR7ycLDUYjW+1FWTdlQf+V3jeyjXWp+g== X-Gm-Gg: AfdE7clc/ScnLHAwshELZ8thDATm4Y5Aa7KKG8zoOeoJ7MOoPY5lpHihp6IB2MQwTOM vK2FZaFRvwwc/oySQpBPkSUHjmksM9CsrM53Ob8mTfrTB1FwOQSpO0EpL2+4OWYUiL2QMi5kd49 0IKu1x69G4jp+T48lCt3RkASlXgwurx0HZoLgsB7EkECjgAdI9oxpt1GaHy3M05dgZNY9nKD/BF PKfuM3SjWu3gaQY8g3d6wVoYC94IngHnriKpy6js0JnBOxz+4BC9OTzCdJ7Ccty2p9SKTFmomjF VSrVul8vGp8j21ZXXP360o1eXc+mUyHwMqzA3ftW36NEsglA4rWV3egCYx/TUoMkbVsuSxN7wmz guUWEOio/+StPtveJMo4ZEXp9nRIcQWtAoVs= X-Received: by 2002:a05:6214:3d88:b0:8f3:9d85:405b with SMTP id 6a1803df08f44-90758ceb518mr84580956d6.16.1784205363716; Thu, 16 Jul 2026 05:36:03 -0700 (PDT) X-Received: by 2002:a05:6214:3d88:b0:8f3:9d85:405b with SMTP id 6a1803df08f44-90758ceb518mr84580406d6.16.1784205363212; Thu, 16 Jul 2026 05:36:03 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 08/17] target/riscv/debug: Implement icount trigger textra matching Date: Thu, 16 Jul 2026 09:35:25 -0300 Message-ID: <20260716123535.3709148-9-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX8Tn2lWPRtw33 3LZV9SqUXHDDl7bFTHqMsoCchpLDWYBijWKEHJuNvGwjDHY/4xO1P+DQtcCsE4mZJHjnGPn6sQd 8FzA0odZqFbwHCFcgrJeTWdesyabjZ4= X-Authority-Analysis: v=2.4 cv=dM2WXuZb c=1 sm=1 tr=0 ts=6a58d034 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=8BcSXCmn-LG7ayDxeBYA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX3swrVOE2pIQX B+gks+7KmyDsKyW6HDNmpWWaxn9h2ITOsx0yvANrrc2aGICpR1tJQ6yRsd+WuTQyLeehLVYDfpl yXjxqJkoWptuni6Rxc1RNxMpZQCnyjm7jsj2uxXYX//KDx9KnijoT0i7J84X8ba3UExwLQ7V/UB KSUpkdQHl3R6iM6LwBmGv9hFIuEKU6FZHjLPxXAG0WrBTrjx1N37jqyIHf/mWO0xh3M19pdepwC 2bJSGBqtOc5ocduH+CFRDChsinwcxV1DuyzV7KnaMO3QEqtbkKPXwNJ5PlcIIsqN38ePpqtRyDL bRse4LG9fvU2LUMOgQUhRol6IBCYNakzUvJtY+LRKeR2IOPdc7z12xOa0ZwX7HeFHhHBgO3yrqn P5/3+HpLAiLasYEEkVXXdqVHO+qrR1tHFaF4IWpVK0Oy7MexOvAaqXBUnnF5M5c7TKJse+DLIiH 5JSy2OEKFcYgzBY9oaA== X-Proofpoint-ORIG-GUID: QlfPq5futiTrPDtMYx6CVaFaf8Y1TSsx X-Proofpoint-GUID: QlfPq5futiTrPDtMYx6CVaFaf8Y1TSsx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 clxscore=1015 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205425306158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin icount triggers are subject to textra checks, per spec. Fixes: 2c9d747121 ("target/riscv: Add itrigger support when icount is not e= nabled") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 3edbb591ca..74f1739697 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -677,11 +677,12 @@ static bool check_itrigger_priv(CPURISCVState *env, i= nt index) bool riscv_itrigger_enabled(CPURISCVState *env) { int count; + for (int i =3D 0; i < env->num_triggers; i++) { if (get_trigger_type(env, i) !=3D TRIGGER_TYPE_INST_CNT) { continue; } - if (!check_itrigger_priv(env, i)) { + if (!trigger_common_match(env, TRIGGER_TYPE_INST_CNT, i)) { continue; } count =3D itrigger_get_count(env, i); --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205405; cv=none; d=zohomail.com; s=zohoarc; b=QbE9m6VsRB14hGGWuYwV5swA56YO22yiIJtUPIMdIXXkFitSzpADcfI61dOaMbxeaonkULhNPx6Qrx8VLXDHMgD2MzRyZa92quEplGfKR2pLJSLxt2kOj7+H33SPQe7o9zXkr4pQoXMTUE8iH7zMuz9PZMiND6ehQuEVRPaCRp0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205405; 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=YUymcoiGygrawRPU79MPQT/fYxfZNvdtdM4e1c052sk=; b=K555CDTJ4GfFTL40tRTo3UvyEI1nXzjsNUxB3LCcQJMajLyFXsNRzeXGyUPG5tn34Sqao7K+7/2dD/ZRsDDVTFIT/ZeatHeM+MD919JnJYUj23NtmBr/HdtE4HvVxm64hwEoPkSO0lJgGFsQVrGsqiqiymctvlTZz8TDMCs+c1k= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205405315141.84733728701212; Thu, 16 Jul 2026 05:36:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLJz-0002n5-EE; Thu, 16 Jul 2026 08:36:11 -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 1wkLJx-0002mf-OM for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:09 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJw-00076v-66 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:09 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBj3hX2622143 for ; Thu, 16 Jul 2026 12:36:07 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feefqktrf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:07 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8e97889ac8aso83867046d6.3 for ; Thu, 16 Jul 2026 05:36:07 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=YUymcoiGygr awRPU79MPQT/fYxfZNvdtdM4e1c052sk=; b=bFkyTK3RHIqHaC/2OgcdluKC+6O aXVg+w5N992toTIrFT5oeqW7JKQW9G09WeIv8nYCPG8AgFJqsYom1Kn7tOUYJji3 W3hXKc9+ACeHF9V1aR9sWG/TPlVVSsytAOdqGnceir1CajyIrWeLMJwvPn+0XVuj eNzXkklpZPEDh3dBVApYT0uuoR87EiMv34xD8RtEhcXLXoxXPiKxHwOKrqHKcZrk zQ0kE030Qza5JGLms6tCQVAxduqzQX4d95WauNAl7aFcILHITkejqBYwcH249cEJ ZeGOHWycbJ/slHFGKj4+clSflFGMTj9Mz++ngjlPj4FtB6JBEm2BvILHpag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205366; x=1784810166; 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:content-type; bh=YUymcoiGygrawRPU79MPQT/fYxfZNvdtdM4e1c052sk=; b=Q1Ay7JqczVeRDNOvOTyIgnTHwbiKKuP3VG3T0WVpp8az7/icTFI+bOayEO5GBTRWau 6tjqCMOBNPDZ1k/yDzUFuIBPvl5Sqf5V+LR2jfW2QDHlu5SxqfAkOus1B2pHj4ApZXoU pX5h/RskZcPtvf3aoN7+0R29ujEgadWkBqRlVPUSlvnaZs1P3JUWT5koMial7yhb1R6Q dySrPu0XQzY8Cv3KtjZiHZFjORgEWstyrHjDr0MV/qGEtigC5y/+LPImFkPC53QTO9dM IeljhNeGUd3L0tTu7BgXG/9Wgkb5XjhSo0HxDYFor/rVcwhC49HPndk+lIYIWcLXSu/b uCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205366; x=1784810166; 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:content-type; bh=YUymcoiGygrawRPU79MPQT/fYxfZNvdtdM4e1c052sk=; b=GXQp2mnt3K36RIUd7O0zweTpZyrUlAo2bRBC42WUeMsD4XielCgUzGyIC4QlqxQLq3 sz0KUrJrau+Zd9fgrwJ8oaHqM6ZaajTOFk/3HRNAZpd5a7kDp1ZrHjcDaCV0/0vwAnwT 36NM2c2Vcm+lE9+Zk6HlU/uRdEPSJoMEWjdXJAi9lImqC37Y0hGy/2F6OdNd07hv5F6x uNH7cQTuksREpKOdte/b9ijGhGMEbLXL+IHO6siyzTuwBy+2nSGHzXvKO/dWl8VSi5+U xe+s3OKpcspl+m+Qks7bcpD2CbY3f/qf3AG1ViQdWO+636gDvTVCGYmz5+MVWevI7L9m 6h4w== X-Gm-Message-State: AOJu0YyxUtQ1wHO/1NBwXZYi++vz8TzIlmV2XrtS3poqXKl2TKXcq6VG QwxchX02K7DjjABz4P4LMPRgNJjEe4JvF7V90fNw0zk1zXT5+DYlJlAgW4rFSms1jStb/BvwtoY DnV5BP0QT0ojqB+BxnjePCKdDL5GgA+dY+6PtX23TSfYqWkchWIYenoWA/+9GdJHRWw== X-Gm-Gg: AfdE7clM+UQNNLZJK90ilXiC+oZ4hF/upYVue/8KxG7/x7MpgVTdNtxA67rIXmJNfB2 cOv9WQFSIugAT3nHNNZu3SK8GchE2I8SmWBQHTPixSTXqrIhBzyRxO6cGo8R3/wIUUGHRpe9mbp /bI2cZY4knWBFEbYwqkQwPydMPHIZ+3W/juHwyPtUiAD4i2KklRvpHoqnEqBMJLyXx5eyVJVqTD WIxiQluXS1Pf1FZHzzHWcgMzf6CRapqRvv1gvrm4vfsnqJ9TMGlbC8Mb3IKo2AhWMs26V/KrpQm n8XCskFNegqCuhkRE/W4xPrf/IRNXViJkQwToKoHjCAYvCudaf57C/1S/VTF7XjgMvwi5TGf+0S nkGJW8TSi7NMSCooiDz3ZG5iNhVm/j0/q3jk= X-Received: by 2002:a05:6214:4598:b0:8ef:e857:c9d6 with SMTP id 6a1803df08f44-9074c728839mr136151126d6.22.1784205366422; Thu, 16 Jul 2026 05:36:06 -0700 (PDT) X-Received: by 2002:a05:6214:4598:b0:8ef:e857:c9d6 with SMTP id 6a1803df08f44-9074c728839mr136150346d6.22.1784205365796; Thu, 16 Jul 2026 05:36:05 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 09/17] target/riscv/debug: Maintain itrigger_enabled in helper_itrigger_match() Date: Thu, 16 Jul 2026 09:35:26 -0300 Message-ID: <20260716123535.3709148-10-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=APNfGQ4N c=1 sm=1 tr=0 ts=6a58d037 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=oNqV0Gv4MAO2-P9rc6IA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX2egt4Bh36uWd THJ+zDCqvLXV5NQZHPcr0dhQp5Yv8WDCFg8DEv5+br1NozqT94W5DJOWjs3AVSgeV2w2wLAdGko AauqVc8DqqnCg5GbYFU+YuwPmeIGVAk= X-Proofpoint-ORIG-GUID: ZzY6YGbAYg_v_YbsgtB-60jvkFYtEWQ7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX5k0SUSj+tw2W T9WQkKzX4IxB9NdKGmmVfHV2n7BCosjbmXUPoGwCGPL/Gm0evDj5HH6LCij8N+c2gQ/+rZRRd98 IrxMKCKyvCSlGfCpMH0ZTZLp4fLsB4uTJJh4Fn27r9ZEt/uNuRzDxratofwDEj32nzdfyZQSQgE 4xzBGz7mfSHWgo3MlRuh9AFLbMF/LIGYTM/EJzaynos7nS1WTCnmJWLqsMpMS2nMGsqeX+0tn0Q yu5LLybfRBy1tIHSS22kizyJLR0pPdndN5Jdn0egDHVQEYwXScG0uv24NO1a69BGe71z87SS7+e Y2E44Y2OJU59LVcYDa49IjwCOajCuNpqkEHtAJsRmSJGjWeIh49GFEms8Df5dNjy5E9joyHa/sY RIBnm13+BPOI79ZMoqU0f0vTh1yn4EvspH+vosk1WRaXjIFygEokG8+TTbYBNcCgVQTHke8TTv9 F9n6kyWzPATLdLfq23Q== X-Proofpoint-GUID: ZzY6YGbAYg_v_YbsgtB-60jvkFYtEWQ7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205407755158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin helper_itrigger_match() iterates over all triggers so it can maintain itrigger_enabled rather than calling riscv_itrigger_enabled() which becomes O(N^2) where N is the number of icount triggers. Fixes: 2c9d747121 ("target/riscv: Add itrigger support when icount is not e= nabled") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 74f1739697..d98e737763 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -695,9 +695,18 @@ bool riscv_itrigger_enabled(CPURISCVState *env) return false; } =20 +/* + * This is called by TCG when an instruction completes. + * TCG runs in single-step mode when itrigger_enabled =3D true, so + * it can call after each insn. + */ void helper_itrigger_match(CPURISCVState *env) { int count; + bool enabled =3D false; + + g_assert(env->itrigger_enabled); + for (int i =3D 0; i < env->num_triggers; i++) { if (get_trigger_type(env, i) !=3D TRIGGER_TYPE_INST_CNT) { continue; @@ -711,10 +720,12 @@ void helper_itrigger_match(CPURISCVState *env) } itrigger_set_count(env, i, count--); if (!count) { - env->itrigger_enabled =3D riscv_itrigger_enabled(env); do_trigger_action(env, i); + } else { + enabled =3D true; } } + env->itrigger_enabled =3D enabled; } =20 static void riscv_itrigger_update_count(CPURISCVState *env) --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205591; cv=none; d=zohomail.com; s=zohoarc; b=JEnV8V9c9appfLVXIqim+SgVDYI9uXR7BAmOwZA+AQTSDANDcacNvQYpN5jrinlYXiHmT3l7khT0lzIjjXDmJDeFvqrXQr46O/BF6fKrHk5bweSPw38sJWLscYdZB8VDMBXHXGwSjPp+Y0H0Tqtp2EUw+MOPU9ZQYiDwBcxvn6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205591; 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=ABclx9VxU6TJYU/oQ5YMaR1V0j1Xrqljshb3DW4UPkg=; b=a+/c12q+jTKjpLoX11kH7GYnTGNqNXAVz7KgmMjM03Mugvs9zB1mmBxCNVXLsJEufCK91oAvnhpKPUbPBS6yXZ5X80nTO1PijIVqmwGPj6aVghFlc1eDvpKUZvj11qk34U8jNA2B5VVZsJkQgbEYTzMDizFFS0znotmC1B6qgCc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205591316611.4298357156773; Thu, 16 Jul 2026 05:39:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLK1-0002nW-N4; Thu, 16 Jul 2026 08:36:13 -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 1wkLK0-0002nD-8q for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:12 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLJy-00077M-Hn for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:12 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiSeo2754573 for ; Thu, 16 Jul 2026 12:36:09 GMT Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feu10977c-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:09 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8e9b9f30d65so90104356d6.0 for ; Thu, 16 Jul 2026 05:36:09 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ABclx9VxU6T JYU/oQ5YMaR1V0j1Xrqljshb3DW4UPkg=; b=RFztDQGDQX3epZZvl81Ys3hhclq lc5ANnVzd+rfsLcVPoxlR6ePCeLziUnsv1k+YIEqSanYjPKJLKtkGHW2FHq+nW/i Zc4lt/hwIYGkIqw5H/dYYBwr/UtVrXiANNGoqRpraZywh6WMKN2wAc2keBKjfBN3 44UJsuUb4fFF9R/CwASzLooOnbSx4UDonhaA+OH2eSLIY2gQitIMKcyR4+v0ZPO4 AEGCrO6b5eH6Jz79sILQUnFn4C3Pfis0yE6HeQNPP2w2/vZMQMevYoSoWIBAqqBe yZpLxr4I2GELVojagC3hbfOWQNT9lerrNznel+HGzK4ZKEstSdt0+8mrkdA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205369; x=1784810169; 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:content-type; bh=ABclx9VxU6TJYU/oQ5YMaR1V0j1Xrqljshb3DW4UPkg=; b=MthyCd07Zsq7/+HoWP2GHmJmDcWdu6rFtS9DJwunOnguIQx7/2fg/FmCGtYKgG96nu hIIdcJ1Bbpq1mPXGSscDzdEeSAlm5dlYKUIAk/H1pOuQFwjRtOJ2l/OG0eraSezh8Sq+ JxUHv4/cWgNSuj/ctb/t/njr5peBgdCsX/9cQLSNxHJ3Hfa5wttFSg7CN05x7Nh49IrO YVs7ydB+nngUXOV0RCB+GgRkjKWsx/3IpzqLLKZd7Bndjs7XrHZQ6tRdx4K8TFOztEH4 ryf2QBTzQzWHJz/sp/+oMt6Li6xe5xj471wfnNky4ggdgUY3q95krrwMh8ugoBoeYwrI 1n5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205369; x=1784810169; 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:content-type; bh=ABclx9VxU6TJYU/oQ5YMaR1V0j1Xrqljshb3DW4UPkg=; b=kvdmWIBSRS9kapBOCEfj1ZjvKjRckINWn9dQmBIbcAHWImhH8CThMsXont0A/JRYvq 7gOyRsHk3WMVabbWLVWqBgFCEcgT3KMZkXdpXXxFzmaDgkmSfiQJNjLyzEL/I6Yt7dYD qv0prcvU8N5HheJ6Rg/B32/DL8wBDYvmSdnncDCJNt8Iu1qx0q5++DwZN1FnFyvDCbPG PSQQ7QLPnX+IBb3bLnrl6elsSpVLC3zHNU+YT/HgTP15lUR3MraBdFgyEg5eZCQkboEK Tb49oP2mrW2WoZmzc9zopqSvNwfHd/K5mUcAkY68tvMKNZuStdKPck7+ibpwbqmmCPsK FBPA== X-Gm-Message-State: AOJu0YyCh0f0dhUNIUbCBDz7+XoTe7zNalNoqBjlY3thC4U+K0lmFZtB hPyaeB399jU8ACyDQe6NBLM3GyHvF0lCIelBWPA6dUx2PtfCEpvN3yuopEm1EI6p9EE3cf70Es5 paIU1HvvIglu5FxMHSYQlu/DNrad7OK7cmSL/ljN/GH+DOPovHnXUmTrtspyL2Y54Rw== X-Gm-Gg: AfdE7ckKzgRdEbEOVbhLe9ozj3+/L5RzSn9+lGhHQZ388STZ8Zob0Eyp7cZV6LxFOPO wd/qQnCJ4IFsvnpTZcKG+JVQglGauLRl208OpYhDUfFSR/STMBkxvjeyXFYOsmWVZz0xHYjQJzq xjVl5B5S1eovLu/6uG4WcZTz9JP1WNGv7XRoQfaMfTjsUA1FX3Bpyv3TtPixE0OWB5XaUL8Jy3+ uiO0cOnvPYJwufgin/jt4abvbIVp2Lg8v96Tm+67P5BzPd6U7XGY/Wo00Lh2TagrG2FcPXYpsiz vFfOQeT1lPouA252CfoOhsKX5JVVW+s+5ujPNyIYyx0wRd7lAgKisK1hKzYB1W0OJd1sgnNqM/1 ZPAT/bN0o7nDRpoe8+mQzrsek2KJ0q+3nbDs= X-Received: by 2002:a05:6214:5785:b0:8ef:a9ed:5e9b with SMTP id 6a1803df08f44-9074c8928f3mr116274036d6.55.1784205368893; Thu, 16 Jul 2026 05:36:08 -0700 (PDT) X-Received: by 2002:a05:6214:5785:b0:8ef:a9ed:5e9b with SMTP id 6a1803df08f44-9074c8928f3mr116273566d6.55.1784205368409; Thu, 16 Jul 2026 05:36:08 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 10/17] target/riscv/debug: Fix breakpoint matching action Date: Thu, 16 Jul 2026 09:35:27 -0300 Message-ID: <20260716123535.3709148-11-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: jRg_fyVQugx6usbKNyYrZgVpTZEtWY0_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX3vnOW3p9lftd yS490SGqJvStVvUrnjd4dnwV7czxMakV8vdtaBUprluK+X3p6uoSorf1O817PZJFNyoqbEewUZZ Jc57mTJFgJ4T/reDRSWG2nmqpyfpB5pkfiVcFw5kCU7es95c4Ce8xM1LXkcqBtUrXfib0uTwE8I /za/O/S60iluTIN79MXoIgQGabdPCLIVWVcjwZW9eMWFi+PKPPTOE9uLn+SC3aCQUSfiEZc/v0o oYSofSsuFFoClI1/t/070B0Yt1mNdv7TX+ilttHlMGAUKpZZGqAWrMHQzxSbJ6VHHf5+bTUfYKk 33/OtR6K6RaLNzCDVMN5TypTjdtxMui0NZFj7x68P6NRLkvfWpk3zp2WxO5daLB4BRto9OsEZxN HUYVDqOCvvAjK6cA6+zDVVymuXi2bVCGeVbnbPzM3DgJisWOczLevmos11kkrE/eJJeUZMy7lOC jp6PvVn+UxzLH36xmLA== X-Proofpoint-GUID: jRg_fyVQugx6usbKNyYrZgVpTZEtWY0_ X-Authority-Analysis: v=2.4 cv=BPODalQG c=1 sm=1 tr=0 ts=6a58d039 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=yV3_rp2NExHQcldBhgkA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXzghpwBReKErr v55pr7gzz5fkXXsoMtHqtXTICfSra/unDhCemUopVCQkLhSewJOPUb3PBR9+LopoCK6d+eu6Y9v s5hSELUZPm1WM1UOKzJ/3GHMeg0LYhc= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 bulkscore=0 spamscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205592419158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin The debug exception callback is too late to find the action for the trigger(s) which caused it, and it is actually passing the wrong thing to do_trigger_action(), which expects a trigger index but is given DBG_ACTION_BP (which will be interpreted as trigger 0 and use the action set for that trigger). It could be possible to derive the trigger index from the bp/wp address, but that is clunky and it is really the action that determines whether an exception should be raised, also multiple triggers may perform their actions in the same cycle, so it is more consistent to check action during the breakpoint matching phase. If a breakpoint exception is to be taken then that is signaled at that time. Fixes: d1c111411e ("target/riscv: debug: Create common trigger actions func= tion") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index d98e737763..f671ae67f8 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -282,7 +282,8 @@ static target_ulong textra_validate(CPURISCVState *env,= target_ulong tdata3) return textra; } =20 -static void do_trigger_action(CPURISCVState *env, target_ulong trigger_ind= ex) +/* Return true if an exception should be raised */ +static bool do_trigger_action(CPURISCVState *env, target_ulong trigger_ind= ex) { trigger_action_t action =3D get_trigger_action(env, trigger_index); =20 @@ -290,8 +291,7 @@ static void do_trigger_action(CPURISCVState *env, targe= t_ulong trigger_index) case DBG_ACTION_NONE: break; case DBG_ACTION_BP: - riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); - break; + return true; case DBG_ACTION_DBG_MODE: case DBG_ACTION_TRACE0: case DBG_ACTION_TRACE1: @@ -304,6 +304,7 @@ static void do_trigger_action(CPURISCVState *env, targe= t_ulong trigger_index) default: g_assert_not_reached(); } + return false; } =20 /* @@ -720,7 +721,9 @@ void helper_itrigger_match(CPURISCVState *env) } itrigger_set_count(env, i, count--); if (!count) { - do_trigger_action(env, i); + if (do_trigger_action(env, i)) { + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); + } } else { enabled =3D true; } @@ -967,11 +970,11 @@ void riscv_cpu_debug_excp_handler(CPUState *cs) =20 if (cs->watchpoint_hit) { if (cs->watchpoint_hit->flags & BP_CPU) { - do_trigger_action(env, DBG_ACTION_BP); + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); } } else { if (cpu_breakpoint_test(cs, env->pc, BP_CPU)) { - do_trigger_action(env, DBG_ACTION_BP); + riscv_raise_exception(env, RISCV_EXCP_BREAKPOINT, 0); } } } @@ -1008,8 +1011,10 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) pc =3D env->tdata2[i]; =20 if ((ctrl & TYPE2_EXEC) && (bp->pc =3D=3D pc)) { - env->badaddr =3D pc; - return true; + if (do_trigger_action(env, i)) { + env->badaddr =3D pc; + return true; + } } break; case TRIGGER_TYPE_AD_MATCH6: @@ -1017,8 +1022,10 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) pc =3D env->tdata2[i]; =20 if ((ctrl & TYPE6_EXEC) && (bp->pc =3D=3D pc)) { - env->badaddr =3D pc; - return true; + if (do_trigger_action(env, i)) { + env->badaddr =3D pc; + return true; + } } break; default: @@ -1069,7 +1076,9 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) } =20 if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { - return true; + if (do_trigger_action(env, i)) { + return true; + } } break; case TRIGGER_TYPE_AD_MATCH6: @@ -1085,7 +1094,9 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) } =20 if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { - return true; + if (do_trigger_action(env, i)) { + return true; + } } break; default: --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205568; cv=none; d=zohomail.com; s=zohoarc; b=Qpod+Tbxa0rOHFCjw1OfaMDq8+xADFz7E2p0ypuLKbawUsSYqW5N/GbnU71PvxZ6WhrsbohyahCEVPtUwKYm0HtLtuOeIGkXMXlt17EV3fH1Cn1pyBCmDyZjrYLnh43TkajKVOLI4RDVg9Unlldp8gR5a2gzbxplRYZBValeJXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205568; 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=xkIcgkaglkvu8MJa4e71VTaUgHHqAhF1ueh5GEJz5a8=; b=Q8vvEl38XD6kWK2shEpNiOkE6Xj4qOYPdpRxTDSiMBC28vwi4pJJqW34tm/araCuH35TMycAHSfVFWJp6sbztSLuheaKU6CN39F0TcAL4RQdWeqC+c6rWWsf1jBtBDMq/ApOq+vKfPaGV4WRLWb+rn6/VUvpAR0TINys/2vyFqg= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205568875469.1031135766467; Thu, 16 Jul 2026 05:39:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLK4-0002on-BO; Thu, 16 Jul 2026 08:36:16 -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 1wkLK2-0002nw-Hx for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:14 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLK1-00077p-5G for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:14 -0400 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBj3TS2622222 for ; Thu, 16 Jul 2026 12:36:12 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feefqktrv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:12 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8f45dde7595so38300016d6.3 for ; Thu, 16 Jul 2026 05:36:12 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=xkIcgkaglkv u8MJa4e71VTaUgHHqAhF1ueh5GEJz5a8=; b=V1h2XD0EHd8b7I6fPjEWK/oaDZx kUw33P0sdob/nz2dcK2Rb6JzMrAlosW5m5/vqaBShHUTT0g05rPRXAkHtn643w6f r+8F9MEZwk1fGJKBtHunEHwayGmWQBPzx1idufj7FwygWmglucXqGGvwlnUyLDGz tPIjnU7oT9edCRQLye8qG0FUmScIAHzUvuX/t13VT4p30Chsqijs5N38ZDWhkewU Pchn7kwg0GUgJ6qdqmTBft4pqx97NJFyjLoJJhJFNbFvMk1eGE3j031wP2pOXcPr O3WBOvMWSx+NaRMlAmH9CgK/1f+Jub0t6vy/EUncqafT2WrkjwTR75bZ5CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205372; x=1784810172; 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:content-type; bh=xkIcgkaglkvu8MJa4e71VTaUgHHqAhF1ueh5GEJz5a8=; b=QzJl4tJu4mp2vIa/5qlrRD/mtm8+2gMDtz/8NSdmgo2xH3ZAvgSCGlq+kGtchUJCyg MPBfxjvJOnvaarcUHVQD5BAtAZMcj+Kfjmsm9j+GiQoy78bbxP2uHQKa0MoW82dY2Yjp vMLAUs7tioS/c3f3E0lFWX9PraOZBaS4+8ZpJw6Ypxh0MUU7ikaWqC42uf59Kd6jJzMP H9aEQX+D06iDImhg3OYSkh1D5Amz1qJ6R8tLb9Qr8Ow7VhW9HXWUkOcoPaDjmkRy1s7c yCgjUr4pfAXXlUmyT3b5Hqx5e797y7RsCznjb+BtN1n1b8T20KqtHldmZlCTnt+jyxks RSlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205372; x=1784810172; 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:content-type; bh=xkIcgkaglkvu8MJa4e71VTaUgHHqAhF1ueh5GEJz5a8=; b=FV96o5EHTrkjf52odW63j74vk9ZHaKb1u/xwf8XSejQSZAp2Z/1XRNAUKgiQujUT1I qHqupswoiW8NPX0lD9lfkhuKk9DwNCYl112vvxhl96fBH6nT5juwO0EGosEFWUXa/BR7 4hK59/m+xSKJEIda7DJ7iPcgTNP5EkNnEQBCvimIvl22Me1z7xueu1IELtxgGtaqVL/5 qoxdKeoQTCLhDF4CIc6vbmpvgu/RjQXyFeNIIv8TpDtuhmfIoScNYM25Cr6bZdju7rga OwrfCwkA54z0iJ/mFqs6yBHmfaVna4kmg0jdghJHlPpSNwssRQSYrnQWRfa0uwRgVYnX idxw== X-Gm-Message-State: AOJu0YzxqHV5EbW9OYIBa8HNRAnWlcu0UPcEqEhAdT6q/6P/91f2wNSt dR0iyTgYysKaYCrcvNu/RiFqDFLsutzxhCBrQi6YMgZFGxgdjpdv5u0x6Miwa8OdxVbsLYoo9B5 QsXj5aqE9OFBKFoHCK9PDK1vTXgo8sgIlFt4TPhXFZVcRKd0tbwJHd7GlNvYwRrjKGQ== X-Gm-Gg: AfdE7cm9e0LSpuHuYAyuc3VtxepGRsBTbj0QO/zoC4lXrAshd72MV6S3JTvyo58Cbm+ 3rm18MSse7VzTWOfuPhfYX1k6MbC9C4el6nThCdQ4b/RYLezKqsItVT3A+xmUiv21krtB5sgr33 lynNGanBrKec4xtc1mXGIJQBowWo49WT118Nj60obKz5y1MjFpEXZp7VoLLw4gK6dxLo1G7AblP gvrElq44k+MoQbm3I/zGvY180uF/O3Mm5TOE4n8FuVNrZMYfPEIJ5Qta9I1ThxIBnAaYoC03q0g iva7DiDaPGv8qyXR1chUXGCUub+5jHL0pZ2WQiM+70GxIemh9MXeb8oQmI6H6sEFPskiY7Q/7d1 zJvbyy/zZxz31UhuW0VZKHyZXOn7+hp9+WFc= X-Received: by 2002:ad4:5aa3:0:b0:8f3:6c2:222 with SMTP id 6a1803df08f44-903fec4e811mr252348266d6.14.1784205371666; Thu, 16 Jul 2026 05:36:11 -0700 (PDT) X-Received: by 2002:ad4:5aa3:0:b0:8f3:6c2:222 with SMTP id 6a1803df08f44-903fec4e811mr252347736d6.14.1784205370990; Thu, 16 Jul 2026 05:36:10 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 11/17] target/riscv/debug: Put mcontrol load/store match address into tval Date: Thu, 16 Jul 2026 09:35:28 -0300 Message-ID: <20260716123535.3709148-12-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=APNfGQ4N c=1 sm=1 tr=0 ts=6a58d03c cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=1fLd1apDblQkEOP04rUA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX9EESY2Vt+Xk6 2DlDjXxjtTIf1xouSVrW0ld2819vxZMNKjwuj50fsjjmBdRIx2bg8DznbOmiVlxiR//NSSiiUSl nJLrGGpYEimZGrboyQV/xEMURKFH0v4= X-Proofpoint-ORIG-GUID: Np96Gy5Iu4z8pkGsXMZ9YD7_iwuT9KHC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX5cAnlALHNR51 5m3d8ybNRju5B3QfY7XCpfOeGzF1JKWUsJAsW2eeWx5yEbbaIw5mTi8yFP7gARMteV3lTkWQTnY iRtUuidQT/53oAgcObVKtYzFxKsZgTSE1UzV7iqVSqzbD57EzDT8N4l6H8cKNaEjEz6XfnVftB4 VStBSLyse0MmH+LJxLJ2M2InCHu78HRGfej9xXCKMIoNkLYAhv4ZV3kAEDzxMmSIGOtDXoixvlY 5PbtCX2Cvel93MgZ2weJuC2jxidodi8VvwVylYWcEIc4MgdGj/dB50PeMVmZ5FfuyD9SkLNhVAa QXi4G35VQBpBmQfu1LCu9Zx29Sybk6lgD5k6Z9FbrdLOJG/jnADj2VBkBI6dqp2mZ06siHqBniL wzKge5Qg/FNaYTyg6e0RUA0BV2jynagpNpNMH3GXvZerbDW1poLEdx8Zrt4UDBX0t93kYfaY//n 9ewSHB6kAZSLpbU2H/Q== X-Proofpoint-GUID: Np96Gy5Iu4z8pkGsXMZ9YD7_iwuT9KHC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 bulkscore=0 spamscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205570247158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin When an mc/mc6 trigger triggers on a load/store and raises a breakpoint exception, put the matching memory address into tval, as is already done for exec addresses matching. Tval for breakpoint exceptions is optional in the spec, but it seems more consistent to implement it for load/store if exec is implemented. Fixes: a42bd00166 ("target/riscv: debug: Determine the trigger type from td= ata1.type") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index f671ae67f8..7ecbe01fb2 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -1077,6 +1077,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) =20 if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { if (do_trigger_action(env, i)) { + env->badaddr =3D wp->vaddr; return true; } } @@ -1095,6 +1096,7 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) =20 if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { if (do_trigger_action(env, i)) { + env->badaddr =3D wp->vaddr; return true; } } --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205593; cv=none; d=zohomail.com; s=zohoarc; b=jpWQeTJhwA6SWkSC0uaTm+d95Q7jjz75LJ6u/VdrqNCcSMZgo66SP9OZm/35qNjduFBP4/QtddxfK2EstqTz80NL+tu+pwXvp3UggXnaGMlOYQLX56etzQQHxAiM/mmRm3R0KYrVni9ZXRad2QySVrTw9TN4zwnf8N5HR6xyO20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205593; 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=+AcuMBz4w1X5F4z0wmXVYFfc0aIM6+1hAQ91Y93OF9U=; b=adxHPvH17GfRjX/WgoU32HGGGoRhqlibBA6zt7+eLLYF3A7YhTWxo6uFwnE2NcLItmmadNeuuRxFq/yhG9FTOppSgLOzOHdRx5EhNHMle+HCluOwkxMKn20thBnr+Eijayhc8e8Eo/JuaaBaARSs9htS75SaWfnLzi8qOGK6cBk= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205593922273.27553647368063; Thu, 16 Jul 2026 05:39:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKI-0003HL-4O; Thu, 16 Jul 2026 08:36:30 -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 1wkLKG-0003FR-I4 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:28 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKE-00078H-TQ for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:28 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBjAii2506736 for ; Thu, 16 Jul 2026 12:36:15 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feehvbstt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:15 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8ee593a5a2fso9150826d6.1 for ; Thu, 16 Jul 2026 05:36:15 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=+AcuMBz4w1X 5F4z0wmXVYFfc0aIM6+1hAQ91Y93OF9U=; b=g4tZa1s49asBUXH9xx2tlE+NAsD M2xKDjNCDWhmgygJONLqnawDZf85jiyf4k1VxNbUXIuDZTXGqd67w70NHrYtpVmD uzHN5OqCQZWrmF4BXbKR1LcgFiwsNPjVHkFjwkQks8Qq2UQBxv/l9hteDW2hNn21 utEzgSLIPmu0fIZJzV3PQosCJV/KtlGfvSr31e+xSDJTOAMUCUGvAfkpRxn0aiMU A9v/GLHf+TY9yI65MxG2L+AHa654N9RYQBurZLN/gZjzTidlba0+m+/I+r/cjwTA EJOO3Jy3tZkYXLF2D1xyXOxY8PFq92rb7JeT7QVZ8dUJDhEgJ7djOiZgTAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205374; x=1784810174; 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:content-type; bh=+AcuMBz4w1X5F4z0wmXVYFfc0aIM6+1hAQ91Y93OF9U=; b=esoRA+LeShtJAqgIFv+yIwFUpTjpUZp6j9x8WX/rES9/ub0Nap8YPgTIFwxTnJl0hW sQXcHOujVfz5xVpj0EfEdxUEMghDaqgZGTuwIw1WmkWsnRhPPOtTpVjd/DnMCW+kjrEE jxKM9gypJBVLYFpqWTd4z5PKjw8p9RqXY3W06y+i9vHEPdvyCp5FPK3BpmDv+/LsZiAc qQ7ex5ABX1ZJ/weTdgYJ9DHxJuKBjsjOpqZ8jNnDZ9YSeiGAKONnYnREbbK6lf7aRFJ/ eaLLNat1StWrBOestRfCaB8RjvgVA7h5/xnM9BFqNH1Voc/6va85AeWSGr2YXLrJ96F4 P9jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205374; x=1784810174; 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:content-type; bh=+AcuMBz4w1X5F4z0wmXVYFfc0aIM6+1hAQ91Y93OF9U=; b=RlVB6tzDmaMQr63DKoYHtA0Na4lI9uTjdxdi4eTrmauu/hncmG8nIHFvGsKvkYJ4S6 mgzT0olK4gIm1Pap1JQVqg4Oc8n0IiUBuEXgGzKVwfhpSzZqCiHvcts0ixqZ7tLPWTFS 8yqFCxtJVIvmSJMaTQn87jUTQcUe6w9ZN2mIeFtb7LD0rXkPr1J7E/aeBjy5sPwcSad7 hUbiHTrvHC1j0B469IKhPK46WiapSGlqUhnM9tZM8o4c5wW0fv0mnraiv+rt+Oa91Lzv pmKcSyh16LoyTaj4WtwxioAJY4vXJM4+gJ5+Y0RhT/uyA2K9zZTd7EHS4SODLW7ZnTd7 vUTg== X-Gm-Message-State: AOJu0YwUElIv8kbPWhIBrTFEtBIfUqK1/qz2WpNMgEowVa1F7RmUQBt+ SRS7whBhPMC4hNURfkpYuxAHRqq474Jt/LXqgbrYxmeCLgkrbqdOEigJ1R8tPirX8ytNNsiai5V K1fQaGAgxRS5xGnLehaPUcXR4b3DsD7a6KcocyLYvuOgnMCuupifTpoOK7PdqjG0hmA== X-Gm-Gg: AfdE7cmPF8+EXqghpQZLBNPsMTJ6Yisnq72UmxKRimbAfyDrIw44xjdZHnNvhnT/uvf WKocdsi7+5+HVuIwX7fES9+E+ZP69Yoz4x8KML4/u7Eb21u2rp0dc0ck1JpeyXQ9nLScWPDO9Ix XaFknMrtV/8KbkLNYrPU0kcT0tFwjGP9vZy8YL6jo7Ea5P3KlkQgQBfziXjiBCdO2gRiOn8JUCa wptkSPtd1aKPxs/dvkCaEP6JVAOaOAELaqjxsWmsBVwe6Xm6X4qmwSWJSr3VzbtibB701A/7oBW AGrTaNlqwHJDdaLgfEzdAF83xKjhxyYdopXC83fqRF3VNsrRj698HB4C7GJ6CNQd0DBxWBBQ1zZ qdOtOwSHtY86F9ZyxAbqRNeM9vEXpLXNLe/g= X-Received: by 2002:a05:6214:2388:b0:8f1:77b7:9bdc with SMTP id 6a1803df08f44-90768de19eamr24188546d6.1.1784205374283; Thu, 16 Jul 2026 05:36:14 -0700 (PDT) X-Received: by 2002:a05:6214:2388:b0:8f1:77b7:9bdc with SMTP id 6a1803df08f44-90768de19eamr24188036d6.1.1784205373646; Thu, 16 Jul 2026 05:36:13 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 12/17] target/riscv/debug: Remove breakpoints on reset Date: Thu, 16 Jul 2026 09:35:29 -0300 Message-ID: <20260716123535.3709148-13-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=ZpDd7d7G c=1 sm=1 tr=0 ts=6a58d03f cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=o2zggslVeTk9FJBUniEA:9 a=gZLHJPz4sbkA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX0b+3y5TRqb35 nydryTPAsd/mSUkVsQlDXl7mghk8GcfYVCTb4xlA65KMTqaDCj4lSdNTN9W9zkZp69MNupCmd3c HkHBbNeb/mtdZC6BW8NYCYMzB7hxkPgCGyATqzycOStBmjrl/PLCIJCC+UhOrBTIhn5e/Gri7V3 aYMLxWgybXSo5dLocTgPIdYpvICB6ZtrRzSXA/MqaJmU5mxsEQm+37cPE7y5pkpcNpGpv6AKo8q 1tyI3l7k6l76w2WO03GfUMk4nJMKw+xsmKPiatl4h2QUv4JzYOUgncJ9qXWEzJ13oLI/XLkPZnl xsLu/DQwxGaySvKAxpjOS0b6XfvZtu1v7bX958YDr6uamUM4c0lyXbZK0f2GxRcRRhpJnk7KOku D8Ad25xxlSaqedAT+9swEGPuSaQcKHMfHYtxM2W11lpxyYDYUAOgQ/uKoh4f8LB5Vp+YAZZW7Q2 QcAfaIGq3ssSO+gr3mw== X-Proofpoint-GUID: 0YHO5iDcvxnipu7Rbqi7mu_E6yBzedkZ X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX/EF3uy59Jp9r fwvdDTp8Hh++293vT36v5HXvDqNJ2eCu6k2VXQ8+gL8LQGH8iWGmb53LMkey6ifirx9vl8KAGmZ pegWJAkS0XhP0IX6Z+aJ01GIwkx8xRk= X-Proofpoint-ORIG-GUID: 0YHO5iDcvxnipu7Rbqi7mu_E6yBzedkZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205594376158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Remove TCG breakpoints/watchpoints when the CPU is reset. Currently they get lost. Fixes: b6092544fc ("target/riscv: csr: Hook debug CSR read/write") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 7ecbe01fb2..6cdf89c638 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -1162,6 +1162,19 @@ void riscv_trigger_reset_hold(CPURISCVState *env) =20 /* init to type 2 triggers */ for (i =3D 0; i < env->num_triggers; i++) { + int trigger_type =3D get_trigger_type(env, i); + + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + type2_breakpoint_remove(env, i); + break; + case TRIGGER_TYPE_AD_MATCH6: + type6_breakpoint_remove(env, i); + break; + default: + break; + } + /* * type =3D TRIGGER_TYPE_AD_MATCH * dmode =3D 0 (both debug and M-mode can write tdata) @@ -1178,8 +1191,6 @@ void riscv_trigger_reset_hold(CPURISCVState *env) env->tdata1[i] =3D tdata1; env->tdata2[i] =3D 0; env->tdata3[i] =3D 0; - env->cpu_breakpoint[i] =3D NULL; - env->cpu_watchpoint[i] =3D NULL; timer_del(env->itrigger_timer[i]); } =20 --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205459; cv=none; d=zohomail.com; s=zohoarc; b=W4uaPw911wuFqFBrim2RsW6zcYaFYxXtaG6Ex7XRqNNgBciblEwmM1fxROFs3G7NHVyURCktJSJSu+vHzyYX4A82f2xgHtQhUnCQ8VsmYwtIDTa6KRJ+e65wrl+Jnm+gW7CC8btLHzHOeEpAY2MgNd1kD9+GH1+7hVHn8e7+KIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205459; 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=VdBHu7RF6Av1LP9UREznd7urSlOX77onQNWl0K2prdY=; b=ZvX9l+nep+6kIaMJdfZVFpCqBtpjRx+OJ4defhUCxLwVZc0qMfDf9IIbjDrbRHhDOr90Ua8GFvctsddzTY+yG5ArtHYWdq2m7dpbkVFKGYgK6EDyx1jwr5L6ZNs6zEb1CDmH8sa4Dfiufav1Vl+CyuztLRHIxwLgGyRAvnaRRnU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205459927255.07523437494285; Thu, 16 Jul 2026 05:37:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKN-0003KR-8M; Thu, 16 Jul 2026 08:36:35 -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 1wkLKL-0003Jd-C1 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:33 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKJ-00078m-Qx for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:33 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBioik2355470 for ; Thu, 16 Jul 2026 12:36:19 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fed064c85-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:19 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92ac0a54110so1090292785a.2 for ; Thu, 16 Jul 2026 05:36:19 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=VdBHu7RF6Av 1LP9UREznd7urSlOX77onQNWl0K2prdY=; b=E9Va4riY3hERmR/6G0MFn7WceeE rRE7Aj3XxLFm5OAU4h9G5ixtcf9Km5gVl5NrHpdvdRQbiz9iw/Hys9U0FP1tEOjw ggcqltaPCuGxCQVVkQZt3nXLoKvCVl4ujoQeSIE+BzDraO81nRUlYWm7sOPTYtbT NZMn9EHeHB34WGbxiaYBhVjgOIKlKxffhFpvNUOmF8AjMd94PN+NM+qwpUGxn+fP 3yuosyRqq2gSQSiqPgj+rcDp3nqC+nDKt9l+m90rq1YxlVmJ34s9fMSW+cHhSX5i lcFPsPSI6IPyODzGcbb9DGaVyejY0Nd7lzYX/fyHfRk3cuu8LeQdl4SS96A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205377; x=1784810177; 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:content-type; bh=VdBHu7RF6Av1LP9UREznd7urSlOX77onQNWl0K2prdY=; b=UEA78a8VV7t5mYUcOABZeNQFLyU/Xet6XyFz2vrxjwlYqc8e6OK5VhsxV2HjcwQK7J SMmZjgrf9/bBZ3LGRm8wjRUTrpGYNUfq419fwFe7FMyolLRSRwogRdi7lySEH7weXyZ0 lZ2ZSkzWoXXKBkj8iV6z0cpFyPJgRlsXHzHXa6le8whnD4XPRafQ0dfniMpqfz1jWAfi fFt3DaVVe8ynsDLsUBE/ZJtzPU+O+YyCGn6Xl7oXZfVHXn2hum3QmW1iqB8It2z1BN6M qKh40tY6BaQxTBxu0dnaj/9dg8/Bu9W9IGTYYAcfN78wvOoD+RuhAvVwvz+mIr6pldXI SvSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205377; x=1784810177; 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:content-type; bh=VdBHu7RF6Av1LP9UREznd7urSlOX77onQNWl0K2prdY=; b=Uwr+QfL3bP+LwfC59PgGNhvrvyV7oSAgszVQdbFOXcIfASVDxwT5MjaUTZ8/sPA34d xaOo8cfEy4eVqu8NryPugDVHrL5J5hPp6n9x7keEGBZF0M+gokQeVvCaizUw75M1WPXZ 3F9c2ZHC/aS7iNIIWaMzS4GZKl0bGpw68gqbtwFVzvqb2o1nWq+lf7rEMPPj1zUobUcR TfbS418R5bheY86Y7bKPSWMuingwFYFTZNSDNA3GjjfbZPHaox8VMgBt/W8Owd25TNY7 PmpQJwWlMhXU3c3iEn81GAS4oWWIpanD/sMsvEoPBppGUHK15K+Pc0FdT79xP7Je/PUh gjhg== X-Gm-Message-State: AOJu0YyO0vigM68B2+zVwT9Obsk2HZk8fQ0VmAhdTgcNhH8nSJDHRYAE fQNNBBuI73Yj9dewljw4D8tA7qW1wiPIfzJdbNcFEdpYfaTfgQLgFDhlQaXJeod0r9oBjfIGCIj dnO5QzjbyEITmKh9ZHZaumy0tlZ9gHwhe53IG5vQXrJkWNwWotARsCpYfd/dFyPV3Yg== X-Gm-Gg: AfdE7clrRhIFj/eMXlAREcOTSPjPtx72orbGV70vehBwv1LxZ+9Fwk5QIWD/iVOAk/s zkNIUxaIPNYDZLPCcWV/a0/ffKJpYD3fceVcigDFCXK2+FWVrDWOpKk5N2PiZMSLaHjqbITZpJx yeWc/hbxEve/P7vKZDHpBHJZzWxfMsb/WLqBWlnAHtFMohhw6vvNUqFN4pExVVtOm080cB/uwtR uuuABHyzFg5jGxHclvuweSAWaSy12eqqiDgWX69ek9NnWeeW3JEIBm3ktguw0ApL6R4hBCwi7Qo QDDACUXVo0g7YjMXT/tOF5hbGEJQWntDXSDbydhkU8yBv9CX3ZVr5zkhRL5g3Q2g8FkYlza4nZD VAwyvQU6ECAyx4xGAYZ77mrRRZWgJ2tOM6YA= X-Received: by 2002:a05:620a:8903:b0:92e:4927:1ff9 with SMTP id af79cd13be357-9309622f306mr770335885a.40.1784205377069; Thu, 16 Jul 2026 05:36:17 -0700 (PDT) X-Received: by 2002:a05:620a:8903:b0:92e:4927:1ff9 with SMTP id af79cd13be357-9309622f306mr770331185a.40.1784205376458; Thu, 16 Jul 2026 05:36:16 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 13/17] target/riscv/debug: Fix migration post_load icount_enabled() test Date: Thu, 16 Jul 2026 09:35:30 -0300 Message-ID: <20260716123535.3709148-14-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXzmmv2D7y2Il4 G4/pNvMJ4g+AMA16x3Iv4uWRsZf6gVPrOXm3bYC/BrTZvfAeGehbzHwfgb7elHpl+vGTrUf6fQI msEAimHHQHAvDmLh3PceVyDBEe4yT04= X-Proofpoint-GUID: peSUdAcXKnXhDiYyGIAZDmOJWtsFiCxx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX+SnSViCPcFnW tDl5z6m1y92UXexPoCOgOFt4uCvmibvJKBf1lcmkeEu4VpcFofyhtf9Xha9PBKvsCQYkI/6uDMy c0tZEK+F7jluzzjj8xTzsLhNLPB89x6OR1Wj5vCGXlNZyOeIusbvG4MKECvkcCnSSWVqVt4HYIz CDf2JXIMJq+5kKLjUm3wi93yuWqwRvjh5lVhOea+ke6sbV3Ni9dUCN7coEQ23GhE2Jb+mY8Z2C4 FpKq5wj8WGUSpXD4QS5U10dymOMvdUWtSBoTmgmdw0Bf8R/PrvJzBYRpPLYJqfQVhY8lUi0+ixP eLycLOPRudH8iuujcHxqo7qdX9MjLdHU71M4qUo5e0s77b4RgQ5AzpTemJBaKcLIznGIdEvT9QE clfdzDtDAaECMQMForA+ZQ7reZOH+7P4KZ/sCgYkVk/A/FqSeeN/JEuCPPfMNeDeIc98PHsp26P kyiIGiX4fns5Bhos1GA== X-Authority-Analysis: v=2.4 cv=Xb25Co55 c=1 sm=1 tr=0 ts=6a58d043 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=bMkCNzlFxodDL1lM-IsA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: peSUdAcXKnXhDiYyGIAZDmOJWtsFiCxx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 impostorscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205461553158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin itrigger_enabled is relevant to the !icount_enabled() path, the test in debug_post_load() is inverted. While we're at it, move debug CPU post_load details into debug.c since there's no need for machine.c to know internals of how debug.c maintains debug state. Fixes: 577f028694 ("target/riscv: Add itrigger_enabled field to CPURISCVSta= te") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/machine.c | 13 ++++++++----- target/riscv/tcg/debug.c | 9 ++++++++- target/riscv/tcg/debug.h | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 0ab613a298..82d2e11eb3 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -228,18 +228,21 @@ static bool debug_needed(void *opaque) { RISCVCPU *cpu =3D opaque; =20 - return cpu->cfg.debug; + if (kvm_enabled()) { + return false; + } + + return tcg_enabled() && cpu->cfg.debug; } =20 static int debug_post_load(void *opaque, int version_id) { +#ifdef CONFIG_TCG RISCVCPU *cpu =3D opaque; CPURISCVState *env =3D &cpu->env; =20 - if (icount_enabled()) { - env->itrigger_enabled =3D riscv_itrigger_enabled(env); - } - + riscv_cpu_debug_post_load(env); +#endif return 0; } =20 diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 6cdf89c638..56f9ceb042 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -675,7 +675,7 @@ static bool check_itrigger_priv(CPURISCVState *env, int= index) return icount_priv_match(env, index); } =20 -bool riscv_itrigger_enabled(CPURISCVState *env) +static bool riscv_itrigger_enabled(CPURISCVState *env) { int count; =20 @@ -1155,6 +1155,13 @@ void riscv_cpu_debug_change_priv(CPURISCVState *env) } } =20 +void riscv_cpu_debug_post_load(CPURISCVState *env) +{ + if (!icount_enabled()) { + env->itrigger_enabled =3D riscv_itrigger_enabled(env); + } +} + void riscv_trigger_reset_hold(CPURISCVState *env) { target_ulong tdata1 =3D build_tdata1(env, TRIGGER_TYPE_AD_MATCH, 0, 0); diff --git a/target/riscv/tcg/debug.h b/target/riscv/tcg/debug.h index 88d34ecac9..6246bedff3 100644 --- a/target/riscv/tcg/debug.h +++ b/target/riscv/tcg/debug.h @@ -151,9 +151,9 @@ void riscv_trigger_realize(CPURISCVState *env); void riscv_trigger_unrealize(CPURISCVState *env); void riscv_trigger_reset_hold(CPURISCVState *env); =20 -bool riscv_itrigger_enabled(CPURISCVState *env); void riscv_itrigger_update_priv(CPURISCVState *env); =20 void riscv_cpu_debug_change_priv(CPURISCVState *env); +void riscv_cpu_debug_post_load(CPURISCVState *env); =20 #endif /* RISCV_DEBUG_H */ --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205550; cv=none; d=zohomail.com; s=zohoarc; b=OMgv8ChIXTFpRLZFUIDwx7Ho4K1sjy50YH+PlNmsUxnJv0jT1qZR8twzaia6gyT5kcnX3XCVDbM8u7To3H2FWQSZJ5+xNVfD9bMohvDqpJ+SZo6iTF3irVxHWAd6zEDzKYPY6wV+eEK5eX3o9jjLywjLmHmrzeF6R/DeBig6gA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205549; 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=FNFsdtnL58jEJT/xn7xwIBtZivm2KGli4fv3zj95Ick=; b=QGoo3tVHSUhbllmixJqDzOyoEXbc3Tzgjb5y//RpFU8GnE7PJiMGgZi2pG/t5ODWSB+xO1eO8mFyEd9s3awguYbEKKywnRUu3Up7JMimDbzlqJ7odgD2AwHWe5F38akM3U6aYbjy5oOp9Txy2u/pho832buI1FmChq9OA/zfgR8= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205549991344.1504274486035; Thu, 16 Jul 2026 05:39:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKO-0003Kp-Ir; Thu, 16 Jul 2026 08:36:36 -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 1wkLKM-0003Jv-Ew for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:34 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKK-00078w-Uw for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:34 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBisWX2730823 for ; Thu, 16 Jul 2026 12:36:20 GMT Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fen4waduk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:20 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8f18c4d1f82so132866956d6.2 for ; Thu, 16 Jul 2026 05:36:20 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=FNFsdtnL58j EJT/xn7xwIBtZivm2KGli4fv3zj95Ick=; b=A3LiGf5awyKJRYwQCpcC8nbT47P nh318CAl8kA1N7kC+AQv9BxZzxIvS6nr4GaGSh8dvSSPawcspt9XR+I6G/VPE352 ce1XUw2TEvz6cWCW/nAfofRQHBE7hkbirYziKdCcOC3mrJ2HQkq29PfyiP5mwz7b UTt2d1BY3wUVqD/YJDWvs08qhNKUz/GOck157n4QCtxaJg01ncACaEnv6HMxLhzt +8hK3HVYq7mlYWTXwfYeeUIu+l9P0TfTvu3z4GWPujidnLRKPyxpd61+W3c1cb7f +0480t526Q2avuN/zF3XeG7AUUwm6HF3pnE3ysEoLvvVOqaxJR75yhN2dgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205380; x=1784810180; 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:content-type; bh=FNFsdtnL58jEJT/xn7xwIBtZivm2KGli4fv3zj95Ick=; b=JU3dJfGmfj5GvBZgDH/7VDp2avzoFPtdmVIsy8qZj/X1BaCT5qsCW19TsQaz3rJ+TB Y8u9KYZrS7otUm7i6gRrCuEVKtunu3mvc3+WkzWd0tnJ3zRpPPgjqAxxde3iwZuHX7Bp ykgC2x6qmIq7pzDI/2wl0fnjxMvBAnk5jWiznpOVaXejFUi1BzrJtyPptPPmLp6qBswb UEdm5+o2M+XXJvMMWgvL5PITTaABrRbXmTwNLzFMArZteOkov6hR0Yx5DMvo5xdJJhYC jcUkcUeu8rAGoGZngsaJ2Din8LQtLTb3qNtp5/iSrRZWgoEk8/+BwQ/ZoQ8sdTyHNTz/ N5EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205380; x=1784810180; 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:content-type; bh=FNFsdtnL58jEJT/xn7xwIBtZivm2KGli4fv3zj95Ick=; b=TD/3U9vF0njC/kSrpNYqsKOWQtFdfi0gpbufF6yjRu/+LeiHL600ewegYVAlJ3pP2k yBfQfMqv6mUhnRKb1EoeOPvPr/BxMxqfz0Ptnwqwzi6GSbdONiwjy42PBfFXucat+b7m HWHXsb+NR3D/HyfBjuB0lk7fr7aONc7BbCNM5Pm77DZbi0l+6Vhf20qyt/GSOF/Gw9J+ U8J+9mpCGupQOBhaciC5PS/JxpyQSPuYFF8P/gJTg0PiA1nhrn5daVyUmKUQXdB5A4ew uGNvdCxZGMWMrEsG6CiKDhztK1fk6ttUkTcMAc2F1snc4h+pfloIgAOQ4MIAJhVmkCdQ SGAQ== X-Gm-Message-State: AOJu0YwouZn/FFd44aYQ7NOhtzO5nCDM1cc6cPyfa5r4zafy+cF5x5ZL jNIeGmg1oYdRYakfn+Au3fkqc/9Cl3NtLj1Q2lnwIh5Q7wDw00JDh2cyG33WmvdYdsgIEqaFx4A CHgAlgaAGIeQm2OdeKA5IpTX2icpKp+H+ttTdAy9j/ytbGkWxHt8gqBHC/AljOIahSQ== X-Gm-Gg: AfdE7cmZrExQZGVYNAWmWoz2p1+HJPQ4YQxjHORfGTS2XiFlTi9H/bpAv88Ano/6j9L pIwi1lzsP8St4BINC9K3LdlmkQSFLXO873SWhwVdwmji47fC350dYSJFk1R17RH/QRnlJHoD2h2 pLtPM/hu2V0HPG/50+VxOYOEltCwx5NhBA0l5+YgUrx3GSiooMTz/Elh776lk2Q4CqDtVJA/ZRV j/251C81xy1u81YohFiRCdofVHE9WqXm40LQqd16OhE4KyzqBBPO4T4PEvEiUGAlcFB5LB0IyZM f7519KRrZ6jDDNk496Ap8z9ojnZQhkZHjLaF3qjdoKJILgPQuRpZb9uFH15qmMbzloAbCjVY2Ed DyvlHwqouwW7pKbg7KX2htry5lazannOT0QI= X-Received: by 2002:a05:6214:2e48:b0:8f4:6ffb:cb78 with SMTP id 6a1803df08f44-90758d0d39fmr73989016d6.22.1784205379669; Thu, 16 Jul 2026 05:36:19 -0700 (PDT) X-Received: by 2002:a05:6214:2e48:b0:8f4:6ffb:cb78 with SMTP id 6a1803df08f44-90758d0d39fmr73988426d6.22.1784205379018; Thu, 16 Jul 2026 05:36:19 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 14/17] target/riscv/debug: Insert breakpoints after migration Date: Thu, 16 Jul 2026 09:35:31 -0300 Message-ID: <20260716123535.3709148-15-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=PsejqQM3 c=1 sm=1 tr=0 ts=6a58d044 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=N90MVQWl6141f43dwBUA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-GUID: I9YBxIzH5o1oLDnxY8SLiyFKlcIpaK0P X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXxaMg1mz+yeVX /oXG+cJDGUOYCDMo9rlUflsix4cOkTmOJCL/AHqG1u9hIXRDSq+qXDNG+5bHaVY5Q7GAlwJcR5x CFAApdYdbP5IDYZt2yKxdS40KmclkP0= X-Proofpoint-ORIG-GUID: I9YBxIzH5o1oLDnxY8SLiyFKlcIpaK0P X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXz0S1oKctX/gk 8nwGj/cWEYisRU8DgI1j07EORfLMODVirAOrfsBUsQ1wOaL6FGr6O2SqWxliNbyF7l2IJmK1kiW k0Kye4yA6m5wSLpunpsunhCflM/zwCRK+LoNg8nMvBKBLpJJuOGwjrzoDcHmthHlUUnbLbFOR3T tDej5arWJq0jSdgjiSNvwdyTP9NuZocWLp6N8Sd4slb+TJ/CfM9q1Mrl+DF877ENHNOcfP3o+e3 m21jYRWFE4ND0VGTa7Wgp6fr/8CVHtMDxCfIgjKshggGlnT0/PArarfsFoPJyabFlWuWY+5bhQZ hNYzY0g/Ya6ViLkeu4TflkLOVAGkLg8TwlylwxsEmJSTFaLzo1ek5F4HyRksjCu4ICWCS8NHSgW 8+r/w7mH6aY2GuisV2q3uhvaLHRMdzqoaHTmNMDGF8kIM/h9SSmXH0SvkFIm0xYo53x/vlnKb5a 1Eywi73E0L3hw/DD0aA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 clxscore=1015 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205552108158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin After migration, TCG breakpoints should be re-established based on debug register state. icount trigger timer in the icount_enabled() path is also missing, but that path will be removed subsequently so don't bother to fix it. Fixes: 577f028694 ("target/riscv: Add itrigger_enabled field to CPURISCVSta= te") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 56f9ceb042..09d4cc03f9 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -1157,6 +1157,20 @@ void riscv_cpu_debug_change_priv(CPURISCVState *env) =20 void riscv_cpu_debug_post_load(CPURISCVState *env) { + for (int i =3D 0; i < env->num_triggers; i++) { + int trigger_type =3D get_trigger_type(env, i); + + switch (trigger_type) { + case TRIGGER_TYPE_AD_MATCH: + type2_breakpoint_insert(env, i); + break; + case TRIGGER_TYPE_AD_MATCH6: + type6_breakpoint_insert(env, i); + break; + default: + break; + } + } if (!icount_enabled()) { env->itrigger_enabled =3D riscv_itrigger_enabled(env); } --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205512; cv=none; d=zohomail.com; s=zohoarc; b=T4Iaj5sILjZACssHw7u6v8joEZiKYwbgfknfW7eOJIqArvW/64l8S2kIlYPBGjHtAqxx2XW5z4tXIqDp2HQcQs6tiIAY2uOjVXWJF77boxTpWOLjKi+w5HznY41lmWG/h2aEmCeO/iBiftK8hxNBPBZHCSXRHiu3Y8WnDnx/Mgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205512; 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=xOMAENftPDTdIMAyjHhGBMJXVoQqIYtsgYzFdOIVgm8=; b=iz5ytj19eH3v/Zx0AUpXcO8QcgimezzNWQ4hbw2+qlz3/qcJkObBHKypma35Ofv5LA1FRpEA+5PMf4n2kN6A9LXJ9vTXFuRrY9FKQQoWY+5mct7Q5SgcEF8kq1DmXXMTGJZwFfcHwutbu/dHNMWlNj9bej/MTLkWrRKhQUZJDC0= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205512830404.8749213515248; Thu, 16 Jul 2026 05:38:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKE-00039D-Ro; Thu, 16 Jul 2026 08:36:26 -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 1wkLKD-00031J-A8 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:25 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKB-00079B-Mg for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:24 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBiMWp2637086 for ; Thu, 16 Jul 2026 12:36:22 GMT Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4feuex13es-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:22 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8ea75996387so161612346d6.1 for ; Thu, 16 Jul 2026 05:36:22 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=xOMAENftPDT dIMAyjHhGBMJXVoQqIYtsgYzFdOIVgm8=; b=Uns8eWrSezoS/0X4kCgD1Kcy3G3 5tVOIGRtYjfTJgbHoE639b4g5920jU32UE80s9Y6JcwcwpmHRGpb8kvtanoA+f6l Fa1qS2LEhcpo+mtEm4f0+V32BU3FHN7fi/leDu7FQARPGHsBOay6uw5jZqAzPHju Egmat4+2vOm+Y3hA91pWb4q7f4O22MbwU2YHyV/T+KQf5IIKf/8m00kP/rt5/P6f RAhksYuGO99lhd5F9IZw6NfrtFT8gsis9pY+I+LjBFyHibjMfi+g6cW60PwCKFxY 6gHlpcSg7RgMC5VbKM3ki2gqjcwBomhM+UqFpg7awTxA+J4dFoh2yYWcKMw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205382; x=1784810182; 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:content-type; bh=xOMAENftPDTdIMAyjHhGBMJXVoQqIYtsgYzFdOIVgm8=; b=TxS3uPa3OA3Y7ehgAXJqYqC39AajMQ5cJtTiQEswZw3lYe6S5McdMgSvz7bYhxasdH hMeStiZKRg950zOSkpMokr1jepgEk6tDgN0x2XfZD+NvB+Z1F9/tSF07/QaGX+fx9RGn OmPdTEFN56FLMtRqmFkIstrASPYLVGLbQ2nRL8ns7GcFR8KZEySXErJ1sldO9KFktJek ByyUjIEydeIFqn6BHnKnROVn2/Mw8rbp1KC1Ia+zXya4XvjQjAuJilEraMWYGaeVInE8 byhWecHOoWrBuoPpOqW3cesLwrXR9DpTRzHt59GTIg2lybkfnN1xm7WGV2+AGnVdxAOk WoGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205382; x=1784810182; 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:content-type; bh=xOMAENftPDTdIMAyjHhGBMJXVoQqIYtsgYzFdOIVgm8=; b=Pyac8DItegv8Yl1nXDLGNWUN+GD8T0pfWPoQJKr7/JeHfXggDHBB/sEzph2vprNUSA lYCm1X3nlSEvFminlfBm0HDkU/vLYKn68EJ5zRRhKpPuJPj7ekO2h6CawHFUGq6Xclyd VXjCHSvGuoEwgtasDlZ8eReb5D6QYvoyNn8/0gLZ8ccfMNCNiOmvFNWV0U/3uxmInq8y gh7xI27mXHrCan/BGmUZpiOU6jkCtX3ke/PpMr/3xaTJyPs63hDib6YoK81RY2/o1Oi8 ZTM0wxEFH+1r7dICw0jfUqymD84qxhXxXNzROVazo61AAuusTeA4XDmrHq7znhFCB8rI cpig== X-Gm-Message-State: AOJu0Yz4skA6XK+EvCOkRp9pZBJNY8bDIiVZlxvgqV+3GxQW3jm0kzUe ZEMf6UWLTveedwQZEcLjpzRFV9mecggB/RYM4QXRR77bmqYUqagAf0Lo/PIICBgqwoQ0/7rl/P8 LdK1UcnaiE6xWuglpLeEdl/FCdFswVXBSPYDDgAq5Nro55PbDPmj8wnsKPkai0jzJTg== X-Gm-Gg: AfdE7cl+hf3qvoVaszViTVUNFsyTcXLdcOFGf4fPWVdFWbS6YLP99u8UKXrvmF4dZYQ wKbvk28XB4jm5sNOyODR4etTpX0OsMp1dbPGreNysOtBCRaWiti7+4MFl2ivJzOuF380HIYuNAW I06QbG3h8HEg0dmMQWE13bYDvz+hhBtXdrPtGNDz+uA2kF5BgIqwiR4gR3JpuQLUF3J5/VVnHRx CiXzd9i6aPpPaKPZ2RaTQH7HwA8xeAiEvEbtXA0h8n51NQISV8NM+gjpU0Z8QrY/GNEmnWiRgxL yO4J365MkwlirphUp2ow9YAmYNsGSDFoM0xdkjLIqst9xkDhKIqlI1rzLBUgAt6iG2zAS7kWWDQ QZZt1X/OuIJ//48GFaVinW0yqiqLjZCLHvAc= X-Received: by 2002:a05:6214:61ca:20b0:907:5c68:54d1 with SMTP id 6a1803df08f44-9075c685694mr50836296d6.18.1784205382187; Thu, 16 Jul 2026 05:36:22 -0700 (PDT) X-Received: by 2002:a05:6214:61ca:20b0:907:5c68:54d1 with SMTP id 6a1803df08f44-9075c685694mr50835746d6.18.1784205381572; Thu, 16 Jul 2026 05:36:21 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 15/17] target/riscv/debug: Advertise icount trigger type in tinfo Date: Thu, 16 Jul 2026 09:35:32 -0300 Message-ID: <20260716123535.3709148-16-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=JeeMa0KV c=1 sm=1 tr=0 ts=6a58d046 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=NbQ-Mm45WIPNpU4tq3cA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-ORIG-GUID: 1oiP0ygXI1sENsd51PoX-SAW0waP-aJ_ X-Proofpoint-GUID: 1oiP0ygXI1sENsd51PoX-SAW0waP-aJ_ X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX6/tlDDOt6t9P BGnVLJHxQEj82bBZ6Cb3qGHc9DzUsFfdSpFRadp9jVMvf3D4uNfgh0+7UUfFaHGY+4xHlg87CTx /o7/UoNUhfRU/zs8z5p6fmBa0YY+0FY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX+3jyydCb10zf yBHOtiqJ55Ncv0qEghwVR+KedC8RBrg7IepYpiXq7JAHjOigWRqmpjv5CGdIKEYTcE+Wxdv4fns S2lXylqaJ+YsxQx7UGr0FGtnWhPz8xJilQOYKA0e7MQu1I4vr+Xn229z93a3SEFGAg/KA2CIjzF wCaaRbh6Rh8hqGCps8TdG0UlO0rFfaanGaecxELk+VgSIvPqm/BGNVxxInenf9+6muqsQOn7X7T 9UvyzKD1HQ3qrAjczAskv6DE/ZUY3bLPURO2fCTg0oaze3702JQmAts1ZVlmcuOGjkTv23eWzWP T8VUh2uYHOSFQQlKTYDreDDgIebjRbMy8lXTu/x5G7Zw+Byh7U5AsknNHx1x5O8K61ZUMNmYnz4 OTZbMG7TdaHWxEK03mo72C6qjQX/9xWaObCBqOETBig3Nk/Nc4LFbP4zUZ5+L11+xtaymo5jhWa AWXQrOl2YB597SfgFLQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 suspectscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.180.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205513857158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin icount triggers are supported so tinfo should advertise them. Fixes: c472c142a7 ("target/riscv: debug: Add initial support of type 6 trig= ger") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 09d4cc03f9..9089d2ab78 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -958,8 +958,13 @@ void tdata_csr_write(CPURISCVState *env, int tdata_ind= ex, target_ulong val) =20 target_ulong tinfo_csr_read(CPURISCVState *env) { - /* assume all triggers support the same types of triggers */ + /* + * Assume all triggers support the same types of triggers + * TODO: set 1 (version 1.0) in the version field when we're + * ready to support it along with 0.13. + */ return BIT(TRIGGER_TYPE_AD_MATCH) | + BIT(TRIGGER_TYPE_INST_CNT) | BIT(TRIGGER_TYPE_AD_MATCH6); } =20 --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205435; cv=none; d=zohomail.com; s=zohoarc; b=OL9qw+QCH+zKAOOOek9GqSU5PM+YK2g+NeNXQrlxllE4dCFtgNAPd6NSSgo10r53G5RW3Kr9yJQ7N5mX/B4RiPROif252BeXiE/WsRGCjUbKFYk9OFHv8nii1Defpr/r1NwKvAmTrlpYHv1ZF9B40GFKDrrlmopWY0KjUV84HH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205435; 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=okbMDKMeqAPEFxDbR29tMvQwjGlM6BhP1NQoNvRrf8M=; b=h0oZyTwXRbDLqQNJL/WvQTkd4WXnlIxP7RInSfkvzhE2rs51sxpqvQThtQUI4LZUCgl7RdG2LsnedsZEUvLSIYfXrfxUco0oUWBsqRqA0XLwthgvXi2YgkVloWeBhFT7KlsANw2Tft7dcojZfGXt+MJq6Irn5atUG5JeaX3gr98= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205435825675.5016367983741; Thu, 16 Jul 2026 05:37:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKS-0003Pn-F1; Thu, 16 Jul 2026 08:36:40 -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 1wkLKQ-0003Ni-PA for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:38 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKP-00079f-7J for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:38 -0400 Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBioVF2355507 for ; Thu, 16 Jul 2026 12:36:26 GMT Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fed064c8x-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:25 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8ec45d9628aso57429376d6.1 for ; Thu, 16 Jul 2026 05:36:25 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=okbMDKMeqAP EFxDbR29tMvQwjGlM6BhP1NQoNvRrf8M=; b=iGU+LY2SyjOaa4wUCiiNrVsgr7J dErb6HkIo0JRfIb6uBQNIjN6xz46Tq6XNAOkTUF5AU4C3BJVQARAPplOiFBX0mEd vyNVNggmvesqB8WQXaHbaYZ+g7evw9HZ2YrWN0dRK/Y5A5U8zleJobRdF/nKneoh NpulgBG129bnS58zF7Dd8rdLIw03Vq0P4GYEsdLagviDi/DSxvaKm6AgLaL548t8 dzpSUjvWaUvW2Uw02CQ1DwWgkDK14cpQNE0CmDTF8DB2ZSozFmQWKiPCDTnHw8/9 4RObPlSsyGj8r7fa85QNJaUtCY1mM/LFfQ7o8W61D38RmXgIXb8vHzdf1qg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205385; x=1784810185; 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:content-type; bh=okbMDKMeqAPEFxDbR29tMvQwjGlM6BhP1NQoNvRrf8M=; b=agR0hNp2iFVZYkO+i8Mxn0/pcUaVHvyYazhHyxAMnbJv9Mat2J6qmP59FD6GWNJH6p y9f/u+p6zKvnNlEizAZAr8O7KHu4khoO14QOYv3aT59unog8GNQDDP0ijltZ6PMuVcPf 4Dq+j8HPkQt3PS+ArtKjELTtTJjBm6wjvQMKktrv/ZIhuSxWdvF83GRE4EBkleX288a7 zmTj954cp2pHX2SX7qJyIM55ne7XqSQy1VAMLgoX7HUqPRhUIvzS4sfYOPy/q6UkKlT7 Y2CNZQaMBgOKWYQHAAhrhkoDGl49q4qExIDRglHVfHDuLiAi/HQuv1uspcNyT+//gxUs BNqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205385; x=1784810185; 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:content-type; bh=okbMDKMeqAPEFxDbR29tMvQwjGlM6BhP1NQoNvRrf8M=; b=T/MTDzBfIsYL5Iap8dL1xd7pafeZCPm5kblOE0oRHIj7fc/E0zwGXdrwAWsB+429c5 99QPSFIX0JfwEDiASw9kHT5bqH/d2yC4deqKsaX5VxiWtD33AH2BggMn/eMIMatuONJa 8GhjR9Ghyi8/w8i60KYr8wnfSoh8l6n0HZHIFTJz+2mA2/366+u1IMNVRx7dd0fhFDbo wKHQFhwNurgDfTAnv9DTlDdkQ/Lk2yGk+5THL5q+X4FFZyDSWR5jfFhYfqG9en5KU5XQ 2ZzVfnfkJ+p35d4pId58qCSlpTARTj9/4ZdLf0ENdEj1GpVgWfEe0qtJzYcCPaPPZZiF ROZg== X-Gm-Message-State: AOJu0Yx47N2wJF1gplZ6PkV/9qHnRZrJlLDXdTXyC0tgDarAMAoZrE4a rToP/7M6dDYoTitErRUW1VtG17/vVMUpx3gTfleSZ/uWsgsHQdBY4jeu86KPku+Q3nEe63CQ3A0 GQrKLDO4iD+SJgPcDNyrSsyfi0UeFHKnxYLiiGQi7l30VojGm+5Wcy2BqrDscri9ciQ== X-Gm-Gg: AfdE7cm7KwwR7OG4js7BaI0e76iAsI3zld7IH9+zOJgf+bJBwmxOJFYUW0eoqapBDin 7sW0zBukYk7tmNYDjyKDWh2nuNdHTXeMq2XaoyFcjEo3GRkHHEaDTz+9C5yohTFK6WUdgoSzdr3 oGBbAlRhLIVRN8LlZT0bi28AtYaMjSjCgjFJTR0CqfEGegPHeH9Y2Uz29jlIBfsXOWgRZd6Y5Cy /16dP520UOrOqqXq40fdJ/dhxdbEIRmyxZShOcslvjcON1NfbTa2Yjh5rb1nwwdZhIcLvF6BGq5 omX60LYRPikJJ0KBh9BK3HAsjjmimHCU6iSrQzYT0WIGuNhBE/K86K5PQlwwbbsB3UstYkXp5oN OMz52JthCM8W6cLbw+VCmt2RZ19ehauPP2Pw= X-Received: by 2002:a05:6214:4005:b0:8f0:b50f:dcf with SMTP id 6a1803df08f44-90400b8b7cfmr257176226d6.7.1784205384694; Thu, 16 Jul 2026 05:36:24 -0700 (PDT) X-Received: by 2002:a05:6214:4005:b0:8f0:b50f:dcf with SMTP id 6a1803df08f44-90400b8b7cfmr257175666d6.7.1784205384189; Thu, 16 Jul 2026 05:36:24 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 16/17] target/riscv/debug: Reset trigger type to unavailable Date: Thu, 16 Jul 2026 09:35:33 -0300 Message-ID: <20260716123535.3709148-17-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXymqIaJBvPmdn 5EzlpM8fQf3oTIOib50XpLnaEJ60xGqD0RLzQpXBewtoREkbEzRJy5h2GRSAXO0EpVy6roFH7XA rQtYKiz4Jp6G+8Cvd75aPR7vdjKQoCk= X-Proofpoint-GUID: XOEI2Ce3aw-aRNNtBIUEVNTUWLt9hpQj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXxUEOYXRKSYXq y6WLF9K5e8xxotpFgoJGIyHFZqv4HtzfGp8gAO1g8x8DcVuFRxY+FR32G2BtrZ4R4TNzfl/deLG 8s5vjFGU5+ZGzoCYJoKC8JMkd4vrkpGtPPXw0ARxX9D2eNWy0IQxsjC5M2/b23+H3lw9aG5W+nA kfrk54VYUsvnGz/1No84RCzBZWiXGGsFrQBm+zsnM+le0HaxCGPx4H5uAj/ClAuYUDKIXmU0A4t XKQX7XjlJzO6OtFrpif09afkL++TeJJDM78PTJ1i4mV4N4F8n93YCWm7SlmpjfE4CZqkeK9DE37 BPzJ3SXxvqHK5zRpUnpDUX4U7xnHv2yRDjnmnI+Lkxnsd2VV01ZuW9j6+pZoaBkGz4pK71YCQCU UJcRGTifpvw+1sYTkLW1LF7XowbWawkVV7h5lRRxaT4WoGsjSEMtLDFFroZDpghnynS7u4PJF/R 4kDjMGBf4j/uxHFiz0A== X-Authority-Analysis: v=2.4 cv=Xb25Co55 c=1 sm=1 tr=0 ts=6a58d049 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=YoUxN3H5ZC8bLvEMz08A:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-ORIG-GUID: XOEI2Ce3aw-aRNNtBIUEVNTUWLt9hpQj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 impostorscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205437421158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Reset triggers to type 15 (unavailable). The reset value for tdata1 type field is implementation specific, legal values are permitted. Unavailable is a legal value, and some implementations may not support type2 triggers so use that instead. Fixes: b6092544fc ("target/riscv: csr: Hook debug CSR read/write") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 9089d2ab78..50e5a85caf 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -1183,10 +1183,10 @@ void riscv_cpu_debug_post_load(CPURISCVState *env) =20 void riscv_trigger_reset_hold(CPURISCVState *env) { - target_ulong tdata1 =3D build_tdata1(env, TRIGGER_TYPE_AD_MATCH, 0, 0); + target_ulong tdata1 =3D build_tdata1(env, TRIGGER_TYPE_UNAVAIL, 0, 0); int i; =20 - /* init to type 2 triggers */ + /* Init to type 15 (unavailable) triggers */ for (i =3D 0; i < env->num_triggers; i++) { int trigger_type =3D get_trigger_type(env, i); =20 @@ -1201,19 +1201,6 @@ void riscv_trigger_reset_hold(CPURISCVState *env) break; } =20 - /* - * type =3D TRIGGER_TYPE_AD_MATCH - * dmode =3D 0 (both debug and M-mode can write tdata) - * maskmax =3D 0 (unimplemented, always 0) - * sizehi =3D 0 (match against any size, RV64 only) - * hit =3D 0 (unimplemented, always 0) - * select =3D 0 (always 0, perform match on address) - * timing =3D 0 (always 0, trigger before instruction) - * sizelo =3D 0 (match against any size) - * action =3D 0 (always 0, raise a breakpoint exception) - * chain =3D 0 (unimplemented, always 0) - * match =3D 0 (always 0, when any compare value equals tdata2) - */ env->tdata1[i] =3D tdata1; env->tdata2[i] =3D 0; env->tdata3[i] =3D 0; --=20 2.43.0 From nobody Sat Jul 25 15:53:11 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=reject dis=none) header.from=oss.qualcomm.com ARC-Seal: i=1; a=rsa-sha256; t=1784205483; cv=none; d=zohomail.com; s=zohoarc; b=l4PDFCccWA0L4RmjV1m3atp4dVaZO6d6cQW0Qo6AkCrQ4VDMMIBRazUL2QFmB7eExN3dZhkZYxmPZUk8rgTv1PdXBAcdGRsU3+d5EEiTUTGVMguBJN799XHsToSZ1HXbG1noN0LoANoUgqb/UJJtXXP8f7ujLrnaMwChW6RJQkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784205483; 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=dPPGQjovsqgpjPBK0Rf/v7XTwgXHKuSKILoSOOXro+A=; b=N1XtK02CNxR+i2gOPuf+KKEpX3sLqBSF6bRGYKE49GlIuQGgWHr1yVW0dG2tS7r/Vb7IFGNqJRTctgBpbR2dpjJtZ05ZOve0/uIhkg6zrvjD0IEyL7XUBxtJVHBMJRQpiQqXI0WPWdLJH993ptSJQAGAUAHCV8Jh0EusQEqe0rU= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1784205483568879.7510545959831; Thu, 16 Jul 2026 05:38:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wkLKU-0003UM-VF; Thu, 16 Jul 2026 08:36:42 -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 1wkLKT-0003SQ-Cb for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:41 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wkLKR-0007A6-O6 for qemu-devel@nongnu.org; Thu, 16 Jul 2026 08:36:41 -0400 Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66GBitaS2730880 for ; Thu, 16 Jul 2026 12:36:28 GMT Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fen4wadve-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 16 Jul 2026 12:36:28 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8eeba1d9e47so87360976d6.2 for ; Thu, 16 Jul 2026 05:36:28 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-902de1fdb3bsm191609316d6.23.2026.07.16.05.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2026 05:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=dPPGQjovsqg pjPBK0Rf/v7XTwgXHKuSKILoSOOXro+A=; b=B3FaverrMXDEmjbHk4MOUkPT6Mu xHzigXtJbVQjyAkkPUVeCnVjEKtAScY9wXb5aO6aMOMjb2VrPV6W8BI26TWhYita GacelI2oC7sR+kHsKTCJoUEmoqNqgUPqtq2c6brWeH8+D9uGfanh8Fn3MQ71IOtS Bml6Rs+rSpk4hYp3T/meuoEyUM67Arz32XqnV0DawChKGuM+BRfwP0eaj6jUaUHU segOB8WMCbl5c5nUa7STABE/5FDj1KPLEwg9VIUMpruBXsb7Umrhz7NKtZSk7P0q FIwiqZggbsCDU4bTmrRZgpRju5Q7wEUew+dHQ6kjzy3MMC98+mS7khMlkgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784205387; x=1784810187; 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:content-type; bh=dPPGQjovsqgpjPBK0Rf/v7XTwgXHKuSKILoSOOXro+A=; b=YHya3NQQhs+97LPQwcltMABOAoTv8Gat9hAZitmMjAyYUydwRfGUY6u/1beI4NRi51 bdcMge/t9Sc8EYUbH/3WvEP2ENGaLe9wKtwRiauL0xMQivWxE8XgI410yON7upLZwkP0 o1zhS2h20GTCvvJpQNcBfekYHw0HdDGYhERRrNMkSuprAgyTTv5ANsCZs8slo5y0aa71 OkeuAiaz9QF9036lFuC/yAQVkYqecNDvJSZ/I7oOJAKK8ayfUgJ8hbK2e+QBZy0Jm3NS SL5W/AvsRS5XOdRz2KnCXBYXyVY/hTdRnlJ3LVfUuzDYAFmjyzMockSYOEuNVY4dS9pL ZALQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784205387; x=1784810187; 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:content-type; bh=dPPGQjovsqgpjPBK0Rf/v7XTwgXHKuSKILoSOOXro+A=; b=KKlFjdmhS1PeTF/Z10Srt0JYQvQRReFzakaxTly5rPuCkuHvjT3SEAxFIyZY8R5ZsR 2bYeZ9KnziNwfXlkkdDvWjqDfSV73bd0jcUVvu2a8AwT7XT4TZzyhTWUTf3cdwgCBTnW 2WcmN/zbwk9SqCEcBI/UTJteRjZttP8flY8kRVyvd9y+YnO6n7lp9awxifysVb5ZLNDo iN5JjxAXOOk7KfHQYJAq3VwCZlFcZJYgwCIIi8jUvurG1anE9sJ56CCC1rw0UkhoULq0 ZLTwa87JxID9g1iAxmagshK7w3SiwbM+p4AZqLFjXJ6hSBQgeKEyui75mnWyTrH/e/9o lLvg== X-Gm-Message-State: AOJu0YzKVOzVF9HbyaErTqlc88w++ZjcoNYH3pH+doFWwz4jZE4ikb22 87XEKw6vFIVrGKg8pXeil3pmx2wwTRP2q0fRUozPZzLRLZRMdsG4Qk4t+JvsyHpQWGpp0dlXTvX D20g02KWoZepg7E4uSLWLOkY1e5hsb1wmIqOE/+2IF7Qn1rA/huJ4lwMVxICo5l55dQ== X-Gm-Gg: AfdE7cm7o1NIrrg4+2keA4rhxjTLvp6In4VK7bWS2g1uVmzG2dQnzv6crjujRVDX8U3 wS+C5XnOhVx4Tf8yVuIbArUVhYD+cbHnsB9tKIOVJwFWfN7wCYIUQuRQuXw1dLSB/xUsDMO9azJ xJdBO2xZ0i99Q5+GR0CkL0W8vG8QkTCkUnF44wRyoKvbrNWaM1P3eqhJOTwDgVrLphLgcgBjsjY MQyEiB/1/fOmixVHYdU346ow4zgcoE/HRGDs6AsVL8UTKYtvVp2EXLIVSMRpKxDAjm6HwnpCZqP P9REZowYaefylmhOQihD6YIPN/rMEEP5UAKU7vuHiTZjHSIF8oTp34fXuDYa3by1Pd0BzTactwO CxjiUuBasWQM5l0YzX2EZBoH1i/tKe876sOM= X-Received: by 2002:ad4:5fcf:0:b0:8f0:12e8:f453 with SMTP id 6a1803df08f44-9074c814f62mr112472196d6.33.1784205387353; Thu, 16 Jul 2026 05:36:27 -0700 (PDT) X-Received: by 2002:ad4:5fcf:0:b0:8f0:12e8:f453 with SMTP id 6a1803df08f44-9074c814f62mr112471746d6.33.1784205386876; Thu, 16 Jul 2026 05:36:26 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, npiggin@gmail.com, chao.liu@processmission.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH for-11.1 17/17] target/riscv/debug: Fix minor comment typos Date: Thu, 16 Jul 2026 09:35:34 -0300 Message-ID: <20260716123535.3709148-18-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> References: <20260716123535.3709148-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=PsejqQM3 c=1 sm=1 tr=0 ts=6a58d04c cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=oPyd9XVBMgBqf3_3PDkA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-GUID: jrnYinhynDV_6VdRi6opUCv3O68KYd1W X-Proofpoint-Spam-Info: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfX0vn3G2++rw+w BIopLYfR1WXLK0UMqq93g3DKpxY7nquo5xgL6Q5euZHoX/8d6tsCB2sLVyTWkw624HXX8tJXUAT ljndvtIeKedAZxMxG+GrZoHz3cIx2Zw= X-Proofpoint-ORIG-GUID: jrnYinhynDV_6VdRi6opUCv3O68KYd1W X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzE2MDEyOSBTYWx0ZWRfXw01fFgvcVOde GXteW0SQXUORr7XsOHeh47N/xqLZ79A4YTgA3R5Jx7HwNAPQ6q9GrFhY1nmJCHFGwiNsF7NDRN7 76YdHZmt5v825FBc2UGhfIdYTAvKd92lPUNfVOMJ6kGt0dGnWHA+T91WrzMOu00jNQCuRSkee+L tiY1XsPDeKPRc3kD1De6dlu6KtY9SC1pgBE1/rhEL1VqF88HP36tJ8fXtwYXaqozkCLJYtqA8zN sfvd/P5U/Rc7fHwnwiUO8dC4zPDyLMR4VhpeI3Kv9zA3Rxn+0GJTrtihs/YSBWIj1c4BVq/NOCy N9+pwwLM8JF/U8r+bmobmBzgZIbnCKz/pT+cxlO5vp/5K0poBBuKZYWlqiz7seLVG+M1a7NSKQF 1d0X9S5PfmqbboVzzrULgpffKs4qzyX8oi+vuVG1lYtW+0qbCZg1r5L3MKOTNOgTePucfzwEg91 UoJk+OyKgblT1qBUVOA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-16_04,2026-07-15_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 clxscore=1015 bulkscore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 suspectscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607160129 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=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.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, RCVD_IN_DNSWL_LOW=-0.7, 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 @qualcomm.com) X-ZM-MESSAGEID: 1784205485644158500 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Fixes: a42bd00166 ("target/riscv: debug: Determine the trigger type from td= ata1.type") Fixes: d1c111411e ("target/riscv: debug: Create common trigger actions func= tion") Signed-off-by: Nicholas Piggin Reviewed-by: Daniel Henrique Barboza --- target/riscv/tcg/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index 50e5a85caf..27c2e0da25 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -122,7 +122,7 @@ static trigger_action_t get_trigger_action(CPURISCVStat= e *env, break; case TRIGGER_TYPE_NO_EXIST: case TRIGGER_TYPE_UNAVAIL: - qemu_log_mask(LOG_GUEST_ERROR, "trigger type: %d does not exit\n", + qemu_log_mask(LOG_GUEST_ERROR, "trigger type: %d does not exist\n", trigger_type); break; default: @@ -944,7 +944,7 @@ void tdata_csr_write(CPURISCVState *env, int tdata_inde= x, target_ulong val) trigger_type); break; case TRIGGER_TYPE_NO_EXIST: - qemu_log_mask(LOG_GUEST_ERROR, "trigger type: %d does not exit\n", + qemu_log_mask(LOG_GUEST_ERROR, "trigger type: %d does not exist\n", trigger_type); break; default: --=20 2.43.0