From nobody Mon May 25 13:48:48 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=1777057992; cv=none; d=zohomail.com; s=zohoarc; b=MwvNkwtwkSN/jNpPNPZRYhHUSS5PPJL/wrPNWDRHuDN0ss89WhwmOm0648rCTJmLo0D/wrweS1CfGxOr+x29iOYGbhsblYLxQGUHfImcsNB/7OMdYkdwLU74XQyEhK7PCIlV5BjHGqhqsX9RsHJwSYSYXf2kamNsKtKOcqM4IWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777057992; 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=JbhSUbgVqgvS1jVnX+VF6Dv1JOy+tx+uSXFOTzDolxE=; b=L96ZIHWZD/3LKT5GtsASaI/ic/IHU7r8MIte3qztgkoTZxMavgE12PhcmD+hxB7EAWSkEkzWUiC4gTj4M5epZIN8SQ8yiSIRioiYToKR1w2TYndoTeaaX34fBZbcK/Hu8TnlRL35wX4pxKhZh6e1Ru3lDQaE0LXHlfpM4cxrdzc= 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 17770579923321006.1566229933863; Fri, 24 Apr 2026 12:13:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGLwN-00064B-8a; Fri, 24 Apr 2026 15:11: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 1wGLwJ-00062y-RZ for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:48 -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 1wGLwH-0004LR-9O for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:47 -0400 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63OI37JX566712 for ; Fri, 24 Apr 2026 19:11:38 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 4drdf486x0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 19:11:38 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cb706313beso1028804985a.3 for ; Fri, 24 Apr 2026 12:11:37 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([191.202.238.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8e7d5fe90afsm2319567085a.3.2026.04.24.12.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 12:11: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=JbhSUbgVqgv S1jVnX+VF6Dv1JOy+tx+uSXFOTzDolxE=; b=lO8hglQsCqTOdFAsgqlEmDdRWAI 2ZPLv7m3SSDV/P4nRLUF6nbXP4DvhqsO7xZAA8eGjWxs0Ll1YmsAinhtOPd99Vdh yKtIeU1ND0TlaGMDR50xqsYmhOR1R9m77FLsLwRKiM8IqCAIbJ9TVSpgatUTP7Mu IaWrkI8QtXXk5dNs/izCViDyDO5+s3m9PbyEQ6mLvvIHhXXrNgMKYIBo123ECePe ViN1KlrUqz9sGsZgH2e6Y3149SbUSK0qiYpj95S+I/Nr7bnd7ZdVjRA5OkU+hD/5 5DSpurGdW0a2yx3Tx9HLE7/o+j4xz0lJvYmToh9vHgkgWI1InzLFWtjnFgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777057897; x=1777662697; 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=JbhSUbgVqgvS1jVnX+VF6Dv1JOy+tx+uSXFOTzDolxE=; b=Zs7fDclm/oL6BQQpvGvuxoNSCf0P5CdmbDTLUYo7kQ9tk6Rw4Gs/mvewfx2IB/co1d jRxHawJxC8NR3cZNJfL4/nSfw22WcujgV6awBg37CL02sMBS5T7/OTxaiYcTwj7Zrkmy VUo4gt/2YF5cPfPCRm+5CM0XjRUV1Z/WhCQp9LwQipkNGlSuff50v7Dpt6H4wpgKozAP w6LCggdMTCWKLj0w5zMegZObzsjsprHbcbw9rY3J50DTfaRq7egmcbJfREVzXzIPmsNZ 0pFaM9LJmnRE5LTc32DzUIhVslISIAVUaxRp4GluyoDANXO82ndk+HMsFCKBI8Hkoyx1 E6CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777057897; x=1777662697; 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=JbhSUbgVqgvS1jVnX+VF6Dv1JOy+tx+uSXFOTzDolxE=; b=EPWKE5Gd8/7ceDjxk/gwrCbQvC9YanbDSeWbMjSsjQGqUAER8afzN5Z1w+nssexceP +GdBRoyhtWRq1cNOnfmH70I3YpPtp+AVi6Wpyd6s2VxacMdqsyjrMec0Dd8hRY3JeK7W BLxo2SX0oVzk4ktmgl62OF2SzzUdNsvwYwE0PCPthcEsOl1y7dC3tC7wqFS000Fb16X9 +Cd5/0ycWUrinJaVj/DAJihdG/jw09gnVYKbHWdbFZpY0x9FwoNo/SUAUZQGXT8vA4l2 OUoV36Y8HNVd22SfR1+nNz/Swgg33ge0rBWfCxlpnFekjio6Zb7XgO8rDmxLqPr8txPs jjEA== X-Gm-Message-State: AOJu0YxMgkCjWYErufMVoQU4WokPnt47zsifYzC7FyIXn++6SVeUddM9 2y7BuuOeVjM4+dHXPVVPPyOv7om4GAECt1g1Ft/LtdObPW59d6S0fAuV+Goc7ps4AYVwxjtS7l5 9dSQ3WB/nsJ95wKteFx91OU7bTuwV8CFjF0Drt6EpagGBGWaFwcyaSrItzPWbQEY2pQ== X-Gm-Gg: AeBDievnODIclFErAm4Gt2Q8hwnYro/909CurBTfPMdJux2ei1TuCP3x+GaBsNy2WLA yRMPKUpgtBK1SH7782Nk/V8vbuhIFBWuZC8xXlBbXWVxQxFGDtrW76QQBApwO3oHElbepQU00Iz Vu6Gn83fpRn3noonv2nSQvb47LweqjtxpOpKljNvxy4bhv6zISo79xmvR++fef+VfGU+IPxr5UJ MdIFHh5H2rD1zgUz+TXSiP5Cn3Hcg+vl3575WHCDVbB7tC2y43PnieGJzxfoYUdOUXuKqEimAIe Kp/6Y00B82Ifws16vMuhgKHWFeGfPnvcpSwzEfuBbJ9AFk+grMIE9vUBpDkXZi6WjmxDQCWerM2 yjDkKmTRMasSbf6dRVjs3tyTf70mzQzt6BWKmj6gqKnOGadlozLmqZeGfddZ0cUMzap6kcO4= X-Received: by 2002:a05:620a:4694:b0:8d6:2beb:9470 with SMTP id af79cd13be357-8e791a98e3emr4511435485a.40.1777057897066; Fri, 24 Apr 2026 12:11:37 -0700 (PDT) X-Received: by 2002:a05:620a:4694:b0:8d6:2beb:9470 with SMTP id af79cd13be357-8e791a98e3emr4511429785a.40.1777057896520; Fri, 24 Apr 2026 12:11:36 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, leif.lindholm@oss.qualcomm.com, Daniel Henrique Barboza , Andrew Jones Subject: [PATCH v5 1/4] target/riscv/cpu.c: remove 'bare' condition for .profile Date: Fri, 24 Apr 2026 16:11:26 -0300 Message-ID: <20260424191129.1494381-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> References: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=Z4vc2nRA c=1 sm=1 tr=0 ts=69ebc06a cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=etEqFfc6qwXwpI8uT8rzbw==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=GhL2bEVCvcqOW28JNKkA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI0MDE4NiBTYWx0ZWRfX/qC4h2MpL4bx fCdvsTmYEVnFRfhRzEjfUL8oa9QWeVCwfqQivpeQ3G83mc2z2zZg0yY84nn+l0isqw0HrzFqGuv H6OdkFcRq5vGwn9W4LGhIz1FCkdb5rWTQ6vWld7Hk8ULMWCBL2kWWxnwBfRuNzQqfQN1QnFP0EC e180ZvBMjo5FUZXIR3Gbp6vFzhvZkgNTH73znfJaU6Z46F5wUshcNUNOh7N5/CqI+qfTNev00lb 5B6NzcSsQYyaGf7mpwt3FqToWgw3y4zxUIqJFXvL2qmlUOUs/UKEQBKHMpL8Sf0RjAY/7eAeCt4 bACyxBsZ9Tvlshx9/XpNPcDOXnf5LS45n0NHKwlNTAOq3r3Vii/0jxKfVv94cbeLT5hSQRDktO+ pcDeuZSxNn9zwLlNgAjKErBuaCg9XoLqemBupKypPORdMHGdRM1tMOr90TuhrAQzF7oVgFI+2RV it9IqWlPVVbHxNtD9lA== X-Proofpoint-GUID: b8JEBS_gx-ZgRzOId9f3CSnjkL7_aRjr X-Proofpoint-ORIG-GUID: b8JEBS_gx-ZgRzOId9f3CSnjkL7_aRjr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-24_02,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 bulkscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240186 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: 1777057994024154100 Content-Type: text/plain; charset="utf-8" We want to configure other CPU types to use profiles as an alternative to adding every profile extension explicitly, i.e. a profile is nothing more than an extension bundle. This means that a vendor CPU can set .profile=3Drva23s64 while having the same handling as any other vendor CPU. Same thing with all other CPU types. Reviewed-by: Andrew Jones Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index a81485981c..586683b28a 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2863,7 +2863,6 @@ static void riscv_cpu_class_base_init(ObjectClass *c,= const void *data) mcc->def->bare |=3D def->bare; if (def->profile) { assert(profile_extends(def->profile, mcc->def->profile)); - assert(mcc->def->bare); mcc->def->profile =3D def->profile; } if (def->misa_mxl_max) { --=20 2.43.0 From nobody Mon May 25 13:48:48 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=1777057962; cv=none; d=zohomail.com; s=zohoarc; b=Ssbf+3ofM7ovGceeyXRDYwXjZra302GUi1KLgqSrxM+4HEDnKK2gcUBnEHLma4lMtICie0djgfBfuCGeijt3EOOFImcrOSbs6dq2Vk2Q95y80vpnaq2f9AYj6zD8nC4YjdNbGKYJIxRWuhz+ui7BieFtUTxStyPAcGdmHE8pZcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777057962; 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=a7TY2AU5eCt8gTvQU52cjnC4YSV1NPobt0HuPJwFdDg=; b=ZIPlsfjlhahjcHFs2vkIuDmWYGgtr8TPsnmIQjc0kWhUFyQwIV0HpzjmWJyeF972eDWFtLJ1Um8Kst0MRvY1wue97LZMQhuHh88m6gXo+++/d/TQK0ytXkFZFWDTBmHJg4Sj979A+yhBj94SqThFzCT1fQ8bV0Swpy3mob/W03s= 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 177705796263084.94043964744048; Fri, 24 Apr 2026 12:12:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGLwQ-00064p-Sg; Fri, 24 Apr 2026 15:11:54 -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 1wGLwK-000632-9v for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:49 -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 1wGLwH-0004Ls-9i for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:48 -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 63OGuX0e3088035 for ; Fri, 24 Apr 2026 19:11:40 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 4drbqg0rdh-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 19:11:40 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8eb9f8bbbb3so1032361685a.0 for ; Fri, 24 Apr 2026 12:11:40 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([191.202.238.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8e7d5fe90afsm2319567085a.3.2026.04.24.12.11.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 12:11:38 -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=a7TY2AU5eCt 8gTvQU52cjnC4YSV1NPobt0HuPJwFdDg=; b=cWp706SK4FHRShUEvCipLSSGfGm 1LYp3DwfFjTxqKBm9nToNVY/+N0INR+JNKEqQiWaEu5qm2lE1+K17jHqu2r3emOx LpSZ3GtaIrzOqWtFs1E8+hftADD/yriGF81X+L8QcYSMy9AFl08A6WHMpU+Ag2D0 XXqu9gC2ewAT7Kgb4qw5qQnDAy+vJ9MV0DcfZawayVUvqgXxYWYMM3HxraExk2IR 8y6uq8ANbBFWWO5/R3PF4RIaMpqH4qdOAPyG5jEeBGZKIVMXanMQTHp29NTlvkj+ E6sJlqCb1nDtSmHkRbUBglbk+MbtlmKFyM3Ugt2LO70wP71kuCkwjeOjinA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777057899; x=1777662699; 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=a7TY2AU5eCt8gTvQU52cjnC4YSV1NPobt0HuPJwFdDg=; b=N1dWPl7cLQz/fk7pl9jn+kOFLhZBEe2MTzmBRKz9JVf0Nt/Jq8q30Od7rBtJkyv82S qul6ZKehy8cz0OMmOevBkUUbsm36YirEpTltRi10TNh71Ymf3HwXsEPCYprs2BtUSXK4 oOtv/Ho3MoMHjrIcf43GBjF5pOXioLRmpip1wgPtnQGfGXdjK1yzcuFK2ywGNM1Dh+l7 p7StCE9G29fAZ26fkSRisi65NUc+PpMi7onTWgCJeslMun2Ubmk0mneuoyk1aGL/auPF dXwXVNRzq44PDpxU8DYitkDfBLO7ddQpsXR9Do/BHxk8QT2IlxYTVT0RY8UU5Yktfwy3 Ux+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777057899; x=1777662699; 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=a7TY2AU5eCt8gTvQU52cjnC4YSV1NPobt0HuPJwFdDg=; b=FYYy8BAQsd4go2tIENpI+iMyWzqH0mjwC0pERjhRUqXdn13RcrrpSbLWHksqydWtgQ o/vyO7aOzq5XHzotQMHJpwjP+W2rrFvXiPpkGH9Lm6d7k37Tw8SdRjkqf4UvbGg2w6b7 ym7d7D3KSYv0ZvUfmjxOpgcnuEaDHvJH+burY3XWFDs7a7LgLdrJudgue22cxhMUCJeG rFJ19oLXaEPe2trSpartPMnNeGyPUv5eIle1thcp4EPs1CQrj6XNBD21ccNRGxUJJrVc rm3pRsegcceV0RAMAD9Baf49n2Bb+D1XAL3d2ZAhl7Pmq9xIKly6zEfP/4wx4AwdqjaE BaSA== X-Gm-Message-State: AOJu0YyVU/BIQX4wfExwq2z4kWorUL3VMfBfGvSRRbk+ZW0bbxjxTjJi 4evDlPN3f1M8DvB9arEf/HgZQyhuYPCBX7k9tIyPBIY52HSnpR/lfcsVPscHg/C1qxqTELniOcx Spxl+TDGWZmTvUjnKoY5trrn9Forb87lU7q7ittmpNVBVsgT8eG5H19TBOsdSKj7y3g== X-Gm-Gg: AeBDiesu2wKSaKVkYYF9cYQrYFDs3NgEIVCMvsbncJx7X//m7YM3APKoe36G7MeSbDy bYsYMi/jBIbLex6RTjk8fa15UsHImMq22AKouPB6lRYZC+y36NllsHnfZnDOHjJ13kt7HKxsflR hCZLFhbsWlceLc8CM/BO/BdUvGbmtuHdh5/+iAH/dCY6JxcpSJnBw0C6YsCKI1sIyGSgssb4r5o ucILGSnye3uou3ZwnQaHqxOWGqBGE/fzaCtHPgHBa4qz7Kt3zINDa5r1AIcxFDNqh+u2c0i8FkE r3Doa5ED4f+7HY3UKYU8ZySVKNROrInSqfi/jYlKC/JUz/y453oFGGOJLVbLIfvVnCpJ64gnIUZ mnCd73AVPDp7UdwKJj/Vox1DmbkRF7c08ckW9eS3inNJJkY7LN/s44woKlFKoGwgZ1XYgtnc= X-Received: by 2002:a05:620a:2953:b0:8cf:dd93:aca5 with SMTP id af79cd13be357-8e78caabed9mr3755859185a.34.1777057899553; Fri, 24 Apr 2026 12:11:39 -0700 (PDT) X-Received: by 2002:a05:620a:2953:b0:8cf:dd93:aca5 with SMTP id af79cd13be357-8e78caabed9mr3755855785a.34.1777057899123; Fri, 24 Apr 2026 12:11: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, leif.lindholm@oss.qualcomm.com, Fei Wu , Daniel Henrique Barboza Subject: [PATCH v5 2/4] target/riscv: Add server platform reference cpu Date: Fri, 24 Apr 2026 16:11:27 -0300 Message-ID: <20260424191129.1494381-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> References: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI0MDE4NiBTYWx0ZWRfX/gIyaHqOTw81 E47CCorLbPQGW9RYySE2DxpPRxW8MwlKaChknsMAYhStsgGfaqfqPH/GhcKwugidjN2a+TFYkaB 1oD9jm2XUDnkf2GcDH8JQb8BWfBI99HLj4hH4c1WkH7c6awGaXJT+LVvQ95+wXyZfF0oSAsbwSr ho4oaQu0pgL30xVTRduv/NVqotC42GfNgNxksLFxqWhbWaAKK6FhhjyZJERFvEDUYWkGBXStZhh n23MwL0b0YYy4FRPJ1rzhwxTm/zdlFbgdYzxHleQF7ZR6DEVz0OMMaaTIQU0gh9ULnXGQzTFFPO OTT2zaXHjVCH3AgDTQGErCGMAJYQfuNpiDKvFMI7Nwgy/D56DFQaoN3+xYZfPEvLIGuJ/GBH2gW cwaYY9hw34HHy2G1ktf2zkuUWxdALzG2fNztKWi/DVyRGPZl8qAfBj4UgKtFdtN0Yzy8hAzm3gm E810CMLWh6p1YlnQBSQ== X-Proofpoint-GUID: GSOPS5M-NWHS_z4wV8HUCSBBvKvsH0UD X-Authority-Analysis: v=2.4 cv=DKu/JSNb c=1 sm=1 tr=0 ts=69ebc06c cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=etEqFfc6qwXwpI8uT8rzbw==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=V1jnuoLLAAAA:20 a=uTRCLKPYAAAA:8 a=EUspDBNiAAAA:8 a=EVmsHFvQfC4jtDmeNssA:9 a=IoWCM6iH3mJn3m4BftBB:22 a=T-agBWn15iSmxapsA1lH:22 a=bA3UWDv6hWIuX7UZL3qL:22 X-Proofpoint-ORIG-GUID: GSOPS5M-NWHS_z4wV8HUCSBBvKvsH0UD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-24_02,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 spamscore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240186 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: 1777057964635158500 Content-Type: text/plain; charset="utf-8" From: Fei Wu The harts requirements of RISC-V server platform [1] require RVA23 ISA profile support and others. This patch provides a new "riscv-server-ref" CPU to go along with the future "riscv-server-ref" board. [1] https://github.com/riscv-non-isa/riscv-server-platform/blob/main/server= _platform_requirements.adoc Signed-off-by: Fei Wu Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/target/riscv/cpu-qom.h b/target/riscv/cpu-qom.h index 30dcdcfaae..a150acd151 100644 --- a/target/riscv/cpu-qom.h +++ b/target/riscv/cpu-qom.h @@ -42,6 +42,7 @@ #define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64") #define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64") #define TYPE_RISCV_CPU_RVA23S64 RISCV_CPU_TYPE_NAME("rva23s64") +#define TYPE_RISCV_CPU_RVSERVER_REF RISCV_CPU_TYPE_NAME("riscv-server-= ref") #define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex") #define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c") #define TYPE_RISCV_CPU_SIFIVE_E RISCV_CPU_TYPE_NAME("sifive-e") diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 586683b28a..4b59dcabff 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -3401,6 +3401,17 @@ static const TypeInfo riscv_cpu_type_infos[] =3D { #endif ), =20 + DEFINE_RISCV_CPU(TYPE_RISCV_CPU_RVSERVER_REF, TYPE_RISCV_BARE_CPU, + .misa_mxl_max =3D MXL_RV64, + .profile =3D &RVA23S64, + + .cfg.ext_zkr =3D true, + .cfg.ext_svadu =3D true, + .cfg.ext_sdext =3D true, + + .cfg.max_satp_mode =3D VM_1_10_SV57, + ), + #if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) DEFINE_RISCV_CPU(TYPE_RISCV_CPU_BASE128, TYPE_RISCV_DYNAMIC_CPU, .cfg.max_satp_mode =3D VM_1_10_SV57, --=20 2.43.0 From nobody Mon May 25 13:48:48 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=1777057979; cv=none; d=zohomail.com; s=zohoarc; b=C5MjC2pJFkthM9CWBQ/YA020vY7A7gHQT13ueJleFWT2ZoB3tas5npv6hnu9gKWeuYkY7YYP+XDsMlp4yry8BL31BjG7+laW6xuvSC6BoRGXBydIUfqIH0+/0S8zsM18hhbXgQkFxAzgBTs6tGB+mMO0jJdYw31zbQ6Yh0CL0Zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777057979; 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=FIBzeY0iBFy1r/i8IAZaV7MjtwHkgx6Rg1XcOCILH/U=; b=DEVT8PE/QkCzLrYa4kLv3ItNeM283zwS/XlJ2goWvW9v/yARaVBxrJUCqPe3z3e1+3eR/wRKWhPC/lxfm+/i0+SDaiIuQMU8XyvhFk5+A/89wXNWRWnrBEF7XjkH/4F1RkNazRvtg2ySgzCmPq7ykzK5zm4FUylXYPbOe/4rjl0= 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 1777057979583964.0844104116454; Fri, 24 Apr 2026 12:12:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGLwS-00065F-0n; Fri, 24 Apr 2026 15:11: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 1wGLwN-00064F-EV for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:52 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wGLwH-0004N7-VM for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:51 -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 63OIpTDX4079053 for ; Fri, 24 Apr 2026 19:11:45 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 4dre5q825c-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 19:11:44 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8eb52a22e85so1353668685a.2 for ; Fri, 24 Apr 2026 12:11:44 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([191.202.238.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8e7d5fe90afsm2319567085a.3.2026.04.24.12.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 12:11: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=FIBzeY0iBFy 1r/i8IAZaV7MjtwHkgx6Rg1XcOCILH/U=; b=VQsURiiBg0hkfICRpkIGy32KUuy GLhaQ1l/OEYN6g7rFPreI9Oriaja+vy3lYax5GggTeabKOCUjENPYn3gqVGqLlUx U7Qfk/XIOIB3Pn4R28AsWG8Ug0EZG9JHOdYn89+ZitKIqREBDjv0Mw3w5A5YSAlz 9pzMEpVmFWs+PQ+HEYBazv8hDmfKRb0NBUe9BtFpkN7pBqE3ug0V1F8VOa8BABtt k1L8u7E9MN9o99DliXmNiZ20Rdbu6Pk/Q61Qj8BCEpdR+eVFnfrzOfULH92RdlMT sqOZ2O868ygAmZHL7bDWXQPRUykJxiw6aVYJefvPvIYNAtJxqDnhvvFzkMw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777057904; x=1777662704; 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=FIBzeY0iBFy1r/i8IAZaV7MjtwHkgx6Rg1XcOCILH/U=; b=SoFDplGWM4YCw+v75DSul4gzJOZZB2wv2U7Xe6uW9f9rUI3WwARWfq6WaEHdAtHF6e G1g5kRssy6f3KQ7HyDjNULohojHaZrCyeg14TdgSlkZZkWDhqZvTCa9QC4pi3is66z2i WiCqiPHSW7Zb58wqelMLGG3dZXjR67iZ3u5ozB2j054fQzj41hf32reaU6YW6876HKuM jhy3bhb8gZIX6topz4cFUEL5I1QanxghmibdRFG9pWhnWAo9CsUEkvHgkkYDGwVLu/d0 yBX36MjpfuXie6iWkyTyDs+ciuQyn8sZfnI/6kSCe/zOHdDjb3Yr5FwgAQaVJrt36hDq nAQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777057904; x=1777662704; 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=FIBzeY0iBFy1r/i8IAZaV7MjtwHkgx6Rg1XcOCILH/U=; b=eXf0MMZyrLKyAqJRFfL2PdoLUhzkN4b9FJMyKBdOdiitKBxRF6iw0jXWFzpGLyk7Vj ERJPxWKI82iZVKeXN12n3m3Ro/kuDXkWpTWDfKNSk0ofzlHQ9MJYPzZU0lgkQS+Mw3O2 S4HmQn7+P8vAc3bea3eimGGvnmyGVlarJDpifBzwErcaWY4IZcUGwtnel2O+ZSM5X33y sckJSaWHS6tyO6VgnJ0GpVrSr3E3dq8RM7/dimnUT4rDHsCaPapqGM84eIImyErXf1l7 ZVrMJ584FGW7SKiWs11yCjw3Bp9WXTa/8+drK8ApBx44F5voGf/9oDLHUhSS4rV7Dvf2 3eKg== X-Gm-Message-State: AOJu0Yx51EfFlMePrggr8D3rMaYH5AiaPHBdEUn9ISRZffWtTETfm+Wg Rr/YGTHH7a1K+JdF+VzCFv1bGneM7Bgrl3H7/p9ppFGS7WYJcx+8szc+nrQc4PFph/HhgTT9nAw 8tExetBC2NNU7z+20rF07mde1cavYxr6Bf7GuVV3A6szdjYCOeKhHmU8zF3/4absx9A== X-Gm-Gg: AeBDietfDHudBC8OBBB2SCWmwJz9KCdXYuNaNkb6XUNRERBfZH6jzzKTjUh8m0WTrno Poc3zpNXq/PjLqU+TF0Lu24yQT/TeYos0h6JskAo2V5A/Qyf8WImBFJyDoTG9A264/TcfpGCE65 XQltHmuud+m8i4lBabrh3m51itTEJslsozOF84jvejTXVFaH5ihD8t/s6R1xK81Ujq8Gp8L0yKo pRATNvB9GRAN0XzRKjSGSPZ5+osBTj7ES9z5BkplxMZebeCSHtvpHFTcC/yGadvBowUzLWjzv3y 9/HVeezbTtCJ1ZII6dvwL3gFaDo7eYMqM4Ec9LmVvLXeGO7n+zU/sPMRjJfq2Z8QDYTAAod2weX KuHhuKEitOi07IZnmVbb/eLhh1MwN08xKQhJt8TOH1q7rKM0hHgl6PkjHLGlbKOZWMeSoLFE= X-Received: by 2002:a05:620a:2954:b0:8eb:92a5:5c65 with SMTP id af79cd13be357-8eb92a56899mr3088101885a.40.1777057902658; Fri, 24 Apr 2026 12:11:42 -0700 (PDT) X-Received: by 2002:a05:620a:2954:b0:8eb:92a5:5c65 with SMTP id af79cd13be357-8eb92a56899mr3088089885a.40.1777057901748; Fri, 24 Apr 2026 12:11:41 -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, leif.lindholm@oss.qualcomm.com, Fei Wu , Daniel Henrique Barboza Subject: [PATCH v5 3/4] hw/riscv: server platform reference machine Date: Fri, 24 Apr 2026 16:11:28 -0300 Message-ID: <20260424191129.1494381-4-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> References: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI0MDE4NiBTYWx0ZWRfX9dEF3i3e/qI9 376GrIfVrfrZPf+WAPVeCFBNQ8in1cOxp+ZUhLVWmD7UChF9NrEmS8e/GWSGGax0z+dRAXuFx7M AraSdBoAOYx7tvVZH1MpZCTvhNvRv/tkjXycU/szexaLm/Jp82t7pNpIrTmYQCLRhvkDw+ixT57 cPdoMOWy2K9Na13VUob8MGUhvLJh/LeCN6J/EAJXyaWZVEaoSc2j+5Gp+ktRaCQLbyw5Z50TsUU FW4xRTk2r7/4M1DIcdW7T9WFEn8Yhgga3cKns1Szk9kj/0r36Qm63iwObAqwQwbbJi22zlsDOG0 ZQnKVPIEXsI4jmgJvz0tcvrPMU9Ir3YS/+PU119TEEDRR/jC0wFHLOG/4MPnL//XiwCUAr4wT6L GeCWIt6EOdQAeM+6BYYU1YvBGZzyF1icLVSu1VNWhS9dCWLhosvGwqO8eWTTb1YbrXwk+p0OKio F4/ckvUjy7ucrxRLd8g== X-Proofpoint-ORIG-GUID: kWvlbrFRsUUlNVLwwdOH_lI9HmLoChPF X-Proofpoint-GUID: kWvlbrFRsUUlNVLwwdOH_lI9HmLoChPF X-Authority-Analysis: v=2.4 cv=eunvCIpX c=1 sm=1 tr=0 ts=69ebc071 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=etEqFfc6qwXwpI8uT8rzbw==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=NEAV23lmAAAA:8 a=uTRCLKPYAAAA:8 a=EUspDBNiAAAA:8 a=uK5kh-ozGs8iDS-x-6cA:9 a=DRYXvJFRnqj4ETZq:21 a=NFOGd7dJGGMPyQGDc5-O:22 a=T-agBWn15iSmxapsA1lH:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-24_02,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240186 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: 1777057980887158500 Content-Type: text/plain; charset="utf-8" From: Fei Wu The RISC-V Server Platform specification [1] defines a standardized set of hardware and software capabilities, that portable system software, such as OS and hypervisors can rely on being present in a RISC-V server platform. The main features included in this emulation are: - Based on riscv virt machine type; - A new memory map as close as virt machine as possible; - An always present IOMMU platform device (riscv-iommu-sys) that uses IRQs 36 to 39, one IRQ for queue, similar to the 'virt' board; - AIA; - PCIe AHCI; - PCIe NIC; - No virtio device; - No fw_cfg device; - No ACPI table provided; - Only minimal device tree nodes. [1] https://github.com/riscv-non-isa/riscv-server-platform Signed-off-by: Fei Wu Signed-off-by: Daniel Henrique Barboza --- configs/devices/riscv64-softmmu/default.mak | 1 + hw/riscv/Kconfig | 15 + hw/riscv/meson.build | 1 + hw/riscv/server_platform_ref.c | 1371 +++++++++++++++++++ 4 files changed, 1388 insertions(+) create mode 100644 hw/riscv/server_platform_ref.c diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/= riscv64-softmmu/default.mak index a8e4d0ab33..ae3f62e2d4 100644 --- a/configs/devices/riscv64-softmmu/default.mak +++ b/configs/devices/riscv64-softmmu/default.mak @@ -9,6 +9,7 @@ # CONFIG_SIFIVE_E=3Dn # CONFIG_SIFIVE_U=3Dn # CONFIG_RISCV_VIRT=3Dn +# CONFIG_RISCV_SERVER_PLATFORM_REF=3Dn # CONFIG_MICROCHIP_PFSOC=3Dn # CONFIG_SHAKTI_C=3Dn # CONFIG_XIANGSHAN_KUNMINGHU=3Dn diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 0222c93f87..acb3d2fa53 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -69,6 +69,21 @@ config RISCV_VIRT select ACPI select ACPI_PCI =20 +config RISCV_SERVER_PLATFORM_REF + bool + default y + depends on RISCV64 + select RISCV_NUMA + select GOLDFISH_RTC + select PCI + select PCI_EXPRESS_GENERIC_BRIDGE + select PFLASH_CFI01 + select SERIAL + select RISCV_ACLINT + select RISCV_APLIC + select RISCV_IMSIC + select RISCV_IOMMU + config SHAKTI_C bool default y diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build index 533472e22a..74944cca84 100644 --- a/hw/riscv/meson.build +++ b/hw/riscv/meson.build @@ -4,6 +4,7 @@ riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('num= a.c')) riscv_ss.add(files('riscv_hart.c')) riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c')) riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c')) +riscv_ss.add(when: 'CONFIG_RISCV_SERVER_PLATFORM_REF', if_true: files('ser= ver_platform_ref.c')) riscv_ss.add(when: 'CONFIG_SHAKTI_C', if_true: files('shakti_c.c')) riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c')) riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c')) diff --git a/hw/riscv/server_platform_ref.c b/hw/riscv/server_platform_ref.c new file mode 100644 index 0000000000..bc74f8481c --- /dev/null +++ b/hw/riscv/server_platform_ref.c @@ -0,0 +1,1371 @@ +/* + * QEMU RISC-V Server Platform Reference Board (riscv-server-ref) + * + * Copyright (c) 2024 Intel, Inc. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu/error-report.h" +#include "qemu/guest-random.h" +#include "qapi/error.h" +#include "qapi/qapi-visit-common.h" +#include "hw/core/boards.h" +#include "hw/core/loader.h" +#include "hw/core/sysbus.h" +#include "hw/core/qdev-properties.h" +#include "hw/char/serial.h" +#include "hw/block/flash.h" +#include "hw/ide/pci.h" +#include "hw/ide/ahci-pci.h" +#include "hw/pci/pci.h" +#include "hw/pci-host/gpex.h" +#include "hw/core/sysbus-fdt.h" +#include "hw/riscv/riscv_hart.h" +#include "hw/riscv/boot.h" +#include "hw/riscv/numa.h" +#include "hw/riscv/iommu.h" +#include "hw/riscv/riscv-iommu-bits.h" +#include "hw/intc/riscv_aclint.h" +#include "hw/intc/riscv_aplic.h" +#include "hw/intc/riscv_imsic.h" +#include "chardev/char.h" +#include "hw/char/serial-mm.h" +#include "system/device_tree.h" +#include "system/runstate.h" +#include "system/system.h" +#include "system/tcg.h" +#include "system/qtest.h" +#include "target/riscv/cpu.h" +#include "target/riscv/pmu.h" +#include "net/net.h" + +#define RVSERVER_CPUS_MAX_BITS 9 +#define RVSERVER_CPUS_MAX (1 << RVSERVER_CPUS_MAX_BITS) +#define RVSERVER_SOCKETS_MAX_BITS 2 +#define RVSERVER_SOCKETS_MAX (1 << RVSERVER_SOCKETS_MAX_BITS) + +#define RVSERVER_IRQCHIP_NUM_MSIS 255 +#define RVSERVER_IRQCHIP_NUM_SOURCES 96 +#define RVSERVER_IRQCHIP_NUM_PRIO_BITS 3 +#define RVSERVER_IRQCHIP_MAX_GUESTS_BITS 3 +#define RVSERVER_IRQCHIP_MAX_GUESTS \ + ((1U << RVSERVER_IRQCHIP_MAX_GUESTS_BITS) - 1U) + +#define FDT_PCI_ADDR_CELLS 3 +#define FDT_PCI_INT_CELLS 1 +#define FDT_APLIC_INT_CELLS 2 +#define FDT_IMSIC_INT_CELLS 0 +#define FDT_MAX_INT_CELLS 2 +#define FDT_MAX_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + \ + 1 + FDT_MAX_INT_CELLS) +#define FDT_APLIC_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + \ + 1 + FDT_APLIC_INT_CELLS) + +#define NUM_SATA_PORTS 6 + +#define SYSCON_RESET 0x1 +#define SYSCON_POWEROFF 0x2 + +#define TYPE_RISCV_SERVER_REF_MACHINE MACHINE_TYPE_NAME("riscv-server-ref") +OBJECT_DECLARE_SIMPLE_TYPE(RISCVServerRefMachineState, RISCV_SERVER_REF_MA= CHINE) + +struct RISCVServerRefMachineState { + /*< private >*/ + MachineState parent; + + /*< public >*/ + Notifier machine_done; + RISCVHartArrayState soc[RVSERVER_SOCKETS_MAX]; + DeviceState *irqchip[RVSERVER_SOCKETS_MAX]; + PFlashCFI01 *flash[2]; + + int fdt_size; + int aia_guests; + const MemMapEntry *memmap; +}; + +enum { + RVSERVER_DEBUG, + RVSERVER_MROM, + RVSERVER_RESET_SYSCON, + RVSERVER_RTC, + RVSERVER_IOMMU_SYS, + RVSERVER_ACLINT, + RVSERVER_APLIC_M, + RVSERVER_APLIC_S, + RVSERVER_UART0, + RVSERVER_IMSIC_M, + RVSERVER_IMSIC_S, + RVSERVER_FLASH, + RVSERVER_DRAM, + RVSERVER_PCIE_MMIO, + RVSERVER_PCIE_PIO, + RVSERVER_PCIE_ECAM, + RVSERVER_PCIE_MMIO_HIGH +}; + +enum { + RVSERVER_UART0_IRQ =3D 10, + RVSERVER_RTC_IRQ =3D 11, + RVSERVER_PCIE_IRQ =3D 0x20, /* 32 to 35 */ + IOMMU_SYS_IRQ =3D 0x24 /* 36 to 39 */ +}; + +/* + * The server soc reference machine physical address space used by some of= the + * devices namely ACLINT, APLIC and IMSIC depend on number of Sockets, num= ber + * of CPUs, and number of IMSIC guest files. + * + * Various limits defined by RVSERVER_SOCKETS_MAX_BITS, RVSERVER_CPUS_MAX_= BITS, + * and RVSERVER_IRQCHIP_MAX_GUESTS_BITS are tuned for maximum utilization = of + * server reference machine physical address space. + */ + +#define RVSERVER_IMSIC_GROUP_MAX_SIZE (1U << IMSIC_MMIO_GROUP_MIN_SHI= FT) +#if RVSERVER_IMSIC_GROUP_MAX_SIZE < \ + IMSIC_GROUP_SIZE(RVSERVER_CPUS_MAX_BITS, RVSERVER_IRQCHIP_MAX_GUESTS_B= ITS) +#error "Can't accomodate single IMSIC group in address space" +#endif + +#define RVSERVER_IMSIC_MAX_SIZE (RVSERVER_SOCKETS_MAX * \ + RVSERVER_IMSIC_GROUP_MAX_SIZE) +#if 0x4000000 < RVSERVER_IMSIC_MAX_SIZE +#error "Can't accomodate all IMSIC groups in address space" +#endif + +static const MemMapEntry rvserver_ref_memmap[] =3D { + [RVSERVER_DEBUG] =3D { 0x0, 0x100 }, + [RVSERVER_MROM] =3D { 0x1000, 0xf000 }, + [RVSERVER_RESET_SYSCON] =3D { 0x100000, 0x1000 }, + [RVSERVER_RTC] =3D { 0x101000, 0x1000 }, + [RVSERVER_IOMMU_SYS] =3D { 0x102000, 0x1000 }, + [RVSERVER_ACLINT] =3D { 0x2000000, 0x10000 }, + [RVSERVER_PCIE_PIO] =3D { 0x3000000, 0x10000 }, + [RVSERVER_APLIC_M] =3D { 0xc000000, APLIC_SIZE(RVSERVER_CPUS_M= AX) }, + [RVSERVER_APLIC_S] =3D { 0xd000000, APLIC_SIZE(RVSERVER_CPUS_M= AX) }, + [RVSERVER_UART0] =3D { 0x10000000, 0x100 }, + [RVSERVER_FLASH] =3D { 0x20000000, 0x4000000 }, + [RVSERVER_IMSIC_M] =3D { 0x24000000, RVSERVER_IMSIC_MAX_SIZE }, + [RVSERVER_IMSIC_S] =3D { 0x28000000, RVSERVER_IMSIC_MAX_SIZE }, + [RVSERVER_PCIE_ECAM] =3D { 0x30000000, 0x10000000 }, + [RVSERVER_PCIE_MMIO] =3D { 0x40000000, 0x40000000 }, + [RVSERVER_DRAM] =3D { 0x80000000, 0xff80000000ull }, + [RVSERVER_PCIE_MMIO_HIGH] =3D { 0x10000000000ull, 0x10000000000ull }, +}; + +#define RVSERVER_FLASH_SECTOR_SIZE (256 * KiB) + +static PFlashCFI01 *rvserver_flash_create(RISCVServerRefMachineState *s, + const char *name, + const char *alias_prop_name) +{ + /* + * Create a single flash device. We use the same parameters as + * the flash devices on the ARM virt board. + */ + DeviceState *dev =3D qdev_new(TYPE_PFLASH_CFI01); + + qdev_prop_set_uint64(dev, "sector-length", RVSERVER_FLASH_SECTOR_SIZE); + qdev_prop_set_uint8(dev, "width", 4); + qdev_prop_set_uint8(dev, "device-width", 2); + qdev_prop_set_bit(dev, "big-endian", false); + qdev_prop_set_uint16(dev, "id0", 0x89); + qdev_prop_set_uint16(dev, "id1", 0x18); + qdev_prop_set_uint16(dev, "id2", 0x00); + qdev_prop_set_uint16(dev, "id3", 0x00); + qdev_prop_set_string(dev, "name", name); + + object_property_add_child(OBJECT(s), name, OBJECT(dev)); + object_property_add_alias(OBJECT(s), alias_prop_name, + OBJECT(dev), "drive"); + + return PFLASH_CFI01(dev); +} + +static void rvserver_flash_map(PFlashCFI01 *flash, + hwaddr base, hwaddr size, + MemoryRegion *sysmem) +{ + DeviceState *dev =3D DEVICE(flash); + + assert(QEMU_IS_ALIGNED(size, RVSERVER_FLASH_SECTOR_SIZE)); + assert(size / RVSERVER_FLASH_SECTOR_SIZE <=3D UINT32_MAX); + qdev_prop_set_uint32(dev, "num-blocks", size / RVSERVER_FLASH_SECTOR_S= IZE); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + memory_region_add_subregion(sysmem, base, + sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), + 0)); +} + +static void rvserver_flash_maps(RISCVServerRefMachineState *s, + MemoryRegion *sysmem) +{ + hwaddr flashsize =3D rvserver_ref_memmap[RVSERVER_FLASH].size / 2; + hwaddr flashbase =3D rvserver_ref_memmap[RVSERVER_FLASH].base; + + rvserver_flash_map(s->flash[0], flashbase, flashsize, sysmem); + rvserver_flash_map(s->flash[1], flashbase + flashsize, flashsize, sysm= em); +} + +static void create_pcie_irq_map(RISCVServerRefMachineState *s, + void *fdt, char *nodename, + uint32_t irqchip_phandle) +{ + int pin, dev; + uint32_t irq_map_stride =3D 0; + uint32_t full_irq_map[PCI_NUM_PINS * PCI_NUM_PINS * + FDT_MAX_INT_MAP_WIDTH] =3D {}; + uint32_t *irq_map =3D full_irq_map; + + /* + * This code creates a standard swizzle of interrupts such that + * each device's first interrupt is based on it's PCI_SLOT number. + * (See pci_swizzle_map_irq_fn()) + * + * We only need one entry per interrupt in the table (not one per + * possible slot) seeing the interrupt-map-mask will allow the table + * to wrap to any number of devices. + */ + for (dev =3D 0; dev < PCI_NUM_PINS; dev++) { + int devfn =3D dev * 0x8; + + for (pin =3D 0; pin < PCI_NUM_PINS; pin++) { + int irq_nr =3D RVSERVER_PCIE_IRQ + + ((pin + PCI_SLOT(devfn)) % PCI_NUM_PINS); + int i =3D 0; + + /* Fill PCI address cells */ + irq_map[i] =3D cpu_to_be32(devfn << 8); + i +=3D FDT_PCI_ADDR_CELLS; + + /* Fill PCI Interrupt cells */ + irq_map[i] =3D cpu_to_be32(pin + 1); + i +=3D FDT_PCI_INT_CELLS; + + /* Fill interrupt controller phandle and cells */ + irq_map[i++] =3D cpu_to_be32(irqchip_phandle); + irq_map[i++] =3D cpu_to_be32(irq_nr); + irq_map[i++] =3D cpu_to_be32(0x4); + + if (!irq_map_stride) { + irq_map_stride =3D i; + } + irq_map +=3D irq_map_stride; + } + } + + qemu_fdt_setprop(fdt, nodename, "interrupt-map", full_irq_map, + PCI_NUM_PINS * PCI_NUM_PINS * + irq_map_stride * sizeof(uint32_t)); + + qemu_fdt_setprop_cells(fdt, nodename, "interrupt-map-mask", + 0x1800, 0, 0, 0x7); +} + +static void create_fdt_socket_cpus(RISCVServerRefMachineState *s, int sock= et, + char *clust_name, uint32_t *phandle, + uint32_t *intc_phandles) +{ + int cpu; + uint32_t cpu_phandle; + MachineState *ms =3D MACHINE(s); + bool is_32_bit =3D riscv_is_32bit(&s->soc[0]); + int8_t satp_mode_max; + + for (cpu =3D s->soc[socket].num_harts - 1; cpu >=3D 0; cpu--) { + RISCVCPU *cpu_ptr =3D &s->soc[socket].harts[cpu]; + satp_mode_max =3D cpu_ptr->cfg.max_satp_mode; + g_autofree char *cpu_name =3D NULL; + g_autofree char *core_name =3D NULL; + g_autofree char *intc_name =3D NULL; + g_autofree char *sv_name =3D NULL; + + cpu_phandle =3D (*phandle)++; + + cpu_name =3D g_strdup_printf("/cpus/cpu@%d", + s->soc[socket].hartid_base + cpu); + qemu_fdt_add_subnode(ms->fdt, cpu_name); + + if (satp_mode_max !=3D -1) { + sv_name =3D g_strdup_printf("riscv,%s", + satp_mode_str(satp_mode_max, is_32_b= it)); + qemu_fdt_setprop_string(ms->fdt, cpu_name, "mmu-type", sv_name= ); + } + + riscv_isa_write_fdt(cpu_ptr, ms->fdt, cpu_name); + + if (cpu_ptr->cfg.ext_zicbom) { + qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbom-block-siz= e", + cpu_ptr->cfg.cbom_blocksize); + } + + if (cpu_ptr->cfg.ext_zicboz) { + qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cboz-block-siz= e", + cpu_ptr->cfg.cboz_blocksize); + } + + if (cpu_ptr->cfg.ext_zicbop) { + qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbop-block-siz= e", + cpu_ptr->cfg.cbop_blocksize); + } + + qemu_fdt_setprop_string(ms->fdt, cpu_name, "compatible", "riscv"); + qemu_fdt_setprop_string(ms->fdt, cpu_name, "status", "okay"); + qemu_fdt_setprop_cell(ms->fdt, cpu_name, "reg", + s->soc[socket].hartid_base + cpu); + qemu_fdt_setprop_string(ms->fdt, cpu_name, "device_type", "cpu"); + riscv_socket_fdt_write_id(ms, cpu_name, socket); + qemu_fdt_setprop_cell(ms->fdt, cpu_name, "phandle", cpu_phandle); + + intc_phandles[cpu] =3D (*phandle)++; + + intc_name =3D g_strdup_printf("%s/interrupt-controller", cpu_name); + qemu_fdt_add_subnode(ms->fdt, intc_name); + qemu_fdt_setprop_cell(ms->fdt, intc_name, "phandle", + intc_phandles[cpu]); + qemu_fdt_setprop_string(ms->fdt, intc_name, "compatible", + "riscv,cpu-intc"); + qemu_fdt_setprop(ms->fdt, intc_name, "interrupt-controller", NULL,= 0); + qemu_fdt_setprop_cell(ms->fdt, intc_name, "#interrupt-cells", 1); + + core_name =3D g_strdup_printf("%s/core%d", clust_name, cpu); + qemu_fdt_add_subnode(ms->fdt, core_name); + qemu_fdt_setprop_cell(ms->fdt, core_name, "cpu", cpu_phandle); + } +} + +static void create_fdt_socket_memory(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, int socket) +{ + g_autofree char *mem_name =3D NULL; + hwaddr addr, size; + MachineState *ms =3D MACHINE(s); + + addr =3D memmap[RVSERVER_DRAM].base + riscv_socket_mem_offset(ms, sock= et); + size =3D riscv_socket_mem_size(ms, socket); + mem_name =3D g_strdup_printf("/memory@%"HWADDR_PRIx, addr); + qemu_fdt_add_subnode(ms->fdt, mem_name); + qemu_fdt_setprop_cells(ms->fdt, mem_name, "reg", + addr >> 32, addr, size >> 32, size); + qemu_fdt_setprop_string(ms->fdt, mem_name, "device_type", "memory"); + riscv_socket_fdt_write_id(ms, mem_name, socket); +} + +static void create_fdt_socket_aclint(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, int socket, + uint32_t *intc_phandles) +{ + int cpu; + g_autofree char *name =3D NULL; + hwaddr addr, size; + uint32_t aclint_cells_size; + g_autofree uint32_t *aclint_mtimer_cells =3D NULL; + MachineState *ms =3D MACHINE(s); + + aclint_mtimer_cells =3D g_new0(uint32_t, s->soc[socket].num_harts * 2); + + for (cpu =3D 0; cpu < s->soc[socket].num_harts; cpu++) { + aclint_mtimer_cells[cpu * 2 + 0] =3D cpu_to_be32(intc_phandles[cpu= ]); + aclint_mtimer_cells[cpu * 2 + 1] =3D cpu_to_be32(IRQ_M_TIMER); + } + aclint_cells_size =3D s->soc[socket].num_harts * sizeof(uint32_t) * 2; + + addr =3D memmap[RVSERVER_ACLINT].base + + RISCV_ACLINT_DEFAULT_MTIMER_SIZE * socket; + size =3D RISCV_ACLINT_DEFAULT_MTIMER_SIZE; + + name =3D g_strdup_printf("/soc/mtimer@%"HWADDR_PRIx, addr); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", + "riscv,aclint-mtimer"); + qemu_fdt_setprop_cells(ms->fdt, name, "reg", + 0x0, addr + RISCV_ACLINT_DEFAULT_MTIME, + 0x0, size - RISCV_ACLINT_DEFAULT_MTIME, + 0x0, addr + RISCV_ACLINT_DEFAULT_MTIMECMP, + 0x0, RISCV_ACLINT_DEFAULT_MTIME); + qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", + aclint_mtimer_cells, aclint_cells_size); + riscv_socket_fdt_write_id(ms, name, socket); +} + +static uint32_t imsic_num_bits(uint32_t count) +{ + uint32_t ret =3D 0; + + while (BIT(ret) < count) { + ret++; + } + + return ret; +} + +static void create_fdt_one_imsic(RISCVServerRefMachineState *s, + hwaddr base_addr, + uint32_t *intc_phandles, + uint32_t msi_phandle, + bool m_mode, uint32_t imsic_guest_bits) +{ + int cpu, socket; + g_autofree char *imsic_name =3D NULL; + MachineState *ms =3D MACHINE(s); + int socket_count =3D riscv_socket_count(ms); + uint32_t imsic_max_hart_per_socket, imsic_addr, imsic_size; + g_autofree uint32_t *imsic_cells =3D NULL; + g_autofree uint32_t *imsic_regs =3D NULL; + + imsic_cells =3D g_new0(uint32_t, ms->smp.cpus * 2); + imsic_regs =3D g_new0(uint32_t, socket_count * 4); + + for (cpu =3D 0; cpu < ms->smp.cpus; cpu++) { + imsic_cells[cpu * 2 + 0] =3D cpu_to_be32(intc_phandles[cpu]); + imsic_cells[cpu * 2 + 1] =3D cpu_to_be32(m_mode ? IRQ_M_EXT : IRQ_= S_EXT); + } + + imsic_max_hart_per_socket =3D 0; + for (socket =3D 0; socket < socket_count; socket++) { + imsic_addr =3D base_addr + socket * RVSERVER_IMSIC_GROUP_MAX_SIZE; + imsic_size =3D IMSIC_HART_SIZE(imsic_guest_bits) * + s->soc[socket].num_harts; + imsic_regs[socket * 4 + 0] =3D 0; + imsic_regs[socket * 4 + 1] =3D cpu_to_be32(imsic_addr); + imsic_regs[socket * 4 + 2] =3D 0; + imsic_regs[socket * 4 + 3] =3D cpu_to_be32(imsic_size); + if (imsic_max_hart_per_socket < s->soc[socket].num_harts) { + imsic_max_hart_per_socket =3D s->soc[socket].num_harts; + } + } + + imsic_name =3D g_strdup_printf("/soc/imsics@%lx", (unsigned long)base_= addr); + qemu_fdt_add_subnode(ms->fdt, imsic_name); + qemu_fdt_setprop_string(ms->fdt, imsic_name, + "compatible", "riscv,imsics"); + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "#interrupt-cells", + FDT_IMSIC_INT_CELLS); + qemu_fdt_setprop(ms->fdt, imsic_name, "interrupt-controller", NULL, 0); + qemu_fdt_setprop(ms->fdt, imsic_name, "msi-controller", NULL, 0); + qemu_fdt_setprop(ms->fdt, imsic_name, "interrupts-extended", + imsic_cells, ms->smp.cpus * sizeof(uint32_t) * 2); + qemu_fdt_setprop(ms->fdt, imsic_name, "reg", imsic_regs, + socket_count * sizeof(uint32_t) * 4); + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,num-ids", + RVSERVER_IRQCHIP_NUM_MSIS); + + if (imsic_guest_bits) { + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,guest-index-bits= ", + imsic_guest_bits); + } + + if (socket_count > 1) { + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,hart-index-bits", + imsic_num_bits(imsic_max_hart_per_socket)); + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,group-index-bits= ", + imsic_num_bits(socket_count)); + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "riscv,group-index-shif= t", + IMSIC_MMIO_GROUP_MIN_SHIFT); + } + qemu_fdt_setprop_cell(ms->fdt, imsic_name, "phandle", msi_phandle); +} + +static void create_fdt_imsic(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t *phandle, uint32_t *intc_phandles, + uint32_t *msi_m_phandle, uint32_t *msi_s_phan= dle) +{ + *msi_m_phandle =3D (*phandle)++; + *msi_s_phandle =3D (*phandle)++; + + /* M-level IMSIC node */ + create_fdt_one_imsic(s, memmap[RVSERVER_IMSIC_M].base, intc_phandles, + *msi_m_phandle, true, 0); + + /* S-level IMSIC node */ + create_fdt_one_imsic(s, memmap[RVSERVER_IMSIC_S].base, intc_phandles, + *msi_s_phandle, false, + imsic_num_bits(s->aia_guests + 1)); + +} + +static void create_fdt_one_aplic(RISCVServerRefMachineState *s, int socket, + unsigned long aplic_addr, uint32_t aplic_= size, + uint32_t msi_phandle, + uint32_t *intc_phandles, + uint32_t aplic_phandle, + uint32_t aplic_child_phandle, + bool m_mode, int num_harts) +{ + int cpu; + g_autofree char *aplic_name =3D NULL; + g_autofree uint32_t *aplic_cells =3D g_new0(uint32_t, num_harts * 2); + MachineState *ms =3D MACHINE(s); + + aplic_cells =3D g_new0(uint32_t, num_harts * 2); + + for (cpu =3D 0; cpu < num_harts; cpu++) { + aplic_cells[cpu * 2 + 0] =3D cpu_to_be32(intc_phandles[cpu]); + aplic_cells[cpu * 2 + 1] =3D cpu_to_be32(m_mode ? IRQ_M_EXT : IRQ_= S_EXT); + } + + aplic_name =3D g_strdup_printf("/soc/aplic@%lx", aplic_addr); + qemu_fdt_add_subnode(ms->fdt, aplic_name); + qemu_fdt_setprop_string(ms->fdt, aplic_name, "compatible", "riscv,apli= c"); + qemu_fdt_setprop_cell(ms->fdt, aplic_name, + "#interrupt-cells", FDT_APLIC_INT_CELLS); + qemu_fdt_setprop(ms->fdt, aplic_name, "interrupt-controller", NULL, 0); + + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "msi-parent", msi_phandle); + + qemu_fdt_setprop_cells(ms->fdt, aplic_name, "reg", + 0x0, aplic_addr, 0x0, aplic_size); + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,num-sources", + RVSERVER_IRQCHIP_NUM_SOURCES); + + if (aplic_child_phandle) { + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "riscv,children", + aplic_child_phandle); + qemu_fdt_setprop_cells(ms->fdt, aplic_name, "riscv,delegate", + aplic_child_phandle, 0x1, + RVSERVER_IRQCHIP_NUM_SOURCES); + } + + riscv_socket_fdt_write_id(ms, aplic_name, socket); + qemu_fdt_setprop_cell(ms->fdt, aplic_name, "phandle", aplic_phandle); +} + +static void create_fdt_socket_aplic(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, int socket, + uint32_t msi_m_phandle, + uint32_t msi_s_phandle, + uint32_t *phandle, + uint32_t *intc_phandles, + uint32_t *aplic_phandles, + int num_harts) +{ + unsigned long aplic_addr; + uint32_t aplic_m_phandle, aplic_s_phandle; + + aplic_m_phandle =3D (*phandle)++; + aplic_s_phandle =3D (*phandle)++; + + /* M-level APLIC node */ + aplic_addr =3D memmap[RVSERVER_APLIC_M].base + + memmap[RVSERVER_APLIC_M].size * socket; + create_fdt_one_aplic(s, socket, aplic_addr, memmap[RVSERVER_APLIC_M].s= ize, + msi_m_phandle, intc_phandles, + aplic_m_phandle, aplic_s_phandle, + true, num_harts); + + /* S-level APLIC node */ + aplic_addr =3D memmap[RVSERVER_APLIC_S].base + + memmap[RVSERVER_APLIC_S].size * socket; + create_fdt_one_aplic(s, socket, aplic_addr, memmap[RVSERVER_APLIC_S].s= ize, + msi_s_phandle, intc_phandles, + aplic_s_phandle, 0, + false, num_harts); + + aplic_phandles[socket] =3D aplic_s_phandle; +} + +static void create_fdt_pmu(RISCVServerRefMachineState *s) +{ + g_autofree char *pmu_name =3D g_strdup_printf("/pmu"); + MachineState *ms =3D MACHINE(s); + RISCVCPU hart =3D s->soc[0].harts[0]; + + qemu_fdt_add_subnode(ms->fdt, pmu_name); + qemu_fdt_setprop_string(ms->fdt, pmu_name, "compatible", "riscv,pmu"); + riscv_pmu_generate_fdt_node(ms->fdt, hart.pmu_avail_ctrs, pmu_name); +} + +static void create_fdt_sockets(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t *phandle, + uint32_t *irq_mmio_phandle, + uint32_t *irq_pcie_phandle, + uint32_t *msi_pcie_phandle) +{ + int socket, phandle_pos; + MachineState *ms =3D MACHINE(s); + uint32_t msi_m_phandle =3D 0, msi_s_phandle =3D 0; + uint32_t xplic_phandles[MAX_NODES]; + g_autofree uint32_t *intc_phandles =3D NULL; + int socket_count =3D riscv_socket_count(ms); + + qemu_fdt_add_subnode(ms->fdt, "/cpus"); + qemu_fdt_setprop_cell(ms->fdt, "/cpus", "timebase-frequency", + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ); + qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#size-cells", 0x0); + qemu_fdt_setprop_cell(ms->fdt, "/cpus", "#address-cells", 0x1); + qemu_fdt_add_subnode(ms->fdt, "/cpus/cpu-map"); + + intc_phandles =3D g_new0(uint32_t, ms->smp.cpus); + + phandle_pos =3D ms->smp.cpus; + for (socket =3D (socket_count - 1); socket >=3D 0; socket--) { + g_autofree char *clust_name =3D NULL; + phandle_pos -=3D s->soc[socket].num_harts; + + clust_name =3D g_strdup_printf("/cpus/cpu-map/cluster%d", socket); + qemu_fdt_add_subnode(ms->fdt, clust_name); + + create_fdt_socket_cpus(s, socket, clust_name, phandle, + &intc_phandles[phandle_pos]); + + create_fdt_socket_memory(s, memmap, socket); + + create_fdt_socket_aclint(s, memmap, socket, + &intc_phandles[phandle_pos]); + } + + create_fdt_imsic(s, memmap, phandle, intc_phandles, + &msi_m_phandle, &msi_s_phandle); + *msi_pcie_phandle =3D msi_s_phandle; + + phandle_pos =3D ms->smp.cpus; + for (socket =3D (socket_count - 1); socket >=3D 0; socket--) { + phandle_pos -=3D s->soc[socket].num_harts; + + create_fdt_socket_aplic(s, memmap, socket, + msi_m_phandle, msi_s_phandle, phandle, + &intc_phandles[phandle_pos], + xplic_phandles, + s->soc[socket].num_harts); + } + + for (socket =3D 0; socket < socket_count; socket++) { + if (socket =3D=3D 0) { + *irq_mmio_phandle =3D xplic_phandles[socket]; + *irq_pcie_phandle =3D xplic_phandles[socket]; + } + if (socket =3D=3D 1) { + *irq_pcie_phandle =3D xplic_phandles[socket]; + } + } + + riscv_socket_fdt_write_distance_matrix(ms); +} + +static void create_fdt_iommu_sys(RISCVServerRefMachineState *s, + uint32_t irq_chip, + uint32_t msi_phandle, + uint32_t *iommu_sys_phandle) +{ + const char comp[] =3D "riscv,iommu"; + void *fdt =3D MACHINE(s)->fdt; + uint32_t iommu_phandle; + g_autofree char *iommu_node =3D NULL; + hwaddr addr =3D s->memmap[RVSERVER_IOMMU_SYS].base; + hwaddr size =3D s->memmap[RVSERVER_IOMMU_SYS].size; + uint32_t iommu_irq_map[RISCV_IOMMU_INTR_COUNT] =3D { + IOMMU_SYS_IRQ + RISCV_IOMMU_INTR_CQ, + IOMMU_SYS_IRQ + RISCV_IOMMU_INTR_FQ, + IOMMU_SYS_IRQ + RISCV_IOMMU_INTR_PM, + IOMMU_SYS_IRQ + RISCV_IOMMU_INTR_PQ, + }; + + iommu_node =3D g_strdup_printf("/soc/iommu@%"HWADDR_PRIx, + s->memmap[RVSERVER_IOMMU_SYS].base); + iommu_phandle =3D qemu_fdt_alloc_phandle(fdt); + qemu_fdt_add_subnode(fdt, iommu_node); + + qemu_fdt_setprop(fdt, iommu_node, "compatible", comp, sizeof(comp)); + qemu_fdt_setprop_cell(fdt, iommu_node, "#iommu-cells", 1); + qemu_fdt_setprop_cell(fdt, iommu_node, "phandle", iommu_phandle); + + qemu_fdt_setprop_cells(fdt, iommu_node, "reg", + addr >> 32, addr, size >> 32, size); + qemu_fdt_setprop_cell(fdt, iommu_node, "interrupt-parent", irq_chip); + + qemu_fdt_setprop_cells(fdt, iommu_node, "interrupts", + iommu_irq_map[0], FDT_IRQ_TYPE_EDGE_LOW, + iommu_irq_map[1], FDT_IRQ_TYPE_EDGE_LOW, + iommu_irq_map[2], FDT_IRQ_TYPE_EDGE_LOW, + iommu_irq_map[3], FDT_IRQ_TYPE_EDGE_LOW); + + qemu_fdt_setprop_cell(fdt, iommu_node, "msi-parent", msi_phandle); + + *iommu_sys_phandle =3D iommu_phandle; +} + +static void create_fdt_pcie(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t irq_pcie_phandle, + uint32_t msi_pcie_phandle, + uint32_t iommu_sys_phandle) +{ + g_autofree char *name =3D NULL; + MachineState *ms =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/pci@%"HWADDR_PRIx, + memmap[RVSERVER_PCIE_ECAM].base); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_cell(ms->fdt, name, "#address-cells", + FDT_PCI_ADDR_CELLS); + qemu_fdt_setprop_cell(ms->fdt, name, "#interrupt-cells", + FDT_PCI_INT_CELLS); + qemu_fdt_setprop_cell(ms->fdt, name, "#size-cells", 0x2); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", + "pci-host-ecam-generic"); + qemu_fdt_setprop_string(ms->fdt, name, "device_type", "pci"); + qemu_fdt_setprop_cell(ms->fdt, name, "linux,pci-domain", 0); + qemu_fdt_setprop_cells(ms->fdt, name, "bus-range", 0, + memmap[RVSERVER_PCIE_ECAM].size / PCIE_MMCFG_SIZE_MIN - 1); + qemu_fdt_setprop(ms->fdt, name, "dma-coherent", NULL, 0); + qemu_fdt_setprop_cell(ms->fdt, name, "msi-parent", msi_pcie_phandle); + qemu_fdt_setprop_cells(ms->fdt, name, "reg", 0, + memmap[RVSERVER_PCIE_ECAM].base, 0, memmap[RVSERVER_PCIE_ECAM].siz= e); + qemu_fdt_setprop_sized_cells(ms->fdt, name, "ranges", + 1, FDT_PCI_RANGE_IOPORT, 2, 0, + 2, memmap[RVSERVER_PCIE_PIO].base, 2, memmap[RVSERVER_PCIE_PIO].si= ze, + 1, FDT_PCI_RANGE_MMIO, + 2, memmap[RVSERVER_PCIE_MMIO].base, + 2, memmap[RVSERVER_PCIE_MMIO].base, 2, memmap[RVSERVER_PCIE_MMIO].= size, + 1, FDT_PCI_RANGE_MMIO_64BIT, + 2, memmap[RVSERVER_PCIE_MMIO_HIGH].base, + 2, memmap[RVSERVER_PCIE_MMIO_HIGH].base, 2, + memmap[RVSERVER_PCIE_MMIO_HIGH].size); + + create_pcie_irq_map(s, ms->fdt, name, irq_pcie_phandle); + + qemu_fdt_setprop_cells(ms->fdt, name, "iommu-map", + 0, iommu_sys_phandle, 0, 0, 0, + iommu_sys_phandle, 0, 0xffff); +} + +static void create_fdt_reset(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t *phandle) +{ + char *name; + uint32_t test_phandle; + MachineState *ms =3D MACHINE(s); + + test_phandle =3D (*phandle)++; + name =3D g_strdup_printf("/soc/reset_syscon@%"HWADDR_PRIx, + memmap[RVSERVER_RESET_SYSCON].base); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon"); + qemu_fdt_setprop_cells(ms->fdt, name, "reg", + 0x0, memmap[RVSERVER_RESET_SYSCON].base, + 0x0, memmap[RVSERVER_RESET_SYSCON].size); + qemu_fdt_setprop_cell(ms->fdt, name, "phandle", test_phandle); + test_phandle =3D qemu_fdt_get_phandle(ms->fdt, name); + g_free(name); + + name =3D g_strdup_printf("/soc/reboot"); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-reboot"); + qemu_fdt_setprop_cell(ms->fdt, name, "regmap", test_phandle); + qemu_fdt_setprop_cell(ms->fdt, name, "offset", 0x0); + qemu_fdt_setprop_cell(ms->fdt, name, "value", SYSCON_RESET); + g_free(name); + + name =3D g_strdup_printf("/soc/poweroff"); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", "syscon-poweroff"= ); + qemu_fdt_setprop_cell(ms->fdt, name, "regmap", test_phandle); + qemu_fdt_setprop_cell(ms->fdt, name, "offset", 0x0); + qemu_fdt_setprop_cell(ms->fdt, name, "value", SYSCON_POWEROFF); + g_free(name); +} + +static void create_fdt_uart(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t irq_mmio_phandle) +{ + g_autofree char *name =3D NULL; + MachineState *ms =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/serial@%"HWADDR_PRIx, + memmap[RVSERVER_UART0].base); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", "ns16550a"); + qemu_fdt_setprop_cells(ms->fdt, name, "reg", + 0x0, memmap[RVSERVER_UART0].base, + 0x0, memmap[RVSERVER_UART0].size); + qemu_fdt_setprop_cell(ms->fdt, name, "clock-frequency", 3686400); + qemu_fdt_setprop_cell(ms->fdt, name, "interrupt-parent", + irq_mmio_phandle); + qemu_fdt_setprop_cells(ms->fdt, name, "interrupts", + RVSERVER_UART0_IRQ, 0x4); + + qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", name); +} + +static void create_fdt_rtc(RISCVServerRefMachineState *s, + const MemMapEntry *memmap, + uint32_t irq_mmio_phandle) +{ + g_autofree char *name =3D NULL; + MachineState *ms =3D MACHINE(s); + + name =3D g_strdup_printf("/soc/rtc@%"HWADDR_PRIx, + memmap[RVSERVER_RTC].base); + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", + "google,goldfish-rtc"); + qemu_fdt_setprop_cells(ms->fdt, name, "reg", + 0x0, memmap[RVSERVER_RTC].base, 0x0, memmap[RVSERVER_RTC].size); + qemu_fdt_setprop_cell(ms->fdt, name, "interrupt-parent", + irq_mmio_phandle); + qemu_fdt_setprop_cells(ms->fdt, name, "interrupts", + RVSERVER_RTC_IRQ, 0x4); +} + +static void create_fdt_flash(RISCVServerRefMachineState *s, + const MemMapEntry *memmap) +{ + MachineState *ms =3D MACHINE(s); + hwaddr flashsize =3D rvserver_ref_memmap[RVSERVER_FLASH].size / 2; + hwaddr flashbase =3D rvserver_ref_memmap[RVSERVER_FLASH].base; + g_autofree char *name =3D g_strdup_printf("/flash@%"HWADDR_PRIx, flash= base); + + qemu_fdt_add_subnode(ms->fdt, name); + qemu_fdt_setprop_string(ms->fdt, name, "compatible", "cfi-flash"); + qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg", + 2, flashbase, 2, flashsize, + 2, flashbase + flashsize, 2, flashsize); + qemu_fdt_setprop_cell(ms->fdt, name, "bank-width", 4); +} + +static void finalize_fdt(RISCVServerRefMachineState *s) +{ + uint32_t phandle =3D 1, irq_mmio_phandle =3D 1, msi_pcie_phandle =3D 1; + uint32_t irq_pcie_phandle =3D 1, iommu_sys_phandle; + + create_fdt_sockets(s, rvserver_ref_memmap, &phandle, &irq_mmio_phandle, + &irq_pcie_phandle, &msi_pcie_phandle); + + create_fdt_iommu_sys(s, irq_mmio_phandle, msi_pcie_phandle, + &iommu_sys_phandle); + + create_fdt_pcie(s, rvserver_ref_memmap, irq_pcie_phandle, + msi_pcie_phandle, iommu_sys_phandle); + + create_fdt_reset(s, rvserver_ref_memmap, &phandle); + + create_fdt_uart(s, rvserver_ref_memmap, irq_mmio_phandle); + + create_fdt_rtc(s, rvserver_ref_memmap, irq_mmio_phandle); +} + +static void create_fdt(RISCVServerRefMachineState *s, + const MemMapEntry *memmap) +{ + MachineState *ms =3D MACHINE(s); + uint8_t rng_seed[32]; + + ms->fdt =3D create_device_tree(&s->fdt_size); + if (!ms->fdt) { + error_report("create_device_tree() failed"); + exit(1); + } + + qemu_fdt_setprop_string(ms->fdt, "/", "model", "qemu,riscv-server-ref"= ); + qemu_fdt_setprop_string(ms->fdt, "/", "compatible", "riscv-server-ref"= ); + qemu_fdt_setprop_cell(ms->fdt, "/", "#size-cells", 0x2); + qemu_fdt_setprop_cell(ms->fdt, "/", "#address-cells", 0x2); + + /* + * This versioning scheme is for informing platform fw only. It is nei= ther: + * - A QEMU versioned machine type; a given version of QEMU will emula= te + * a given version of the platform. + * - A reflection of level of server platform support provided. + * + * machine-version-major: updated when changes breaking fw compatibili= ty + * are introduced. + * machine-version-minor: updated when features are added that don't b= reak + * fw compatibility. + * + * It's the same as the scheme in arm sbsa-ref. + */ + qemu_fdt_setprop_cell(ms->fdt, "/", "machine-version-major", 0); + qemu_fdt_setprop_cell(ms->fdt, "/", "machine-version-minor", 0); + + qemu_fdt_add_subnode(ms->fdt, "/soc"); + qemu_fdt_setprop(ms->fdt, "/soc", "ranges", NULL, 0); + qemu_fdt_setprop_string(ms->fdt, "/soc", "compatible", "simple-bus"); + qemu_fdt_setprop_cell(ms->fdt, "/soc", "#size-cells", 0x2); + qemu_fdt_setprop_cell(ms->fdt, "/soc", "#address-cells", 0x2); + + qemu_fdt_add_subnode(ms->fdt, "/chosen"); + + /* Pass seed to RNG */ + qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed)); + qemu_fdt_setprop(ms->fdt, "/chosen", "rng-seed", + rng_seed, sizeof(rng_seed)); + + create_fdt_flash(s, memmap); + create_fdt_pmu(s); + +} + +static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, + DeviceState *irqchip, + RISCVServerRefMachineState *s) +{ + DeviceState *dev; + PCIHostState *pci; + PCIDevice *pdev_ahci; + AHCIPCIState *ich9; + DriveInfo *hd[NUM_SATA_PORTS]; + MemoryRegion *ecam_alias, *ecam_reg; + MemoryRegion *mmio_alias, *high_mmio_alias, *mmio_reg; + hwaddr ecam_base =3D rvserver_ref_memmap[RVSERVER_PCIE_ECAM].base; + hwaddr ecam_size =3D rvserver_ref_memmap[RVSERVER_PCIE_ECAM].size; + hwaddr mmio_base =3D rvserver_ref_memmap[RVSERVER_PCIE_MMIO].base; + hwaddr mmio_size =3D rvserver_ref_memmap[RVSERVER_PCIE_MMIO].size; + hwaddr high_mmio_base =3D rvserver_ref_memmap[RVSERVER_PCIE_MMIO_HIGH]= .base; + hwaddr high_mmio_size =3D rvserver_ref_memmap[RVSERVER_PCIE_MMIO_HIGH]= .size; + hwaddr pio_base =3D rvserver_ref_memmap[RVSERVER_PCIE_PIO].base; + hwaddr pio_size =3D rvserver_ref_memmap[RVSERVER_PCIE_PIO].size; + MachineClass *mc =3D MACHINE_GET_CLASS(s); + qemu_irq irq; + int i; + + dev =3D qdev_new(TYPE_GPEX_HOST); + + object_property_set_uint(OBJECT(GPEX_HOST(dev)), PCI_HOST_ECAM_BASE, + ecam_base, NULL); + object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_ECAM_SIZE, + ecam_size, NULL); + object_property_set_uint(OBJECT(GPEX_HOST(dev)), + PCI_HOST_BELOW_4G_MMIO_BASE, + mmio_base, NULL); + object_property_set_int(OBJECT(GPEX_HOST(dev)), + PCI_HOST_BELOW_4G_MMIO_SIZE, + mmio_size, NULL); + object_property_set_uint(OBJECT(GPEX_HOST(dev)), + PCI_HOST_ABOVE_4G_MMIO_BASE, + high_mmio_base, NULL); + object_property_set_int(OBJECT(GPEX_HOST(dev)), + PCI_HOST_ABOVE_4G_MMIO_SIZE, + high_mmio_size, NULL); + object_property_set_uint(OBJECT(GPEX_HOST(dev)), PCI_HOST_PIO_BASE, + pio_base, NULL); + object_property_set_int(OBJECT(GPEX_HOST(dev)), PCI_HOST_PIO_SIZE, + pio_size, NULL); + + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + ecam_alias =3D g_new0(MemoryRegion, 1); + ecam_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam", + ecam_reg, 0, ecam_size); + memory_region_add_subregion(get_system_memory(), ecam_base, ecam_alias= ); + + mmio_alias =3D g_new0(MemoryRegion, 1); + mmio_reg =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio", + mmio_reg, mmio_base, mmio_size); + memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias= ); + + /* Map high MMIO space */ + high_mmio_alias =3D g_new0(MemoryRegion, 1); + memory_region_init_alias(high_mmio_alias, OBJECT(dev), "pcie-mmio-high= ", + mmio_reg, high_mmio_base, high_mmio_size); + memory_region_add_subregion(get_system_memory(), high_mmio_base, + high_mmio_alias); + + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, pio_base); + + for (i =3D 0; i < PCI_NUM_PINS; i++) { + irq =3D qdev_get_gpio_in(irqchip, RVSERVER_PCIE_IRQ + i); + + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq); + gpex_set_irq_num(GPEX_HOST(dev), i, RVSERVER_PCIE_IRQ + i); + } + + pci =3D PCI_HOST_BRIDGE(dev); + pci_init_nic_devices(pci->bus, mc->default_nic); + /* IDE disk setup. */ + pdev_ahci =3D pci_create_simple(pci->bus, -1, TYPE_ICH9_AHCI); + ich9 =3D ICH9_AHCI(pdev_ahci); + g_assert(ARRAY_SIZE(hd) =3D=3D ich9->ahci.ports); + ide_drive_get(hd, ich9->ahci.ports); + ahci_ide_create_devs(&ich9->ahci, hd); + + GPEX_HOST(dev)->gpex_cfg.bus =3D PCI_HOST_BRIDGE(GPEX_HOST(dev))->bus; + return dev; +} + +static DeviceState *rvserver_ref_create_aia(int aia_guests, + const MemMapEntry *memmap, + int socket, + int base_hartid, int hart_coun= t) +{ + int i; + hwaddr addr; + uint32_t guest_bits; + DeviceState *aplic_s =3D NULL; + DeviceState *aplic_m =3D NULL; + bool msimode =3D true; + + /* Per-socket M-level IMSICs */ + addr =3D memmap[RVSERVER_IMSIC_M].base + + socket * RVSERVER_IMSIC_GROUP_MAX_SIZE; + for (i =3D 0; i < hart_count; i++) { + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(0), + base_hartid + i, true, 1, + RVSERVER_IRQCHIP_NUM_MSIS); + } + + /* Per-socket S-level IMSICs */ + guest_bits =3D imsic_num_bits(aia_guests + 1); + addr =3D memmap[RVSERVER_IMSIC_S].base + + socket * RVSERVER_IMSIC_GROUP_MAX_SIZE; + for (i =3D 0; i < hart_count; i++) { + riscv_imsic_create(addr + i * IMSIC_HART_SIZE(guest_bits), + base_hartid + i, false, 1 + aia_guests, + RVSERVER_IRQCHIP_NUM_MSIS); + } + + /* Per-socket M-level APLIC */ + aplic_m =3D riscv_aplic_create(memmap[RVSERVER_APLIC_M].base + + socket * memmap[RVSERVER_APLIC_M].size, + memmap[RVSERVER_APLIC_M].size, + (msimode) ? 0 : base_hartid, + (msimode) ? 0 : hart_count, + RVSERVER_IRQCHIP_NUM_SOURCES, + RVSERVER_IRQCHIP_NUM_PRIO_BITS, + msimode, true, NULL); + + /* Per-socket S-level APLIC */ + aplic_s =3D riscv_aplic_create(memmap[RVSERVER_APLIC_S].base + + socket * memmap[RVSERVER_APLIC_S].size, + memmap[RVSERVER_APLIC_S].size, + (msimode) ? 0 : base_hartid, + (msimode) ? 0 : hart_count, + RVSERVER_IRQCHIP_NUM_SOURCES, + RVSERVER_IRQCHIP_NUM_PRIO_BITS, + msimode, false, aplic_m); + + (void)aplic_s; + return aplic_m; +} + +static uint64_t rvserver_reset_syscon_read(void *opaque, hwaddr addr, + unsigned size) +{ + return 0; +} + +static void rvserver_reset_syscon_write(void *opaque, hwaddr addr, + uint64_t val64, unsigned int size) +{ + switch (val64) { + case SYSCON_POWEROFF: + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + return; + case SYSCON_RESET: + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + return; + default: + break; + } +} + +static const MemoryRegionOps rvserver_reset_syscon_ops =3D { + .read =3D rvserver_reset_syscon_read, + .write =3D rvserver_reset_syscon_write, + .endianness =3D DEVICE_LITTLE_ENDIAN +}; + +static void rvserver_ref_machine_done(Notifier *notifier, void *data) +{ + RISCVServerRefMachineState *s =3D container_of( + notifier, RISCVServerRefMachineState, machine_done); + const MemMapEntry *memmap =3D rvserver_ref_memmap; + MachineState *machine =3D MACHINE(s); + hwaddr start_addr =3D memmap[RVSERVER_DRAM].base; + target_ulong firmware_end_addr, kernel_start_addr; + const char *firmware_name =3D riscv_default_firmware_name(&s->soc[0]); + uint64_t fdt_load_addr; + uint64_t kernel_entry =3D 0; + BlockBackend *pflash_blk0; + RISCVBootInfo boot_info; + + /* + * An user provided dtb must include everything, including + * dynamic sysbus devices. Our FDT needs to be finalized. + */ + if (machine->dtb =3D=3D NULL) { + finalize_fdt(s); + } + + firmware_end_addr =3D riscv_find_and_load_firmware(machine, firmware_n= ame, + &start_addr, NULL); + + pflash_blk0 =3D pflash_cfi01_get_blk(s->flash[0]); + if (pflash_blk0) { + if (machine->firmware && !strcmp(machine->firmware, "none")) { + /* + * Pflash was supplied but bios is none and not KVM guest, + * let's overwrite the address we jump to after reset to + * the base of the flash. + */ + start_addr =3D rvserver_ref_memmap[RVSERVER_FLASH].base; + } else { + /* + * Pflash was supplied but either KVM guest or bios is not non= e. + * In this case, base of the flash would contain S-mode payloa= d. + */ + riscv_setup_firmware_boot(machine); + kernel_entry =3D rvserver_ref_memmap[RVSERVER_FLASH].base; + } + } + + riscv_boot_info_init(&boot_info, &s->soc[0]); + + if (machine->kernel_filename && !kernel_entry) { + kernel_start_addr =3D riscv_calc_kernel_start_addr(&boot_info, + firmware_end_addr= ); + riscv_load_kernel(machine, &boot_info, kernel_start_addr, true, NU= LL); + kernel_entry =3D boot_info.image_low_addr; + } + + fdt_load_addr =3D riscv_compute_fdt_addr(memmap[RVSERVER_DRAM].base, + memmap[RVSERVER_DRAM].size, + machine, &boot_info); + + riscv_load_fdt(fdt_load_addr, machine->fdt); + + /* load the reset vector */ + riscv_setup_rom_reset_vec(machine, &s->soc[0], start_addr, + rvserver_ref_memmap[RVSERVER_MROM].base, + rvserver_ref_memmap[RVSERVER_MROM].size, + kernel_entry, + fdt_load_addr); + +} + +static bool rvserver_aclint_allowed(void) +{ + return tcg_enabled() || qtest_enabled(); +} + +static void rvserver_ref_machine_init(MachineState *machine) +{ + const MemMapEntry *memmap =3D rvserver_ref_memmap; + RISCVServerRefMachineState *s =3D RISCV_SERVER_REF_MACHINE(machine); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *mask_rom =3D g_new(MemoryRegion, 1); + MemoryRegion *reset_syscon_io =3D g_new(MemoryRegion, 1); + DeviceState *mmio_irqchip, *pcie_irqchip, *iommu_sys; + int i, base_hartid, hart_count; + int socket_count =3D riscv_socket_count(machine); + + /* Check socket count limit */ + if (RVSERVER_SOCKETS_MAX < socket_count) { + error_report("number of sockets/nodes should be less than %d", + RVSERVER_SOCKETS_MAX); + exit(1); + } + + if (!rvserver_aclint_allowed()) { + error_report("'aclint' is only available with TCG acceleration"); + exit(1); + } + + /* Initialize sockets */ + mmio_irqchip =3D pcie_irqchip =3D NULL; + for (i =3D 0; i < socket_count; i++) { + g_autofree char *soc_name =3D g_strdup_printf("soc%d", i); + + if (!riscv_socket_check_hartids(machine, i)) { + error_report("discontinuous hartids in socket%d", i); + exit(1); + } + + base_hartid =3D riscv_socket_first_hartid(machine, i); + if (base_hartid < 0) { + error_report("can't find hartid base for socket%d", i); + exit(1); + } + + hart_count =3D riscv_socket_hart_count(machine, i); + if (hart_count < 0) { + error_report("can't find hart count for socket%d", i); + exit(1); + } + + object_initialize_child(OBJECT(machine), soc_name, &s->soc[i], + TYPE_RISCV_HART_ARRAY); + object_property_set_str(OBJECT(&s->soc[i]), "cpu-type", + machine->cpu_type, &error_abort); + object_property_set_int(OBJECT(&s->soc[i]), "hartid-base", + base_hartid, &error_abort); + object_property_set_int(OBJECT(&s->soc[i]), "num-harts", + hart_count, &error_abort); + sysbus_realize(SYS_BUS_DEVICE(&s->soc[i]), &error_fatal); + + /* Per-socket ACLINT MTIMER */ + riscv_aclint_mtimer_create(memmap[RVSERVER_ACLINT].base + + i * RISCV_ACLINT_DEFAULT_MTIMER_SIZE, + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, + base_hartid, hart_count, + RISCV_ACLINT_DEFAULT_MTIMECMP, + RISCV_ACLINT_DEFAULT_MTIME, + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, true); + + /* Per-socket interrupt controller */ + s->irqchip[i] =3D rvserver_ref_create_aia(s->aia_guests, + memmap, i, base_hartid, + hart_count); + + /* Try to use different IRQCHIP instance based device type */ + if (i =3D=3D 0) { + mmio_irqchip =3D s->irqchip[i]; + pcie_irqchip =3D s->irqchip[i]; + } + if (i =3D=3D 1) { + pcie_irqchip =3D s->irqchip[i]; + } + } + + s->memmap =3D rvserver_ref_memmap; + + /* register system main memory (actual RAM) */ + memory_region_add_subregion(system_memory, memmap[RVSERVER_DRAM].base, + machine->ram); + + /* boot rom */ + memory_region_init_rom(mask_rom, NULL, "riscv_rvserver_ref_board.mrom", + memmap[RVSERVER_MROM].size, &error_fatal); + memory_region_add_subregion(system_memory, memmap[RVSERVER_MROM].base, + mask_rom); + + memory_region_init_io(reset_syscon_io, NULL, &rvserver_reset_syscon_op= s, + NULL, "reset_syscon_io", + memmap[RVSERVER_RESET_SYSCON].size); + memory_region_add_subregion(system_memory, + memmap[RVSERVER_RESET_SYSCON].base, + reset_syscon_io); + + gpex_pcie_init(system_memory, pcie_irqchip, s); + + serial_mm_init(system_memory, memmap[RVSERVER_UART0].base, + 0, qdev_get_gpio_in(mmio_irqchip, RVSERVER_UART0_IRQ), 399193, + serial_hd(0), DEVICE_LITTLE_ENDIAN); + + sysbus_create_simple("goldfish_rtc", memmap[RVSERVER_RTC].base, + qdev_get_gpio_in(mmio_irqchip, RVSERVER_RTC_IRQ)); + + for (i =3D 0; i < ARRAY_SIZE(s->flash); i++) { + /* Map legacy -drive if=3Dpflash to machine properties */ + pflash_cfi01_legacy_drive(s->flash[i], + drive_get(IF_PFLASH, 0, i)); + } + rvserver_flash_maps(s, system_memory); + + /* load/create device tree */ + if (machine->dtb) { + machine->fdt =3D load_device_tree(machine->dtb, &s->fdt_size); + if (!machine->fdt) { + error_report("load_device_tree() failed"); + exit(1); + } + } else { + create_fdt(s, memmap); + } + + iommu_sys =3D qdev_new(TYPE_RISCV_IOMMU_SYS); + object_property_set_uint(OBJECT(iommu_sys), "addr", + s->memmap[RVSERVER_IOMMU_SYS].base, + &error_fatal); + + object_property_set_uint(OBJECT(iommu_sys), "base-irq", + IOMMU_SYS_IRQ, + &error_fatal); + + object_property_set_link(OBJECT(iommu_sys), "irqchip", + OBJECT(mmio_irqchip), + &error_fatal); + + sysbus_realize_and_unref(SYS_BUS_DEVICE(iommu_sys), &error_fatal); + + s->machine_done.notify =3D rvserver_ref_machine_done; + qemu_add_machine_init_done_notifier(&s->machine_done); +} + +static void rvserver_ref_machine_instance_init(Object *obj) +{ + RISCVServerRefMachineState *s =3D RISCV_SERVER_REF_MACHINE(obj); + + s->flash[0] =3D rvserver_flash_create(s, "riscv-server-ref.flash0", + "pflash0"); + s->flash[1] =3D rvserver_flash_create(s, "riscv-server-ref.flash1", + "pflash1"); +} + +static char *rvserver_ref_get_aia_guests(Object *obj, Error **errp) +{ + RISCVServerRefMachineState *s =3D RISCV_SERVER_REF_MACHINE(obj); + char val[32]; + + sprintf(val, "%d", s->aia_guests); + return g_strdup(val); +} + +static void rvserver_ref_set_aia_guests(Object *obj, const char *val, + Error **errp) +{ + RISCVServerRefMachineState *s =3D RISCV_SERVER_REF_MACHINE(obj); + + s->aia_guests =3D atoi(val); + if (s->aia_guests < 0 || s->aia_guests > RVSERVER_IRQCHIP_MAX_GUESTS) { + error_setg(errp, "Invalid number of AIA IMSIC guests"); + error_append_hint(errp, "Valid values be between 0 and %d.\n", + RVSERVER_IRQCHIP_MAX_GUESTS); + } +} + +static void rvserver_ref_machine_class_init(ObjectClass *oc, const void *d= ata) +{ + char str[128]; + MachineClass *mc =3D MACHINE_CLASS(oc); + static const char * const valid_cpu_types[] =3D { + TYPE_RISCV_CPU_RVSERVER_REF, + }; + + mc->desc =3D "RISC-V Server SoC Reference board"; + mc->init =3D rvserver_ref_machine_init; + mc->max_cpus =3D RVSERVER_CPUS_MAX; + mc->default_cpu_type =3D TYPE_RISCV_CPU_RVSERVER_REF; + mc->valid_cpu_types =3D valid_cpu_types; + mc->pci_allow_0_address =3D true; + mc->default_nic =3D "e1000e"; + mc->possible_cpu_arch_ids =3D riscv_numa_possible_cpu_arch_ids; + mc->cpu_index_to_instance_props =3D riscv_numa_cpu_index_to_props; + mc->get_default_cpu_node_id =3D riscv_numa_get_default_cpu_node_id; + mc->numa_mem_supported =3D true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary =3D true; + mc->default_ram_id =3D "riscv_rvserver_ref_board.ram"; + + object_class_property_add_str(oc, "aia-guests", + rvserver_ref_get_aia_guests, + rvserver_ref_set_aia_guests); + sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid valu= e " + "should be between 0 and %d.", RVSERVER_IRQCHIP_MAX_GUEST= S); + object_class_property_set_description(oc, "aia-guests", str); +} + +static const TypeInfo rvserver_ref_typeinfo =3D { + .name =3D TYPE_RISCV_SERVER_REF_MACHINE, + .parent =3D TYPE_MACHINE, + .class_init =3D rvserver_ref_machine_class_init, + .instance_init =3D rvserver_ref_machine_instance_init, + .instance_size =3D sizeof(RISCVServerRefMachineState), +}; + +static void rvserver_ref_init_register_types(void) +{ + type_register_static(&rvserver_ref_typeinfo); +} + +type_init(rvserver_ref_init_register_types) --=20 2.43.0 From nobody Mon May 25 13:48:48 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=1777057960; cv=none; d=zohomail.com; s=zohoarc; b=fLyrMRtvITEcH3p+wInY3iBUGAb2kPU66Uo9q4wvkmknRaywxV6OJG7jLLFtQHFuW5/QasD7RHaNZrvAe+DprvV02soEorCbJHqGj2aApcKX1dVAlm1Zr1xn1yOHEAueJ5xReDO2S3kRdmvj7XWygeeNGaJ5kfCUO2xCcivXY6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777057960; 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=RWtTeeX80M7UyjtsWtjdLoF0L/y79rbrHQrXJNxvvTc=; b=Vna2v3wrtBCFcNxvWGkSgA7x/6o/PDISlEp3d+vUXWnyHtvibqvX41bHpqmlxG5jA4LN+y13bCoutbcGPQLpG1jevfUvVat1WFcs/gj0xw9BoIZHO6+KQ1HxacI3Y2IKiUSP67AJexMcvxhfhDJlTJGUw7fUuffgqN43VQbWlL8= 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 1777057960741309.4177029533356; Fri, 24 Apr 2026 12:12:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wGLwS-00065N-KU; Fri, 24 Apr 2026 15:11: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 1wGLwM-00063e-1n for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:50 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wGLwI-0004NN-Gb for qemu-devel@nongnu.org; Fri, 24 Apr 2026 15:11:49 -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 63OIf1Rf1858797 for ; Fri, 24 Apr 2026 19:11:45 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 4dre0wg30r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 19:11:45 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8d4c2906fdfso856210985a.2 for ; Fri, 24 Apr 2026 12:11:45 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([191.202.238.222]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8e7d5fe90afsm2319567085a.3.2026.04.24.12.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 12:11:43 -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=RWtTeeX80M7 UyjtsWtjdLoF0L/y79rbrHQrXJNxvvTc=; b=bsQOzcaPiz2lYFmNKy28XU+Wraz 0H0O5QAB+FTC1cUlD6QssW12A15/++1dB5qeAGhCAPza6rXzyb+Jj51sCLFKDtVm n3nvBvA8s1mzA8jOMnsKaVIkKrA7cYwV+YVLG1z8FBaZ9Aoah1wq841ohneE1rck TcgvufSDycA1E8NbsuwYczXAcT+gGXOAZeyM0NoVMphY9ttgvLmR2hcymw/c+UU7 1CP1NtuFnPi2AFkvXdwwvu0KLdlTfb37FUZdTdn4J/4e1yqBeLSj6rXsPUCAnD5m 4hNvnY40/d7/iRO/vDJm+iqIvrqZhWiSCT6qv9sPrvoZby5VGojWt1D64Zw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777057905; x=1777662705; 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=RWtTeeX80M7UyjtsWtjdLoF0L/y79rbrHQrXJNxvvTc=; b=TfSXg5mShd/oxEHEjpDaF3kQE8RBB0mfiNh7Eelr52cdPh4CtVpb2s0jGh8++4RNA9 2I1w7xGGNie04oqJ7hA+JkbFkzbsY/TytrYbtErcPP5KmSmL9LSkGuPudOHwupCD88Yi YIfYfetaQlxGV89W8rsaS8GiIIugiQ2rdczmctnCffK9EWGq4m5ArCCqc4IDUIxVX5g4 14Kz87fN4W4g8MU6JfjVRBCl9CD1m10pu5rAxTX/8kWBVo6wc30tZOycvDCh/x/+Qo6U MI7daX9cW5+bHLAxXlSqg3AjGsmQxyT0ols/04gUx7KidFMx9IBQZHYNJc+12dOgYioI UxKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777057905; x=1777662705; 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=RWtTeeX80M7UyjtsWtjdLoF0L/y79rbrHQrXJNxvvTc=; b=RskW6kqAJkTUh78GBIIkg7r+C/vnqBD4LeuolVmCSxwJrw+sj8aKjlSv+sg0ax4bHy aLOGx+hb3RshmCDjaX0SDGe9uHOohPXv6zDith9QAJH8uVT/qz6Y1pa2rO4o1f1PT/ox Jx4YByEgWm6VQXAHeaC9B7zXllMFoCNe8+otkGuTztk+cp5NAVvdOr14+xuVhRa2fWy+ 4FaXMhfSmPSjLxp1ZKLDkaBbQo8iQ8dsW6AcwxiuLrHj6LMMX436ON2vy8UZROq/YP5A RBpQyNavZbG8U1+Y/lum2pX3BIfwW9J6p/ug+y322R+zT1aUIH3V3LHbbrwc0sfDfGwn +Jug== X-Gm-Message-State: AOJu0YxwaZvp6WiEIpAXl/J0xxqyBR4FVvLgTPLS81JXWPzoqokdABnx nMi0ksIQbMEVgpzz5FmNnn8K3QlZTXjL3VCqwUzyivjoFUPAKCO36c58D6wEPxuSKauWBEtlgIA jhL/yDsr/BtJBLv3arf3p87kmLBwsAvjNEq48ACK/moqhJGvHlKzinR310fziSojeAA== X-Gm-Gg: AeBDietmTtVLvHYpi/tD+RKOweZhTnbZWDqXpRrROerfCBJKuecWg7TOCsE1bAsls4e cRa1Q62UQy0r3U++gNenB8iqpIYJ8vMctwwe+GQ0gZN8br740WZKQhIn5/Fr7VIUi2XhsqKzgVi lSCtJrnwLSpJZS8SEKLL1rJNWbrcNcAYw/MPVycvdPeB5VfKGaKZD8QZvDI6mPr9w0iOAQTo8h6 1I8glnozWW/rPdqAgwnyLNGLPAXmYhinubtCRNSKtK0y2ct6RJ4X4G0uuB8XOmNWvuErzFsKRO4 hqD4ZhH605r2MWViZBzQ9AqPYailNvnx3f2eAMmrt7HcGjJkex16AeSoZ9D75nlAIfp7XzghG+X GDh3WbwqUUXqOJZME4AI51B2DiMKMEH2h4DpM/36Vo6YJdOxkn7+42y4vVdKqdjIP0DWZ9+c= X-Received: by 2002:a05:620a:4694:b0:8f1:5e8f:fff3 with SMTP id af79cd13be357-8f15e900620mr1115358685a.26.1777057904681; Fri, 24 Apr 2026 12:11:44 -0700 (PDT) X-Received: by 2002:a05:620a:4694:b0:8f1:5e8f:fff3 with SMTP id af79cd13be357-8f15e900620mr1115353085a.26.1777057904144; Fri, 24 Apr 2026 12:11:44 -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, leif.lindholm@oss.qualcomm.com, Daniel Henrique Barboza Subject: [PATCH v5 4/4] docs: add riscv-server-ref.rst Date: Fri, 24 Apr 2026 16:11:29 -0300 Message-ID: <20260424191129.1494381-5-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> References: <20260424191129.1494381-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=H+frBeYi c=1 sm=1 tr=0 ts=69ebc071 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=etEqFfc6qwXwpI8uT8rzbw==:17 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=NEAV23lmAAAA:8 a=EUspDBNiAAAA:8 a=bmbEedN3N7VIJUCuTIwA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: SVZBbzIad0d7rST_bXBNrTSMBwFc8WzL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDI0MDE4NiBTYWx0ZWRfX3QOE9V+Qm4uC Xx7xfAIfQl5AVpDmGtjpIRX9bthSwrfNdMSoRmfldqsQCz8siLzPDFI8Z4gt01xdMcZYz2s71dc nLvIcpfRTgoH632jZqc3QtcpwRzDFAQHbtadEMbwe/ZRMN9XkyhLMxlMLAzkGYu8h9IFCY2RsQr QOjSuPgVXLDWuLI9pG/SIB8RXMnD0GIjA93oxggyvytCeRd0eXeb5gCmISTHrqnh8BSkoTNscWj 6ZaL/LtZz31AdzU0Fj4SqdltXO45ktbhnw6ymDKZN/as7OhE6u731UfvcQUih9KBH/vH+kU9/h0 6D6jVKHscsZ1O47gip7G5jOdgfQuumw7JlkAeKcJ9PIYduU6a/1dAlxObfIaMusaXewNQPTGyEC 4tGusZVz5o46/cMN9NlXOrrc1fYNuMerphD8QJGc41xvl7yDTkZjEltkLk0w8CQg7nzAQ2sN6XL +FEDdDGhJAduHuceRbQ== X-Proofpoint-GUID: SVZBbzIad0d7rST_bXBNrTSMBwFc8WzL X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-24_02,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 spamscore=0 phishscore=0 malwarescore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240186 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: 1777057962771158500 Content-Type: text/plain; charset="utf-8" Add documentation for the new riscv-server-ref board. Signed-off-by: Daniel Henrique Barboza --- docs/system/riscv/riscv-server-ref.rst | 31 ++++++++++++++++++++++++++ docs/system/target-riscv.rst | 1 + 2 files changed, 32 insertions(+) create mode 100644 docs/system/riscv/riscv-server-ref.rst diff --git a/docs/system/riscv/riscv-server-ref.rst b/docs/system/riscv/ris= cv-server-ref.rst new file mode 100644 index 0000000000..acf7110b96 --- /dev/null +++ b/docs/system/riscv/riscv-server-ref.rst @@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +RISC-V Server Platform Reference board (``riscv-server-ref``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The RISC-V Server Platform specification `spec`_ defines a standardized +set of hardware and software capabilities that portable system software, +such as OS and hypervisors, can rely on being present in a RISC-V server +platform. This machine aims to emulate this specification, providing +an environment for firmware/OS development and testing. + +The main features included in the riscv-server-ref board are: + +* IOMMU platform device (riscv-iommu-sys) +* AIA +* PCIe AHCI +* PCIe NIC +* No virtio mmio bus +* No fw_cfg device +* No ACPI table +* Minimal device tree nodes + +There are multiple ways of using this reference board, some of them being: + +* BIOS: u-boot-spl.bin; SD-CARD: ; NVME: +* BIOS: fw_dynamic.bin; KERNEL: u-boot.bin; NVME: +* BIOS: fw_dynamic.bin; KERNEL: EDK2.fd; NVME: +* BIOS: fw_dynamic.bin; KERNEL: ; INITRD: + + +.. _spec: https://github.com/riscv-non-isa/riscv-server-platform diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst index 3ad5d1ddaf..3f7690331b 100644 --- a/docs/system/target-riscv.rst +++ b/docs/system/target-riscv.rst @@ -73,6 +73,7 @@ undocumented; you can get a complete list by running riscv/sifive_u riscv/virt riscv/xiangshan-kunminghu + riscv/riscv-server-ref =20 RISC-V CPU firmware ------------------- --=20 2.43.0