From nobody Sun Jun 7 22:19: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=1780566865; cv=none; d=zohomail.com; s=zohoarc; b=j5HVk85q8PVGj1qFCtDxv9Yw8n0wo8tIVce4AQiOxNiKBngRKhglwfdLYmZP83FdKbkneVY020TJxXy5d5aHGO3ZkpAJcK2lXX/p1VQhSOtGrT4m/baeBxOvYuHDB1EK9hchgZ6siuVsV0kFQKWf6nWy6DWAcaI6S6KB4Hyzk9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780566865; 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=tjcJ28mFinExTdQkLHGFFBxaKcXZG06GkSkZCcUr+IA=; b=CNoxU4u+Mm5Upc930bGQ7gOpu5XtkvBIIIrOUD5PpUOCnqGc1Vxi8ydjUVw0O69R03HEaqDQU2KZR5YRERfXxs6kZAkHDxg/f7AvW3RSqelCpHbg9/CE6dXE8fa+3RL0KJiYf4rHYk3Nyu+A+e9wx+i/dHyMDyHQwqH0o2h1ujc= 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 17805668658281016.0671496142012; Thu, 4 Jun 2026 02:54:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV4lH-0005VO-O4; Thu, 04 Jun 2026 05:53:15 -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 1wV4lC-0005TB-MP for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:12 -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 1wV4l6-0003hj-W7 for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:08 -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 6545PuMT994913 for ; Thu, 4 Jun 2026 09:53:01 GMT Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ek374rxee-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 09:53:01 +0000 (GMT) Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-7d19c3a699fso6713637b3.2 for ; Thu, 04 Jun 2026 02:53:01 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([177.170.117.62]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d64ba680sm3522830d50.21.2026.06.04.02.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 02:52:59 -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=tjcJ28mFinE xTdQkLHGFFBxaKcXZG06GkSkZCcUr+IA=; b=hZ8933vxbSyuJSh6epnSwdex7Vb Umx+MAw45Qpma2T/aJrw5y83KmdI+fveEf7B8DKYiRNRc+axh7Dchg+fRUuyZjTh 9JpnY+Iumfj2HMwkTiVq6cTYhKvyIlyy5Bj0zTwMYpp1nKMDVtTi9m/lcCTUAhZ7 A6Rp4frRqIMXZgciql5/nvcqEXRhkDnbA89qYXqsdRKi7mACETpwVtmPXY1D0jzg GJ4ghNrC8j2giSs5lsuCDixVT4sPO4yTvR1JrH5q2LZjszlkDTjXq6zF6IzwOfjd No6hOCq6Wq+TzARvIU/vS7cWigrO6sW9injd/e6dZ/hG07Amls35WVP3Aug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780566780; x=1781171580; 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=tjcJ28mFinExTdQkLHGFFBxaKcXZG06GkSkZCcUr+IA=; b=PdxC499qvShdHKa1pDS7wxLH625THegWvIbiaDPUEz8AKfw8mxEaJw/S3BBmlRKnmh 5Qg1LSK6j1C8qsIl4v1KgrOuP0D1KGs3o5KvpkjwZkoT82eWwz52ZQ3LnnB2Cpior7fn nYfjPaGOvhqOZ9YTvDW90iF3Goj7mqkqMrH+kwsAPNIo1D9TNPHibJ/CGN3751fnjT1i ohh9kErUzyNePVz5Z6yton33r8bI2ugn6svXRClqNfSVpgPcgUxHWSQTev6XCAkSnb4j Xl7t+2vE3q3lizNWkBrAS/TyWyDEyAU96LDAgHNyhZQliAFd953r0v/o+nxAJDHIXxLL QOIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780566780; x=1781171580; 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=tjcJ28mFinExTdQkLHGFFBxaKcXZG06GkSkZCcUr+IA=; b=ED97o3mfi418RPnvrWw4AZ8+egS4DF1qwcM6H1hgQBkKntLkPFgRC3LHkr6y6x32hh LQ9voL4nF1ZoLP4CO7M/PPXJC4LKpTzFF7O/GB5or59r/0jRYNbzjXxgRoAeWqiBg3zX Krd952r+mQWFH9vDGh4NMSHCZSEmoc/zsVPArce8dgOGYa3s01PV7ShdME5Ip/c9Tbpy KDs1QgVRYCCc3vyHf80DE5HakBt/IOIWSm09i4IZNQ2xc87XR5vTylR+0pvTe57dFK/x aK5xQmmZZ5LKsjksHOkNp8PnmMHPgyP+0NYHI1z0UI92ql+CKVTqqma8GLA611UCeE8s em5w== X-Gm-Message-State: AOJu0YyD4DZwxaJFLXt2/g1YgJc/zIPJGoUC/iMDgEQHh0Lw5aEULvEr bTcxzA6kMZbUXqFoNVw+8gmR6Ifes/E/XLPnJ2/W+4uaiyc2Qw6al6L8JDqQRG77m0aLLgtkn5v 6nXIA2X78B7Zbb4GedXgpTQ6e0FU0Gi2SQpN3kyOH07eGbxBTXBDpbQi/6c2az4j2BA== X-Gm-Gg: Acq92OFRu4xuTKGx/bceFthdHZqbdYtp9whNtaWUfN8OY86ETYjLeBKyCap2JMM0SaW 4M24FpXpTKK7KzlB/0IZryg3N+4gd4Y18PfJjN15usj15SYuTJ2A/kNb+fbwwOCpQP+En8LKuFV uG3QmHzuCZUJfGlL0C3161YBFCiaiHZkT/BtQtwn35DlULS76fzyVLA5b0pc9/bQ85YCY0HJ4d+ TVszrD2DK1UIpo2swXD1nBO/tFgPSvEmodRBUnzlkueGMZy1k+oX/3Es6/hBKPqSZ4A+XHBeNEi UrzC7JlzeiCvRWRpeG6g1xE0T+2JELjQYxJ6d2X5yjERhvKmh931HmrRwB9mhOWxwLhJIxXtPfS x5kHQFqwB2NLkr5enGUDsSxhKvtdyCjp0QdgxUMl9EryEmcaUWiiVLzwSpRkFsrxDGoe2ug== X-Received: by 2002:a05:690e:4384:b0:652:ddea:1679 with SMTP id 956f58d0204a3-660dbfc0251mr4376583d50.16.1780566780317; Thu, 04 Jun 2026 02:53:00 -0700 (PDT) X-Received: by 2002:a05:690e:4384:b0:652:ddea:1679 with SMTP id 956f58d0204a3-660dbfc0251mr4376566d50.16.1780566779935; Thu, 04 Jun 2026 02:52:59 -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, andrew.jones@oss.qualcomm.com, leif.lindholm@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v7 1/5] target/riscv/cpu.c: remove 'bare' condition for .profile Date: Thu, 4 Jun 2026 06:52:40 -0300 Message-ID: <20260604095244.3313259-2-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> References: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDA5NSBTYWx0ZWRfX8emNDhO9nte4 vEvb5KNB8KxWVkzoCPv3uKgDVd7u31xEzqOej2zzWF1TiPbN6+EMmYSeKpGlGlz0TEiXX5mVG+h /IjgPuXBPRNeXlnyYBzL7XcPh4m7YaWexvTooGvCDaO4+JH53s06TY4RsNHOhp0L0yvC5XvpPLP yr75VjmTJ041VB9iIi8f/3oecnCmZtUnI9Ti6eh+jsctRlIxzd+UTHEmVKaPqE9HnKqH3OJuH5p wPEhWDPlov6mTLlA1SIY85OuD15KESfeBN/ucAJRn6gccMsD0a4qogrtYcr3MP1CUssYkY1qe34 banxmLkbP3m1Dyp8VDqe7tDfwge86W9Sw2RMVX747fIEIoCoouLtB0OKVT0YZ9Hs9NobL+C5Psh yGFVdwlt6gWBWTqrQyWT/R/JkL4hicZo6c0dlqXIXlLxW9LYvgmjvlSZ6pmqUGpIlTjhrOrrhTM hWHxOk+QdYYSKeLOPVQ== X-Proofpoint-GUID: cJFrTq3PdGZa2zgDWDJb1Ei4zPsW6mOE X-Proofpoint-ORIG-GUID: cJFrTq3PdGZa2zgDWDJb1Ei4zPsW6mOE X-Authority-Analysis: v=2.4 cv=eJsjSnp1 c=1 sm=1 tr=0 ts=6a214afd cx=c_pps a=72HoHk1woDtn7btP4rdmlg==:117 a=gdiugJE53z4H+vvYeRBHqw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=JF9118EUAAAA:8 a=GhL2bEVCvcqOW28JNKkA:9 a=kA6IBgd4cpdPkAWqgNAz: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-04_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040095 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: 1780566868451154100 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. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones 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 f3b5d4c94c..3f0f931335 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2737,7 +2737,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 Sun Jun 7 22:19: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=1780566880; cv=none; d=zohomail.com; s=zohoarc; b=PrhS2tL/FoZerEJLPee6G9/lEy84AKSeDg+9yzOOYFWrkMTFZ7ywgsmfybovXzp00VXkPz8F8ygom+xuKLp6FyjLvYlQfDNjBYEDuGfKR1uP/dbe/BKPjpkHdYun1Seh/boDKNYISELaAoeLzrWwDLNxkuIH0cRjv3VrdL8klbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780566880; 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=rIJ+z58zb6Q93VW8mtj9oFZEH0MU8/yOI5xPORlDuXc=; b=mb8LoisbIuUwukHJ70qFKfrJO7WzzBzzaksyV2DMDIKaSrKvbK/iwv13YH2DNcDbJxF6h8n3w9p6jfr/FcOHn1AEeuZu8Gk/BVFJDy44XgSdYytmzJgyF5MlmKHrcAKF+xUxnxCozyTF17TBeMENbH6WuOHCg7dnKxcgaqvND6U= 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 1780566880188335.3626486861907; Thu, 4 Jun 2026 02:54:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV4lG-0005V1-OF; Thu, 04 Jun 2026 05:53:14 -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 1wV4lC-0005TA-MA for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53: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 1wV4l8-0003j4-Jq for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:09 -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 6548UiC81132984 for ; Thu, 4 Jun 2026 09:53:05 GMT Received: from mail-yx1-f71.google.com (mail-yx1-f71.google.com [74.125.224.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ek5wsga8t-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 09:53:05 +0000 (GMT) Received: by mail-yx1-f71.google.com with SMTP id 956f58d0204a3-660668ea5cdso846813d50.0 for ; Thu, 04 Jun 2026 02:53:05 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([177.170.117.62]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d64ba680sm3522830d50.21.2026.06.04.02.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 02:53: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=rIJ+z58zb6Q 93VW8mtj9oFZEH0MU8/yOI5xPORlDuXc=; b=H4DgzJRi3qK4f71Vc4QY7aOnGLt +3WhfiQvbv7NCNvQdxSqTUQn3MISSUEHy017UH4aJCCGE6EjlFynTDAw7epZ7eEu a7zhpQzjYbsGUqPnE6rLYdpMGqKzTQW1q4wRZNcqEtACTCSjHK76R/fH5qoGdk7S +ehafBAM7DBEDXL0U97pPUxlppeShWCakspP+aKIhb/uMVynO4T/sUw9JxcywKFS /DdnAB7EdsCqMLnnHQodDrcCCelaAAlTPNuVA+npd0S6afI6ka+n8JlLMuDzf2nG HwCub46l92YGfQz7+Z12NLmONmVOra9kyOsWY7YWTJzQ8gDZAe/udys3xvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780566785; x=1781171585; 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=rIJ+z58zb6Q93VW8mtj9oFZEH0MU8/yOI5xPORlDuXc=; b=Qmf1y7Y8FKBNKFF5OMTAbCODW0ihPTX/XGGuBjD9vdcj7K4HuFeyCNziPG+L0CBNoS 3YzYT841aZkU3jhueNx4VD+mBX11ZmGqq0iOc79STXo24Zy5eHSePR8iXA+FsetqHAbW 26RapzzHlKvdzv/dtyBLcJM4xnKKIZ2weUkkh0lN4XYuyx0lIFscyoRSLIR3HGhPqMPs VD/F6II2OnoBEF8RtvL1fqsb/vTtc40OJJqSD1J1nU4i2m9+qeXwtR9+wjLgMaNCw0g9 0iFnMxb424EDz9UtNkP5MATT5Cdy9IS+R4xTp7eobz5T1UODMorAMf64Oc5S0wfqGR58 gv6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780566785; x=1781171585; 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=rIJ+z58zb6Q93VW8mtj9oFZEH0MU8/yOI5xPORlDuXc=; b=QEMPDHfdPMn7S3fMHuUrVP1AoxhrR+6WdiTjTvYJg4SMwibnwQOYVt/R8qxlt+ikHM DdCBJ2zIAMJObePB+uj4TSzKB/7qxKLljlLgN4CRGdGuT+QXWK+leVDq0t+T+P4zTU2S iHqYePoDF27qr8J2qVSvRH7Lq2leimH3oH1hqaSPhv2gxU+MHI2r/g3RKlMFILKP/AOK Dtz1opbCciSgY+Rf94hRFhmqfqgLmAM9KGAKzM59qqbTwcE7ZDPQ3gdlBfdR9WObPaWy IPRHrPPNC1obEbm/IM1PbCivr4JK44oRUnEebOfhtPl60F9/plLS35LHXnHdAfQ8HxNV 6y1Q== X-Gm-Message-State: AOJu0YzzzJM4HSRKLlplVgSzoaA+8eCKQNBTwV9KQzgjOYVBLA2Gevie aJMnvz7lJ37cPpoOdwpdgA1Jy2o33PXOP0ZKxjnOXe9IFMYq01XiMzE3OT+XDvYAGtIEg7v/AOY QcFa9wmX/NLJOolNeravG0Zf0hkxEt/X+LntleVFuMrUvJegjO4sPUl+7+bYECBMKfA== X-Gm-Gg: Acq92OHK0vmz0aRumrXfXXiT0EaIT/gkZitoQFmYWmg4o/fNxonAvHS/HSljF5c20Zn owNruG3LPgKQlML3f+iDKoxo5JcWViNfZJ0uxqIzEkOYdZafKaDH21QA6iBWaRQel3n3CcgMt6A UBj8gvWh+eQSaPuQdW9QmTHFlf4Px1ZPLnR8Qx6DT/xU5iSl9ouCGiHHD2Vk0vYAdgOQBI6grjt ixIfDGuxKQxLRjOJB3uKTfwKXKRjTcovrHZxPPD9eRyHDXE4XTdorrW/VrXTa6BF/lqps/S2Si/ jPoX91vqD58MrZpbqorfJSikK9hhV53klHeo+yLOqNTTiX0TAKSR3vS3uGODyW5CiDb5c1r8NHm 537Ko8SktKReAE7g6WGDHBjPNemtVApvcb8Dzguz0EPPap+t+ElL8pwTSFgI12WHh66Qoyg== X-Received: by 2002:a05:690e:bcc:b0:660:eaa5:c13f with SMTP id 956f58d0204a3-660eaa5c3fcmr4660782d50.28.1780566784617; Thu, 04 Jun 2026 02:53:04 -0700 (PDT) X-Received: by 2002:a05:690e:bcc:b0:660:eaa5:c13f with SMTP id 956f58d0204a3-660eaa5c3fcmr4660772d50.28.1780566784141; Thu, 04 Jun 2026 02:53: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, andrew.jones@oss.qualcomm.com, leif.lindholm@oss.qualcomm.com, Fei Wu , Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v7 2/5] target/riscv: Add server platform reference cpu Date: Thu, 4 Jun 2026 06:52:41 -0300 Message-ID: <20260604095244.3313259-3-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> References: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: 2gYE8LxH5R1nlzP9vLdzGBr2eftuts3X X-Proofpoint-ORIG-GUID: 2gYE8LxH5R1nlzP9vLdzGBr2eftuts3X X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDA5NSBTYWx0ZWRfX80ftUKAQnDpp M8RBZ37z0GRdHM5+eG8BE2J25eBGYAjFg4fPy5Xl1aR2R5TZ7tG55axZtRhkqjytQ4NKx7qYQja y+0yFfGVzg6efDWsJbZrCiz3pP3XTjgRM0w/7MEhMKoQYcdkeb0C7WvvNmQxIj97nKLvh5z3qzd DKzrGevcv0/03zVF6QLIZb/7axqALJgnje4SehqiDV9ihO8Ngo0prYjPPP00nIxwM/aKkyg/7Z+ pFubqbutnSYcTdKNdBaH+YVFvWwKT5eq0uaY18NrgU2liPjU3Ibbs2YZrWUHPBONwubZwwKI6JR GpjwFtg4Bolfc3Ri3xc51JIfGv8izwOcmzns6/A3a+1n1DHTx8A0VmMvl7oCHaoI0qjf5DBoumy 1KfjDjzTWJeJ1U4OmjBCeNtH9kcBCTBTIGFnSz1rlrvqUa6jtGJdRjSvCxN0y6t1XFldTzEFOPj IajWpWpazGUSbxU+Y9w== X-Authority-Analysis: v=2.4 cv=POc/P/qC c=1 sm=1 tr=0 ts=6a214b01 cx=c_pps a=ngMg22mHWrP7m7pwYf9JkA==:117 a=gdiugJE53z4H+vvYeRBHqw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=V1jnuoLLAAAA:20 a=uTRCLKPYAAAA:8 a=EUspDBNiAAAA:8 a=EVmsHFvQfC4jtDmeNssA:9 a=yHXA93iunegOHmWoMUFd:22 a=T-agBWn15iSmxapsA1lH:22 a=bA3UWDv6hWIuX7UZL3qL: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-04_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 priorityscore=1501 spamscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040095 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1780566882914154100 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 3f0f931335..c4a5a7f1cb 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -3315,6 +3315,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_SV48, + ), + #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 Sun Jun 7 22:19: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=1780566884; cv=none; d=zohomail.com; s=zohoarc; b=WO0Gx/UEBzyMHA4iEXhN3+3e4aLBDxjdoczhMG66IHYdfwDXfUKoS61BWyB5RXlbPiU59acpSnIcrDPOAJNct0KWQIWl1syLrfvYQCRCI02GWDwWcWLMid5CHQSmmkU9KkS1As8zuMpu2xDldOjzC43nlmcz8gz0GIHbcgqs73A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780566884; 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=MbyhWsuFppP0dTITqXrfzh25aOYBj7MtxBuRjjwpLpk=; b=Qzq86ji/xAp+J/whpTuu/48+7L1tEF6ce7zRJ75G47YaJTC9QaXvZ/gwLmuGtSk3Jl2yvawmQsoDOYnL6wljSbIXgI+keiWsyB4M/ww0GvaXcWayHwoGlb6HXDSGvkt35g4BHxIo/LLbiI6KsuRfU/tB8s4eyNs3uUwia6xTdFE= 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 17805668847130.1552836955671637; Thu, 4 Jun 2026 02:54:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV4lO-0005W4-4m; Thu, 04 Jun 2026 05:53:22 -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 1wV4lN-0005Vl-0Z for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:21 -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 1wV4lE-0003jq-RS for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:20 -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 6545Pf4X994532 for ; Thu, 4 Jun 2026 09:53:11 GMT Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ek374rxfa-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 09:53:11 +0000 (GMT) Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-7e90f879daaso6772367b3.3 for ; Thu, 04 Jun 2026 02:53:11 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([177.170.117.62]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d64ba680sm3522830d50.21.2026.06.04.02.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 02:53:08 -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=MbyhWsuFppP 0dTITqXrfzh25aOYBj7MtxBuRjjwpLpk=; b=JeHYAyv2ad6xqXZ3q5cd5yDegpp 4vr8nyK8uJhzbp0zJqOIhvMgmqUEcPv9qbUs/jSgLQ2+CO5nbPlM0DOr7SRFAiWR WxAl78yW5Vkxo/3I6abm8IBA3Hkhw71VDRbCrLd/QyH+443beRUoAtHn9JiBJAxa fQe3+3FzUSQIkREnWYLEQ/bERMlG96nmNK0pYTzrxuadJtrBJ9gKhuSz6cagkRUz NzucCRtDTClMpaAgGKCy6YLFYV7rJYpEKtoGvT1kwlnB29sY/Ve12XEwwEOxpj1S ThIUP4e52/QDdRKUT6AcmqGp7/RGVFS7LPFQigyd5s6DGuvRYvGfVL5dm3A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780566790; x=1781171590; 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=MbyhWsuFppP0dTITqXrfzh25aOYBj7MtxBuRjjwpLpk=; b=HGTCWHE5MQ7igHdTSlhNgRFz13/OUL1d7OuD+krA8PsP5ntVbBCCA7mDjMrXJxck17 JNCZ2fjl152PxRygNTEpvcTZsBP0Ng7F0tGaiqp/k7SZ0xoI4rWuF77X9y29fSJ4N8bh gfo9HlTjzzQtQq1HUI3Dn9fzeAJdM+FFxPSdhAG11qkcaFJQ86nwYnUK5Gog/9hOEFOG mo9sGm3CpCWK1koKcmdc4/AasqIUAbxZWv7atzCeQlwmGLcum+fv45STaZgor15PyMtJ qLZHIBwWNjshgn9DlHEzvj4YbukwdI5B27welwzfgC5R6SsnYB9cez7VwnsUHFJu/N+7 dU4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780566790; x=1781171590; 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=MbyhWsuFppP0dTITqXrfzh25aOYBj7MtxBuRjjwpLpk=; b=VcYLImlI+8kpX81rEesmPn/UOh72TXG9JBwr+S2aAjyuCozIIageQUImpp3SNeq2Er 0BA1QKilhbONxAhp9o/YqePMQYcSIDfijOMeEsoFkzAZqtTx9fB1mEXCPpY2TXMKMWYh SAV+4drtEhKgvTLsL0h9T9c6u3gwDQkONjCE8WYe+IUt8oWWVkoyt4parieRLlHxdMJy GPXoSNE2xSL1Bh1pYMIxsI0g8ch3uLQq3TGc3J8AHLN0u2WW4/HkQv5hK438IpUfZQ6P zQWU8c1zeoDtSopFVyouWuiT56uRzRm45it9pmheJ+f9tIt1D1nf7Xlnp7Zk9t+UPPhy yQDg== X-Gm-Message-State: AOJu0YwurlD37AtPUb5yrwRqjSyOJiqarniTf0bw1R/dTxh4LmC4COYw KlM2dXVFJNryDeG4yIu+1PMhVVrazdkP+WDK0D7BRWtoYnwrEbI7bj8N99asMKd6tvEh7/O6CNu ZOdGKbx5ddfDLVro/51darPlzU7swpaspRdHXDX8pgLJ0X2lv+QJzmwsHKQ38imkyNA== X-Gm-Gg: Acq92OHY5Jbx75WJrZRWEsFkcumt8Fxlsn8VW/96g/A0+83Fip9NjEkX90Njd+9CyI3 VccVGWjWhmSKCdzDKCnojUl6Dr+OLGGupj6Ti4jWI3uNgu9mCjKR5by477RoOf0f7LyPid/gvCf i1OT/BYbivT10bMmhg2C8MwZVO7zDf5J1YarS0jU13XaNQXSUjlCH1pjeoWmgGvuSla59AOakUu xUTrvSSrWilXJeUsPDFVQUC82DM1uwvg6GIR36rw8QX7TRN1NlQtZm7N2xhfTWK0U8yGZZ3TPp2 9/WSnV75GSqCpPexcOw1Rixd3/Tcd1/RTuu34QrdPeKeBJQzZ14LIf9VG/ndylB4aIiS2+XsFBn x/U7rKmDX6sgcP/8RFHQPNv3dRh+9Kxmil9M3pj/3NerZipC3GE4e2/DwvLd516mIBG2pAg== X-Received: by 2002:a05:690e:169a:b0:651:c268:479 with SMTP id 956f58d0204a3-660dc5e7695mr6191359d50.57.1780566789577; Thu, 04 Jun 2026 02:53:09 -0700 (PDT) X-Received: by 2002:a05:690e:169a:b0:651:c268:479 with SMTP id 956f58d0204a3-660dc5e7695mr6191274d50.57.1780566788582; Thu, 04 Jun 2026 02:53:08 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, andrew.jones@oss.qualcomm.com, leif.lindholm@oss.qualcomm.com, Fei Wu , Daniel Henrique Barboza , Paolo Bonzini , Palmer Dabbelt Subject: [PATCH v7 3/5] hw/riscv: server platform reference machine Date: Thu, 4 Jun 2026 06:52:42 -0300 Message-ID: <20260604095244.3313259-4-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> References: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDA5NSBTYWx0ZWRfX7zmDBkoZygjt R8ZNouC/orF5TK8YC3C6aOsm79Ej0j3563Z+nrolkIYD9dsRh/XWaXzcFRRycU2Xlxl+cKKHdiv e1YzrxQW+sxoUH518VH1Wk16ThYIoIxVieajUbxZD8pvLrQ+9dm7wh04Jcy1PJ90ntFbC9zUPFE LV6cYWHa3EdPM2wZDjKw2ZvWp1o4wy4eeFKDP9RCyKdrHiVbyBQv1ATgEPaavC6XYHwnyCiyuBC k4Zcv8Po8WOy8A6cCdktEzV+lFjOVMIHUiUi+I0MIH2AUVeOTrrShvc4+eEnTD8GVb8Vb7IAobs a/jqu4wLnp+kLw/bb+AcWXNd1vBrSdu+OlF2Favuy/LpbwfrEEjyqMIvMb9Mas44BUYUzJazJrf CLvTc26WTsYQG4OWBMjHeLT29EQ9aIjTSgwylC07cP10FLsFG6tu1gL/teca0eaYV6g5wWxqehA lPgPJT07qQUELzc2k0g== X-Proofpoint-GUID: F1604pY3k3j0cTXzqhlpTiiTLnSiNeO7 X-Proofpoint-ORIG-GUID: F1604pY3k3j0cTXzqhlpTiiTLnSiNeO7 X-Authority-Analysis: v=2.4 cv=eJsjSnp1 c=1 sm=1 tr=0 ts=6a214b07 cx=c_pps a=NMvoxGxYzVyQPkMeJjVPKg==:117 a=gdiugJE53z4H+vvYeRBHqw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=NEAV23lmAAAA:8 a=uTRCLKPYAAAA:8 a=EUspDBNiAAAA:8 a=uK5kh-ozGs8iDS-x-6cA:9 a=DRYXvJFRnqj4ETZq:21 a=kLokIza1BN8a-hAJ3hfR:22 a=T-agBWn15iSmxapsA1lH: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-04_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040095 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: 1780566886687158500 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 | 1373 +++++++++++++++++++ 4 files changed, 1390 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 2518b04175..1807c423ff 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..02022998fa --- /dev/null +++ b/hw/riscv/server_platform_ref.c @@ -0,0 +1,1373 @@ +/* + * 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/machines-qom.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), + .interfaces =3D riscv64_machine_interfaces, +}; + +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 Sun Jun 7 22:19: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=1780566865; cv=none; d=zohomail.com; s=zohoarc; b=i9D2leTJK3JGT33E5reQ2ZQsTmSrbgXB4yJvv+w1qF5vC4ZEczzDBA335MNsucVFYZUs1MGmVnbWiabPWjU5rfpgApYhakN0AcUk2QTF35aPmi45iATQOCmQkaxdiFd7CVWN5e7u06J8D85mnbrnX9VX0Okl3mLsZbVKbd9z2aM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780566865; 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=TVgVH1HOpFAj5Ji00+B2fTa3jTQUDt0mbrCqmduThng=; b=XBN56mrGKh9WcF4pXhJ9LJL/hiAuroch5yHYXuhUxrqvAW/3K97AmDXdQKRrBTBuvoxDONTFoKyDR1Q5KZVZbB+qLwh+UUcokg63R6XX0IgosJfbOP0NHN88VRQvR2GROfl9CltjbGt3sq6TVhYbSMtJ7+lY+340gWpLHzRkNwk= 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 1780566865958515.5785951253528; Thu, 4 Jun 2026 02:54:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV4lV-0005YR-Hq; Thu, 04 Jun 2026 05:53:29 -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 1wV4lP-0005WG-BC for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:23 -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 1wV4lM-0003lN-Pf for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:23 -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 65491ekG2261313 for ; Thu, 4 Jun 2026 09:53:14 GMT Received: from mail-yx1-f72.google.com (mail-yx1-f72.google.com [74.125.224.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ejr2mkfpf-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 09:53:14 +0000 (GMT) Received: by mail-yx1-f72.google.com with SMTP id 956f58d0204a3-660575c74f1so827320d50.3 for ; Thu, 04 Jun 2026 02:53:14 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([177.170.117.62]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d64ba680sm3522830d50.21.2026.06.04.02.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 02:53: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=TVgVH1HOpFA j5Ji00+B2fTa3jTQUDt0mbrCqmduThng=; b=cQxitIWWkiHt3NveBSbgrUBroEk XV4M2RGjiI1q8EECA+E8gIDuljMqb4dScJ8NHF+DqYciqEQGGVgtbnXgiIU/7gr4 ay3rpETWb2ySDKWPho+rqVxsn7jlfeHKx6Byg3pEmE4asalS1fP1OgpeIuxQIPpH N4iUGw/8Ohpa+Q2T6TlgqeA9ZU3oFrgll/vmGeC0zZccIdxP6tZAiUjRU3A7l1Nj gHZOUL+u5jLIXsxR9siyTRp8BdLWYc/FDoxoFNHh/Obh2VMCdiUlBnUPEaQ7kVJV DCA068VEs6fq58Jssyoiwny4MgCauVcC0RxfQzUT6JhqYwl7RShik5c1qhQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780566793; x=1781171593; 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=TVgVH1HOpFAj5Ji00+B2fTa3jTQUDt0mbrCqmduThng=; b=SrHe1T3G7Wn+MriM7QDoyXC+uUcansl5mvWVkU72LVKnljYC88+/Waa8IMCNDzSvF+ QII6YpSOyawFHOXjsgq9YWyyFvi2Ip0GjrIaLUI9VQQ0Oo8fhHZNN6AVYBOnhmpwG+9b Vwzl5NkF4xE9stjc5bY/E2Vdef2bgDSuCgoZVjifSuEya+o2G/c3rVGFPDu7PPXNpZFB 7caVE4LAWpCQ8orZCzYwCbgWIJnaTnN1VuSkDiAHc5NspTHqieniKHQxxOo4LsE9fc2k l17imBd/VPbh0dsquLxztxFrP7CaFrDdTQ4PcEASvYPZ/EuJwyJ5R23T6XfgRxd5Kj2o knwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780566793; x=1781171593; 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=TVgVH1HOpFAj5Ji00+B2fTa3jTQUDt0mbrCqmduThng=; b=Q7+Y/9ydaJtpCPee12GzlZK1YxXaV2p5co3wA4tv+c4eLpre2g+s4LQyVfhIpsRR8V ElSUrB5tKprWIiSBaV7VUkK6dyXjkCXsa1DsU42thZH5aaKB7EFMkpwSQJLHCx+rettb c3nw1YsOpTB0zlH3PNwZvdyTu3GEUAimkqR+88KxJNV6KiR7JmukHOEcbKDYlm156Evd rPAm126d+KrxOXwXJnO2+4yOCKMbF9x92j53mLYIeeV4E8U5q1/MUtlOdEnHgNgzbxmo 6eII7p+wSSVH1D1PFqOLnpkHeUswpUZwD+ugViGVD9Z7Tv2N28Ktl0fnsuR5aVnzBPRT 6HNw== X-Gm-Message-State: AOJu0Yytmu2UpmPKv2n+G5qA83UkfQzxCxVDoJGeAXWAbQCxY/G9JpOu qHl/zBCTmAxo+ueCimluzod1M9jBS8p3mJ7K6KEPFNbiJB/EJtLKrJsX730QxHcP/DMXyMVquaZ n+ZfRME7QBPBh0NCLGRyWm7KMM+sq9uAUUUPQoGIzzanuwzrkDendxIhmSAJ7kxMpVA== X-Gm-Gg: Acq92OHfYPPWOG1rivu1rce5LRpf7X6lHOzctdxlZWET38OBWw/KRO5/WIN3cFljlHA 5bPEuC3SdxRLvLh49rkKJmhh8zszyN48U8pRTi3uzo3xHy9Mp4TDIYHrNI+pgpc3mmdtjUVqv2S 9QTVkPgsWG6rIXGoBPKN73/y7d/25ijw9ZCrLUeWZMrt37qJNEC3ECyPIjPvKxiGWZE37QuozXX U57p31J2Yi4EkK7roS0qkNTqhSZDJJuceLsNK6D8O3U6JaAl5ukUQA6+36fG5+8j6Fhjp5IOdMB cr7NNWOlGW7e5JBbZUpnfCDg6M0jUUFgCUGpV2SoC/eWFSunzCtN9qHcvqqRVVxkpw34fp0dwpW bQIWatrZ1JQN1ryQOAYIFLuEdgS7VRs9RutnvgZNwS2yx0A5da7uwdYTCvLbZ0qlS/u15TA== X-Received: by 2002:a05:690e:4847:b0:651:b7e2:6835 with SMTP id 956f58d0204a3-660dc50cddfmr4833663d50.35.1780566793197; Thu, 04 Jun 2026 02:53:13 -0700 (PDT) X-Received: by 2002:a05:690e:4847:b0:651:b7e2:6835 with SMTP id 956f58d0204a3-660dc50cddfmr4833638d50.35.1780566792788; Thu, 04 Jun 2026 02:53: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, andrew.jones@oss.qualcomm.com, leif.lindholm@oss.qualcomm.com, Daniel Henrique Barboza , Palmer Dabbelt Subject: [PATCH v7 4/5] tests/functional/riscv64: add riscv-server-ref tests Date: Thu, 4 Jun 2026 06:52:43 -0300 Message-ID: <20260604095244.3313259-5-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> References: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: F9QnGmn9ZtuStdokBkUGaR6H6p3BBroe X-Proofpoint-ORIG-GUID: F9QnGmn9ZtuStdokBkUGaR6H6p3BBroe X-Authority-Analysis: v=2.4 cv=A91c+aWG c=1 sm=1 tr=0 ts=6a214b0a cx=c_pps a=VEzVgl358Dq0xwHDEbsOzA==:117 a=gdiugJE53z4H+vvYeRBHqw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=NEAV23lmAAAA:8 a=EUspDBNiAAAA:8 a=5c9j0NbqnjbX5077XfcA:9 a=uujmmnXaIg8lM0-o0HFK:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDA5NSBTYWx0ZWRfXxMIIKI76Fseq 56eKSEKpGOA8HTzQYkyyFIbfmyzSiM5mC31AGLN/nHFVQ7xim6r/h8yQuuJW3yEiKfyjLembfjZ mtT5hS6zE3dTUEI+naI5HjVMCHtktuZgzEuC49koQH/CCGYUudG2tIY9tDZKC5W8fDZGdA3mkly +iwRAbMqL8lxfwr23qEigqi7BqWsWkNAbjTRHqujuPE7zqqLbV5r8KOJ84kN/l6R2xD4oZdlGVA jRhhZbZoMcjjkRyQLQIn4ewR3Cvjm/xuoroXxfQQjaW0UpM1y5E8B5ZEVLszlTlcv1AKGqkDOIo CkzlPpzPR2vhNchvWlwyUHAm3DWuIm9XjEHw3Zyn/R70X/Xl9GBlqWu20DQTBXM1OKkD2cVry5M NUQjiZ5k8vLIIAUKAAXaoaPIAFO1UVYkdhGejB5saqhdSnO0PVFCfHnWmkljNsUWu3+4fb1iM2o dAbqAgsFlWZ8YIpK5vg== 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-04_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040095 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1780566867553158500 Content-Type: text/plain; charset="utf-8" Add two tests for the recently added riscv-server-ref machine: - a new test_opensbi.py test. The idea is to have a quick test that can catch trivial regressions that would prevent OpenSBI to finish; - a new Linux boot "thorough" test that will boot the machine up to the buildroot prompt. Signed-off-by: Daniel Henrique Barboza --- tests/functional/riscv64/meson.build | 2 + tests/functional/riscv64/test_opensbi.py | 4 ++ tests/functional/riscv64/test_server_ref.py | 57 +++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100755 tests/functional/riscv64/test_server_ref.py diff --git a/tests/functional/riscv64/meson.build b/tests/functional/riscv6= 4/meson.build index 5871211e89..2eb12586bf 100644 --- a/tests/functional/riscv64/meson.build +++ b/tests/functional/riscv64/meson.build @@ -2,6 +2,7 @@ =20 test_riscv64_timeouts =3D { 'boston' : 120, + 'server_ref' : 120, 'tuxrun' : 120, } =20 @@ -13,6 +14,7 @@ tests_riscv64_system_quick =3D [ tests_riscv64_system_thorough =3D [ 'endianness', 'boston', + 'server_ref', 'sifive_u', 'tuxrun', ] diff --git a/tests/functional/riscv64/test_opensbi.py b/tests/functional/ri= scv64/test_opensbi.py index d077e40f42..057f55f90b 100755 --- a/tests/functional/riscv64/test_opensbi.py +++ b/tests/functional/riscv64/test_opensbi.py @@ -32,5 +32,9 @@ def test_riscv_virt(self): self.set_machine('virt') self.boot_opensbi() =20 + def test_riscv_server_ref(self): + self.set_machine('riscv-server-ref') + self.boot_opensbi() + if __name__ =3D=3D '__main__': QemuSystemTest.main() diff --git a/tests/functional/riscv64/test_server_ref.py b/tests/functional= /riscv64/test_server_ref.py new file mode 100755 index 0000000000..99e301a852 --- /dev/null +++ b/tests/functional/riscv64/test_server_ref.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +# +# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +""" +riscv-server-ref board test +""" + +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern + +class RiscvServerRefTest(QemuSystemTest): + """ + Test the riscv-server-ref board + """ + + ASSET_KERNEL =3D Asset( + ('https://github.com/danielhb/qemu-machine-boot/raw/refs/heads/' + 'master/riscv/images/virt64/buildroot/Image'), + '6bacc876c769c1bb6057d2bf549eba67fbe83916e8223f9fe21c8e8fff665a36') + + ASSET_ROOTFS =3D Asset( + ('https://github.com/danielhb/qemu-machine-boot/raw/refs/heads/' + 'master/riscv/images/virt64/buildroot/rootfs.ext2'), + 'f00bb88749f945d80675540a1338bd1ccb226574685a5b6c65ab44027d0411a8') + + def test_boot_linux_test(self): + self.set_machine('riscv-server-ref') + kernel_path =3D self.ASSET_KERNEL.fetch() + rootfs_path =3D self.ASSET_ROOTFS.fetch() + + self.vm.add_args('-kernel', kernel_path) + self.vm.add_args('-append', 'rw rootwait root=3D/dev/vda') + self.vm.add_args( + '-drive', f'file=3D{rootfs_path},format=3Draw,snapshot=3Don,if= =3Dvirtio') + + self.vm.set_console() + self.vm.launch() + + # Wait for OpenSBI + wait_for_console_pattern(self, 'OpenSBI') + + # Wait for Linux kernel boot + wait_for_console_pattern(self, 'Linux version') + wait_for_console_pattern(self, 'Machine model: qemu,riscv-server-r= ef') + + # Test e1000e network card functionality + wait_for_console_pattern(self, 'e1000e') + wait_for_console_pattern(self, 'Network Connection') + + # Wait for boot to complete - system reaches login prompt + wait_for_console_pattern(self, 'Run /sbin/init as init process') + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.43.0 From nobody Sun Jun 7 22:19: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=1780566886; cv=none; d=zohomail.com; s=zohoarc; b=lJh7vHZt9YecTRRVLaxKv4VAaa0qhLj3IhL1Q2TZ5gnQi8qOSQN5oqsfTdOlJauAy1mi0uaPurzb5CIQJGgbrwOkJLwZ3qfIZvFsu+awX7sFFWuqK3m+PP3qw/KdoZAVocJSnhFnHHX0WiDu15TP2RuDytfAMTahMTy8UpOeTGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780566886; 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=kdUL16Bl9EsrcnZahIysFeQV2Fl79lBtFPC2hJwXPYY=; b=QMQ5jHjwdXO/nWrFhpu9TN5b0o4Cd4SOZ9VaX6MBQcuAresEjwy0ki7wzHkwiXncEMeYTu+tIhHWaP2etcFh7MS8GMWonNARSpZm3CA/vULRn0maGkfuzjmFF2go5VpDDYkH7a7n67UQp9rlCcskq7N4/E7NAge+azm92IvLm6s= 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 1780566886661249.1596303781281; Thu, 4 Jun 2026 02:54:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV4lV-0005YS-Ux; Thu, 04 Jun 2026 05:53:29 -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 1wV4lP-0005WF-4S for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:23 -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 1wV4lM-0003lV-OV for qemu-devel@nongnu.org; Thu, 04 Jun 2026 05:53:22 -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 6546c7U43241141 for ; Thu, 4 Jun 2026 09:53:18 GMT Received: from mail-yx1-f72.google.com (mail-yx1-f72.google.com [74.125.224.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ejvd0a9u9-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 04 Jun 2026 09:53:17 +0000 (GMT) Received: by mail-yx1-f72.google.com with SMTP id 956f58d0204a3-660d7828a5bso914267d50.1 for ; Thu, 04 Jun 2026 02:53:17 -0700 (PDT) Received: from QCOM-UWl2o8bcGT.qualcomm.com ([177.170.117.62]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-660d64ba680sm3522830d50.21.2026.06.04.02.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 02:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=kdUL16Bl9Es rcnZahIysFeQV2Fl79lBtFPC2hJwXPYY=; b=GqT2+SEu8949aFQCgzzahdn/WsB ehWGYGk3Tq6Usvhgb4WERRjEF2Aoe3s8GVNKPPtjnkzf516AxTYC67unPar8Ujmr 9Zm14Igj3iERXnr8vcZU5f2Oz3z69uDY3bcIhqBWLRyWd5lG7DJf5KbnQcDaG/oC VKpPFxkxQAyMIXD9NDoscspCmguQHjZCr/hqlIC1ISUYDnLIxmE9qVkC0FLOYYP5 bRAOu7cQ4hPpuH6pvO+LBApUPAhhqEfGnWFC7U0DwK/ADlvyU1HGu1Kua8+omkFi hRzmMG7IuExWBYKTAbl+z5sitsca0Ae06dzr0QCGEjkwUAICa5WB9E2WEuw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780566797; x=1781171597; 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=kdUL16Bl9EsrcnZahIysFeQV2Fl79lBtFPC2hJwXPYY=; b=jIXTzwwyzSpjkSwak2f4Wfjn6aKBh+8/b/mqjPwWjUT3U+/kEGiginjwnFyQJvWufB MQoSE2/buu6hAO9YWyS/n5ZVnOQ7DjghZfkz6HFphf9m96oxmVd8G6mIBj1OD4EwI4Hu qgHqU2yJ51vGP8Fc6LhYq3v7WBIH9+DHMDs/xhSraWIjAlJfMk1mxos7K48ncsOotNai XnTOEdYpitgDbTM2Sy8M9kiP/JXXJnxkCIIDeB6zAyArXJ6p7zahN2bS9fyKI9t4G+Hu bySEfeh3fWH13vaH0Yiy5Qhdb+1xL1h3gI35q7pGoc12nhLPDQnvCdhUj1p3ZohAgf4r 77QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780566797; x=1781171597; 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=kdUL16Bl9EsrcnZahIysFeQV2Fl79lBtFPC2hJwXPYY=; b=ocSZr6nCiBE2v+yLaHkqERaAb8LeNoZ1E6ISeyyMP/6w6wTYVF7Tc3Q29CYYigB9vq myT5s5lL0FXN6zgK4T9sD3ezJkuH+xH26HmWZ20x1qZ4BKRQKATYC70bRjH+SMzS8tvE Ep6uvYew/LmKOWzjRXZZXLvkWQaM0okrqYXifRMiZp8uUyrnT5qcpQ7cg4cyj26Ju6K7 DDKdz0zQQh0MLZLbH8dxtHZX34jpbwwVIA2XlgShjSDZvmEGTru0i0f81pagQZ/3eLe+ 74PGNhsXY42rS0s6Keeu/q9ckS/cEHpZ6Rh1tKgySWNa6PNfvEkJA6fA3/6j4HEM3mDz eExg== X-Gm-Message-State: AOJu0YwSu2DjfJOBxCwF73izcIUkhS1y9wvbDjlzG05oS8xlUw7C0m7J CKsQ1VsvuavAPnleh6vBcRBY+lPCgj1pGXZbcK/R3puw0ugda3fg1H6rYMNJwCH4Sqv81ZrF99d ApGmaZBBJEAX3wH9HmX2o24MWpnvYdWFCSg7FmJxhoaMFS8e4sPPcD05OQVQbFDZQgA== X-Gm-Gg: Acq92OHWwWFlD7va8vJhG/KsUAEIvpDzwE/RSpshhG+sh6dMQegmXWVSARlk37FBoUj NuCXNLrDuIh42/E3qFBtuatPhUY0bGC3N6lWtakcgEnhvLOvon8GWHwHxTVvZquFJvdYKQhDVw1 iloQoBCt99qkGrNKPfdVq/Ey9lFJKrCi3WX4fMM2DPBMY7oeP9i8uKu/EkTmyibdj5GZZropV7t bfXk/ET03hEf8y3Ub+am6ZK6xaSJF7TRZo6zgG6kIZHPkPB2nDX46NKWw1IhjwtunZUIkYY67Ft D6MjwJBpGkRm02+LYI6lNJy8/fQXW0IwLDFQU8siAiFEw6L+ANWl5faa2We5Jspjw0m9n9NtPxu GaybKPj/Jq9AubBZ2sdQf5my5uFRaalJt8Zk7SfpoD66E6mH36lo2FMjzyhh+tFg8NU+j+Q== X-Received: by 2002:a05:690e:1286:b0:660:7bcb:7aae with SMTP id 956f58d0204a3-660f125eaf7mr2342241d50.44.1780566797298; Thu, 04 Jun 2026 02:53:17 -0700 (PDT) X-Received: by 2002:a05:690e:1286:b0:660:7bcb:7aae with SMTP id 956f58d0204a3-660f125eaf7mr2342223d50.44.1780566796885; Thu, 04 Jun 2026 02:53:16 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, andrew.jones@oss.qualcomm.com, leif.lindholm@oss.qualcomm.com, Daniel Henrique Barboza , Pierrick Bouvier , Palmer Dabbelt Subject: [PATCH v7 5/5] docs: add riscv-server-ref.rst Date: Thu, 4 Jun 2026 06:52:44 -0300 Message-ID: <20260604095244.3313259-6-daniel.barboza@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> References: <20260604095244.3313259-1-daniel.barboza@oss.qualcomm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: ey3NvM2M5mVWlYypAXUNN3IrzgxoAMww X-Authority-Analysis: v=2.4 cv=M8h97Sws c=1 sm=1 tr=0 ts=6a214b0d cx=c_pps a=VEzVgl358Dq0xwHDEbsOzA==:117 a=gdiugJE53z4H+vvYeRBHqw==:17 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=NEAV23lmAAAA:8 a=EUspDBNiAAAA:8 a=6mToRrmzC69ltaW8jJwA:9 a=uujmmnXaIg8lM0-o0HFK:22 X-Proofpoint-ORIG-GUID: ey3NvM2M5mVWlYypAXUNN3IrzgxoAMww X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA0MDA5NSBTYWx0ZWRfX4cIEiiPnb04i yxko4eVTuZTwp+nM1rvUq012GN+OgJ08TbLJygCY9QQkN+0aJny4or+ry1eHkCR+mQG1O32Qg0A 7js/ZfQ/6BQPWtFo1rGwyK6M/F5RLd0ObA1oPk6kmndrGrIhecDvCpYrF+lj5+upJM5KxKLS77d p01opJDet71RJ5ZxFiB70K8XUJf4fKihQ8EelS+XHl8SloIFr4PWojYnR35OX+4VIen6PDkTcLH MoBU4kMryhdqaxg8395LmVBZx3IoXq1siYtrCHS12Rj29m9rOon/MgK+GgSGP7YKctLst8lv8j3 mV4GFoYpj4jjZG8T5S5ZKk++Wm8Rn71mESYmnJiBxn/LCQBrAhvva7iyRghV6aN14fJUJu6kply qVVhCZvVBtY/rAMlRaz1q/+uDj03lEQOZw1pnZTNIPW5VM5kAbERJZfxSa2exDt6Pt/QNSxJwTd 8VJ8qdZKFr8IxaxeyBg== 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-04_03,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 malwarescore=0 suspectscore=0 spamscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606040095 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1780566888620154100 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 | 52 ++++++++++++++++++++++++++ docs/system/target-riscv.rst | 1 + 2 files changed, 53 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..379b7ef76e --- /dev/null +++ b/docs/system/riscv/riscv-server-ref.rst @@ -0,0 +1,52 @@ +.. 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. + +`spec`_ is version 1.0 at the introduction of this board. New spec versio= ns +might trigger a revision of the emulation itself, which will strive to alw= ays +match the latest version available. In case the emulation changes aren't +backwards compatible we'll introduce a versioning scheme, probably via +a machine property, to allow older SW to run with older spec versions. + +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: + +Here's an usage example with a recent (June 2026) ``Image`` and ``rootfs.e= xt2`` +files from buildroot: + +.. code-block:: bash + + qemu-system-riscv64 -M riscv-server-ref \ + -kernel ./buildroot/Image -append "rw rootwait root=3D/dev/vda" \ + -drive file=3D./buildroot/rootfs.ext2,format=3Draw,id=3Dhd0,if=3Dvirt= io \ + -nographic + +The images QEMU is using for selftests of the riscv-server-ref machine can +be found below: + +https://github.com/danielhb/qemu-machine-boot/tree/master/riscv/images/vir= t64/buildroot + + +.. _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 afd86ca2ba..b2aeb39a8e 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