From nobody Sun Jul 26 12:33:36 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=1782156884; cv=none; d=zohomail.com; s=zohoarc; b=EXajAKVn+iWtBGh+eqBrgCI0hMeGcTOmVGoNUoWUn0C7qfauzLbB/xS0MeE2EUhmjsWMTtAEHZzmqupxg/M1unuGWf66tIUJMWXwRmm9BdRhRpMVqBAUmq168NWGkRjm3mEZhWxKTsQOUqGPY/66Iu5UxSrFp/N9uwVSKNUyaQ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156884; 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=JlWaUfos7yjI3FU17LUyASkuG3ZHrPKrvb80yV6fXxU1/7Jpe8uNVz7wk3FWorHLcXpm6eDLt3mq8twCxAD5XsHUOKxaKxkFyiIxMTPsi8YEPyHh4a/LLfidbCjHkzccImDDo4geWqbMie/rw3L1aHvOYlgGCUBsfiF808FGFPc= 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 1782156884221411.88402342407505; Mon, 22 Jun 2026 12:34:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNG-0000OI-Kn; Mon, 22 Jun 2026 15:32:02 -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 1wbkNE-0000NH-VI for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:00 -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 1wbkND-0001kE-D0 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:00 -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 65MFVngi3842478 for ; Mon, 22 Jun 2026 19:31:57 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 4ey2yht16q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:31:57 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-915f6ff639aso1220436085a.1 for ; Mon, 22 Jun 2026 12:31:57 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:31:55 -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=IUIxQuiyYjd+lRb3 H0IrpJsRpsj9pt+5/lYRRo0yT+kGXPSxi/deB6knldGIUS7vjFiNtlfXDR55B7Jd qQ0jvakA01/AI9+ABpIFEfN4vsRnXDHVZCcFKK9Mdm7R+QsUwYUVsNbKI4IaoBce +QYaJ28tdTPV+HQddirGyd0WsdLeQ9+wZC7lZ6OoWKgOMpdkVFr9bpSrhcEf0z59 tGcM9xhLwWy4J+cY8V28FoQhIjui35V1GBKAiWiZV1cIya9WqbyaMoNMEvBRxwap ImqgDPtvUBDjCMe4ppNLEuLksJXVbn7ikCjSccibjwCHYxtJBpKMDu8OMiYrKQ0L qAD7RQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156716; x=1782761516; 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=hVmtKH82XCL8qRC8P3dcosu3pXlDzR3zPNwo469Vgc+0hBWl2L5E+FN6HUFTxUA0bl h+Trd76GNvc18icoAjicsl0NmeUs39fh2ANymsiOCckIed+EPg/vJ/gaKhDlRWh8Iu5l jUX2qDwGtkju5Nu+pia+CdN2OePhk0aDvT6x6P9FtMlujfCAOWIQp5baqS2df1E76bm4 RIGqf5bim1ATOAstmxvOojigvs0TVCMUI8zzvUNIviur5VUxs0bceXVx8Lj84C+x6IEl HfvREk7uLu3VIF0tAw8GbT9cgjl9Dmc56wJ3AtpyzktXeeK7MPDi6ffUYj1e/X8Yj+a2 ynuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156716; x=1782761516; 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=Z2q7BHjhW5E6fYZl0WG15OZP2vuRimuv67g7HiWvsKRoLpfB1h6+M5BSCrLC+An2Zn oSqFCvFGm4lZ5k4OAZyFDYIF8me0H/TObRvipxYrzuVjZ2U7RW45wpY02Q0GJteA3GUb GKCWJlq1mgsXKeCmd543QIyhVa9Y9zROZTcYBlNZxfa8WXGAQ7aRPLOHPaa4WsN5gXwb AiwwtbVUF7erqFCJG3Lk4AvAf6++4T72tvHxMbpNiFWg7jwUKrSjcbSyYYrFuByoNOWz XYX0knH2cNj/SzEdeOZoyZfZNKHl1cfV0DJy0V9WupD74IfVjSnuxF6opKk39AYcg9rr R+lQ== X-Gm-Message-State: AOJu0YzsernU5jMxY6ZcjsJNPc7kYFk4ankG8npXDSCdwtMXgU31nnlk 1Cfkt6iP/PMIgUTxNAOdulfHc8ODFghw2HXFrySboYRu0sMeMrwNrN0bUcs3tmSEaiUgL+V4qLd XS+pS5Lh/zdL8IZVFvoDJUAWsOwh1k+Psrxkmm0s5k7PyTmwi0NiZtO6YH6WQaAl+Pg== X-Gm-Gg: AfdE7ckvR+EeEC3owjxzjRSFo8E290ItUHsmmD2jGla7XKayOSRMAjZmvvBwgIPRlXJ hja031AQbLEetQeWNLE9a2qfTv6zD82ocCnkzVCnRIt5RAkh/XkNbB5ajhAv8p1wKrYRaq2v/o0 22fD7EOTgZDp5nBz3kJRohPW/uT8Nlu6IT5ZqzV+yzmPI7oLZgFtfujC7IfkH1hHb3VwXlbuIct Lz74TKaFfwiA9mbCQ2ZHMlrTCfWY9DR2ljheXrNKbLXEc0NPmvl1DusPk3febQvHYddg0/ZLljh IltWjPCScxFfAewGGFQeZHm2HfH6y7/yeVvdfCajhAfHIx/Bpy+FbHnICB/uSEMX53fqYypiUyj SOPpDETGdVi/v1BALqSuqPFbrJ1HCToMzMgW2GVro0nI5Ag== X-Received: by 2002:a05:620a:630a:20b0:925:b3cf:5c9c with SMTP id af79cd13be357-925b3cf5d64mr260882585a.24.1782156716513; Mon, 22 Jun 2026 12:31:56 -0700 (PDT) X-Received: by 2002:a05:620a:630a:20b0:925:b3cf:5c9c with SMTP id af79cd13be357-925b3cf5d64mr260880185a.24.1782156715977; Mon, 22 Jun 2026 12:31: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Zephyr Li , Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 01/24] target/riscv: Remove unused tcg/tcg.h include Date: Mon, 22 Jun 2026 16:31:17 -0300 Message-ID: <20260622193141.1449724-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-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: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX5m8CuXGI7YgJ 2Gfj32JUrEI8Tm7Tee8pw+dOeoy9tvKTywzxPvgT+Pj3eGBKulucy0AMo7ywG7X9Ns2paT8HCgm +9HW0L7qR6thUGqtJq26Tl9ThfkRoRw= X-Proofpoint-ORIG-GUID: osJWepRM8UUo8H34Ipkh4F6wxPmxCG-I X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXz65/KFXUC+aH 6PeR6Ph1xZVOiwZWo0mWATISdgpND46PLEa5BV+eZaddGpdzSyPsdq45sQR8vvacfwhayyP3rJO CFIAy04g5kFpV3dQUZRg+TvxIJ4sCr36lkcTms3Jm2s6qStsEZfz0CTsHFsq28qKq/xjnxXjYcc tuFzw6OjGjxIU65t9zd2HENdwF0ZC96wX25jmITkAY5sb0oya7Xw5c+V/9hPACVfWlkgrhVeaXX ZDABtxkxRu4BicX++b9ugdS4hbTbyGG8abh4lmvFWLRNRZ5a2BwkG6vwH88TXUQnHD7NmJUl2Rk Pzc763pd8u6h+bkuq+c8lo3cA8CkN0t2MDxFEJeLYlOhqs1x5huCv/x9SPYELhbmhjrntwqfsW6 21a50xVQkrB61dOtZV1yUy+T+IfzeZEoMJ2GK7CIQfz4t02zldL2bO52U1sTqMjddx5BB45FlsG H1M3YMQcDYLTwVcnvNw== X-Proofpoint-GUID: osJWepRM8UUo8H34Ipkh4F6wxPmxCG-I X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a398dad cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=JF9118EUAAAA:8 a=beEPI9FAKrdLFu6WGxcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=xVlTc564ipvMDusKsbsT: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156886426158500 From: Zephyr Li Signed-off-by: Zephyr Li Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza Reviewed-by: Chao Liu --- 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:33:36 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=1782156746; cv=none; d=zohomail.com; s=zohoarc; b=VVWHKUY09XYSDwfFZN57HMpDlQZ4evNUuULp4m3SdBhHb2vGXKLI4jNnqGZKumc00FhuidDQsIQV92F6pprTzRIpdpcEsbPX3Bxbwwl8rE96EMLaEE9XfH+n6oLzOcmTXZLgP/5Xa4P1TIO3VbyTCrRf4jvIxMjPcVSqz1BrtQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156746; 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=syl834R6TVNkopHzNxnL1qVcUpWq0e1+uvxqHbeNVEI=; b=K7E5WCkuVuDYdRvh6czePGno7RF0inK9EIUKrlYk3Ix3x6SN+N14xO5OMFzVtMhXmvfcmW2IDo+hp0iO2B0LUTY20cuiwwRTdhYPx3xNLCOYosS+0P2VoGUudC8h/1URKbfxAPBRM9BoLhDlVOrd6nPwHbr1ZUK2i+axGLLUoU0= 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 1782156745944106.15335026102491; Mon, 22 Jun 2026 12:32:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNJ-0000PE-Gg; Mon, 22 Jun 2026 15:32: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 1wbkNI-0000Ow-GU for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNF-0001kh-Hg for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:04 -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 65MFXKe31571253 for ; Mon, 22 Jun 2026 19:32:00 GMT Received: from mail-vs1-f71.google.com (mail-vs1-f71.google.com [209.85.217.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey3eb9x3q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:00 +0000 (GMT) Received: by mail-vs1-f71.google.com with SMTP id ada2fe7eead31-72b09f14b5fso2123245137.3 for ; Mon, 22 Jun 2026 12:32:00 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:31: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=syl834R6TVN kopHzNxnL1qVcUpWq0e1+uvxqHbeNVEI=; b=m1YWPzxJwYyGpnOtketg8VDavyg kqtFkodOowFfGaVTlYu09tyaXCgsvi3jB012iwoY8CF2drEDaPivyh8wJ383frP8 O5CLj0wSSXf8eK1wK+hnX3y7g2OX+Whn5ol8iOhZQ7k1xXqsg7rlXFN8f1mKmbnE XoeS4Z9mjoUeYOwV1GoasUZ0Y/5Pe1lxLIc6n8QZzuB8L2nntMHxl7wFZtd5pM2d mBZX8cFbVptC1UjRFEhlgvqhESN0U4D2FmNIc3aRyyU7D4EaoGnVvkeAQtTOIDeK x7l4q2YCRf6hCkX5mzH7dd2lWEvNCkACe3dmDdZEyKNoNhpNiAW88PCQLlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156720; x=1782761520; 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=syl834R6TVNkopHzNxnL1qVcUpWq0e1+uvxqHbeNVEI=; b=IIKRpiIku4WVMAnCH/eOZX36O8zS6UGnnqcD7dcIbEET7YTwLwNOHCqb69+gq9xEKq jhHdQBMK4jgC2e0JrFVklpbzozkK2M5aJDd/7nUl16KlxS+spuMQ5LB4KR1gPLIhQ1iQ qaNUvSn03cJSs9U9XE+Jo0fxRIiRXmWM1Ph2bzqGK4s4eRNV9STYeJEV2GD3FOL4dAo/ q+vXCji6p4/zVGvG/df5CMDmoSNSDyvt/mysyhkrvvR+GQ2NnZwyQluGZ2Ew843R52Ke qIhL/2NwhBoLpbL1UuOuZOqA1b/PJ4BOYbJ0Gn5ZSOZyXYXGAUDtEMaNmx5z84dAiPM9 G7Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156720; x=1782761520; 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=syl834R6TVNkopHzNxnL1qVcUpWq0e1+uvxqHbeNVEI=; b=nduDG59fMY9T8w353Otp4UlC8G5pqSqEUSjnm1zhevpWJP8CBhPwLwcgc7NGhvZ/0/ pmo+KGt5huU1jpZqUPr23okN9kvhKE3Ozlch8QowUw5rxgQD51j75k96AUiOXKweWgXz lyXmLUyaD6NBJyp2wz4lH2at9Oo106tfw4UA4dHjR0QxFsEW3V2T8QofePhSqnotjTie apkkiDHtvzkUdhogzZrIhg8+vKpIZeIomEAkBdMjvY+ioUfoBcH+w4AtFgn5YWRiVI34 6JQcQ1TwuHxfD8+CO4A3owDynyL7Wjghmq6DzYkPUvmgt5khgJO9Lwt9EXiyx/y+K7n/ 3FKQ== X-Gm-Message-State: AOJu0Yw3ON36akNZ33aBfqQ7x6iYIDKZTz3sxFvaGKPf1CkYeidbtjT6 UsSB6TcKIundaptbXdOl5BXSoCprRuhXN5fxljzwdIbqqFvnWFX5wdlpexiGO3NHr04oBttFYS7 9DJxyhSppdMeSuabzjRVUgz55I3DHEBKaZzQCtUbBd1Q99A9TCzC+TdFtG3bMJGM5Xw== X-Gm-Gg: AfdE7cn6bm6oQGohzP71M6og/6I/OnCbTFRTvFPhU5HUEMtPpMJzyRG/kPtJARqJ7h3 9mcU9JU1Ab7SCcZK5CGw9S6i+CAVFUhCEh1SJtCGx9ZqNA4jPzQtatvDpdLDJt6A7r2tS+hmUAU FXh53s8Rgv8dp1+EafE4S4QrHkq0DDdtpgAWH+bSMZx4BNKvUJ8s7p3qCAfLwrID5KEcLvVlUXP jnVn8fyYy6A0Srsq9iiTavEv0Ppzrh4xrVMCMX53RfzY6BNzdb4UtS9I1J2S4ztNk+2kUCZsyvJ 58uzzgIehjHz6upjDo3A7gG7iMis+E1Jah9+C4Jnl9F0herxxBhPObGhrb3jnwLL2BNP9Bz1v3L /CT5Kfq73j40mQlw24FMMlnoYCqgH6tzXT85xvgz4it8yaQ== X-Received: by 2002:a05:6102:5121:b0:634:92c:bdd0 with SMTP id ada2fe7eead31-72a1ceec338mr8523175137.6.1782156719467; Mon, 22 Jun 2026 12:31:59 -0700 (PDT) X-Received: by 2002:a05:6102:5121:b0:634:92c:bdd0 with SMTP id ada2fe7eead31-72a1ceec338mr8523057137.6.1782156718748; Mon, 22 Jun 2026 12:31: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 02/24] target/riscv: move TCG only files to tcg subdir Date: Mon, 22 Jun 2026 16:31:18 -0300 Message-ID: <20260622193141.1449724-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXw+u6FqrVS3dP H/8Q/QnxVlCcTn/nyJ0EGHTVa1MiS2KtkZWR/6Pva71gRIhORf6a2VI/p7lVadVr/ZBCpbRwpHS sSyE4ZR7wFOy2tmcZV4NurqcG8o1byQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXw/ULh8jxc3sA RFKLQPbd6Vagx/cSU0e7r9YGTReAvGCbJVynineMMDJWRGVSFI1y8bu2ebqA9RHvxkY2fwb5PDc wkFPUSV8eVv0FW+qGmEK23b1ghSDwpKJVw7gEO/4kRKDBzzPZFV87v7wGML4yDA1ubm3Rq0EdH+ dRkel0cRp6+tY8HhiOjjvgDt6lPFx8Ipg1rr26pW1+avC8NtA0VgKVthz9BVyhciutWRNAM2+9v PEllohab+rCzzteR484ETEX2qseOy+pR0x4MqbFRWy/PB1UPut8uq8oF5VVQoL5KTCM1WGH2aqT H90QAZULj/Um/gRYAgD80ek3YpmSMlyaze/KpM3xvALqtW0Gq+9UpQzpEo9gI3q3yRPFHogM+gy r21vDx3meLtDoOnrcZKm60Khs1cA1eBxupAINWxQx2zrDLktkS1YRfMtUFVFn7Va6yjDl8YBIex hAq/sA7tMnZ1kxSl5qA== X-Authority-Analysis: v=2.4 cv=ILIyzAvG c=1 sm=1 tr=0 ts=6a398db0 cx=c_pps a=P2rfLEam3zuxRRdjJWA2cw==: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=dWVhGV5Cy5NFuyiy0EoA:9 a=ODZdjJIeia2B_SHc_B0f:22 X-Proofpoint-GUID: N3uIrU-QFbp5qnp9_xSNyIgr2NLrqap6 X-Proofpoint-ORIG-GUID: N3uIrU-QFbp5qnp9_xSNyIgr2NLrqap6 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 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: 1782156747927158500 Content-Type: text/plain; charset="utf-8" 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: Chao Liu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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:33:36 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=1782156773; cv=none; d=zohomail.com; s=zohoarc; b=HVLUwLtWs4fV6DSt2fu5zHYGgwxv4yHkqZVpP3RWmDR/2S9DzjfT0jfXzzmOCoJYmZJLbt6Uq8tfZH1i2LS6UH1N6SNLm2MxYyQ2H8qmH0NrLkOtHYb3a/trzcP6NpiBfVjXiWmnDueKEQ04+k/pzZr6q7dT4m6146wwiGaf2g0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156773; 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=iiBX3jB3KRaaFmijhkaFMDZ7Xd5BoK+FVfH4I41MbPA=; b=UiDIZruGWCHQTFtEzI47DfelWeA+aOt76LDJTu67NfgacymqNkjcsH66cOiQZnMtoHD2xEveq+yZM7vYHvowGk3Oziqcha317FMVnPLhiBlQbve2wO9sbsaiq+CBSZvO+bZd1NcVF6+JumzoljtZxd1jzzDXxGHD+ce05GdWV+0= 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 1782156773357515.673311659083; Mon, 22 Jun 2026 12:32:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNL-0000RJ-PY; Mon, 22 Jun 2026 15:32: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 1wbkNK-0000Pl-1W for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:06 -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 1wbkNI-0001n9-EC for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:05 -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 65MFVi791097889 for ; Mon, 22 Jun 2026 19:32:03 GMT Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey3cq1xd8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:03 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-6ee0bfb5681so5806681137.0 for ; Mon, 22 Jun 2026 12:32:02 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=iiBX3jB3KRa aFmijhkaFMDZ7Xd5BoK+FVfH4I41MbPA=; b=liu9Sha6UbzYQpxXqA+RDz3wT/Q N0RDtfDiPY4EeV1Nzd6JFJjkrF3kQey+WEcaFm5O+FZvNrBNIQk2mVO2WhdtPO4G aXuaRrSYGSc4D18LPEJB9FGDDw8eI/vaglZAqLXKMkrBG135KanZ0W8qFTuCGzEd Y5vF+FHzWozUHa2/9inZfZfi1NtY/eaBF19HHErPP/1zM4PhkOgLrcUWBiElJH+C TAQC/nlMfzIJNjQ8pmNBUEWPZkI5IOuy3knvf70KY+PHhrPRvjx8B7FaWnoZr5L5 bsFSsb7g51y9hfPkc8myNzbD/wfajInQcLWTUNA4cmslKMBeidZ0ydbjnRw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156722; x=1782761522; 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=iiBX3jB3KRaaFmijhkaFMDZ7Xd5BoK+FVfH4I41MbPA=; b=Fz2YAlcIilZ0qJ0E3s5l0qPoFpYTX6hSw/JcOJFxhzjBKk2++8umAFsVTubb36vfeQ TkDCzHuSd2mD92BoJ24PWap2HpJGKEQBJOi/vySpO5Kk3MOvVXcOHuwzjS1CV1p/nhbn 15EVRvRf26KxOWFBh4bI7OQK8IkHFjkPYDsDDq2hX7ZlRrrSBA4RsbSZxjqHnpVj/84i ebpz2KBsYsoFUJXwkP5uwBnL/o4bEa1iG7pS+fAd1akQOJK9ZXUsiu7ygQHx7YmJSg0Y 0WoffUxYdunC/BAevRDKUzddYMEJ9MQS7YK0LoBgghunH2oH2dgpZkG+ht4j1zCi/Y61 GaKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156722; x=1782761522; 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=iiBX3jB3KRaaFmijhkaFMDZ7Xd5BoK+FVfH4I41MbPA=; b=PfxmdGSieDOrvRyiBOCZusyJI6zn1Mo2EdmLIS3Tjwnbrdqj8g0x5KteUFhFlbuxfH KKotv22LL4plzbvWM+UpxECUtIfQas3JSqY/bw4YYls26PfaciH8kcwQcQy4u7XIe1aY 3cFk8Wx9siYtlg5rO8Gkta6mUNQ6jwGOpkcOampkbCvjCuW9ddbfhtbYfsnsKwNXubCr jVLmRgJkNs1nZJDIGR50AZhKyn5Y+qFTDTsKfP2BLfYB5tlajiAdQf4eR1/vVtnFNpou QrQgkvjEibyNV9vIhDpQr8S0RDbF8XF7gfOPhghhu6R/Yi/5fyWznhsVrCnoB1luxfdy PFGg== X-Gm-Message-State: AOJu0YwLNS+ciocgb+J2068PWNTgMYoYvr4DbopExfAYWyj+Sq9cOpzE uYCvqXvP6kugSht0ogOUN4nOGRfitTouoLnWAgY7evKi+QaVCWXFuCUlc25yoRvWA0eut6odByj v6mUBetCwdIxRQXmkBGkFSAfU9Z3mOD2cNY6osmmqJw/ZMG7j47SiBB+hfYPDWpSiiA== X-Gm-Gg: AfdE7cmgEG6KrVtQ15evc6cqpH9Ikt54UpN3osfQ2jeIVjmoQJrykqNHZ+aztRuC2Eh ovdmTK5s0pzMFZvPc4L93Gsi0KThW65m2DN4i2NKJBXrpOU4LjuMFxjcygKFY4u3buBXzaGwgs/ VfXRN9RcEvKgYTJ9MtvA7LE0t8I+GEeuf8ZeW9QgRsqlKj+JVcolurnyqbNWG4KFBWue81oP1DL Q/zUsZF27o2giHSWMlGZubRSU+TOrPoqljKeyHm8DotFar/QvEjNRu4UTj/UFywpnVrJGWcQVaB CRD6kficnCBEuZQk236upwVga32eeDry3NjdJBGnA1KRPd7xsfy6F1Fb9pQOele9l5SaCHl2Cgn VL5i7XZ52VAMKQjx53UE1/+/XrS3753vMqSFp+bYUi+t6Hw== X-Received: by 2002:a05:6102:32c3:b0:631:2624:e5ec with SMTP id ada2fe7eead31-72a788646a5mr9834126137.16.1782156721955; Mon, 22 Jun 2026 12:32:01 -0700 (PDT) X-Received: by 2002:a05:6102:32c3:b0:631:2624:e5ec with SMTP id ada2fe7eead31-72a788646a5mr9834027137.16.1782156721306; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 03/24] target/riscv/machine.c: do not migrate pmp state with kvm Date: Mon, 22 Jun 2026 16:31:19 -0300 Message-ID: <20260622193141.1449724-4-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: DksOXDXmsKlO0BDyO9xUFO2FV98O-bIk X-Authority-Analysis: v=2.4 cv=VKXtWdPX c=1 sm=1 tr=0 ts=6a398db3 cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==: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=4aX5uSYTwWxERF7RVPIA:9 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-ORIG-GUID: DksOXDXmsKlO0BDyO9xUFO2FV98O-bIk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX6iXKNajQd+uy CVM+CbMebI4CxRuqAx2D+InS3NnFAmtP0XuZfLOUCUNEWOgjzhxWIVJYFnQgU2LuOup4vQsuSgr xL2WoY9yeM+vbl/bGDlLaoLF6tNrc3n617ZszBnDR7fYPppFffk82uFoLJWAkOq5zCg0dYga+1y jf57aY9BYHQpasRYfB3HECsU6ROA4nKvDIHxUrykE/mDIG1l9Ag4B8zgnmL/wvtdQr5BxzLONuz 0g2+VXjSVYewlAbz+8gHf1yc59fp1oCOuynaE5n4cyRhp8/W3/uP5MbgTcwffRnrH+2wU7mD3/q JY9tVyYTFE2CLUnJs8A/+toa6leac8bu6wGqsC0tguB/+Pz0ikTUUNDflOaD+1k//zDOQUr0Tpi 1IyOI0dT06e1CBDebolP/kT+JbQtJ5lsIFxvb1IWFERebUW/OYQrUjHwsti1dx6xJrkuZonszFV ibplnW4rcbYvhTsS+Og== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXxcG5m+P+F+7K Anb2ZbFF1O6stMC9W4w1gCwBTOsA4kJF5ix6Fs4pGy9H7hr9JAYTzGEeNJzXl9JMbZLxouCaleN /Ey160yqoZocC6RLcQ8NWFCpthc2kqo= 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 adultscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=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-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156775930158500 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: Chao Liu --- target/riscv/machine.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/target/riscv/machine.c b/target/riscv/machine.c index ba96ceceef..bd93d6f3a8 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,6 +30,10 @@ static bool pmp_needed(void *opaque) { RISCVCPU *cpu =3D opaque; =20 + if (kvm_enabled()) { + return false; + } + return cpu->cfg.pmp; } =20 @@ -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:33:36 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=1782156825; cv=none; d=zohomail.com; s=zohoarc; b=F0Ij8brKkQfyUpz5Caqxp1UZ4T2b3J5vmExZfvXGn9noyPeEhAMIC1dupuuepy1RkAdUjEiicvVsfJN15YHzQkposspBWmg/c34BehbYvShzJCENYptlEAsbLLXx0rrAhWRioj3XSv5GaVqcZgXMADl9XBNcghk+NMIQhU5YW58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156825; 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=s9Oa2MR8QAO3i/c+5hYDpj196wEltw5TlciP3p8bU50=; b=i7O7YU4r7SBFT95WHS29pjvy3Chgk/jkZ6rX1W4NCWfx0hp0hVTrnh1IltCu3dewstF+Bjji/OXvvU0iZg+AOs9oLLqJwcsADij/EKlu2Fo9EZ2g5d70r8OT9xr5lDgLRaQYsiqABnjmhF24YMppnPFSQ9JaImt2ZL1aNuNuH+I= 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 1782156825978617.8244146178712; Mon, 22 Jun 2026 12:33:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNQ-0000Sr-8F; Mon, 22 Jun 2026 15:32:12 -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 1wbkNN-0000Rc-B1 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:09 -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 1wbkNL-0001o6-AP for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:09 -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 65MFVoJf3842519 for ; Mon, 22 Jun 2026 19:32:06 GMT Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yht178-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:05 +0000 (GMT) Received: by mail-vs1-f69.google.com with SMTP id ada2fe7eead31-6751db2792dso3503186137.3 for ; Mon, 22 Jun 2026 12:32:05 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:03 -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=s9Oa2MR8QAO 3i/c+5hYDpj196wEltw5TlciP3p8bU50=; b=JVRMFm0Evfv/hyO4+5mMD7o3qay QjPjapEtltfOvE11trdUgQxN+MONPUscpysss09x4aXzCNxnUtmj5QhZi7ZKAhIX T9mkhyH5QrZqFSBFOPEuS0/9bs0Jr0ipDVb002ytfUl4XdvK15L3YiYEvjW3iITw etNkuJlgMmZTKssQZhTOO+gDQKZYH2Vz4Fu/Dq49ye5I0JWlu6bvPsj1aBijMeKo kkcrnJRzU7Gy1Rxlvp6YYiNszFZV9HDlxtxZY4BvWLBRGOe7qjDpiRGd5Hjl79XM nD+HNZTWjmNaHN2SDSgEw6T5kymbXfyEdoOWlMivFYMY5RrUYYR/dTdnqbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156725; x=1782761525; 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=s9Oa2MR8QAO3i/c+5hYDpj196wEltw5TlciP3p8bU50=; b=JIiCCLfN+ROIHJfGRSMOPQahpw9k3iUcDLXg4zdNnSGMqrT+3qPs8IW4m1LWJvpKhN Ygdde4GeIPVJuUddbHvP0utQNmwqgZ4yzCK5soYvsLDiaAEj1C2g8CgBdfx46Ng4Pn/3 UOKi7w9qN0AYJuca/nURLyFC9au2rqs+ikMjXcyLJ8XycMtwvUYIG4oIOI7h65+93Xzf gHFsUKS0c3GXbljswxpvJ0nGTRKeo7vOOwsNZfYXe9thFXlB32h/riBjZj1ouzb9g+Ra laDEjvNBWh6EFI1ujLPN3LivdC5bdv7pPpOi+JR8UfBop1b0wZZBz1M7VgrdqthI82y7 QzGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156725; x=1782761525; 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=s9Oa2MR8QAO3i/c+5hYDpj196wEltw5TlciP3p8bU50=; b=MrS+mg1k27YrmQuiTeuJRwx6d6n99GfsT8uxmb2iLUrSVTNkbHSdL1q6xQdDr20o1H pCfCv7s0KBmgGBvVvPvl3izjFrUPWc7NsVtsqwJ2699eQtkuvdPFv1TvHCpWQwmXZm02 x5VSPNXodlVnzsknQnPx1NMS5RtLF9/07g1WSyoQdLNS3oC7+ehXHQdjWwrUWIgG/6zv ZNHqz7OIwAiMqFl2d3MgyZ75KFL8h9/z9iaAAFhRVXYHR2wbyzNsVc8JoG7C9IJz6FYX EHdGPMhMr7CgsrboiSf3y5i7qAL+wvUfOklPu2ujBZlRCChDqFonUiVlpDIZbQDNsLY+ rSFA== X-Gm-Message-State: AOJu0YzupVPI2g2trulU+Db99sClcMZTY2QKEhu8NiTZT2HwSTCs+/Jq yoffro5VpG+1Cj3p58i0x+tIUZeFPOFQK4GyIKiHQZEQGN0sHIr7dBAgad2NZNhnEGCxx8EpWXT AWTti+a7x33+ESTzrfNI1izXYdRDqZ3CWe3WWlOEaHEkXGA3ClcK1sgo5Qdk4nAZJPw== X-Gm-Gg: AfdE7clDg7oHMjJgKgTbnT2HApRLhuDft5ZGiawZpUq9v0SDmDtNhju1XP7KFUVNmFD X0ETxJOp2MgndcFfi/Fulr5Ms83fOhMaE11W1HtrP2ywxNfd28Pzwa4ZlM0SYEWNDrMWm+6vLJy ETxzbK8o5vufq5PsJ3t6aQsOf2ED1Zxw8biqlUD705bCQH0el2DjuTBE5pd407Y+9+/49bLbs4v H+f6HeqOO4CLtmJ+I0KCIFbq23xZzRjPgYaWKHAmzGfsvbxLoCqJsA4XdJojTyCx+lNR1OK7kks 8fg/X7aCuRERv7J8rK3XF/afTlfeUKCdXQY39HH+eRQu83fJYBgN9SXA752NQspz7p60UPLEL+x cCc2xWUWcuX4FyZqitBoIHPYzmJMoXPebMeSIJu8WyVftVA== X-Received: by 2002:a05:6102:8601:20b0:6f0:3ba3:7d84 with SMTP id ada2fe7eead31-72a75fa3c17mr6119449137.5.1782156724893; Mon, 22 Jun 2026 12:32:04 -0700 (PDT) X-Received: by 2002:a05:6102:8601:20b0:6f0:3ba3:7d84 with SMTP id ada2fe7eead31-72a75fa3c17mr6119405137.5.1782156724495; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 04/24] target/riscv: move pmp files to tcg subdir Date: Mon, 22 Jun 2026 16:31:20 -0300 Message-ID: <20260622193141.1449724-5-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX5CgyX1xnPJNg 0rcrfBN6QOsDMr6/law3JpJQCzTObMN9vzIHERvsLBs8GZGFSBEkGwUxO2kNhY7qqUR348nob58 uaV4vicJ86serzvuGWoedv8Dhs97L8Y= X-Proofpoint-ORIG-GUID: w7h481vDnycNJQ-sv8uUms9QslKIeAlO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX7qYtXnctIAnF WZCZHzWzpbOVDu8B840Udz/TG5bONCVZ91L9L7AWXaCUimIkJ54zGrxLXOk3peDGvSsOyjDxBss GV3+K0GrNFq+pVSYPjQ1ESeW7YZaf5davUzW78Ur7zMlr3Zvxk7o1MbT2GvB9gPbIhSFLzNxtyo xK1LmkEQnDKeLuQ9KBcyHd5z0V3vt0JAX63TJyR4H2/ByKDuCiUqpC3GpR7aALUo0T4XkXWBYM9 YefSLNyef0BAo9YFpsF+xxORSGeL3zEbaWBTLjF2o8DxMn01/qkQLqTKZyrqW6zk59suP3cA9vf jtB+lI3LrmXMEydba765a5qmBkKS/iAOpJv5KSbIFuqX1NdRZLuzCjgWWb2iyo6Sj2mwyvwsoGL FCH2dPPJNFwrYX5QeQd+515JLsFAleI+GqKIyGRU1YTvySTfmnkPyXiIanHT0PXtlG+iiATt7nv vPSAYwChw/Ld8RPOJ3Q== X-Proofpoint-GUID: w7h481vDnycNJQ-sv8uUms9QslKIeAlO X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a398db5 cx=c_pps a=5HAIKLe1ejAbszaTRHs9Ug==: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=fhcCIlfuyIdyhw9Sb1oA:9 a=gYDTvv6II1OnSo0itH1n: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156828177158500 Content-Type: text/plain; charset="utf-8" A trivial header change is required too. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Chao Liu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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:33:36 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=1782157206; cv=none; d=zohomail.com; s=zohoarc; b=bjWkxUImdlMWvNBJSwKfXnTilIMrE9+9K6phA1PtrgC++wmkZVvKL8PyT0qSV0pGYQVhi7n2coSD/3XQ2cnBvWXw4vjVBYPgDETk2jIzvWDQiX9oFk1rAQ9hF4tdbPGzjuvk1ADFNDA1zzGB95lFe7I4ROi1egQoH1aU7jZusuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782157206; 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=N33YsxfUbNnQ1BMGZTsmV+t73YG+r/2wROA5bZF0Fpc=; b=c3Ekbk8HruMqpiBgv8ZSf7qCN57KhscXw7ccj8+AXj3ZtyOgHWij/y5F7FT16CA72z9PbPvWGdbOVdJSFCN6n90GEgb0AkAPbO9UsH3yCqlBq+73noLCMFQo5pzH3gO8FjZt///52MtQLhFRKXxnUnZhscqh2i3JITBKDRZYUtU= 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 1782157206257316.4481671098481; Mon, 22 Jun 2026 12:40:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkUr-00039c-1Z; Mon, 22 Jun 2026 15:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkUp-00039T-CA for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:39:51 -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 1wbkUn-0002vu-SZ for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:39:51 -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 65MJaf9v2176433 for ; Mon, 22 Jun 2026 19:39: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 4ey37ha02a-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:39:48 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8ddefc5be4bso86281976d6.1 for ; Mon, 22 Jun 2026 12:39:48 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:06 -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=N33YsxfUbNn Q1BMGZTsmV+t73YG+r/2wROA5bZF0Fpc=; b=hEhAB2wE+U7J9h+5Jl3jHCZQGcQ T7LBRDAFIQMUoNThjabN5+kY/QjAn/8wvaQCEunU/J5mXvYggSycvdz0tPSEbi3H yOF/86oOufzM/57bj8fkMqhICxyrCdiMwZp3sZMCylo06tLIqXSKsecGI9CPCH6n YZWbdC3iNyrVhvqSI9gz/XgYfIbztUloZtVuCK/Fp3A5bpoOCDgBaqI3LGK6tuV0 L8ds5QrGbWHXpf9a9jjytxVPe+b6HTtNvJwtNbaFKgabmE0dMiUWSmxuLyz6un1r 6Tjb/BXc3oHXZq86tV6PwVQsFlesNI38Z0DIrbbPqhZN8/tSAUJI0VLGXsg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782157187; x=1782761987; 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=N33YsxfUbNnQ1BMGZTsmV+t73YG+r/2wROA5bZF0Fpc=; b=ZCaga9t6rpcWvqtV9A5NXDjFo+XqntwB9IUpyvVo3GG/XuWA76/GxnaRooKNGyrSPC MmkX7zQmnGfaNCjcF3J4feTlVm2P837lrZMqPCMbbBarsRl0WAkCF1RJMJrka5nSM/T/ r/WpO6a0L+HXbVMfVd4wzqOhQZt+pZLpjVbJDTD9ThYhvp4e9FMUfX4qPkbmbmvynx6B bps/lViT4sjXiv5u1se4KgRJ3cIsFaWmaNYAQFnu+Uk4wTVXzynLwcrzoMWbH1GGJaD+ SSX94Gcjnpc8ZrFxZjlHjUhhR/4SJn5OKmoild/izrcN1gze4/OkkrlrZvkuwv1ALxdP aDyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782157187; x=1782761987; 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=N33YsxfUbNnQ1BMGZTsmV+t73YG+r/2wROA5bZF0Fpc=; b=FSHDCIh399daZQRPy1VWEGZbH3MubQkylW5DZffjLzaQ2aL2dF7xbhvf54EpGla4j0 67+kmQqNdrrUMiOr3+4NpuCGDn1IaaHS2ShgNvebYVwy9pH9Mm9GU4MS/L98xyI6SN22 HRcDytO70zBCH6kPq8MzB0wkMXKAjLlROTXB2kVeW6L3J1Ka1n2KUSinsPCJqkciZ6I3 PurAcC/pjQ1ln5mkMYOrHv3gGm175jB/MPtm4fgDN1tedBcFPlzKOQi54fXwOhqGvxos CaDehALuZKftwHEuIsC9zG0sSfcesmL7bkG8+uIpFgwg6Qkn5nCKkZnUMNnHhQIS+q2V zjKQ== X-Gm-Message-State: AOJu0YxPgmmp6x+nLHkPwa6l0JHCcnpJJDwjQ08kpmAw3fYcxRdB8HPN aaXO2i6GPi3vub8ZB3T2LLzIWwehQ3LYf04tOM+4qqzvN/hrWVS06M0OhVcPBKkRuM75oKE403/ BwvFrcE/ftDoR3lDOLpEBhwUMX+BdETbQwo3s+E1Wfi+Z3yU2PMs03YaqdvgZSI+6tw== X-Gm-Gg: AfdE7cm+SjK0WQklIjtPMPxEobezlI9K+f5xK4rzk+qSUeN2MtHb+dQUqy4EMEUrps+ /4kDwzx5UJ8cMCavvQ4LnCgRsyOf6dW4rced+X6JVN+BxW/FxYBRnXs1hPqY5fRYAPS0YXeqSUt XMp6+cblBp8O4AhhLIdq465CYLIA0BP4+k7M3j17d7ce0MVwOKWsVDksGw3y4rcczxgn4PyPmGC AKisnG/SQtZP69Dw6FR1bOMejURSgdX4LfnXMK0DUANsWYiHTVTLZ2CdSXqN/I0ePMG6tq/Et9l KhLSKDlftALx/PmYcjCHct0FEzBp7bv0VepHp2/ktdXLhYzqsGyKKAXu0FmJCL5kDHI4/8riTrm XTbnqnaHK6h4wWEw6/9btJCQdRTpqWP7w72uHQVu3McTVfw== X-Received: by 2002:a05:620a:4445:b0:915:77d0:2ceb with SMTP id af79cd13be357-921cd9036e6mr1755076885a.0.1782156727745; Mon, 22 Jun 2026 12:32:07 -0700 (PDT) X-Received: by 2002:a05:620a:4445:b0:915:77d0:2ceb with SMTP id af79cd13be357-921cd9036e6mr1755072385a.0.1782156727222; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 05/24] target/riscv: make some riscv_sysemu_ops TCG only Date: Mon, 22 Jun 2026 16:31:21 -0300 Message-ID: <20260622193141.1449724-6-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: IbZ_4VY2glmi-OGPl615fZQ6VCOVh8r_ X-Authority-Analysis: v=2.4 cv=ecANubEH c=1 sm=1 tr=0 ts=6a398f84 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=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=fajYm1E7_uVK9srsrG8A:9 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE5MCBTYWx0ZWRfX5VItl30Dk/KE Myd28Mp9RrhxGT/1q2CT2Ca8rwVxrdmb2iz2AaAPnbkbq/NBzF4AhCe5qjms6QjJZ5aQjP11uxA quZmIqNIiS3XqruLuvbSYFcwcw0XSAs= X-Proofpoint-GUID: IbZ_4VY2glmi-OGPl615fZQ6VCOVh8r_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE5MCBTYWx0ZWRfX5xlFDlv3E0d5 nGbnR/Z8EWrud2FhmKqzOLV1y1pZpFg/xw/Sh7OrH/2GwOWaRcfxztnlfbfgJUSxthSZk2sFmu7 Orzk30SxTPVfxFm5cPcRROisr6MjZYwumAs3s1SfVdE+w5/CDiUkq877HQZ88eGUeMvVrtV/PWC CoAUMcAUwU62DogGLnGIHnpjrvowtvl8pE0kOQpFGqvlqv81SHjrKPDbslIJHAwtgV41FataYvM fpmGiwCiCKXMZV01ch2jBF2tKDSHNS3pRyMQVw4z7B3pIU4FUKpTfJ+0HNKSPioJ1zl73AclIAP kGqwKu+6L1GAlZRfnS5qUis7DLcYSmGc6zNRF1D99RIP8bSR/UmVdPNb5B1DwtbF6Wr/0jblCxC KHAirbHYL2CE3CDCfTl5SS1BshqjUMyW4mLdsWJdrMl/E1qXAjwles215zztIzintsg7Z1kkHP1 jA8ieYVdUGT/adc6Nsg== 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-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 adultscore=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-2606220190 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: 1782157207167158500 Content-Type: text/plain; charset="utf-8" monitor_get_register and phys_add_debug are TCG only. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 6 ++++-- target/riscv/monitor.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 4e96bbeb60..0a7e6f6ed0 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 + .get_phys_addr_debug =3D riscv_cpu_get_phys_addr_debug, + .monitor_get_register =3D riscv_monitor_get_register_legacy, +#endif }; #endif =20 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 --=20 2.43.0 From nobody Sun Jul 26 12:33:36 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=1782156756; cv=none; d=zohomail.com; s=zohoarc; b=KXitIlzJARYV75qHwhz5Ez/mRUcCvqUKCd8Y3qiVm3+oHHJPf9mso+f15MsndvIJI07kmzTpG//uXQo/cjn+M/2JRM2VlTTAt8S8X3g8PA8XOmWHYJdjuSm++351YczgrDz+a0fI3z/R2NV0EaboQMCmbA91oOmG7kek8UHH9R4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156756; 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=W0gwyeyxOK3xN0EqMYV+ik2P4gYthRQYs/yJr8j24WbUwReHe4SzTyxCjzUqeLLbXSDCMWV76gexAX+x770ar65ofRkwj93pMXv6jtgRifwukujHTixzTfGuc2k9L8UCrOmao6YHJT6w4ZITxGgecOrXkHrD/staBl0uMBfmcko= 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 1782156756404143.20764646703822; Mon, 22 Jun 2026 12:32:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNV-0000Wt-Qp; Mon, 22 Jun 2026 15:32:17 -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 1wbkNT-0000V7-QJ for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:15 -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 1wbkNR-0001p3-9P for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:15 -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 65MFWGsm1098915 for ; Mon, 22 Jun 2026 19:32:12 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey3cq1xdt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:11 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9159bc52211so792142985a.2 for ; Mon, 22 Jun 2026 12:32:11 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:09 -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=NUZNSLa42gmlZzIirzNf9KkA4ih oRn4d+ENuZQlCPBavmvc+jzS0Sib5Mw24ddC+FpFs10lONPIaqCnzz4XxkIX89ck cRMvO8CP218wCy5qYtYwR6zJKy1v+8H7ySm8C880o6BEljP9NpTZ512NWaVW85nC 77VDrUe+1z92MqPYPq47pawhIMkbqXGyv2NKy7ijnSrjkHNf+imS1B5xvHlOF1wU V4PI7qDTH83ax65EZaCN1IEjkLVwa7yhit1qqkdkwLqKH9ziR1hgtn7+mfNIFM7j dmYHBK/nbaliacns0VqJj7UqACVlD9w8Ylgg+qHJaugqjJqmkoWqQfocytQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156731; x=1782761531; 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=KXM/LbfmlJFBOU3r8pFT/jQV+U5FjXiXxyZmCC44VQI8EKWmC6qt5zXrjBYbDv0sqM cd70BFikoJLFmEHwjl1rdV1z2SVOJoq0Kg5vAWYcypJsCuGRj2yW/NH4MBddBw94heM1 usHuBZeHyN6n+R1SYxFMsrz2CSQwWkiptpApqk8Olqj4hi/MOgfPP9WMi02kGXBtheOi WEMCivPhKi3CcFZTwhGMVnZT3Ts6CV5Y9eWLEYjKrj6hU6TikM6RBgnO5nhOtIVnPbJ1 qgho3sy6BoKVLDVIR+QadqfwDy7D3mDW54ynBY1EyV4qzHesKrKzMwfVty6o9QVSfHzv QylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156731; x=1782761531; 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=GWGYrCF9i23/19hkoMlhjAtxVemR3dGR5acRsPrP8PhHITEIpIyWwjyyIIbm8ox5F+ 2fO6RmA/tBnyLEgVbovUnz/EEnZSo3Hl0fT6rZbmM13X5sFNg6MsttneFn4lyYEZ3Vlu FpWcvwtWKd9zVpU/7V4Nu9iHYVa1brX6Negmv0rHuTb3nBA17TC/8oAb2K73tbGgcyqr r31nSPkFQBGdC5Gu7K90g0UyX8NvHli8yMzyhoj7m1piZIt6mzz3b+iy36mwIiaYhwML odArMTp/1Fss+mT4jqbFKSXcKpAb6rweeGROg4fI4YleBJD5Vr4yl71brVgJGx9sbrOf AR6A== X-Gm-Message-State: AOJu0YxrVzexgzA6l8EoTiw7yCAguot9B3hKjKgamHD9T486y39I5apk 3K6F8PXptiDoNcKHhgbgSMMdK70daNXFGW0ufPcHy54jKX1RDMozk5CD8d2b7+6WpceFqvl9ubU jrsAy8xoTEAY2KFG4Nv7spbxu7XT5i2bHTuLxBYersUkxj2w63lM109gO7/CFx/ReiQ== X-Gm-Gg: AfdE7cl84DGEog46FJfcyKKBfOuqpfxrfrXQrYWo+QGJVQn6KiHRSORl3Ymu4MhJX5Y 3KI1i3rxijMJxRLcnyO0KnqwFb3bND1RL7glcKndb5tjT9tcSGF7gX4V3mYLnqs3HQHAMZ1KZkL AhFfCG/fO/B7pAWHUY58uJfVqQk6T0pXKypazygP4B5BKhSM2Rb6mTLMBY3lPAkBg/Sj2REVfVd vzQxT3Tq5iC+nlOXyz9bwq1t2oCncbunQngaiCfh/2zKF+QaHL2rkys3yDtJuICa2Q+Tb6x18Qx 5v7CUBOEucjMY9oQOY7p6exybk6W3lZVLWMlqPocG3t0sVkyf+vXzf6NOZjiqtqlRW2J77BEylS IXlTPeC8EQnI9UU79tecIVe0A0ORZtcZhxvxkshpPQQvvvA== X-Received: by 2002:a05:620a:2954:b0:915:9984:5781 with SMTP id af79cd13be357-92091395713mr2712042985a.51.1782156730499; Mon, 22 Jun 2026 12:32:10 -0700 (PDT) X-Received: by 2002:a05:620a:2954:b0:915:9984:5781 with SMTP id af79cd13be357-92091395713mr2712036785a.51.1782156729863; Mon, 22 Jun 2026 12:32:09 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 06/24] target/riscv: move pmu.h to tcg subdir Date: Mon, 22 Jun 2026 16:31:22 -0300 Message-ID: <20260622193141.1449724-7-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: CCV894BbYRUxRe7jY68XN3uFaR8ut92Z X-Authority-Analysis: v=2.4 cv=VKXtWdPX c=1 sm=1 tr=0 ts=6a398dbb cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==: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=KqZ3gCmnYdtU6Ji4SLwA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: CCV894BbYRUxRe7jY68XN3uFaR8ut92Z X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXykmunKOVDP6g H6nf0B2KP+kPT3UPt7n2/GNkw/E4q71VB61uhDPxbPPFjQ7tV3VXSiGt9/i90PjSL6c+FGQrrN9 pE1FaKTfZ2EqZE7NzRIXDWiGhQf2gjSBYHa9rM6j04o5uwEPn0wBlic6m0SEAvwU5CEv4S7ofbb IeEFLn9xL5JyIY12tofi6xytFCplAj2/B8z28Prm4nyOReqblBN3wHxX/mo7u0nEc8vuyzsNOgw GYBoIwMAkXiYvWzhhLuimuxHhzFf5fi1bHMGD6kzgI0GKh+FppEtrQgl1YbA/gApkE+jQBJsjVO TJpbJrIg7CVEmzBUbfnUvs5Z0zZXNAgxSBPv6QPHHcvbOdF0BcKs9NMcmu+RzFONDjumLza6uo+ qDg4Q/E/09RAoXthZWZVskMkUxw2tI5DN7f//lIdGlPmBPkS60BHbh8HLo4DpM/V17Oc2zgHkrf NRGBqObUIavYTlVSZXQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX7DUIsYVzJLcY XYTm1DpXMbaHSICgYUx2Z9JoVxSNw92K5Z2NHt6rlBDeAWjcbp8cxEuUIPbAJA6SZAWmUjgKoLA 9Gfmukzd32p5YwAm1dMgQZCFReu1ysw= 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 phishscore=0 priorityscore=1501 adultscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=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-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156757676158500 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 --- 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:33:36 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=1782156858; cv=none; d=zohomail.com; s=zohoarc; b=YBokIvWuDgqQPemopD6GtYFcEdfaikbW6Tv2wZsx18u+ByZFM5ncWCty+dMenyvODOFq9CXTpR2a7J0z/uegSyx5JpxXr+CkesYabuRYSPK1uWaK3q40nm2NSoCJsvwmrD30uQG50t43/yU8mT3bpguK8PPx3h/o36/a2U/z4eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156858; 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=AZWlSGpH+ztvHihs2CQRxejyQo0DP9CWkQJ0wjaKtzU=; b=iPVjvZz9hJLSjoCg9Bu6X0n8eLYStAqZDgJH1rJNHQIvwxF9ABbvP9zQAMHuYaRiynmJWlSPa6kE/NecOGpb3duUSomhxVy7hvhFO4//VOcgbJ6iHSJzPlgrdeY4kSJDPoS4lOtZ12CDUQyYSimwLf+b0a8fIj+Y476FV93WaaM= 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 178215685833726.317739737583793; Mon, 22 Jun 2026 12:34:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNW-0000XC-KN; Mon, 22 Jun 2026 15:32:18 -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 1wbkNV-0000WV-8c for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:17 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkNT-0001pH-DB for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:16 -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 65MFVoJi3842519 for ; Mon, 22 Jun 2026 19:32:14 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yht17p-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:13 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-915f6ff639aso1220472785a.1 for ; Mon, 22 Jun 2026 12:32:13 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:12 -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=AZWlSGpH+zt vHihs2CQRxejyQo0DP9CWkQJ0wjaKtzU=; b=Cl1Tho4+u0Df4zipa7Mkuasn/yn K9U8uaygIEqMM0U6Z5l3YpCnyEJSQsJxKYNNtFNzDo55wkj2Qb6QHFIp38FbJ7Sv MCVDR1OdUq0oqx3EI9l7VvtkQBhyeyejqsRpPF3uSiOiAxgJoweqHr/RGfweiKIf vRK0H6896EQ7KWie76xfU9Q7QuyPJlk1w1wByRFQprnjd6JOZJi1L4+64aPIRXZQ kzwO+qiZRlub7gGgEiK1YvptJsv3pDw16U7mCh+ELoLO50qPmeLmC6/wgHTFca6L 534mpXT9ZAivI4trAz3xCOzcQ7xL8f+lNS/eBtAc0vwhmQr8rO6qV3eVoXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156733; x=1782761533; 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=AZWlSGpH+ztvHihs2CQRxejyQo0DP9CWkQJ0wjaKtzU=; b=GbB7yqB4idoSPp3/BF1VPxwGODwXwvDlNC7WJ86k40dx4eA92E2tzQZCFXg+NBsMVn VlTAD6FhTGtS8D+LJwuFu25O4dijLEatvGVjp8XBO10zAmjc5/gKviFVVwoLcW/JFuiR ay7d7zXKR78kN1nAEh0/K3upD6HohjedP8g6o7csatYQ66SZHF4BsiUikRM/1CLzv9kD LnC4Z8Gh2ed9Y1R34OfVykrLOlK11Em9Xaj/FGAJobAzaE2HYgt5sPNnSGbCOzo0NCtz dfuvcPJ09rhYkX0rJDY4dnebfjVUkEZ82UKTXreI30luycCGLgx9ZIhcwpyLivZXBBP4 Ds3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156733; x=1782761533; 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=AZWlSGpH+ztvHihs2CQRxejyQo0DP9CWkQJ0wjaKtzU=; b=ZPQieHtZfh4R1LG3159HjfBjDD0A/WPeGmFirZqp54k5F337Fp/Uom2oktfevFdTUb uzGn5GPdV0c+SLOmVXHX+wzmOiBi92NyqPemY9MOo9aY9LADtwiiVo5aEUbDrT3gq3Ol CoX1esqX36w4nqj5mpSwyJH9v5xxQTMc1h4g+8WjbQy29b7Ea/RGMvrU5QmVEtViQypC iTrxxj9iKhS2yhq8U4gjN7tgzmjh5eszX352AdZo3mc8fnxt8tzall+4UECQ6AL3vosi xL0fu4NH519cI1hjgWM4WxHKr7ZUDq4JYDG9PTdqMSFFOUkU03/yY/fsm9xhtcqA73Io ThHg== X-Gm-Message-State: AOJu0YyD1WgrwzNXFdLs9WDxtgJKttOcHOX94ZVv0KtlYTCLgCbInQGy mmV4Ej7eVx5F7GfMUNgnoXnlOXt0PtYbUOma1E/DM0EvKpqiE1dwkm9WFQh0dhjxl4Hwjj7TeyW nTtWvotBziSzJEt34MHEm6m98bJ0MkYGiuh+69iCvDd44crudUApZTz7qfPbUPY0XLw== X-Gm-Gg: AfdE7cmF/2GJhHONFUR0EH2W6656t3uy+Jh8wV4TEEkQA9ALRXzmBdpl121rQ+H9Arm /pE3X0LGCFFojv6LivymVoWruwDpnPAnlPEKxyB68KminDOPt51PXuPe8whEtkkqP0Q6ohWjo1p tnGAWSuSf23as75Cxh7bVh3RhkYHJYuqqv/oxW+I7vCY0fSW5K9bqqVIB73BQqcfRhB1cqkImBU td4eLTcMtA5306lKGilrQuf+4vmXIa60lL5G05mXJdqJpJF3+c8Yvg9Z2mSZC7VftxC0AW/4hTh l/YtFDPE0OMeGnDWpyNupF+O/n86oDl/dwuNjJG1WQ+wHswTk95sNGtuuVlHMC5Zzy+rjTPrBOU EV7uBiKbDMVtGld3bg7LcEeMiK1jINT8StvtrRhvQsG0O1g== X-Received: by 2002:a05:620a:40ca:b0:915:6cfc:5018 with SMTP id af79cd13be357-92093131f92mr2755055185a.58.1782156732939; Mon, 22 Jun 2026 12:32:12 -0700 (PDT) X-Received: by 2002:a05:620a:40ca:b0:915:6cfc:5018 with SMTP id af79cd13be357-92093131f92mr2755050285a.58.1782156732435; Mon, 22 Jun 2026 12:32:12 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 07/24] target/riscv: move debug.h to tcg subdir Date: Mon, 22 Jun 2026 16:31:23 -0300 Message-ID: <20260622193141.1449724-8-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX1B7+lgIjxihv 0QTOmUNvQSSFsmxqIgkjwPABPvC6SpKiA8iniMCFYRRqtMIwOQ7Lk5Y7DRDwQEUEJJEh2mDis0Q fzPDPfR9fZqa978NzZvP0+hJ8kKQgPE= X-Proofpoint-ORIG-GUID: Yp6EVkFwLNnY5ehkx_lCOY7NBZWwEiJ_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX+xB8B6ui9uOq 9Pk414wdqZEM8xpyKCp7g6Zc4URDgVmmTskDwQuHi75QEWIGQ7xg6ssc17VlCfiwE8IISD1JOY8 zXw+4SQ9wQaiSgdZw35GgxUuFcvFo8e+TQiSTUQEjtuQiK3bor28/CbRwdr39OkObLcq3N65KuR Z1/F7xmhVwf9DP2wu4kCuPNY6NfdYROTZhlC9MRhMZOAnpKOxdzL7I1jcfMWrtSBLr5g6Yqx1nQ b/3cX+rp5HgGO5v03m9uGyv6nlU2j+nDmv3GCAshVzZmwKCVMuc7hxpx+cPQ6GSiX37F+dDzRtn hijPEqGNnH8aoOL5fjVg4sxb4Sk6OAZYj3n2PCL1PiKAkd9Muq1CzVVrE18pCiX/FNF+OW/NnJr 35ZO4W8tFjOmpc9BAl1S8i8FffKAE6fUYfZKiV2mTcJV5de758iLfMMyi9GOq6ciDqctx44OH9f fRKgIwnqAbnZs2g8cPQ== X-Proofpoint-GUID: Yp6EVkFwLNnY5ehkx_lCOY7NBZWwEiJ_ X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a398dbd cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==: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=tQvhUsybbcJyJE2uAKwA:9 a=bTQJ7kPSJx9SKPbeHEYW: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156860357158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 0a7e6f6ed0..f999042178 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 bd93d6f3a8..4d89486cad 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 59edcdd370..9293d61024 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:33:36 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=1782156850; cv=none; d=zohomail.com; s=zohoarc; b=d5ozCUaQevL533afg0u0xjXCDxfL5aYwQBOIZ36MtY4uC+khnEUlYF+/ryczNVlWbz/I9WfAxJHbfYJ70185DzdeJKsYY3a2K/hRH9YJH4voNwBaMe8PR58oAJeGu+jSaPWV+o5DhEd5DZ8dMmoxzLUZDa28szooaVKB0ehkjGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156850; 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=4HJO01tRdn53xAdLjKeS39dTf9kvVhP9MmTvHhoHe8Y=; b=aiy4Ts9Gi+PxieEQtmONONR9bM8KlDzbgOOEPkVRrJfYNCSkNlLxchD5iYgI75Zl6N3qAiq/fnIbHe5plpgUuJtVoe1ZBse8JbZ9ho2EMMDBoIoSFVivHd84F1VNH+e1t90xIK1czMyIvXT2P9XRbS2TlDbSXrylawrd3AdR+Y4= 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 1782156850305343.70799497860276; Mon, 22 Jun 2026 12:34:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNj-0000d2-UP; Mon, 22 Jun 2026 15:32:31 -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 1wbkNi-0000cE-IF for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:30 -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 1wbkNg-0001q1-Gk for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:30 -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 65MFVxlR1010525 for ; Mon, 22 Jun 2026 19:32:17 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey3a0sypr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:16 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9157f453a27so753355585a.1 for ; Mon, 22 Jun 2026 12:32:16 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:14 -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=4HJO01tRdn5 3xAdLjKeS39dTf9kvVhP9MmTvHhoHe8Y=; b=NOpYjdbBBFlIbUW2rbz4CKYmpCq y4ZuJn3LXsheihTS6CMmhD0GfXbFfgrNSTc964WmXm0LrjXMzVdsu7LEMnfMqTCQ /sFgl6CfPz6CTkWK/N74NqIc+PDqcCagunle64J3uI4y8Wo39jdD037sfTk6SOLf Yro50ei55YNQ3/hMGHHeQU+prF9EsVsn2ABJu+3WnjpapYGAmYuywsy6G4VDec6O vUf7O42LMuqzSQtLDKEp9MgnUDQPpVoKmExAOVFfnbcqN7PE7s6JR4TT9Hj9Hjsh tA0E880IqiITUCGH5BQilDnRwhmlP0w+zX1EPg7oW0LVNsagof03R5iKdlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156736; x=1782761536; 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=4HJO01tRdn53xAdLjKeS39dTf9kvVhP9MmTvHhoHe8Y=; b=WyOFEuTmufdKqRv/ERHWKv9Hj/jgQL9b59zT2DhuOVS6Lc5IwEkRp6d4U/CzeXM5OX 84lnNC+KZw4GTKE4tppskOphQaLPdPI14Flnrgkug5WHCccb0Wl4C+T6T8gm6WRa4vN0 tpQ0/drTfrr969PPAtNrQ8SGbFHCYJmQ8l/2qjbMC7SYLnEQuEorcFEwO/YpwM4w02n/ WI+gKcy8dRef7lqW11Y/HUdQEdFB9Sz41REegKqoWSh2McPtE8UJvmLFJ1fSddnf9rm/ qWkOifz07jrEz++yEZ9q4sxkg84a/SX35ubHOFi//8EHgnQ49mTTfFFsNU1AfthxuAih ykAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156736; x=1782761536; 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=4HJO01tRdn53xAdLjKeS39dTf9kvVhP9MmTvHhoHe8Y=; b=a+1wp7oeaXgX36gamRCgy0IcogJhH68BJXZjoKu513hrmblx4AgkjQcnbjtyIEdxnH 3ay5LlCCtkDAFkX5yYf68dpvaxgJAMuUK1xoJeDeHh4ExR34io6tfK/U1ikON9xD6mkF FJUABiIZtWoGYEjcptWMKst7AFkSK4gtskoEQf4KUWj1ZC4kh6uIRl2pzouJji++3x0A xE4bC3G1zIj7JWkCxIjJ7X1rzl7k0ig6luXvK+8Y0JH/5GXpSlDPChQpzW6+ktogjg8B Eecwhsd/bWGDIpSfTuRYX9Opnfp/KQRgTLHb9CCXJijs4sCVQEHpzrPPY5ynUOaP34ew kj0g== X-Gm-Message-State: AOJu0Yyx4xlc/YIDOiCEuYMSeGdq6dXS9jsf8kOrLgrQjGBSo6ahuPpJ eB0/9w9IRyjnN4yrESwNFDbSRdn9Etu4pd3cukivsIfzOo5A4X/0T49Syw7npugnvLNxrT+z0Ih gPREIo1wKV58cgDxBH/1gF5rbz/qwjmksUWPUPPaX3oGF3RXHbWF5mD3xtasprWSBzA== X-Gm-Gg: AfdE7cnm5i+5lZ+9paTya/xxtvxwmRIEIi/YLqC2y/6E48aRW1uj6etniaiLJFvU3O4 0t308l/XWTOC5OTveYFq70gbVkIYaL/Wsfj4qcsvd74VV8uW+DFrwSC56Oki0qPCDcLemEyc1U1 HPxz21/EuX5bHb/jPbVJDHw0zqRxLGRIVu2YTevV8b0wZ6v7z9/lDkMbbVDwo3lfULfdaRbLFaJ RcQE6wnIKEjFQWAY2i20TAp0DqXCWBsGFI9RUceR/p0CulnMpDjFKxpiOlR5lPuzVnNpSzGnuOT W95iEc6q3va+uX6Fq0RDb2F/2n+qhPkdTApsh7nl5/8nSq+QMu6oopBS+/wtutEYyiskavenf28 pYscKN70louP+7CDPlV9ntrMAtUjfxsAGtw216DJT4g2+TQ== X-Received: by 2002:a05:620a:4046:b0:920:56af:cef2 with SMTP id af79cd13be357-920d1cea613mr2390769085a.25.1782156735732; Mon, 22 Jun 2026 12:32:15 -0700 (PDT) X-Received: by 2002:a05:620a:4046:b0:920:56af:cef2 with SMTP id af79cd13be357-920d1cea613mr2390761485a.25.1782156735015; Mon, 22 Jun 2026 12:32:15 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 08/24] target/riscv: remove csr.h from kvm-cpu.c Date: Mon, 22 Jun 2026 16:31:24 -0300 Message-ID: <20260622193141.1449724-9-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX9PHgp0AyQLaP aMTiMKDMQHdvsacc19dH2ig+pgisDcrqfykpoOuPWjWp1KeTzn2R6dlAumkuKw7TnXj2TOwShyR 33myKifvghvoa2zAhSuhcdAnG/g1GFw= X-Proofpoint-GUID: Ym4KnlELTIpIJX4SMj57qI3xRgE-drpa X-Authority-Analysis: v=2.4 cv=UJ7t2ify c=1 sm=1 tr=0 ts=6a398dc1 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=iaHOtbHYuYo96Khm3VgA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXxzjRWpkb37FP AKaT/mARYDS7YbnW4FPFkCvFLL2T7/wo7WRctGMX3Z/tajnDupoU2BFkW+nUV2bg25j0HSMff22 3UQyQianJlN/i6m1BV2kSYFxH0MQuMUDVSLhpGrKavpWLrpe7Ret55GFdL6i6CeOLlaN2Egx3Se 3uNNk1ZgRQi2z+gauQajWMSalWA81jGxWqynr3AujkYFf6qbsLksMFSZUUXp52L72YGDf2wm7NT +D2F82YYkH4CjGH3r0tsul0eU06bDt8sh23u3eTWRh5d1fkWsbOS0jN3GPYy9b0hk+BAetTVgkY xwT60WUk6z/zvlN4U9wGO2XHHlD0PHwCV2m46kr6osZR4DExjndlrLcAhrOp4VV4Y9+Ihs3SrAf jz9FfqTS8D/amsspyZKrsQja9qIgqGSjUeaiXW5o8maVruxU4jU+JyG+8m6nQbJsLHbD6FMyS/0 HcmQ0FaQyeCGe28Pw2Q== X-Proofpoint-ORIG-GUID: Ym4KnlELTIpIJX4SMj57qI3xRgE-drpa 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156852517158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 f999042178..8fe524be21 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 f0c78c1474..4fc82d2477 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -971,7 +971,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:33:36 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=1782156803; cv=none; d=zohomail.com; s=zohoarc; b=KBX2kBphloFW5rEjbzgknDApTgroNVrodiuhrjAL8oYrIo2YHrWabsoXJ13U3IaPKAu4AoKtQVYPdhHABsZuVh86y/SOtw1vHx92ali1ksIzUvEN/CUNmlBye1x6odkzJcdxp/YgufhSohXGufIpaewoWXsTZN/SXeU9dHnSHwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156803; 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=0MXkkvCouPl0quvEFxVeopBQWkMIV20QUWyTYuKd1HE=; b=K4LXgEyjJ7x5sY2Rr1Ywfc57j0MI4LHVVAFyMfKYmoKVdBJGyDDO7Vd5tsCP2ax9MSyt8EAfn66nKdmNr2kLTe+YFSpwFm3gnETaSkiK3fAPrecIfJwa2JsKQiEN+009dEwp4y/cLCJy7a+wPL5I+KzooBDfVH6TgDKgQsoqlyA= 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 1782156803408920.882350046496; Mon, 22 Jun 2026 12:33:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNn-0000e8-21; Mon, 22 Jun 2026 15:32:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkNl-0000d7-2D for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:33 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkNj-0001qH-8p for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:32 -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 65MFVlix1010023 for ; Mon, 22 Jun 2026 19:32:19 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 4ey3a0sypu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:19 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-91576c147a4so1191908485a.3 for ; Mon, 22 Jun 2026 12:32:19 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:17 -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=0MXkkvCouPl 0quvEFxVeopBQWkMIV20QUWyTYuKd1HE=; b=DMB8GBNTtRVClgNs6rVtUNhHzq9 g9ZU+ygAX1i6xNWktr1hXjs+aGP/78z1/P2RwVZW5Dn1z+fdmAGiQGZEczMsSYU0 gM+L7wdMzRKt/C2CHQ2PXlL+l0AQqTZsC8WndxKPVLEJ7yYU+vTeQDzIQXkwG06y AqZk9Y3HXfKHmiV6N1msQzbsXK6gPDBf03yEQRF582f+VAqRwsieXHONJ50V5heb +bsKpvyUrijAdI78n8X31mngXcYRgvs1uu0ChJjVyPkCm8NByqVRZXD3yreg0QAR /Y9wgTObGX2jUtX8fsAOqxg+Se1lELmDl01rZVC/YrB7ds16Bz+XNcpBHyg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156739; x=1782761539; 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=0MXkkvCouPl0quvEFxVeopBQWkMIV20QUWyTYuKd1HE=; b=HNKCAHbErsl60hQv1NVzEy18yJlin9xHPIcfmx9lJoy8ODMXQ2W9DDw85p3QBApMDo fKT1XEujlrTPF97OHJOL3zFKd0MEv3ANiHY83vE0PEx8gHRgL0spUf1Kaopd9Hu22V3P 7PZm9nmx9oRrLX1Ef/PVzDLTzV5Vomg6cHFAt9wWGXb26B9PigfivTeohccIh1AhEV4c Tk5vxQRZiPFEgljVWtdocRY7HN/KhQ1kOEkMeQpPRK+/oouIdbfMrfcAbdwPO3X3Oh5+ 9KbjDmZtvwVugZGyakDY8nA018X9/QJVB1MYAO/naFC5e+3rn72DfiW0KxvMqYujTfYW zLxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156739; x=1782761539; 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=0MXkkvCouPl0quvEFxVeopBQWkMIV20QUWyTYuKd1HE=; b=cpCtb41sNDwalTfrMzXKD2uZrbq4UZh/9GHVZT2FITR2W20TJ61GWIw7fvS+imqPYf 9KxH9lm+i+N7vtlDUrElB8QqO3Gd2V+EOJe6U1H0R1DoVUT2Ch5vr/8uCFXJXHqV93Rp jXX0t9tYLNknE3x2JonGJ7AKqgcWuLnx2Vl6DSOhfoOtWRQdIK3f1oVIDI3XftA8o1E0 9cwjIr/2Ct6uynYJpU6yVKAl2upRq/at+d+5xxyrhCBSqA050KdldNLZG8x7/VX9HMUf nmRlfB9Lq2nwUSSqRBV0eNZ2EsY1zzhCOlrlcSqg3bQaOCrx8Wsaxb+YZUt8N/6DOpmF NOoA== X-Gm-Message-State: AOJu0YxiFfIadRbUi6nLEjJn1ctx1Pc+J7nUXnjxuwTxkyzzFFC1WuED itg9/7ZbPwQ1QpjXvDDhyrmFcxvjGpKJVFj45RHiaxg+z2+/7Xy9JfJKpBtbtpgqtVk1kFnmia/ VNIVNX50ZSa9T/D8MvkUqfab3/av8TQBhN7s1HsJ5lya6UGy5dB0SEEU4sT+aCksRAQ== X-Gm-Gg: AfdE7cli9TNUuiP+eM+7CNijUlohcBs+eojLboF7ljVkEql7ta9zB27NoG/hL8bFfMW Nyc8ijN2qG63F50+E29ncKIoQJyVsiGXGbLsGDgLxB/WNS0UK4993LZ1eK0JGZkdMLoA0Dyyd+i IQ/P4pITe7xQOXqH7HAwMxdGJmy0+qXrq6/iL04MZ8NYMdfICNELdypSxRonGMkMI0GWqvKVM+E AezoLNIdzlStIUNp15YMEElxqN/jLAhLWlejwxyENI+in1fSmIHGmosinf9N9zK/CXQM98zXXsY /9YnOa1PP2B/dU0KVsRz1nlsCpa6YjRJoWz4glWc2PC43r01YN3Zqi/Mg73OksX8Zmke9Po7ASh ATK7KzVHWov8+Rkq5RuPO/r72jk9E+JxEpErsMkhQNVKA9A== X-Received: by 2002:a05:620a:4890:b0:915:a3d2:288a with SMTP id af79cd13be357-92091f5337bmr2448993085a.40.1782156738410; Mon, 22 Jun 2026 12:32:18 -0700 (PDT) X-Received: by 2002:a05:620a:4890:b0:915:a3d2:288a with SMTP id af79cd13be357-92091f5337bmr2448985685a.40.1782156737838; Mon, 22 Jun 2026 12:32:17 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 09/24] target/riscv: move csr.h to tcg subdir Date: Mon, 22 Jun 2026 16:31:25 -0300 Message-ID: <20260622193141.1449724-10-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX3gerU4OtXNsx haF21qy2aLWwBhkPbzXKU6Wg4Ti6dZ24WcDONe8bmFta2acSZ0cMlc2hFZs9pvvNTZ6xyZBNdM9 u26EbSbeBnv47CyTeYIdVVRJafzEztI= X-Proofpoint-GUID: ECF-FPFdH9Zw1EtgVIUQxeqwEW205Ru6 X-Authority-Analysis: v=2.4 cv=UJ7t2ify c=1 sm=1 tr=0 ts=6a398dc3 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=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=82-PFmB8izlBMBISFaoA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX/uIcfZHJ5uKj GIPqzfUzxPUhkhjdzOxhHgWL9TNEW5ok1Ny0lJN/9zuNX1TvkZ3qkQSEQ3vmJ59GFZkrgKx/ij+ KO3L2Gzu5yOpbBRjs8axV+l72j4+l9eCo5pydyp+c1xlLCyhvETDNiLE3iCMcuGMRuN6ZKvFMKX IZ49N16wi8hDcT3C32xnQVUmtUCoz2lEji2KHNR4W1vgTQaeKzq3D3mmTqFlUNi37cO2dket4jM Ccr708ke2HVv9NWlc2mt3YNHKuS0Ddrgu0djMmp8lG/9ZWixrXvrHpwQhur3t5Ct1XSme1olYFt 1mtVSXQkdoZUzD2hh81bwd0F5u8Zm9XZD8DQmRWhDM0tA63KjFCY22t+IsETwMvLijjB8VAfuSw /vz3KgOI4+aKNkOADCudmB/deTXTSike+IRvlJJ4XqB0I4NxwGrhps8qwM++JkG3sna1MGFNASy L9UktlO8Z1qr6vwAyHA== X-Proofpoint-ORIG-GUID: ECF-FPFdH9Zw1EtgVIUQxeqwEW205Ru6 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156803956158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 8fe524be21..503b96bf2e 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:33:36 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=1782156952; cv=none; d=zohomail.com; s=zohoarc; b=Z7Ghj1Axl9RAYfuE97gaqvR+fQJ6ljbQRlcRv152W8aXnFuI0/e7A16MkLsBJyVHjEtq/Pca9p84R9PEq8G2tNdEff9Yer5xrEGnB9yCWHKKDK7fQ2A0Qlms2e/gwNB19XhOgKBS4cSov5nD2yDwIYsgG9f1zuEmLOosTQ1N+3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156952; 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=iz0Qs3dA7GN4+dUdfxOGNmKUJWefMtxQaJofGCFNLyY=; b=jaIL0Xfaddl6rb2/wLx11wyetFIsbxAA8acnHHWHt7AGswrzB3tLuKb3lO6pmI6LdZ48+nqGr+xkUBs0EZEfXKpoqWwa6pJe5Jom3O0Vnnt91JzWpSDEy+GdqayRGCjh8wgO293PPbICIpWJNrl+GVhecqB7AItA3UrgpizMeSY= 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 1782156952525736.4377886509485; Mon, 22 Jun 2026 12:35:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNr-0000kT-4Z; Mon, 22 Jun 2026 15:32:39 -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 1wbkNo-0000ga-Uu for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNm-0001qZ-CP for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 65MFVgpD1022796 for ; Mon, 22 Jun 2026 19:32:23 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey729s2ua-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:22 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-9254309dfd4so168371985a.2 for ; Mon, 22 Jun 2026 12:32:22 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=iz0Qs3dA7GN 4+dUdfxOGNmKUJWefMtxQaJofGCFNLyY=; b=mLnyQdnEPInINC2uRsxx1Mp+F1w nIdI2b6G0XbD8WzDWi47MZATLPmLIEd02/JaRKcvKzjl58gPVwHijg9Wik+vaUEB MCKASK2TIh/ym9dGIjF1fg32p4tL1unryIG5ZYwEZ67aYLwLqx+cvfZyYL07Ivy/ Fk2bPrqpxRM42GpafrQHqnkdSsAHV8AbDRMqPiS5BWoqTHGhJTzVFShNEvx9k50L XpJuh56DA1vnOU2MV56apjPVo3Q0CBtJ5f/iUHEhOd85n7zPMZMKodUw1g0qa1Dh gnXU2J1fymS71RwU42mQepSTFRdO33s3TEDidya1nL3AWS0bQ/RgQKzYSqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156741; x=1782761541; 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=iz0Qs3dA7GN4+dUdfxOGNmKUJWefMtxQaJofGCFNLyY=; b=gyPMq/2LbVCU+DrmP00ypaoMNEc5oOOW0rV5Gy5zRzQEBY5qW6i14TvtOHezd0drx9 yCvsXQ1VS3I7jqjZ5UynCppRMHJ0ATJxRPEdi5VbA5CCYFYSLwEaGbxuepImGGWP0x75 IdidGkoaHgr9rJWXAvhLw9cPBt7Q7SJDKThlvlJkOe+ci88DE+lwjzv5C/+quYFEcu+b Fq2MfCkjd/tnFjeczluve5di4EZ56v/04GcjYKlNXnatUjGXj+JHzwYCjq5FCl4/LCG0 qqKTpLEcwP3+tB6celhOaZlQUk8eJJN0NFsCZ0Yf2QRlg1O2ByczETCdn4g2aFQVs48s oHbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156741; x=1782761541; 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=iz0Qs3dA7GN4+dUdfxOGNmKUJWefMtxQaJofGCFNLyY=; b=h4ZIQwWIgtJrwQLN/ic9oJWvjTrqvOoBfrcrWaP+4lkdLEPANKE0YAK7WK102HKDfF MGhWxv3Og0WXVIvexHh4RJb8Y9MndfE+NC2F8n+8kzi5A1OpQOJeibMtlFSgVIuq69zc Z8YJvSCCfhHCpt0CUFxXFWnmsb8lWadMaQrsAyM08Zf/Bln/PTZ8cdY9Mx8myDwBnLHS lieWKhdeMao1XfS8sabLNJJ1Ujf/HdvtCMSSwDWNBAqvm9NkhbvCFzyDVBPGglMYhZco qXlaptoFn+lWRAdjcwgCaAYrZOcEGQegjvJYT224CcAF4eNEPTrlrZO1jBW24zT4SoXB HT2w== X-Gm-Message-State: AOJu0Yzdv+q0qcEsJGmrB31IybUw41wIlNmqMgVQiC6KoPL5jydfYm0p bYE5PBGPViIsni/1wA3Ncu4/iPZe2L1Vp/8812DiO2CYl7zSyzWWI5gSBG++0Fc6Jk13UcuHmm1 tBVT+LrBC0wXDF0wqdO2y5+qJVJ4nLYdI+dbfUCDvDWbdeqC4sdkUcNHnvXJYF6ocZA== X-Gm-Gg: AfdE7ckFLT/ebO3nczduCYFWRPvjGu8Jc5T5Rg+YRlnpsbwb4C2Rp88ZQWkdbrTDus2 DHF77E+TpbiI+bsNK6oEP4WWYBj7XrvvnJsd24xBXrt+4AvQSmBdUiatnkLNTxF7ucsK84V3TEz 2e81lWqihBLpqXWmjG8Y6msGkFtZHwO+CtplwMag/Rx/DqblHUtfs84hPsQGlniorhwxBMBwb7v p/DpyHx6Guw9aQlc5ETH+QlkDaZdgj1SsUZwhheYuWkB5JPa6UvzYuhSVHAx8XqWIFFlF6RYk4l zt9qsqVqXXXV1PZi/kDR90HE21wmMGzDFe6sGW0vhDeCky26f8OpkCzH6Hgbg0HTG+wXFuR/C9A O+xOjmIFDKzkWL+++0HwCSJr4/nDK1Vj99TkIDyTOsZHJig== X-Received: by 2002:a05:620a:454a:b0:911:1a2c:f953 with SMTP id af79cd13be357-920d1af4854mr2232858185a.20.1782156741081; Mon, 22 Jun 2026 12:32:21 -0700 (PDT) X-Received: by 2002:a05:620a:454a:b0:911:1a2c:f953 with SMTP id af79cd13be357-920d1af4854mr2232850585a.20.1782156740432; Mon, 22 Jun 2026 12:32:20 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 10/24] target/riscv: move custom_csrs logic to tcg-cpu.c Date: Mon, 22 Jun 2026 16:31:26 -0300 Message-ID: <20260622193141.1449724-11-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX2VFGbl4MwiLV VQRQSmVen8ReQ/nE8Lfd/FCAfEwSXTS/u7ls1ZXlLIUDrQir1jT4W3fJnab7qZZWLBfmxkJJ44i M+ySepGB0BAAGeBqgIJ43lDA6hVxmTE= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX35eKR5o47CLD Tk+k6iekTnYr+Hv080b65Hb1I5sBU/OaK1O4Xvvn0eYIv82KqggG0fUY1wmHA+vwzXUCz2B1gXt C1Xd6nCt+7fa6U7kXrQ4lf/y37MeCSQZMRVhRxvq12fHRBguXlH/Rw3OaslB1DMqIOiVD822FaG PC65+aNID+zVAt9nlfoHGIfZke5+/Om7e76iNGmNBYK9XV0tyjwJ+7Wxo+gKSYUyqFL64oVP0yl CjfrYdu3FjT1dosZ9jo4PVKchr63e3QKv3vPVdos2aPWnccctGkYx8xJAdX8T/6gVyBUItIIuob vEnh7XwKn3ebhXho1DPPXEoPCEdRA+/FCBA56FDOvDWIg8oaH7nWRUThjzCVzOyb+MJ9JyGlkn0 AgPrJKEOxq6MpIquWeT/WB0yDe+648anU4Y/y8B/rPGFVtYC5A6a9qguxoS2ElrZDrqt4aBz2Ns XSrJ/+0Jd0oY4wDhp2w== X-Proofpoint-ORIG-GUID: 4lrAZcon2j6p5EFoSPS3N0nAoUUN7n0S X-Proofpoint-GUID: 4lrAZcon2j6p5EFoSPS3N0nAoUUN7n0S X-Authority-Analysis: v=2.4 cv=eN0jSnp1 c=1 sm=1 tr=0 ts=6a398dc6 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==: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=UMTKudPWM8hV2BnMNbQA:9 a=PEH46H7Ffwr30OY-TuGO: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156952944158500 Content-Type: text/plain; charset="utf-8" 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 --- target/riscv/cpu.c | 24 +++--------------------- target/riscv/tcg/tcg-cpu.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 503b96bf2e..0c5e000f17 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)); } @@ -3178,7 +3160,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 +3206,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 +3411,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/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:33:36 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=1782156954; cv=none; d=zohomail.com; s=zohoarc; b=atpJiM87nAv4m2tqyMHup8ERGE2biY4E47PL3sF51ddQPJqJdOzzR9Sw/l7uuz3olZVpkmpKCcvWjq9fnbT0ixd4BmtlWu+F6cbTSv/EH7XhPH4t6UIRoLE04Zel9ViAAJMrELk2jSTN8Q5xDiDgBDuEMqRmIfkIlh0bCuwUctc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156954; 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=bqoFOqi9y2jApoBFiQULiZlsCkxGWjY/YWJcwDvQwNI=; b=gT7wXE7gO4k7k+la4r/Zgi3Arcw290O+lanNe1gyhPoxSnlX/Cg+NW7/56Fk/upqAswKUmEgf+42lw8g0v6zSOB/01iPlmo5LzayTuwuwESwtfqJ8TJ8gDSwYY86uwquNmtRYToezCj07d8Kz27It4GjQaSzIlXdaxvHRALLSvI= 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 1782156954241248.46797668103795; Mon, 22 Jun 2026 12:35:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNx-0000ot-Cm; Mon, 22 Jun 2026 15:32:45 -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 1wbkNr-0000lh-G7 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:39 -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 1wbkNo-0001qh-4k for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:37 -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 65MFW6qS1083656 for ; Mon, 22 Jun 2026 19:32:24 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yja2fe-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:24 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-91598ab3a1aso600334385a.3 for ; Mon, 22 Jun 2026 12:32:24 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:22 -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=bqoFOqi9y2j ApoBFiQULiZlsCkxGWjY/YWJcwDvQwNI=; b=XdDEwLm8Rm9AjxpnjX9N86/Z+VO xjc+/hoTxrxNs4mRbK38krqf70uBUZm4j7BoRjeMJ21M1KsOUcBDe8KoZxWxjTqb li8A21313qk4IiWSgEk6RtDdLGI8/f/CDuL+i7FUxZGspK52DbmLzEUBSNCI5Qu0 Hsf8moIKToti/nWkoWw+e3vto1RTCFiFyMX88wMVEaQp55I7bxAMxqu3lb3J6NGb Jy5y8VRc8CSTIncM3VpgdD2EgNTA3e6AKBTsUyymVk7vgwHisxLTKUJ2cKunpmRg cFYye02ZF7qwKslkArzLZzOQoP11rcWqFdTmr5f1PgQFP6jTq/zCnJMgAxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156744; x=1782761544; 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=bqoFOqi9y2jApoBFiQULiZlsCkxGWjY/YWJcwDvQwNI=; b=Qe1+AfxsEpe8iu+YQmyyfWvXtDy6L7Mes3yEYhz5R9jRgbTOxGE+/OXgyRi0q5BkXB 35mGEm5TlLzC+/2UZia8f4C5405XmHOPwQ9jJ931pCg+35vYuYvrOg7FXU5KeIl4rTDb cMz6RgUmeaUepxzJROuNOzl16nOjCAGsdSM+5zf1eRdwQv6aWJLT0jfnf2t6XxRqsj4R Z+v3gLKYF1lMlHKEWBsxxIjBECdCb/3P+gQIyMLu5ctz6c95tGLEgB4TH/kwfcB9OBNQ zfQksANpiRw+px1b3ki72/wacSoFrIyrf2T1eaOsGVUqgiDVnsuFv1gRfKODNHKbqx+v qe/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156744; x=1782761544; 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=bqoFOqi9y2jApoBFiQULiZlsCkxGWjY/YWJcwDvQwNI=; b=iE1Dnk+h2iuo8UoFDc2zJGWJf2mikh3ERzRBKWyWNedks9R62NRIRKCKTD+kANuXtu 5SIuJ+8qWPowWdFH6dx4mthYcQRc7X5HgNw0CJyP7KUQ20n0yqZXhfV9aVwxkDdYY35X BugNC2XRQtz2b70+y14WxgaQjBuDrsCj/fHodQ15Ci3OwnSfG7n//LADi0fPlicESqHN 2a8s6erG87GDiq1kCihLpQqLvmgrJqBgLnuMWostkEfFV90uHPFSDdOoxeGpT0DjfU0a 4acipKXd4/tl47DbmzNWXPy34TqsS8aq5QUetLp9mkQVJe8ke10/N4WlICsGcUnp1aSY 7SVA== X-Gm-Message-State: AOJu0YxdJfV+7gtr1O7a2wztCXmSLs4AF6qgRMTIHy3wOm/f8cMuH0V3 J/aKHwyZ5aRIlXC8onrha+QPEuSI3shN1SYeoMKUtjGLUfFqJRd57pblRmUxbbfmUDeWolPkYIO 1MBZZJS0CLS96F6ZwMZwf6AcgVK3bxrL74if00TkO8HOnSNy9ZZiV9NXRSp+UcyU2vA== X-Gm-Gg: AfdE7cnADCZlv7T/didnTcxRWMffTAVq/T57P5AKs/WUqJzfzzjKqN5mX5Mxfl3aMog oClAEk9V5e5S9/C2MWOZTHiidfOYLMz9jiuaVOOK7rZtZS/iUnDnRZzyr2BRsx0eFKXdQ/PRp5A wyGPxaEH8T2O23C4hcOyz9D01kWAOerFpSa2sESpE7+IFXdUqxVLBiJOpRhV9c4PXT4c31eDzfD /gUzCZVVxj5xvErm+stRoFt2sfBCOOVC6wnc//yDfx1+2l0UaTwcYSIAK5cTE/9+nl3X2xocQKG R9q1xNb+mrviThFMnF+7bSlI0FIXjeUxi/cBk6KI7NjkdhnCKfAPFWWqVL+tZl/K8+2kt6yk1mM 8/Lkt7HozYJ0uY0mXNplMuIcDK4mb/iCnj4sCw8lF3Cm60w== X-Received: by 2002:a05:620a:1a1c:b0:915:cda5:2803 with SMTP id af79cd13be357-920d480ec73mr2112870985a.56.1782156743496; Mon, 22 Jun 2026 12:32:23 -0700 (PDT) X-Received: by 2002:a05:620a:1a1c:b0:915:cda5:2803 with SMTP id af79cd13be357-920d480ec73mr2112866385a.56.1782156743080; Mon, 22 Jun 2026 12:32:23 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 11/24] target/riscv: move riscv_cpu_set_nmi() to tcg-cpu.c Date: Mon, 22 Jun 2026 16:31:27 -0300 Message-ID: <20260622193141.1449724-12-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: o-FvM_FgH-UMW_FZVVwFn3i8SkapAGf_ X-Proofpoint-GUID: o-FvM_FgH-UMW_FZVVwFn3i8SkapAGf_ X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX4AshNH0eUlRw 1YEbxw9T04PUqjGFs/YQFn94RHXJVZIwZaQXmn1UNwDps6zZvFVUIdteUqaq1H5NRD5xuY7bHS8 CCa66HWTbdLuC2XJLAmaz/cDqCxlMeY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX6t3ZoH+Ja/Gq oavCvM9AtdgEL3X3GdiQO3WYM8LtzS3dbnyucBiDCz22HRa+dMNUCiyb4dxKYcredMeADGzjf8s +8jqfKotLZ2nMTTfDzx5EsB4rUOfJZpM3RtGKIweVrAMlq/WjXNwEBy8u0LmPurDyRnPcke0ZXn lrhUKIM5chxIVCup0jotVGrLmwx+OrdRgT+4U5e2qH3H0da2c8r+2zR37VM+u1BcUlzxDCdkMnG fxU6Sk/RDRzd5wRRY7RugFtyWO2BaJlKFvkn5kqOMZZYTmtpqyiXpWiMxBRUFEgx1ABkEsgsMo6 hVnJhBnLeZpCJI8EnMZrb2nxynEz7eel143Ywg2tk5SGSVU/AD/d1ZaB8rUUTJf8dSFkUmTvy4C /j6M6VTiv0O79JUCXUjb3w8SVPCoC/UtqzCrzymd4K6gye0iSGPRQTzGEyOSv/LQwCbp2r+fvJ7 nhZsGivpXdG3izNkJ0A== X-Authority-Analysis: v=2.4 cv=YLSvDxGx c=1 sm=1 tr=0 ts=6a398dc8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=9Y5uhDEGy_uPjlLRjCEA:9 a=bTQJ7kPSJx9SKPbeHEYW: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 bulkscore=0 clxscore=1015 phishscore=0 adultscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156954876158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 0c5e000f17..74b6daa76b 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..0d0a704179 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 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:33:36 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=1782156971; cv=none; d=zohomail.com; s=zohoarc; b=W8j7Y5xOp9PKR4xEadcDqweqnMBjltkyMszp/SC3+Dh9FZsXVLBLFni1u27LHYATRx9wgMTtTHZPxW56bFsw8lWDFMrGSrOczhZcC5G5ndkpKMzAcvIb0gEvBF5j//RdANjPQsSFn9u4tG9Pw/qBP5ldQ7IpsjwLAWQ/r66ndGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156971; 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=d/uFzFy5FqRX3cHIra3ntqXywnztpCpncFwhI0IbSgw=; b=RmeUPNh1kUbE8zs/92u0XlL98HUn/fRKIAYP/fVTFPfS06YPZZ4u6+P2RtnpLz2j/JQe2rgBTU3w4FB7evsMoiq/7iz8hAp38gQpW4Sa3MF/UrleFkfFa7z85JvN4GiMzLcelXiQg6V2dOXbbMHUBVXyT7tAdsbi/dImgtl8Szk= 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 1782156971621195.2418292204277; Mon, 22 Jun 2026 12:36:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNx-0000of-CF; Mon, 22 Jun 2026 15:32:45 -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 1wbkNs-0000mS-Nf for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:40 -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 1wbkNq-0001qv-SK for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:40 -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 65MFVtSM1010425 for ; Mon, 22 Jun 2026 19:32:27 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey3a0syq6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:27 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-921634eebdbso596857285a.2 for ; Mon, 22 Jun 2026 12:32:27 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=d/uFzFy5FqR X3cHIra3ntqXywnztpCpncFwhI0IbSgw=; b=fiVza742NK2gyVOiHthMwMJ7blx gJGs7ZNlDTn+y/JXOc5RbK38SQjWABH41aXIMvOag4dQyQLYtJTjGO5azGCdciyY qswaQ4lKvhPwPIW0065x3R0Czhjttg0TboYTIFEPl53HEXFlVzzdqgxBtLsVgiV6 GJvxpjNvPXUzrdLMXeGBrNKrVOgE1OYMIXGWFYCmlhSiRgAwtQW4vcBxWoS4B2eq EBVTJSEWRx+75dW+9fzZ/Xv1Dxa3zvdF3aQS6+fbKXihMZzrPOkpnETgrov9lxz1 XvwCxylqIkJsNiBukMPh/+znD077tt8EIJGKpym/gqagxrysFRS35GzK52g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156746; x=1782761546; 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=d/uFzFy5FqRX3cHIra3ntqXywnztpCpncFwhI0IbSgw=; b=QeBGSxkaQwg2FHwWfFAxE/NEUsyLu6MGY8m88Ka0yAhLHJnrzMWHxv+FXtiz/nv853 yywkTIrkQfZYr/byXX8o5Lw0b9puz4dU8by5oFmWAz1U/pe/IREFWCGGRr32cgOahG0N NOhxX/14a8nIgpgAMdmPkTkc1JKEgvvsqK7cCszZRVPf0y/o5aFTu7age1stzHgt0/e5 BCBMBZLyB9ebVvTt1QLJsx30nHOqPHKRYLbPV4+XY+4CU/8c1fsBrO9CIbuIwsJX265C 3G5xxH+6diU+XiRy3CiAHimLzoqFI+o0tFdX7Ns66eQhuaiXs35qL3Q9nvgL+aFgYyWw KouQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156746; x=1782761546; 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=d/uFzFy5FqRX3cHIra3ntqXywnztpCpncFwhI0IbSgw=; b=f0NXH09Ut6J56FjHI8JFS8htx+RCUPLxGjNxrlYuuq5WVUhoHAvM/a3oMNwDATtRRm xvFxV+VxZd/UkupfcBJvtHnfO0DX+7mLGCS8ySbjKCP0FN+kGp6G/bJCGcZUBABnVpJR nLXebfiwcHPXZDvRAPSY7ZmiF4pW/rxLdNp7z1QwyQ3tbHH/arogi1Pj9Xgcgr7MQT06 68jtSWLfTees+5HX1U/z7/TlJEuvNkaqi9bYXOrjgum8lywxC5bqS9Me8AXppUBV/NEf idnbSwKgpXkZ6L29BPdjUkNll4Zb9RA4wIzn/pDfSdCCkddA8nENGQ5u84P6f8CPrK+J tj+A== X-Gm-Message-State: AOJu0YxB0NtiUnX04mldtLDyH6MHVKXWcKBWkhF+2Cef6Pgf+9eHFV4q gbCKHZJIysmfIel7IdAyyax8a0d3FlRnDZXUfxHhJjoHsB548YkQ3tpJxYkF/9h0BhHqQQKWyWg 1rMOU4ABlMnQuH++j/GMOq0Mb9dF+imIGHQaBVkVu7VQpLRvhD+mgplTZ5hfgV47R9w== X-Gm-Gg: AfdE7cmqumklMYme5cTxZVB3vp4o9LyyATmSXnxrB33/+nGr+i9XAQXpK8LKQ6lBqOm xW6bJvRLWnKYSYJzZZmI82K7hwHwxUpwezgvpABqRTKb385/tRU8n8wN5K45UzSUKuoBKiLA3zE kMZiDYVK7ItD/dxbCOa6gQt94lQbSx4gAuysNYzY0qs595XbssAZ2Qra/CEiAuPiMh4fpi6fy27 bYD7WXz/ThHDl4HkatVT0puwBsP51K5JdPhvc6W4ZqLBVCJvvYu/rXv5N+nKzEdNir1JdR3crDa mVvzw+kp+WdpviNusvuou2LItpHuHhN+K3HIEeDNtui/Jf8SRSJBG/s2+OzFgSwuzBkpK2K7Jsd uyIpa/HX7CgNTonSdU6HiXjU8tq6Ycg2HFqrNqV4ZjH1lOw== X-Received: by 2002:a05:620a:44d1:b0:915:d5cd:8ce3 with SMTP id af79cd13be357-921d104344cmr1643047285a.14.1782156746124; Mon, 22 Jun 2026 12:32:26 -0700 (PDT) X-Received: by 2002:a05:620a:44d1:b0:915:d5cd:8ce3 with SMTP id af79cd13be357-921d104344cmr1643040885a.14.1782156745643; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 12/24] target/riscv: move valid_vm_* satp arrays to cpu.c Date: Mon, 22 Jun 2026 16:31:28 -0300 Message-ID: <20260622193141.1449724-13-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX3OiTq1WK2lA8 MvFN79lVOi3rPadkIBW+P4SSFK3VFLcr/81ETRSlMdDagtymrk9lJJnpqMyrEz+SvMoQQg4UvAq uJf+rxiq0VYQKfh5gshOrJjmsud1MSg= X-Proofpoint-GUID: ZhRnVKj9qvrT-3uAIr8AgV1ZNAs9TlLT X-Authority-Analysis: v=2.4 cv=UJ7t2ify c=1 sm=1 tr=0 ts=6a398dcb cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=5rzsFUvyi4LdqLJPsjwA:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX44lkUZpdJNVl N/BOvc3uECTtr/H0kk3JgKAVH8VPfP/1GFQW1W7MM8veLGYEnboAHChab5TnGCznY+ainJR+K99 unoMC236hGmvrTsVfZQixjoWLCepRlYr+u2E0RTcstcIXqw8n34qvE5iyIKVaPFSzt+o0xwNZ8M ID57ahWxzzxAo2k4IFXbhsvaABmGdAh54AUV/8YZ7vugo+L7Obhu+9xqz0YW631pNn9OyErlaZE nECKC/XngZ98BZR0ICJBpGevkYnHabEnH3dbDUK8cpelJpGKrqmPLNo4NKH5fr7s9K29wpoox3k K66On+LwuFIzFxBJzz5e+Ki5aA2cSPJxrQhHxmQzXtFGaaIS57dg1p9I8LXpDZwG5LY64WhmnPN 6mwglUVCWbyvY40UNX7V8aXfSE4YLfrYiGFskV+eAX2bDqRLBMEOIyhO+ALxaIV2krr7RihLh4D jOI0yJbTz19sR8rnRyg== X-Proofpoint-ORIG-GUID: ZhRnVKj9qvrT-3uAIr8AgV1ZNAs9TlLT 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156973049158500 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 --- 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 74b6daa76b..f0ef4c5a4a 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 4fc82d2477..ae6b166d46 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -968,8 +968,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:33:36 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=1782156785; cv=none; d=zohomail.com; s=zohoarc; b=a17CpJ7Dpa8F9sKYWze5gmelY8/A6jTNrlZdRTnsl+v5UG5YL+5tP2AMjPgJbzBOIxoNnHeA/If9GXpzcGBY21h3DQE07mV/9SeFKmLtBm5zAz4f51ty8sXm4evD2XLRybNkGlYTmD2Ya7O7l1p3Rix6AFxY9qlg5aATn+YcJq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156785; 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=d+x/KmfI7lK59cwgzYrYOT6TnQYFSTwXngaXEUCLYBY=; b=JMS60fKivwvWTVonIyVK0ofVzGS2yEetVoxbY7mdT/87CUaWjseHloyce/Xvt16LF62cs9+ne94zrPU9fmdMS7C4RRwzmIk9sSsiZAdC/8nD//SMhyx1qAwD4V2T+bfEAR2Tyor3jBVldPeA6ltXTUCpYat2A5f23NtNzM0D2uk= 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 1782156785526815.6402219864342; Mon, 22 Jun 2026 12:33:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkNz-0000tn-WC; Mon, 22 Jun 2026 15:32:48 -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 1wbkNw-0000p6-Ed for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNt-0001rJ-VX for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:44 -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 65MFVlrd1010009 for ; Mon, 22 Jun 2026 19:32:30 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 4ey3a0syqa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:30 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9157ae36434so735785685a.0 for ; Mon, 22 Jun 2026 12:32:30 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:27 -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=d+x/KmfI7lK 59cwgzYrYOT6TnQYFSTwXngaXEUCLYBY=; b=IExnaafeP1qhf8C5ivVQllNJPpD lr91Xxvm7EUorwJXdzEws7orXDZGyjbI4oRcWXcT7EUpIiuGwmdCOG3mGcB+9hTF Ojx0udyM2iG3Ro54WtSHV+E8DIj4iPEKFyEsO1BLxBOWnvXu6AJNBD29ck/5EdL2 LN30/py/DoP0/i6awYTOBwJHfP6KBcfqaMiLbToav7p95+52MqFfjtxM76yhNVeB ow1ECbFzYSouFvwR/9i22IlcDEH025P4IK/KyxvkAEtwsZYEjBM9REj+OeMN3nuB yJEskykyXKjQrgZS9EgMwrmysoULBA+VxLBVWhBLfiik6SWjYgOxu1jEveg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156749; x=1782761549; 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=d+x/KmfI7lK59cwgzYrYOT6TnQYFSTwXngaXEUCLYBY=; b=NT51vfJCh9rr31OoRgLl1LSfOHdp5LHJna1YUUXT0TLkac5qFDc5HpcO8qXrsJtL0/ Ik0p2hjJ/xsq0QDkcIw9ZgsdkQCBweLcxid14kSuf9xtuOIcTQPbFW1MnXU1VwyROfSI UW/TzLld2tghBz7iYB9o8uBwAWgMULGXHqL7OFCeA53JWB36OuD/LtItVbaTz7cUAElD RMDaJX2Jd/L+TJzhze2nweq2Sm5it5qx0yBQhy0BU1HpB8mLKM5b1T7jfwZeFG173eph QmJfbh0ehB0wCOzDZUmP8JvjvU/wRvb8OXwvDPTErNHTltgCooqnaDAQvAtT5xdZQ7Gh x/tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156749; x=1782761549; 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=d+x/KmfI7lK59cwgzYrYOT6TnQYFSTwXngaXEUCLYBY=; b=C0IvZaAVVtENtUUXaATj5mRdZsYxE5mwXM/jlok2ppT5vKSSCNDT7ej3NSLmdSqcWI bdWJK9HjBjoYhEpkPOd/04kK83gi++8bIUFxY3TsDUMSFwEhlZwwq+WFUHQijLO6+Ize yZy5hxx3z38AJ3sCqkpoANIH0Pe7sIbXE1MMRZifunEn51JCvtnKEYWqmAmqOZUfSek0 3MvIWLB2Vo4YPJn7jid6ONNYZVS0DzCGtAA3SAwpLz7qzM91uHOpbxCUdiil5BjNYn+f k+hd8DJjjkGU30fbMXS5YLqhimBFmjoN9RWybvHdpnK21iAuph+/KdxYzUb0ZaTDW+5D rRvQ== X-Gm-Message-State: AOJu0Ywc9BW5i08DSImYBjk7PaRo3t0Z+ucLPDJZAVPw7XPKHQviZyAz m5O7+dhMokZH+81eLUhXwi31g0g6eCHbFNgFPJWv+ndRSGMWCBhbXrqQMIlm90UfQmSymhPloFs SXtxuiKVC1p02VH8Mky3oopv0ugdd1Mq0oUIJkoRHS/aXk660N+nRfGj5L2o5t0sQVQ== X-Gm-Gg: AfdE7ckJDyG1aIW4lSNwsEkQHxIavwL5Xc+UrfX51TBZjy+QmpLrjrc7IIemuOvxFKY juu/o4kxDNhyvcH1FGn9GxHqnxUxmgQH/wqroVdDXye0hjuoWtM0ulRNaDdco6Bqdg43Q0pNrEP KE21fX0wiHFMG8O2MlbN2TZwgMESfJJuZ6kH6w2H8045bgH/f09/2P0MMr6PfxL5Adb1PkUWOXv ERuDzn+kkEZFll6NR++uvRBxBfgxyr2QmIRqC8LAbSvzVSb1NecHfJA4NILu9eUxtbbBrQQWUfP 0AdcX/UUssOkvSBF0xRXN1LxFjU44fuBKKVNuPo/oi92wTalr22YxJ7LaISE3adPxeBMkKMvOso YYgN8bxj13e05lxNqLp5evqiMapeYTV0tX9Nb4VNe/LY4Vw== X-Received: by 2002:a05:620a:4587:b0:915:8f76:8005 with SMTP id af79cd13be357-920910a5ff2mr2445545085a.47.1782156749045; Mon, 22 Jun 2026 12:32:29 -0700 (PDT) X-Received: by 2002:a05:620a:4587:b0:915:8f76:8005 with SMTP id af79cd13be357-920910a5ff2mr2445536985a.47.1782156748457; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 13/24] target/riscv: move some irq helpers to cpu.c Date: Mon, 22 Jun 2026 16:31:29 -0300 Message-ID: <20260622193141.1449724-14-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX8qOTB+ZTo/5H E6JUS+t7kXc6/vqWXPibcAz8t7wZDDBgAPv4fUq9j3msUvQu7Rj7E+TDu0tzv9mIi8bfvk89Qes lonqQK2MBXG2qcN7O5XwO/YfHmVphEY= X-Proofpoint-GUID: liRojGNuIq7OrPTUH7gyZ1lafM8FiOy9 X-Authority-Analysis: v=2.4 cv=UJ7t2ify c=1 sm=1 tr=0 ts=6a398dce 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=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=GPi4zPIJMbMzHxplyksA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX7f6ZDUZqQ5K+ tdr2Gmzp5xGiT4ae6FS6T9s1hZdlV3ja2Wlk2XntCvNrBUDTiwGmV4J2AFSj0fjzZ9UBqwB7Nbn PH0VaBDbViIFMY0F/C8DINqfEO9p77UHZRL+AKCLWlb8cB6NSgdZtIOVR+y/xSaSibHHgXdT2aZ k8ESgkMHRWk3YbKAzzxoXVp7xwCA5I4G3HHFHWEeRnJkU9lpx09U9wEuJrkJh3cJgWZLALeNDja lhcA/7rB36Cw91tovgiGDKgUNQ0vu1lkqUVS9wrzQrJl2+YfhniZ8OsbW3QfTaKWtthme596UfP epLldTunka3998V98OuZUZVEzrc6HNOC2DMPDPLXr6vn2t93uP9uiJ/NFK1vT/9Bp8hJaZ8Ytlf R0WUjQa9eOD3f4hn0LroU/7nRq74vBdv/PTSHkah9pS0Cmb4wWiTVgeW7P0k298cYyXb83bujp5 I/nzEGmd/QTvYhmqIJA== X-Proofpoint-ORIG-GUID: liRojGNuIq7OrPTUH7gyZ1lafM8FiOy9 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 malwarescore=0 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156785808158500 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 --- 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 f0ef4c5a4a..41646acfb5 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 ae6b166d46..c45ee228f4 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -638,6 +638,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 9293d61024..09ac1aeda9 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:33:36 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=1782156992; cv=none; d=zohomail.com; s=zohoarc; b=KnSCEPOb6jOyeaYasCFcM2CTBZj+BcmcwkC7a0BR8lLpFolxLHda1nL9defjW9tKh3gYm088voqKUuuaZilL4XaHzM3+LLKmUUZrzwWZvEeKhFtcua9fYMNJxIMhV0DUB3Up/q/i9abz6Ytr8wm8KorlxYN4ZqKqHtlOF2vIARs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156992; 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=zTW6iltEwLvRjrstwtoU0aPT0/EdH3lbHOuPE1b69z0=; b=OJH3B3aHv/GPbiz+fR/x1CnqrPIBzgOqrcbxfiW4DnecqxXi8hIScrk0mYKoLy1tRROY/5OGmOVy4GuL1k1CVc3RspjEUkX5KgvVdzOmnZMMFX20OicfQ9Pl+ZC/t32CqpyovLVRiUZ5kK6Pg+S54RKwalZ1j+En2Wxuh+WWCKo= 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 178215699240361.17373130249348; Mon, 22 Jun 2026 12:36:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO0-0000u0-GP; Mon, 22 Jun 2026 15:32:48 -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 1wbkNy-0000rW-1G for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:46 -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 1wbkNw-0001rm-Ch for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:45 -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 65MFVic33842313 for ; Mon, 22 Jun 2026 19:32:33 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 4ey2yht18y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:32 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-915767b341eso440326285a.3 for ; Mon, 22 Jun 2026 12:32:32 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=zTW6iltEwLv RjrstwtoU0aPT0/EdH3lbHOuPE1b69z0=; b=ht3jjsIsqukVmzp5vo9pbALyQFu qEjMH9Nx2IpbXXlRD5Zo90kK34C31IQFsS3EdHp8dY5RybAen0ZhdykNx9HJIfoJ 4rFk8aNAbhFltouHrCyLu6o91GOTAzP4gUozQZIPF+P9y9zzCDUNM5PI2rEmT1pg zBF3fwaTDQoUmmvBC4VmFfex/R5xWuOfwkE61KA6fMSupoeV64tI3OBZcl3skClu 7pGpJs9RtNgvfQrdsvGcU4bLnN9mf7hox+veoAZYtd+eKCFURI8KfBjBYxgM8v5J H4ceKqP9XrkB92WwcNf2+2Kyj5M8TCwpOA0jLyV1McBHbIq6WMfvZPw1FGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156752; x=1782761552; 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=zTW6iltEwLvRjrstwtoU0aPT0/EdH3lbHOuPE1b69z0=; b=OjvsT7yHDnk1a1h/4Lv12UBEMsq4PduSc6scTq2amv0HGI5ethIYH+KgN0CfWblf0S oA63yJCljJ+GRvzFT3dKW5j5xc6CChWIDoL8pKt3woSIebFJ3xdxS8ovCPx7HJNClLO4 vzAOGTQRxGGBC/ntz6jAn7dD4WdiiHN+Cbjke6TH415l8ZoR1K2QouvfaAElOUfrjC2r 1nlY1pxtr+gAs+XG/laQeV4yrUv2/xy5JH2srMGJzfBi3HHPbz3FLaBnMIqd5iREND+J K1fo3ObqLwL9gA6zVmObQZFJkDpTFmG+P0j60nDxJ7J3eUHTu7+83+G6yx6Qf8zyDr4j F/Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156752; x=1782761552; 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=zTW6iltEwLvRjrstwtoU0aPT0/EdH3lbHOuPE1b69z0=; b=V7peaqZLyYEP0VSMMPb7IYr2biTZ7k8qZPsTu+mxyIYnTewwReGJ+q1Ur8IxaB8z56 ZGrUm97n0XGH//HZ6q1afCUkBWrGxXCgGP1Sad2IhqtsasuoyVu5j/MqWpcER278X0iy rAMH1n6eNbhC6mBC83UYg+UZFegqeyJzAvxAAYZ23xE1+Fm7ixWuvMdEnMdhxlP+Igs3 LhAtNEVfetfNR9zAb87WXn1CVV1v2PnmOAdTSlrWaVyvapQlRO+EWeWjA6UuvONWBF1J /Z/ThrOAmP2AgjAQdrM6+Hci+GWSY+sC20Ro+baA4o1Qb/PGty/4Ww+9yquuegUY2vku AjiQ== X-Gm-Message-State: AOJu0Yy2G2xbkkmNvIDaZF6SP55yS9M0IQq7Mp0Ph9I5yYPb58VN8vKL tgiFSeXFSRs5Z7mN9Dn3z70xyT1KRCnPqG7o9i++CY7KOWQwSdq8y2yJ43DrPcmBZhLvbJL/5kW dDtPB/PlMYRpnuwiWqzmFjsBDJPmEdjZgw9AH93QhHViCBJmG1CbDVyH5ZSDxLoqEsQ== X-Gm-Gg: AfdE7ck7yKM3SLZHUjNKixT/DHwutDwR/9BFqkWyoC70dzI5AGWd4iztecmhGIR18HD hyt+F/P4SIXAR+drNNQTKYZJYBFF36Dd/vN3yljmOrBMH9bEDK/Sg0m1S6xBS7QWMUBYQIRZ1r8 kc4dwSqfg+7dLwnsOHLPWvCIC+XLd3QclLzugFpTz0/+tm6mhKyOkrsvzh1/H/nadtIOk5l3z6D QpO/zAzZhdXrNhHPOUt4zCqWa8SYMwYJodqw2rXVVg1Rj2rHtDp8B1DBXcr67+3vaieJXVuWb1z EQWJdc7jdVlk7h0JeP6HOT045ugwzMBp/rZdT7QkkQInxvCxnPCSCwe4CAYpExNiqlgeB5Hj7dh Yd852jm8kLiJgwwBXii0eiQBEI6F0nMbgIs4Omz84gNmbTA== X-Received: by 2002:a05:620a:28d2:b0:915:675d:a2d with SMTP id af79cd13be357-9208d7e7a14mr2604408185a.51.1782156751974; Mon, 22 Jun 2026 12:32:31 -0700 (PDT) X-Received: by 2002:a05:620a:28d2:b0:915:675d:a2d with SMTP id af79cd13be357-9208d7e7a14mr2604398785a.51.1782156751288; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 14/24] target/riscv: move riscv_cpu_claim_interrupts to cpu.c Date: Mon, 22 Jun 2026 16:31:30 -0300 Message-ID: <20260622193141.1449724-15-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX76DIOkS4aLBR RgSerhhwhJUrhh0o4TqfAAINhtiw56YDxruTsyv6iHU5d272NrzsGw/s0L4nd1fDbLWPCudoamr TkoLKm0UIPWcnvuVEGRMUwKsCfBUkF8= X-Proofpoint-ORIG-GUID: CpXmQA5hJlo9zEhwJIZMk9U5SOYUhotx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX8JdlQjfZ0d6G /E0J7lZKAW/E+EtqZFbk8BtzL7wd2fedNfcvtQPjCPkJd0eEYRSVfuXN6st4yUZocd4Tt/1it2t XW1lDTxI+M4SIhOEAF5wWs7MLe35xuTZn1tRo/ZEmfS0/8jIemHDRDkKT8Waxt+6dgr5APbJ38L W/6GuPooRoh+41Q1BVkyMUCdjp1bpKo2/GPtq1R2rBSfFgs+Orf/Ftqaunv4UHWSJWYjNIghhVv 3kKoJXPoczBG/7Wohv1kK3XO5yozRMqWzl0MswZSKYuSbj8jB/G+1QuQTXNXXFa1/LBoiGpCV3z Z/rf080KaqpwCL2ce5rIgN7WQyZrkTY7la13y8xVKHoeojGuPpJ8ChiaAqlRZ0DL9EnByHfaulu qCUyUW5yFYngBe+zL0iRTkln1W0EvBLWH2RJybx0/h5FOuAYZtSvYUg7e7XVdpXy2lcyo0XkduT 5i0URJubXIH5UppJOlA== X-Proofpoint-GUID: CpXmQA5hJlo9zEhwJIZMk9U5SOYUhotx X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a398dd0 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=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=P7v9EdgfUgEVytVI3b0A:9 a=IoWCM6iH3mJn3m4BftBB: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156993184158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 41646acfb5..2b1fbe4b0b 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 09ac1aeda9..f99fa636c7 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:33:36 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=1782156870; cv=none; d=zohomail.com; s=zohoarc; b=IIk2Uhl7umQI78SZkWCT/axQCFwTYu0mGatMIYqe6apJOVQp0fzM3EzzkluhWczZ6P9p9v3S8e4bqrRMMZOiXz1CW+r9Jr+JfLaxkOek1JhZICz2h9f+A0uskuD4MMKlMKi26gx98kVOwZUQkcpGlO9G7U7pEEq6rtUUs/lblHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156870; 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=JbEUpwiuB5S/wePK+7Qm68r9sNPteyFV0cyQLCteb8Q=; b=dJ5oTthQgEoO1jZTYGcmUFoGuO8twJ3juxAzxcAaiyu+d40QMRsoN18Mk0g1rFbVsvLInepj024k3lbOp9pENRAl49D1uydBqXa1Pkc4OZYgGcxw7fypvGaQaIuz/BdiMx86opfBzQ/jLcBUnqpQIQEGW11EHlJpmYpf3c4HZsA= 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 1782156870921692.8418240838078; Mon, 22 Jun 2026 12:34:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO9-00011b-8b; Mon, 22 Jun 2026 15:32:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkO1-0000uI-0t for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNz-0001sC-I1 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:48 -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 65MFVj5F2691547 for ; Mon, 22 Jun 2026 19:32:36 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 4ey5sn1d3y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:36 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-915d1d4fc5aso869108785a.3 for ; Mon, 22 Jun 2026 12:32:35 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=JbEUpwiuB5S /wePK+7Qm68r9sNPteyFV0cyQLCteb8Q=; b=cSMRv2F8jOiIQGO0M6t8xR//LrP BM218BInjKRISejJosKQAhFoDf8p4Asjq//Bmnpwp7fHoFcm3nyo8tptcrv85oio O3nPC/VCG9MmBQebJgU1Kf+UgT56sd8hBLjjc/dQOw8da9sMdxjIFhkSf7x/CHIr Inw/TU/OaAFAJU21KdHpZlZYumfc6tFIix8Cn92mjnZu0ocG9H3F7z4V3cRRPrpb wTb7aLMKc7tYQHL7Togc9pO2UD2TszLg7Er0NZClGHvBEGKSGSKO12r6Vv3VLpgb GpD3AyCNRth4d27WG9V87qp+lA2lleBzrSs2rbgQFORpmuTVJVmnoAkfADQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156755; x=1782761555; 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=JbEUpwiuB5S/wePK+7Qm68r9sNPteyFV0cyQLCteb8Q=; b=G70NYg2Suve8nWnOiflMQqaDr/aw4mAi+8pykfERfI2MrOcUYWQg+dsnUovQsnt45Q HPfWNGc/sWuNqg7vCjctmtJVZEXfJGEWRu52LGzxsjGn9HYFgla2hep+dUDoVnTRqpnG /fBw5ajbF3llKKvdcj79Iy1IAjd9tQqyFF/L67x7rz26Dtjl2d/GahgwVqJ9ck1nf4sl ieUe2INnTpgO30V0uC02/jAtmOoRqns26XUviVmz3bL4ILY91oue3D4lo18/Ojvt8/Vv pPXYwqyqGaad4D7JiFh1ui5ezLBfdA0xs1aXnSZG6TBtQWZnW30hMR8uTfsoTEn6jZUP CWQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156755; x=1782761555; 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=JbEUpwiuB5S/wePK+7Qm68r9sNPteyFV0cyQLCteb8Q=; b=rf1ByWGEeUNucPx87ezMoz3z36seuhEERfUATj6JPLpNu/3jipesSN7qzMetfirRmy KcVBThRuSQPHbMHhjzniMQpLFK5Aa1uH2lktEZk7bg8U5VjbnU2+lq8RAfG9KNZjkk1c dgO53JRcxM+3EL/gQLTem+28lftQw8bZZ4GeSkyps9/UvNnoMb6BZMyG5wEKs2WnhxRu Mi3dF9g3ssu7j7MCcT8mOn4kaOf/ppBlNGi9/l1Tob6uYxUfUfqz+z2uAGrCNlKAJrJ4 eYpg105hHS5PKyOgC6ae2WCJQ6K3VqTV2S6Xf77ucZhtog0U1Zfeym1nehlusMmGn6jz XB+g== X-Gm-Message-State: AOJu0Yz/SXp8Soj0fV+eeHkUMUxrT0ErnQ3zg3JPUsNp5CbOVlqn/a9i 53iIo+AKz293th1bnIxjtJ5ZwKGfrUUiCl2NyLBuS5ERCHOZWTy6R4jgfNg+HJkI7rDr9ONITG4 oJ++MyADIBQ1ZX6wpBblKQLHlOB9TYdNrnCiFtg7MqUP3z2G+HXgIZqiQrcqeE5VfzQ== X-Gm-Gg: AfdE7cm9PBgO72iWEW0UQpOM4VQMSiZyqONBUu0YW3FDBI7MQ7Dr7toaXvO4f1Tf0MW VYDIwj2FlQgzZj4JNzFP5sd9xZhUzY48pgVaviv2HsMSnuDB3GPafErp7j1A0nU5GCR26dpD5kV fskK2sG3a/N1tGqWDkDjP1sNf/bq0MiKwkoVZULbkFAByWWy4Ci4vTgNn9xmRwdiJah7Y/upraq whQBxCNdOtVRrUoUcfycai+5C4AFkIK3R32aktCvlKego5DvIKYGbgEO80tQPS8RzCju+CftMQq KgXZanw2TDkS7xsRocbMMcvEx9Pe7Msk1fhWW+iL1zWa2x/S+7locnMR9HCP1MGH61L+yk5l/Kf 8LYU49mVH59gJSYGjnJiX2ejJxuufYvePNYLzo9z3iejmAg== X-Received: by 2002:a05:620a:bca:b0:916:421:4626 with SMTP id af79cd13be357-920d403aaa8mr2328061885a.37.1782156755054; Mon, 22 Jun 2026 12:32:35 -0700 (PDT) X-Received: by 2002:a05:620a:bca:b0:916:421:4626 with SMTP id af79cd13be357-920d403aaa8mr2328055285a.37.1782156754406; Mon, 22 Jun 2026 12:32:34 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 15/24] target/riscv/cpu.c: handle TCG bits of riscv_cpu_dump_state Date: Mon, 22 Jun 2026 16:31:31 -0300 Message-ID: <20260622193141.1449724-16-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 5lLSYij8NcBMpYD2WXBVqYNoUzHQx3u6 X-Proofpoint-ORIG-GUID: 5lLSYij8NcBMpYD2WXBVqYNoUzHQx3u6 X-Authority-Analysis: v=2.4 cv=PuKjqQM3 c=1 sm=1 tr=0 ts=6a398dd4 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=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=n_Gjmr79VRyvsDPUZ2MA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX5uojDAEUPArc 2lNfRXESA/H8zqywOsIl+TF9AM5pHdr2MP/6ClNPQQmu7KYRkBBuU2mYEZAHoAaBqfunsXY4tdX +L/r5rrki2+tIYmiqOJR3AQhqXwacXg= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX2cZmGhM6Twvq 28CSa3ZMfW/KL1CTrqQzB/J7+YlXs+o1WVmpajPAia6G9oVpBOu3tjHg5PgDS6MBd9AM+u2cQdn o90ZOPGXwRtVIwMGM/Su4AW8XJV0CsDHAmwJHEnS4Tukgc8YFm+Ft0Zp7nK5R+xblcN2GgWDukD ZLb6Lp15pOCM2qSV4nhevwsjX7gVtHBXAU1f51lmK5mcUhcCJ+SKlgCrczh6r+O/W9K6L1Dqu22 9W/MQtDcth6H6BvPi5wmgVYJKJVeI584IyfNF++poFIbdU5CtnuOunfMwjxx4AUUQI69uOvyrfI AXH+UMDIWyq4ED4P+JJtwI0fzH8cWXk7/0m8JwEactWxdDaCWzIzKo23EBh5iElXU9gvNXyw7Ff vYbe5Dezp72rRcTs0fiuGUuLMsiIZM9uVtR4okFx+uIeRx9ykoydLDUQ8ZfUwT/Q6nw5vYuFBuQ VLjhWxIzE6TvlLe68JQ== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 impostorscore=0 adultscore=0 clxscore=1015 bulkscore=0 spamscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156872355158500 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 --- 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 2b1fbe4b0b..9c1b55c3c1 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:33:36 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=1782156953; cv=none; d=zohomail.com; s=zohoarc; b=F5wzFs11hRtZ8haMXiyTPFwZDEzXb9km08ZsfwPP7+RA+LULVUNITix//b6DGdr0vpym7vbA3t9ZeTfNHxHbZ5zVvLFPfDmIAd9QKljKkgWXU3dDxv8qkn2CWCUI1pVyTZloQ9G8az1PSukOVwBPEwHTcLK317TczgzSv9IzS3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156953; 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=G/X0cRfF4l4iK4D/p8Gh8GL89M7DIMuZtkGx3iFQEaQ=; b=Z0MRjaJq2M8FI8N+Iq+eoNk9qYAGbBRmFEeANiOiWtDsbW64sH3R+qIrAI8kE2s9elbxrhSpNkO65ONqZRvQzSfUmUL7dCz0XICwZFlRejBKeI75OLGV7+93l7tkyOVn6yl5Mkwfh4zbZ0157QK0zdN9SarMWdoqvMNmBcVHqsc= 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 1782156953876363.1825021685937; Mon, 22 Jun 2026 12:35:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO7-00010a-Jd; Mon, 22 Jun 2026 15:32:55 -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 1wbkO6-0000yW-Cs for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:54 -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 1wbkO2-0001sa-4n for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:54 -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 65MFVqWR3842533 for ; Mon, 22 Jun 2026 19:32:39 GMT Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yht19b-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:38 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-92158791d14so340001685a.2 for ; Mon, 22 Jun 2026 12:32:38 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=G/X0cRfF4l4 iK4D/p8Gh8GL89M7DIMuZtkGx3iFQEaQ=; b=QCNDYmewPB7aAV/wO41jAeJx+5k 6Y0evOf1swO0ciKfWEZ/FYEOCxuhliOQilFVuhykDyBWID0lncnuXi9QH7ju8B9E WCcCUzvFAJCddXd726QCf79cD1TvhIyiwfrZRVnNlljDODYxMu5VFB5PYOV+ZEsb vmKFkre3aTYVjy6SHMcH6WZyVkN5kj2Gq6YLWlIbCv5UBWpt7EPvbYK/W0SEOOg/ mZB/AdqN42TGPZ1PTuPQ/7XBOqTKi8l79upTYUkKxMHPTQE9Y8kXhAKE4+IjKKCh 6nmAcFCd1UKluKDWfvpXFKbt27MVBa3Lq7DPiGyLwB62MI6M5FmZGiePzCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156758; x=1782761558; 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=G/X0cRfF4l4iK4D/p8Gh8GL89M7DIMuZtkGx3iFQEaQ=; b=dqPtMrKhmdJtbrlmb2PAxMKAFWkG4uh2SsMcTw88hFVbtBvCm4uxBRE8+cCU/lXpts Bg+q5Wh7IoZ11IYX9iM6k0MRoLZlP0HVljmfub+e+zmFYJEkq3FrqNf9VTlfDwNUYVGk c6eVoIcGZ1iE17E0sy9EbekFvKpyFhGD3nromRSuwPLF93Qc9lnu8pjrVuzVQC5JLmEr YW8kBSkuOwGpYJwfmINzcFVg8BNv5Zm8UvDA7GYsw4wnoLMVZ8uUXkgTU9Zo3PrtbaXG HVNdoZggU9EsT1EpUgEp+if6QXb8RbjWXJv0ZQO8W0jSWLZdw9PksIR4wHNTJeFdV8O1 vrXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156758; x=1782761558; 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=G/X0cRfF4l4iK4D/p8Gh8GL89M7DIMuZtkGx3iFQEaQ=; b=mdyDOzB0Y4Shp7uWFQWy0Gy6m8UzMrbBdlQxA13Xndr7FXy0UTATlR4UbwqQQUDrwL D1+Idj66BW0g+i4ReJQnLoNafCUC/HZGJ+xjYpFJ1t8IjN+Y4pXDSntITRCDq+e2EGTz O00kCUMW20G646RikpHHULnVkhgq0yIuTFPbfqaRwnvOehqgzW0mGYYgg+kxlE4ADFNv K0f5s/YANJs8iPEkkNmKK0R65iboRRrImL4UKzfozOuQ1SCItsdR0zn+GgwO9xBcSt8T 3tlZMdfKW7SwrDdZVGiQSULF9f0BIuuQv8IJWUDFa2yufiiU5/Vcz1kqwXteZddK8A/L d3cg== X-Gm-Message-State: AOJu0Ywh8xv8Wa9fYD1wbtSolYMJ5PzrBEsCs/fYvw9Z+K7h5TBw4a3T WEVcv4PuNbVSM7fEeVfVb+t6Ln6PWfPpAIsQgu2pJ9CdOBZgYA/XJlwb+0bYR0pSz4l8bKEIPVE ilXMMWSTfmvZPnow47KpbX/+gPEYdAmGEHxQJSJ97IwhYNjToGdCcEdzr5Zj2FDd9/w== X-Gm-Gg: AfdE7cnoHNuYq0n4dBBQSi6bLHglEE4tblK5kAsGK+bJjwlvhFAYgGlHOHuBL96D+Mi cc21fWEbmRRrNrZuq6Um8CH36mnEgXlHjeOHRdnW+jH/442bSSZ6/MFYQwKMOA8EL76QD4aVeZQ 4LGGkULGauKwJuEIjK/afPzolHXcDKZWTkSdK53ixm7qoW0PoqYLN9J2VVNxTaNNVoyDPGCzPgt Yj2YexZH12dA8bJD+J/HMYllBOf0PUv31YfPe3Kd0cWTKdcz0A5TuAunf/KsSw1pxus+VzwuX0D JKTbA5tAa4nkg/H3AnCjYyaFcyCK8bMCa9mtGRBQZJJJOpyGEQRT7sWYW2iGinPA0u0qPSyqb5X yA68WGcnrc98X7oF2U9anLLTVv9cZ162xIqZZjmNxA4D3yw== X-Received: by 2002:a05:620a:17a3:b0:8ef:3de6:c5a6 with SMTP id af79cd13be357-9208d3f9286mr2528935385a.47.1782156757591; Mon, 22 Jun 2026 12:32:37 -0700 (PDT) X-Received: by 2002:a05:620a:17a3:b0:8ef:3de6:c5a6 with SMTP id af79cd13be357-9208d3f9286mr2528928285a.47.1782156757049; Mon, 22 Jun 2026 12:32:37 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 16/24] target/riscv: gate riscv_cpu_update_mip with tcg_enabled() Date: Mon, 22 Jun 2026 16:31:32 -0300 Message-ID: <20260622193141.1449724-17-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXxkoDn+bdBr99 rza0SOinXChqglEjVLrXFSX5awk0JTagR99u3FVZYwW+cOTOGsCFe1jRxfyndCfwcIu/gfKRt3O NY7jJ2a/BvrBhRhXn40Edh2eQWMYiUg= X-Proofpoint-ORIG-GUID: IyeoTAlplX9cHi7DCAbh9OYGGJVu2Fmx X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX0LOAWL8eKq6a VUQipLYnKksq1uwjJR+VBvbZKZsWmhQ9dSda1LgZSgR0bsYqJcbUuNqpgblJfJNWxQkkYmeN6hc Tro6keW6PDvrTVwNx8MJkyrrNDZ0NboiM9K+blRpP2seBQfkQoj7hd8PXSVF7wjzTZ/5UtvIROL pMD9dIlVKLZ2SyK4XI/r42lcNiqTguZ94c8xilczhpxEZmvd6u7dmtXQ26v5A6Iip/7/WeE6Oxy n8UQlskmANJcE7hUiyMpFZs6HEyJQuDh3ZEyNt87gIO/arx3/hUIctEqOBZv6Qwfft6fPL4I0dV 5QVGZ9w4eF3ACMGUXLCczHtKiJGNpz8OxD73Hyj37jttiO6qgT8XMpCQgn3CS9QIpOVgdFLpm3h bOk2HIOB9gNTj6EyrViILO9d81noYU4u8YKI7QW32LknLpausOjZn3Bsx7I6Ro7GPlPOVAkugvi YbMBkprbDGWdfmnwjqQ== X-Proofpoint-GUID: IyeoTAlplX9cHi7DCAbh9OYGGJVu2Fmx X-Authority-Analysis: v=2.4 cv=cKbQdFeN c=1 sm=1 tr=0 ts=6a398dd6 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==: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=pBdMQyqLZ6fKue3OrpUA:9 a=NFOGd7dJGGMPyQGDc5-O: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 suspectscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156954968158500 Content-Type: text/plain; charset="utf-8" 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. For this file create a riscv_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 --- 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 9c1b55c3c1..8aac18ea5d 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..2679dbba6c 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_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_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_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_set_irq(cpu, 0, BOOL_TO_MASK(1)); } else { - riscv_cpu_update_mip(env, MIP_STIP, BOOL_TO_MASK(1)); + riscv_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_set_irq(cpu, 0, BOOL_TO_MASK(0)); } else { - riscv_cpu_update_mip(env, timer_irq, BOOL_TO_MASK(0)); + riscv_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_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_set_irq(env_archcpu(env), 0, BOOL_TO_MASK(0)); timer_del(timer); return; } --=20 2.43.0 From nobody Sun Jul 26 12:33:36 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=1782156962; cv=none; d=zohomail.com; s=zohoarc; b=dkEOctIrpPFsc6CDHVooJUL4nAnWEq7K1e79ozZH/CzrN3nNrFTVhl/xrEVZu0IUh9FPNmXIsnyCSxhsImgJfdCRm+R0vrpD4KSyTJ9y9MpdPvHqGhR2OL+4U8ynrbVdygL3lz5LItUVJ9ry5WXEKPUIrhkBcJ7lVZQOMtX5Plg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156962; 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=CoY4lHGOSRL+t8mA9dqO1s1tHLvM33QXIPneGNC5ixg=; b=YfyxGrPu3PbVMV4MJ62ArC24hhg2xQOJJIB1pEVFoZ7fHFpwmfERYgr6zgSdrINUqLy5SPr9YGExcaHxuHSwNjIA2sBEelurF23CLAS6cYH3bAlZRowGZYetcF3jMVj3AEOz/Pm2KHr/7a79ZCASHKXnbuSt9ejY0jISdqU2J0w= 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 1782156962225496.96277338761195; Mon, 22 Jun 2026 12:36:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO0-0000u2-JI; Mon, 22 Jun 2026 15:32:52 -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 1wbkNv-0000p3-R9 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNt-0001t5-T0 for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:43 -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 65MFX7Pl1591648 for ; Mon, 22 Jun 2026 19:32:41 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey5n41dwx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:40 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-91931144870so1098015085a.1 for ; Mon, 22 Jun 2026 12:32:40 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:39 -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=CoY4lHGOSRL +t8mA9dqO1s1tHLvM33QXIPneGNC5ixg=; b=cGaIxt1ZHY7U0mhKHGeNuL6Rzz7 SGV925c47orETpjoJjhoxCykUOZYTg1frEpyY0dtpaZIAMlM1TcqZ4pVQl0KEt2f dN3icBemYm8wiJXr3X4YDB0nwWZiraT03KHBzFfMifoKw2O9UGq6zQUQfG0B86L4 qNkfDur0XsEZYKJ9URWl3twp8qccqRGaA5jSZr1dPU3D95zW0lNvuXOtKNUGrYU4 6LQSek3vcwPcYtZLfoOnOJYsOJNqIicfa7uLWw9CsvwEnqIbHRl6gLCyNIclYMSl SgMSfBQ7gkkEKBf2x0bYW+386M6gVLBdYeh7OsQb+ChjerbuToFTHMO+7XQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156760; x=1782761560; 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=CoY4lHGOSRL+t8mA9dqO1s1tHLvM33QXIPneGNC5ixg=; b=NTFgWItVALOv908KyS+cuYIG1rQScfJreR2bfJUjpyaBxUKP5E/Jp5krlKtDI0r1Jr 7x9xVE097VFOBLa6uOsfE2Z4/+ygEgA0p6EBa0JA+WeJuGa4YYwbYf+hTN/u0ftAuF82 Rjk5irUSLHg3sQuMN92O23b+TovJiyaDooQ4tL1rbUcu/afhti5grHpKTkMJLdiYrhPB 2keHJ0PC9abhdVyz6nfuSfdrxGqJ9ENwoh7HG4w9t4WqOo1pmWY2K4XaRntn8pqfN0iH 42hqlwQbzKnkKWcnV9YgJbAhGiM7eNr6/b5DIypQaTaU4b2YOqLr6xvMk/OWwr2FC+9I D/5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156760; x=1782761560; 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=CoY4lHGOSRL+t8mA9dqO1s1tHLvM33QXIPneGNC5ixg=; b=IQVgjVtNxWuD2t/PqFiKHz7uPQQriLQr1IvDwZKWKznEq2EeKrLvzHiRalWm5QirJ8 /oX3FwVSVIlO580kxd5rDKepehYT7cV81pYj9V/KZX/lQ/0gfTo96pMig/sOchT+jMFe akIZrxKbBujzev2Pw7vIvTiiqfamXZU8eNDr+KIzyWyZ8RlTOFiRTHYYgeQG/8HGrIB7 ZlZTENOv3s322cS/NzTqMEp4Cp16aErMcLLap0eZcgK3T/DF/t0BHsD7ZnQu0zfQGhiD WFlvG2e8jgL4ITB7jZEe+U5nwjI4by+r9HqiyxlA/VWfw4pyAztqv9uL5pscLDuopzNq u7ag== X-Gm-Message-State: AOJu0YyOPsX6wA9Y8lWNdvkfVADiaqFHFilnNeLWTul6mpzDu79AJiUF qVMALV/pobt+9i2boAXnnBKzEsrpr6zz3tNQf/cpad9PjUhlM9nD+JpUsYICD4dseDNksEb5o9d zhDPtnBguDly4XIox7hrZXX1clRyiTH43+aXA5Q332Ib+o2z7kkc0NpwsTzXaUJ0pgA== X-Gm-Gg: AfdE7cmjy8DKEqXIiT+s3G4RRoR9cFNnwtojud55npsRBBNfLTE6znW3TFlq/32fwxn UP4iF0LY1kszSuvNpUyMcSyPKMa3YCO2xwUJ8+TSW7Ihx7/s642J2fxVONV10XtzKQM2w5LZMav /3paJRq0MW1eF1XEMbtVnNic9e3E0lNCczw6NodWiZnPNcobv82gzd53KPgWEiPBroQVEKYM32U jB6wIMkDJgm4oZiSW+qO2aoL10d8JuWoJgQXL7zP02jm6046NSlR2j1kuR9loxC8cTv6O1+LXAz NeoywK38qSbXwDMRNj+einIg8qOMTPEcql6SgoE/n9U9p/urPeiVQHSDXGhIIbjzC5jUBepS9M3 YBolSOJ0wru6bNkKrDfIOcPXkd52a7mDCU1oxeafbeN1+qw== X-Received: by 2002:a05:620a:1991:b0:91e:74f9:17e7 with SMTP id af79cd13be357-920d403a72emr2244101085a.31.1782156760290; Mon, 22 Jun 2026 12:32:40 -0700 (PDT) X-Received: by 2002:a05:620a:1991:b0:91e:74f9:17e7 with SMTP id af79cd13be357-920d403a72emr2244095685a.31.1782156759844; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 17/24] target/riscv/cpu.c: filter TCG only bits in riscv_cpu_reset_hold() Date: Mon, 22 Jun 2026 16:31:33 -0300 Message-ID: <20260622193141.1449724-18-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX5cdugoSNLMw5 7SdJk/nYpQ+LX2JWNiGuwF60zjlnG2b2I1PpgbjzRp0Vwadnu1lh5f28+VeSix99sqDMZ4idkQm bM0sVLBXvlcgMz0v+wPsnspmxzYNrbo= X-Authority-Analysis: v=2.4 cv=R8Uz39RX c=1 sm=1 tr=0 ts=6a398dd8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==: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=bJI4hLjMr12y1cUB6bUA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: oKHi-J5E0SktMbMtrk_esoA6xZvbyLD7 X-Proofpoint-GUID: oKHi-J5E0SktMbMtrk_esoA6xZvbyLD7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXwJr1YxX2iBv9 MOt2zm9sF+ldNSKsTSCXpjgUXwIDlaNfm0umvM+nhiZSwnI6ylaiCH3XDzdE4FJnveQTE8UhaZD ux3zoNOhQ4K0PadaPqHYZV01F0Jfp8SXlJtJu4ZY2D8BH7lCFly7ti+KnF2nVCqG+F/0RjDBFif gnZ+CJmEjiicAjPG4XhHcMIn7SH2YO0Si2B0fQrYA/lJptpvTameXbCB15Y6E5ylLsL/ixDof0R Drbs1kNDneQ1MnObiGgBYzx3jldl5PlSbjl537NYRqZsYFYhnEl9nJA2nZI5xdTDydkVrZMjtvI yLKUSwenVfVZOjllcpeLEOf3MVIcfy2+6vHxz9mgQ8xLfBRYTgojtFZktCZFUD2n/3p4ck3M0Sv R44igsC1V/QKXry1cHWzegCHvkAhVWVU3V+ma9hhXmFLPElOeblAm5THUfUPEoIimlfbWuau4qb L7vIOXCJOPL7nF2BzcQ== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 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: 1782156962958158500 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 8aac18ea5d..8a330487c5 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:33:36 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=1782156992; cv=none; d=zohomail.com; s=zohoarc; b=Mg6TIVouUSyPjptIRpyUesYhZdT0Z8gw0EGPlFzejBWZyze93FBbi7iwV2E6pvFfSFN8Qj468ThSvsgeCwU1G6VBmZRKjaodEmYyP4bpM3UbKGkV0qmECXsFDg7q8CUW4iD54Z6EFanNHn0CGNuPtuusv87bMQ576yfj8ECMYY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156992; 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=ZW1AS6UbO/DiXQEGb3FbTJGYHWMXWvoOX//tpmsFM7E=; b=bMd3CaK88FVRk0q1emnFCQXz7jqnubIBAka24gNrAjT3u09gmVoFhosvr5wazH1SQ8+krNXIZMKabCJ/3/HQ2RFXLEORnaxFm/xY1O9CHxzxUQSOlSlW2tSY+DqzdJY/XSAxYPvqczqoImDTYEj6HVsaA1VX6twEg+XQK6F7gy0= 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 1782156992071764.6761512424054; Mon, 22 Jun 2026 12:36:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO0-0000ty-G2; Mon, 22 Jun 2026 15:32:48 -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 1wbkNx-0000rS-Us for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32: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 1wbkNw-0001tT-Fk for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:45 -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 65MFXVOH1647515 for ; Mon, 22 Jun 2026 19:32:43 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 4ey37h9ybr-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:43 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-91574ad681eso734869985a.0 for ; Mon, 22 Jun 2026 12:32:43 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:41 -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=ZW1AS6UbO/D iXQEGb3FbTJGYHWMXWvoOX//tpmsFM7E=; b=Fhs1cV4OiLUUWTnEYWo9pSoq9C4 xz8rj/nxlCjiCraRCMgH1iWT4lRPvmtkXKEIv2QJ4nDBnTyBHobOO5b7lP56DKcW mI8FQsbTqRDzo0pG3DS8ZjgzRVljRgNPQ0tMArgLHSdYm3wCEFcw3em7eLLOuHCC 6s+is6wDRna7MnTnTRhLP5+uiDTp45C/FtUYE8z6i1A55hl4Vb5yosHYOimid5o7 kXrkZwCcrpyrgsWF20O4kn167RvBhv+E6PDCZLvEr8jRuYo2dW14AyjZAYSVtMSH Iv1e5z+nMSsdmPO8WKGzbaRSoYyofPnU1+Io2N0HD8+Jcga3pE4dAbYtnMA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156763; x=1782761563; 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=ZW1AS6UbO/DiXQEGb3FbTJGYHWMXWvoOX//tpmsFM7E=; b=bm1Q7MnLh3RtjbJnZjA7gLA2LoKV1W/DBuDSXZFmZA7hVFw9E5KiQYm1vytWphKOF4 FC3ljlLfgUluzE1Tr305RRXMrPnHv5JcyKaL4G7cHAOm9zr+UiW3LlgbP4OJmAxQ/NyA amTKzciRy7WHxBjiwHafvOmHWQVsKCgwVQAGJ1KrTkdEQhPPIsIMf2ClM8tdT5Ksz74x SussbQGwGmbEkyONdqjdstagFDzepOG7CAGDpX+N2uWI/imBbg70IpEyiRLeRCJU7697 yADgcBHkNp4HkWKGELLblWwWIrC76l2Ih8hVUaI5ApEikO4V7fGpNxxnF5pBNpTN+QdS V2yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156763; x=1782761563; 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=ZW1AS6UbO/DiXQEGb3FbTJGYHWMXWvoOX//tpmsFM7E=; b=k0w22emxrjMr9zunYVqrgZBUpeuc6V1mD6894DnWAQrAPFOVxWMdnIg44oAxfV52vD sWBc8tdZ1viZnw46LvTQOlAcyXfEwBuvyb4Jl+jomMCkQqlxPs4vMBrOSh+AzN/Lzr8G nKlEfjweykOxmaoWmBjIhoFZYvN6tudgPSXAJHjg4nrCWllaWAiubN+Z/0QWlBzMBC2h IB6NmYKYO2rWaO7PIuMr0PSB4T1qbMDEAjzQmKQqWi6og0Mc82oT1A4OmcrZij80Vpuk Q6/TJifOPmnZ21srMfJLX5tYrwbpNGaYUWChHVVwWMfZigffIp3xvWwm2kzdCFfQtkET Oopw== X-Gm-Message-State: AOJu0YwpPkDs8cSozYUNJjQtjUBGjrgiSOqRvpWQhcc7mVIPYsvhMzsT fgVUhOvmFHRP9rnlnn8nXzLzu1xCiRFKt99O7XQ9puNCCZcLAkPjhndcMt+Oj23NDblWSJvBWJZ +pH8UP71+bhY4m67YMw9TJ+ZWOoJL7B2L+0d2nXr3QXzzeDL8eAgnL4E11LBR5+rjCg== X-Gm-Gg: AfdE7cnUTL1azkOKCBqXLMakiV0qJvIZ40VW6bISSM63KvsjJ6qKRztDPIoANowdERP Rm31/odfeeg7V2frqWY8rEr9DHJtSP4PTAxjRUGbxBmZTznv+VF8C/zcVCFOLwpkKUHYdExKE3h e/eHs8k2K/+hCvCH9+2uOjjKcRNYo1v+ugF6sR2uFLPwZfK1IHZUblZ5qOYBpzQjMqSsHSZVD+V b2gn57lz/lB2D7HzMc50ZUWakQtx6zw/Yo2O1UFAzTUw8OlFXby9jtoIndgw1pMLzJDcrIAyEEX C4FafcpGE6y1vBKXlXNr2xDtqnnYS0Y2ZKLXeiSQx9BVcdbngXzIzY8KNKkBw2tp7nONj+4dq84 7vmz15/kSSdHUqs+o1fuqrdcbPrpWE5agrjE+zyQ7OfCO/w== X-Received: by 2002:a05:620a:40cc:b0:91d:6ac3:567c with SMTP id af79cd13be357-9209119c552mr2633428985a.31.1782156763010; Mon, 22 Jun 2026 12:32:43 -0700 (PDT) X-Received: by 2002:a05:620a:40cc:b0:91d:6ac3:567c with SMTP id af79cd13be357-9209119c552mr2633424085a.31.1782156762587; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 18/24] hw/riscv/riscv_hart.c isolate tcg only bits Date: Mon, 22 Jun 2026 16:31:34 -0300 Message-ID: <20260622193141.1449724-19-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: KWGLiXM4gMNFISlt9eaPFD7jmnVriGYQ X-Authority-Analysis: v=2.4 cv=ecANubEH c=1 sm=1 tr=0 ts=6a398ddb 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=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=0nQI16K_ZF54athspwIA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXz1wdzadumlxm jzNNKmrb1UfWZzgdBtyChmr7ObOXGfc55xFoLBYUs91Xjthn/C515OkzSOQq7+cYyUELmc10+/u uLD1DLJ117hMI9G3phJj+61tTEHKWwQ= X-Proofpoint-GUID: KWGLiXM4gMNFISlt9eaPFD7jmnVriGYQ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX06Z9BWRvao1U sLp1exUB1hmz4P5tqoCzaXKC3saanvg8EV8nK7NkaL/wzvkZPiDrNlsaM6ex7+wkFQIjHkrXGMS Pgvgghaxh8mQph8OP2Fhjmntm4LCd+e7jaHUCiQkz5NsDhLbzUG9dthD255Wpbd7i4QsJ2eP68c GjD5qPhrJfHIHWlhEjHLLT/+5O9J/ZvPEcAiQ2Ybgxs+fmuf+mNwR0K60IRZwO/H3CPRL8QTi4W aeWFv83SC0CwA2kenc7cTWCmipMUYUWmZ3jamkf96mn5y65NwJqO9FyW96iaRtD0mHdGXYaLDYX u1qgoPlQFRybeoq0U6jgsaVem7xh37lqEvShRIfpWvy/Nh9jFnPwthPzg/hwfSh5lLZKYPnfhRy hlbGVZjICqW1ptq3XanQP6nG/1vkhg6Y4ZTaxVVZzKE21Ggk45Bs1UaYu8nvckB0Nua0xduaPUN lb8Zl4FqDlELtqxZozw== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 adultscore=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-2606220189 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: 1782156993177158501 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 --- hw/riscv/riscv_hart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c index d1c7188369..28925aee59 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,7 +151,7 @@ static void riscv_harts_realize(DeviceState *dev, Error= **errp) =20 s->harts =3D g_new0(RISCVCPU, s->num_harts); =20 -#ifndef CONFIG_USER_ONLY +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) riscv_cpu_register_csr_qtest_callback(); #endif =20 --=20 2.43.0 From nobody Sun Jul 26 12:33:36 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=1782156921; cv=none; d=zohomail.com; s=zohoarc; b=MkjhCvVbnAGFCpo2WoLNdQBu14VYwy4WRc6EghP6Ac+m5INhKTLOP2/0kyYSLAG6IBQabMCmaY0IvkL/3y0ZLz953fCLYjpuNhvaat1HB1RnT+sKyRDVadnQuNiVaVmunhgid7BcaVBHtBRYqnkNSrZT3ndgyz0+3Gnf2TymRFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156921; 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=RVJxl0urG61Dpxt1Hln7eU1BoOC47/dkV0DoEJa+ztdLTseGTTfFd3s6uWJVORKt5UraPqVotACggOkmPivMhLTxY492nlRqrTKBWvhWYLrOgN3Z94vfm3BC2WJjl1cIldIRbP/nXCUwPzNn0j7hwBqnp9FcdJV+AW/SLAQH+TA= 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 1782156921380328.25170933109075; Mon, 22 Jun 2026 12:35:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkPS-0002Kk-7i; Mon, 22 Jun 2026 15:34: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 1wbkPC-000284-KU for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:34:05 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkPA-00024x-Sx for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:34:02 -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 65MFW6qY1083656 for ; Mon, 22 Jun 2026 19:33:59 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey2yja2kh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:33:59 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-920aa2e130eso718391385a.3 for ; Mon, 22 Jun 2026 12:33:59 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=q3VKOG+bLiR yfEcN4LKgkHdSXA4OOkMf38y8s29WJto=; b=I8CQH6xL+Q7WdczUlGeikOQMtKj l1X+zwdw2TV2O38B+o7P7sjHw6qaF22DmL3sDGrHn+/bDykdQ5JtdiyzD2gy+G7G cdats7rYrX063L0EY+ZT2hFDT4suonm6Mx5nDmAme3sj4WsQsd2rygy8c7XHYJc0 Dp6zc68Xk5uM1q2+WRi0y+GrW/53ZWfouzWCrTisNUYIB32fTWUuXcHjw2lXZgus DM9mKHjJQWHNqD6/Vsh4E2CD2MOIUL3jH1nRORvg+SdUJCN/wSQRT2KxP0VrlE30 +fGjGKGG16wfMgrvvMevZVJSvK+LaRLh/EagEQrF2tyC6owMv5rKBc6Nu1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156838; x=1782761638; 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=Htl6BFq4BSWu3K7+Zb50NIg9rijEMHEfMsHiPlxh1zwdKBKVbQ0q88SybLFwNgEVUS 4rbhbYYE8go9rBnAZac5q76Pk1wXi5CQaKQLur/vkaom86nT0sZANi3fr6Nw4WpawI/e jl6prM3PiVCZFmOVLD9zTnvVAAgwlCZivyQ34CtbFilxhXb3mEDBb34kYMrgK0S65mgG tPnrtY0ysGWeG6IoCDdaoA2RXOBdSGjWik+y+SJMPXCp6w4AvIupZRePhsK7ElekYt6A p9K8K3I/TuxwSnuwUFpeN0SOSmf9tr/5wxp+dBGrU6m9kCrNlX/rtFhc8QcmcefcVQZZ 5NdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156838; x=1782761638; 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=juf3njhRVARwYkqejAm5hV8KCtnA0BxVAMnQkkfc9duMdk2st3R/NwTXhUA6yCcoBQ HbuLxy84pLqevXyrzV4yBswgBtPKdFJrxjaHypsDcnV2RNUO+rJmUVVbHKxFsWNQpp4I WyCUdHHxRdu8w87Edb2DTHm44FqkrU7KG5UyjWKdW0u+/cRTXHF4YRz5UHCnUOA+ux7J Eo36zxERdFDFz4KeNmE2VUw3JKkCm1gjwit3Sv7wmUuatpKbwqixkjz0DHqh4gWs4ghk Z8rd4Z3HLKp1XGfcdgp/DJwBSYP0MtSGLlLS9jfUtpHWAa85cJRtMlqTPr9rJKaQxLHJ YCnA== X-Gm-Message-State: AOJu0Yz0Va9UCF/75Gru5/WAlVEPV/c/YPQUK58ZYxtNmGElB235FRns ouhHZt8Z641aHO5tL0LgdK6X6KoHAY6ggFVStQjp7EBd+yFerV+7Nrkq2w6HyKJhgXbrun9R2M4 iSnGPVC5Y5ZT4Jzc2jbeu8DHFoSOQ7MGYG/faSqkLkE63K+ZCJTtn3NNec115CqXEig== X-Gm-Gg: AfdE7cm6TCkgdDvF58pJet1FRayAtw+1N+10GF4KD+Qr+nWNywdDviFgk1jyAfv7TuI 08modApQqj2TESE4NKWSL7vS8XYeUfG6EBOmyo7mP5Zoo7aWpDtXnysC3qQXv2AHOwXICCDHwVh PX1KiJpjtNWCTTRckXtZWikYuA3kUozHrTvludQZl0PNb2UgY/6u9WCUcqxakdYbitN6kuWrJxJ 2oWuhjsaxMQ+73YnaqYDEZakJQNJQHUhiDkVCSWwx9QkHX3rJz2QsCVTCCjiMaoL3lQMFlAz91k P4JsavXmI9zjOujSUkpFt5oCwybAmOSJlNAYgIwR8m1rVh+5YEkuiGkWp+rasNVCbZoJw80xteq hnlbuSgfLnYwsMJewnkMb0zDmXS2G67u703QczQ9KkypG7Q== X-Received: by 2002:a05:620a:2725:b0:914:ca66:841f with SMTP id af79cd13be357-9208f256a65mr2472362985a.6.1782156782281; Mon, 22 Jun 2026 12:33:02 -0700 (PDT) X-Received: by 2002:a05:620a:2725:b0:914:ca66:841f with SMTP id af79cd13be357-9208f256a65mr2472143485a.6.1782156765168; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 19/24] target/riscv/gdbstub.c: isolate TCG only checks Date: Mon, 22 Jun 2026 16:31:35 -0300 Message-ID: <20260622193141.1449724-20-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: -4IT0YtseqcY7cFXKTNDnIYVlTVzBKKc X-Proofpoint-GUID: -4IT0YtseqcY7cFXKTNDnIYVlTVzBKKc X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX99ZoBUDPl6Xc e9BfweCVvlT3MoZRBQ+WIo10c3qVj08cQIX0X/w8EJSMAb5n0QSXtmfIGeB/19PZ0NnVVm9R4Ai ORe50tgL8x76Uv8x84/ycX45oTgVYCw= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX4i14OmaiWvtP aJZoS6aVFmYqIGZNZlEVITQXtFTN/dGR+W+ogXNiZ5h6QDQjm0C7nY2n4nmcjTsGlN5jJPHMMv/ sR1fspsGoSgTW3BeXYOpbjr8NjGE0o85tdUu2hW4T3A3Idbk1r9fWjFnrcpMxMYlU3DXlVQjejX MfBoVTRUwXS/BzzFjwOZLMzLQd8SNLIgOkzDz7Y/xixwpPb5Xbumm3hue1KvXkOO+rehtogm8Jl sgMpdSz1Np9WyqbOTX2so9dhkFa8lQk8uDyIGN0TAWe3VZJ70FJP8IHGTAnklietwCUL9xjHlRj Dj8uzR8yxKEMC3rIEIztVvjd+0EPjyezcEqEzbHQLIcJZJxFZywcds2013c2xMDS8sgsgh7pBpn Md4Igau6ohFM7hhyOd5ZvoNhLmjgSCBa0fYjeLaDFiuhGYLmECb0Br2o3Fe1fzsFuqdz2TfcovE Nd7um8IjFZSrYx9LnMg== X-Authority-Analysis: v=2.4 cv=YLSvDxGx c=1 sm=1 tr=0 ts=6a398e27 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=m8F5ZJ-s4jyFCOPQnU8A:9 a=PEH46H7Ffwr30OY-TuGO: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 bulkscore=0 clxscore=1015 phishscore=0 adultscore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=205.220.168.131; envelope-from=daniel.barboza@oss.qualcomm.com; helo=mx0a-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @qualcomm.com) X-ZM-MESSAGEID: 1782156922659158500 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 --- 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:33:36 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=1782156976; cv=none; d=zohomail.com; s=zohoarc; b=jsDYpTo8+CEi/9cVVpF/ASumrofVX5o8SeguwbIBygNAWQpYPFxdIm3KbALwcJhTCJSKLF9B10qn9keVSXWxPy4DAR79i/eo4JyYrui/PJz4KFwBghNypxwij77qfRIefZ3hP0oSjC1WbAwaiZkHHhTD+fLFQ6gCACujtm2nAHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156976; 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=F7D8VHI79dV67Zew7czHHb8GjJNhn3Nn4r6Iq8m8kRk=; b=aAfvzSsfWDPYtfn41N+za7GHswZRVZBJyJG8ORLJX8b8DDt3S1Qs6c8F8YYcMw+syRCevt86fVw0mGsHaNk6/9vG2/eEPoXF6RKFLEOkpn/iOaQKyK4edGugYv/lI/Hq0p/v9CF1IGLUr5vay6tzwpMYiYZDi3kHXQhqJlViJ4E= 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 1782156976433205.42082405494398; Mon, 22 Jun 2026 12:36:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkO8-00011S-NT; Mon, 22 Jun 2026 15:32: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 1wbkO5-0000ww-Hd for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:53 -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 1wbkO1-0001uN-Rt for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:32:52 -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 65MFXh2b1647837 for ; Mon, 22 Jun 2026 19:32:49 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey37h9yby-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:48 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-91576c147a4so1191988085a.3 for ; Mon, 22 Jun 2026 12:32:48 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=F7D8VHI79dV 67Zew7czHHb8GjJNhn3Nn4r6Iq8m8kRk=; b=MF01BdQbKM8u+mJ6PLIPdyfwOeo 2oW6IYJD2wWvEnMLJmjBh2mqgXKiQ8qvSW+rfSS368n93rf6Pk5W0sZan5Kn9/ow QURV8n+fIQn5PAm/Eoxy3t66Xi+XJj1XEKEoN2D1otrE09mCzeoW5OAtsWhv8wVw OZkZgJBCYvip29a4tLtCzdTPiwSJ//SeR+83Ie0sYpKW2OlwdRoHBc4qbfpfWFjp hc2KIrASCQpuroPcg2uSwQ82aMKAjUwZjNANMlYfaZ0oT/RWqs58mKD7KVFCeDc6 97PrnF6QRLcrvdIjKQWkMntMEcUF45hWK5k6aWxgsxGcEa8G+iIUdOgy0yQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156768; x=1782761568; 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=F7D8VHI79dV67Zew7czHHb8GjJNhn3Nn4r6Iq8m8kRk=; b=X7+nctbQPiwLG486c2770bGtwhWn7q+bvAbbVT7Zjt8QS6q0L4R+rq2agyqbw1lEwa FqZTSd8K24fHMZX2vwxyNZbDX4ThQQYIdX0d4yVUAG6MePC/914T3OSiuWSyVcTjCCRX lubmv53UlNqrS+nhufjxbK4+aoaWCpVND8l+aGgmXE2UB3nGEe2cMH+E7nLclQuploOf LBjGo2ezZPXwaxHxz2ebU8/+Cb7TT/CS3JwEDGCHu/cox9xaWwnLk7e0G5LBQbCrquke On8frwvbizTiM1YU7cU7YSXVqwOhPeGqmju2NnrkYrPcAch3tRSJem6H3XOfPY15tyLd CWnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156768; x=1782761568; 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=F7D8VHI79dV67Zew7czHHb8GjJNhn3Nn4r6Iq8m8kRk=; b=q0j4rMEHnlF8VfgsuNGu0H82a1Kf6VFQGrlMYEnGIjXAeqAgfBFHBexx9F3Zc8mhxO QGF5x69SWjtyG5o3RyVP19zdq7JtxwcL/OxGauS9uRzBdZrKfFpwM2rz97/SkgunBQg9 T7qbq/gNhMxPX2G3uLY7GG/UiqtTMNFNfZ9PI0jrtOGuL0nN4A8Yyglqp+ECToc09D+3 lJUdjsgsbhOALA2Bj2royoiwlQB1VuBwy8wrz8phnXnhytIsq8UocVUUnf1oeUtJlwCb RXw40VcMXzgbW5gsWZuci9htzfGCQ5sWEwxKVe3VDTzxzuFbFozNSmJArNm+Qv9Gzk7w 9Pig== X-Gm-Message-State: AOJu0YyI/CcLpEzBA26r1efRgDab4LwHRUg/i2rHcdLUALd7hZDk/tpg GNDbQTQ+cv1uEbaCrAl6XqWVBzqV6j+75Nw4EZIfDxPvExdyq3CcQqlSt+JA4NYJs4L7TmMOG95 GvKO2XB/KPg2fMsvNX1fGXyWwCBR3TGBJJ2FZRvD2Pkd+391ukUTG3U4ca0Nh31TTmw== X-Gm-Gg: AfdE7cnGCbMCoSHXFmZ9bMZFrXwO+3WjdhGaoQjri9a362aymAgb1q25F9VfKtdzbE1 mQhpxjwKKqoW9U4YhwgUmyHl2BCAL5e5FXVEJs7Dy1opTfY4zWi84oz41c23lU2PgblRL/5lpD6 HQizyzm4vqaOKCNY3vsMi1zS1z87ZI1uDfZPzvreKqBQjbM2LcvzuOJBmvJDLc8St7jKiqnfeSG INGUvN28p9dPTrXG0zEdUWpvCig0sXP7db5Md3qFpcLZaghyRN6193q9K/AgUnJpW6kYe1KYCpQ dH59KrS+CYSKnJYyFhrkKdkjOAnoGTzLm4us6cfQtDRzuhEFmTpXSpiUbXKO6vXUQMZafiCQFqm aqgEaB3dxbjuG7qOPalpR4IRZJL1pd40H+7x1vHEZdebNKg== X-Received: by 2002:a05:620a:2701:b0:915:cda5:27f9 with SMTP id af79cd13be357-92092e37e1amr2249684585a.56.1782156768429; Mon, 22 Jun 2026 12:32:48 -0700 (PDT) X-Received: by 2002:a05:620a:2701:b0:915:cda5:27f9 with SMTP id af79cd13be357-92092e37e1amr2249676685a.56.1782156767944; Mon, 22 Jun 2026 12:32:47 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 20/24] target/riscv: move riscv_cpu_set_rdtime_fn to riscv_aclint Date: Mon, 22 Jun 2026 16:31:36 -0300 Message-ID: <20260622193141.1449724-21-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: X5h_Vr40clVgyE-PrC5_PFhDbE123k0P X-Authority-Analysis: v=2.4 cv=ecANubEH c=1 sm=1 tr=0 ts=6a398de0 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=u0cZ2EjT8PS4VQJ4ig0A:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX4PHrFgwGzBSg DtwC/vYn83+CPFunhxHs1OepzDYlm8fneMTYwSg1tpB5iuAIHV2pOuTeP8grzqWnvFFqkAdNKTH siz8a2YFBG4RxuCfvv88V41Q5+ICV/s= X-Proofpoint-GUID: X5h_Vr40clVgyE-PrC5_PFhDbE123k0P X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX7Z1+0DvQ9RRx i26GkaAgLbR5d083bD+IRCJMpc/a2dg9QK+6m4ZSjd3idLnZp6eFlndrnmPInnt+JAdksS8YTnS K56Erb/N4ndRFJz3SV6bGlOxF8x/Wj27S2B6Pasaw+zzcCRxgkDBGk8cmwBwDIEZC9rpiqsqFDf 5d639xk44ZTCLKyqocAtjYi6aHfLWhnPZj4gskTiuXhLcWMR0yibzkl+b+voywgx46D6IhoBD3d tdyyXl9e+Qb/VInWTYFL+YdhFhelo+AQMzm+7hMROWYwzHqWW4CSb3eqUh55DtmE0QXlXVx1HFt AUsy3u8N9k96V0BoUAn+SHOfclal0YEm5ppi4YrrfE63AW37SbXo1VWR5Zwixpp6NW4BmQ1zad2 UIlXx6qZ2Su7JX0KQz89kRJ9xtAQOdTCucMYD91sQI8JaelL5aLT24FkByxuY95ROEMwZ7XsOR3 CUmbvMv/osfRFZc+jZQ== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 adultscore=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-2606220189 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: 1782156977047158500 Content-Type: text/plain; charset="utf-8" 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 --- 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 c45ee228f4..9ec86069a6 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -679,8 +679,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 f99fa636c7..d0d74c3597 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:33:36 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=1782156949; cv=none; d=zohomail.com; s=zohoarc; b=LvjwoxWKoHRTOWiGm0uADsxVNrS6RZLlpsza9jtZIe8sxpJsoGmzEGKxToSIJPc39m6kn2ONIliwLDGWsTMnh6j88+LBuhsHxUl+kqRYxCrTBYsqXRNXXn3L3GuHE6ZHwYN5RWJW9Kx1Sw+xLhX4Bf2cuEmKqVAK0ynEttm7Z9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156949; 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=aSo2kC2MH7hpLxfCMiCuwltWVVJs8yBNERrFBxnLqA4=; b=k+Bd/hQG8siCJd1lRI2XgqbAJrxtlmaNb2o23FC4bmzphY8Tf0cEHqvLWULOoikruyLhWRrZ0R71/1S6RvoNMypPl3B1xXPbO3x+Sd1hsUceunUWztoJYMWuzWnbdlFMImzYaUtIoVvApX952fzeByWwsIW+XIJ/gXNqBwf8BJQ= 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 1782156949278221.84743359495974; Mon, 22 Jun 2026 12:35:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkOX-0001XP-OL; Mon, 22 Jun 2026 15:33:23 -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 1wbkOG-0001Hy-Pk for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:07 -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 1wbkOF-0001ug-CD for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:04 -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 65MFXVaf1647501 for ; Mon, 22 Jun 2026 19:32:51 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey37h9yc3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:51 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-91598af506cso461011785a.0 for ; Mon, 22 Jun 2026 12:32:51 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:50 -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=aSo2kC2MH7h pLxfCMiCuwltWVVJs8yBNERrFBxnLqA4=; b=klSavXZ1HesCnmT+jx/BPtG+a+/ jS2ayw7tEiuZXm+DLL/ndX9U30vbH24Z7pldK/dFG9AyTs2Tb1IZRozM0eQJ7Eg5 BhKxRgVm68gkhXUJvZM2Zv4L1PgosbDLH4fprliQJVms3EZ3fC5OiKXGfwhHAIzz oCta56X66w6A0ohdKC8km1jI2NQdtxpGecG0/sKccEqwezhUd3bYjrFkgbQbAScE 4KL3oAZv8LF4t+9H/8wtB4e9a4L3TdNjc0aBw77rxN0Mkq4pgoZn7RkKmv/Be1NP Eoawt6lqpAtWzQGPRFezjrzj4NGClGQFFB09d7cQEFoyzQFd3Y9ZMGQcdjQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156771; x=1782761571; 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=aSo2kC2MH7hpLxfCMiCuwltWVVJs8yBNERrFBxnLqA4=; b=dPq6db4CvXHVDpdk4crFdVZEhQZG7/juaLkVSoTdHWstlrKEdMueDkXnLAlAJDZCA5 jXxf7Fbu2ckT3FNim4OIZLmn1qysbOK3uXXyT69xVlIG8WvvFkW+DtgUAEgcNh2X8BNp JlSor7R9kDPvsZniKI6PE9ilKIK2nySfQ5B+rROO2jD/+ZKeSStxG3OwQAfdFQVcgdod hIt6jJYDlFUmNC2iyeI1MAYAx07+V++m597RrS9VsC9SybB22F+c142A7ECSY/LCgF8q 8ZkcK4Iaig2DakjQM9XDMvF/kPO1FUOcS5JOXYUr3NcE+c7zsYRWjHpayfBIof17g1n6 268w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156771; x=1782761571; 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=aSo2kC2MH7hpLxfCMiCuwltWVVJs8yBNERrFBxnLqA4=; b=YQ12GrNYrBfNmfDfDfaN9sffdB6gtrsVPDrfcYyNfLLAc/GrXe8CZs/oANEcJSCSrC iurnSddTJCbbg4FBK6WPUplsy2fsbMC+Pjz2JOpUvmHASAZDUqJK00Ww0SWESD7NzyOb o8BZXz2agkL7FzmclSI+1xj7TzQ9IvWkmEbF5g64M8mW/oJiGuvpD137T8S28Ye2Ten9 BlE1krHCcnB0K1tcD5KfqKFUEVUCbmoT81srKDyOH9zan4xu8Ydqbk7yzAJVziycwhIu klsecb/e8/J8CwhuzqA47m8mqZjIjBPpesL51lRPrvwE9PvC6ifkbUINkdmK+IgFJf8O fixg== X-Gm-Message-State: AOJu0Yy5hzS6WIpbni8ZwSZBoQf34q0Uy4Xemg6wq6e0NxV/2nCJKg3D HCsToNT6/517ZEI/T5KoBFOPcze2seVg/oM1l6ZPiegeYPTRikcynnuEUa6CaBZdwMFqhQa7Lu5 cOlwEVSHg1HuzgnQ0NUUqVxWaLL7CQ3eyuDQzhLgEIVs2NnSqg9kyd/Y/zmxXbHZ2tA== X-Gm-Gg: AfdE7cnucDSaYpQ1dr2H17Um4mDgyqwLu9TUcL7r08iYHWbbzAjdWKl8eZamal/LlVS uq7nwjS6DrzCz/fLDtUt30k1PnD1E9ji+S+7iFCkDnWhlYrszGXlV5QV3l7heWH3jobaPKoJAsE xhqFD8VKlp4gYy2OllxmQa342iwsqq+poP5CEvZz9iHJMkCI7uBRhxCj4y/dtjJLa5JVY5Jyh6u P91zLYOy7LEhaTkULrdZIj+Ejc95GwtMe4wK8wYDVpImBlu7ULdt/XHhftSfXM3Cge2NMZnapyl S0uwO+WvOFJvua/HnDw/MJkOt5NUAYm7I0VeFJRDy4LBjFCZI63+Bvr5jdkmiXDyHsXX4LnZ+03 031gtC7ieHhhidsdM5komrSMNb41bDcozJ0mb4Ma6YF6bxQ== X-Received: by 2002:a05:620a:2947:b0:915:a101:48d with SMTP id af79cd13be357-9208ddc3d63mr2663183485a.56.1782156771027; Mon, 22 Jun 2026 12:32:51 -0700 (PDT) X-Received: by 2002:a05:620a:2947:b0:915:a101:48d with SMTP id af79cd13be357-9208ddc3d63mr2663176085a.56.1782156770516; Mon, 22 Jun 2026 12:32:50 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 21/24] target/riscv/tcg: remove unused riscv_cpu_get_geilen() Date: Mon, 22 Jun 2026 16:31:37 -0300 Message-ID: <20260622193141.1449724-22-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: FrZgh3us1kEml7tvKUt0AcH3rXulHm_w X-Authority-Analysis: v=2.4 cv=ecANubEH c=1 sm=1 tr=0 ts=6a398de3 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=tH4yzZzyKPjBQqKxX1EA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX/Uw6XIZVkI2W wYkAAdo6u8Vwubsr5uPTqcu5XPsLI1qpmwmp5RWToJ6BX6u9Ync5N4E0qI/ai/Xm09jsDjqoAsp 2U85wGEm1u2i+LkXq0NWbhRhKfSYgx0= X-Proofpoint-GUID: FrZgh3us1kEml7tvKUt0AcH3rXulHm_w X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX2GccqJbNW2gk OiZeqgydPgrIMPONr+dpivY1UHCUK26T6WgY1WmvDigqIiIV+AcoixOCyaGnIh0YyewQqhMDH0O pzgC763MS3dxroRuIQjwxuZ7cI/uMQIdDhlvUwQz7fsS0ep1RjDbkOvLwV202kxiOlaDqw8wbjJ PpoqmJFR8ek/g44wRWEbxnugh6sjJO8Fx3iS8ZwuxFH6mCHIrW/pwt/glOIs2vqDX8xmAMTwjWd c1noUtuJ6VrJVVimghFKPjMtT12enPB4Q+sahzVIaHeTnPVeUqeNhWmmL2VDcMLLP2prbCJU2Ue xXPHqOqrAzLoEWx9OR4jgi9LF2H7+jGAvGHYv1mSNu+rn3n7nVLjRUqKtOvRZgQ90NlllvFQatG W/3rjLZyh7nYJGuPlFbtKwmhqtS+PLS+CSsZr4tJe97QJqOsh/KesvfwjWziQrPRbIHxRRPSWBZ s9t4xUfHdyEtC8FqW+g== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 spamscore=0 suspectscore=0 impostorscore=0 adultscore=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-2606220189 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: 1782156950848158500 Content-Type: text/plain; charset="utf-8" No one uses it. Signed-off-by: Daniel Henrique Barboza --- 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 9ec86069a6..aa67999005 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -644,7 +644,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 d0d74c3597..1f13d257f6 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:33:36 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=1782156846; cv=none; d=zohomail.com; s=zohoarc; b=HgmpDZJoG72C6c6Q3m/9REx/tr4MGXOOINKki7x/bDShCkvAeYRXz0c3doUw0gztzBNMoK1n1Enf3DZdGknARiPyRikw5bWfS6XpMYtftDCOJvptYrf2DK7rfgUj2/d4a5nROhlEwDT3U/45R45m/x/Gs7/ReUXL8Ofi6sLatfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156846; 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=ihjj3C2nlHWY9mPwHPQFkjWzNQOlvyu29eIM/9zvKro=; b=MiYcWsp8yLdY+PFvBkAiyIjTyVHpWT5mmB4zQJNhvaQNVBED6EBQmBsoHRLhO3E9uL3rtH1IpB6EukMnYw9elTkwRMfH2ZWy9Q3Mb1Rvazn3mOj73L9OXXr9l4FLor9BrUW0c6eYXNK0TeoBDZmvCJ77LZuypvWqZThxNeLGdEE= 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 1782156846263858.1007543380891; Mon, 22 Jun 2026 12:34:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkOY-0001XX-5P; Mon, 22 Jun 2026 15:33:23 -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 1wbkOK-0001Ok-SL for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:12 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkOH-0001vW-QP for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:08 -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 65MFXFgE1675287 for ; Mon, 22 Jun 2026 19:32:54 GMT Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey6tms5be-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:54 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9157ae36434so735841285a.0 for ; Mon, 22 Jun 2026 12:32:54 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=ihjj3C2nlHW Y9mPwHPQFkjWzNQOlvyu29eIM/9zvKro=; b=IxpurBErDgp5q2iqyvNJHWT7t4H ABcuAhBrN/PUe/74BVqGnFSVHo/0tFsukZCz03H1OhX+iGH1dvD6ZrJQOZMgJ0J+ oFqjQBRz/+SL0UpHlvuFGaHenALraBEz1d+GRWf9x3Fmw4Nlbg/VsX53rWkHYuB4 B95PqMjasjp8kP7nWtAyvK5Ql7X1AD3rzSCBBE1uPOuCTzbKtC6X/LAoD/a4ZSLf v3Tn1U7Z70/FHCm8ipBnyoBOiJ8O/fccdHDDan+Dnq+3wCYsGqSGdCyd9PH13kqZ nErlap9w/57Af2P/+AhkPGnLtnGGUb7OQorAVHnzSYsASzNcuh8gLWJsgwQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156774; x=1782761574; 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=ihjj3C2nlHWY9mPwHPQFkjWzNQOlvyu29eIM/9zvKro=; b=Z1PS0zM3E6LviK5KgiM8cy+z9bqkAVCKjgYvcVHbKwR/vNbJrGiOgiMmooo1hQUJVs y4RPkP8//07v/E99QR1Yn1GmGTQ6SA4mkgllHwJGjRU9cjb5mcFVkr4/JJvaMTZAIrDS SCLcw0A1hucklqkxVrIXuRCVsAl86UYYCPRiNliwp0AUHNaW/sa0pX7PqgenNs7H5UrM WkTF/hSdGSC1IPWFzeMK6nO/sw2c4tlvEDfjXRrAodzg/FaW/bQh0EdGNgWf7u7z0oDy 0BvnaHANdquQpzcG029qnlNAkEP+34TgKU9QlqEdLaP4p4DJo1oxR2zy1bn1c4ZvKxOa QDFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156774; x=1782761574; 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=ihjj3C2nlHWY9mPwHPQFkjWzNQOlvyu29eIM/9zvKro=; b=A85MWNW6/Mc2VVai3b1V8Aeu6OfkwbrHe8BkKGl8YLo7wghma5I08+iIO/cN4QkOAX 9C6ATXKUTZ23do+5WZtH8u3h5wTkKGl4sFwIFksvDEDV1Cam3su4MaHNlXgEAQY7O5Ov yjsyyjKftLKPBGoA1gJceKFJVzarteYppd9Xko8WmiO/KszVreIrPCLfYU0ZrL6E9zc2 TpuqqTQt3shzVbRrvfGUj1EQ1Zot4wlhf1k6vqsIu6OCTOOB51VuZKZAEHkgSKMg4x/p sPftLVYBecM66EBsklTSUmVPw7v6pHrENTAKHFCMALQIxBqtTQJdXEhUzy0QUzPcqH9/ KT4A== X-Gm-Message-State: AOJu0YzCmtxGczMTSeT0ASXRcq8KuwK+lv95q8gYHQrQDHKsVO+JT7YX jdUbZXShbf+pFhXggK2M7Sp5cdmPl0WTkBf8d/0MvPI/5QngSayru7eN7PoI4naslw3lS/L325x mijOhBg/VeyTl5DdcqULsZGd3GPeNzJLOK/snkLoC8poU9iKObrd8EdFqyDfOR0WrMg== X-Gm-Gg: AfdE7cnGK8ypNZaqvDi6po38GZqy4OR8SE6qlLQtUm1Xxc2+AL/PMNryPcONGV1X+B6 PeA+d08dHzCI7EsYhQ7SqWCgCOjNwWMMTHUBhmCM80Y4+ccLnFib23xsQczVO3lNInoATrv6koH QpxTyQfm1ZugxtbmjFanV72oyxAk/YHLxGlVgDVRtmK8yW2xnwrURAkhnUp61XeBvatFX8eaw2R hGsjJxZwE01+5L7D6o9m2T63gUusNmuuN+DNROPRhHY4i+LOHW/WcIzvqvqXuh+2KRJnu3xeYLj 4W/JLclbWeCP+Kq8rvwc/Ra1xPJvF/sDVQ+AtsLQVfnt1uKcaQ1t4dzdQ8oq3wnyWDDfquadJTR J4KjnPqim2GvnyNzjLgT8kANvf56xn7BD03oUGym6xMd2wQ== X-Received: by 2002:a05:620a:a0c3:20b0:922:38cc:bb6 with SMTP id af79cd13be357-92238cc16c0mr1207835485a.25.1782156773900; Mon, 22 Jun 2026 12:32:53 -0700 (PDT) X-Received: by 2002:a05:620a:a0c3:20b0:922:38cc:bb6 with SMTP id af79cd13be357-92238cc16c0mr1207827385a.25.1782156773232; Mon, 22 Jun 2026 12:32:53 -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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 22/24] target/riscv: move riscv_cpu_set_geilen() to riscv-imsic Date: Mon, 22 Jun 2026 16:31:38 -0300 Message-ID: <20260622193141.1449724-23-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXwdpOvLsX7jB1 499vG2eznfhpA2+IBJbb6l/tZSJfZXdQPurWU9Vp38FAWMvh4dfpYej3DJAotIo/xvvadWA8EtA RJQjBseOfi/V5Z2JPtKzv6FBgS4OVqo= X-Proofpoint-GUID: i8vz4Ban9pGJz9RxYNMYfhc_Sx219pGz X-Proofpoint-ORIG-GUID: i8vz4Ban9pGJz9RxYNMYfhc_Sx219pGz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX2UJ2njAMekEX hLvUSt7oY8vzsTlrkMG8jyQKf2ExC2LStGs/CtfNLHDl4n/cKKeotbI09uSIg+NMOzZQaPiEisz uoX/KktfPM+k+BoEJS2X2wrY0OLEJ6y4iR7YDJ/oiFbGnUl4+B/4j+RqaW6M6hMGcszy+X8TAsm ZLcth76kO5SRhx9826CCxrVzJOnws6o6NfpRNz1ORupFs1OKgBXfISikmnLW4sXMioBn9BrBUYI DZ1/Qa0okwKGEKvzXpNqwsqRaVB5FcuSQ8T2Os2TOEvwJSffQqUgE+YQMczWVk3HTb0/et8wTna afZBAtOF/6MUZp5Kn7t4eFTacHfde+M2zMgLlI7i3/VA/xJQDhH8kiYbaDToT1Ulek232yRR4jL 8TL5+5OIgmTNIpE8nQ89oGGpaBbaQsjkGyW5T+pbouNb0REI+MbhksRgU8PrCHZm/UyBzNaUv7P KcfwoKhTZ0W6XHbYlYw== X-Authority-Analysis: v=2.4 cv=H4HrBeYi c=1 sm=1 tr=0 ts=6a398de6 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=O0V1kVBzSblzqwnZNHcA:9 a=bTQJ7kPSJx9SKPbeHEYW: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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 clxscore=1015 phishscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 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: 1782156848398158500 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 aa67999005..65d77842b2 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -644,7 +644,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 1f13d257f6..3a4e86f6d6 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:33:36 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=1782156840; cv=none; d=zohomail.com; s=zohoarc; b=fGVykz6Tqtzpbt9pj9OmvIr6YdhORc5TI0Gi9TiNSwoscQoxvO6bKsuEC0yFn6YwEMF8rFcnE3A8dF6HrW1LAXL7dWT8EOpQ52H3ssm9cxevkVzylMi/i23yiQWAczpWqxj4qsogYVAqBEgRuKIHWCvnPIPPAVLgn5ltBedhdrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156840; 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=iMdm/ny/73NEbE0ZipOIUchBEo+OzplpsDTdm9KL8GM=; b=WX+7uRk7K1V/9M8KgXp19KG9CcATqmmoi7FIM1eXe42pYbPGqR6RmABZT08r2Xf/qeUsA7yFi1qyH0gK5mQME0Op739JhGVdwuxy7BeRNEtid9gl+XrY0z0akEOO8gChvsWGokb9NWYiklIOEYyF4tDTkAskDdaEIDDNGmCwf1g= 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 1782156840608785.2024356176609; Mon, 22 Jun 2026 12:34:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkOi-0001az-2Y; Mon, 22 Jun 2026 15:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkOM-0001QI-UU for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:13 -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 1wbkOJ-0001vl-VX for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:09 -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 65MFX1uP1370016 for ; Mon, 22 Jun 2026 19:32:57 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 4exyn1u2cx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:56 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-9157f1be083so821182285a.3 for ; Mon, 22 Jun 2026 12:32:56 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32:55 -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=iMdm/ny/73N EbE0ZipOIUchBEo+OzplpsDTdm9KL8GM=; b=bjex5AV3KwVF5F0U+HZ7/KtrgkZ GfItF2PDgFOwYZl5Txo+GKoBHjPb98lky16kNPyFI4To8PTFoUT7M1NVEZsrLas+ 2FNuyr9iThCzUXwJZGZDD5P6PwBv1TtWehSoMXtDCU7yYwKDulZSElXENwmf1rHT 55+jAXiOcd2kYng7HXujFvt1fKz2Lbgu42UDqUsVCHQSa/FPd3ISplQt9017D+KY dy7QwwBLmL10hNAz8v/NDh0FvRuqWCbwcQ4nqC9XLMjEyW4VRAB4XTYJL+cx3qMr Qw5yXPwKnUs3Mx1dVpzCtT3zeGCzznBXvQRtkH4/ohOpoIFqWm6axKwVQzA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156776; x=1782761576; 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=iMdm/ny/73NEbE0ZipOIUchBEo+OzplpsDTdm9KL8GM=; b=OAgNfck/Dqu5uG4IS99yWXZb6sQXXxgV9uXJM4WcoRmH34MeUuxzVE2JOMgKQBU+JF l+7NCRSKHnqD3fYmns/YDRxRRQ1w10yN2ebLIRQtHWK1rmbmNXT0Bew+7gwTRJDoyy9k 6G72pQvx+MGHI5Aeb//eEusOsKszyUsSuDWHINf2Zb+uJ1iH9o0cb1uIQo19nQMdiQw7 7DjOwI+1HNAk/ourydQmVRCTBDMejEQOvi66WC6uCHVwSrAA+WGGDtC57U1F08LpLdZm GOJUySPMHEfL+5RxndAXRdH35qQEo+3QGHbrqRLUh3UvRHG6efj77E7wzaRH4YzoWKYt 8+5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156776; x=1782761576; 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=iMdm/ny/73NEbE0ZipOIUchBEo+OzplpsDTdm9KL8GM=; b=S+/PnPKXbdLWTTyWoafVF73Tn4ASYsnq3y0/XUGLghZufQ1XAVQUA5aCKnJs0Olgxh z9RW1qwoZnX/9MciK8ZPodLtXC502g1+R6tGY27D0Aal8wmbhhhplrEmImPohUto47UM udtbTXhv5YoK3Jt+YpM2XN7S/+mkRr+ysePRGGu/vvEqbG8D6xNukLZXO28027Hn4TH0 I0hulw2Hed8e30DAktQSLiqUEN+8e3VmxCRYg4pClbvRKxLFdvmhibVsovQTM/vbzioR 9mc9sr1HUnDJ7cs5zLmn5GxnYQdsXkVxnyusdlYqjnCjWZDthZmkv31Pp8S5OzQgtiJb sefQ== X-Gm-Message-State: AOJu0Ywk1exe1lRO6vaAIbLGpAvKWSImltkfi1s2cw9i0WaLgErcujro L8RP0aKoiNVythqgm4Tj8c/mBYK5hjc0vYR8+9zsTk2ZDMShSBD8p4w05Pidiby8vPIvX8815P0 KWWHd5OwRoXo0IvDpzfbMykhsrS3DGSyH3xnoPkx2FIYf485rvFM5Tym5ON2Dv97OIg== X-Gm-Gg: AfdE7cn7TTPH8AJEt3s1K79/Epfjj7dP+v+15DW39M/6WwCA/EPEcC89ibxMvUKeYOy gt0Vbdk+OI0XAxC0cX4MJqSlTETprGro98lnUepO8sm2RtZB+jlRRfxkfzww1hiLK4xUWCgK1v3 r8QQXlafC+MsdLUtXAyQHqGW9H+vwOfLd1T8qGaYK0Wq54zhfsm+fr//giPXFeJZZN5R20DRtrb //rqqMNlO/CwcWa9xhBpBaL7IoDAaiFkoP3L2zgvAgnCJVwgYYg/UmOxn3ikhkwXLmxAaRYl0pA HwWZw4r68hSEZEBd1nwYCTCMjGp4M627De64X40FkxgC6XNDLXgkyWGCx9WYZWCOBYxQsg7VhmB Eqqabv9O026b2W6ps7A4bp08yUqq6/f+YU7UeRSTo8YJ8VQ== X-Received: by 2002:a05:620a:370f:b0:914:b9a2:f29d with SMTP id af79cd13be357-921d29fa263mr1584856385a.37.1782156776352; Mon, 22 Jun 2026 12:32:56 -0700 (PDT) X-Received: by 2002:a05:620a:370f:b0:914:b9a2:f29d with SMTP id af79cd13be357-921d29fa263mr1584849885a.37.1782156775894; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH 23/24] target/riscv: move riscv_cpu_set_aia_ireg_rmw_cb() to riscv_imsic Date: Mon, 22 Jun 2026 16:31:39 -0300 Message-ID: <20260622193141.1449724-24-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: f4_Q_d9GuMMSfvylJPBtUdJF4_nIS5L- X-Authority-Analysis: v=2.4 cv=EOU2FVZC c=1 sm=1 tr=0 ts=6a398de8 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=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=tRk87D2_djSq5c8C55gA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX/qUCknld80lu FF2HddgE8LC46l2+Em6vauVPbtvQJ3AK4vOhvm7WHcpm/bJRoRRlUNluuiQ7H2bVDWqjqxtRK+X FB8VzTf3JrnuF0m2ylI11l7LTH92bMo= X-Proofpoint-ORIG-GUID: f4_Q_d9GuMMSfvylJPBtUdJF4_nIS5L- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX2DhmHmFMn894 3HhKzjEzhXsJtQT1hOxMuVFMPSsl4WMj5IddenRBQWIKDPOwZqFva6mw2WkfvsaWY+qn1n7Vetb GymIl3vCqmzIz5Ov3YvnZkxyOTeIWmoZDLhMW+4Ho7c/TLHYsqOQnpmc4PGe2dMKa6EFWMOYR1S NZACBgM0UHrkaQh9WqDxUCUXVI1fErSICHQ39nSTspcAklyVwb/szEf6WgXrdd2OjbBzo6tXdiY FxAlD2qGEtSaFuK0FeJl+Z3lBIfs7ZOAD1CsqWdh2xRdiF+kHRMbyL28chTJWnpun6el7pR29Do ny3QES8pTDSHj2UrcPDxkJdUJc8FeiGPocvECtVtr7uxps+qo/4kdwgFGdqoikF9FynLXaj02TB ho2Ew4BOAlGgCG9IsVlv3tPo5rH/Pw+IvFRSKHLar2UzywDNLNnc0Bdz/65TIAjAMI3h/h4ldJc MXSda40xamq9TAVSnOw== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 adultscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 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-2606220189 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: 1782156842417158500 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 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 65d77842b2..e0836c986e 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -677,9 +677,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 3a4e86f6d6..2ec1c3f079 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:33:36 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=1782156870; cv=none; d=zohomail.com; s=zohoarc; b=f0HYoJy76xv2oPP6ub9d3BB83GYMD/tuVveh0X1Ap+7Q4ax17mEtI3XRhkwXbDpp7OgsbMZ32yTJ1uLBjyfX6Rucyx2vZsiMq/fv0TxEHWevmVod83qeJ6ORP/oU7HZ+ssz5eqUYy4u0phY+RRmbSqWYfUDwX6dFG1WUlEWTwhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782156870; 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=M9M+5uQNTIqyw8bgzZgShPzeFtSsV0Z7ays58OElqxtu8bz+ewRo4uwJ9rIeQmBVyG00gviCmY1CstVUd4usccWd72XBSocJBATXORm5yj2t3sKDLrU2Ixj78l2PTAO+99ifGcslpXcKcMSmUxLNXMFc+l5adpZt0mUnDUN9BUc= 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 1782156870920451.74783094191423; Mon, 22 Jun 2026 12:34:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbkPK-00029U-LL; Mon, 22 Jun 2026 15:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbkOR-0001SL-1O for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:15 -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 1wbkOO-0001vw-Jc for qemu-devel@nongnu.org; Mon, 22 Jun 2026 15:33:14 -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 65MFXPq11592138 for ; Mon, 22 Jun 2026 19:32:59 GMT Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ey5n41dxw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 22 Jun 2026 19:32:59 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-915d3261c5cso1004858885a.3 for ; Mon, 22 Jun 2026 12:32:59 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([189.79.21.40]) by smtp.gmail.com with ESMTPSA id af79cd13be357-926004ab49csm61489585a.34.2026.06.22.12.32.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 12:32: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=novCirPSAB+ Ybo1QyBdlWXtDjYfXG49M7VvGodoMtJI=; b=hKYKoW6wQjpTP15CRsMrZ+0r7C+ qqHdPsCrWoLpVs1RPrrqd5o7sMISAsL8404/1K2nXK4aa02R0UcSP9JwVL/AGRO+ QN6+k14odJYBgIfi5wO9Sdzi/v2Tqn2mK40MJh2tuKXTgxSLof3EOHpkSKMUtkd2 MY5n43zyykVJLLPYRksgDqFFtvNI/zNaKn8/JcHzMBO6zO8S9AiyfccwQm1Lw+5v A58wAsQt08uPiXr/XPC4e5fJ5wr5p+BFxKv5nVNJkbSz2RVO++5JXPbc4/fXSpDa xbPbH5s5z4L/ptarxtH9YlMhZHIEOQjkERFJjgZJJY6ewaJZAScotosK8qQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782156779; x=1782761579; 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=WX2Qh9BEl+uM/6jb1WU3b7NfQYvLn05vaCGlrJHvlIXbaNF5ti2o51HyNdVS5GmlRY tQykE3TAN9jEIaBiiWi8avW0jA+StLBa8SzaonQWMlKZyxYSjftkP1Z7OQ9dGW2wWkco aaQJ5vGitglhihYtIHD0RJN6t+v98uIX6KvyBufWnQbuTey11TVGMpfQZFDLS2HsCB/v 134pZ2gfUIWkUbraflOakZqrvLezkSITc1vrp/JhTPTPu0u0ZtgdZwkFga+ZmSAm2Meu VKyO5aXbEGlELxh50F6ohyC1Umw9LfJAnmVXRIDCNcgjX1n37MaBOtsdInQqHPYnlfoA am5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782156779; x=1782761579; 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=ECrSlOhNpurbrWX8+gIyeiG8Fthvn7TwDEQeUDdDjwf/WDlRFrPpf0DobPyT4j3IIh 4KgXFGakkNVvVQzyZdIUft6Hd/eIxg2rP01rlNbMvloRCsLkVjHnVW892RwJKNVmRFWD MrYIfnPf/S38u8N8ArD+3R23v7kMzHiPLpNE3tf7b569GQPvQlSh/xTes9aS7H8iGOsn KDd8GHPEaNo6fxqAVSVQGisZq5ybGwahd0PRfQIku5uLZ3f0rbHAKiTsmSFGDBlFO603 aIBI1gL+nmuhK1Z3bMjSf3HZ9x5UtsUltBC+xCxa1II7X9Zl5PXzMffG/P+8QcJ2siaa P/Mw== X-Gm-Message-State: AOJu0YyzQ4sAZLNh2VhzoHxR3eVpsWZj78QESb0kabjYtVKWT5fDxhsB O7Q5DFXpQWJxvVlae7jJmyC6oQ6txe2PezvW+QZi5+ie1MC+4KaS2iTOaGX2sh/9vcDE4VA6bIm f6Mfx/Bta+ZejWlAHX1Oho7BEPEkYMzeN5lJIPFpWP/+y6IIT/OWoHPyZ3fFF/WE1Sg== X-Gm-Gg: AfdE7cmJqIOJGKJsR+y8WItHm1UePoZl8PWJdwUUB3/emSAfwOeXy2GJjjSpNHoHtKE nQbBV7zCkxakpIyr83Z2X8MhajSEJJtEWXplB8up9x/mcfo9HJBdiDqwAqeHNSthARxDHCgOkvx OIAepr5tCfmYue21thqy9+V/RUrGPhtZWHleQ5Zg4bqvoaB6dGEMV0xcvH5qlS4KsPLq8bWoFFe JOh1lfBfdGG6Qd7sXPVvuMzVgmz+ufDdPAXQ+3aELSE4MGxqXuvQyUM3h8FrI1ws7yY62j5ShwD EUvPd9fSsZroF6ldQorTDZFRZKHKR8xsgPPiJr/b7aKKaawdJzHqUx0WGCFop7Y+Ns6RNl7Q7Sc edSCtWCqLekf5p6fUsE/NnMb+h3nDZUAwzVFPEZ9jKPHtUg== X-Received: by 2002:a05:620a:4386:b0:915:a811:1707 with SMTP id af79cd13be357-9208f05c719mr2351405785a.5.1782156779076; Mon, 22 Jun 2026 12:32:59 -0700 (PDT) X-Received: by 2002:a05:620a:4386:b0:915:a811:1707 with SMTP id af79cd13be357-9208f05c719mr2351400585a.5.1782156778633; Mon, 22 Jun 2026 12:32: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, philmd@oss.qualcomm.com, pierrick.bouvier@oss.qualcomm.com, Zephyr Li , Daniel Henrique Barboza , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH 24/24] gitlab-ci.d/crossbuilds: add riscv64 KVM-only build job Date: Mon, 22 Jun 2026 16:31:40 -0300 Message-ID: <20260622193141.1449724-25-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> References: <20260622193141.1449724-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfX5N6e/9r7A+Wp oBTTdPJW+yP9EGE+XnQoRUyHtcgo92pUYKtQVfO9kim0zNM3ExHiz86He+OC8fbwLXRhapVTRT8 +TNOBbIG1zy58PIxosjvTF+Ltg3VpU4= X-Authority-Analysis: v=2.4 cv=R8Uz39RX c=1 sm=1 tr=0 ts=6a398deb cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=sHJf4AwOIoU3qjeHFPlg6Q==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=BEvAcZqKd-QGyfCP7A8A:9 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: lUBRjtYzaBQCciB9_m0gKASMiRf5o3rV X-Proofpoint-GUID: lUBRjtYzaBQCciB9_m0gKASMiRf5o3rV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIyMDE4OSBTYWx0ZWRfXxX49Y/KO616K 3+WTWh3bB4MllJSaZnt0j2CnNlFMQg89dxjOFdIyWdPhVf7K2MAG3z0iOLZ5Na2fNurtbHHtFY9 8oKeGWDgVInFjQEz3U1pe2+jtw+QMqP+P8OXcijrzGUVsnF94RARUGO8vBHNvGcg+mLc7UOse/4 QCZw1sKYkZsS+FhC/KOdNcu635kQqrHBki+nnm7sIDpA7g6hENq3NBDd94f8gUGVQx3ClTz4tlQ 3PYruyRLpwxTSGMn4MpSOGdNQBPdA4CP4VC3fb7ZvkC3CdBhFxe8WCgLHRInTBVfp3HacKZzIL8 /vyA1TpK0XcLLsDzzfFmQ/3TR3A+reyeDNX6si8dd9hMCCm2yIX0xzw59C6IVNoG/snruwoJqnr 7GNNKR+w6cFhi0QGjZ37UxQuX+vL7EnNElsv/QwObGPtX3Ic87UdD2ygjST2KqzEwkMAm+E9fSN Qb2YCUU6xPxGEuBdT+w== 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-22_03,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606220189 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: 1782156872334158500 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 --- .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