From nobody Sun Jul 26 12:29:00 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=1782259668; cv=none; d=zohomail.com; s=zohoarc; b=Aatn9WATHzI9KFf9nlsTuekAe/lPmY1Jp88MnWZDcW6w2AL/1AH1nPMXflWjHf6/6Ig9xTKOUlYmxNfCzutzDssE+EFbhLnjtPfrldSRUz4vpGeDOVyUFccDiyHeRCokRbX7rj1ChZ7qscOPb1gV6jed86Wy2kEhpFYSuLelTuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259668; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=t4FW760/dwatMRdPf5Z+Kiei6+Rz9q8sXcA9tVx5ZWo=; b=LOB2tGdTJwBxKJrzn5GdJlPrQkiyZzhWg/ykOPSC9RavIRFLQVPUhNyYsNb/0zY0ZR7svFp1W4W3ZaIlH/7NjmMTVlYbhkYgQiPdzTFZ8J2H3GFLPExiEZN+EKDLxCQ59J7QdYYRW0C/TiNzU5a9kfhe2qL1dfv0U0P9Nks6pg8= 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 178225966864371.99646477657359; Tue, 23 Jun 2026 17:07:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB8l-0007JY-Hn; Tue, 23 Jun 2026 20:06: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 1wcB8i-0007ID-32 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:48 -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 1wcB8g-00039U-GR for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:47 -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 65NJwrNk613918 for ; Wed, 24 Jun 2026 00:06:44 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyppykjcf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:43 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-517afbeda8eso7449691cf.3 for ; Tue, 23 Jun 2026 17:06:43 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= t4FW760/dwatMRdPf5Z+Kiei6+Rz9q8sXcA9tVx5ZWo=; b=QxoqfrydSjOkzUia f4h/hxFIPhDNfxju6Kk+QEhKGoRfAyfNwyPvjaFR3oNkDoohx5wBumDu7/mCKtwk 8HgdkuwhooC1r3NN+no3Hu5dWU3clI3f36DWlBt4mP7Iq/9WaWrHYuzkMVetGkvr XPXgl6Kh4an631Z/crL+nxrMnxzKxnL8Zw3Pf9xc2EogyTa88WnoBxuwIaKneIf+ oZxEeaC8Ys/nK+xaOy0u14JQm+A5Rc7KcvUHCH67/6YP1WH8M7aSY0cmWnp9mFXL pk6v3uzucFSI0Fw/rao3ZMsAwcB68ydQgfT8NuBuBDoTHMdMdl/2u7d4ZByvcjaV Te6DQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259603; x=1782864403; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t4FW760/dwatMRdPf5Z+Kiei6+Rz9q8sXcA9tVx5ZWo=; b=WBBlffXfYOg2YBvnIZDCP9rPfCF4Y23eo8Zu2cTH/oDF9wnQ+p+GsWfTHUlk311JQP i13+uavO8qGGKMTuBp5vcWzC7+TLM2wDzWiaJ/J3e69oDSBug8E+UWm/bsJwcZBkAM+/ zu8J9tq8/K4/r/539J0TqOPMDxg5Yori4o1miMyx5txvjWJEzyJa+nzGK0qzE/fBQsRN CUuwT+c12QzShXbm4P8dZUYWwq20roFrv44l05dht6QCxw7JdGexSXDW0WJPEZcpX9vg EGk2W6N4tMpSciMHcL6hB43H3YAg0oU4xDQdHjl7F6c6NEsYjiXtNNJ4v/k7+6ebDUPT fFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259603; x=1782864403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=t4FW760/dwatMRdPf5Z+Kiei6+Rz9q8sXcA9tVx5ZWo=; b=DjyZXxhRFgzgZK3g40MIz3Uz8TwCYRTPbGN2jLlndiXA7XxYE4j/kpVbzyJ9fNq7Ft zE1JUwi2nRrGJAiKIGxLnKlJXHGWHgQkkklS6b6SxcbxEknqCqn6IzNpbakFni7yWZsR C+yzmC5iQkzJPYrdgHHtfLSX1ezI/2YF7+A7uhXyiqRcLFSFMIs6yuwl1vMBQt5jR4Nc tsdwkpCZP2LBJE78CiPirOIXgSxVgSUu8Gk9v1eV/FgURFaUwGKmzTp1zJkz1c7RFb3H tFEibtAC2gf71aStgMn/BMudStSy81GWh7gCa00fVu5C9a4jEtkrVVA2fUloppFngn6L 9cEA== X-Gm-Message-State: AOJu0Ywe+XuwvfFKYGCRDACI6++7OViYoat7GuBXF5g//1hKIMnogqzV PLhujeAMWp2JUQ0pab21OihfAegpSxqUehcUbn5vpQyvQaBi9kOSrgHM8v4j81KBOxJS5kDzh5J Tt9sjkyfUXms5J5IcMgr2Ux8tFJqSOgWPOVwL/WlfhehvmB6JvT0WJ5hW4RUfLQoO+g== X-Gm-Gg: AfdE7cmaJUsTlDgIPNx9ar3XAdKh79JetGWYLcTsO2F0VNCvTufNZk41Hqxs0duBcCQ 4wXSLglVP/Itaij2sopcjLlWccrOmCpLF8CBhExo/t/L/sOxeEMToUz8IWDIxU2SbyfdpqpW2P/ p5DjdGS2luY2CsSnZ0XKid8RUtQrRRhp0Ls2RV2CshFUOkDrLM23Swp1DQseJarLiJvFDCDE5Jm TYUg79HWm6ur9Dg008VXKYU+nbNZGbjRRvC3PJci5umvVnEDl+dhXKn4LuqZzL5QX/iYj8pno/3 xUyicSfq0ezEVt6B9vm/vcW2d2AU5RAinwbi6DJDXEe6Q4rH7TJ5tL3Oa8MQvW7iMOmKQma2KtR AGP59m6XuvGE6gpwigYVFCfLkGw14k+iWZHk5Rizv+Z9REA== X-Received: by 2002:ac8:6907:0:b0:517:c65b:f416 with SMTP id d75a77b69052e-51a61cb160amr19911851cf.54.1782259602696; Tue, 23 Jun 2026 17:06:42 -0700 (PDT) X-Received: by 2002:ac8:6907:0:b0:517:c65b:f416 with SMTP id d75a77b69052e-51a61cb160amr19911181cf.54.1782259602131; Tue, 23 Jun 2026 17:06:42 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 01/24] target/riscv: Remove unused tcg/tcg.h include Date: Tue, 23 Jun 2026 21:06:08 -0300 Message-ID: <20260624000632.2149359-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX9Fkxg6UhskYK si0pbCj5gD8znOsYT9php6fH9l2sNd2Me/6fW0DVHy/NgIDPDlOp7leSFBDxdaRhP1X3RcxHf0u 1+W3Vq8dkWhZQsQnRu208qJLNwlB888OXbK21/wlO+AIM1MPBoOyI5eJ20Xz4+Q37ESRRS2il4+ S623bb8CoFpxhzzJYVgdWLLFcFY+Yl6ytpH9sfov3nYLZ0fHMHevhiyG7Z3swKuJbJ1rmsLaIAa zsy5xyKXQoxo6+nhoMnZfXJ4OCVArdb/4gYFSPGX3ANZ4002KRldu0Dx9IZXyfVs4XcEPcdUmzq 8cFW9OPkilBN04E+0y96om8uxhOmfVdNXiV0lS1TVUWnv9hwNuUYgze94X3QsxYqL0EoXeXT0R+ x2Q3SyWNmZmv5KiOtQ49MBq868j+oA== X-Proofpoint-GUID: V7NIL8dbYL05Bz1QHlfP8mFIPAgCMz7f X-Authority-Analysis: v=2.4 cv=dvfrzVg4 c=1 sm=1 tr=0 ts=6a3b1f93 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=JF9118EUAAAA:8 a=beEPI9FAKrdLFu6WGxcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 a=xVlTc564ipvMDusKsbsT:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX3+tL0GwMF8UC uKFfmAWxuTlK0Oe65A7btr0cu2q47IQgOZAY03tYsVP5yJKLMtX6+ZcKelaBuSCt3sR8//xp8sK CGylYae0EJnnnmMK2hDHhcFY2oaBeLo= X-Proofpoint-ORIG-GUID: V7NIL8dbYL05Bz1QHlfP8mFIPAgCMz7f X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 adultscore=0 spamscore=0 suspectscore=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-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259669775158500 From: Zephyr Li Signed-off-by: Zephyr Li Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index bff3ed5de1..4e96bbeb60 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -38,7 +38,6 @@ #include "system/tcg.h" #include "kvm/kvm_riscv.h" #include "tcg/tcg-cpu.h" -#include "tcg/tcg.h" #if !defined(CONFIG_USER_ONLY) #include "target/riscv/debug.h" #endif --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259762; cv=none; d=zohomail.com; s=zohoarc; b=R1+//yQoVUpqvuYla7vbFIyFZFTvlm1LG3t01PaKf95jZB0cTqMcbhhQ5Q83EwNSG+kJCsvAw3S5PVDz9aN+t/S4t8eLWn8eqMyI3QQ/0ZFWbr+8CYlH9YKGpGIW6LoIkyawPgWSdH9XVCLp1Vl+7PCznkr9BMiJg1ZX4602F4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259762; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4TfHkAcssF0NJF9dyAvoTDljZN9CfROAV6iKH47t60M=; b=I3g8T46IibKyNlEXtk9I0/2kKszYhBgmTBPQ+3shcdoM74TDTGFMf53JjId4DOcJ97QvOkQ+079WhEMcwwG79U0bjqA9oUgJgQRa9mrvajh/T3Z/aOZAYNHk8t4asOW2ndmu1iGMktdy3LwkGEUHbeR7gZ9X8MWEs9CtrAyij74= 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 1782259762956912.2491688639037; Tue, 23 Jun 2026 17:09:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB8q-0007N1-2r; Tue, 23 Jun 2026 20:06:56 -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 1wcB8m-0007M7-Q0 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06: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 1wcB8j-0003AD-Ln for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:52 -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 65NK0vve1177559 for ; Wed, 24 Jun 2026 00:06:48 GMT Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyqe6bd83-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:47 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8db8b467f13so10534646d6.1 for ; Tue, 23 Jun 2026 17:06:47 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 4TfHkAcssF0NJF9dyAvoTDljZN9CfROAV6iKH47t60M=; b=nQZHXV7QVEJx+4bT Ckf6lZkVt/mo1YaL12iFxJQJsc6LcGlTO5VSy7GSMc8hTFmRmNhpYiGlw+lv8Vy8 fqIoP6aMZysCY8aK7REbmx4ujdk+AIkUryLk2j5BNqsKo9hcJLku6zTi0gindSOH KynPrH13t5Gl5uIBfCByU1Qe+8kIk0DDBwrsosPhh5GW3fw7hqi+fggOLywVMQOL ncjb6KDbEWZ5qz4Dg74g2RkkwY7e1ANx0DwCIqjhsuZc3JmOq480hUS9dTZJ/vZU cbxro7wjXq3RZ+z+vVrQAHtztxRKlzRiyxUkZyY/ahGGtKIdNEBvxIQVruGrgTTA eK4Yug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259607; x=1782864407; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4TfHkAcssF0NJF9dyAvoTDljZN9CfROAV6iKH47t60M=; b=IgyWZf2GfwDN9/P3RkD7RHekH3A9sBRLfx/dy8flf1UzcMGKbS8rk526AwzM6TsBgd QfH4W/nadVTsnXRni2F9RrHOOtIjH75mjDC79W9BZK8SIJqKA7c6wf0Vomu/twuuanHV mUhubzBixB1+exv6ENBw3Bn0AMWuGDhtwYRF72PlebCeDPG6OMiQJNF3OoSiAfAC7aiQ 0plIin+UbXdqM1JMQ+ZxZbafwxW7J0MXCJkbT7R2QaIM/ha5E1mfFItbPdHUGDhXB5zu 9Qdttt/sNZ0idKaRbRv0eS0YHN8Ow9hdSVJb5CS4H8GDFB0ujD5woI6dqJz4S2J4HwWS OyyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259607; x=1782864407; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4TfHkAcssF0NJF9dyAvoTDljZN9CfROAV6iKH47t60M=; b=LC5NyS9bf0AQ8WDLnYqunLkWU83P8O4oIG6Z2EdgnaAMaa2tIjKFv0kdFKetZdG0bP akDrm7/ZGPtRFzPVsvPZ0qI+ZJzHe9detzmSv7OX6UkhWFOXLNqD7tkhTabJN1/i2e2E R1tWSXo4rDeGwy5muVqBot3LYrILRmdhn6Akfb3uKOJjrFD8eTjPYCfoIhO8S0oTY/q3 muqe4m6/x08fOWtUPgcwGmxn+fk/DwGrtdeZvdEo3brxlgM/lBWZ0e7CMEimGgTGcCef b8rvmuya2rf3BGY59daXqGYeJ3EI7DTExiH8IxgmPxvor9feNo7CLrSxICtdkq1p/RJ7 9juA== X-Gm-Message-State: AOJu0Yxn7OC1MZuOlW3AtLfELH1syB/f5GCjWdvV51Y6OYgmJBbdS2Pb HAeXcuv40/h/c/fli3maxQKFXAreGyVzRRZMT1raRcs7eOgCNkC1gL7H9xxneaQk2YLEQbxhPRL /YKdXAkktFxieAOyU+Rt3q2Um7If2ouN6utfC6+A5dQuniTAxTcIPx0wrf0Vs8a/x+w== X-Gm-Gg: AfdE7ckLCkIAO/PBe4+s3Xu7/zrJngzRIkOAyPRQyYlHtLSpKrP+rG7KdUblUKH7uA4 NxuSsfoYeUbWX4OKo10uLIkLFANHfseT8/meuWhrwVLAIdg1OqGlztfGPw8ptVeQi/GEwViizdw zRCobvAEHxOHzzxOo+e1rryJPgS9dXm6AFxq3tqMAl1bjCwUyk4xl7kpVtF3SjiC2g6RG3BkYuY 5qwUd+KhjiWvAuqCHsO7zfzhoEd1mfB/46oJqtDMxrROFCc1m6Y6YFE0Vip8TxM+GYoewBxCEMu m3I29+vxpuWVhvMVeLcLLHjUrzkEPcJsSyWKYlq2NaOZ2Vq16HR+KtH375I+suueT2IRxcSj/6A 4TUDlWQr+cAG65+JeM5dNECethKvinOZZEKUOzdognea6dw== X-Received: by 2002:a05:6214:4803:b0:8de:ca40:c3b5 with SMTP id 6a1803df08f44-8e535b0b8eamr24192126d6.31.1782259606526; Tue, 23 Jun 2026 17:06:46 -0700 (PDT) X-Received: by 2002:a05:6214:4803:b0:8de:ca40:c3b5 with SMTP id 6a1803df08f44-8e535b0b8eamr24191206d6.31.1782259605805; Tue, 23 Jun 2026 17:06: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 02/24] target/riscv: move TCG only files to tcg subdir Date: Tue, 23 Jun 2026 21:06:09 -0300 Message-ID: <20260624000632.2149359-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 4CE15BwovwYecmVkmSy63HrYDNJAGlZT X-Proofpoint-ORIG-GUID: 4CE15BwovwYecmVkmSy63HrYDNJAGlZT X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX9M5JllinGyU4 mnrdOWbNw9OxMmpmm5UUj6kg5GXs1UVk4K8Y/CPNTvcnCn2CiKMEAo/osfucJRUYNfF5is8b7gv HkmS6e4NncYWlaV0RIWeehGsKF6Jzsg= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX5GhJloi4Gu5M xMKPMX77q/MyNNhYwPlFrX2TJesuxcCzAHWsQig+q3h7VeHkN4Cy1hCBFa/5HZj1zQYaUkh/48q hGrBoy35XcUyDgkrmuyfWDExjxa8FKJ6tllmk9I3yiq99ybqY0CSsAcDUh4OpWlBpqXNEHEX9hW 2V1CH3b8L+LOakP3/NggK5ziB4Mp6HziiCuxpuMmV6Al3c2zKVnEqBkRU64Lo63vxg/qwTALB9e f81OHRhXmMveQ0tq4A9+f0IyQdCK43dexP3Hypi+KKnk4xbI4igbMflluSlqQq3+sUhbZzEiNdL DYWmAUzOfv+UiDgGscltxWVccgCkKTEcnoYtoQWE2gu+L1sJeOLkbDC+FWwPew57Gf34jSEH8kG khgUCNfZa69AE7SduwUr38Vkf/r7nw== X-Authority-Analysis: v=2.4 cv=OeKoyBTY c=1 sm=1 tr=0 ts=6a3b1f97 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=dWVhGV5Cy5NFuyiy0EoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259764221158500 We have *way* too much TCG-only code hanging around in target/riscv, where ideally we would have things that are shared between accelerators. We'll follow the example of other targets like i386 and loongarch and move everything to the tcg subir. This will not only cleanup target/riscv but it will also expose what is common code but it's buried inside a TCG helper. We're leaving some stuff behind because these require a little more case to not end up breaking KVM. We'll take care of them next. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/meson.build | 16 ---------- target/riscv/{ =3D> tcg}/bitmanip_helper.c | 0 target/riscv/{ =3D> tcg}/cpu_helper.c | 0 target/riscv/{ =3D> tcg}/crypto_helper.c | 0 target/riscv/{ =3D> tcg}/csr.c | 0 target/riscv/{ =3D> tcg}/debug.c | 0 target/riscv/{ =3D> tcg}/fpu_helper.c | 0 .../insn_trans/trans_privileged.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rva.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvb.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvbf16.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvd.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvf.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvh.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvi.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvk.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvm.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvv.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvvk.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzabha.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzacas.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzalasr.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzawrs.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzce.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzcmop.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzfa.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzfh.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzicbo.c.inc | 0 .../insn_trans/trans_rvzicfiss.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzicond.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_rvzimop.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_svinval.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_xlrbr.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_xmips.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_xthead.c.inc | 0 .../insn_trans/trans_xventanacondops.c.inc | 0 .../{ =3D> tcg}/insn_trans/trans_zilsd.c.inc | 0 target/riscv/{ =3D> tcg}/m128_helper.c | 0 target/riscv/tcg/meson.build | 30 +++++++++++++++++-- target/riscv/{ =3D> tcg}/mips_csr.c | 0 target/riscv/{ =3D> tcg}/op_helper.c | 0 target/riscv/{ =3D> tcg}/pmu.c | 0 target/riscv/{ =3D> tcg}/th_csr.c | 0 target/riscv/{ =3D> tcg}/translate.c | 0 target/riscv/{ =3D> tcg}/vcrypto_helper.c | 0 target/riscv/{ =3D> tcg}/vector_helper.c | 0 target/riscv/{ =3D> tcg}/vector_internals.c | 0 target/riscv/{ =3D> tcg}/vector_internals.h | 0 target/riscv/{ =3D> tcg}/zce_helper.c | 0 49 files changed, 28 insertions(+), 18 deletions(-) rename target/riscv/{ =3D> tcg}/bitmanip_helper.c (100%) rename target/riscv/{ =3D> tcg}/cpu_helper.c (100%) rename target/riscv/{ =3D> tcg}/crypto_helper.c (100%) rename target/riscv/{ =3D> tcg}/csr.c (100%) rename target/riscv/{ =3D> tcg}/debug.c (100%) rename target/riscv/{ =3D> tcg}/fpu_helper.c (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_privileged.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rva.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvb.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvbf16.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvd.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvf.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvh.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvi.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvk.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvm.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvv.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvvk.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzabha.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzacas.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzalasr.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzawrs.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzce.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzcmop.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzfa.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzfh.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzicbo.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzicfiss.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzicond.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_rvzimop.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_svinval.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_xlrbr.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_xmips.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_xthead.c.inc (100%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_xventanacondops.c.inc (10= 0%) rename target/riscv/{ =3D> tcg}/insn_trans/trans_zilsd.c.inc (100%) rename target/riscv/{ =3D> tcg}/m128_helper.c (100%) rename target/riscv/{ =3D> tcg}/mips_csr.c (100%) rename target/riscv/{ =3D> tcg}/op_helper.c (100%) rename target/riscv/{ =3D> tcg}/pmu.c (100%) rename target/riscv/{ =3D> tcg}/th_csr.c (100%) rename target/riscv/{ =3D> tcg}/translate.c (100%) rename target/riscv/{ =3D> tcg}/vcrypto_helper.c (100%) rename target/riscv/{ =3D> tcg}/vector_helper.c (100%) rename target/riscv/{ =3D> tcg}/vector_internals.c (100%) rename target/riscv/{ =3D> tcg}/vector_internals.h (100%) rename target/riscv/{ =3D> tcg}/zce_helper.c (100%) diff --git a/target/riscv/meson.build b/target/riscv/meson.build index 79f36abd63..61874ed0af 100644 --- a/target/riscv/meson.build +++ b/target/riscv/meson.build @@ -16,31 +16,15 @@ riscv_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', =20 riscv_ss.add(files( 'cpu.c', - 'cpu_helper.c', - 'csr.c', - 'fpu_helper.c', 'gdbstub.c', - 'op_helper.c', - 'vector_helper.c', - 'vector_internals.c', - 'bitmanip_helper.c', - 'translate.c', - 'm128_helper.c', - 'crypto_helper.c', - 'zce_helper.c', - 'vcrypto_helper.c' )) =20 riscv_system_ss =3D ss.source_set() riscv_system_ss.add(files( 'arch_dump.c', 'pmp.c', - 'debug.c', 'monitor.c', 'machine.c', - 'mips_csr.c', - 'pmu.c', - 'th_csr.c', 'time_helper.c', 'riscv-qmp-cmds.c', )) diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/tcg/bitmanip_hel= per.c similarity index 100% rename from target/riscv/bitmanip_helper.c rename to target/riscv/tcg/bitmanip_helper.c diff --git a/target/riscv/cpu_helper.c b/target/riscv/tcg/cpu_helper.c similarity index 100% rename from target/riscv/cpu_helper.c rename to target/riscv/tcg/cpu_helper.c diff --git a/target/riscv/crypto_helper.c b/target/riscv/tcg/crypto_helper.c similarity index 100% rename from target/riscv/crypto_helper.c rename to target/riscv/tcg/crypto_helper.c diff --git a/target/riscv/csr.c b/target/riscv/tcg/csr.c similarity index 100% rename from target/riscv/csr.c rename to target/riscv/tcg/csr.c diff --git a/target/riscv/debug.c b/target/riscv/tcg/debug.c similarity index 100% rename from target/riscv/debug.c rename to target/riscv/tcg/debug.c diff --git a/target/riscv/fpu_helper.c b/target/riscv/tcg/fpu_helper.c similarity index 100% rename from target/riscv/fpu_helper.c rename to target/riscv/tcg/fpu_helper.c diff --git a/target/riscv/insn_trans/trans_privileged.c.inc b/target/riscv/= tcg/insn_trans/trans_privileged.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_privileged.c.inc rename to target/riscv/tcg/insn_trans/trans_privileged.c.inc diff --git a/target/riscv/insn_trans/trans_rva.c.inc b/target/riscv/tcg/ins= n_trans/trans_rva.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rva.c.inc rename to target/riscv/tcg/insn_trans/trans_rva.c.inc diff --git a/target/riscv/insn_trans/trans_rvb.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvb.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvb.c.inc rename to target/riscv/tcg/insn_trans/trans_rvb.c.inc diff --git a/target/riscv/insn_trans/trans_rvbf16.c.inc b/target/riscv/tcg/= insn_trans/trans_rvbf16.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvbf16.c.inc rename to target/riscv/tcg/insn_trans/trans_rvbf16.c.inc diff --git a/target/riscv/insn_trans/trans_rvd.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvd.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvd.c.inc rename to target/riscv/tcg/insn_trans/trans_rvd.c.inc diff --git a/target/riscv/insn_trans/trans_rvf.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvf.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvf.c.inc rename to target/riscv/tcg/insn_trans/trans_rvf.c.inc diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvh.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvh.c.inc rename to target/riscv/tcg/insn_trans/trans_rvh.c.inc diff --git a/target/riscv/insn_trans/trans_rvi.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvi.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvi.c.inc rename to target/riscv/tcg/insn_trans/trans_rvi.c.inc diff --git a/target/riscv/insn_trans/trans_rvk.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvk.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvk.c.inc rename to target/riscv/tcg/insn_trans/trans_rvk.c.inc diff --git a/target/riscv/insn_trans/trans_rvm.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvm.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvm.c.inc rename to target/riscv/tcg/insn_trans/trans_rvm.c.inc diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/tcg/ins= n_trans/trans_rvv.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvv.c.inc rename to target/riscv/tcg/insn_trans/trans_rvv.c.inc diff --git a/target/riscv/insn_trans/trans_rvvk.c.inc b/target/riscv/tcg/in= sn_trans/trans_rvvk.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvvk.c.inc rename to target/riscv/tcg/insn_trans/trans_rvvk.c.inc diff --git a/target/riscv/insn_trans/trans_rvzabha.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzabha.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzabha.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzabha.c.inc diff --git a/target/riscv/insn_trans/trans_rvzacas.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzacas.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzacas.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzacas.c.inc diff --git a/target/riscv/insn_trans/trans_rvzalasr.c.inc b/target/riscv/tc= g/insn_trans/trans_rvzalasr.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzalasr.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzalasr.c.inc diff --git a/target/riscv/insn_trans/trans_rvzawrs.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzawrs.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzawrs.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzawrs.c.inc diff --git a/target/riscv/insn_trans/trans_rvzce.c.inc b/target/riscv/tcg/i= nsn_trans/trans_rvzce.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzce.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzce.c.inc diff --git a/target/riscv/insn_trans/trans_rvzcmop.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzcmop.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzcmop.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzcmop.c.inc diff --git a/target/riscv/insn_trans/trans_rvzfa.c.inc b/target/riscv/tcg/i= nsn_trans/trans_rvzfa.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzfa.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzfa.c.inc diff --git a/target/riscv/insn_trans/trans_rvzfh.c.inc b/target/riscv/tcg/i= nsn_trans/trans_rvzfh.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzfh.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzfh.c.inc diff --git a/target/riscv/insn_trans/trans_rvzicbo.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzicbo.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzicbo.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzicbo.c.inc diff --git a/target/riscv/insn_trans/trans_rvzicfiss.c.inc b/target/riscv/t= cg/insn_trans/trans_rvzicfiss.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzicfiss.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzicfiss.c.inc diff --git a/target/riscv/insn_trans/trans_rvzicond.c.inc b/target/riscv/tc= g/insn_trans/trans_rvzicond.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzicond.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzicond.c.inc diff --git a/target/riscv/insn_trans/trans_rvzimop.c.inc b/target/riscv/tcg= /insn_trans/trans_rvzimop.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_rvzimop.c.inc rename to target/riscv/tcg/insn_trans/trans_rvzimop.c.inc diff --git a/target/riscv/insn_trans/trans_svinval.c.inc b/target/riscv/tcg= /insn_trans/trans_svinval.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_svinval.c.inc rename to target/riscv/tcg/insn_trans/trans_svinval.c.inc diff --git a/target/riscv/insn_trans/trans_xlrbr.c.inc b/target/riscv/tcg/i= nsn_trans/trans_xlrbr.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_xlrbr.c.inc rename to target/riscv/tcg/insn_trans/trans_xlrbr.c.inc diff --git a/target/riscv/insn_trans/trans_xmips.c.inc b/target/riscv/tcg/i= nsn_trans/trans_xmips.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_xmips.c.inc rename to target/riscv/tcg/insn_trans/trans_xmips.c.inc diff --git a/target/riscv/insn_trans/trans_xthead.c.inc b/target/riscv/tcg/= insn_trans/trans_xthead.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_xthead.c.inc rename to target/riscv/tcg/insn_trans/trans_xthead.c.inc diff --git a/target/riscv/insn_trans/trans_xventanacondops.c.inc b/target/r= iscv/tcg/insn_trans/trans_xventanacondops.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_xventanacondops.c.inc rename to target/riscv/tcg/insn_trans/trans_xventanacondops.c.inc diff --git a/target/riscv/insn_trans/trans_zilsd.c.inc b/target/riscv/tcg/i= nsn_trans/trans_zilsd.c.inc similarity index 100% rename from target/riscv/insn_trans/trans_zilsd.c.inc rename to target/riscv/tcg/insn_trans/trans_zilsd.c.inc diff --git a/target/riscv/m128_helper.c b/target/riscv/tcg/m128_helper.c similarity index 100% rename from target/riscv/m128_helper.c rename to target/riscv/tcg/m128_helper.c diff --git a/target/riscv/tcg/meson.build b/target/riscv/tcg/meson.build index 061df3d74a..5684fcf985 100644 --- a/target/riscv/tcg/meson.build +++ b/target/riscv/tcg/meson.build @@ -1,2 +1,28 @@ -riscv_ss.add(when: 'CONFIG_TCG', if_true: files( - 'tcg-cpu.c')) +if 'CONFIG_TCG' not in config_all_accel + subdir_done() +endif + +riscv_ss.add(files( + 'bitmanip_helper.c', + 'cpu_helper.c', + 'csr.c', + 'crypto_helper.c', + 'fpu_helper.c', + 'm128_helper.c', + 'op_helper.c', + 'translate.c', + 'tcg-cpu.c', + 'vcrypto_helper.c', + 'vector_helper.c', + 'vector_internals.c', + 'zce_helper.c')) + + +riscv_system_ss.add(files( + 'debug.c', + 'mips_csr.c', + 'pmu.c', + 'th_csr.c', +)) + + diff --git a/target/riscv/mips_csr.c b/target/riscv/tcg/mips_csr.c similarity index 100% rename from target/riscv/mips_csr.c rename to target/riscv/tcg/mips_csr.c diff --git a/target/riscv/op_helper.c b/target/riscv/tcg/op_helper.c similarity index 100% rename from target/riscv/op_helper.c rename to target/riscv/tcg/op_helper.c diff --git a/target/riscv/pmu.c b/target/riscv/tcg/pmu.c similarity index 100% rename from target/riscv/pmu.c rename to target/riscv/tcg/pmu.c diff --git a/target/riscv/th_csr.c b/target/riscv/tcg/th_csr.c similarity index 100% rename from target/riscv/th_csr.c rename to target/riscv/tcg/th_csr.c diff --git a/target/riscv/translate.c b/target/riscv/tcg/translate.c similarity index 100% rename from target/riscv/translate.c rename to target/riscv/tcg/translate.c diff --git a/target/riscv/vcrypto_helper.c b/target/riscv/tcg/vcrypto_helpe= r.c similarity index 100% rename from target/riscv/vcrypto_helper.c rename to target/riscv/tcg/vcrypto_helper.c diff --git a/target/riscv/vector_helper.c b/target/riscv/tcg/vector_helper.c similarity index 100% rename from target/riscv/vector_helper.c rename to target/riscv/tcg/vector_helper.c diff --git a/target/riscv/vector_internals.c b/target/riscv/tcg/vector_inte= rnals.c similarity index 100% rename from target/riscv/vector_internals.c rename to target/riscv/tcg/vector_internals.c diff --git a/target/riscv/vector_internals.h b/target/riscv/tcg/vector_inte= rnals.h similarity index 100% rename from target/riscv/vector_internals.h rename to target/riscv/tcg/vector_internals.h diff --git a/target/riscv/zce_helper.c b/target/riscv/tcg/zce_helper.c similarity index 100% rename from target/riscv/zce_helper.c rename to target/riscv/tcg/zce_helper.c --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259800; cv=none; d=zohomail.com; s=zohoarc; b=Z3xqig1hGY+YP/s7VIVYCfGcTEOFo262W/xbIuTCnetYEAHCv5i6X967YvjZFk+W/Kb4z/tIkTT5FlQQeAoHLLDoMTzT5YAA6HxP8ThKwo9god5HEZVVL0pPLpnkpArRFmnZ6WFWx8k6/CSmawUbG4tKxa4nbsNIiIl/07MU7Bc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259800; 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=MZP7Zk3uinzrssBb/EnhDeb4UwEFQe3jIpJKUSipL5o=; b=HWv2+AL8P8unwIYX0UoW1pOUMGRz2ERzuFTW2qwbA/pRZQFbfKQVa0PocHW8sV7GtjoyApB2ILg14OmFkiocKv8lsIWBxvPZvuA4RZU+sjKjisaGi4+SvHtfom6KQGchrBvLZOTgB1JKmwhzJcZO9No1SjKZnX/vrlBqyiVJXIE= 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 1782259800125704.4068965809856; Tue, 23 Jun 2026 17:10:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB8q-0007Np-Um; Tue, 23 Jun 2026 20:06:56 -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 1wcB8n-0007MT-Tp for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:54 -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 1wcB8l-0003AM-0J for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:53 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65NK008e1189842 for ; Wed, 24 Jun 2026 00:06:50 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 4eytvh2ev7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:50 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8e06f4680bbso10270496d6.2 for ; Tue, 23 Jun 2026 17:06:49 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:48 -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=MZP7Zk3uinz rssBb/EnhDeb4UwEFQe3jIpJKUSipL5o=; b=R5z/PXsNNEO4LptcyIZykvSz17J /NBQAK1Y4Rye32v2sd1PmpZhWmDICvHVuhGCkpThy3FFdNI1U4rEXdJTE99QyQxE +SRtSKPJJqd9ruiwCkWG12QeAvNxgQPlnROBcDA1fVo27O3wQRrIPOpdVx5IkxRi 0J0KrgdAJR6lPjrG21r3d3FBpbJo1u/Em7X8Lf7NfJZQnjmWf4jieBO7FdVirtUR jrarMBGdI3Wxw5BxdF7vh2/Q0WTizqaKfl7Dzt3c25ZxY3HMPm/QkPRZxiHcryFB Ndb8bvPYWiPoVV0n/XQXm10Y9Gi2WvGXBq+JAhTJejsSRvc7zcvYXQ7bDFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259609; x=1782864409; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MZP7Zk3uinzrssBb/EnhDeb4UwEFQe3jIpJKUSipL5o=; b=YunjNv6f44ugL7a/0Y2vk+08yKJRTKo6PVulNoS8ZeWf/vUBESeJnHnHqd5BxVffs+ QnDGQnPxxn2LaUA9K3iXNWhSiF1PYu270b4DGXjRHcwmCERRvniT/r58r+UFj41wPkKE ioy4AwqL0v2UmJR1htdbIDfewrUkGqCgQllxqKcnzIM+S+PWPQ8JJt2VFa+cI+h/WF/d fh66qyz+nMXFuqjkbSUfIPLihhYZRpEoZvofWEB3GiIlH87Knbe8fqfxKIdfzVgffSTm 1AAX+K0bO33ethWN48HG6knN+jVO0sFJQG9HFmdx3g8+yg/h/Wl5g3m6ivjHyJYDCHEd 8UkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259609; x=1782864409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MZP7Zk3uinzrssBb/EnhDeb4UwEFQe3jIpJKUSipL5o=; b=qyrrcHUFe0KOnCSAoM022KckOVCZ9sB4r+Pf52psnQ7eY3OoWs0jnZG3uAhtlUX4wd +cAaFTQHMS5FXJUCRfEsaKpQWjU9UtnVgxDcPrlT1rPlm1ImPzKcdt1mNKU2L1hX1y0l djPFm7g3AwK+1zcGjTu5pqgt8JIxHyj+gpAG54n9mA7Ry/GgrhH4Br4gn8j6eKNjmUWH pXYPYybQy7iHAeaXHN9QIN4T15/LGXMxOikGiuCcr6GFnldMAjrSeBI1O8kBfLj2zvd4 1xPUUPVG24KKp+qB+akFbDEy0F1Yk+fI2yNoNqjt7mbHqy2q4UxUsTAHRCk/Wdqs6KR9 TDAA== X-Gm-Message-State: AOJu0YybKvTQvrwaE990FGoeIGheefDU1PIjvVH/flVzSXTP1I63lPNF koGB6u2nksmNN6rvCoAgUN6aVR+Eo0Nzu2nDoKOuj60eHZPUr/yJrEQKAJsJHyIJtCZSdQfnBEw Q92oIY79nSUCGM3zbkKIIxHTTJIMBlTWTt4Vo7HBL5AIXLuMoUTGnowSJgggPgyMAyg== X-Gm-Gg: AfdE7cllgzR7mEVfIcLfZkcI1vG5nHHvsjZx7LYMI5QrwnvAkj49mpJOsJ2Sv4on+Zf ogLp8mnJY2rQI7J+QlFhe5OWqgV7jXvCQXsvVrdA0OJh46oQpTyLUcvtQHuyItcTdUVVUi+OvHL daZxhZXRQw+S8T9w+XtMIDOn9LbybZuP6+A6vfTn2AfSrIO0upuDoKpZS4z/Pwc7UmpMij6T+CK EIx/gM2wZM6VaWDYBoMNiusiP/8ugMpO/rs0IV1i8Yt6/FN61oamjhaUwonIHapONebXSdW8uAs 54FrpXHC6MbIfsh2adqQQLO8eTfnQw2fNQaotmN0zmwmW1vjfJQMEzgJ6Lh7EL55vj1qj4qTQ47 15+Yi+4kYXOK9w/jy1RhQa5DOuMqWTVrYeaurZX+9pTrvZQ== X-Received: by 2002:a05:6214:451f:b0:8db:aa76:103c with SMTP id 6a1803df08f44-8e400e0d803mr92193806d6.10.1782259609264; Tue, 23 Jun 2026 17:06:49 -0700 (PDT) X-Received: by 2002:a05:6214:451f:b0:8db:aa76:103c with SMTP id 6a1803df08f44-8e400e0d803mr92193376d6.10.1782259608940; Tue, 23 Jun 2026 17:06:48 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 03/24] target/riscv/machine.c: do not migrate pmp state with kvm Date: Tue, 23 Jun 2026 21:06:10 -0300 Message-ID: <20260624000632.2149359-4-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX0/0KbtXZDrrx Tl7XZpG3rZKA+hZWt3EmuwkL/n1mksWK5ZhlVo1ABJqBkJlEckOXNnX7t6BIKlQ+OrO1pEOAaLH a5eV9xC3/0JiRMIE6yr9etXrM1iqB3ud92ke1QADxpzicSd4LUi+uji9DSYPaAFmlvWt52T3xhl z8P+oygJA2Xj2lpz7moWfRFyHCjYVXv6TE+5Yw1jrIdb02K/SaeW+awK9f2xbraYw1W28xcE5tE Yvo6zjybEUHaaQ0b8X1is2zEl7PYfFwiy0dREuAX0GXcc3O2o0PQw4MWB0e6uRylU3in5vb4iS0 TRky6Ptjq0YmjXj4tIrqD7iwCAUHO4/kvjYFUKCr33IzLremYuBpz+fflYbo5bHk3AkEtjF9woz MH1/PLC3cUQH9D47IQbyEg3G84gMhHDxg3VTHAZ/EUT3cxzEnTJA4Iw6ZX7A9Ul0K8DaeKSMMcx NhUS7ZiZvhi6z9D4PKg== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXxfcncc2MK64H 8bqkA4eGAsn1X4mu9Big1nB3fYMbAysLf6CjeErul556gVOOZ+kJueIqn67+64MQi/FfaHdtx4D t82J+Adcsm1Qhp9FZtVAkXm7I27lGe8= X-Proofpoint-GUID: kdnfv5gcj8_wTLinqrA2-_wKhBJKQoAQ X-Authority-Analysis: v=2.4 cv=AJDhMgPs c=1 sm=1 tr=0 ts=6a3b1f9a cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=oilNxGZmbZYYRX1p_pwA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-ORIG-GUID: kdnfv5gcj8_wTLinqrA2-_wKhBJKQoAQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 priorityscore=1501 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259802154158500 Content-Type: text/plain; charset="utf-8" The PMP emulation isn't present in the KVM driver. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/machine.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/target/riscv/machine.c b/target/riscv/machine.c index ba96ceceef..e1cbcaa349 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "qemu/error-report.h" #include "system/kvm.h" +#include "system/tcg.h" #include "migration/cpu.h" #include "exec/icount.h" #include "target/riscv/debug.h" @@ -29,7 +30,11 @@ static bool pmp_needed(void *opaque) { RISCVCPU *cpu =3D opaque; =20 - return cpu->cfg.pmp; + if (kvm_enabled()) { + return false; + } + + return tcg_enabled() && cpu->cfg.pmp; } =20 static int pmp_post_load(void *opaque, int version_id) @@ -39,10 +44,12 @@ static int pmp_post_load(void *opaque, int version_id) int i; uint8_t pmp_regions =3D riscv_cpu_cfg(env)->pmp_regions; =20 - for (i =3D 0; i < pmp_regions; i++) { - pmp_update_rule_addr(env, i); + if (tcg_enabled()) { + for (i =3D 0; i < pmp_regions; i++) { + pmp_update_rule_addr(env, i); + } + pmp_update_rule_nums(env); } - pmp_update_rule_nums(env); =20 return 0; } --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259791; cv=none; d=zohomail.com; s=zohoarc; b=oKD6aBZFOvAMRPPs8/BzlADIOcwn352Bs1GJScPAU5AmqAqIotJX8zML7UTBbq4VegXrYep+avyo4wdoCvkMsxoXOTxvgJbqX+FSkVS/D657zYA4OPIke2BY2E5HMNRiqsUhNm28EQ6beqSu1h8LuWnYhYloSw7rsQCg0Fj0u50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259791; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=M2bDB3WX/4cfzI5MLnNA2V9fGf9bdsUqT/08tNTdLTA=; b=Xu77rMcc5SQqScF8dimyxSJ94NnWsAH6QcY0r3S2paupHeGN6tHycNOh4U5MrzjAj3PJx5dD8laGYquX5ONImLCZzyRBeD1bRzlGQCNF170Z3uS5PXXJ1fbJqD+K6dWdp+Eta5pa2kGDTn7HV5m5aU7ZYA+h7uDeyHOFmq3kLHo= 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 1782259791074303.0945934405198; Tue, 23 Jun 2026 17:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB8v-0007P2-GJ; Tue, 23 Jun 2026 20:07:01 -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 1wcB8u-0007Oa-4k for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:00 -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 1wcB8o-0003Ax-JN for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:06:59 -0400 Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65NK1D4i1259741 for ; Wed, 24 Jun 2026 00:06:53 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 4eymnvv3vj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:53 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dbc0f048efso10783696d6.3 for ; Tue, 23 Jun 2026 17:06:53 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= M2bDB3WX/4cfzI5MLnNA2V9fGf9bdsUqT/08tNTdLTA=; b=hBrHL5Aobckj7/cT fqbKCGONwVkRhMTELUMdnJnuWh9h6oOh/2MpSNgCzYfjBSNL38upVup6raWWHLjo zgUOAobQ/aiFlnS1qLEx1OcKtit+8fb6ZCIw156CQtaPy7akw2yDMmNk1x1/LpjN v5LgCutwsx2oTjEUSvHLNC363HUZdLYgDsR8XXwiClQPBU/KvsQe13VPPgHDKV9R hg/VjEksurrIgVVUoCw+JsRn19uhw+gQawllWYnlWL79ixhyNIQXWxSc2S7K1DXl YpJtzhKumnGtT05d4QDdpRbhyBTm8bZuonRUvTKCQA3GQUMkPwIbRixevv6yZgto f/ED9Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259613; x=1782864413; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M2bDB3WX/4cfzI5MLnNA2V9fGf9bdsUqT/08tNTdLTA=; b=jQ7Eb/izMdFct9ZkQTJ5cyq8uJhkSSnsIV3AbWFqiS8i55fK1Bmc6Dw/kHjLXgkaDr +v8bKWKvPf5owVDZJgCtrQ2aBfuduxKro3Da3sQnFvGecdOcD8PYu0fEevxOLPEpX3oy y0lNiAa56Gg986qqX5q2lhqvOyG8XJazHSIY9EMQgeS0mNXADnwVYC+u1wsYRp7WzJXl IVNwRHWsF2L5yoPBCni0HcHNDQx3SkseOZ3AOTJEFEFfBq9PzrHTB+pciJOGEQmvX96A 3ZRBGykr2ZM9XvDGVCuwJB5pR415+1Jmn85AjK18afRlBRe2SqyyiBuv2tO3muyGK+bo /jNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259613; x=1782864413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=M2bDB3WX/4cfzI5MLnNA2V9fGf9bdsUqT/08tNTdLTA=; b=DufoqkAa8bhNoiLe2cr+zqmdWFXzomDpUfNNezicxbDkj1+nbqKwa6HMALLcOEv011 i6gOcD/xG0dbOFqw19uf2V5o/qUXve7T9JLMwBz4pqRD3fSWEQCQKsPSvUirsQJaiXa5 SQMTTiErh13zis0Bi1zMhHbE0l5ISX8zapcX5eINjKxgJnpdnvY7GmMNZ5WBH4+93/0D sK4HN4VZukahOMhe7Jsa011vKNju9KwfEOrYTgG9/I+UO1n0fBvSfhoNdABsUbAJejv4 gxnheuUDnPbo3Ty1cXFo9Lv6giAYdoPSUIZFDXDD8M3Fi/6sZnjRj2w5j4M6GUChquWl Y+4g== X-Gm-Message-State: AOJu0YxE+kQ/Ze4Hv6Z7c+rCtHGpKZyrxTwImXzJITRQkRMGtn5tuddd WoA15l1tT21cghuLRFGaCSMy2UWTLxBJvkeHQpw2gTV0Pge+TTe5kZQ0syrtx3QVqanGPSzktXX w30bKqUQEMAs88blwXeynHa4HSI8bnDfQKQVfFCneEwnxa/wN2kjYk0xYsSEAc0vsUA== X-Gm-Gg: AfdE7cm1uTULyImuqIy2rMEfcJag48AlVV8QNowjlderyJXYWppS3bNJ9hD5FNHwFif +XSxWmV6dhb6zeRM/GdnxgmPbU2NrRQvhgKHNUSwEDfHt+Oq1GO1nZuGfoNzIafzJHtr7K3uGkI OwqpK2GYJENQ34v/pj2LW691f1//E/0MxRg8LGUaLIGGEUsv2iyfNkNCBQk4trvEiglOI9gWZJY 1zEUDrcp9/hl2RsiAQoQd6ex6O1yAGLFQhd63C2B8e1BXWTUCabzbP+XogMCateGYDV4KF1roD1 MXmr0gY+GJRgn3DIIhKdLoI78+akNqepJs5MN0C/n7NLKf3O/sGSkGd8izyBSVrdRtMGbXXKTmw 4s5zPtxkgemiTHuZTwJZD5Oj3l893WENMzGQliae+6Ec/oQ== X-Received: by 2002:ad4:4591:0:b0:8e0:4469:4284 with SMTP id 6a1803df08f44-8e52d8cbc56mr19819036d6.5.1782259612956; Tue, 23 Jun 2026 17:06:52 -0700 (PDT) X-Received: by 2002:ad4:4591:0:b0:8e0:4469:4284 with SMTP id 6a1803df08f44-8e52d8cbc56mr19818696d6.5.1782259612575; Tue, 23 Jun 2026 17:06: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 04/24] target/riscv: move pmp files to tcg subdir Date: Tue, 23 Jun 2026 21:06:11 -0300 Message-ID: <20260624000632.2149359-5-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=dOWWXuZb c=1 sm=1 tr=0 ts=6a3b1f9d cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=jGktlri6GTd5LI-DgqAA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX5BDedf1vyUbX MpUbZZ81lGK78YMai4XO5Y86Lc9xS0SauU/bOsfBgg1BsFD3B31glLrl+3p5glOErXnF0ZscOa2 UPNOOplTcf7B07s/t32PpQFMcArRDP8= X-Proofpoint-ORIG-GUID: uQjLgVj7qZWj_K7oL83EOmwAtQompM2O X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX5I2DZdlmTSaO HKAmMCuseDtgTuKT/lrkAjtJMBvpmtYMmaE24CzSg5I9egbdCfufcuzV8kNXyqpN32dkubsMAwy QXvNCZTzmXvuPc6PWWt8nw7YDCfl1ergMJ247IGZbkgqWsJGyTCFEdNLQwS1oKKrr1/li9i6v+y NwOH/k44KH73JXuqcYX8UxA1ZnwNE9PdxObLCsXxZO2CJWT3D7kC8sV6Z6LY6JcZebzM29r8mcM nvVrB6b3k3d/fpSmOpSAiQ3uZDVAC4O9UdSPpPSRQyTyUCSt4mpq2nU2/hIqKye5B3ajrQZOGxu /lU7iro8Q2/moEgy9gkNH94AjkCjANufpwX01O05tqzPiCPeYLO9BfVZgtrOCsIOsyJd5qQeEzB IUf8aC/peBKM31ZYaJ+0873lsFm+v5vqhsJDR4Sy9olm3QBj3yR7X6aDSkvW+sXYnTyykpEb0CS OoWfO5zT18t85y5HT3A== X-Proofpoint-GUID: uQjLgVj7qZWj_K7oL83EOmwAtQompM2O X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259792110158500 A trivial header change is required too. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.h | 2 +- target/riscv/meson.build | 1 - target/riscv/tcg/meson.build | 1 + target/riscv/{ =3D> tcg}/pmp.c | 0 target/riscv/{ =3D> tcg}/pmp.h | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename target/riscv/{ =3D> tcg}/pmp.c (100%) rename target/riscv/{ =3D> tcg}/pmp.h (100%) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index bdd28d329b..f0c78c1474 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -183,7 +183,7 @@ extern RISCVCPUImpliedExtsRule *riscv_multi_ext_implied= _rules[]; #define MMU_USER_IDX 3 =20 #if !defined(CONFIG_USER_ONLY) -#include "pmp.h" +#include "tcg/pmp.h" #endif =20 #define RV_VLEN_MAX 1024 diff --git a/target/riscv/meson.build b/target/riscv/meson.build index 61874ed0af..42d0f6d538 100644 --- a/target/riscv/meson.build +++ b/target/riscv/meson.build @@ -22,7 +22,6 @@ riscv_ss.add(files( riscv_system_ss =3D ss.source_set() riscv_system_ss.add(files( 'arch_dump.c', - 'pmp.c', 'monitor.c', 'machine.c', 'time_helper.c', diff --git a/target/riscv/tcg/meson.build b/target/riscv/tcg/meson.build index 5684fcf985..a05ab642f4 100644 --- a/target/riscv/tcg/meson.build +++ b/target/riscv/tcg/meson.build @@ -21,6 +21,7 @@ riscv_ss.add(files( riscv_system_ss.add(files( 'debug.c', 'mips_csr.c', + 'pmp.c', 'pmu.c', 'th_csr.c', )) diff --git a/target/riscv/pmp.c b/target/riscv/tcg/pmp.c similarity index 100% rename from target/riscv/pmp.c rename to target/riscv/tcg/pmp.c diff --git a/target/riscv/pmp.h b/target/riscv/tcg/pmp.h similarity index 100% rename from target/riscv/pmp.h rename to target/riscv/tcg/pmp.h --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259668; cv=none; d=zohomail.com; s=zohoarc; b=PbUX03jx94rzVgJxYCZ+co/S1/xGqpbC9fvyYsMn4tcvFDdbjoFJtNpMUhHSrXd0VhX3dlShv+KHyvZI2XBMdcTF2BlhAR0LYisaHwf3UwIZCDX0CXfV85NPInq/MeGb7jeH6CNcg9DCWJ5933AGHTLennDZ3hrxJ1mARoLfto4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259668; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gxdHg8ThLg3IWBFqDHiyuv+moEUD77xWG/b/9Q74awg=; b=IXzwI6TT4lpflHzeS5F/fFCDhj8A47VjwK2elNNdulKQimbgcEyDug71fBw7Yg5FTCNew3hIiRt7WiVqAYG2sejCBDsl65iLHp7a49+DhTiCvQuWTtKTM4qtbamGHOjbSGgoxlnPJ7MFAzGWaF6+3UTid0rwoMDcxfe7qC6xVk0= 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 1782259668246231.16332754675955; Tue, 23 Jun 2026 17:07:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB8x-0007Pj-3l; Tue, 23 Jun 2026 20:07:03 -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 1wcB8v-0007Ou-12 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:01 -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 1wcB8s-0003BW-0n for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:00 -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 65NK0o5G1285719 for ; Wed, 24 Jun 2026 00:06:57 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 4eyr323618-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:56 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8dd6d58b606so9463156d6.2 for ; Tue, 23 Jun 2026 17:06:56 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= gxdHg8ThLg3IWBFqDHiyuv+moEUD77xWG/b/9Q74awg=; b=gvJGCQYWEk7YinOu D7LII4oTIboIyi4RJkX+133lQaw7jPUnw5Gut4eV2EmJ/ytfdsu8k0D+ckUoDGMc QROKT49p5/DjuPDAnau57GB6sxsJd7aoTSijrz57N/Z0G7/7rzHtiV3xkUtHiClL or0mzU/yV9HVt0tIUkC20gnm5NpWLbP0r9e86Vlu0ANZ3N1wbjHT7Vx/ktx3m84Y HJaLu48d8z9vjKJ0/xAJCSZD71qqTJMuWsG9+qUkQswG6Se8SPUsUKIUpmv5cZJg M340+cqg5ZPZE+r24gUDXm3kkN6zyMv2SdEyHSwWpvZTJP7knO5KVNMTLFSVXMCs qGviPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259616; x=1782864416; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gxdHg8ThLg3IWBFqDHiyuv+moEUD77xWG/b/9Q74awg=; b=IG1DrLJiBdT3xMlNYI0KX73tuZ3QVFnSP/j+qjoelyerK1EYJXxlBJMvHW5JDh0hPO vQ5YPEH1HUFgxeywC/QJV/E3kwJNXFIgnq66579/8oZlyZwA5aBCERdD/wWPtYpOlkxZ DWGV0htFDO9bSmu67Lun0fUOzzUcOqx/ZXAAkMDea94SC/z5q3Hn9CwXDnSdaWFdKC6c SKpJtV9e/cETgM3f4kuRBKlohFgqff1/EyytoPrTNxkEMgmp4dujPfFK5ljmkOEZoRFi 9Q8d+EDTwN6YgxEnpe3mPcvb3a9EvhFeAq6ea7EXTnR8J7QC8NX/EX2A2kL0Y7XTmXdb VLVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259616; x=1782864416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gxdHg8ThLg3IWBFqDHiyuv+moEUD77xWG/b/9Q74awg=; b=eIXfJ5YBOFWYzd0lLwrbq34ZRu2AXzCU0b+5y6c+TyJPl8BKgku7KecI3sUuDufq02 driqMAkTBQOXelyP2y9wt3TfZCWU5bvQfhxJNw0htzgJaZ7B/Xg6DbZR3Fpjmav0hkMJ E1onEWuysT4BDj/qYpqeHsbcHcZdcW02MmErurrpZpo8BPY8UNPdrKKrFpkPWB7OO/sK 41113ge+BmCRC/K4W3jaEsWqEr9/uUY/bDke3SVQreqS2hh7OHw6mgNyydZi0tgrr+qW /TMxsp5/vVaOaVFSACCJ0VX9akgo0yXPSt6eb1g1yWR18VhvkVM02SmeFAH/d4r+Mwua MAZQ== X-Gm-Message-State: AOJu0YwfFmvvOOs4Ns89rtgVz4pz2OrcEybxaLPvu3sJoEOqypgpUtYn rsdZYMPqom/hayiveExR6XKpcyPaw9TAqWxa9vYq+aypeoVKi/ldTetZTgWpBxZeYXxhmAnT5TD En6v3WuOdR6464MxNAkqECvxP8XaHw1+qSyS3w2Se7rVxiHmANqdaEWjMVvhkKPHt/g== X-Gm-Gg: AfdE7cmHYTH9MWJDnG5YQT4CzXbq35wuWvoNLccSG2tznEZUym5T9X7QIm2/wbYwlJB hWHxvbRAin1fEziHq50BlZvwrkDR1HJBzm3h7IdBVJRGc5VVynpiAYItFjJBkP4rfVuoES6/+03 BAqFx0wOFukzER+SRBJV2y9KQRKHncxfTQ3smQ+8w1JTR5Ytuj0LiPMm0BPfBYyFojDDiv32WBr IDnxtD66zKujyxbE2enWfUCXvUpdhCswjwlD91c9PjxJnJX+dH6zBKN8EAcSjuWyNJ8S/7FvG5Y RfZUk1P4lgw67cuINoSWZi/85deXDMHxhTOe/4GuX7tuNb07YzCj51UEHMFbSGqrx2ML7INsY6K q9tf6+6pxhJGc6V2/fckgCBKie5NBZsFqIG8Arr/xgFNM7Q== X-Received: by 2002:ad4:5bcf:0:b0:8ae:60c4:857 with SMTP id 6a1803df08f44-8e4012ea890mr92170506d6.18.1782259616378; Tue, 23 Jun 2026 17:06:56 -0700 (PDT) X-Received: by 2002:ad4:5bcf:0:b0:8ae:60c4:857 with SMTP id 6a1803df08f44-8e4012ea890mr92169726d6.18.1782259615800; Tue, 23 Jun 2026 17:06: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 05/24] target/riscv: tidy up riscv_sysemu_ops Date: Tue, 23 Jun 2026 21:06:12 -0300 Message-ID: <20260624000632.2149359-6-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX/mu9mAd/8SMY 90KDv1pGjTKZ+7k8yB93/E5aaKQH+BsrP3F8PE022/MIcReVMtHJ2ckRbaTqjYA3sdgZUu4FAVa XYRKyajIYKFrDm+RljBIUKdGX0ProV4= X-Proofpoint-ORIG-GUID: ChCLGofSP3OXm3xczPDpVXb5q2b0c0r4 X-Authority-Analysis: v=2.4 cv=HrxG3UTS c=1 sm=1 tr=0 ts=6a3b1fa0 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=t0TUB-rRe_9fwXOx4ZEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzxJ0J3iyNFCe v03Ka4ydJv/zR3MdLlwJwBzhMHbhpbtTqx3e+4m9TOAkZwHFSfW1FIUX3PyXXT8+qtrA4lMoCrR mAsHuCG56PwCB2pLke1QZFc1pK8RoUxh1y0gkuWodiGauNRIA7r8cvIt44SPD4GWXqE1AsqOMF4 OpfiAAxjZAXcLtLCQKXRro+h1j9b8hqaxxa659EI448N6p3qOBAMTxh6mexoekRJWD+IbWX59Bd 0ZZuyfVQuiXpCdwOGi5Vzu1pA5+ZhG8mf7FUOTj/QuiyrobldicdicPiXDxeteOAFeM+1dYbHX7 AiQTgoOTix1KTGu4ko0qwgq7hZJhGi9WGTEVqPwuogtHkHiiyn/dtD5fcAWMfuksLrAkwlRjHUs g9pMB9ALtf9ICspvlBb93rugThMd51MJ2rHjIRlIhUI6jyheIPYCABoWex65KJyB2CKZF9S/3ay RhXUI6tyvVZP0HjaxVg== X-Proofpoint-GUID: ChCLGofSP3OXm3xczPDpVXb5q2b0c0r4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 phishscore=0 priorityscore=1501 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259669822158500 monitor_get_register at this moment has a TCG exclusive implementation for RISC-V, even though the callback is supposed to be arch independent. Until we address how KVM is going to implement it we need to filter it out in cpu.c.v Same goes for get_phys_addr_debug - it has a TCG only implementation and KVM can't use it for now. It would also need to be filtered out, but since we're at it, let's convert it to the newer 'translate_for_debug' API too. Same restrictions apply. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 6 ++++-- target/riscv/cpu.h | 3 ++- target/riscv/monitor.c | 2 ++ target/riscv/tcg/cpu_helper.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 4e96bbeb60..319825882a 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2669,11 +2669,13 @@ static int64_t riscv_get_arch_id(CPUState *cs) =20 static const struct SysemuCPUOps riscv_sysemu_ops =3D { .has_work =3D riscv_cpu_has_work, - .get_phys_addr_debug =3D riscv_cpu_get_phys_addr_debug, .write_elf64_note =3D riscv_cpu_write_elf64_note, .write_elf32_note =3D riscv_cpu_write_elf32_note, - .monitor_get_register =3D riscv_monitor_get_register_legacy, .legacy_vmsd =3D &vmstate_riscv_cpu, +#ifdef CONFIG_TCG + .translate_for_debug =3D riscv_cpu_translate_for_debug, + .monitor_get_register =3D riscv_monitor_get_register_legacy, +#endif }; #endif =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index f0c78c1474..70b8729bd7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -665,7 +665,8 @@ void riscv_cpu_do_transaction_failed(CPUState *cs, hwad= dr physaddr, MMUAccessType access_type, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retad= dr); -hwaddr riscv_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr); +bool riscv_cpu_translate_for_debug(CPUState *cs, vaddr addr, + TranslateForDebugResult *result); bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request); void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env); int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint64_t interrupts); diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 3e89dcaf7c..7aacd1d89c 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -245,6 +245,7 @@ void hmp_info_mem(Monitor *mon, const QDict *qdict) mem_info_svxx(mon, env); } =20 +#ifdef CONFIG_TCG static bool reg_is_ulong_integer(CPURISCVState *env, const char *name, target_ulong *val, bool is_gprh) { @@ -379,3 +380,4 @@ int riscv_monitor_get_register_legacy(CPUState *cs, con= st char *name, =20 return -EINVAL; } +#endif diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index 59edcdd370..a893472c4e 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -1771,7 +1771,8 @@ static void raise_mmu_exception(CPURISCVState *env, t= arget_ulong address, env->two_stage_indirect_lookup =3D two_stage_indirect; } =20 -hwaddr riscv_cpu_get_phys_addr_debug(CPUState *cs, vaddr addr) +bool riscv_cpu_translate_for_debug(CPUState *cs, vaddr addr, + TranslateForDebugResult *result) { RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; @@ -1781,17 +1782,22 @@ hwaddr riscv_cpu_get_phys_addr_debug(CPUState *cs, = vaddr addr) =20 if (get_physical_address(env, &phys_addr, &prot, addr, NULL, 0, mmu_id= x, true, env->virt_enabled, true, false)) { - return -1; + return false; } =20 if (env->virt_enabled) { if (get_physical_address(env, &phys_addr, &prot, phys_addr, NULL, 0, MMUIdx_U, false, true, true, false)) { - return -1; + return false; } } =20 - return phys_addr; + *result =3D (TranslateForDebugResult) { + .physaddr =3D phys_addr, + .lg_page_size =3D TARGET_PAGE_BITS, + .attrs.debug =3D 1, + }; + return true; } =20 void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259686; cv=none; d=zohomail.com; s=zohoarc; b=VOJINGDYSzr2RPVPZOer20Y+pN5Z98fjU3rSTEI4YODaJc+NcMUEWsIoHQcNBsVo1NRu1tYjCd2WBMtIOgar6CdtKrNrCdXXNtSSMCawTeGsLdyGaXNIQp5e7pi1FSTOyE5OO3ZvWYL8BQvVNc8R1Wgd8Cbi/IlUck/uoDid4qI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259686; 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=C2rMfFWTL/1+5pznB7RLcCvBAec1n4x9PcUZHGb/jms=; b=Nxk7mPAXmJLI43dfCd5Ie8Jem675vpN1mHCgm5I6RBVu7pABpCd0BCHbl+a0a4v+f+Q51NGZC34ENdDLJZFxF/RUoalXm/SSdcQTvvs2uyqFIwSkJzCAvoHVFEVjXfjQKfuGHyV0wx6VJXyoXY37Unpoj+Ixt7y/RcwOMvT/Fj4= 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 1782259686480139.9028851330578; Tue, 23 Jun 2026 17:08:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB92-0007Qt-Ug; Tue, 23 Jun 2026 20:07:09 -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 1wcB8x-0007QI-FF for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:04 -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 1wcB8u-0003Bz-TU for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:02 -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 65NK0IUv973558 for ; Wed, 24 Jun 2026 00:07:00 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 4f004p0sj6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:06:59 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dc4d71a6abso12778086d6.2 for ; Tue, 23 Jun 2026 17:06:59 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:06:58 -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=C2rMfFWTL/1 +5pznB7RLcCvBAec1n4x9PcUZHGb/jms=; b=Zb69ZoNUfkejMgymO+Z6jZe3huA avJfuR+9uJwhD86At2qMoGb4j/ISdQIOB4+bK7JXXpPKCrAP0JaNf3RBgxpPlP/Q hm6IJeHu+mF6msLJNmtGUmvCPWefqZqB9btTzqR7xEsPOfikZmAxxiclMwcNtPmP 7zkPhOsiyEqK9XlliFU3HAUwz93ejDrbcyeEWyJlLrhmsug21p0m4RTied7X6dzE sGtPXeGx5yZIE2jKYobRh8K9+zBu999B3um9CvzyRsrS7NcaXh05wvP2PqvNxBjX 5CZNXpBxFAJY2JzhB4WmygTPhy6lWM4pVMrJeZyunyRaOwPQ6IEfD89fx5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259619; x=1782864419; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C2rMfFWTL/1+5pznB7RLcCvBAec1n4x9PcUZHGb/jms=; b=j6i7OyBiMN9WBgGuM9TzdKM82imPtec0PqbxHsZ0mJ1u1zmlM6vfnDXiMBYf7+KelN M+YUxis4Nsx3l0yafWaGnpmlj+oqaDJ5libEWKLCmCIzKIwVcYq6KCkrPzroe+h+3k+2 UXz1+itmFkW329h4vLvt5fD/1cQvNC/POLGfkUfQisVZEwbVYInMdns3rBoOxu91euIK i5lTnTopubtoiPSsHLunQDpJ1wsH6GCsfLjH1dLfYbObAN7TRlxQq4Rly9ezbXKE9v+D WDKsjbJbX1WrOP9Gs3YtU+Oz2zTfAzsxxqd9m9OeF09/wS+blPgyLwQGo8gGzOPIHsHT R8RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259619; x=1782864419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C2rMfFWTL/1+5pznB7RLcCvBAec1n4x9PcUZHGb/jms=; b=c3kL4nKDz+77AHIoM1hsYufaIaVtfPxXg7/pML8d8oRVtqOhgKNnlJI/dluLRPqe+q 3nbkBGI7X1OXOwlqJWb2Oqiav+BzosavkkVD+8wrOjQCspWIqwpnZmhu9PqWOYBdvRDl Eftz9XqhT7deMVnXJCdwX/Th1LKWsg3t0jgRKgu0UaOuLS9wuQbhpot1NdZ1HQmzHRCD KIgiMDP8sEfbcyOHnY3rWLadWU8chvMoF2Zx7SlG5+scZhkrEKnIDQdZHO48kHqBOvRr 5PnFCt0Zr0ckxHx8oIE5ufFHS09k9Y/hd0QZnHh+utFegwPRWlJaaJs1A9Ecz8pUt5z/ /zdg== X-Gm-Message-State: AOJu0Yyf6CDVImNHztacYqRwXLRPnMUzqsggGof/Vh0kthaBJFh0bm1r uyhm4FLfAG9hUsQeT9UxA8yGZvIfcynEOXkevroAg1eydAkbFGHE7MweZ9jLVfLknwWEFhWzKRZ cI37DxJmLt8zeeGvoktaCGeSx54WPkwAa5UrNY0squyx2vGQm6Pzokg2M7O9xUaQ02w== X-Gm-Gg: AfdE7cnrB/tSD2Ifke+z3wM0+Ek2lmWsoRGTnXqmJpvVU4Xl0Nxp7VB0FazVn11fO1U WhJlgWGLG/coQ2qj2zdAUZrRHUerbvZH+iV+3n6a66CT+pj8lKh2bThQpkQt63edR3TZvMEwdE9 XFnzHzYxbRM1ZwE7ef31Hai9TiYdGubER/OyjobmmWzjoxAjdtHpacFqrvkgnlVFsiaYDSiVr8T We9JTWPW+HBDKeocpQ7gDEWVUsGUGAM8c1T8gTDu4tql/Hn7BxOmKnaiPCWBF6SRQGTBnatOYWm LcEfxkDC6ueUQy60L5JeH124iHqUp0Ffjid5tRwJEzKZcLySAcPD2dbJiml6obVDaCgS6y0UQFf 1oVJLV9KGZYj+gIKlb4Jf2NZ68XwLulqjKxoar53+Eogujw== X-Received: by 2002:a05:6214:508b:b0:8d1:ae7a:7d79 with SMTP id 6a1803df08f44-8e53111a649mr23682386d6.41.1782259619131; Tue, 23 Jun 2026 17:06:59 -0700 (PDT) X-Received: by 2002:a05:6214:508b:b0:8d1:ae7a:7d79 with SMTP id 6a1803df08f44-8e53111a649mr23681766d6.41.1782259618582; Tue, 23 Jun 2026 17:06: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 06/24] target/riscv: move pmu.h to tcg subdir Date: Tue, 23 Jun 2026 21:06:13 -0300 Message-ID: <20260624000632.2149359-7-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX0Nu8sJq19Tr0 pMhtW3XlvM/FK+iPP1+B3YvFt2NaD6M1XNW/Z13yrRO40q/ZpvqoVRHDciOf7FDZSg7tmqJYOOJ ybMMA5om7Js5t9hPz8OpuCtB0KWHbWQ= X-Proofpoint-ORIG-GUID: eHWsy7ea8r_DGml_AGwD3GJGKCmXCwZz X-Proofpoint-GUID: eHWsy7ea8r_DGml_AGwD3GJGKCmXCwZz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXxHSQSaDnhl4z JZ9pI5S9oqR66+e2Usod9v7TjwU/8nLeR3EGn0ChUh7WkqmHaldlumFz/FXlTliYV52nU56RWYq PWhbTYFIMfFH8Qj6zhbKRr+cl2Q9mSaKPhZjfCx5HC6dJd89OyiPWxui8da47dH16JJsGvQrXuk L9+UH0pZoWwEgsn2e+52qJZr3ACslCMLlh58hClJc08+c6PXee8xW/dge6GLlsocmFvYpbzCVyr VErO1wxtlvrEVV7cWA+QJ+pcpZDBgJMYt8RFpzRq9ix/CuHnopvTDD9cxIelNnL+o6UpwmthP1R 4lcqv5y8zJKbEarQZruqXEcG64mywDHFNRSDK9QpVyJVk/iRa6zKxaVaTweWXrWmaztoHJJm1TF Rw+z7zak+G5UYOkxegKvrc3o4EMgI7+FqPooBnWNmDwPemc+JpK3MbEOSRYtm4jlP25noIAvg9B 7gIDtbbvudAl9zTUsag== X-Authority-Analysis: v=2.4 cv=Q9TiJY2a c=1 sm=1 tr=0 ts=6a3b1fa3 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=KqZ3gCmnYdtU6Ji4SLwA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 spamscore=0 phishscore=0 bulkscore=0 malwarescore=0 clxscore=1015 impostorscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259687899158500 Content-Type: text/plain; charset="utf-8" riscv_pmu_generate_fdt_node() can be moved to fdt_common.c since it has no PMU TCG internals. With this change we can remove pmu.h from 'virt.c', which is now becoming a tcg header since we're moving it to the tcg subdir. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- hw/riscv/fdt-common.c | 52 +++++++++++++++++++++++++++++++++++ hw/riscv/virt.c | 1 - include/hw/riscv/fdt-common.h | 1 + target/riscv/tcg/pmu.c | 52 ----------------------------------- target/riscv/{ =3D> tcg}/pmu.h | 1 - 5 files changed, 53 insertions(+), 54 deletions(-) rename target/riscv/{ =3D> tcg}/pmu.h (95%) diff --git a/hw/riscv/fdt-common.c b/hw/riscv/fdt-common.c index e0e31af09b..aa143a618b 100644 --- a/hw/riscv/fdt-common.c +++ b/hw/riscv/fdt-common.c @@ -230,3 +230,55 @@ void create_fdt_plic(void *fdt, hwaddr addr, uint64_t = size, } qemu_fdt_setprop_cell(fdt, nodename, "phandle", plic_phandle); } + +/* + * To keep it simple, any event can be mapped to any programmable counters= in + * QEMU. The generic cycle & instruction count events can also be monitored + * using programmable counters. In that case, mcycle & minstret must conti= nue + * to provide the correct value as well. Heterogeneous PMU per hart is not + * supported yet. Thus, number of counters are same across all harts. + */ +void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name) +{ + uint32_t fdt_event_ctr_map[15] =3D {}; + + /* + * The event encoding is specified in the SBI specification + * Event idx is a 20bits wide number encoded as follows: + * event_idx[19:16] =3D type + * event_idx[15:0] =3D code + * The code field in cache events are encoded as follows: + * event_idx.code[15:3] =3D cache_id + * event_idx.code[2:1] =3D op_id + * event_idx.code[0:0] =3D result_id + */ + + /* SBI_PMU_HW_CPU_CYCLES: 0x01 : type(0x00) */ + fdt_event_ctr_map[0] =3D cpu_to_be32(0x00000001); + fdt_event_ctr_map[1] =3D cpu_to_be32(0x00000001); + fdt_event_ctr_map[2] =3D cpu_to_be32(cmask | 1 << 0); + + /* SBI_PMU_HW_INSTRUCTIONS: 0x02 : type(0x00) */ + fdt_event_ctr_map[3] =3D cpu_to_be32(0x00000002); + fdt_event_ctr_map[4] =3D cpu_to_be32(0x00000002); + fdt_event_ctr_map[5] =3D cpu_to_be32(cmask | 1 << 2); + + /* SBI_PMU_HW_CACHE_DTLB : 0x03 READ : 0x00 MISS : 0x00 type(0x01) */ + fdt_event_ctr_map[6] =3D cpu_to_be32(0x00010019); + fdt_event_ctr_map[7] =3D cpu_to_be32(0x00010019); + fdt_event_ctr_map[8] =3D cpu_to_be32(cmask); + + /* SBI_PMU_HW_CACHE_DTLB : 0x03 WRITE : 0x01 MISS : 0x00 type(0x01) */ + fdt_event_ctr_map[9] =3D cpu_to_be32(0x0001001B); + fdt_event_ctr_map[10] =3D cpu_to_be32(0x0001001B); + fdt_event_ctr_map[11] =3D cpu_to_be32(cmask); + + /* SBI_PMU_HW_CACHE_ITLB : 0x04 READ : 0x00 MISS : 0x00 type(0x01) */ + fdt_event_ctr_map[12] =3D cpu_to_be32(0x00010021); + fdt_event_ctr_map[13] =3D cpu_to_be32(0x00010021); + fdt_event_ctr_map[14] =3D cpu_to_be32(cmask); + + /* This a OpenSBI specific DT property documented in OpenSBI docs */ + qemu_fdt_setprop(fdt, pmu_name, "riscv,event-to-mhpmcounters", + fdt_event_ctr_map, sizeof(fdt_event_ctr_map)); +} diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 92c30a6f4c..a1cf8210be 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -30,7 +30,6 @@ #include "hw/char/serial-mm.h" #include "target/riscv/cpu.h" #include "hw/core/sysbus-fdt.h" -#include "target/riscv/pmu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/iommu.h" #include "hw/riscv/riscv-iommu-bits.h" diff --git a/include/hw/riscv/fdt-common.h b/include/hw/riscv/fdt-common.h index 017278b611..1729a6abc6 100644 --- a/include/hw/riscv/fdt-common.h +++ b/include/hw/riscv/fdt-common.h @@ -35,4 +35,5 @@ void create_fdt_plic(void *fdt, hwaddr addr, uint64_t siz= e, uint32_t addr_cells, uint32_t *plic_cells, uint32_t cells_size, uint32_t ndev_sources, bool numa_enabled, int socket); +void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name= ); #endif diff --git a/target/riscv/tcg/pmu.c b/target/riscv/tcg/pmu.c index 3444400bd2..38ad2737e1 100644 --- a/target/riscv/tcg/pmu.c +++ b/target/riscv/tcg/pmu.c @@ -27,58 +27,6 @@ =20 #define RISCV_TIMEBASE_FREQ 1000000000 /* 1Ghz */ =20 -/* - * To keep it simple, any event can be mapped to any programmable counters= in - * QEMU. The generic cycle & instruction count events can also be monitored - * using programmable counters. In that case, mcycle & minstret must conti= nue - * to provide the correct value as well. Heterogeneous PMU per hart is not - * supported yet. Thus, number of counters are same across all harts. - */ -void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name) -{ - uint32_t fdt_event_ctr_map[15] =3D {}; - - /* - * The event encoding is specified in the SBI specification - * Event idx is a 20bits wide number encoded as follows: - * event_idx[19:16] =3D type - * event_idx[15:0] =3D code - * The code field in cache events are encoded as follows: - * event_idx.code[15:3] =3D cache_id - * event_idx.code[2:1] =3D op_id - * event_idx.code[0:0] =3D result_id - */ - - /* SBI_PMU_HW_CPU_CYCLES: 0x01 : type(0x00) */ - fdt_event_ctr_map[0] =3D cpu_to_be32(0x00000001); - fdt_event_ctr_map[1] =3D cpu_to_be32(0x00000001); - fdt_event_ctr_map[2] =3D cpu_to_be32(cmask | 1 << 0); - - /* SBI_PMU_HW_INSTRUCTIONS: 0x02 : type(0x00) */ - fdt_event_ctr_map[3] =3D cpu_to_be32(0x00000002); - fdt_event_ctr_map[4] =3D cpu_to_be32(0x00000002); - fdt_event_ctr_map[5] =3D cpu_to_be32(cmask | 1 << 2); - - /* SBI_PMU_HW_CACHE_DTLB : 0x03 READ : 0x00 MISS : 0x00 type(0x01) */ - fdt_event_ctr_map[6] =3D cpu_to_be32(0x00010019); - fdt_event_ctr_map[7] =3D cpu_to_be32(0x00010019); - fdt_event_ctr_map[8] =3D cpu_to_be32(cmask); - - /* SBI_PMU_HW_CACHE_DTLB : 0x03 WRITE : 0x01 MISS : 0x00 type(0x01) */ - fdt_event_ctr_map[9] =3D cpu_to_be32(0x0001001B); - fdt_event_ctr_map[10] =3D cpu_to_be32(0x0001001B); - fdt_event_ctr_map[11] =3D cpu_to_be32(cmask); - - /* SBI_PMU_HW_CACHE_ITLB : 0x04 READ : 0x00 MISS : 0x00 type(0x01) */ - fdt_event_ctr_map[12] =3D cpu_to_be32(0x00010021); - fdt_event_ctr_map[13] =3D cpu_to_be32(0x00010021); - fdt_event_ctr_map[14] =3D cpu_to_be32(cmask); - - /* This a OpenSBI specific DT property documented in OpenSBI docs */ - qemu_fdt_setprop(fdt, pmu_name, "riscv,event-to-mhpmcounters", - fdt_event_ctr_map, sizeof(fdt_event_ctr_map)); -} - static bool riscv_pmu_counter_valid(RISCVCPU *cpu, uint32_t ctr_idx) { if (ctr_idx < 3 || ctr_idx >=3D RV_MAX_MHPMCOUNTERS || diff --git a/target/riscv/pmu.h b/target/riscv/tcg/pmu.h similarity index 95% rename from target/riscv/pmu.h rename to target/riscv/tcg/pmu.h index b4f1e469a2..de2fae1fb4 100644 --- a/target/riscv/pmu.h +++ b/target/riscv/tcg/pmu.h @@ -31,7 +31,6 @@ void riscv_pmu_init(RISCVCPU *cpu, Error **errp); int riscv_pmu_update_event_map(CPURISCVState *env, uint64_t value, uint32_t ctr_idx); int riscv_pmu_incr_ctr(RISCVCPU *cpu, enum riscv_pmu_event_idx event_idx); -void riscv_pmu_generate_fdt_node(void *fdt, uint32_t cmask, char *pmu_name= ); int riscv_pmu_setup_timer(CPURISCVState *env, uint64_t value, uint32_t ctr_idx); void riscv_pmu_update_fixed_ctrs(CPURISCVState *env, privilege_mode_t newp= riv, --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259741; cv=none; d=zohomail.com; s=zohoarc; b=Acm56sJgYhoCa5mOEzVFp0G8QnVMeERM64i2KjHpdsW9zFGCdXisfPzF4gURtUd+EdteY6UsTTTiAcZcGRiZ5PnB5UAqTqgXyEhTBc4upRVJpDOdGKleDwbzlt+MlnQBCEqY0w4GE2jioXU/w4DWDTxAuZMN4eUpnX7OQdMAXxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259741; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=k1H5fBBe0pzKndrOzEcbxV2DHTShNMrbTZS+jXVioV8=; b=Gv5jIvEYwYySOlviWocTjpwvNlf0nXzjd9mEorU1oLi9yOzZhgKOcZ16m7qdawjcAKNRL2b4hPEYr0VA4lPUNlxqZELwQ1aozgjlI9yrqU2H2ehBYFzwQihHowCIpu3R9lAm6f6avKMghhabB7996LqyFSj2vuDddmXV5KQq9C0= 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 1782259741717362.8660899394449; Tue, 23 Jun 2026 17:09:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9D-0007Sq-Kt; Tue, 23 Jun 2026 20:07: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 1wcB9B-0007S4-LG for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:17 -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 1wcB98-0003CX-90 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:17 -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 65NK0rjs1286033 for ; Wed, 24 Jun 2026 00:07:03 GMT Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyr32361g-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:03 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8e0dfafa41fso9802326d6.3 for ; Tue, 23 Jun 2026 17:07:03 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= k1H5fBBe0pzKndrOzEcbxV2DHTShNMrbTZS+jXVioV8=; b=PBrJoFvaLUwtrEO1 SiikUx/O95i8Ot7QlG+BkZ2CHTpLF3t/9YFJFxkeC6ZcF248mTmswze65GSG50p7 4Fpfocxr37zxAhosGu1zZv/3uiPHGTApOuJd7SKgCokvhUtc716tJdbeJbslfmlZ 0i6ZR38ZdU4sftJ0U10GId53ZV5EK+XYVlyPSkUxPi7i+NgTE9PeikrmrDWMd/vN yNOlEkdSjUdkoE0mKTZ4OMIZiyExP6h32REyK4YD4I1cUZPIiHKNvKJ+yCmIBfyh qxvaDRl1sWbLGxdachtOmWwa82N4QZr+O1zjoXwpXWVw/cYEhNYC6HsyzVth9V/n xPlnvg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259622; x=1782864422; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k1H5fBBe0pzKndrOzEcbxV2DHTShNMrbTZS+jXVioV8=; b=B0qtNYQT9YoNHcZyoyHbzEQPb11kWWuf6VeTmnDZkZOzbnL3Fxfd4ShjiqP2Pt0bbP QOb4bgGjRjdi08WizxHWjBYrXcFgrLuhhf8pVjN6E2OazyA7bC6b8cEytiOqz89B/N04 0PfpweyAOQ0/F0/Du0c/lKU65QyIdquv+4xEha/BQU98qyVKLXFF+2aPBB9OjaplCxzd FX8Sijqj+H4+ZAevjRYa+F8hwDeM8TiI7dR7m0YaH6s6TRBgwsOyUG9b84pnsQGKcBLX n2i9G4QzFMw/9DOvgVYPEFGSzQcK8jRq/G4fN3VIvjDbh/HLpTpopoKFk+9rL1Vmh4PC Pacg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259622; x=1782864422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=k1H5fBBe0pzKndrOzEcbxV2DHTShNMrbTZS+jXVioV8=; b=ez+bQSBEUP2tTi3OvxRJaYqet98W5zeih9CL6DrKUcMe+rzivx8UeeTumu2vRuuP6V npcs3tpCDtK95SeodAPNunqjhKW8C3FvexfAwqMAfz3dZrOZT+spIt2ID8r2R6LlcEA1 OBgRrVJKreH781iIWptLl6xVwmDJDkroa2a+UAhvReWRZk8bqszYxujFjDkqHfPykglP Q78IjMyhiJhLXM9Nm3C5hUCJJ5pxftASRHrFgcKsvHcdVA3OLDw9WBiK7ts/NnX9haZJ AxIWzUCrkRaHa/qOMERyfrxTBk0WhemFL55O13icnc2l+YxvQYOgUncgxBXCIdW+KjyQ GWfA== X-Gm-Message-State: AOJu0Ywt272wgPXB8hFNGj8GHPcilRX6egbRUFv0OPr/2Fsno7reR19K Ajg2TPsYkQ0dzmUwu9P2PA0SvpA2KVIRBQc96x2w8+7QpJy2aE7oq4aH/xus+np7KDnbNxOmvly UHdq2Ll6wkmDf1BMPE1QzyPaq4/ZGqt6m9Po7DjarXM+T5qjQXC1CUqNAgP60nsqJlw== X-Gm-Gg: AfdE7clmN3hQ1JFXvN4HgwqIepL7uvZj6eS4qI4GunC5Z5Z/oimVV840u7TrIfkRwMX k7r4lV15QhSH/3CLai1+Z/jUC75RmmSK7ACnASSnpPIQTeglNQFxqEX3wlI7vNDQaEAkpan4U6T CCPUeqq3PKxhDiSmmeQd4k80Jtw6WqLAq78hZEgnE1ltlXK2WVze1TTBujjUyzvfoMl7yWtZXK5 +EV3Q24SOR47joKfLN6CyG0fu4v9SWwAbTtKXQ0nDhcmgyOgMNnoauDxK0G60ocaOboS0ilwahy 7a+xLr/UaZ8o9bHZ53vUBx8soBrgkFpbueyooEKNQrgYGoajoV0uRiZwKzWfLLb0Dn3k3K9EkKX y8GiTuqiuNynxLgOAKOfUuXDmvojr7unfWmrzul7HWhqSaA== X-Received: by 2002:a05:6214:5185:b0:8ce:ba04:7bcd with SMTP id 6a1803df08f44-8e5365c727emr21905196d6.38.1782259622429; Tue, 23 Jun 2026 17:07:02 -0700 (PDT) X-Received: by 2002:a05:6214:5185:b0:8ce:ba04:7bcd with SMTP id 6a1803df08f44-8e5365c727emr21904206d6.38.1782259621803; Tue, 23 Jun 2026 17:07:01 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 07/24] target/riscv: move debug.h to tcg subdir Date: Tue, 23 Jun 2026 21:06:14 -0300 Message-ID: <20260624000632.2149359-8-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX6r/aLeXYLINI Pq1pOmbMYaAJ0lf3xN2IoylmGkG7DiZ8WlTHodfasZZReOFY91rq6mV67KEEgyx0cieTocd9Qeu yF+rG0knenleu/3EYXtSzYK3MacFwTo= X-Proofpoint-ORIG-GUID: UNMfvWTh-MDm1ts-xQB0ALB8zvy19OVg X-Authority-Analysis: v=2.4 cv=HrxG3UTS c=1 sm=1 tr=0 ts=6a3b1fa7 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=WBZ-eJHDTolNJtMr4n4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX+x2SDSyaRrQ7 Pbh/nGNJQQxIF3qx6E2xK7pAupc/Zt4qzszYDnG8oS4n97KujtSnTjdnuCZPwtlc2Snn7pFJoJs 3iRv6g/nROPkRCB5n3QfyyQDfKNW4+jQUuuL0//nTwMqX/mIuJRvCHpRvhvrTwb7tBOuggB+JNU xtizdeb0JWlR0TrTF4AGeNvRJKUIxdyokZAMlYoBpkDfPwubd+Qt7G2nsp58yE/z6PxTash/45L O9q3H3Co6AjlfaCvXNMpJIlwi/JnyXo14WqYG8CmpP0TewFWBd3tlkVRE9N/x//Ej3MdDtQ4Eqc iF/Zec5JJQUHrqGf2GsXo/r3bENNbRXEaM2br1byHSPsnG0XE41S/avLAceRTxaiTHdPaO+7F9m X9JBuVROt0zrv44k5Uvr3FnQFwnE1+RnoVGfTPdkBlPtAtbycQnrIzZkpgGcAXgnq+FVXfXM5SC ++pSVwod11KjIdiapSA== X-Proofpoint-GUID: UNMfvWTh-MDm1ts-xQB0ALB8zvy19OVg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 phishscore=0 priorityscore=1501 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259741995158500 riscv_trigger_* APIs are TCG only. Wrap the usages we have of them in cpu.c with CONFIG_TCG. After that we can move the header to the tcg subdir. This will be enough to get this out of the way for the --disable-tcg build. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 8 +++++--- target/riscv/machine.c | 2 +- target/riscv/tcg/cpu_helper.c | 2 +- target/riscv/tcg/csr.c | 2 +- target/riscv/tcg/debug.c | 2 +- target/riscv/{ =3D> tcg}/debug.h | 0 target/riscv/tcg/tcg-cpu.c | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) rename target/riscv/{ =3D> tcg}/debug.h (100%) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 319825882a..fe47ae64c9 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -39,7 +39,7 @@ #include "kvm/kvm_riscv.h" #include "tcg/tcg-cpu.h" #if !defined(CONFIG_USER_ONLY) -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #endif =20 /* RISC-V CPU definitions */ @@ -836,9 +836,11 @@ static void riscv_cpu_reset_hold(Object *obj, ResetTyp= e type) env->vill =3D true; =20 #ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG if (cpu->cfg.debug) { riscv_trigger_reset_hold(env); } +#endif =20 if (cpu->cfg.ext_smrnmi) { env->rnmip =3D 0; @@ -996,7 +998,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) =20 riscv_cpu_register_gdb_regs_for_features(cs); =20 -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) if (cpu->cfg.debug) { riscv_trigger_realize(&cpu->env); } @@ -1011,7 +1013,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error= **errp) static void riscv_cpu_unrealize(DeviceState *dev) { RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(dev); -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) RISCVCPU *cpu =3D RISCV_CPU(dev); =20 if (cpu->cfg.debug) { diff --git a/target/riscv/machine.c b/target/riscv/machine.c index e1cbcaa349..11e869a9c1 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -23,7 +23,7 @@ #include "system/tcg.h" #include "migration/cpu.h" #include "exec/icount.h" -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #include "hw/riscv/machines-qom.h" =20 static bool pmp_needed(void *opaque) diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index a893472c4e..8c347aa1c0 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -35,7 +35,7 @@ #include "semihosting/common-semi.h" #include "exec/icount.h" #include "cpu_bits.h" -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #include "pmp.h" #include "qemu/plugin.h" =20 diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c index 7fb0ad5bc1..b460860409 100644 --- a/target/riscv/tcg/csr.c +++ b/target/riscv/tcg/csr.c @@ -34,7 +34,7 @@ #include "tcg/insn-start-words.h" #include "internals.h" #if !defined(CONFIG_USER_ONLY) -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #endif =20 /* CSR function table public API */ diff --git a/target/riscv/tcg/debug.c b/target/riscv/tcg/debug.c index ba5bc6ae13..3c0fe70101 100644 --- a/target/riscv/tcg/debug.c +++ b/target/riscv/tcg/debug.c @@ -28,7 +28,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "cpu.h" -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #include "trace.h" #include "exec/helper-proto.h" #include "exec/watchpoint.h" diff --git a/target/riscv/debug.h b/target/riscv/tcg/debug.h similarity index 100% rename from target/riscv/debug.h rename to target/riscv/tcg/debug.h diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index b73e3e9dd4..fe6350f497 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -37,7 +37,7 @@ #include "hw/core/boards.h" #include "system/tcg.h" #include "exec/icount.h" -#include "target/riscv/debug.h" +#include "target/riscv/tcg/debug.h" #endif =20 /* Hash that stores user set extensions */ --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259867; cv=none; d=zohomail.com; s=zohoarc; b=cTthIyvcy6lkCoprDf4fyu3ZY7TrWTiev8elNQ/q4IQ6pOj8PAztMn90oA9HKwrdD3eL1qpmslYKsoNN2Ibp+xnIPWiYte4OOcGAj/5G3yOJ+k181NeO5anKl08R4gEZmYgWlr/rtquJqxe35OYsNGOWWsOnI+WhJb4kZXT/NfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259867; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=F0Isirr0MlsSsKy41gDn9B8vpEig/F5As+5NVwCdPXU=; b=bUKCQHaY/tNnmHO7T72LByCoTrX7qVUS3EzeepDqSeDfhRfXQ2B2QH5sXK4dTzEh59fy/N7FHGjhho7EBtSBAdWs7WHBWLkOzv1i4OhP96SfT0S/7i+9k1Om51Hqbxr4Qjhnck4ZsmkKJFOr1mFvEM+VyEowdBqXREoZLR+TPc0= 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 1782259867824593.599748473891; Tue, 23 Jun 2026 17:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9I-0007VU-VR; Tue, 23 Jun 2026 20:07:25 -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 1wcB9C-0007ST-SU for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:18 -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 1wcB9A-0003Cm-Jn for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:18 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65NK04Lc1191161 for ; Wed, 24 Jun 2026 00:07:05 GMT Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eytvh2evp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:05 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8db6a7471baso10844626d6.0 for ; Tue, 23 Jun 2026 17:07:05 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= F0Isirr0MlsSsKy41gDn9B8vpEig/F5As+5NVwCdPXU=; b=RnDuMRzyOlPS0Bfv O5JpzpIN1Xxnk7jznjIbND7sVJLvqnbChCSe7tl2VtV6dJZF1BWaNb9YICa5vO+W GmErMSNZOP2TrURlqu58FrCdPs3khQzemd+VoIiDWM2PwckxYFIvb3DG5CNXh0RT bqRS4T2JoUKV8BfiTmVYh2ucGhUVHJ4b30fWh3G9bpwIecqNSR2HKLp6JjdyxMly G1bO6pyVtfzsEuGa0W7hN9J67u3kD971XP+SECJ0FD1jlcfuvXv+EPZoK3BklUEX xnoke7s/YXMwVjYBXRsu/8erozCosPM7xBnbGhFXSuT5EqcRJuu7Zeu7XZcYp0mh VDlC9Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259625; x=1782864425; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F0Isirr0MlsSsKy41gDn9B8vpEig/F5As+5NVwCdPXU=; b=HAsf9tD9PFZiL1sLyAcmxOZlkH8BUheTnxDWLEcyoVI9ecwLzAqH1VTy2rH56d1EQL QNduFl4IRSEv9CKNyyQjBHobdaOFdd0Hnw9x65eclr9Wnk3Zx8vNPzAUvLLrUKKOQQiV zpevYtuavKBYtlYpYhvCLNT5HMVObychf4Wu9g0XOsv7apTm3fLFqXrQq5MAW/DC1dat cfytducqdtsnJsuxUPaW40My60bYxI4uIc2V4Gl7+2LBBUePdqOhGqv7zc/Qo0V+sSJI PYxBQwfY4I5GIzPOgCVckIzwHdcbzt5BjpbvyjbBMZ8uhh04AyBUWBMZwEbOssnT92TZ DmLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259625; x=1782864425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=F0Isirr0MlsSsKy41gDn9B8vpEig/F5As+5NVwCdPXU=; b=jHeM/CMio0ZP7f5mP8wy66EcehSfmOuTqjZ4Kkl51tds1nFxyg/dT3sPWXsNnnAM0j F3244AMI+LiMHRQ5gqPdRqpEh6ZFWmvdE82gBgFrHpfkil57G2VOtv0Tb/+U4MdHjf/j KT+Zds+Gg3UmlHa7ApvDjmjZqODheLpEQtK3W6gp8QNty6neGWwuRIS3HdAodpwHmjhi mL005mi1tYfu4Z5YkrnLmt14CTPN7FOaHJyoeEAUYj3celFtOkF8qqn07jignWUsoEGl 1jJ607RbF4JDlA3VyPMAo3NzCdiURY3aeIZNKVQLPadVo3r6x4KQR15jTvDUbnXN/FH+ hU7A== X-Gm-Message-State: AOJu0YyC9Tav+upEa8ZQcsogUA78K1encDN5Nf/F4/Kn7zIu+b5DoBPE ltnud9nryaDe47aquvpSvec+Ox1VmR1Z5exsUNcFoF9VmztdvXP60Ilqj8VOMkoKGNYQltQYPPl A7oGbwV+Ku+49aIDFlgeikObkgHAbPZUHDnT4uHRfWN1ytPLoLbImxOFcULiqrRI97A== X-Gm-Gg: AfdE7cm25EgpoumQltQ6RE6K1ybBuX2jSDqH7Lv70NE0a2LSalbpO/HUWE43nV3gbZK r1jwQ5xe81QbVzVYPZ417ZCX0wcK62RK2XqzsGNi+c1Wj+tMLEnOdKKn+WVIV11WSHB3ssXQKUc dGAwtiTxo4gWXWQlW782YRxQssR3BkKDJlNGg8TeqGXwZFaxe6bWdSQzm+uy3LdCooyrN0zlxF8 f/e7Rjd961ZuQEvOKYPfJ/ckWIrbmAhMqZFo/v9S9qz81iDuBYazRDXEPSqektY8HFnmrXA2k7M xZs1hepComAknPlV4UspTyJPllSFNwGCnHBpxsYklo0qvAoNFWz0siQe69bEm5PUSV/76TlQ6V4 0WU4lqFBaU29Sc2d9o3OwY5XXN7W2l7yNnVnLfr0XBOPK2Q== X-Received: by 2002:a05:6214:2429:b0:8cc:2a92:48e4 with SMTP id 6a1803df08f44-8e535cfea4amr22373856d6.32.1782259624980; Tue, 23 Jun 2026 17:07:04 -0700 (PDT) X-Received: by 2002:a05:6214:2429:b0:8cc:2a92:48e4 with SMTP id 6a1803df08f44-8e535cfea4amr22373366d6.32.1782259624543; Tue, 23 Jun 2026 17:07:04 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 08/24] target/riscv: remove csr.h from kvm-cpu.c Date: Tue, 23 Jun 2026 21:06:15 -0300 Message-ID: <20260624000632.2149359-9-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzrI8RwkLAom5 ga0LU2RT5w0zWQlpQVYU1GDoPttERbOIGbR4i6SJA2tCSAfRMxROwQ1FZ9CmO6l2xt3ffa7AXZT tnN+rHFJZ2Gs27G4PE9bPewj9WZxC52RGaAH9l7LkaYtm8xEOpNWGJKndJ32kAjfkq0yIFzsPG0 MPLDmEOqF92l/f3p8tPa3b0kvuBkd3+R982hLzCZfyBy18/LQRwdGrUZrVzVTKnPXvGN/BXOpiP gl5/3WHpWkoYk9WkIhIGREVFHvZT5uswJ+NcjLrAfVlzFUDbuRYYMZ8o2I6hCjrXfDg4UV0biaI 1vxuNgR9xGQS+NqiziyYNKHb2lQh51E6n3HS/Fc+ABZtHhUB9CAzytUgHDHU9ZD4OMnwIGLgSai PZSckRX31QMvzLA4eCARSLAlgmJr6NO55LM0zwyy+Ld+WE9P7Gt95gYqtNS1wTNeEhMjK+zKOxQ dRi02JhCTBp+VuImWCA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXz0qL6emN0vKF +8oD3Gv/WZ9FWjn7Y7GiHjvd+sr14yaV1EJIIsAgGdEtzH7EX8xVJ9Z4Ss7RWK5V+wGD3y9+L2m DP+mfEt2mirxlsRpeHGXAbmg6+DBEIw= X-Proofpoint-GUID: dmn-EkQe61vxui_N8cAb9wm716Sp5Qz_ X-Authority-Analysis: v=2.4 cv=AJDhMgPs c=1 sm=1 tr=0 ts=6a3b1fa9 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=6BMwLXxoa7YWeqrhhxoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-ORIG-GUID: dmn-EkQe61vxui_N8cAb9wm716Sp5Qz_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 priorityscore=1501 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259868576158500 Move riscv_new_csr_seed from csr.c to cpu.c since this function is shared with KVM. With that we can remove the csr.h from kvm-cpu.c. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 30 ++++++++++++++++++++++++++++++ target/riscv/cpu.h | 3 ++- target/riscv/csr.h | 3 --- target/riscv/kvm/kvm-cpu.c | 1 - target/riscv/tcg/csr.c | 29 ----------------------------- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index fe47ae64c9..5d44f993e4 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -21,6 +21,7 @@ #include "qemu/qemu-print.h" #include "qemu/ctype.h" #include "qemu/log.h" +#include "qemu/guest-random.h" #include "cpu.h" #include "cpu_vendorid.h" #include "target/riscv/csr.h" @@ -536,6 +537,35 @@ static void riscv_register_custom_csrs(RISCVCPU *cpu, = const RISCVCSR *csr_list) } #endif =20 +/* Used by csr.c and the KVM driver */ +target_ulong riscv_new_csr_seed(target_ulong new_value, + target_ulong write_mask) +{ + uint16_t random_v; + Error *random_e =3D NULL; + int random_r; + target_ulong rval; + + random_r =3D qemu_guest_getrandom(&random_v, 2, &random_e); + if (unlikely(random_r < 0)) { + /* + * Failed, for unknown reasons in the crypto subsystem. + * The best we can do is log the reason and return a + * failure indication to the guest. There is no reason + * we know to expect the failure to be transitory, so + * indicate DEAD to avoid having the guest spin on WAIT. + */ + qemu_log_mask(LOG_UNIMP, "%s: Crypto failure: %s", + __func__, error_get_pretty(random_e)); + error_free(random_e); + rval =3D SEED_OPST_DEAD; + } else { + rval =3D random_v | SEED_OPST_ES16; + } + + return rval; +} + static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 70b8729bd7..c0e9098728 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -972,7 +972,8 @@ bool riscv_cpu_accelerator_compatible(RISCVCPU *cpu); extern const bool valid_vm_1_10_32[], valid_vm_1_10_64[]; =20 void riscv_cpu_register_gdb_regs_for_features(CPUState *cs); - +target_ulong riscv_new_csr_seed(target_ulong new_value, + target_ulong write_mask); const char *satp_mode_str(uint8_t satp_mode, bool is_32_bit); =20 const char *priv_spec_to_str(int priv_version); diff --git a/target/riscv/csr.h b/target/riscv/csr.h index c791260f83..73d874ee98 100644 --- a/target/riscv/csr.h +++ b/target/riscv/csr.h @@ -12,9 +12,6 @@ #include "exec/target_long.h" #include "cpu_bits.h" =20 -target_ulong riscv_new_csr_seed(target_ulong new_value, - target_ulong write_mask); - RISCVException riscv_csrr(CPURISCVState *env, int csrno, target_ulong *ret_value); =20 diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 39d48a9db4..dcdaf7f2b3 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -31,7 +31,6 @@ #include "system/kvm.h" #include "system/kvm_int.h" #include "cpu.h" -#include "target/riscv/csr.h" #include "trace.h" #include "accel/accel-cpu-target.h" #include "hw/pci/pci.h" diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c index b460860409..d447204721 100644 --- a/target/riscv/tcg/csr.c +++ b/target/riscv/tcg/csr.c @@ -29,7 +29,6 @@ #include "exec/icount.h" #include "accel/tcg/cpu-loop.h" #include "accel/tcg/getpc.h" -#include "qemu/guest-random.h" #include "qapi/error.h" #include "tcg/insn-start-words.h" #include "internals.h" @@ -5577,34 +5576,6 @@ static RISCVException write_mnstatus(CPURISCVState *= env, int csrno, #endif =20 /* Crypto Extension */ -target_ulong riscv_new_csr_seed(target_ulong new_value, - target_ulong write_mask) -{ - uint16_t random_v; - Error *random_e =3D NULL; - int random_r; - target_ulong rval; - - random_r =3D qemu_guest_getrandom(&random_v, 2, &random_e); - if (unlikely(random_r < 0)) { - /* - * Failed, for unknown reasons in the crypto subsystem. - * The best we can do is log the reason and return a - * failure indication to the guest. There is no reason - * we know to expect the failure to be transitory, so - * indicate DEAD to avoid having the guest spin on WAIT. - */ - qemu_log_mask(LOG_UNIMP, "%s: Crypto failure: %s", - __func__, error_get_pretty(random_e)); - error_free(random_e); - rval =3D SEED_OPST_DEAD; - } else { - rval =3D random_v | SEED_OPST_ES16; - } - - return rval; -} - static RISCVException rmw_seed(CPURISCVState *env, int csrno, target_ulong *ret_value, target_ulong new_value, --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259669; cv=none; d=zohomail.com; s=zohoarc; b=gFPXM5PnswKx33tEZM5Y73d6GSB1HukhJ//EjqcaggcvAF363ukGTMeD25JWifBJI3yr/deLrYbt+Kuln4e1v3GzJ2bK6WgvU5OSs1H95+1WvJGkQ6EeM6Bnx/+IHL8h1IUzu2/zEVL2hQ1WMMtuPHCwig8w3XzNgNqRbZHsJO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259669; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IxPWJh8zmFovY0aWY54Yi7sQk2Aa12IwMKCPVPgpVmQ=; b=LEqEnT9NUJ98rli8b4uX6nYNv/7ii13sQd/SS/VdhiSGKfspBIjdDQybiq4/Qf2eKYey82mZw87ijAqpC2extH2XQ5WGg28REatASrmRgFjzztwnFIJumGRH7r5e1lUl4TBuqXzWvH5Z0Q6Ol/Y3a/Z+8iXMKbZhW51dz8SZ/UY= 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 1782259669307163.41995980266893; Tue, 23 Jun 2026 17:07:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9J-0007Vf-1S; Tue, 23 Jun 2026 20:07:25 -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 1wcB9F-0007UP-Gc for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:21 -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 1wcB9D-0003D4-QE for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:21 -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 65NK0uE71177304 for ; Wed, 24 Jun 2026 00:07:08 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 4eyqe6bd93-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:08 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dd3fe99e80so7779856d6.1 for ; Tue, 23 Jun 2026 17:07:08 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= IxPWJh8zmFovY0aWY54Yi7sQk2Aa12IwMKCPVPgpVmQ=; b=OSkLF9Tcz0N4lzlQ JyFkDw625brarS+qfGevQOoQYcKmtxXhvSD9AJJHKmyU+ATGrAk6RJFeurR3bWji YZvJkvPY1+mYwX1KyAfjw7hCvp/EAV7J7WeI7EP0zLsHDf++GqWave2tIi4MmGDE MC8uIUBrOmYxc0gHMgLPyGAf+V/JzC6pXtCViKQskT7l9epa8iukBLjokp/ddBZ+ aAVdxMLNWFGAxTg5OAqBgGYC8Vb1rXBfe81EiNVCn4LtprthSAkxMBAjtOHlLKIg KSBlpeTEZX5glNseBk+o9IKzDL4CGtTsnFh8fOZ9LYBIPNd0Ug1f2dd/KU/6GUAy f90MPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259628; x=1782864428; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IxPWJh8zmFovY0aWY54Yi7sQk2Aa12IwMKCPVPgpVmQ=; b=TdTWl/9UvORQCiX6fK2pMvYggY+oWt8iXWnwZmVdd/PZ6OLWAk0z6f1t0Xh2Om/gYs IMVyQ8r0Pvq0LymAMeyrin4IhBTnJLt/mVJliNcP4Jok7HAcdb3Tyt3GOJutemgKBI9W 3+Pn9Xt6Uec0ocQzwNkxd/nxooq7+i8uCBtx2Dcq/oTpgAaWrFwYJA7hOeY42eqYfqCL ofxJGJY5kP93mRK6A11xv1JElteXFpn/WUtUbYfb3ZVDB2Khf4rGal/t+53jhwh6CZE2 UYjgZgVW0m3Evodxreh9b8LJwA6+ZxTRJjWEky1lFx/mQGc0+mz0Omw8N1yBthHXI10q dXBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259628; x=1782864428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IxPWJh8zmFovY0aWY54Yi7sQk2Aa12IwMKCPVPgpVmQ=; b=gTgh88Em+n2iHivbUgxcF5X84P/DHebyVpn5aoH4NKLlNdjmIuR/jKjBzKWSBRTWWp Xev4jAgqi1C+xwnXNRfsqscWnK4d/69s1NHsOShyhTqcUHoKL8yZD1IYDOof2h9VvAqu Od9ugzCduDG+bLcIJOQESVkVzIdaJ0xQmuyRN3JzmKfPunUjfcruVeBu7a/C49ekR5HP A70DnG9t1iBgDtwMv6zaBrehEdXUh8I+DW7Q3yxHQh7hnd+3ykav3oEIWuOXKuYm2Kmp 1gPTMnhVAf/FUJH84TOt4IApU/30ZdWJZnf5KCEPMWTt8Pi88VJ1fJeb/PLJV9thlZ4m S+SQ== X-Gm-Message-State: AOJu0YynMl3Yihp0eV3o6cAwv/gI5CZ2+woPsue5fQYCalzo1F4QF1Vz BiVfsHoGApIjLeLbivFGC1GNKL6Sj55ljio2/tJ5YoTePEERmnsO+snqjWdVhbv6YbGxd/NG2k3 u0jI2CMnSspbTc0y4BqXMRvOGlHIWV54IFYS1q0YmURoha0raxDNLOc3LidXyIFO64w== X-Gm-Gg: AfdE7cmZ9knT3NCLWmC3sJ84m7aLV5Sy2txjOlyKXi6uULVQIu9FFrhqF/lZQ7cPnbj o9UrDVkptutHeiBz/hxIkhqKwQkV3Hq8dnxSXDZiFnLch6Ct2wOpHwrMkudY2jpmiRBHQYfpovT Df2m5YUSyslRnWBtnAW/giQQEOCAK/kkgB8ptIalwYXHXF1hW2l+gp1nvemOcJC6EXXVbvZ9NS+ rGgFPSRzi6eE2sSGEmZFrYSgOhWL0XIiP+nABZmQdeGBRJ/5BEKPj09an2V5aE+J5qNwhcDSl82 xmLYGk4yjMs4x7guMMQFYxM7L+6mtR0rls2s1NasPkqD9r6ZBbupbClqTJ3+nIdRLJ4kpgriUSP vQBPr6f8G8SbBPu2ip6WYVQc9uh+IYDUpcQfIQ5DAq0XYgA== X-Received: by 2002:a05:6214:230b:b0:8dc:f889:d67d with SMTP id 6a1803df08f44-8e535eee784mr23167526d6.36.1782259627899; Tue, 23 Jun 2026 17:07:07 -0700 (PDT) X-Received: by 2002:a05:6214:230b:b0:8dc:f889:d67d with SMTP id 6a1803df08f44-8e535eee784mr23166726d6.36.1782259627394; Tue, 23 Jun 2026 17:07:07 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 09/24] target/riscv: move csr.h to tcg subdir Date: Tue, 23 Jun 2026 21:06:16 -0300 Message-ID: <20260624000632.2149359-10-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: -QdjYW7nTkD6cETrqOYSZaVhCKz0t1mh X-Proofpoint-ORIG-GUID: -QdjYW7nTkD6cETrqOYSZaVhCKz0t1mh X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX7YBrHQ1n1To5 MfM3JwB+X3e5mN2v2mFszrVaWsi8Dc1uC9SbxzSCk6bgmI7iwZ5uKjlA8kxxHLNWPfWXrE+GEiA jqIv4gMHfsKw7Ll2I0+Hur2Ffx9o7D4= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzZ7LrIpNu5Yw 7t+D6gMuqLOvhgZxYcze3zOejLuRyfHrwGuCssMoflD8Q5x6wRY87whcrjPSWq6kwpDd25ahdSq pOXNLfg7U7ZWYyB/Cm8U85CFohtRgOcoqEtCtXnvxXIQemv/Qkg4bU2jp+6dlNDeigCyUewCi4I 9KbTHF8NBVlXtOClZFPhBZd/yhVy3J3lyMn1oJyDx71d7yTE9tRUqHDWZ+H6s81domL5+ui88FB BfjdtPs8tKZNQPivfxP8aC1Mt9yw8iavDrmL6512gJZtJPRksaBpNBthlswg/DTab6onkqz3WII cONrAxqnkP7vYrQ1qG3t1m76D4P+ivCkOhsJGq0ralV+ksiHgnBVkkneCsuCRZ7t0D4+nnlT/Kb nXJ+y7I2SpKMxk8GE9sT/EgbScjaDqdNeEJ81ga92ICpU+UAIP8+FSV83sS6K2D438wqvACcihU brkvXXw04GLATT8Wa7Q== X-Authority-Analysis: v=2.4 cv=OeKoyBTY c=1 sm=1 tr=0 ts=6a3b1fac cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=82-PFmB8izlBMBISFaoA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259671821158500 After KVM is no longer reliant on csr.h move it to the TGC only land. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 2 +- target/riscv/gdbstub.c | 2 +- target/riscv/monitor.c | 2 +- target/riscv/riscv-qmp-cmds.c | 2 +- target/riscv/tcg/csr.c | 2 +- target/riscv/{ =3D> tcg}/csr.h | 0 target/riscv/tcg/mips_csr.c | 2 +- target/riscv/tcg/op_helper.c | 2 +- target/riscv/tcg/pmp.c | 2 +- target/riscv/tcg/th_csr.c | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename target/riscv/{ =3D> tcg}/csr.h (100%) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 5d44f993e4..96c92de2ee 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -24,7 +24,7 @@ #include "qemu/guest-random.h" #include "cpu.h" #include "cpu_vendorid.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" #include "internals.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index a2bbaf7f07..f0a5e0d86f 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -21,7 +21,7 @@ #include "gdbstub/helpers.h" #include "cpu.h" #include "internals.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" =20 struct TypeSize { const char *gdb_type; diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 7aacd1d89c..f8042db9cd 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -22,7 +22,7 @@ #include "qemu/ctype.h" #include "qemu/qemu-print.h" #include "cpu.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" #include "cpu_bits.h" #include "monitor/monitor.h" #include "monitor/hmp.h" diff --git a/target/riscv/riscv-qmp-cmds.c b/target/riscv/riscv-qmp-cmds.c index b94e8391ed..2647deef91 100644 --- a/target/riscv/riscv-qmp-cmds.c +++ b/target/riscv/riscv-qmp-cmds.c @@ -35,7 +35,7 @@ #include "system/tcg.h" #include "cpu-qom.h" #include "cpu.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" =20 static void riscv_cpu_add_definition(gpointer data, gpointer user_data) { diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c index d447204721..572a39d660 100644 --- a/target/riscv/tcg/csr.c +++ b/target/riscv/tcg/csr.c @@ -21,7 +21,7 @@ #include "qemu/log.h" #include "qemu/timer.h" #include "cpu.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" #include "tcg/tcg-cpu.h" #include "pmu.h" #include "time_helper.h" diff --git a/target/riscv/csr.h b/target/riscv/tcg/csr.h similarity index 100% rename from target/riscv/csr.h rename to target/riscv/tcg/csr.h diff --git a/target/riscv/tcg/mips_csr.c b/target/riscv/tcg/mips_csr.c index 609718f288..884030e91d 100644 --- a/target/riscv/tcg/mips_csr.c +++ b/target/riscv/tcg/mips_csr.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "cpu_vendorid.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" =20 /* Static MIPS CSR state storage */ static struct { diff --git a/target/riscv/tcg/op_helper.c b/target/riscv/tcg/op_helper.c index 775fd431d6..003f6ebb31 100644 --- a/target/riscv/tcg/op_helper.c +++ b/target/riscv/tcg/op_helper.c @@ -20,7 +20,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" #include "internals.h" #include "exec/cputlb.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/riscv/tcg/pmp.c b/target/riscv/tcg/pmp.c index d93563c36b..41b55519a8 100644 --- a/target/riscv/tcg/pmp.c +++ b/target/riscv/tcg/pmp.c @@ -23,7 +23,7 @@ #include "qemu/log.h" #include "qapi/error.h" #include "cpu.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" #include "trace.h" #include "exec/cputlb.h" #include "exec/page-protection.h" diff --git a/target/riscv/tcg/th_csr.c b/target/riscv/tcg/th_csr.c index 431f4cc286..e6f642991c 100644 --- a/target/riscv/tcg/th_csr.c +++ b/target/riscv/tcg/th_csr.c @@ -22,7 +22,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "cpu_vendorid.h" -#include "target/riscv/csr.h" +#include "target/riscv/tcg/csr.h" =20 /* Extended M-mode control registers of T-Head */ #define CSR_TH_MXSTATUS 0x7c0 --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259728; cv=none; d=zohomail.com; s=zohoarc; b=leU5ido22iVwdV2E1M53DTxtcs7m1UdWVNgdlcoZt3vOOyBidhdqBnAK7Q3JMeO68/jHNOLapFDIzKRer64YzuSh0EKWANi+Kaa3rBsngCUKF4uemlarnajD9KcodWdnCx4fYZQZsRrrNTknhoS5aywSc+U6nu3atb3YoPdcvq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259728; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8CGENXBDENB0oBVBQujZCqmzhM2oRFjHKcfx/ZhXG40=; b=A/Y1vBwuNlcVRLTL3ZphoueICqNzkIJA8ke8+exS8XSwYzSHh7oFRHP9vsergfp6NQSNefPnYsOys0xeERfNhPD+Ptu8NCTWS92YfeHZON8xJkFP1K7kmI9bMXFq4LvGFY2qbCajthxeGZfttJ+dOSzojDphV/vaEMU8Ye+v7dQ= 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 1782259728588550.096893598782; Tue, 23 Jun 2026 17:08:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9E-0007Tk-44; Tue, 23 Jun 2026 20:07:20 -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 1wcB9C-0007SR-PR for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:18 -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 1wcB99-0003DN-Pa for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:18 -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 65NJwnV4706731 for ; Wed, 24 Jun 2026 00:07:13 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyp29kta7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:12 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-5178fc89b2aso4759981cf.3 for ; Tue, 23 Jun 2026 17:07:11 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8CGENXBDENB0oBVBQujZCqmzhM2oRFjHKcfx/ZhXG40=; b=fFTKc/+K82I5e7UJ Bmompu8seLjbu+Pp8dKCDaq95mmpv231jPBpXg6mFXoqSBdgjElVbPgQtHH9PdAr Xs5KzE1VqZCvujIqM9bd2506uz2k0wxGtnNdYW3VDL5crbqaROvFDud8m04saKyk GEzmhMFZhYwKybaP/FggFGCVAkRkVoZSBnvPPwNdEfdo45Jy9bBfOU121PoVLGXp 2Tw3RuCjB4hrB8+JAatUv8nzQvxO+EkTrryI9jMc9ivNgGEBGplEW7j977Qe7HEn /oEz/8oV3Il1SVDyZSr6nfL/AcCEEguRa67yLdb87SL8JZh1WOIJH9bhsYaLelnn q33lDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259631; x=1782864431; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8CGENXBDENB0oBVBQujZCqmzhM2oRFjHKcfx/ZhXG40=; b=GfsABpWs8V9ZdoLVncMfE5oO0Fzg2Eqpogr6bRS8CggF4Zb/Apmu6EYzU1AGN2bZbN ElTGUbY0hFDaF+70Mf3JFYL9dWVo+VuD9hlRoKmhU944U0GpGLh1YUox+Djx+YQOcptd /jfM6vE4435mOrH/BTAOxPoKfqF5BjscGvAm6sGrmHYP40aejSGDhyusyYis0785J1VU 3suue6Ng6o826paR0VDJzapBJDBuzAkL411eiu7tDAb0cuPd15idrqlXCyKqQSmdQ2SL Drw58Cp1IXSVPcPfzzHMkEYE1NBH8oBIDz4IGVLP8GpZ8zw0rz44/UcMCCzuyEetObc1 lgFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259631; x=1782864431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8CGENXBDENB0oBVBQujZCqmzhM2oRFjHKcfx/ZhXG40=; b=etbT5ZsFWDXdFzZMzmVdgE5CJLZewHEnoFs0B23fng1AMN5X5KNrAal9Hg+ytxLf6T GwiFYHC0Hcu+LHNRH7cdAfeXhis/wp8vPAn+TpUdJqK109kX1R1QHzGnST1ecsHsaFzq vPEoAU0zSKIU2DquftdaM72OsVJilT6viQr4LwKR+CPKsf6ZuHNMfLB3WBa41JaZcNtG 709sZWeu1aYBxVKzKWLyfWLLfQAZFJy3DhX2B55L3dM1h4CnOmCwWnHQ3Vf6QHh7juIb PQG0wuL1zKYWQSMIsrqWS0o9mpuS8aLyMKfMR3ztZgHevULDHfJMPulDs2Fh5PuHKE92 515A== X-Gm-Message-State: AOJu0YxyN+YaGtzUlaOV//NzSQXdZ8Oe/ZWrdcy8dDX/UfSJEfu68lSK UQSZIDf6umHl1ZhAJEm387JanTJua+1VFTJCU/VtE/CViQqqDt0yj3ybDzryM0USebx90hCUG+Q 4sCa9FnbolCOQaipmNOuKWShzhUBVPnq98lQBpNFErJFXAUr10SEQgjWMbC1o2ynsUg== X-Gm-Gg: AfdE7ckRE3fn6PM2Y7RRI8hFliLmrUQzUGWjFx/ndUHHlbjHtb89E35/8LO7dUvEP24 rEX3vDGXz2w3IrZkVfT5kmDuZZOf1rsStbkkRHAkFDZRGvfOKNmkFYQvUOoregeKgsSxB5H8GOx k8t07UrQbbR0/TZDCf6pAGWADE33b3c1VK/WzRLH2r/VODzNUoe/BEFxd6wrtlvS08zLkD8SO7o Bfwp4tVyNdHMQofyEoZRh/f9wvqna2KHTN3d+aZAbDmugw7Cw6C4x7iS0/pVdyA50YfYwJTVtp9 4lODYhgOCNYmDc/BTMxIbD8wNvg01njoXNDO9eM3XvaS9LKs49fvVlqU0Jc3mCFgL1Tt3Yy1D0g bgPxT7aDgM/coaAfbP/4ZILbKu1SHikZSKMKC+FoyTO0NTg== X-Received: by 2002:a05:622a:6082:b0:519:f2bb:1036 with SMTP id d75a77b69052e-51a61ba8cdamr20872071cf.36.1782259631059; Tue, 23 Jun 2026 17:07:11 -0700 (PDT) X-Received: by 2002:a05:622a:6082:b0:519:f2bb:1036 with SMTP id d75a77b69052e-51a61ba8cdamr20871561cf.36.1782259630648; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 10/24] target/riscv: move custom_csrs logic to tcg-cpu.c Date: Tue, 23 Jun 2026 21:06:17 -0300 Message-ID: <20260624000632.2149359-11-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=LdAMLDfi c=1 sm=1 tr=0 ts=6a3b1fb0 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=pNhwjiGmTFK0dS8zIOEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: RQ4dgZY-t88u7k_DIkSx9KLBacugM1cy X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX7rjguRwEEhkl Y1oFIRRVQKF2cq4amnxbUDLBqhFSP7jHaMdXHMihVgImfJydU0qEq6uEZi+d++Dvu4XrXFJ3gUq 9rewavhIRQ3ALjBKWplC3U9DAd752dA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXwBN54WZoIInf M0qUqP4QFXN6x8uYbC1RReTM4urm2rHwPDADcAMSq/kvVvVn3l433AiI954637Ra1nu2ESJ5Aay xKhT55MZMy5AFXb4nvKjdLpt/9r6Mi4GGWlMZp1/grQvWHGvoImN+LyaVsezXJMFqIzOsyzYtfQ pTUtMOrJyYo9XnVEA4aDjPQlEzeIzUP9BWue5NoGEnexWIcnUx1Lmzkk261d9tGR+u6NPIRtasi W8wMQ7eZ+aZFNXyDHHApC6rZy+9zFrK817BqLPdNSxpBOQ++SBTAmtZPuymPcP85CQekCSbCZ7a irsLWcokTNFVnoijlwXeWyQfGKnni0b5SzLc/zqRJC+CnU7pttdT7/KTpGafBGfjZBqbhjJnHT6 Y8OK1ZPoNIH9L9o0I6QjfBJ465T1jg== X-Proofpoint-ORIG-GUID: RQ4dgZY-t88u7k_DIkSx9KLBacugM1cy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259729950158500 We have a couple of CPUs that has a set of custom CSRs that uses TCG specific APIs. Move the related code to tcg-cpu.c and do not set .custom_csrs if we're not in a TCG build. What we'll end up doing, sooner or later, is punting all these CPUs to tcg-cpu.c since they're all TCG specific and KVM has nothing to do with them. Another time. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 26 +++++--------------------- target/riscv/cpu.h | 2 ++ target/riscv/tcg/tcg-cpu.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 96c92de2ee..5e951ea19c 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -524,19 +524,6 @@ static void set_satp_mode_default_map(RISCVCPU *cpu) } #endif =20 -#ifndef CONFIG_USER_ONLY -static void riscv_register_custom_csrs(RISCVCPU *cpu, const RISCVCSR *csr_= list) -{ - for (size_t i =3D 0; csr_list[i].csr_ops.name; i++) { - int csrno =3D csr_list[i].csrno; - const riscv_csr_operations *csr_ops =3D &csr_list[i].csr_ops; - if (!csr_list[i].insertion_test || csr_list[i].insertion_test(cpu)= ) { - riscv_set_csr_ops(csrno, csr_ops); - } - } -} -#endif - /* Used by csr.c and the KVM driver */ target_ulong riscv_new_csr_seed(target_ulong new_value, target_ulong write_mask) @@ -1244,11 +1231,6 @@ static void riscv_cpu_init(Object *obj) if (mcc->def->vext_spec !=3D RISCV_PROFILE_ATTR_UNUSED) { cpu->env.vext_ver =3D mcc->def->vext_spec; } -#ifndef CONFIG_USER_ONLY - if (mcc->def->custom_csrs) { - riscv_register_custom_csrs(cpu, mcc->def->custom_csrs); - } -#endif =20 accel_cpu_instance_init(CPU(obj)); } @@ -2822,10 +2804,12 @@ static void riscv_cpu_class_base_init(ObjectClass *= c, const void *data) =20 riscv_cpu_cfg_merge(&mcc->def->cfg, &def->cfg); =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) if (def->custom_csrs) { assert(!mcc->def->custom_csrs); mcc->def->custom_csrs =3D def->custom_csrs; } +#endif } =20 if (!object_class_is_abstract(c)) { @@ -3178,7 +3162,7 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { .cfg.mvendorid =3D THEAD_VENDOR_ID, =20 .cfg.max_satp_mode =3D VM_1_10_SV39, -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) .custom_csrs =3D th_csr_list, #endif ), @@ -3224,7 +3208,7 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { =20 .cfg.marchid =3D 0x8d143000, .cfg.mvendorid =3D THEAD_VENDOR_ID, -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) .custom_csrs =3D th_csr_list, #endif ), @@ -3429,7 +3413,7 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { .cfg.ext_xmipscmov =3D true, .cfg.marchid =3D 0x8000000000000201, .cfg.mvendorid =3D MIPS_VENDOR_ID, -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) .custom_csrs =3D mips_csr_list, #endif ), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index c0e9098728..34c63a3628 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -591,7 +591,9 @@ typedef struct RISCVCPUDef { int32_t vext_spec; RISCVCPUConfig cfg; bool bare; +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) const RISCVCSR *custom_csrs; +#endif /* This is just a setter for env->num_triggers. */ uint32_t num_triggers; } RISCVCPUDef; diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index fe6350f497..fef66557c2 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -38,6 +38,7 @@ #include "system/tcg.h" #include "exec/icount.h" #include "target/riscv/tcg/debug.h" +#include "target/riscv/tcg/csr.h" #endif =20 /* Hash that stores user set extensions */ @@ -1650,10 +1651,30 @@ static bool riscv_cpu_has_max_extensions(Object *cp= u_obj) return object_dynamic_cast(cpu_obj, TYPE_RISCV_CPU_MAX) !=3D NULL; } =20 +#ifndef CONFIG_USER_ONLY +static void riscv_register_custom_csrs(RISCVCPU *cpu, const RISCVCSR *csr_= list) +{ + for (size_t i =3D 0; csr_list[i].csr_ops.name; i++) { + int csrno =3D csr_list[i].csrno; + const riscv_csr_operations *csr_ops =3D &csr_list[i].csr_ops; + if (!csr_list[i].insertion_test || csr_list[i].insertion_test(cpu)= ) { + riscv_set_csr_ops(csrno, csr_ops); + } + } +} +#endif + static void riscv_tcg_cpu_instance_init(CPUState *cs) { RISCVCPU *cpu =3D RISCV_CPU(cs); Object *obj =3D OBJECT(cpu); +#ifndef CONFIG_USER_ONLY + RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(obj); + + if (mcc->def->custom_csrs) { + riscv_register_custom_csrs(cpu, mcc->def->custom_csrs); + } +#endif =20 misa_ext_user_opts =3D g_hash_table_new(NULL, g_direct_equal); multi_ext_user_opts =3D g_hash_table_new(NULL, g_direct_equal); --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259699; cv=none; d=zohomail.com; s=zohoarc; b=i8uacA3rwrhP9D6s4YJGNnote7MYx8J4/YFp1OePgeswFqShM42dWwmZ9tK5WbqJs6tQdGafYy0/izS15C79DRuXaFeLkRUXwbk65q81ScqJdjkOGJxIUGtWc5GA7JVI677VWkEMCyL2t6F4rSCWPTM42MorCXo8pdBllqx6RUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259699; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=A1ZLSHN4dBq9bPyOCHZ00O+eAxtNDiStcOtXHJAjF2M=; b=IpsIXMmHTIlX/XKERmQI3KxNPKFi2eW5UfwVVtVNoZ0rxk7/S8GFj7rMjVh1HTutYZC9RiRG/UCPfU0jvQHXPA52sfJlL8XWLRFxgCvQHKyC0ASeh5pEyKVI0GIZfBhvBOwBtyvNVmvn1bvQ87nVbLO1Ii/WE1OJIIytlQjfP10= 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 1782259699318250.81805817455927; Tue, 23 Jun 2026 17:08:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9e-0007h1-6K; Tue, 23 Jun 2026 20:07:46 -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 1wcB9L-0007WX-HC for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:29 -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 1wcB9J-0003DY-PL for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:27 -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 65NK0ont1285737 for ; Wed, 24 Jun 2026 00:07:14 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 4eyr32361w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:14 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8dae6572676so7195436d6.1 for ; Tue, 23 Jun 2026 17:07:14 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= A1ZLSHN4dBq9bPyOCHZ00O+eAxtNDiStcOtXHJAjF2M=; b=pGHAPBT/PIxg/3yh YAZn0cOCp2yPIpzS1YthJvfAc+E5ZWZZMscsgNFr23ARe46aUtyHVR9ctX5KVdUX HNtxYKi0nLmfHmUDmaeGYWOBmAmO9ML/jOQQ/5YhFs32DIsh5wd0qq0URRVnlkjU ZSoGKpnBjDMgVbrtEx9fU78mh94c3Bk/+4HxLL95bBoDan88LVYnVel6JxodOtQv lCU1bHN4WJjuxqfimZvPUQ8YYbxEeGtWdd7rZL5YOXrSsW6ONboOASdWj/2lMk33 d4hAigKgK2qmZCzkUhtUeWAqmraKCX9B58hri6/XtuaUiL0+qzMJpSVlT3uM+K0u in/gUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259634; x=1782864434; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A1ZLSHN4dBq9bPyOCHZ00O+eAxtNDiStcOtXHJAjF2M=; b=hVH6eFdKA3HC68Bml9TpoEYfo9Ga4soux3QnCOzrM+bIjd/Qk54toIddSSkSWOeEYA 1+xPpoPS5D/yQWCmRxCkh41ze2zVxMqxOOSY+50PF+1dKnbgrm5WMA4PZwt+vuNV18M9 Qav6OB35SoIvbsI0BfbI3xdeoULKInvo9abgl/xp/qLkH/21fLXKP/JSrF6PATvQ0J8A Y+1/mrvXqbquAkGaMIE9NPYKGFN7RzHZyVJ3QmvYQg5PoN+RqWmB2yQLI4uFyZFFOgnz 5jb2JaRqedpfzMmg7mbE7JzaaO6HYuH8CBct9+pNigmr6DygBVV+WgD+805TEInkamJz 4D8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259634; x=1782864434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=A1ZLSHN4dBq9bPyOCHZ00O+eAxtNDiStcOtXHJAjF2M=; b=ACoJHZVog2c5N3rzZXJVnnhuYeciuzsqwaY7OPBrWDkwS0dinvW3uGTNA9jd4XzwB4 K1x8ap3gZ8TVrwLCf7OtxuvP+f9Ogbiewa43CBjT5OkPg5b2tM8b2DvuGIRaxL6AdnxK OS8716T+yfjxQvcHbmcIfdz7tH+7Slygds2jQTHdBm+faLS10THAt/Qw7twIrW5iKmDT r9A6+iBMSQXbZLzSRajMSM2pEPLe3ZPMf1weibAyf0/Omp9b0+rMMOGXguV04t0S9YcK v44gXAipYYLG8Dplc73Q7zwjFJlsXzdlY/mPGL4YrZ3FKes03xgGMIMjlP/EEWbNEGCa U9YQ== X-Gm-Message-State: AOJu0YxvpuFxsw1l1DEoC0vnNCKA6pt9Hztjnc4kC2kLYkS6cMZI1LEv bS8uLb6ikiFcVjO4U7UFbUZoCKC5a2T+3nLOt9sjV+oUrUr3R+zfTqbEoaXQ93OYzq61IlSfOY4 BV/WWXXFq0DoQY/i9opmqd53DOlfjDJoLFOvDiijZvj2L5g09jMGTPAisLkXyzFYwxg== X-Gm-Gg: AfdE7cmCbZHbc+01HYhu/+kcM4sIdNsuIyygfw8zLHQwz0xXdy2csxTZjplizWhCm82 6b/vj1KMz/fPIcQyVYY2Qmei+rA3/wtW3a5fB2c6wafSc6dgA5+Chgk/gg8PVJWTJD9iWF7C/9o GWJnvSVho6y/dPK7YslVK5PtjsqOLbAfJ9Oi4fOTius8KMwkhvLoGEZP+ra/67KYlNiMgSVwrS1 BHbQGMxNTgP96snZHcXPgTG12gh9ZQ7sHbCOvvSf8YAnysVEy/2WRDFb/3waQX8tPWFlkSP2/1c 1+H8h+Ho0aYhP9A5OCz5fnTyESqHtwTI/iuW9m60j6x+pkOsd72pIh2hXECw1fDN7LDy4ZspV6L d/Mwyae8YU7daXJ9vBhR03jo+kLZTZgMxX84drdbAU2b53Q== X-Received: by 2002:a05:6214:e8e:b0:8cc:d066:54d with SMTP id 6a1803df08f44-8e52f9bc79bmr25462656d6.24.1782259634043; Tue, 23 Jun 2026 17:07:14 -0700 (PDT) X-Received: by 2002:a05:6214:e8e:b0:8cc:d066:54d with SMTP id 6a1803df08f44-8e52f9bc79bmr25461606d6.24.1782259633401; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 11/24] target/riscv: move riscv_cpu_set_nmi() to tcg-cpu.c Date: Tue, 23 Jun 2026 21:06:18 -0300 Message-ID: <20260624000632.2149359-12-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXxEq/yJCnhj3w YMbLxSi/oPyfH//2zhzCqK5Ybm2CfBPpSCT40FrEM3sbkzkGLmUC5YMRvya3DqUNQeOHMpilUUc ts1HgvnOCZgt1dFnUzmS99GfoozAu+k= X-Proofpoint-ORIG-GUID: HsNK5HETgJu3n1ZTArTFRKvISkfQYXze X-Authority-Analysis: v=2.4 cv=HrxG3UTS c=1 sm=1 tr=0 ts=6a3b1fb2 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=9Y5uhDEGy_uPjlLRjCEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX1mCGgxreGxgo MlHn9E1bfvRMcYU4s/PvgciHlDFQjlzmS+RFlD/liJZCKbdOs7GfmlXMCen3ewv9ozNAXIAw+JS ZSPYwE3xdU5SG4WhDpmKYFJrdNciNS5X7FFfJuwb2h/mXvXAR6R5vIbHPTweITW6vGs+Oxy1D7a TBiE+/fid8t0MjHkRvDfO+qQhlm1ZKaeVDVSTfF2c1nUk4b2lI+2q/5vHIZV2XbCZBZ2V6YrvWN 8Gdx+RBIWDcjpuxS739pb59E1hqEKgtcF2lwgVmJ2eDZSeeKMVFvwiswlDr2inLjtqHxId4P506 4G9NifBjVIFZ4xWhHTAuEwmJPb561+MnUs0jPQwo1DYKh7H8LfJwDhWw/bZ0XklXUFuda3nNOpu vvEqDIq4CcXc1FuUFe5Kk/Ir5p+A1h20czb88+pUSD33Lm6l/MqUVaQZpBBbj+8AT4CEXt1iVm+ obWsIfEZL0nfsFwuOmg== X-Proofpoint-GUID: HsNK5HETgJu3n1ZTArTFRKvISkfQYXze X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 phishscore=0 priorityscore=1501 malwarescore=0 adultscore=0 bulkscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259699901158500 This function is related to Smrnmi and non-masked interrupts, firing up interrupts via env->rnmip from riscv_cpu_local_irq_pending(). This is all TCG only code. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 8 -------- target/riscv/tcg/tcg-cpu.c | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 5e951ea19c..cba7d2502e 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1160,11 +1160,6 @@ static void riscv_cpu_set_irq(void *opaque, int irq,= int level) g_assert_not_reached(); } } - -static void riscv_cpu_set_nmi(void *opaque, int irq, int level) -{ - riscv_cpu_set_rnmi(RISCV_CPU(opaque), irq, level); -} #endif /* CONFIG_USER_ONLY */ =20 static bool riscv_cpu_is_dynamic(Object *cpu_obj) @@ -1183,9 +1178,6 @@ static void riscv_cpu_init(Object *obj) #ifndef CONFIG_USER_ONLY qdev_init_gpio_in(DEVICE(obj), riscv_cpu_set_irq, IRQ_LOCAL_MAX + IRQ_LOCAL_GUEST_MAX); - qdev_init_gpio_in_named(DEVICE(cpu), riscv_cpu_set_nmi, - "riscv.cpu.rnmi", RNMI_MAX); - if (mcc->def->num_triggers) { env->num_triggers =3D mcc->def->num_triggers; } diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index fef66557c2..4af5cd9c73 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -1662,6 +1662,11 @@ static void riscv_register_custom_csrs(RISCVCPU *cpu= , const RISCVCSR *csr_list) } } } + +static inline void riscv_cpu_set_nmi(void *opaque, int irq, int level) +{ + riscv_cpu_set_rnmi(RISCV_CPU(opaque), irq, level); +} #endif =20 static void riscv_tcg_cpu_instance_init(CPUState *cs) @@ -1674,6 +1679,8 @@ static void riscv_tcg_cpu_instance_init(CPUState *cs) if (mcc->def->custom_csrs) { riscv_register_custom_csrs(cpu, mcc->def->custom_csrs); } + qdev_init_gpio_in_named(DEVICE(cpu), riscv_cpu_set_nmi, + "riscv.cpu.rnmi", RNMI_MAX); #endif =20 misa_ext_user_opts =3D g_hash_table_new(NULL, g_direct_equal); --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259732; cv=none; d=zohomail.com; s=zohoarc; b=mqJoIYve44KNSt7tw4wnhyf33DkDRl+xAYS38NDh+FREvGijj8IfDBSVLM/Lscjp/+JAquHSoMpYVKXmv+Cy28qdjee6qmqS0vJwZ5/BeOuO4TXhVGNp1ySm+aklDxJME3JniRvZDHPpFETfMTaVs5F1t+mD0/n0JQ0WjDLZltU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259732; 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=tPKgOZLimskfFqkC0kyNvo6B2QfFFcxZ49dpgDAdxuo=; b=mVPGMimldfeIu4VGogeH+gfEERS9cpwnHDsQaQI+KT6CCTfcgb3D4ZSxoZ7gOIcB8NM0lLVQzrSM+nF7HtEVYEiBVmYveo9t4SS+Pm2sp4gwdV6y6nXN+gr6wurtIW/egkiTu1B57w+UNjmemHIx534VpRj/4Y9tQX1YVcKlOJs= 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 1782259732677920.6319104508955; Tue, 23 Jun 2026 17:08:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9e-0007iT-Jp; Tue, 23 Jun 2026 20:07:46 -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 1wcB9P-0007Xe-Jy for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:33 -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 1wcB9M-0003FK-Rz for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:30 -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 65NK0wZp1177683 for ; Wed, 24 Jun 2026 00:07:18 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 4eyqe6bd9h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:17 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dbc0f048efso10791256d6.3 for ; Tue, 23 Jun 2026 17:07:17 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:16 -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=tPKgOZLimsk fFqkC0kyNvo6B2QfFFcxZ49dpgDAdxuo=; b=Ip1QgaWTwjSnAuuNIzJU6Q9poyR rNhnQvvoWxSbrKf1A/EV7F6uv4mIx7R6k9FdJbvti3ifWtLndenVcVOnOz5/KKJm UKW47SHssonqpbK8wv7hcdlcPm2gfICUkJEa/kD31TqB0H6xn41CQ5CKbgLvWkCk GC1bclMvNPWcP88Hvsjn2/ZxMdAFZ0j3Do++QzM2ze12e4eT2ZrqzAgQcckROSY8 R1rnIAYHinN1mZ4Ud8Awi2zlWFTP6Rf7YSYuOZAxm4gKpecAwdCVAKKZbk5dngKt UT3oYYWsxhM3uYQh9fvYTbVey/Qw5dX05Kkuq+1x4wfrlQmqFzZi/q9VOZg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259637; x=1782864437; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tPKgOZLimskfFqkC0kyNvo6B2QfFFcxZ49dpgDAdxuo=; b=PeAL+pDuMC5sEN/ZzmfH9he9aKLAwXbcKiqM9exc0fAuPGl5OKU9k95zQeuCKcq2j8 fWNoB/+buHDUbpTJ5ayGHC7voWbv0wIdYXGF7MX/73Nw+irsKxIk2gifdOSWjJiVHbG+ eUqRgRALUSFgLX+zb1za9F4f7APyVhQt1pGFzEUVFXzwA1mokf0NnbI/pmoAYrf/ECdh bKk0xZJXiWatLvxw4XRyMZWUjcMkV7Fy5EH0uDRe8WsKytQyeIhKoefXZP4xxfG+iY8z RnWIB+LqBj/nLfx66hnKhxqTrjPglL3jF6JxzcEfEd0TwVgIaEZgSqrWa1vO+cwB/b+s Zbfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259637; x=1782864437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tPKgOZLimskfFqkC0kyNvo6B2QfFFcxZ49dpgDAdxuo=; b=UqK+/sMqRJKcf+jgB9UQyxkkiYOZryfDvnRoLvUEsQexBOCKwguLMagHLuQ16Zsit1 oGCYiwGeGop2Bb5NvgosZh0BqkbzMFSPpTRSLlesb6kUQwee9V/FU8H5EnAqEw9In2ml u6VD9z2fog15DQk10sepreeoXWjEfLmCO2K+LUntbiPcbPvmYFKmT0THX5om1D3ha/Tz DvhZGOQh/F2xTlOolCZhVnC+oy5hUMf+UPnYL0aMwaaFMZ0Om3pOShmEZf741cZ68z1J CQr7e0Txv10OCZs6NXWgbBH/eKpuvtoZ37soIM5yOx2yFKWp8Nz3mEu4Yd4OInsR1l4d s0xg== X-Gm-Message-State: AOJu0Yz3gEQX/D1/0dPmU3NYu5iixO0AdbFJPvNnvcvFuwZZrfzprYja ObXammI+Do/21HJvpQdEX6zTps7A2TjI7VRChnA9vBrWL6n4mdzySCuruKS3JOaO4oIABM2HaZB 9rIPBgIS/2IEMYaVWMD/X4SEp++8irwT3m+gtmW2KuLXeUTZLgDK/HuwTi9jXHKkR6Q== X-Gm-Gg: AfdE7ckqUQFcTIFQ288qduv68cHeUtEnr0xmGt3r0S9eXsDhPRqKzbFz6+NzY/h8I8K bSg0lt9f3y0Cu204x5G2R/u9RrVX4e2eVAD6BOk88V/YjcP/7W9g1WWwK1Caz/+2xUbjKfzTVn+ 40uDL68ildFPzMG07TOND577+UA4js26BckN9yGF4jWqiiAEBoayTd9RBOZJiaPQlgBsHUQxYyO YV0oE4PoYKH1ea+PTxvPm5cgSaGXfFH6GkgDZyQpbQ4yr/6Cp8Ai8tnRy86300umRcYArM0zCT6 1UJ1EkMr5lCWm/EnsRHiqOOU9ZiSoZT4p+zYmFcuEax0BemXy1mRzZTY9OLX6YzFY2p4Ge7A7CN pJAbnVmK9fgqkurv2GqfHZwQLrimLMYa2Ds8ZOac6CC3dhg== X-Received: by 2002:a05:6214:5f08:b0:8ca:f47:25ea with SMTP id 6a1803df08f44-8e52ac2bf0dmr25074166d6.0.1782259637243; Tue, 23 Jun 2026 17:07:17 -0700 (PDT) X-Received: by 2002:a05:6214:5f08:b0:8ca:f47:25ea with SMTP id 6a1803df08f44-8e52ac2bf0dmr25073486d6.0.1782259636761; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 12/24] target/riscv: move valid_vm_* satp arrays to cpu.c Date: Tue, 23 Jun 2026 21:06:19 -0300 Message-ID: <20260624000632.2149359-13-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: tE6RNa-XKQ84WFy2uc3xt6xen6l_NWDo X-Proofpoint-ORIG-GUID: tE6RNa-XKQ84WFy2uc3xt6xen6l_NWDo X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXwnbjjgFpBmFJ mKrPqXFxiNuZGDwiB+/S/lS9kNcOkyAP65GDLqDjQMh0kFaPkGqR0QK0h3lI74P0ZrWdWCjmJL0 pR/ArzjCipSGHpNQDQNExrtHqenonvU= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXxsloNYI512SC EYeat8p08rlx0wIH9bWu8TsjNRIl2uLDp4OeRtmGNmVbQlGDrcHcSbb+3D8Hps+K7vR0nfNDcOw 8NL/vmrLtot5/cZvKl2/0hH6VN1D2mQK4LOTu8nrgCuUtTog1QPswkL8obQnsZfGDJBbIMmrzxU /H3rM4o4pUJKwzECYIL7pp19cgqkcA27ze+MLgJvHc0nJKwZb3tH590t6g5CTl57m5GaPxm29BJ nG7VC3c0Vfpu5XsKcwXWxSzlRTjMMOilA3/6lFgQ8KOUwUqG+fwt9JTqLAhjh6kpJGRgp21CqWQ YG59M4Wjlfh6/dtjxpKQEQ0SI3hFKH8tPIZ775KXvy26cfVs6oxzQ3rtDFyuHSoN58I1IoFy/sW RSyJxFPWtWDQPSDnsWliQ3GrGdj+Rnucf12bet3wtp6kcM3tzV165/a4/mrM2jfWIL6Pg8i4GeC QaSHMBb4Eztqo/0JgQg== X-Authority-Analysis: v=2.4 cv=OeKoyBTY c=1 sm=1 tr=0 ts=6a3b1fb5 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=5rzsFUvyi4LdqLJPsjwA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259734021158501 Content-Type: text/plain; charset="utf-8" These arrays are used internally in tcg/csr.c and in cpu.c in the satp options logic, which is common for both KVM and TCG. Move it to cpu.c to allow KVM to keep using it in --disable-tcg builds. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 13 +++++++++++++ target/riscv/cpu.h | 2 -- target/riscv/tcg/csr.c | 12 ------------ target/riscv/tcg/csr.h | 3 +++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index cba7d2502e..29af0f2be8 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -59,6 +59,19 @@ const uint32_t misa_bits[] =3D {RVI, RVE, RVM, RVA, RVF,= RVD, RVV, #define BYTE(x) (x) #endif =20 +/* SATP bits that are shared between TCG and KVM */ +const bool valid_vm_1_10_32[16] =3D { + [VM_1_10_MBARE] =3D true, + [VM_1_10_SV32] =3D true +}; + +const bool valid_vm_1_10_64[16] =3D { + [VM_1_10_MBARE] =3D true, + [VM_1_10_SV39] =3D true, + [VM_1_10_SV48] =3D true, + [VM_1_10_SV57] =3D true +}; + bool riscv_cpu_is_32bit(RISCVCPU *cpu) { return riscv_cpu_mxl(&cpu->env) =3D=3D MXL_RV32; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 34c63a3628..82430ecec6 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -971,8 +971,6 @@ void riscv_cpu_finalize_features(RISCVCPU *cpu, Error *= *errp); void riscv_add_satp_mode_properties(Object *obj); bool riscv_cpu_accelerator_compatible(RISCVCPU *cpu); =20 -extern const bool valid_vm_1_10_32[], valid_vm_1_10_64[]; - void riscv_cpu_register_gdb_regs_for_features(CPUState *cs); target_ulong riscv_new_csr_seed(target_ulong new_value, target_ulong write_mask); diff --git a/target/riscv/tcg/csr.c b/target/riscv/tcg/csr.c index 572a39d660..b17be35e56 100644 --- a/target/riscv/tcg/csr.c +++ b/target/riscv/tcg/csr.c @@ -1874,18 +1874,6 @@ static const uint64_t hvien_writable_mask =3D LOCAL_= INTERRUPTS; =20 static const uint64_t vsip_writable_mask =3D MIP_VSSIP | LOCAL_INTERRUPTS; =20 -const bool valid_vm_1_10_32[16] =3D { - [VM_1_10_MBARE] =3D true, - [VM_1_10_SV32] =3D true -}; - -const bool valid_vm_1_10_64[16] =3D { - [VM_1_10_MBARE] =3D true, - [VM_1_10_SV39] =3D true, - [VM_1_10_SV48] =3D true, - [VM_1_10_SV57] =3D true -}; - /* Machine Information Registers */ static RISCVException read_zero(CPURISCVState *env, int csrno, target_ulong *val) diff --git a/target/riscv/tcg/csr.h b/target/riscv/tcg/csr.h index 73d874ee98..53ba3b4a4d 100644 --- a/target/riscv/tcg/csr.h +++ b/target/riscv/tcg/csr.h @@ -69,6 +69,9 @@ enum { CSR_TABLE_SIZE =3D 0x1000 }; =20 +/* valid_vm_* arrays are shared with KVM via cpu.c */ +extern const bool valid_vm_1_10_32[], valid_vm_1_10_64[]; + /* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE]; =20 --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259709; cv=none; d=zohomail.com; s=zohoarc; b=NpRI9YPGBS4v2qv+sGyKHSDqd+ADAMNn7hNyJWQZmM0UW2dXA7bzShWxfXTkliA1BrH4XbxeW1mGhKiXlsMSWxwPAdsSL+ZLR2wKWOiT6QbNYA69eUl4WxreUprk9fFftdckiEiK2Msl3wtyCgN7Xo1H5TwmPAGnvCDxrm+g/Ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259709; 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=IijOlZ3k8fCmRuDBmWVMxoPeZiwipVAvycOnwQeR95s=; b=HZdfIhkWAOXbsXZq3tjmoXyrl3eqoI3jz3LCg2Lh6Ul8zA6tMBYm6skdt+NTDT4wh6/IJB4S0YgWeGE7CvE1KoG0Uy4IZvOqZVKazNB6oArN+HMqW6Wbt6+F3rvtSwZSHfWmKTlrnpBbrVFs2hVmX9uJMqETlvAyBeqnVyT+eo8= 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 1782259709526160.6207153521151; Tue, 23 Jun 2026 17:08:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9e-0007i4-G7; Tue, 23 Jun 2026 20:07:46 -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 1wcB9L-0007WV-AD for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:29 -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 1wcB9H-0003IR-F5 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:26 -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 65NJwjGw3454642 for ; Wed, 24 Jun 2026 00:07: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 4eyp1gur98-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:21 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8de3cf78895so9683046d6.0 for ; Tue, 23 Jun 2026 17:07:21 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:19 -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=IijOlZ3k8fC mRuDBmWVMxoPeZiwipVAvycOnwQeR95s=; b=mc88IhZQmkQgWj2P4KAvc9WpDyu GJj4yRSsbjCto+itZZJ5nqw1Xy5a2ekOyq9RPIhTf2u9yJMaxshiDSPET57+zrlh MRcBm9KyNoc1ws3xUnuDmDGNZjHugCbwQpQhzo7QFC3uYmJ+1YeLT5BvU5KQe42y v3FnypCDbxhdpVcJhJZys1yccf7R5GecDl2G59C/yzrzS89LU7NZp++cfvFxpCVV r/KrtJ0xPUa10eWIoDKtvs0a+zre+20eeMG/eZubPdNXcsxvs5LyyjnoeNVuavIT eWKKP+8zpvTiSQGu+tuNF2VIDG58lTm1eWLbr4lxyB/Ifz0BxKnZrCO9Byw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259640; x=1782864440; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IijOlZ3k8fCmRuDBmWVMxoPeZiwipVAvycOnwQeR95s=; b=PI4El5lLeIGtDY3AZDYHy9i3PS1ubLHYz0qP1hwbDfV52Po6E3skt0ucGpl2BYHD2q wpvya1G/dym99x0U7CNzdZpVigoKk3eZ+QuMQq//y9DiMHMPrhFh5KnUmqpc8gdE/gtm S/CFGnFJtbHilSAlFIy1wKosWbkVeI9DaNdZR0v0Ch5Kdbu6zStaKwOK4n2iW/0gSs++ ltdUFdOwbhHeDI7w/Irqjr/kITsdNJuTmKeluq/dZKRkyrySmNfVlqQOB9otMjdMC/ay gCVB0CKpGSxc/7axUQVqIy92DIsROqcjIg4YKoZTgdgvAzXibDDGCmEv69CiLESUvS/l Qdrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259640; x=1782864440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IijOlZ3k8fCmRuDBmWVMxoPeZiwipVAvycOnwQeR95s=; b=jW3ED5Of7ZjRwO4fs2zeoyxDw+NWqmlCDDBk9sONw5+BoOBQbpw0NKy/0oA71L2mcO zd/2t4qNwK1aLbzSSGDws9bGFfRxb1p2pVow24y+8JOKG0XFB3msfAkESpzQQaxs++ZY hMGvU4hS7V7lIO/dDv4GOk9QmZkkAqYa9Ncv8ZJAd2MI9+yv7/WZMKF3FMON0jFhgfsL eGkpTS3grk+s69gVkhRzxwo1YrT+8F+ytzv/TqvJiV066V8aKgZ/+UxzGsxG63J9rtDm L9ZCyBPRZXVWecqM3aXmXlAvHTFlCup/XzD7ayGbvdzmgUP/fEkXkr4W84t6kXVX3wOQ AYsg== X-Gm-Message-State: AOJu0YzZsRC3kzoBvBsmsed8xDcUVCr5r1VEo21BbEFbjfm4pCz+7xWj 9CUh+TS1Oa7EDug1Oebn+FpF6zMl46ZEmuL1sq3Wq9rMA2DSLB09S1M5wOu7SCMNEVwgHb4IXSV iegsvt6iQXJRbFROuIYXFAsu/BWjH+ezwE8tQoaoxd2SXovh4wNdLA9QMd3y2cHoYJA== X-Gm-Gg: AfdE7cn2JtmqYle/qp1ZdQAXojKhV2PjeXgQbXnhSHs6vINquKb0yzFhta2aBu8B+R4 JV04aP191JvcP31Ywot4bOe9muig4D3U8E9NmRSQzZy1jhtv9mbLhfqnMr3tR3Rv1Z27v56ggb3 +AGZBZgXBTyDDkVKnw2SKGZQ+8o6GZTA8458131dy6lPT0JbTYB4+JKXamYPWi30A+f2XtRCQig 9B3PY3XRA1cp+FfO7VC/eqIdIpCKwwAxkalSy+Lo43ilnVpiwpNJNx4csZ5sSWNUUSYSYA4KfvD TQdbKffMw4oAG5DzHtDdZqYbh6GDk4J8bYPiuoOm8A51hbok6fYKHMFrtDg3TfIV9Vnj3niqNWO a9rfbruk9y8ZBIUFWBIRJxvXMtwGL0HOYpZOVTI/pa4mYBw== X-Received: by 2002:ac8:5f0f:0:b0:516:d60f:6457 with SMTP id d75a77b69052e-51a61d274b8mr19388221cf.4.1782259640023; Tue, 23 Jun 2026 17:07:20 -0700 (PDT) X-Received: by 2002:ac8:5f0f:0:b0:516:d60f:6457 with SMTP id d75a77b69052e-51a61d274b8mr19387641cf.4.1782259639544; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 13/24] target/riscv: move some irq helpers to cpu.c Date: Tue, 23 Jun 2026 21:06:20 -0300 Message-ID: <20260624000632.2149359-14-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=QJhYgALL c=1 sm=1 tr=0 ts=6a3b1fb9 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=GPi4zPIJMbMzHxplyksA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-GUID: 2v24UrcVbNULEKVQ2z5dOSp8Vli-SiSe X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXyDRhwwTo9wb4 CX28YS7AnmyJAUDLQboUHlEFUyGOsP6HIFFCcgLDBlqVJtzzxDVI/pkyCNp6sxrXWllgrmSevLn boxCRDzPvseDrpxBGWwUyKyOZm7Wm/0= X-Proofpoint-ORIG-GUID: 2v24UrcVbNULEKVQ2z5dOSp8Vli-SiSe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXyB47O4dXbehV y5YmMKBUclz+VfgZ1M4Rj1ywk2XAueBu+ctNn7ZzTIwChjiKIT5E7UYgDu5qhXg4GZJSxhKxQFi i+FnJHSWKXlg4Yg0yWcoR5IpxFIhMgsxsyaO4tMMJiL31mvd/+Yzwle/+unXQRLKr9+4u6+v7d0 NTms1HgCOWll5rod7fHwpWjof6JTofRppag0KqoXQ9PXK8/RVOck1RywBt4ONdSkh9WXnuzTnqC FeYGX0wubh90aFnboz5dHU6LUtm3gzXP+iR+X3NOTSxzPLOcf0LDHplskx2DdJl0u8KuoePJXM6 4mNxs9NPzJVdAwxEZwj40ju1qWTn9AY68oYU/ABRmQyNVRm44P15qtcL7SsDDl8az03pyOXeGTF lVt/15dSmxsWcydHK23guOsC451ETA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 suspectscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259710036158500 Content-Type: text/plain; charset="utf-8" riscv_cpu_has_work() uses a handful of irq pending functions from cpu_helper.c. There is a very high possibility that KVM doesn't need the current implermentation of has_work(), but the common accel code needs an implementation of this callback (see cpu_exec_class_post_init) otherwise the KVM driver won't initialize. Move the relevant irq helpers to cpu.c to allow KVM to keep using the current has_work implementation, allowing --disable-tcg to work. We'll circle it back to evaluate a proper KVM implementation for it in a later date. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 187 ++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 5 + target/riscv/tcg/cpu_helper.c | 187 ---------------------------------- 3 files changed, 192 insertions(+), 187 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 29af0f2be8..483ac2e0d0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -738,6 +738,193 @@ static vaddr riscv_cpu_get_pc(CPUState *cs) } =20 #ifndef CONFIG_USER_ONLY +/* + * Default priorities of local interrupts are defined in the + * RISC-V Advanced Interrupt Architecture specification. + * + * ---------------------------------------------------------------- + * Default | + * Priority | Major Interrupt Numbers + * ---------------------------------------------------------------- + * Highest | 47, 23, 46, 45, 22, 44, + * | 43, 21, 42, 41, 20, 40 + * | + * | 11 (0b), 3 (03), 7 (07) + * | 9 (09), 1 (01), 5 (05) + * | 12 (0c) + * | 10 (0a), 2 (02), 6 (06) + * | + * | 39, 19, 38, 37, 18, 36, + * Lowest | 35, 17, 34, 33, 16, 32 + * ---------------------------------------------------------------- + */ +static const uint8_t default_iprio[64] =3D { + /* Custom interrupts 48 to 63 */ + [63] =3D IPRIO_MMAXIPRIO, + [62] =3D IPRIO_MMAXIPRIO, + [61] =3D IPRIO_MMAXIPRIO, + [60] =3D IPRIO_MMAXIPRIO, + [59] =3D IPRIO_MMAXIPRIO, + [58] =3D IPRIO_MMAXIPRIO, + [57] =3D IPRIO_MMAXIPRIO, + [56] =3D IPRIO_MMAXIPRIO, + [55] =3D IPRIO_MMAXIPRIO, + [54] =3D IPRIO_MMAXIPRIO, + [53] =3D IPRIO_MMAXIPRIO, + [52] =3D IPRIO_MMAXIPRIO, + [51] =3D IPRIO_MMAXIPRIO, + [50] =3D IPRIO_MMAXIPRIO, + [49] =3D IPRIO_MMAXIPRIO, + [48] =3D IPRIO_MMAXIPRIO, + + /* Custom interrupts 24 to 31 */ + [31] =3D IPRIO_MMAXIPRIO, + [30] =3D IPRIO_MMAXIPRIO, + [29] =3D IPRIO_MMAXIPRIO, + [28] =3D IPRIO_MMAXIPRIO, + [27] =3D IPRIO_MMAXIPRIO, + [26] =3D IPRIO_MMAXIPRIO, + [25] =3D IPRIO_MMAXIPRIO, + [24] =3D IPRIO_MMAXIPRIO, + + [47] =3D IPRIO_DEFAULT_UPPER, + [23] =3D IPRIO_DEFAULT_UPPER + 1, + [46] =3D IPRIO_DEFAULT_UPPER + 2, + [45] =3D IPRIO_DEFAULT_UPPER + 3, + [22] =3D IPRIO_DEFAULT_UPPER + 4, + [44] =3D IPRIO_DEFAULT_UPPER + 5, + + [43] =3D IPRIO_DEFAULT_UPPER + 6, + [21] =3D IPRIO_DEFAULT_UPPER + 7, + [42] =3D IPRIO_DEFAULT_UPPER + 8, + [41] =3D IPRIO_DEFAULT_UPPER + 9, + [20] =3D IPRIO_DEFAULT_UPPER + 10, + [40] =3D IPRIO_DEFAULT_UPPER + 11, + + [11] =3D IPRIO_DEFAULT_M, + [3] =3D IPRIO_DEFAULT_M + 1, + [7] =3D IPRIO_DEFAULT_M + 2, + + [9] =3D IPRIO_DEFAULT_S, + [1] =3D IPRIO_DEFAULT_S + 1, + [5] =3D IPRIO_DEFAULT_S + 2, + + [12] =3D IPRIO_DEFAULT_SGEXT, + + [10] =3D IPRIO_DEFAULT_VS, + [2] =3D IPRIO_DEFAULT_VS + 1, + [6] =3D IPRIO_DEFAULT_VS + 2, + + [39] =3D IPRIO_DEFAULT_LOWER, + [19] =3D IPRIO_DEFAULT_LOWER + 1, + [38] =3D IPRIO_DEFAULT_LOWER + 2, + [37] =3D IPRIO_DEFAULT_LOWER + 3, + [18] =3D IPRIO_DEFAULT_LOWER + 4, + [36] =3D IPRIO_DEFAULT_LOWER + 5, + + [35] =3D IPRIO_DEFAULT_LOWER + 6, + [17] =3D IPRIO_DEFAULT_LOWER + 7, + [34] =3D IPRIO_DEFAULT_LOWER + 8, + [33] =3D IPRIO_DEFAULT_LOWER + 9, + [16] =3D IPRIO_DEFAULT_LOWER + 10, + [32] =3D IPRIO_DEFAULT_LOWER + 11, +}; + +uint8_t riscv_cpu_default_priority(int irq) +{ + if (irq < 0 || irq > 63) { + return IPRIO_MMAXIPRIO; + } + + return default_iprio[irq] ? default_iprio[irq] : IPRIO_MMAXIPRIO; +}; + +int riscv_cpu_pending_to_irq(CPURISCVState *env, + int extirq, unsigned int extirq_def_prio, + uint64_t pending, uint8_t *iprio) +{ + int irq, best_irq =3D RISCV_EXCP_NONE; + unsigned int prio, best_prio =3D UINT_MAX; + + if (!pending) { + return RISCV_EXCP_NONE; + } + + irq =3D ctz64(pending); + if (!((extirq =3D=3D IRQ_M_EXT) ? riscv_cpu_cfg(env)->ext_smaia : + riscv_cpu_cfg(env)->ext_ssaia)) { + return irq; + } + + pending =3D pending >> irq; + while (pending) { + prio =3D iprio[irq]; + if (!prio) { + if (irq =3D=3D extirq) { + prio =3D extirq_def_prio; + } else { + prio =3D (riscv_cpu_default_priority(irq) < extirq_def_pri= o) ? + 1 : IPRIO_MMAXIPRIO; + } + } + if ((pending & 0x1) && (prio <=3D best_prio)) { + best_irq =3D irq; + best_prio =3D prio; + } + irq++; + pending =3D pending >> 1; + } + + return best_irq; +} + +/* + * Doesn't report interrupts inserted using mvip from M-mode firmware or + * using hvip bits 13:63 from HS-mode. Those are returned in + * riscv_cpu_sirq_pending() and riscv_cpu_vsirq_pending(). + */ +uint64_t riscv_cpu_all_pending(CPURISCVState *env) +{ + uint32_t gein =3D get_field(env->hstatus, HSTATUS_VGEIN); + uint64_t vsgein =3D (env->hgeip & (1ULL << gein)) ? MIP_VSEIP : 0; + uint64_t vstip =3D (env->vstime_irq) ? MIP_VSTIP : 0; + + return (env->mip | vsgein | vstip) & env->mie; +} + +int riscv_cpu_mirq_pending(CPURISCVState *env) +{ + uint64_t irqs =3D riscv_cpu_all_pending(env) & ~env->mideleg & + ~(MIP_SGEIP | MIP_VSSIP | MIP_VSTIP | MIP_VSEIP); + + return riscv_cpu_pending_to_irq(env, IRQ_M_EXT, IPRIO_DEFAULT_M, + irqs, env->miprio); +} + +int riscv_cpu_sirq_pending(CPURISCVState *env) +{ + uint64_t irqs =3D riscv_cpu_all_pending(env) & env->mideleg & ~env->hi= deleg; + uint64_t irqs_f =3D env->mvip & env->mvien & ~env->mideleg & env->sie; + + return riscv_cpu_pending_to_irq(env, IRQ_S_EXT, IPRIO_DEFAULT_S, + irqs | irqs_f, env->siprio); +} + +int riscv_cpu_vsirq_pending(CPURISCVState *env) +{ + uint64_t irqs =3D riscv_cpu_all_pending(env) & env->mideleg & env->hid= eleg; + uint64_t irqs_f_vs =3D env->hvip & env->hvien & ~env->hideleg & env->v= sie; + uint64_t vsbits; + + /* Bring VS-level bits to correct position */ + vsbits =3D irqs & VS_MODE_INTERRUPTS; + irqs &=3D ~VS_MODE_INTERRUPTS; + irqs |=3D vsbits >> 1; + + return riscv_cpu_pending_to_irq(env, IRQ_S_EXT, IPRIO_DEFAULT_S, + (irqs | irqs_f_vs), env->hviprio); +} + bool riscv_cpu_has_work(CPUState *cs) { RISCVCPU *cpu =3D RISCV_CPU(cs); diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 82430ecec6..396d9253e6 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -640,6 +640,11 @@ uint64_t riscv_cpu_all_pending(CPURISCVState *env); int riscv_cpu_mirq_pending(CPURISCVState *env); int riscv_cpu_sirq_pending(CPURISCVState *env); int riscv_cpu_vsirq_pending(CPURISCVState *env); +int riscv_cpu_pending_to_irq(CPURISCVState *env, + int extirq, unsigned int extirq_def_prio, + uint64_t pending, uint8_t *iprio); + + bool riscv_cpu_fp_enabled(CPURISCVState *env); uint8_t riscv_cpu_get_geilen(CPURISCVState *env); void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen); diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index 8c347aa1c0..b38f639dae 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -330,193 +330,6 @@ int riscv_cpu_hviprio_index2irq(int index, int *out_i= rq, int *out_rdzero) return 0; } =20 -/* - * Default priorities of local interrupts are defined in the - * RISC-V Advanced Interrupt Architecture specification. - * - * ---------------------------------------------------------------- - * Default | - * Priority | Major Interrupt Numbers - * ---------------------------------------------------------------- - * Highest | 47, 23, 46, 45, 22, 44, - * | 43, 21, 42, 41, 20, 40 - * | - * | 11 (0b), 3 (03), 7 (07) - * | 9 (09), 1 (01), 5 (05) - * | 12 (0c) - * | 10 (0a), 2 (02), 6 (06) - * | - * | 39, 19, 38, 37, 18, 36, - * Lowest | 35, 17, 34, 33, 16, 32 - * ---------------------------------------------------------------- - */ -static const uint8_t default_iprio[64] =3D { - /* Custom interrupts 48 to 63 */ - [63] =3D IPRIO_MMAXIPRIO, - [62] =3D IPRIO_MMAXIPRIO, - [61] =3D IPRIO_MMAXIPRIO, - [60] =3D IPRIO_MMAXIPRIO, - [59] =3D IPRIO_MMAXIPRIO, - [58] =3D IPRIO_MMAXIPRIO, - [57] =3D IPRIO_MMAXIPRIO, - [56] =3D IPRIO_MMAXIPRIO, - [55] =3D IPRIO_MMAXIPRIO, - [54] =3D IPRIO_MMAXIPRIO, - [53] =3D IPRIO_MMAXIPRIO, - [52] =3D IPRIO_MMAXIPRIO, - [51] =3D IPRIO_MMAXIPRIO, - [50] =3D IPRIO_MMAXIPRIO, - [49] =3D IPRIO_MMAXIPRIO, - [48] =3D IPRIO_MMAXIPRIO, - - /* Custom interrupts 24 to 31 */ - [31] =3D IPRIO_MMAXIPRIO, - [30] =3D IPRIO_MMAXIPRIO, - [29] =3D IPRIO_MMAXIPRIO, - [28] =3D IPRIO_MMAXIPRIO, - [27] =3D IPRIO_MMAXIPRIO, - [26] =3D IPRIO_MMAXIPRIO, - [25] =3D IPRIO_MMAXIPRIO, - [24] =3D IPRIO_MMAXIPRIO, - - [47] =3D IPRIO_DEFAULT_UPPER, - [23] =3D IPRIO_DEFAULT_UPPER + 1, - [46] =3D IPRIO_DEFAULT_UPPER + 2, - [45] =3D IPRIO_DEFAULT_UPPER + 3, - [22] =3D IPRIO_DEFAULT_UPPER + 4, - [44] =3D IPRIO_DEFAULT_UPPER + 5, - - [43] =3D IPRIO_DEFAULT_UPPER + 6, - [21] =3D IPRIO_DEFAULT_UPPER + 7, - [42] =3D IPRIO_DEFAULT_UPPER + 8, - [41] =3D IPRIO_DEFAULT_UPPER + 9, - [20] =3D IPRIO_DEFAULT_UPPER + 10, - [40] =3D IPRIO_DEFAULT_UPPER + 11, - - [11] =3D IPRIO_DEFAULT_M, - [3] =3D IPRIO_DEFAULT_M + 1, - [7] =3D IPRIO_DEFAULT_M + 2, - - [9] =3D IPRIO_DEFAULT_S, - [1] =3D IPRIO_DEFAULT_S + 1, - [5] =3D IPRIO_DEFAULT_S + 2, - - [12] =3D IPRIO_DEFAULT_SGEXT, - - [10] =3D IPRIO_DEFAULT_VS, - [2] =3D IPRIO_DEFAULT_VS + 1, - [6] =3D IPRIO_DEFAULT_VS + 2, - - [39] =3D IPRIO_DEFAULT_LOWER, - [19] =3D IPRIO_DEFAULT_LOWER + 1, - [38] =3D IPRIO_DEFAULT_LOWER + 2, - [37] =3D IPRIO_DEFAULT_LOWER + 3, - [18] =3D IPRIO_DEFAULT_LOWER + 4, - [36] =3D IPRIO_DEFAULT_LOWER + 5, - - [35] =3D IPRIO_DEFAULT_LOWER + 6, - [17] =3D IPRIO_DEFAULT_LOWER + 7, - [34] =3D IPRIO_DEFAULT_LOWER + 8, - [33] =3D IPRIO_DEFAULT_LOWER + 9, - [16] =3D IPRIO_DEFAULT_LOWER + 10, - [32] =3D IPRIO_DEFAULT_LOWER + 11, -}; - -uint8_t riscv_cpu_default_priority(int irq) -{ - if (irq < 0 || irq > 63) { - return IPRIO_MMAXIPRIO; - } - - return default_iprio[irq] ? default_iprio[irq] : IPRIO_MMAXIPRIO; -}; - -static int riscv_cpu_pending_to_irq(CPURISCVState *env, - int extirq, unsigned int extirq_def_pr= io, - uint64_t pending, uint8_t *iprio) -{ - int irq, best_irq =3D RISCV_EXCP_NONE; - unsigned int prio, best_prio =3D UINT_MAX; - - if (!pending) { - return RISCV_EXCP_NONE; - } - - irq =3D ctz64(pending); - if (!((extirq =3D=3D IRQ_M_EXT) ? riscv_cpu_cfg(env)->ext_smaia : - riscv_cpu_cfg(env)->ext_ssaia)) { - return irq; - } - - pending =3D pending >> irq; - while (pending) { - prio =3D iprio[irq]; - if (!prio) { - if (irq =3D=3D extirq) { - prio =3D extirq_def_prio; - } else { - prio =3D (riscv_cpu_default_priority(irq) < extirq_def_pri= o) ? - 1 : IPRIO_MMAXIPRIO; - } - } - if ((pending & 0x1) && (prio <=3D best_prio)) { - best_irq =3D irq; - best_prio =3D prio; - } - irq++; - pending =3D pending >> 1; - } - - return best_irq; -} - -/* - * Doesn't report interrupts inserted using mvip from M-mode firmware or - * using hvip bits 13:63 from HS-mode. Those are returned in - * riscv_cpu_sirq_pending() and riscv_cpu_vsirq_pending(). - */ -uint64_t riscv_cpu_all_pending(CPURISCVState *env) -{ - uint32_t gein =3D get_field(env->hstatus, HSTATUS_VGEIN); - uint64_t vsgein =3D (env->hgeip & (1ULL << gein)) ? MIP_VSEIP : 0; - uint64_t vstip =3D (env->vstime_irq) ? MIP_VSTIP : 0; - - return (env->mip | vsgein | vstip) & env->mie; -} - -int riscv_cpu_mirq_pending(CPURISCVState *env) -{ - uint64_t irqs =3D riscv_cpu_all_pending(env) & ~env->mideleg & - ~(MIP_SGEIP | MIP_VSSIP | MIP_VSTIP | MIP_VSEIP); - - return riscv_cpu_pending_to_irq(env, IRQ_M_EXT, IPRIO_DEFAULT_M, - irqs, env->miprio); -} - -int riscv_cpu_sirq_pending(CPURISCVState *env) -{ - uint64_t irqs =3D riscv_cpu_all_pending(env) & env->mideleg & ~env->hi= deleg; - uint64_t irqs_f =3D env->mvip & env->mvien & ~env->mideleg & env->sie; - - return riscv_cpu_pending_to_irq(env, IRQ_S_EXT, IPRIO_DEFAULT_S, - irqs | irqs_f, env->siprio); -} - -int riscv_cpu_vsirq_pending(CPURISCVState *env) -{ - uint64_t irqs =3D riscv_cpu_all_pending(env) & env->mideleg & env->hid= eleg; - uint64_t irqs_f_vs =3D env->hvip & env->hvien & ~env->hideleg & env->v= sie; - uint64_t vsbits; - - /* Bring VS-level bits to correct position */ - vsbits =3D irqs & VS_MODE_INTERRUPTS; - irqs &=3D ~VS_MODE_INTERRUPTS; - irqs |=3D vsbits >> 1; - - return riscv_cpu_pending_to_irq(env, IRQ_S_EXT, IPRIO_DEFAULT_S, - (irqs | irqs_f_vs), env->hviprio); -} - static int riscv_cpu_local_irq_pending(CPURISCVState *env) { uint64_t irqs, pending, mie, hsie, vsie, irqs_f, irqs_f_vs; --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259817; cv=none; d=zohomail.com; s=zohoarc; b=FjLErAaaZHDWQkqGSbrRFMAPp5D/GJmqmcLJ4V6Yv4a2+Wp8VfMKzIsj0VcUZgcXCJK4QjK/CG6lMuYS5SGa9lu2E4/+Jz0tP8XsaTEaN2AuE15xxYTudyjHvm6A7rOUwEosXYPMWHpkDwuTu3W3QH8fTjdgotk8SWldtYCZWdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259817; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=trZN2ypWOA+WyJb3G4pISP3mPY2cH6T3didQHTIz/bA=; b=NIOKxJiKq3P0zhy9/GaZJBDUdjFIjQg1GhGi/Ff7BMmBru2MpEGBy9omZdiDDswJTGKKwQsCyanzC4K+fRTjvTaqajRov0EhnTmwfnhh0uAX6GLI9FlLJ8HeXUYPZ51bRq0jVxeK1QzdrrwpUkLGNBWdTcSB2yEHnCCl7bZrsdE= 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 178225981767345.70347527628962; Tue, 23 Jun 2026 17:10:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9i-0007u0-A1; Tue, 23 Jun 2026 20:07:50 -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 1wcB9X-0007bN-3O for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:45 -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 1wcB9T-0003IZ-9l for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:37 -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 65NK0wjF1177695 for ; Wed, 24 Jun 2026 00:07:24 GMT Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyqe6bda0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:24 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8e0df2461fdso15070826d6.0 for ; Tue, 23 Jun 2026 17:07:24 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= trZN2ypWOA+WyJb3G4pISP3mPY2cH6T3didQHTIz/bA=; b=cr5RnGF0HNKo0RMa dw8AFlsyQu73Suuo4GIbJQOJ8N3HifzEren0TMtX38cCMLRfZBrlCXXVmxvIW4rJ 1EndXU1Hq9mwBkT3NmSb4XvRuZ3GIPP9l5WVxNQ5H9hK7derqg9m7DRZnfP2xSXQ yJ62ivWoLpFD5n1nA7nfpX8ioEwDczbNmtt3JEaAl+Kc22AOzJ3fSNscjU/7kc41 U/r/KiN7zKQNtkbJNMUBCTKHjzvDYhjQ94vsP70TLYERHbDiD1LM3CiKG8ErXPbg Fp5h+bd0lZdV4rb+CkNb9Now7KQZclPTQisJ35LCfgfltbYso0AsPoNmnZw1i0Z9 kV/obw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259644; x=1782864444; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=trZN2ypWOA+WyJb3G4pISP3mPY2cH6T3didQHTIz/bA=; b=MwmbZjmi/KJP87UFpNZw/2UL6Q9Er0JeCcOfCHnscSdkn+4z7Z+m6NSjyvCKfUUGO3 jBEGGKOo5sLii4+uislMxGZOGcUZJrTadrCw7Le6CNVabCdiFiO82bpIOZ2Kj1jN2Jx1 ndhfpMkSW2ozJd+nCjhi7ibbsyvOMShZw4oCmjLgNHM1LsTxFwue6s9m6oJTCN1/a9Nj +TALX8BusJ3/R4r9PZd/yMY17NCxVNyvVBGo0cPxd7XWi1tBGbxzeq6KlgV5NQATS5i5 IgbA4Ct94ETXN3CXSlMJwczP3T2907jEDe9z/VBkw3tLaTeUaC4oMPNRJmNBr54P/5ag x6rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259644; x=1782864444; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=trZN2ypWOA+WyJb3G4pISP3mPY2cH6T3didQHTIz/bA=; b=QNAVg77wqfoippYIAgti2qMO+U/RvPGXJxf8g3OxcWbqO1KXYO4h5QVTRqnGZGjybO xBl3rAa1OWa1Tyfapl6nzv6sE/9rD62r/+idP5C7/xITFEqdYJj18khiKlTymQDYd6G2 rToeQb08fLoELnvipSPDQZe50wRtE7fS/h7khTRySW4QaNZGHCyMd2gFOvRblayYjT/M vs0CunJ3DWm/bdmbEp3upx0+2OoQVjWiKT/YpI9ro5zHfOPyAjec1OYSqDlu6dzpfz6l B4AOfltKn79YfM9kyw3nnFGG8kPHmUh/aq2ALWq9RRQPCathTSRzY7TcntwPSdtayioS uSdg== X-Gm-Message-State: AOJu0YwQRyEpvY941Ke6pDQX+Hrgn57MB7dMtLc0ZU34sbIjdyIQKZBH PpFS+jmxv8CCpDnJXWjhVsZ4tiDJotiRXWZC6UkeQkBq2nhHyxjg2YaEalFOi/MbpDLaKO50w+c QIaX/oBd7iN1S6/5H7Sl7i6a2onyB8dmrdAh02YQHER0gj0k5b/54DJLiLex7utKZew== X-Gm-Gg: AfdE7cliUWoVKMzu18eAUzMWeDceyAydSlp2lPZsX/ZdGjICno3giWkiGJHlF8j1CEQ qXuQLGl2NQHn/w5x0SSvYMpwdRKf3UF2iL0OZGa/tb9t+N86W6btTE/zjnH7Yt/bpSQhyFUP+jc eq31XKNmH90WWEiXDDc+8V3EmSeNYM+sfXYKMBcK9ZLV9um5DyzdRxj5psbUEPWrDZbpvoUcxnu NKfO00UPADICiYvG4eVnqeAzPaxx0a0OhLGLlevVzwDJ/38X8pOV8kcNb4Aii0DhVABgSY641jq qUR80HxOH0xrysXh8PkgXoxZjwAlzzdLV6wBPTo+oAhkx7OfuarHeX73KF8PXL0iGoqHgRN51FB vM9LU+ZreY0R5x6Akw4n1zZJbQT1F+XYloQrQPfqiC5hWRw== X-Received: by 2002:a05:6214:55c8:b0:8c9:c38a:20e1 with SMTP id 6a1803df08f44-8e52df964b4mr21214426d6.10.1782259643561; Tue, 23 Jun 2026 17:07:23 -0700 (PDT) X-Received: by 2002:a05:6214:55c8:b0:8c9:c38a:20e1 with SMTP id 6a1803df08f44-8e52df964b4mr21213776d6.10.1782259642964; Tue, 23 Jun 2026 17:07:22 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 14/24] target/riscv: move riscv_cpu_claim_interrupts to cpu.c Date: Tue, 23 Jun 2026 21:06:21 -0300 Message-ID: <20260624000632.2149359-15-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: rsioIlyEQmcwFycsA-y5xYkN_qGrN4qD X-Proofpoint-ORIG-GUID: rsioIlyEQmcwFycsA-y5xYkN_qGrN4qD X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX7F5KctzKmU3Y 1eQl2E+aYT9SxqQNMiUmdMB1x9hibtT3ziK41R86k4YldxMfYw9oAhb/1JRgVSD3tkzIbP/kOVx ckE9iD3F2Q3lswNhSf8oGw4yTASY6Qw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX1NJ1Xjhlanun fqC/+wEU+FPpn/EsscBoErazVYZCodnBvdKA8XnTBi7fwny92L9ahtYTFjgGt5boMwicpgn/UUv b/6LILFwoAT3UynExdbkeqD18TBWWiBHwZf2eN+UpjuN+vCpzgJye29Q0RzP5I3jAanNXxl24x6 Kf9T5+yHXAb+jH8WUb6J7WQtJszZ4+cDYMCpT3Sdu7Z8NEGvQV6lk9Vof5p31cQHABpFzWiD68T ZvpLWo5VaWf7A2in3EJe70EB6HbxSWwjUsvjVuVGnLgqPKQIIO81mRBVeOzaALDYH3viAR34q11 vtBbMSiu0gkF7+GPPtOoOgvGvD1tAnJj9Dfrw58aGcQigfovuPCWdRgyKiu2tsJT0Qc8Q2bux+h 8HYz75qZuGERLAzh/K2w8otjL/7rg6dTTX60iwyCE8R5i1dSyhDLv9CQPADM2Dg7y5LhkeK2toN Y/Q4ROSl6NGTxqEPsQA== X-Authority-Analysis: v=2.4 cv=OeKoyBTY c=1 sm=1 tr=0 ts=6a3b1fbc cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=P7v9EdgfUgEVytVI3b0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259818259158500 The function is used by hw/intc/ files that KVM cares about like riscv_aplic.c. Move it to cpu.c to be accessible for --disable-tcg builds. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 14 ++++++++++++++ target/riscv/tcg/cpu_helper.c | 11 ----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 483ac2e0d0..4fc0ee2823 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -566,6 +566,20 @@ target_ulong riscv_new_csr_seed(target_ulong new_value, return rval; } =20 +#ifndef CONFIG_USER_ONLY +/* Used by lots of folks in hw/intc */ +int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint64_t interrupts) +{ + CPURISCVState *env =3D &cpu->env; + if (env->miclaim & interrupts) { + return -1; + } else { + env->miclaim |=3D interrupts; + return 0; + } +} +#endif + static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index b38f639dae..9237d2129b 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -572,17 +572,6 @@ void riscv_cpu_set_rnmi(RISCVCPU *cpu, uint32_t irq, b= ool level) } } =20 -int riscv_cpu_claim_interrupts(RISCVCPU *cpu, uint64_t interrupts) -{ - CPURISCVState *env =3D &cpu->env; - if (env->miclaim & interrupts) { - return -1; - } else { - env->miclaim |=3D interrupts; - return 0; - } -} - void riscv_cpu_interrupt(CPURISCVState *env) { uint64_t gein, vsgein =3D 0, vstip =3D 0, irqf =3D 0; --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259795; cv=none; d=zohomail.com; s=zohoarc; b=Kzse5JTFVieUelRZ1xF7ixqYDo3xs0bpAEAMrr7i3luOhyWQN51EXTf81VMrx6wSAfRRl/1kJVVDDFWotLF9MgP/KQM5LuwwbY7lE2HMxnoPamOkUSB5abh+n7TlDM9jSH5X/HlgyPUEwzg0ATUj8tDDmBU/JdCZcsypuNhlnG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259795; 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=FAFAbbkieraqKgzFY/50UsOxfNtGrL/uy6qUk6k1aiI=; b=nTKOddSnIYBvCwQtURV9+PmxBEvRyeJqojAMNWVK+bCSHlg2v41phPT20EH5h0gIeOaiKkELfh0PKirFtO/FLRa3OC4glvzgRtx6fIHbOJorE7IgUPko+kn59TgKNGvdPbmL1fZCRl6FgCXI5agPtAPAj7WjLH5L2UIvnO1vwos= 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 1782259795792738.3100210513733; Tue, 23 Jun 2026 17:09:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9i-0007uT-Bp; Tue, 23 Jun 2026 20:07:50 -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 1wcB9Z-0007c7-Lw for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:45 -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 1wcB9V-0003Ix-QZ for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:40 -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 65NK0fLK1000032 for ; Wed, 24 Jun 2026 00:07:27 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 4eyr9yu4e0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:26 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9227d9b3b5cso102540685a.1 for ; Tue, 23 Jun 2026 17:07:26 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:25 -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=FAFAbbkiera qKgzFY/50UsOxfNtGrL/uy6qUk6k1aiI=; b=bralpz5+EPy5owInHZooIiIRFYu xQScG4Ejk2+SSM0cvR6rYfnHaXgaudy0THQAfUUg4mopGir4p70zjXITwxS3XY7t cehHhOPF7hN7t2rhbJoZStHSfFHxkKfpCuDwyXtKseHosTT8D2LAxN/DgzkSukUN 9HyAo0Nf3ue0joR2MqBW9tJg0c+ph6XSraGv+Y53kDWjoOTLPM3p/tyPEAJxBWM3 7+GpsLVEKqj3kYM+lB7QaxoN9TQHuxAPzraCVBXVfiEA1FJaNBh9dkof3qXsMGIu RCAg3TsZomGsNfLYcFoNfNEd9DQ1eNt/2Fv0OabdKSB5XM90RkjeFOz4xQw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259646; x=1782864446; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FAFAbbkieraqKgzFY/50UsOxfNtGrL/uy6qUk6k1aiI=; b=cH+/+u9FXhzxO035kP4yqdSWk9DXxE9C+QJ6NsxFpeoBV3zB6WNNSPTBitJCpxMSTe ZLNpt9A1oy58bBIjVpZEBCk+EurycyGF3QPNiAXzJ2ufrARS8qeowT8WMI35bubrTrTI XCXG6cQ9xcboH0xIdEqgSLGJrYskIO6AZeccH12Ej7OmDBcLdNqAM2RkTVfq22Q0JgJ+ yR9HYYW+Q/pTC4vfWTqEPqEc3P6V+07Dh/E1TwmNBZGhDm1Pl0H/x3dzfFnfN7kPmCQx FHKPqx/cY4+dIjfeVxlB6KG+l8NAKUjD6IMW3LwGzxPk2Nl7qLUEVzQKE4g65VZhIwQ1 doIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259646; x=1782864446; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FAFAbbkieraqKgzFY/50UsOxfNtGrL/uy6qUk6k1aiI=; b=V5JXic0Wc2qPIe92pPtlbacoZimUrgCZ5rheECgTdWMWGLHRtaxIGnEO3vzRFoNpip JnS2+Xoibd0/X5YXRuRaVXPvcGGifEfVU7BNf59mQLp2niIunNQ5i/znJBfI7rFbuN2Y BhYpFIWveNRm93366YYLmC5CJUwfRig+Ft/PTKhBov6OixLC1zJ9lB7PoaME+prVS4xD CD1cyO82sqC9OG1s0ujtWkg5E/HqIgjHGz1ox7lHtHga4EeSVq5fMISGqOitiT24SbQk HUnrVR5oD6Ul3BrPgNMh5OM1e8E8+W2khtGx+8C+VrlouC2+JeIZ8NXUreuo3n6KhckE zVcg== X-Gm-Message-State: AOJu0YxklgNCmGmvRlXgalH0/oiVBHllckFl90Im7eIj44+hY9O1JsiB 1WWVB0NgDbZBcy6opf+TE09niC/4zEE6MpbBOP3bOpoUaNxo5CWG3tEIs/o5vwWsepx93IT8Jmr Uu1DemXzRnDVfvEofChVad+WeLJ5HmU88amOQIvLlsdMR2zz3MAx9hJUN8B1xk+CG5g== X-Gm-Gg: AfdE7cmOdWm5ysqXIGghLMxxg+8387w9sb9wNxZHApK4T5OOPyZ0PWnd4m3C2cCYa/O WCG2XQ6I+/UPFXofXFV2x4J7JCJwf7s/+g3yxbSNVwNnudQVJzsXOBlXnpmgWsYNrhhgFieHwZZ M4KdCh6R1L8n6J1dLXtPN/6/7Odg8XbgfiKfJu9+DyT00Jp2Hcv73gmvcxDHOkFjvPLzrQe34j4 DTUjAoGKUT2LFOrUjBYVRZxJ/mb0vOS5D5JtzOP3Hban/FvMMMaH2o3O+NZeIPT7DyOaGsO3BeR TOQRl3LMraWHLuyxaqCseuvhQMFRnbTiVrZM75xysOXBuT1HV3DOjf28gCaIXurWzIv/e1jY6bQ BDx3LO4vDczjox/PFtcfYuJv1OQC+HdAHbNmHvopmtWnJsA== X-Received: by 2002:a05:620a:2705:b0:915:cda5:27fb with SMTP id af79cd13be357-9277f8c955fmr227698285a.54.1782259646173; Tue, 23 Jun 2026 17:07:26 -0700 (PDT) X-Received: by 2002:a05:620a:2705:b0:915:cda5:27fb with SMTP id af79cd13be357-9277f8c955fmr227693685a.54.1782259645735; Tue, 23 Jun 2026 17:07:25 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 15/24] target/riscv/cpu.c: handle TCG bits of riscv_cpu_dump_state Date: Tue, 23 Jun 2026 21:06:22 -0300 Message-ID: <20260624000632.2149359-16-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=JYSMa0KV c=1 sm=1 tr=0 ts=6a3b1fbe cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=n_Gjmr79VRyvsDPUZ2MA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-GUID: Y_nLPKTCyqd80aHi-9hA38rzQ56pgmMP X-Proofpoint-ORIG-GUID: Y_nLPKTCyqd80aHi-9hA38rzQ56pgmMP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX7YOnAi1X/nyc cegqw4SRu5fIHKQBqJqfNxtyheU+fsRXSHCmezEcbCic20Y+oAZvnrQ0rSbXzD0dVqVuzhmVVry HHrQA+f4Paglu0SxE9Nfah/MUXdrUPciFC0v238Nz/NOTj9joT60A0gy35Ox/PD4C+VkJPbE8le NY6tToNzNFzam6Ke/k9RYw3HIniuE962N4ax+utQYsdqUFc71XoJiiCK85CeAqPhSs0PG31fD95 QJeEKK28a/Jb6w6istJBXhhiGWVCnFkouRSDdfhcdBTmIqbwhv31fSZtzRzreaA4pXAHbdwC3nm rUbd0r/8N4rEU+zWNytieyOgcGa8VG90OdwOgyXIZwfp72VvED0OsKKYomBoNAxXYE0GKCM5rV5 LNh5GTscH59vhvdq25VtBVTUwggtd8ld0/c26HqxN3HQsh1qwBO950SJ3RR9VAln19j20Wfknzr VOIyo5KTLKKQii0z1wA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzPBsgOeGZfm7 FqwLaJ17fJkh1AJqHMpSRRLXihywSBcmoarLVmtwNXba8JiO0TwT4bh42SR9A4iY5sb+M8zo4El NZK6ozj+hBmVEZNsbNjUBd3IpEC0c2Q= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 impostorscore=0 malwarescore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259796144158500 Content-Type: text/plain; charset="utf-8" riscv_dump_csr() is a TCG only function but we'll have to implement it at some capacity for KVM eventually, therefore put it under a CONFIG_TCG ifdef while making a note that this function is unimplemented in KVM. The csr_ops array is also TCG specific, thus the for loop inside dump_state that iterates it is also TCG only business. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 4fc0ee2823..7bd5bc0fc1 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -605,8 +605,10 @@ char *riscv_cpu_get_name(RISCVCPU *cpu) return cpu_model_from_type(typename); } =20 +/* Note: this function needs a KVM implementation. */ static void riscv_dump_csr(CPURISCVState *env, int csrno, FILE *f) { +#ifdef CONFIG_TCG target_ulong val =3D 0; RISCVException res =3D riscv_csrrw_debug(env, csrno, &val, 0, 0); =20 @@ -618,6 +620,7 @@ static void riscv_dump_csr(CPURISCVState *env, int csrn= o, FILE *f) qemu_fprintf(f, " %-13s " TARGET_FMT_lx "\n", csr_ops[csrno].name, val); } +#endif } =20 #if !defined(CONFIG_USER_ONLY) @@ -655,7 +658,7 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f,= int flags) } #endif qemu_fprintf(f, " %-13s %" PRIx64 "\n", "pc", env->pc); -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) for (i =3D 0; i < ARRAY_SIZE(csr_ops); i++) { int csrno =3D i; =20 --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259865; cv=none; d=zohomail.com; s=zohoarc; b=d8nlRAQka6e09V/OeZu2WlUvuXNO8inh2ls7BdaPbbBtxFelQfdL3XlZajE9nyNzS1b0AWsU5ci2nS2JmAF4hZ39Z9vyrI5HWWSkYPrFHPy8lKZm8BqcVUI17u7yvooz4v5hepkVHWsmtMQ8p4NOGc48A2Ionp92o3gt6Ko41CA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259865; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TCwdhiMRj9ZQNqm4F7nb8HIrgeLaw/oBfD3H8vDFPjs=; b=VW3egib0bEWAqu2ZlMNap5H87/RkhdGnut21HFOe7assairK1WgiZTYQ0X6EsTp7xTrisT5d5KE696mTtof30DINJ+FHEGSgmPdskWhcJC3PRbD6JfSENiE0XlxVh6kBQaKtffPyrwXhE2sdAGUY5HqbivhxUf+m/RqGOuhR93c= 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 1782259865878791.0753925061495; Tue, 23 Jun 2026 17:11:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9j-0007w2-Mh; Tue, 23 Jun 2026 20:07: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 1wcB9S-0007Xz-F5 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:36 -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 1wcB9Q-0003Ja-IF for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:34 -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 65NJwr57613932 for ; Wed, 24 Jun 2026 00:07:31 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 4eyppykjfm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:30 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8dc0a6ab3bbso14301736d6.1 for ; Tue, 23 Jun 2026 17:07:29 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= TCwdhiMRj9ZQNqm4F7nb8HIrgeLaw/oBfD3H8vDFPjs=; b=cSZDs6u0FEWIDfJj oPPY8ON8O+wpfeNzMkL9JiP7Ya5mX+LozOJJTJ2hK2FTUV7FPz4o87rrzQRBv2ZU TI2jaehElzD6bLZQ1zx/4GYRmVUt+sRJ93wTiarGc5yX6Jqbqs7WQT1V+Vjw5/9/ LUomJzfEjxEUgTQqee9vxRt9D3ZDypXnBkzBGOLSMu7XGP6/yDEjvjkBykymPDb1 IaxhLEHCDJWEYphQ+DpdodQ16dvYOuutWpSXe1eJcJw9CZubvGRrA7tcfXGKc+Gc rWAfsIkaCSaYk3mmwamHmCZhlKK3d8uukjJpOwSP4hhiGDtFoa3cfAyb8TJhXhbg WUf1AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259649; x=1782864449; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TCwdhiMRj9ZQNqm4F7nb8HIrgeLaw/oBfD3H8vDFPjs=; b=hScTkjTYbahNPrVJmD+slQ33ddcbZGRZmQ8MOS4bErnvy8jLjfrRGyFNBQLAIIuXQO s01JMIvBzCGWuDJnNJWDEKfTlJN9+HXLjJbLviX4BManm8c/qJTkbf8zs/hkaXP4MDSm mR891QKNJKQ6U0mPrPnafF65NBuEgIWFwu/wqniorPjGySmGVM+fbGnoSus2bdCS4+m4 ZnnsfuSk+FqJfayIRy4PBNlXFK/RntB9OEX/MkN99PDejkhYCe3AVPK+rh3knm+CPtd4 lzJQcFw6nmVPpah5vntsBnYU6zMH1M/yJQpx0u+Ix7cIfDjsDCENY9KTtj5tBFFJx2lU v8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259649; x=1782864449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TCwdhiMRj9ZQNqm4F7nb8HIrgeLaw/oBfD3H8vDFPjs=; b=OrrR9AbxHi3OkYMtjMx+fyy5U7PpJzt1W9hmU1WhaX/TTYNZ0somPg6uoIojElsgXQ R8LxpZqomCAkSY5l7r5zUtArkCc29zl63EPUbCDMGFcMhdRp1tuwrbCtakICQNmI+yWy pSJYgu3Paywrugf6PxLhF3qgzMKzHyBiz/Qaqo0xLYl3ORivEmMuJGoyIeJvyMk/X5nl J6kPzFcSgCxcS/SAtAgzquE+qM7l21LpieJRRp7DHQ4GQy4+Lu+KTIU76FYxW5sVQwxx XDVrJ4fLSrRqKuf6AtuVsg2TsDWICUq72luifLHKEaHDkgvkkY7fXnyFGgsewaujM67b Ak5w== X-Gm-Message-State: AOJu0Yw4GMb7VlEij5xlBeZ1WDP1RzZsZd9dRLVmXzjjAELZNaHvnS5a 79raofPWyh3WDZLCADGTWldwbSw5BiX/4Tr3CS3jxugXraPw0H0KB+l6ck1PXKfszzDCVvu/wpi 0h9tQQy5xKWrgQ/os7FFXzgRg8nM4GMz+94Kg0hGEgYxv+1avqLsmqGPAtI+fhssiiw== X-Gm-Gg: AfdE7clog2zn6s0wnA9N9j1nG/e7DEq+RsZk8BYrt+9JuiS2+0e6vUPpIP1BP5v+FWp og7FZEyKs8Tpgd07lRz5dKkfU0WFR5mn/KzexztRjbPj88h+/soPD5Y0Npo2cjbsx2hMGgA2lf3 xySwUp1NdAkPiI14WBxtdUrH6h0JXHRQuUM9f49EIpLk5CzEEXaXRSPnEfrU9i4Ob0G0/r0JRGu VWvTMQyNbtBk6Wgj7GPfT5GHz3n69SNEuTYMKsDFBjdBTYCkGefH4RdwhLEXmXJ2yyFwOvVxO/1 uFTSDfvi4Ah19jQpphNzDqgIz8uDUJfwjfgRGduJxD4flSbwWVvGYWxZx56MEjEZnslYhFy6pKY HjB/IqPF3PfI9A0EXbQOVocEmQQjBHX3SCJJCID4A49jvnw== X-Received: by 2002:a05:6214:3286:b0:8df:9ea9:72e6 with SMTP id 6a1803df08f44-8e52d7d6229mr25857656d6.5.1782259648991; Tue, 23 Jun 2026 17:07:28 -0700 (PDT) X-Received: by 2002:a05:6214:3286:b0:8df:9ea9:72e6 with SMTP id 6a1803df08f44-8e52d7d6229mr25856966d6.5.1782259648384; Tue, 23 Jun 2026 17:07:28 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 16/24] target/riscv: gate riscv_cpu_update_mip with tcg_enabled() Date: Tue, 23 Jun 2026 21:06:23 -0300 Message-ID: <20260624000632.2149359-17-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXyEObXIsrBO2f pT2CUWrKexu4OHFbZbhOFIi4oU/XdKwY+sD646dntpSYJbf7RxWNcbytEZVDQDz0vKGvIWoWfRH fTbKwKMbhk7mWAUAOKK4EzottYSP4j58w6FNk4AQmm/QmCdESsguw7Urn3LyBHGrNLIy/+X2VGs 4xii9pm3rMgibISXVRjJE00v7+2tnBWIvpFThE0nXjVjs9J7sPebSv+QIXp9aK8zso4wJsSpmNB gH4juC+j6JlGPKJSkFygm9pZ48r4OneurTiAxpUt4vlcpJh0ZRcKXL4E+ZBsAJhXFDLMNKOwd9a ph3lKL/gPLDFAWtbMJa2k4s/GQVuioBWorzUeQTxwELamMq1lXFX017DdiGlqRTIkCLK55U3iO6 w67DVem9KhTxbWJlR5JF+ps/NTH2LQ== X-Proofpoint-GUID: ncMSgYGFtvL3JX4ggFn1_KqjA3dZHWck X-Authority-Analysis: v=2.4 cv=dvfrzVg4 c=1 sm=1 tr=0 ts=6a3b1fc2 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=pBdMQyqLZ6fKue3OrpUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX7sCFDENwgpnZ Q5QGtparerlla/KAkXhhKtFlNBRrj39owKeoy30Ls0XQD3AcAqlURmDeB9EOAWH+vNYRPoywBFg xmuP22iRISXDbViy9bssPFhq35qhiMU= X-Proofpoint-ORIG-GUID: ncMSgYGFtvL3JX4ggFn1_KqjA3dZHWck X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 adultscore=0 spamscore=0 suspectscore=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-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259866576158500 riscv_cpu_update_mip() is a TCG only call. Its KVM equivalent is kvm_riscv_set_irq(). cpu.c gates the KVM only function with a kvm_enabled() check, making it unavailable for TCG only builds. We need to do the same for riscv_cpu_update_mip() otherwise a KVM only build will fail because it doesn't know what this function is. Use tcg_enabled() for the couple of riscv_cpu_update_mip() calls we have unguarded in cpu.c. We have way more calls to deal with in time_helper.c which isn't using kvm_riscv_set_irq() at all, so create a riscv_accel_set_irq() local helper that will choose whether to use the KVM or TCG API. The reason we're going through all this hassle in time_helper.c is because hw/int/riscv_aclint.c uses it, and if we don't do something about we won't have riscv_aclint working for KVM. Whether this is a real problem or not and we should remove aclint support for KVM is question for another day. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 19 ++++++++++++++----- target/riscv/time_helper.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7bd5bc0fc1..8f9d2967ef 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1336,14 +1336,18 @@ static void riscv_cpu_set_irq(void *opaque, int irq= , int level) case IRQ_M_EXT: if (kvm_enabled()) { kvm_riscv_set_irq(cpu, irq, level); - } else { + } + + if (tcg_enabled()) { riscv_cpu_update_mip(env, 1 << irq, BOOL_TO_MASK(level)); } break; case IRQ_S_EXT: if (kvm_enabled()) { kvm_riscv_set_irq(cpu, irq, level); - } else { + } + + if (tcg_enabled()) { env->external_seip =3D level; riscv_cpu_update_mip(env, 1 << irq, BOOL_TO_MASK(level | env->software_se= ip)); @@ -1370,9 +1374,14 @@ static void riscv_cpu_set_irq(void *opaque, int irq,= int level) env->hgeip |=3D 1ULL << irq; } =20 - /* Update mip.SGEIP bit */ - riscv_cpu_update_mip(env, MIP_SGEIP, - BOOL_TO_MASK(!!(env->hgeie & env->hgeip))); + if (kvm_enabled()) { + kvm_riscv_set_irq(cpu, irq, level); + } + if (tcg_enabled()) { + /* Update mip.SGEIP bit */ + riscv_cpu_update_mip(env, MIP_SGEIP, + BOOL_TO_MASK(!!(env->hgeie & env->hgeip))= ); + } } else { g_assert_not_reached(); } diff --git a/target/riscv/time_helper.c b/target/riscv/time_helper.c index 400e917354..ede1a4c2a3 100644 --- a/target/riscv/time_helper.c +++ b/target/riscv/time_helper.c @@ -21,19 +21,34 @@ #include "cpu_bits.h" #include "time_helper.h" #include "hw/intc/riscv_aclint.h" +#include "kvm/kvm_riscv.h" +#include "system/kvm.h" +#include "system/tcg.h" + +static void riscv_accel_set_irq(RISCVCPU *cpu, int irq, int level) +{ + if (kvm_enabled()) { + kvm_riscv_set_irq(cpu, irq, level); + } + + if (tcg_enabled()) { + riscv_cpu_update_mip(&cpu->env, irq, level); + } +} + =20 static void riscv_vstimer_cb(void *opaque) { RISCVCPU *cpu =3D opaque; CPURISCVState *env =3D &cpu->env; env->vstime_irq =3D 1; - riscv_cpu_update_mip(env, 0, BOOL_TO_MASK(1)); + riscv_accel_set_irq(cpu, 0, BOOL_TO_MASK(1)); } =20 static void riscv_stimer_cb(void *opaque) { RISCVCPU *cpu =3D opaque; - riscv_cpu_update_mip(&cpu->env, MIP_STIP, BOOL_TO_MASK(1)); + riscv_accel_set_irq(cpu, MIP_STIP, BOOL_TO_MASK(1)); } =20 /* @@ -48,6 +63,7 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTi= mer *timer, RISCVAclintMTimerState *mtimer =3D env->rdtime_fn_arg; uint32_t timebase_freq; uint64_t rtc_r; + RISCVCPU *cpu; =20 if (!riscv_cpu_cfg(env)->ext_sstc || !env->rdtime_fn || !env->rdtime_fn_arg || !get_field(env->menvcfg, MENVCFG_STCE)) { @@ -63,6 +79,7 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTi= mer *timer, =20 timebase_freq =3D mtimer->timebase_freq; rtc_r =3D env->rdtime_fn(env->rdtime_fn_arg) + delta; + cpu =3D env_archcpu(env); =20 if (timecmp <=3D rtc_r) { /* @@ -71,9 +88,9 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTi= mer *timer, */ if (timer_irq =3D=3D MIP_VSTIP) { env->vstime_irq =3D 1; - riscv_cpu_update_mip(env, 0, BOOL_TO_MASK(1)); + riscv_accel_set_irq(cpu, 0, BOOL_TO_MASK(1)); } else { - riscv_cpu_update_mip(env, MIP_STIP, BOOL_TO_MASK(1)); + riscv_accel_set_irq(cpu, MIP_STIP, BOOL_TO_MASK(1)); } return; } @@ -81,9 +98,9 @@ void riscv_timer_write_timecmp(CPURISCVState *env, QEMUTi= mer *timer, /* Clear the [VS|S]TIP bit in mip */ if (timer_irq =3D=3D MIP_VSTIP) { env->vstime_irq =3D 0; - riscv_cpu_update_mip(env, 0, BOOL_TO_MASK(0)); + riscv_accel_set_irq(cpu, 0, BOOL_TO_MASK(0)); } else { - riscv_cpu_update_mip(env, timer_irq, BOOL_TO_MASK(0)); + riscv_accel_set_irq(cpu, timer_irq, BOOL_TO_MASK(0)); } =20 /* @@ -151,7 +168,7 @@ static void riscv_timer_disable_timecmp(CPURISCVState *= env, QEMUTimer *timer, { /* Disable S-mode Timer IRQ and HW-based STIP */ if ((timer_irq =3D=3D MIP_STIP) && !get_field(env->menvcfg, MENVCFG_ST= CE)) { - riscv_cpu_update_mip(env, timer_irq, BOOL_TO_MASK(0)); + riscv_accel_set_irq(env_archcpu(env), timer_irq, BOOL_TO_MASK(0)); timer_del(timer); return; } @@ -161,7 +178,7 @@ static void riscv_timer_disable_timecmp(CPURISCVState *= env, QEMUTimer *timer, (!get_field(env->menvcfg, MENVCFG_STCE) || !get_field(env->henvcfg, HENVCFG_STCE))) { env->vstime_irq =3D 0; - riscv_cpu_update_mip(env, 0, BOOL_TO_MASK(0)); + riscv_accel_set_irq(env_archcpu(env), 0, BOOL_TO_MASK(0)); timer_del(timer); return; } --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259863; cv=none; d=zohomail.com; s=zohoarc; b=AnNFvxi5lcYtX51rMYgNfvZYb1EZgRFKywQw7gnZzoitxUm4FmLJOJiJhJSm5qwJJZE+95oYj3MRKGI8EShjq1yiI4ZwK9W2ajys4OUHk3HSzOZ85Nuv5LvKh0jSBf+iPDx3cn0+IvzRGMDneKXGl9ovP6zbEM6RfdYWUjcREk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259863; 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=7/Ye8uQmQEtQzueRNIktNChhgXsfp7S9pzEwkRTES5k=; b=YcHLUQ68VRsvkp9wrinetoDd5wdRKfMwP4Q+I1vNePpoPsLaMz+lJ3rrE39BwzKFRuLAYTD8dpLqJ4fFGE5BdlYXmqhp5K6zqzHQDC9aC1cFCL7KuWUv/ax3ycuyfHL0UpSXpXwtP0hKXgnTNb/iOyuON4y0rMlIyPps7tDbi0M= 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 1782259863251368.62274417202207; Tue, 23 Jun 2026 17:11:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9f-0007k8-7w; Tue, 23 Jun 2026 20:07:47 -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 1wcB9U-0007ZQ-D5 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:37 -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 1wcB9S-0003Jv-Hd for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:35 -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 65NJweNZ617655 for ; Wed, 24 Jun 2026 00:07:33 GMT Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eysv3jpqm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:32 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51a5212cf77so6637071cf.2 for ; Tue, 23 Jun 2026 17:07:32 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:30 -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=7/Ye8uQmQEt QzueRNIktNChhgXsfp7S9pzEwkRTES5k=; b=JDNzLe5khO554nbZ0Bq5UJ+rxXW AoO3R3mmi+VPfScCI0xeescN1phJidlez/lXFXVq3gCnrYJ5ML8XUG7eMEHfSSbO L+d5AGqFzPoQFL+CHWI55pQ7riw25khWwPT+8DKzYRqLI1XU7/7TazMB5e317HbR KdLB0boOPq+61Yad31cFGCDHZ/zJwkPxLVyk0/GhLCGhAzaQ2yd0QHQp6KFC4nBP vrQcwRfJxwVH1RFJ1qe00R22ikkg3s3bagyoBki1os+FmhXf7od7VWrFkG4BtM4z GItjh2w6YOlxC+7qf/9Gb1O41uR1v6vm0Mkxf/lLpqfjFUEBRr/P7ci72zg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259651; x=1782864451; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7/Ye8uQmQEtQzueRNIktNChhgXsfp7S9pzEwkRTES5k=; b=O0nVnqTPVotKthwIs3KNQGcumHndz14KPO7UuJNcct2bViJvRPKkDpKeLkuxa81H7K qWCdhTJsPZvjyMXIfa9PVtn0N5tFSAWKDQz6Ev4iBUCDf0D7p/1bpGOzk2UiZcqfDqSs n/cU3zY12mjGR9s49YFjJwLfdnUEwRXit+pOIrswYEht/CwNzx7vY/hjizCcLHJxn5DF w/ON0VFF2+Yo+9F8L5qSvqGDAQtf/KbDjk3uTGIFFaMgsec63g67JeXdtxCL8hQJm3Sb 5Zq1pF5Jg16man+n70Gg2gpW+X6uT8Py65nks7nMdt7m77Y6eMiT19YwXvvK3M+YOW0q l9KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259651; x=1782864451; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7/Ye8uQmQEtQzueRNIktNChhgXsfp7S9pzEwkRTES5k=; b=tYCaycQxwF6rTDp/PyvJD22TUs4bdA6/LPRAdkV/Em4TgJ2bYILD1p10DVC1zLjoLG gSfXfj8YBFzEfNXTXZB1FKkxIMwPj8Len87WeFOuhB24S6SoFzu4Q/eyiNFGM+tMVWsx RkR2cF5VnSn1ambKnMnqt0UBbV8hQNWOVGQeb2zCW9PwdX0txLlpo3S+vP7j4UFuKZGB /LlB7VFUbGGSBrnc7H+GzXVXTPPX4MFvdOc5+Hsxmy+jQXaVOWoAzHnoQlXADrqAUj5x AdlFZRSpkXUdlBODy9psg14uVtKMdBQxq14ALUhQNxRKzRsjiyqRIjtrokUMkGbBxlLb LngA== X-Gm-Message-State: AOJu0YylmLm04tcOzliBmylVD1cAGAp4DUUQhaytuDOZyjwUKhEB6bvR KJkaMLYQIZpvXXQ0XXJn1c4wCobFGPSPizVzN3I2sIcLkhKO/WWKVLVs/ob1cKfOfW3yOO4BnPi rg1e+0Va4STuG0DhyncKRrbI8DLnDsB3D0XDclxTS90EYZXmB9NEnCZomCa52TohN7A== X-Gm-Gg: AfdE7ckR7FCRY0fcR4871QZDZSxB2Y41H1nyVlSEYlvNcQMfRIzIBqSZOq3j+6MPoZw +9EAbSSO6pyiSqmLhFQdk2BJCriiWgOqUsWUTpqr8KVTMmb/2Mhkgiyj7RoxxSdrPupwFGIz1SO BSA+Xj3y0fHg8vn3SyksCarA8dwwqe4gtmuv8Ou4HWWMVu7t+mjEDXhWgaWteVeObse9Uw4sllE aq+LByYNcdinjhakDdteN9dB2bKZppYzidwwDWrP97KGKr0ptXvPGXJmCqNXrkFuCLwWSgIAogE 2kuwm+VSliaQYk+D/x7wdXiE/0S01XqC/mHLpOlIlA9gEqEF0/Eoctfpz9cxJY7VXxRP/OYsyR7 cQSoDO2V2TujIlqe2n+XprUvZ9mc8eYGtQLITU0taqTWKRA== X-Received: by 2002:a05:622a:253:b0:519:e1b7:5ba with SMTP id d75a77b69052e-51a61d6f330mr19124031cf.15.1782259651370; Tue, 23 Jun 2026 17:07:31 -0700 (PDT) X-Received: by 2002:a05:622a:253:b0:519:e1b7:5ba with SMTP id d75a77b69052e-51a61d6f330mr19123581cf.15.1782259651022; Tue, 23 Jun 2026 17:07:31 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 17/24] target/riscv/cpu.c: filter TCG only bits in riscv_cpu_reset_hold() Date: Tue, 23 Jun 2026 21:06:24 -0300 Message-ID: <20260624000632.2149359-18-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX+vxXIwNxgiYE PH1Pd8tQoftkp2o/wRCrbsx6k8zAqZd7Nn0uc+euK5tf5M0/CzXEWLWcZ9IqMx407FZIaBjcPK3 O2YwXTihhYxWrplNA0lv7P94jywcHBs= X-Proofpoint-GUID: oGtIQlGshxl3QjGww7N0vXzJgEvquui_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzUE0rq7RiSVj gyyCySN7/uO9ZdHfbAQfs25UAc0bO40dl9EMTJfSDpnOxcR02f2TnhtaYoKX+np7uDVOIjYA5cH RXTfchlWYx90adNSaXW0daKaXnca71zRfIre8MX/sWe9POrLoUhQjgRP6UP9e2djN5XK2+cDoUF nGuOfQh/SGY/4wg2Re/9hDniohPhPG27Nm9LKdRsG+QQXKys0xAlHlWdUeMVtvCKsOZUTE+5x6D /HFXDihhI6mKHs5+0P/1jqVTzdZ22/UEN196mwqjuIkZiJ/Mswe9jdkVgNxanUofgCJ5FAnWWad kK3L4hZgc9fGO8UkFuNVU5Oj2hL2z7Xu8J4T8q+fuCAjBH0wTg2WcVCYAUp35fk+SOfmtu3B8BL yn+DHPJ3Gd7ZsMJrhgbMYk00OwNjig== X-Authority-Analysis: v=2.4 cv=WtAb99fv c=1 sm=1 tr=0 ts=6a3b1fc4 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=bJI4hLjMr12y1cUB6bUA:9 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-ORIG-GUID: oGtIQlGshxl3QjGww7N0vXzJgEvquui_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259864502158505 Content-Type: text/plain; charset="utf-8" We have a lot of TCG only initialization in the common cpu_reset_hold callback that prevents --disable-tcg to work. Put a CONFIG_TCG ifdef around those bits to make the build work. Eventually we'll create a TCG specific reset function in tcg-cpu.c but for now this suffices. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 8f9d2967ef..0c777b76d6 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -958,10 +958,6 @@ bool riscv_cpu_has_work(CPUState *cs) =20 static void riscv_cpu_reset_hold(Object *obj, ResetType type) { -#ifndef CONFIG_USER_ONLY - uint8_t iprio; - int i, irq, rdzero; -#endif CPUState *cs =3D CPU(obj); RISCVCPU *cpu =3D RISCV_CPU(cs); RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(obj); @@ -1013,6 +1009,10 @@ static void riscv_cpu_reset_hold(Object *obj, ResetT= ype type) MENVCFG_ADUE : 0); env->henvcfg =3D 0; =20 +#ifdef CONFIG_TCG + uint8_t iprio; + int i, irq, rdzero; + /* Initialized default priorities of local interrupts. */ for (i =3D 0; i < ARRAY_SIZE(env->miprio); i++) { iprio =3D riscv_cpu_default_priority(i); @@ -1050,11 +1050,12 @@ static void riscv_cpu_reset_hold(Object *obj, Reset= Type type) } =20 pmp_unlock_entries(env); +#endif /* ifdef CONFIG_TCG */ #else env->priv =3D PRV_U; env->senvcfg =3D 0; env->menvcfg =3D 0; -#endif +#endif /* ifndef CONFIG_USER_ONLY */ =20 /* on reset elp is clear */ env->elp =3D false; --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259804; cv=none; d=zohomail.com; s=zohoarc; b=goxjQIyC2A+an6KUpHhxJmRsWsuJ+grnUoWOtN0J+ZcDgaqeic0t+5oL04ubnxuhKwZ7s987xLWcsDB85f0j9PJ2abaWKdgLmMtrue8lWXitd8vndHI845gfEXeKCp+kuSljWel7pkI/6YqmLSPKTo2KrlTr+KXqfMwWN3i/Dqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259804; 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=smrgu7dCfi0trFw7Vp+kVKVNvhdzaDa2myQuk8ZtXAw=; b=PEo5Z1R7aKl90wLtDmzVe55Ff0PTDMbIiOK+sihvVsOIwebO1lhN21GQPqbwIUrIOa/VCQoRypAgj8NtotmL/87arPQ80lQ4yoMRvZLmMqam/ctq0Dg2Tlv5MkNZFD7D7p0kbOOsN4y674s8ezKB56hIIyTBVsX4BQaKt8OiFnk= 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 1782259804364473.44861428517186; Tue, 23 Jun 2026 17:10:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9j-0007wZ-TQ; Tue, 23 Jun 2026 20:07: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 1wcB9f-0007ln-CF for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:47 -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 1wcB9d-0003KA-QZ for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:47 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65NK01wF1189854 for ; Wed, 24 Jun 2026 00:07:34 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 4eytvh2ex2-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:34 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8deb27fb80eso7660596d6.0 for ; Tue, 23 Jun 2026 17:07:34 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:33 -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=smrgu7dCfi0 trFw7Vp+kVKVNvhdzaDa2myQuk8ZtXAw=; b=pHSue+xyCeblrL+HwkixVy4y0y7 BaD7qZhTTbVhh/4n0PkwSETcmp6tAIQMS18Ni6dJCFGrkNu5Hnj/MMxkifyntK0I uHbMLQFAUvTBCDMEZRs2sh8DZZJfolZS9iw6p9eLetstF9b/kX3xFXWh+5l8X3zV BkqFWedhciJXaib8mGLiGd8SbgSBJH1Jddm61sF09Cwszp6D1FooL4oUSb4R6GlN IM8aeLKfk2Os4156eH01b2YbjW4xnktAkzTzi01fUM5w+y9L5op5NtFCU5PXx7Rs AzJXygIFep7ZeqbCB7577VNLzNSe6Grg4UGzqfu0FP2ul9FUnR2HBaLmqjQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259654; x=1782864454; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=smrgu7dCfi0trFw7Vp+kVKVNvhdzaDa2myQuk8ZtXAw=; b=Anq5oyllJS3z2CtkRNX6eTIkb6i17d7xi+QlhVUsBEkTWWf4g2YuyU13SrjavREmPR aUKP2Z/DXOCsjspHFyFkA+qH+No9EwceOOA0u8yFiINcrIR8i03psNh/H/KupKF8Tcw8 GqoHN4XYpDNJNdS0hzO+LuUerZwwaU7g9jgwm5q9C38u0fTRIppzXf0jvhAv2TwwmjWH RDRfbagSUXZlR8CNRWsFBMNiUwPcVBACVpY6kHwY1eVSDeUgZ4w8iYILmTWSOXD8kNFe CKSW64ACEp7VtLcAPndBabIbFZVBEBXz57uSTGiTBLtf4nwFD1M720b4e2Nfhek0hGiJ HMnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259654; x=1782864454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=smrgu7dCfi0trFw7Vp+kVKVNvhdzaDa2myQuk8ZtXAw=; b=pSzB46HpNqnvWXAJc1bHebvftPCMeFNicSbfZr1n4mL13ZYPFB1vQTBOQrAblDT4EQ rx3rXxoihJapTsaW+sqWgUsVrZ5jNhVKPwyICT55EEhjYOr7nQj7FWAmVLODEPHgPVe9 oVwY6+JJqyYMh1s1Yvnpbd7aXhWHz4GFEVl1Ulk8xFHZcO2roD6olKc55+EYfhTgS1JM Hft7g/ssl3DvCcpVN1tvZr/qJ36igHSxVJJTmWx7jCqRZK6iEl0BOB4NJ7Q0wFho1Ceo qSAfjH8gOD151YJUKN+44ML+BQyCl5Zg54IEbzIWvpOm7wnlYQArGIs3yl941jiiqoKZ zq/A== X-Gm-Message-State: AOJu0Yw9xngAdBJ14D8Tb/sg9HPlsQITcMjc4ssrpwIjDwShVrlqAHMt d1uMjAUkYqniaxeRAcyR/BLDw13Fottzmvggcu+IYOhod0p6PyYe6Fa5uw371hPSQbc/UKMrlV1 zYjLuVYppKw5tjGDPcFoa9xbpdNvYFolxTaSG2srD/B93QCtmm7E1TBN/rl3OVsR0FA== X-Gm-Gg: AfdE7cnEpfpKk6haDCegUCZqJ2Ra0CbYT1oz+JwaZubCWECbmo7ryoOw4A8KSev7bDi ACUX4tsXE1cmuVdF9ai/2sHbp8jrWKMkWfROn8Uq7/daBFm7Z1DxA9rWnTY9MbMijdaTBZ6TQrl /E8PqJOzR1cr1hw+/MJgOESZEEPz3k3GnJs+3v+a7AAoiRaSMDWfOv19aLOPt6Ijnlb72Uq5bT1 Tgw19SVU1OpNejaj9sFLpK/XS65Yb0a7KvE3Bvs4XSDGTkTW949/Lij14N4pbp4FWluWSGr+ZWe xy6f1o+E3slQQaYFV72HMPdHA2FkMPduKds8Ob4JLZUrliXRA7cXqcwQ2YH+4GRISOSEHWb9oFc r7Oxk+2uPrJvJmPVQ75PvnrZ3ai3kSJPwxa0a5a4fIdj88w== X-Received: by 2002:a05:6214:4019:b0:8ca:256b:8741 with SMTP id 6a1803df08f44-8e53543c244mr24782726d6.27.1782259654081; Tue, 23 Jun 2026 17:07:34 -0700 (PDT) X-Received: by 2002:a05:6214:4019:b0:8ca:256b:8741 with SMTP id 6a1803df08f44-8e53543c244mr24782096d6.27.1782259653651; Tue, 23 Jun 2026 17:07:33 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 18/24] hw/riscv/riscv_hart.c isolate tcg only bits Date: Tue, 23 Jun 2026 21:06:25 -0300 Message-ID: <20260624000632.2149359-19-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX0InhrrXQprS/ Ywhsdh2QjCDyh1M2Rov0PD4rWGZbYpWWLf0xRPuTSbnSqXvKyWI3So5Ig7MbgqdMclcD11SNDnl q/8t5nfMDGCCp/PCn1YoyhKl5BmXky+iTga0PMf5rvWN4ux0Ur9XvJbUWYpXPzZt6wY4wmSVjCz Q80guE0x4Wp+9DqRnHMiHIhl7/nQ+8qPbD2PTrJPoMuuFXDozB8DfUOlis4wmW8LS/BLwuSskv1 qYT9xXYeV1cf0wF5oV1Bxh9gnDkGRaj//kop1OhhUGiIQMXU83FBgw8Y7anz1IOESgxCkhhwi9U lNGXjO2bE2vQEQvS+2M/Byqu0yz0RvCxLb0PNapVBEHhvjM6kJopLSr7CNgyF8qivi4EEAp36JW Nus4pFt68W2rlOMtBsqoVF8DNtGwhxNyX9iWMI2IV/k5fNlDOaV7kmiMXU8eOyu1GBh+vBYEM/h TLike8Mh28+GSZJ/VuA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX0g55rHRN1w62 2YfGOPMQndV6/sJMRqI/f5B/OPbBFbdFNaF4bf2cGg/mngQ/LfC5GjCL6kEZf4hKyxCes9Blrsb V1UvyELd9JPutSVliWwYYvvTvhvp7ZQ= X-Proofpoint-GUID: l21mtn-Ub4011kdL2-VuByrs1Gx0lS0q X-Authority-Analysis: v=2.4 cv=AJDhMgPs c=1 sm=1 tr=0 ts=6a3b1fc6 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=0nQI16K_ZF54athspwIA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-ORIG-GUID: l21mtn-Ub4011kdL2-VuByrs1Gx0lS0q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 priorityscore=1501 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259806290158500 Content-Type: text/plain; charset="utf-8" riscv_cpu_register_csr_qtest_callback(), vcsr_call() and csr_qtest_callback() are all TCG only and are not available in --disable-tcg builds. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- hw/riscv/riscv_hart.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index d1c7188369..747754be61 100644 --- a/hw/riscv/riscv_hart.c +++ b/hw/riscv/riscv_hart.c @@ -61,7 +61,7 @@ static void riscv_harts_cpu_reset(void *opaque) cpu_reset(CPU(cpu)); } =20 -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static void csr_call(char *cmd, uint64_t cpu_num, int csrno, uint64_t *val) { RISCVCPU *cpu =3D RISCV_CPU(cpu_by_arch_id(cpu_num)); @@ -151,8 +151,10 @@ static void riscv_harts_realize(DeviceState *dev, Erro= r **errp) =20 s->harts =3D g_new0(RISCVCPU, s->num_harts); =20 -#ifndef CONFIG_USER_ONLY - riscv_cpu_register_csr_qtest_callback(); +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) + if (qtest_enabled()) { + riscv_cpu_register_csr_qtest_callback(); + } #endif =20 for (n =3D 0; n < s->num_harts; n++) { --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259734; cv=none; d=zohomail.com; s=zohoarc; b=LmGVOt4CdbWFXwDHw/qdaQcDZcKz5NdqjU46EWu39Uj4iViMn5QrmhO3xRgxuG/RxuIyE68V+fKpBDXgGGWd3h6gM/t6L+1u2DbF1Fcv6FJs0FHjrjkhk1W2NZEpcps/667VCAwgeQzUKUbt16Inn5EEHvxlLPejQjpOou7MkQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259734; 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=q3VKOG+bLiRyfEcN4LKgkHdSXA4OOkMf38y8s29WJto=; b=AdoYZIvUwq/gzDKrMQziNDBIxarxRx3r6TnBsMp6V+uhPe3LGSW0z8qJ5dQLC/DHHzs25aNnH0vfz0T5QCrSNWFPSiszB/p/cxZcr2pKL5i7e53ztGBCp6OQ8GzUhmyggSLMTW+wZWonvactZdwf5ptAvZzvtqj+rpS2eiByoH4= 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 1782259734408773.3579896394382; Tue, 23 Jun 2026 17:08:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9x-0008AF-Nb; Tue, 23 Jun 2026 20:08:05 -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 1wcB9i-0007vU-GV for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:50 -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 1wcB9h-0003Kc-1R for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:50 -0400 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65NK04Lh1191161 for ; Wed, 24 Jun 2026 00:07:38 GMT Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eytvh2ex8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:37 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-51a1460e3d3so9006591cf.0 for ; Tue, 23 Jun 2026 17:07:37 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:36 -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=q3VKOG+bLiR yfEcN4LKgkHdSXA4OOkMf38y8s29WJto=; b=R5MKMGEM4osw/GWnPLLTKomQ8b3 /haddFQzjiQsjvNyZxI3/GCNUlAk1wQwABkuwBL3zBebKVF1o18duHfnK68APyos 1Fotp58Kn/X6itsWTjieH2iZvo/R33AeQi7SuWvc2Lq7afTqcQul8P2gP+180exc 4O8R8GiNTaIqvwl8KzKI35DkIVH1sNefMa5/4OBWh5aYVdR30QZ7oCkWkyocoe83 hvIeHu7nCTfj11Ze5ROCkjgQhGhEyNfpXSouMGFrZKmDFRjgpg16ZUHZJjh+QzNq xdQaztt9gSnt8N+6Xbf3Hv2hFfMdBI8ckvXEEBPUGb/n9NvUnWY87YLL/Jg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259657; x=1782864457; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q3VKOG+bLiRyfEcN4LKgkHdSXA4OOkMf38y8s29WJto=; b=kR2n+okZV7O4Hjp5KUUvTN5ZinYtTzM8swvO5zNO7NVSRXnaLo4UtL2Un1/UBOj5p+ 6FVM3RHpJQI+Js3DZnh5PsZdYxDMnJ1DcxwOFEwgYt61VpN7+tCD5cVgs6iWyyRsl6MY mSjjYu7r34lZEABnVTwCnYnaOTwpT02og1M6fSIYt4Y1hmELaxln4wBkQgDAFozJQpEo cr1jUSLs4Qk56r8GTg9Q6qJaOzNc2QUxctz5eNopq6lGeVDzeW+Hr7CKr5FhjJa5n+PS yYWGcN7LtEkMtJc4v7V+VfJipuXumVIWxDu9dH1vx3XsES6GaEfdTLaShzxcg2rGiql/ v46g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259657; x=1782864457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=q3VKOG+bLiRyfEcN4LKgkHdSXA4OOkMf38y8s29WJto=; b=DLKnvcdRMy6jvQhDS47v0lu0cL0lbi4F6r79HU271tt2XcyGfrBQqgsk6DVZYY7dn6 gAd9H4RpJsIX7PliLD3RM0XnU0GINw3mCSFW21ggyLF183t7gygebj9PQELn3nXjCTqA LnsUghZmykOiiihq74LC5GicRDF2Xkhy53lV6ywHS2xndB2/TRQV+DlZfTnuutv3f7Rw 0BB3xEbrAfCV/E+iH7ZhGsyyGgXRrooyhZs6lED3K1aI72PlLSE6rJvO2o94RhMVdEzI 67otfSJih5uaoVmDn940D2WdHnGN6Zq3twqQ7xnbK6tR8sWXZDosh2sjB/wiGyU5Zgki 0Dcw== X-Gm-Message-State: AOJu0YykPbOw3sxPlUxH3vUte+Mcq7xTnYAd5NizqOcITiLUtriOK0sl CNfcArmhPBsyft9j9BXfgEQzlff0kkitjMzqvi8kP9b+Y+CtBoABe+dQAbMj77Lt7eKKVIGYRtA WdW4gWXafDxnA+AXKQ5BGbV0E3fEysGzezVconYKVNGSmeKQGJpJMyOO9v6exfnoxCA== X-Gm-Gg: AfdE7cm6ROR8gWPB2507A0mqMSVGF+hIUXnXlO7e1iC6gvcv3SeULTk24FNKR93dz+a nYItwujTg9NAQf9Azj9Lqio1Hjk7j8sDY7aJMcuwt6EEC7WaQEeQ71wae5Z1h6jQGGQoD7MEqnB Rhs9HI8bbkHovwBWJu3QCijxmykNUbxLYkY+36CxwYZgHr/7Z8kvgJafAMmGz8HhsRbQH4BuiZP bEdzWaiQ+AgiTlo3haLEYN1MKucOTaAV2RGP7N+dDcDwtf6Jg9WtOC46RVHpIN3j64C0ktdGjzK gTxyIdIlb7oP/LVH4UjeeKdGakLu6nNkylWbZPIVzIaKPSQ5o36EvkGnxdFWEEgHPlLS2iRSf2I B1l3JJlfglX4Tti1ZEztKqin0/dHKJ1suKksPFpwAJvivhw== X-Received: by 2002:a05:622a:1a8d:b0:51a:1a44:101f with SMTP id d75a77b69052e-51a61b4c2a1mr20603531cf.21.1782259657167; Tue, 23 Jun 2026 17:07:37 -0700 (PDT) X-Received: by 2002:a05:622a:1a8d:b0:51a:1a44:101f with SMTP id d75a77b69052e-51a61b4c2a1mr20603031cf.21.1782259656791; Tue, 23 Jun 2026 17:07:36 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 19/24] target/riscv/gdbstub.c: isolate TCG only checks Date: Tue, 23 Jun 2026 21:06:26 -0300 Message-ID: <20260624000632.2149359-20-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX/7Isx1TyvsJR NO/rYsimUONm0+562hOiHO0TtjgeaHM3V4XqhOhiKBc/w4k552IJQrzp1C6OGMytAUaD4kHasWS kyPgn/TcDoxIR6J2UqDpswo3Wj75RKi3sLu0EYa+E3qzGc93sJhtoSC0swBs72adSC8dEmriBfF p8PpVSRqfp90wSclvgYGCVqpjMf6K1O/9UznXaA5yVxOdxwLURObDMkTUh4Zl9qvLLJmlKrTMKK tP7b/0lJAAgfiM5r4FOkRpxUFdYm7Y9RIt8WmZoDhE0rEhuDvbBRcbprBX1yXgKSMzYOIm/flCk Z9GlZHW1mteJnslAMT63jbmBc6QBnD/uwzEVoOq5PQ8XNeIBk4CZP4LB8t7iblJczUlxRj/coJ0 QCOTZGA9v0y5wC2TkWbf3bwA+N7SK741bkgsnTfWoBSJFTFTGQyuatxTkeE16/jOH3MovN4lalN HQ7ZywsAbdbAHJy573w== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX20oEzb4MN6Yr gIHfmlX7hhsO8mr4VZL1xfmHyepSIbg6OF2EDqnffcxNUWuApRnk6B40P/pNwUuEbsV+bO7n35l Lybp8tHq/slXSw9tHmZ3HCFcLmSQjWI= X-Proofpoint-GUID: mPW8hoPV9daV4vmPWJHBWf267QHx_284 X-Authority-Analysis: v=2.4 cv=AJDhMgPs c=1 sm=1 tr=0 ts=6a3b1fc9 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=m8F5ZJ-s4jyFCOPQnU8A:9 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-ORIG-GUID: mPW8hoPV9daV4vmPWJHBWf267QHx_284 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 priorityscore=1501 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259735896158500 Content-Type: text/plain; charset="utf-8" The following functions are TCG only and are broken, if they were ever usable in the first place, with KVM: - riscv_gdb_(get|se)t_csr - riscv_gdb_(get|set)_virtual - riscv_gen_dynamic_csr_feature Gate everything with TCG enabled to at least get them out of the way to enable --disable-tcg. As a note for the future: other archs have distincts gdbstub files for each accelerator. There's a strong case for RISC-V to do the same. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/gdbstub.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index f0a5e0d86f..9abbf5bcdf 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -164,6 +164,7 @@ static int riscv_gdb_set_vector(CPUState *cs, uint8_t *= mem_buf, int n) return 0; } =20 +#ifdef CONFIG_TCG static int riscv_gdb_get_csr(CPUState *cs, GByteArray *buf, int n) { RISCVCPU *cpu =3D RISCV_CPU(cs); @@ -294,6 +295,7 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUSta= te *cs, int base_reg) =20 return &cpu->dyn_csr_feature; } +#endif /* CONFIG_TCG */ =20 static GDBFeature *ricsv_gen_dynamic_vector_feature(CPUState *cs, int base= _reg) { @@ -336,7 +338,6 @@ static GDBFeature *ricsv_gen_dynamic_vector_feature(CPU= State *cs, int base_reg) =20 void riscv_cpu_register_gdb_regs_for_features(CPUState *cs) { - RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(cs); RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; if (env->misa_ext & RVD) { @@ -351,6 +352,10 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState= *cs) riscv_gdb_set_vector, ricsv_gen_dynamic_vector_feature(cs, cs->= gdb_num_regs)); } + +#ifdef CONFIG_TCG + RISCVCPUClass *mcc =3D RISCV_CPU_GET_CLASS(cs); + switch (mcc->def->misa_mxl_max) { case MXL_RV32: gdb_register_coprocessor(cs, riscv_gdb_get_virtual, @@ -371,4 +376,5 @@ void riscv_cpu_register_gdb_regs_for_features(CPUState = *cs) gdb_register_coprocessor(cs, riscv_gdb_get_csr, riscv_gdb_set_csr, riscv_gen_dynamic_csr_feature(cs, cs->gdb= _num_regs)); } +#endif } --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259841; cv=none; d=zohomail.com; s=zohoarc; b=clhhFT8pUx1AwoRNXAwbsD+GQEeZwLHLER3eh7g9JZwMimLRT0RObbo65395UXB1j8FwRPiIouatbHKUXCeroNSIIQfkm6qu/aS2IcaQJjANu/i6BD1mksERR38BKtWVSD9zo5o1JzITj90d9CdjwYzJm5KYPwPTrLNr4YaEB7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259841; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UJ/VuRTDDvOZzIN9WXSG0TT4FVv4DNHGoPKG+8PDOo4=; b=MpnQwp3Df38EBOjMYfgsCX4id9bWf/iw618Z178FzvFLDmi8lFOQXzWC2kimYC9ZjQggucrwp68R8VVGuI+p/nv0UIBokNav2r3xBLrPlAANpEnkBfshTB9IdX3JqR6FtNvkn9I5CZFWgXH9yVTKFkLZF9INhT27uTdBD0c8ydA= 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 1782259841884679.7151288444829; Tue, 23 Jun 2026 17:10:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9x-00086R-0Q; Tue, 23 Jun 2026 20:08:05 -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 1wcB9d-0007gJ-Ur for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:45 -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 1wcB9c-0003LS-4p for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:45 -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 65NJweHR2295601 for ; Wed, 24 Jun 2026 00:07:42 GMT Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eyr28u4ku-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:41 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-519ed1acb05so4281571cf.3 for ; Tue, 23 Jun 2026 17:07:41 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= UJ/VuRTDDvOZzIN9WXSG0TT4FVv4DNHGoPKG+8PDOo4=; b=H8YAMXPWQ+JUwj+u x01PWQZ+b21hQXdPKvX8bH7Yaw3M6u4ahIFJEHUHM8bVcjtLPtm7FsN92AmfSM0l PDaUOLlVJajlETveEVETVe6SNh4+Uk4GFx+KvnaH+yWtARUOuZpmBGRbYBtc6DhN +kmduaRhJ9NnMCw9G+8yimWp4k/iE0vebTbOr13ky0gMlPm4EogEDCmMDpwrrLSC A9rHB/JlWkQaDv0Ge54WdN16+Tt9Xpn9IqIpg3PdiRWwexrjt40345YXQT9yqNOi KxfOCRo1mJ2A6LQYzPOTMpzVNpnwjAFV3GKWdrpaZWtOO4NgdaNE7V357ipV70gj J+1U0w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259661; x=1782864461; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UJ/VuRTDDvOZzIN9WXSG0TT4FVv4DNHGoPKG+8PDOo4=; b=PklL7oGyPpFnB2b0xFs/LcBIlntTXQXT/4FhUm7Q7HP1ysoxl+uQR/bsI1D3n1+sKf IYK4Tzkekvmce+Zhq3EbHOHGjquH3nkNA73I1n+vI6OZ38YEFOsqZOlpVaJdUmA/DgUt Tj1TVPWOt+tzjGmlrw+PQMJPA9PqSOLUwfeWQ/mCGi1drq4NPITNWHf0uDOGyc0sCuWG xZ2aw2ER+/6xm4kNg3tvkMhJbyoObxLnWn0hLSnkLp62jRpqbjabUU7Zp7mHWrfg+9Eu 0/5JWheBsmzkwfqO+sqSPPrJEZpWhIWQ5RDMwA0VGDLljyG7GumrMx40x67JrtLaUPlX 42Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259661; x=1782864461; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UJ/VuRTDDvOZzIN9WXSG0TT4FVv4DNHGoPKG+8PDOo4=; b=ozQorvXFiRcap+EGs606Pw2p4bQXW4rRUIBqGs6AYyj0619tO/BYg9rYm4jfasqnKv V3Pj6Ck77532PBfcB4y6Tqx350anxIeWpBgbm47sHCUFXEso00sR5olSF8CNa3c/23wu c32ZKXyAfpPuisVmi0EumW4oEGq9/E3R4Ed0mAkxDxQceWeFVEi2ekvZ2KKzveiizXjF +cnb1wVl7enCWtEGE/tcJeP5hVBLM0644J6DyQ8OsZinyj1GgBBRq2qU0It4qZixvneZ qsM6vg9kRJb/KgwY+PV+0oaqFtNt7BCUOs3OCVBO8QaLBFJ0dTKc1Tyg1ZmBDBND7eUG w59Q== X-Gm-Message-State: AOJu0YwjETP5Ea9bJclNBWCRvk/Jnsnx8BWc959KHXvwcc3SKxjS++TV id/1eIPrTLEuNQDU9JzgHdvmpYSGJPsHPnpnjegq4tIMixwbu4lXRbn6wi44blZeJa//HXCKUbD h5kTaqK1wTG+rxDCNBUq9DFauRqHng8V/6KDEOpRhDLCYYIpOgxap/zK10lzAZIWOuA== X-Gm-Gg: AfdE7clb4sWrs++AiuulYCJkBF5ofJQBinXAAyxhvzIy+g+0YSIUCemlDYdDqO7e0FJ MXQgbe8CK2k10hGlH0h3DksEl1b/Ul+I85kvS8heOnKs1szhHkaJte+JhBqIorE82F+w2wAQ/88 rh4TbnZuSAAAE+XFwZp1QMfFUg1woNS8JmmRdABW9YRd7iyExmyz+7UGXJso8SyGM5IhOc7QaeC Y7L4kU1t5MhI/WllmtMl6Hx34qKfjS6Vwb9eel4/XRBcerYITAs+EvylegszoxmQm/BKc9xdIw4 oQW7BvO/9KuWS3TueDicx9lGDrlUA1bJRpHexqL8tyU+UIjk4gY3PTbQY/aYdZhSjweCtJjwSq6 fjV3x2VAsxxTXlVcpLFP27VmD60srKicdlV+2YOH+Tz8yvw== X-Received: by 2002:a05:622a:1aa2:b0:516:ea30:8756 with SMTP id d75a77b69052e-51a61bb526cmr21745171cf.36.1782259660598; Tue, 23 Jun 2026 17:07:40 -0700 (PDT) X-Received: by 2002:a05:622a:1aa2:b0:516:ea30:8756 with SMTP id d75a77b69052e-51a61bb526cmr21744401cf.36.1782259659958; Tue, 23 Jun 2026 17:07:39 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 20/24] target/riscv: move riscv_cpu_set_rdtime_fn to riscv_aclint Date: Tue, 23 Jun 2026 21:06:27 -0300 Message-ID: <20260624000632.2149359-21-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXyE9QFmjhR//J /MKC9h02DhMYhpDWfo4s5FYRXyxkTyZQZ3jg6DslLZPkSY8Gh2YoHZmwQjbc/WkkBYv2L5sgFLf 6S8ayn0Cznf3vq9ZSv2t+eajz+DR3as= X-Authority-Analysis: v=2.4 cv=b4KCJNGx c=1 sm=1 tr=0 ts=6a3b1fcd cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=u0cZ2EjT8PS4VQJ4ig0A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: WTPbYQc-fa3HF3AkYN2CIp4xmhXoNdAr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXzgCGwcHd/Xvr gIZD4ZaGd+1TSHs0+J5jpig1ExBebgr3Z/rJZAJ9hiQ14mDoo6et+pHX+8SgSeat7h+/0Jvdr5F vo5djSMNqi5OBCxyY01ZGEBpAXobARKXZVp2xH4UsYLxJ37gC6rpcEEWr3obOrLStjknOtEYRvE K0JNgWJSSbkMEVV+4JD4xGGHwDd9wb2tBNb0aVOPTnoY7Bv4OwO0QOq5ant3g7t8+r+05S3/5QF mNnndYsFJVGS3h38zJPCNcTE4P4Xxcv3hQaColL/hpe0xbE6KnHNyxeXwU/xULI0KrHuzLq7ah8 /dfLvOWqHFyP6cetV47fgfIIuv7vncX7f8CjIxkISrUHX/ZNUhsiXrKKXtkBJkKGA7STgLSJ7vi G+X7236vlSc/JbNEo1Wt20gY/jsaQQ== X-Proofpoint-ORIG-GUID: WTPbYQc-fa3HF3AkYN2CIp4xmhXoNdAr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259842405158500 There's no need for it to be in cpu_helper since riscv_aclint is the only caller. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/intc/riscv_aclint.c | 8 ++++++++ target/riscv/cpu.h | 2 -- target/riscv/tcg/cpu_helper.c | 7 ------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index e27e5fb394..361a8d1bcb 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -40,6 +40,14 @@ typedef struct riscv_aclint_mtimer_callback { int num; } riscv_aclint_mtimer_callback; =20 +static void riscv_cpu_set_rdtime_fn(CPURISCVState *env, + uint64_t (*fn)(void *), + void *arg) +{ + env->rdtime_fn =3D fn; + env->rdtime_fn_arg =3D arg; +} + static uint64_t cpu_riscv_read_rtc_raw(uint32_t timebase_freq) { return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 396d9253e6..d6c5d6c1db 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -682,8 +682,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint6= 4_t mask, void riscv_cpu_set_rnmi(RISCVCPU *cpu, uint32_t irq, bool level); void riscv_cpu_interrupt(CPURISCVState *env); #define BOOL_TO_MASK(x) (-!!(x)) /* helper for riscv_cpu_update_mip value = */ -void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t (*fn)(void *), - void *arg); void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t pr= iv, aia_ireg_rmw_fn rmw_fn, void *rmw_fn_arg); diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index 9237d2129b..822c9fe483 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -612,13 +612,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint= 64_t mask, uint64_t value) return old; } =20 -void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64_t (*fn)(void *), - void *arg) -{ - env->rdtime_fn =3D fn; - env->rdtime_fn_arg =3D arg; -} - void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t pr= iv, aia_ireg_rmw_fn rmw_fn, void *rmw_fn_arg) --=20 2.43.0 From nobody Sun Jul 26 12:29:00 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=1782259714; cv=none; d=zohomail.com; s=zohoarc; b=NJnSBOhfvJbBKzNlTgBhLzA12jKgX60ROViHW1kXILGpcH9MqxIpZSXpc5LSSt3ndmwz3deS2JPa7cEU8Mrn/o2rkt/8xazu73fC5kAs/7Q2hGqaPcS1OslHlSARANqWkPnm6LzOKXuBA7FIwOTL6dFxK2xwV/WGm1vVSoDS9fQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259714; 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=iOTZIweGlNNxzxc80t3aYc0ZNrbiE2Gm5Ew+CPkkpvQ=; b=iupXr+QAARSAo/No+cZRY4z6+os9wqs0mcbn2Cl3Tr5S+kKBB2VNX6RXPYa7O8kdW+GFYGWChix7g7r1PnQDLiDRxztffbH/H9Uo2c+j7NJLTHQdSVNaCK2UAwKgUh/Nvai8HtIwCzr6YVUhTx+CIaBYqlayCoecoZ6O/KSFLjE= 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 1782259714766645.9297296326719; Tue, 23 Jun 2026 17:08:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9y-0008Ek-Jx; Tue, 23 Jun 2026 20:08: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 1wcB9p-0007xi-1J for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:08: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 1wcB9n-0003Lc-CE for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:56 -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 65NK0JHI973566 for ; Wed, 24 Jun 2026 00:07:44 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 4f004p0smw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:43 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dc0a6ab3bbso14308186d6.1 for ; Tue, 23 Jun 2026 17:07:43 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:42 -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=iOTZIweGlNN xzxc80t3aYc0ZNrbiE2Gm5Ew+CPkkpvQ=; b=l+4xw7mLckhtEMxeFL2mT/AdKnj zx5hV3g2k38rSJn6HQZpyn8iozrXPEKZAX6lhR9KYOw4nDmnxdYWCOPSfLq9mDcI gR7POGV8RDUUdF9302Y05UJAAQaCa4O9zs0LIJXCH0c+LK08FyUgzqrBl4Efciof LUJnE/XG6Lyef+40YqJ0BL1MNuZUZKHK3Nq7QtFxMG+wzt8dNavLlSW5BzqK4DDf 7+WLI6fOxrKTBVr17LHPZMQzEk3bKqVDY4rq/ggea4lkbgQr2EIAM/oBvgqE+y3V hz1053WcvvrE3vdlSrkjJ5vvepp954z9FVOA4yBqvAShbP3J25NvYah4/MQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259663; x=1782864463; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iOTZIweGlNNxzxc80t3aYc0ZNrbiE2Gm5Ew+CPkkpvQ=; b=bLP499fxiStuNjtNqfSJw/TrFOpAbXYXHfW8q5d1Bi3NNBVKFGA/cQ9Yj+rppmI9WK nljpdrN75MGNqVobu+U1wXCD77M6096ybM8o+dPa1g3/dpS+fpaN6MqoTOhUmp2ftc0s ZF/LQy7P2LBpRy96W5+xozXmMsl2hlxFCb0JkTOR0nxV+/D+Iiisb9poWbQfvkvpDclF bZSk/E0r867GhuyooCbUGABFOTw7sUpindnqj9mMRzKliM3qSP1kbVRNcBI50ip66whJ hTWXXcbHDpnWj8996rXmhKrIGiBe4wFdEiJubFkgSGt+ABUJubcwnfBm/yU4gzbwMmoC oXCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259663; x=1782864463; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iOTZIweGlNNxzxc80t3aYc0ZNrbiE2Gm5Ew+CPkkpvQ=; b=s5aK6h7LEmQFZM+u6hhzqZJ3v/X5yoMr/vrEGb8Lhj8TsUdhOeRo/idtmJbzrZdsRK PUtWYlMXz4TcjtC9BuGM9f3qX+suQUAnA9M3fvEyCUzEA6ca2Xz5efJcGoo0HnXCxzDA pmVY4RPfz67tQp2Mg5NV9Dozc0gMyzh8rza6ajLfBve3WKdMf8jn6sY9Eq3j27DNZjCs taf0/Z2d6tI+xPNQckkZ2MxQycQeni+x+uIqgWzg3v8Qtei6s2DYH8WE25duu5eDKNJp 4USB2eaUYL5cxAi2JhbKkC7qSBHfFxOyy/nhkjDTBEQbTzuzF4D6gCSBQ/nIUkpnmSJ1 0mmQ== X-Gm-Message-State: AOJu0YyjERgo+A7RP7HMyeI4Oc0F8MYB/evg2sLBY5VjY0f/6jzFmWYn E8VRR773lQFUTnxoUmjKVuTbSJIbp8QMOFQSUREo0ynnZ2yU+xnT0fG8wYxZIKS5iU2WWAlaUzS OBFncYGiDwKD3wFvFT57aq9t4tcRZSTN/KbD83wxQvVPnLl/55jhYdwSH3KdrF3kvCA== X-Gm-Gg: AfdE7cmBaLsfXYkqSUyS+NCKBV7D5UoBJV9NAF1hrv5whRxV7kGZT7pmkevZDrBSxCA 5aabgZOlYZJ2Ao1XuDcMEd3b8hzaFUDzJdMra57ky+g2OB9h3h+cFnsBYkNAQKQOI2TTJD4UE/t t61/a8yGtoDkUTpd+iyYpuwZk+VCV/UiwynJ+1xZkpEQCN/Hth0mJClQCw5oYQVBoZQhQI3yZov 09Ta1pHXCtGjWvI2OT0jpxQLIgM4iRGzZLet6t06fOCow+/UanAE6TxQNNHDGgw5zwlIwza8rIV QqI2sBzmGBMreuo27wT3keYAsgnu626XtfJInrVCM3VMB1SW+rbM67icMM4eQd5nnZSmDmpGw0a AiFvGXxURycU3tTbBk3WuDY4K9BQaHV83Hkypi5GEwjPVbg== X-Received: by 2002:a05:6214:8085:b0:8db:dd:4d85 with SMTP id 6a1803df08f44-8e52fbaaf12mr24634746d6.26.1782259663296; Tue, 23 Jun 2026 17:07:43 -0700 (PDT) X-Received: by 2002:a05:6214:8085:b0:8db:dd:4d85 with SMTP id 6a1803df08f44-8e52fbaaf12mr24634136d6.26.1782259662775; Tue, 23 Jun 2026 17:07:42 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 21/24] target/riscv/tcg: remove unused riscv_cpu_get_geilen() Date: Tue, 23 Jun 2026 21:06:28 -0300 Message-ID: <20260624000632.2149359-22-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX9E5ey12dmxlN nFtFEak6R8rn4S4+O+OmBIHnAF+BgskMN4dnnaY7v36Mm9CbEhOx/Zn437AIA5zAWDGuTwbTuzm Y9qEy56+fynUWAQ/GnFxA0m8sexf5TQ= X-Proofpoint-ORIG-GUID: 7yjRsms32t16GKAFtcOhZ0oZf7ubks91 X-Proofpoint-GUID: 7yjRsms32t16GKAFtcOhZ0oZf7ubks91 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX+2fJCOpIQNMo cTGRCAN4+7Tx13IwZkOxyxbVFcppbKBoUAyTnJcFzMO/IKtNOjSKfJD7dtdnmb23znMo6Qb5vZB jpQKGwmlo0qbVU3i0OtPlMLnwmLqVXFj7FHouZDmKxD9AQtdWO4ccKnl/qpRugY0B2Jz9yijTaj yxZ/mnLHo2UkofJZVS2l8UhGKFEjktI1CZkUcsnNEdEqadeS3WvXJWmjeV4EyZYYe4wsxtefw7G UWZ9ivVyPpkq2KgpHFDO/4KFF4A6v+mv8oFuYlVq6vk1mktmpK4sMO9Os1lVGubMcmnNFcjCDqx JTNWTD9wg0J078N5xswhEwBXtK7p55RA/bYqoXUYQhppa1UPtbc3aCi8f/EPsodmdksrSmYzLiz 3GoB6AqIL7lZ3lP7/foNL78GzyBYnxqRjg9knP8XkC3BFDitQ5uHAhTWWqO3mLQ4lM7iA5qB0bM ZoVCYfhUiLZaS+Ive8w== X-Authority-Analysis: v=2.4 cv=Q9TiJY2a c=1 sm=1 tr=0 ts=6a3b1fcf cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=tH4yzZzyKPjBQqKxX1EA:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 spamscore=0 phishscore=0 bulkscore=0 malwarescore=0 clxscore=1015 impostorscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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: 1782259715845158500 Content-Type: text/plain; charset="utf-8" No one uses it. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.h | 1 - target/riscv/tcg/cpu_helper.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index d6c5d6c1db..7618110412 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -646,7 +646,6 @@ int riscv_cpu_pending_to_irq(CPURISCVState *env, =20 =20 bool riscv_cpu_fp_enabled(CPURISCVState *env); -uint8_t riscv_cpu_get_geilen(CPURISCVState *env); void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen); bool riscv_cpu_vector_enabled(CPURISCVState *env); void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index 822c9fe483..baf5cace2f 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -526,15 +526,6 @@ void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) } } =20 -uint8_t riscv_cpu_get_geilen(CPURISCVState *env) -{ - if (!riscv_has_ext(env, RVH)) { - return 0; - } - - return env->geilen; -} - void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen) { if (!riscv_has_ext(env, RVH)) { --=20 2.43.0 From nobody Sun Jul 26 12:29:01 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=1782259746; cv=none; d=zohomail.com; s=zohoarc; b=nEbtLmp8KSphNWrmN9aLbsSTj76ErUO78wyvYzLvvuISgZtl3p/0uHcTjyYv04DyvebQn3kD7iv0elvEtYK9RS2USUVwXmfHyQsujsaFCPK4dYdA23YENLIcgX059k/4jgDwehDA4r1uQnLFGfYwJ0O9foUMz0HGqLtRyKwsDFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259746; 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=P3lydCQDXPqvzkivEXgkdj+wjXFKn1TxLNJlSp9IHyY=; b=KiCE5m/cPokBRCGub0aKqDMSGz3FWtQ2Ko2hSj3Diw3EDbF8jWNaIGjL9vPG98J7hPFKjjKDqJL/tnngIOtpQ5eGQnjFREJ78PbLjqEpNVBUywlHzHYgNXY8A3HoKQk4tbVu/Wj3gWwz49G2TKofQixx36dsx0ugNCbQX/MQ8XA= 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 1782259746330166.41232135719372; Tue, 23 Jun 2026 17:09:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9y-0008G3-S0; Tue, 23 Jun 2026 20:08:07 -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 1wcB9k-0007wb-0F for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:52 -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 1wcB9h-0003MU-IG for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:51 -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 65NJwqNR706773 for ; Wed, 24 Jun 2026 00:07:48 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 4eyp29ktbx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:47 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8de2adc85efso9377546d6.3 for ; Tue, 23 Jun 2026 17:07:47 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:45 -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=P3lydCQDXPq vzkivEXgkdj+wjXFKn1TxLNJlSp9IHyY=; b=hCS0GdrWZGHDbi6k1XupNYlcj27 rIqkdX8D0XAao20gLd9an0YdeOAEcwKArorCDbbxvKshNbSkTgjInKh4swvgczCA 2r57XhcgkhF1BdK7IgVT1ZOpGZyPgIHMmE7/97nsaZKeuMH0ZSZbkpEmViv3q1sc KObjEB5Szg221Q4eBRAKfd0+iryembt+ON5mv+IgGC2LJnmoZkWso0jzeD4Q02qy 6c0TNt9d/oBJEXOwuJ2ZbAbrovoKePisNdRmduGEDI5HdRxeG3aNNGGxvPK3WsVr UOMS5v7vfv8pcYWc3qpZNwjTdP+7Z8Tb/qvLbk3MiUjUYYZcAwyNUW1GNog== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259666; x=1782864466; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P3lydCQDXPqvzkivEXgkdj+wjXFKn1TxLNJlSp9IHyY=; b=TbGeKUkvVxy8100QgY6NVJlV03LFMWPu93r3vU8irX4Imi5pU+PQehbrqg/PNQeCsr 7g1aJumXvGwusFg9zpj0gUwh9nyjh7eZAcyUe5/CtxaKJxpdJRQDFKWh3mR7f0KBKI2L DrudOswtXtNPtsT5QI9HLoirx/FWAMNArCB2Pjz38v9Ob6C093HBozMY9+Efgm/XUlxg QJ2WBvVMnXlgMK2nG5JzGJSy9RNR8Nn3f2JqgUyNm2U6DeIYMtbBJnTWbO7vxRw1xrNA PJPQ8j2pQJPBGJyTJ5PpEgSR4tVoK87seFvfyw3BpnGhOht1YDGOc+0JQr4LL+InNy8e dCpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259666; x=1782864466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P3lydCQDXPqvzkivEXgkdj+wjXFKn1TxLNJlSp9IHyY=; b=Uwen2Wn3V5uptCeCADeAVLvao9GG2XjBrvioR4qNbLp8jbvYcoaUWUUt1epkgNrsL3 jjJTYD5yYWb676MZ8+TSuvny5+WzMYVlhQ4y9mRm72tLFG33TMdjJ5aPqtwDNIe6fCdY VbMGVqJkiG3CpYjt+w9lu596WiR3bMmBcaq3ptE3AHi2+D+GlCtcBui+uL1EhKRXCFUd WxsepOnnalZ5ihX2yyJHRCAV7IT9RCkv3okQ733K0nC21dDp8y+kfJPPj5grgKCC7Dtj b6Q4XxeQoHxxh2l8MFpekbui6POM4DuQLkM40vsp9vCfE49wqOqQ7iGaUL9OXQvP66L0 N3mA== X-Gm-Message-State: AOJu0YwHdWssKpPMA2Yb7WOHmPiZ5TkmNnk9MK49dShQOnmW+mmHjgt3 +UsUQIdK1Z4Ds5i2ZlZIn26K5WROJRXbJAo0gUAwIXnmGx6UgDN0yeJpVcYjivtr6kJYuoBG+Jp RbuCNe1orKKWLi70BbOk3XKsfAA5rfTFxIFFUlwktWiJlSYCEvq6tMCGB4v+15hPS0A== X-Gm-Gg: AfdE7ckuojagHCQVF4FdKORW8Mc2kDtTt8qd2Hq48lSsZ78NngMzshYTBKInnr3LhX1 FjwEkhOR/v3bRrV6a/4av7IYrAl/s0t43tcXTY/r7b5OUoG6UvuIdlvNrWGXMC9yrLAen0Tu7nR 0Idf2jRL5NXQNTItJLz4WMeHTWCZAobqw6jsg9omkvP3natNz2kOE/i3b0PKZGi9n7cAVo2ae08 oY/GWld+V+9twmpzDHhdf1M4QTpFRaZpMNRf8TqCXP3pxTW6dDwBp/OZhR6SEMawlxcPY/l/egS 19XaF4/5HvINLPSfYipW2KU/0X+ww4RXW8Yb9jr/crrj7dFP500Jc1RuwjMovALZmYWiqC7kZp+ 2KmpmXA7vxvTH/wq7HM4JUQ6Ku5uoabq3RjAWIFmy4mRJ3w== X-Received: by 2002:a05:6214:469a:b0:8ce:b018:89e1 with SMTP id 6a1803df08f44-8e403123d56mr89261766d6.32.1782259666250; Tue, 23 Jun 2026 17:07:46 -0700 (PDT) X-Received: by 2002:a05:6214:469a:b0:8ce:b018:89e1 with SMTP id 6a1803df08f44-8e403123d56mr89260856d6.32.1782259665555; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 22/24] target/riscv: move riscv_cpu_set_geilen() to riscv-imsic Date: Tue, 23 Jun 2026 21:06:29 -0300 Message-ID: <20260624000632.2149359-23-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=LdAMLDfi c=1 sm=1 tr=0 ts=6a3b1fd3 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=O0V1kVBzSblzqwnZNHcA:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-GUID: fGPdAkqpo4IRsuw3ufuQ267VFAvhCpwY X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX21j1j5+NtaJb DUI3CQmxirYO0CmdEhEIVI0k8t9q92bQBNliIHgu7Xk89YLc1IUTQCyJLSYSsfe1Amm1K5N5hlT 36xZ2INMasYPW1nD+VQoseg6YzVkJGE= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX5RxyhC8KPR0v HhUSeUXErQaGFvB5tNdyAkx01plYuKHUs3/Ws/qvlIW0vVNjO2zXtOgOQr2LrClmzFkhAPZIMOs jT7Y84S7Z/Bb82Qiklpenp0VFYoxmhR0aJH4L9p7Pj4TQyEfEvnyprEI9ZKfMxQwpjIRXVnX/1B 6l5kY75PHT01eF2ZL2dlWRZJNqrSdPsyQWwmCz1d8/ADOVx3NXgxXcMK5SJJIa95wfaG/AEQEuG +4jkpimkVQTLzG8PcOFKlPP4YHBdOYU58Ohd736mB4BcSAtdYUID+qyYCZlWx915S/od9nYKDCq c3jsscfsFIKS+qr1pdytfypo1xPwY6rIi+l+y+zDn4qzLQRPGSEe8RqUYm/E47q/NVGzW2gyIJ2 gPlbBQnKixLcOrEOFzmLuXvqADQRzg== X-Proofpoint-ORIG-GUID: fGPdAkqpo4IRsuw3ufuQ267VFAvhCpwY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259747946158500 Content-Type: text/plain; charset="utf-8" riscv_imsic.c is the only caller. Having it sitting in the TCG only cpu_helper.c gets in the way of --disable-tcg for no good reason. Signed-off-by: Daniel Henrique Barboza --- hw/intc/riscv_imsic.c | 13 +++++++++++++ target/riscv/cpu.h | 1 - target/riscv/tcg/cpu_helper.c | 13 ------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 7e5b5349ba..ebb55191c7 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -46,6 +46,19 @@ #define IMSIC_EISTATE_ENPEND (IMSIC_EISTATE_ENABLED | \ IMSIC_EISTATE_PENDING) =20 +static void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen) +{ + if (!riscv_has_ext(env, RVH)) { + return; + } + + if (geilen > (TARGET_LONG_BITS - 1)) { + return; + } + + env->geilen =3D geilen; +} + static uint32_t riscv_imsic_topei(RISCVIMSICState *imsic, uint32_t page) { uint32_t i, max_irq, base; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7618110412..7a4d8abe07 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -646,7 +646,6 @@ int riscv_cpu_pending_to_irq(CPURISCVState *env, =20 =20 bool riscv_cpu_fp_enabled(CPURISCVState *env); -void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen); bool riscv_cpu_vector_enabled(CPURISCVState *env); void riscv_cpu_set_virt_enabled(CPURISCVState *env, bool enable); int riscv_env_mmu_index(CPURISCVState *env, bool ifetch); diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index baf5cace2f..a5d864cd24 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -526,19 +526,6 @@ void riscv_cpu_swap_hypervisor_regs(CPURISCVState *env) } } =20 -void riscv_cpu_set_geilen(CPURISCVState *env, uint8_t geilen) -{ - if (!riscv_has_ext(env, RVH)) { - return; - } - - if (geilen > (TARGET_LONG_BITS - 1)) { - return; - } - - env->geilen =3D geilen; -} - void riscv_cpu_set_rnmi(RISCVCPU *cpu, uint32_t irq, bool level) { CPURISCVState *env =3D &cpu->env; --=20 2.43.0 From nobody Sun Jul 26 12:29:01 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=1782259733; cv=none; d=zohomail.com; s=zohoarc; b=Mqg7Ru+1HnK3gPq7tPvfTCDHLkwBi8Vz92VXZe2UBh2MQ+laBFDLoHcneAZjMi35wn5SNt5LxtFEgkau+gEZucIRre1rKJ5LFdsP5JKDJIe4CwKPKfl47bkg5mWK72h31mY47XFUL74tIu/TxvwnIIV5bB9Q50O7OigmNFYBduE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259733; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ouV5MqYWAmtAndi1dcMkZCZv9z3hKC7UIjKZVhs6NcE=; b=ZOh8SOfCQc56QwZSLEmbmmZ+g50KWy7rjZ9zzL2v6xMVQ3xRiaLGFu98xa2AiYsQlHdBm9NxQU3BwpwvaQ7S/JXktJk7oapfP9UeuCuqmI3ggLS4FMLd7Sdk4Je4fwoS0R9/NgmzQrBPU63Pk5L+G1SfrSo7RF1ukUdkMAJKzJE= 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 1782259733036141.34255863664316; Tue, 23 Jun 2026 17:08:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcB9z-0008Gw-EI; Tue, 23 Jun 2026 20:08:09 -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 1wcB9n-0007xe-MT for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:58 -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 1wcB9l-0003NI-Bb for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:54 -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 65NJwGuG695863 for ; Wed, 24 Jun 2026 00:07:52 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 4f00ev8qsm-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:50 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dbc0f048efso10798636d6.3 for ; Tue, 23 Jun 2026 17:07:50 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= ouV5MqYWAmtAndi1dcMkZCZv9z3hKC7UIjKZVhs6NcE=; b=ParsgdvWNuuaRbiZ NJBi9+e0qERwpJ7LgRdp63uHd7GNu+x6VwOrLXhs2uCU3l9KucfpMtU4fcSty2Li d0YlRyTyIyUj/VGDoKXey10vQZmG7t7hWWXccxzu/O6AGylCQh/BYObDnF4dfnzf LXDr3IvqlHHcyfLul8N1gOuWLl6Oy8hcfflakaR0P04p4vepZORmD1AIKAAChzzj 3iyck8uuyOlRNVyjs1r7ayGAEyeYtZuY/vzVeYAYXHJkLSs++G79BGPGTp5U/GCh hBqc7R0G2Q0r1N9zka+2AxO0R28n20Lebz7cf3UmuR0XpagYwxCTWC75z8cDHFsu Rqc++Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259670; x=1782864470; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ouV5MqYWAmtAndi1dcMkZCZv9z3hKC7UIjKZVhs6NcE=; b=KEMq0P4/yiselAFysq/e0SDZ+vCVBdfh35SNAO0we4VwGg3h7Z4Y7xkv6a7vENdjYk 7WkrdNaAI0WG1H5e9htanLmrUFunf1KSELzec/JnWCgO21H734d0lWrHLhdSwULfOqhU as8vBs+jUOZFmalu/vz/Y7zqJceZAu9TCOFm76P9zXBTF7UJAjJ5HghGE9Mk3lsxfTdR OS/SFC9uLgpv32/1hWeRdR+BxvYpBhp3eb0Py1uyl3D7hzUoKsfarLDCEgKVZkh9FUhr gRGBeqwH9xUjRHyAxF2tTYEBB5Bp4l+PxmOhACGM+co4emsJDcf//tkiQ2kS58hOgUps D/6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259670; x=1782864470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ouV5MqYWAmtAndi1dcMkZCZv9z3hKC7UIjKZVhs6NcE=; b=GaY93p75V++X3zae/Oky3ZFi9B0XHTaWuECAiY5/+BWVpDihyNMfDnP9xIG40tBF/F ef/WAkUDzSRZBjRpD3g870Z0832hB9Qyo2gYnuKKOhafSVCcXuNdbAby3ALIdBVEUs4l IfDCZF2JcZlzg69YIFcZ7vHrKJ/9qtuNDGveDxeHdXiTWqYuVXKTyuVPsW4cd2LoPseO i17YRJW1lvidUftOBYIkPAP7cYhqbaaQ6CTcfdyq7ZfGoDRdJgbweFobt1f3ckErM8Ht 6PlbshlPOYPG+6T2oqCu1gZRF8LIfnrvAf10ciu49zJY77ph3OsibPX4CNKDVXFyRnuF LQSA== X-Gm-Message-State: AOJu0YyzCm0wlFHpWzUQamJW/UvxeM97pR/6ph9FAdUmAsMjofxtUtkW wMRokisHOGAzrilflwXj7cCkfSK2lf1PShEl4VJ2l7bKgj0f4cW+2Of/RfLGnhBin3zSS8YmNWc q6Lcta0KSFlTocK8ckbpdh09nNuDyvNitWx1e990d9KCRIbQdYoTDOP4uKPrSfpwLjA== X-Gm-Gg: AfdE7cnasF4mLERRs4C+VVHiAMrUWIZmJWkhX89kWyGCfkHNtbn5HF/n182kv7Mzjtm z6oVlDZnWtkvADUIFVt6nqZnzpSgRX+q1MKN8l1Tr6vRxWwvH6seE3FECEXrKHOu13ypkS+0oLi dUVaUBreXgTWlZXLjqj7DAJenob3XRO23z5Y1v6eJIniGtCvU0lLr9+SBCcp5YBNnKQlUOu+gw0 7wG00OzMlWJ7M6JRO+Jz7N8MBR+FUWhV9pVLLW+Xi9LwC7QDy2n9iK6usTCPXkhlHjIXQQX7nLJ YmbkjHfkrlXkASzjMvOHBcflIw3Vom/BFn+X2yktYAHu+czn8icr9b3AwqHZBWrOnhKDECqHeFq oy+eR1IObcFcDMBWS72ans19DvfKZoKdRVbK+ZBIWjEfzYQ== X-Received: by 2002:a05:6214:130f:b0:8bd:de6d:c340 with SMTP id 6a1803df08f44-8e52fda08fdmr26382776d6.26.1782259669956; Tue, 23 Jun 2026 17:07:49 -0700 (PDT) X-Received: by 2002:a05:6214:130f:b0:8bd:de6d:c340 with SMTP id 6a1803df08f44-8e52fda08fdmr26382086d6.26.1782259669340; Tue, 23 Jun 2026 17:07:49 -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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v2 23/24] target/riscv: move riscv_cpu_set_aia_ireg_rmw_cb() to riscv_imsic Date: Tue, 23 Jun 2026 21:06:30 -0300 Message-ID: <20260624000632.2149359-24-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX3Q2jMDiK0jpw +UdUfWLjKddECJD4PP5EvDA7Qebkz4sdNH9rxRnnPVsKw51grYkLkdj4Ya9TqxULPcx7Jqk7ttS fVmIb30CvYnF0znvZ5nHlTftcwlHVOw= X-Authority-Analysis: v=2.4 cv=JbaMa0KV c=1 sm=1 tr=0 ts=6a3b1fd7 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=tRk87D2_djSq5c8C55gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX5o+RLpkVw+sT vowpVH3JZDB1TtwGF5D7jq3My9wSb/DjwwaBfmsoEChaWz/FZjOE+gAxLcNmAg5Q1E/xlOqvj6+ 0NpVbAkEQ4+a6fNc+Bh+6ZJv3fS1eDJD/IE450lR4Rpxg64W0y088A+S99ajrVcXC9JL2J51G8P mm7IgEnguMoj3mbgoaOfttD8Yt4o+ccAo1FZ6fwg++Edo7LskSuIbC0OXWWfDBrOZSFYhtqmCln xJ79X8b4mTsabFlMivG18rrsh7vuLbLNU17gFcj5/tXKjSWHO/AqwSVkCpKnancembvwbVpcOlj AoZcf/XYqo0TuNLy8ZXVPK/vYvkKRSG+O3+vjP3Uv1sRMJZp7Ejq1Plz3A3W7Ysq7icq177yxSd hH/fGCzP5SKQ6kpDcIM3vPZXSQRZGg== X-Proofpoint-ORIG-GUID: y72tnwqNiGPbQpBncVS3ieny31Qeyfm9 X-Proofpoint-GUID: y72tnwqNiGPbQpBncVS3ieny31Qeyfm9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259734016158500 riscv_imsic.c is the only caller. Having it sitting in the TCG only cpu_helper.c gets in the way of --disable-tcg for no good reason. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/riscv_imsic.c | 11 +++++++++++ target/riscv/cpu.h | 3 --- target/riscv/tcg/cpu_helper.c | 10 ---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index ebb55191c7..d6b46cdca2 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -376,6 +376,17 @@ static void riscv_imsic_reset_enter(Object *obj, Reset= Type type) } } =20 +static void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, + privilege_mode_t priv, + aia_ireg_rmw_fn rmw_fn, + void *rmw_fn_arg) +{ + if (priv <=3D PRV_M) { + env->aia_ireg_rmw_cb[priv] =3D rmw_fn; + env->aia_ireg_rmw_cb_arg[priv] =3D rmw_fn_arg; + } +} + static void riscv_imsic_realize(DeviceState *dev, Error **errp) { RISCVIMSICState *imsic =3D RISCV_IMSIC(dev); diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7a4d8abe07..c9dfa7daff 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -680,9 +680,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint6= 4_t mask, void riscv_cpu_set_rnmi(RISCVCPU *cpu, uint32_t irq, bool level); void riscv_cpu_interrupt(CPURISCVState *env); #define BOOL_TO_MASK(x) (-!!(x)) /* helper for riscv_cpu_update_mip value = */ -void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t pr= iv, - aia_ireg_rmw_fn rmw_fn, - void *rmw_fn_arg); =20 RISCVException smstateen_acc_ok(CPURISCVState *env, int index, uint64_t bi= t); #endif /* !CONFIG_USER_ONLY */ diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c index a5d864cd24..e0306d5d95 100644 --- a/target/riscv/tcg/cpu_helper.c +++ b/target/riscv/tcg/cpu_helper.c @@ -590,16 +590,6 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint= 64_t mask, uint64_t value) return old; } =20 -void riscv_cpu_set_aia_ireg_rmw_cb(CPURISCVState *env, privilege_mode_t pr= iv, - aia_ireg_rmw_fn rmw_fn, - void *rmw_fn_arg) -{ - if (priv <=3D PRV_M) { - env->aia_ireg_rmw_cb[priv] =3D rmw_fn; - env->aia_ireg_rmw_cb_arg[priv] =3D rmw_fn_arg; - } -} - static void riscv_ctr_freeze(CPURISCVState *env, uint64_t freeze_mask, bool virt) { --=20 2.43.0 From nobody Sun Jul 26 12:29:01 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=1782259719; cv=none; d=zohomail.com; s=zohoarc; b=ZFPHTxf0/ELhOu0MC6pHev2qGrOS31zraKO0udVo8vLk6GM5ylyuWI9wC9RN07r4jCsVckHBUNxpKai+t+u56xvsBkPhgFjIrYqf3uuse8fuKJnjTsAx4XYmybitPtENHh7bMSK9w3rgJ/q562LA1IBITmtZNXtDUGMoPr0+vno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782259719; 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=novCirPSAB+Ybo1QyBdlWXtDjYfXG49M7VvGodoMtJI=; b=ZVYDPjG9vXwqsfs8t0fgnNlFNmPvOEaF//LIY2Ez5kxUdc87zN7wI5pBrnmkRNZZicdGKWb0iDFwF+JAJJsfANQ2iMkBdDBXvHjl++LHHIc/Fb+ooeC6hYK2SDYAWCtLEQDyjxl2TRsOGz1trXBNmAfvcOVbSMZpVeO6cl0MBNM= 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 1782259719675395.0113928018079; Tue, 23 Jun 2026 17:08:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcBA3-00009D-DU; Tue, 23 Jun 2026 20:08: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 1wcB9o-0007xh-PH for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:08:02 -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 1wcB9n-0003NU-5Y for qemu-devel@nongnu.org; Tue, 23 Jun 2026 20:07:56 -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 65NJwkau706574 for ; Wed, 24 Jun 2026 00:07:53 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 4eyp29ktc6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 00:07:53 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-8dd4e82d2c7so11243416d6.0 for ; Tue, 23 Jun 2026 17:07:53 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8df81cdec56sm142422976d6.32.2026.06.23.17.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2026 17:07:51 -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=novCirPSAB+ Ybo1QyBdlWXtDjYfXG49M7VvGodoMtJI=; b=MxqoyS5E0opbuHwGMPJbRD7EnkH FJrHR2nB6GcNJLUCaeFhOwNBExhmU/78LhM/EQaet3r2V3wiz9zxISDaR/zu3IUE 8iJqSF1tjMN6w3hjaDJVvy/xpQeV6KnCvD3dQuhXq58/h+9R5nrcxoZwhO7pMcew X972x98REP6zJyYAqETjaI/sX/V+NwVEVFt12TLyOE3Ua4RQ7dHRXLct1vGqQSjk XkGkQEqGqUJLmMIkC0GnhDn9wCZjt4g83MwlyoXSQbPkwvzeJgu+xDWrVOwQS9Nf 5i79ur90zJj5vogKBkz1gOq5Z9LT4jC2Lr4pRrWoiCg8y6NkITouvAXRzaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782259672; x=1782864472; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=novCirPSAB+Ybo1QyBdlWXtDjYfXG49M7VvGodoMtJI=; b=Dq550JMq1ea9J9BEK47Qa11op59a/FYDivf3XMM1NA/v3s+rYUV8F9TI4bOrVrIGLs TAhwYEuL8UhMKe9QIaXEBIMyfYFTMNBb7/C17YJhAJHSlnyIbiR9kcccADSe6jMuAV0L iAJ6K90JEUDPKzjEZV/A6i0xHGOSPmOpI26XuwsFw9J+5r5R//XXJAu7adG3jRXZq5+y sFJ8hURI5ktBOrzZboW4bJte0KAOuIQDNX1aOh62mq19ctmPsF0xu9kEXSwUr/O9EUOA giaOkUHn4THn3gcBUE8goZX0mHvSGJ5GCIV+seweTtHmhFgafgQWoTa2QpLrLwjtv8kx EGyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782259672; x=1782864472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=novCirPSAB+Ybo1QyBdlWXtDjYfXG49M7VvGodoMtJI=; b=djyLI0EILroKE1h+AhMRjyyCCSxNTi7XQa8uX53sMphnFIGNyaDlw5FOEG3BtqHGH3 tR/8z5g0eo4bNumYT6D5cdTkmGDr80hso5OBDiKDY+rY56ZBJcRmvTdr5Yg+r90R48j+ 9pYT4sY91cI2UH93cwQyYRHqCrO95UQTTbyOhu0BYzmEyj5rWuRYebir7OueHsm2qLt1 w/csTCsd+yIEezOl4x+1k6UTmLygH6Hu4dPg1wUP6dyu3n6QSYn+0gaii7OKAEWKmBnW u0lxG4VLLD4Ot3MmIRSzAA0OjRZ+SgB2kbnGuIsuxUtQiyiHv1KkU/YXmGRQdn3FMe/O E3JA== X-Gm-Message-State: AOJu0Yxu4ONHBNigYoRuUqOnmzQmqKIRBnag6tCGKr9w5kcoglW139zf P2c0bQql41bCyjnWxGe6bSlJwlQR2yTJWRfN4i3dWgeXhZNgR3aRic8fuyliLW/85+3pb0LXPO4 5FsHvoikVzMnnNldpsfsuf4fIZNseLPIrNqLLau6GvAQ7iQr3eHjSV4Fyr9wX7jKBIQ== X-Gm-Gg: AfdE7cmYkQu6EWtd71uJeGXM/dHH7pj9t2UzQSfdKCAZ7EJcV5id9/gRygxQDLt1E12 JQ93HdmuLrk2CXRPA43z10+FhCVAG2Yl9kAgv5Pml3seX3Mg9Y0D5AsIxpOrMEr/SamP7pXFmVF zbr6TjgXK6acwI06gjO2mUKRmgsWA2FgncKaKCQh42GlOImNZBw4BKw2GYOte3o91J0Va5pnSIP AfiVYGYk938QFxGl44IYOg9NrenG6bwZIA5WXkMlzTujpj+MO1gjSgj6zccUgYh9QtZZnfr4bpt BwcqyEQVz+3c3VwYbF+aoh0XcKu9zW9npX0ceKqsglHbNqyPm7d1heBPX7xRZ8gmOFykbhY9ITj FsuSY86RJ0ZRuxCNR1vun2VSF+l4BWUhkN7d9mnvMYgDhuw== X-Received: by 2002:a05:6214:8087:b0:8cc:d74a:8dff with SMTP id 6a1803df08f44-8e3b44488b6mr86598006d6.5.1782259672415; Tue, 23 Jun 2026 17:07:52 -0700 (PDT) X-Received: by 2002:a05:6214:8087:b0:8cc:d74a:8dff with SMTP id 6a1803df08f44-8e3b44488b6mr86597616d6.5.1782259672034; Tue, 23 Jun 2026 17:07: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, pierrick.bouvier@oss.qualcomm.com, philmd@oss.qualcomm.com, fritchleybohrer@gmail.com, Daniel Henrique Barboza , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 24/24] gitlab-ci.d/crossbuilds: add riscv64 KVM-only build job Date: Tue, 23 Jun 2026 21:06:31 -0300 Message-ID: <20260624000632.2149359-25-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> References: <20260624000632.2149359-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=LdAMLDfi c=1 sm=1 tr=0 ts=6a3b1fd9 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=BEvAcZqKd-QGyfCP7A8A:9 a=1HOtulTD9v-eNWfpl4qZ:22 X-Proofpoint-GUID: VpTqXdgt8SgmAzjjDvBYISL2KbhhWXr7 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfXxoH1qXALaeid ud4xeG3m6+gECiXt/mdWyyogEVIh96mZvAWH5oACec8Ud1B++wY4vUYERqavsTeb/skxtst3hMT uGmEVfYMUFUJ9GiqMvjqW16BYGeQYu8= X-Proofpoint-ORIG-GUID: VpTqXdgt8SgmAzjjDvBYISL2KbhhWXr7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDE5OSBTYWx0ZWRfX9/PEiuJ4DlPb iNEHgmeEyOBWDfSQDRhnuvdo17U+5QSclpfcOUZQiKuMtWlczi5Za9a55L6U0wZFr14cUyL+bKN akyT3OXyab2yPY0o6Y4IFkeYap+VKkLO6nwViCC5BGfr2blo9FWbJxRXpwe6BTATWjDJUeSQEEt /cHclHmoaFOyj5F72myl7+F4pA5/SloDKOjxS/VmYfxjb9/2nq3mJRH6qxfrHmEfmc+r2eFRtL5 r9dt/5mUW54UZ90WW2vD772IuXQEi/FiGoZnZRunJTwDjhPBOAhH/MRbOKphoTOU87NrIdW50bQ XoSjxUIJBpHg17nnYvYaYy/vBv+/vPHLgJozhsRX1fSj45fflFN1TTnWdEMyYferquKPGzogR83 ZMuMguy1BNJL8nhlLxgKQ++B/wFhUkWTtUJeio6TbWBwKwYlASnPHn/nhfGyCSLDSRuiiu67uXy fcvFqCH9I48ML16/CAw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-23_04,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 clxscore=1015 spamscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230199 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, RCVD_IN_MSPIKE_H2=0.001, 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: 1782259719844158500 Content-Type: text/plain; charset="utf-8" From: Zephyr Li Add CI coverage for a riscv64 --disable-tcg cross build. This ensures that RISC-V no-TCG/KVM-only builds keep working and prevents TCG-only code from being accidentally pulled into common RISC-V sources again. The cross_accel_build_job template enables KVM by default via --enable-${ACCEL:-kvm}, so the extra options only need to disable TCG. Signed-off-by: Zephyr Li Reviewed-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- .gitlab-ci.d/crossbuilds.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index eaeeb533ce..a823aaaa21 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -59,6 +59,14 @@ cross-riscv64-user: variables: IMAGE: debian-riscv64-cross =20 +cross-riscv64-kvm-only: + extends: .cross_accel_build_job + needs: + - job: riscv64-debian-cross-container + variables: + IMAGE: debian-riscv64-cross + EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-features + cross-s390x-system: extends: .cross_system_build_job needs: --=20 2.43.0