From nobody Sat Nov 15 05:17:05 2025 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1755876397; cv=pass; d=zohomail.com; s=zohoarc; b=V2JeX1olZaou+C/JdjcmRpGW72VGuAZ7lEK7tzjsGfQgW7uacYWH2mD+GhLDCOsGTSgjy5+EtzrDNCX+6xNMMU6c5b8aEbp9/ZVjsYEI1EmBzyjCuIBYxHH9XBHqzAQ3Vo8sncVaheLovWtrkuLwPMarz/Anux48ywLpYoJudHs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755876397; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RQoM5bl5cXTqQ0Vd9sbYZWZ3ak8n0+c/gHfcKSVZbzY=; b=Y+Eg4pNlPEdHjC42fpQckqkejhMqknydb1ELHDHam7lNbL5+7HGxAY6wqJ1DBGCaPrBc6U1zTbS2CiwY4iIz5460ogbJLad61ceyaaNTnlsW3gF5VnL3nnGvnfkI+TmuwIApV3bHVOlU8REbPz54N7G9NYnKJ5Ec6d18kiVdGVs= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1755876397057159.31295585266787; Fri, 22 Aug 2025 08:26:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upTW6-0007tB-Q4; Fri, 22 Aug 2025 11:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upTW5-0007rl-0o; Fri, 22 Aug 2025 11:17:21 -0400 Received: from mail-bn8nam12on2062a.outbound.protection.outlook.com ([2a01:111:f403:2418::62a] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1upTVw-0007BK-9z; Fri, 22 Aug 2025 11:17:19 -0400 Received: from SJ0P220CA0029.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::13) by DS0PR12MB6534.namprd12.prod.outlook.com (2603:10b6:8:c1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.18; Fri, 22 Aug 2025 15:17:01 +0000 Received: from SJ1PEPF0000231A.namprd03.prod.outlook.com (2603:10b6:a03:41b:cafe::9) by SJ0P220CA0029.outlook.office365.com (2603:10b6:a03:41b::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.19 via Frontend Transport; Fri, 22 Aug 2025 15:17:01 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by SJ1PEPF0000231A.mail.protection.outlook.com (10.167.242.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Fri, 22 Aug 2025 15:17:01 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 22 Aug 2025 10:17:00 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 22 Aug 2025 10:17:00 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Fri, 22 Aug 2025 10:16:58 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m++MTCsALTelYhxYXhzoT4tBqJxhamKFUZ2ovg4zbqXfl2vp08h87ER6cwa98pA9aSD+V7y5r0i0Zg5Wt8L02I2nGKLmrZ5pm4ZmfW+mm5AgP4MsdQIgH040Idph9EZb90RAa66nTdwnj1fjRhbiderySRtYYbn2pmzwFapLXSinosGbjFxJdwcJPdwx+ff5ZRzdxAZpusmChF4zKb5VvaYWeEeKBcsxgXEpUXla4r/GqDzx+v0EiU+KiJS4bQMpwTN8ahPBrPpIFV/Jaz5TfDt66fz+Bvvdy7zd7CNQgQLCsLfGNBaGIA1aaRBRZXPefPp7FrXLxGTE5F/zwEtqcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RQoM5bl5cXTqQ0Vd9sbYZWZ3ak8n0+c/gHfcKSVZbzY=; b=wPvfIlsutJukXLAWQd5WlNPZrmNVSRW8C7gZcoRWIztvK9nnFmNGhmma0wszUWIkWt5V1nNrwffLG+xXQ9MO/r3aqb1ag4/zasxuNO1yQ15C4Clz73us4sc1WSyleob4L15K82fKAXsQDmoElVMRfyCGmkIW6Rs98fSVOBuXphMnGdQMgZhD6hsRe6RJWM2VfRZDGtGBa/FFaA331/6SUU+51+ZfAdAtiez+kRPkjtIAzDUht1NaIcya12g190KaVUgo/tUqpge9zwHrkpjbeGYPzbA6M6cOKh19LKd9249ILwhc8Z7z4hGW+XOEVpKmQYVC92t5fnHUM+cPoUUFpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RQoM5bl5cXTqQ0Vd9sbYZWZ3ak8n0+c/gHfcKSVZbzY=; b=VuW/uZl5B1su8sQ7qrERLpcNGHicrlgF8Gm4fBGHnTy2Puc1EVgmBglnrFhpvTpWiXX4M7WWc8bU0RnEXFxU7GtH6QZ4NJmfJh+SbL93stDPAkgocnuShP2hv6IlIbgs5iSVOL/otrOOEyrCxTHiCzuz3VyoBEKv9oKnbsQP4Vs= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Frederic Konrad" , Sai Pavan Boddu Subject: [PATCH v4 18/47] hw/arm/xlnx-versal: crl: refactor creation Date: Fri, 22 Aug 2025 17:15:43 +0200 Message-ID: <20250822151614.187856-19-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250822151614.187856-1-luc.michel@amd.com> References: <20250822151614.187856-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB05.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF0000231A:EE_|DS0PR12MB6534:EE_ X-MS-Office365-Filtering-Correlation-Id: 3394c735-9459-4e7e-ac17-08dde18ef1f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?eMTREfdKlaO8cMdIi2SqBsozPFgWmT+lwGtpGIJXbVnOvV4oTGCDaEkW80dZ?= =?us-ascii?Q?BQSu0SHFqK3yanwgImVLDJprgbiafDlAgAKQxAzNfD/c140HOxruQeYk7BBE?= =?us-ascii?Q?7Jxb5ApaXJ4jBiK24p8DCt4yker6YwzJddRaBoYgZsmZbqO4KDWX6Xp7/7q1?= =?us-ascii?Q?KOMnhEPK4CPOmlYfiP8vgyuJFY+fr7U20WXpf2huoQGA/CI4RTFbgMwmId5D?= =?us-ascii?Q?t5mMiZnjOCDSQ9fqf8d9EbvaTakxHgBnOwPoHE+cfRL7ilrWiHtBrlLpepnW?= =?us-ascii?Q?++Aogkg2quHHurQ8SIEhqH1pVSkCoifLqVhB/AKbdb8It1sQwsHdHefoo1tq?= =?us-ascii?Q?5DEm2cnl1Z4J1H7sM+068lWnJ+UyD6WXkI7MZ9IhsJ09biJ+6+feIDnEU+uR?= =?us-ascii?Q?byjeuWhLl2wuzEIr91y0/ghJHHjmSqDyBqchOLf2YkExa4eqM8dZWdTCA5jd?= =?us-ascii?Q?Zr+twoBB0coa7n2wNATp7zvnjkhI+8P4pcZVOBT1F1TQHme7OB/2uyujFvZv?= =?us-ascii?Q?U7JGQ2dURr80q2e2JW5HhZLzHauS5cGHgMiIhd8FE60Fi/w/t+OBXT7gsnQS?= =?us-ascii?Q?Iv73PI92t/1V95JHkEk/VHTHnrqY0pK4WKZmnCKAI9ERjey57vRZUuE+HCdl?= =?us-ascii?Q?yfc+6i8Kj7Z2kA0LbVLcZy13cXFsMr2e/cydMWRkyAkGWbb6SLxOiORw1fuk?= =?us-ascii?Q?oXVNR91GceENSEwRXVOuZI7cg0ARuv5vG/fXYTWeqrGnBuehZg/bWRBNialR?= =?us-ascii?Q?fxRJAqM53sefKbj+d/UGhSEQIUO1W1MAgF5jL+1ro9PyJ2wEgCSZDMMcQGP9?= =?us-ascii?Q?W2TcdFGhW7vqRWXKMdvr/68ppDQr3hYb/kbIMDR5Zmi59KVMWZDNlvYAoN6z?= =?us-ascii?Q?Ez7Iph5ZP410lCBa55WeAtckJj2+SP+XZMrOWJW7AW6cvxzzKrCuXgujLaoG?= =?us-ascii?Q?AZpFpfos7k54SLS6S3If49alZPMThWJjgETx+LW4W2ywnHIqxaGIJa08J4oi?= =?us-ascii?Q?PIqM4lxthYWrFfHWpkttskh+49v6LOGgzcfBs5Ki+75iXNITl6+8L6G3h2RI?= =?us-ascii?Q?Nb24A38X2sguQxpQrotPxDG1nev3wRMzXn2u/NnMlzBcUpHDzJcG9AKM/f7B?= =?us-ascii?Q?LMVL4ckBZbA/809CDYdbYUWtr23C6IDflImByl8TzZxvi7Z0QmDpnh+DR/5f?= =?us-ascii?Q?foFF7TJID9i3Htlx5f89sx0HheJavYMab+7p4NTErcZQtYza3N3jCvc8usfK?= =?us-ascii?Q?vYWzFDyKZ7j0N+UKI9wniRIort1mf7Am6nx2GrtRkmHW3ZUTiRvlDu17lzDe?= =?us-ascii?Q?lKJ4TV5Qy9ItU8mptxa5dvHao3SIy4Bp6Fo9v+x2dI2LOCRgFaZddLOGsbdk?= =?us-ascii?Q?Svxb5qJC+TcSDGvioB8vTGpJOEJZ6ZAkLe6NwNZY/AI10aaUXmnGkktzJ4Ld?= =?us-ascii?Q?4FQrmv0rXua+OI34TuTdzOugRCIY+bYOi/qd2AhrORGgKZyDEVeJ1kfGNwYn?= =?us-ascii?Q?tMQFjmRaNCCIL8fUHGwBson/sr5H6xsV1j5q?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2025 15:17:01.5875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3394c735-9459-4e7e-ac17-08dde18ef1f1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF0000231A.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6534 Received-SPF: permerror client-ip=2a01:111:f403:2418::62a; envelope-from=Luc.Michel@amd.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-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: 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 @amd.com) X-ZM-MESSAGEID: 1755876398505124101 Content-Type: text/plain; charset="utf-8" Refactor the CRL device creation using the VersalMap structure. The connections to the RPU CPUs are temporarily removed and will be reintroduced with next refactoring commits. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 3 --- hw/arm/xlnx-versal.c | 36 +++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 5a685aea6d4..d3ce13e69de 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -15,11 +15,10 @@ =20 #include "hw/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/intc/arm_gicv3.h" #include "qom/object.h" -#include "hw/misc/xlnx-versal-crl.h" #include "net/can_emu.h" #include "target/arm/cpu.h" #include "hw/arm/xlnx-versal-version.h" =20 #define TYPE_XLNX_VERSAL_BASE "xlnx-versal-base" @@ -69,12 +68,10 @@ struct Versal { MemoryRegion mr_ps_alias; =20 CPUClusterState cluster; ARMCPU cpu[XLNX_VERSAL_NR_RCPUS]; } rpu; - - XlnxVersalCRL crl; } lpd; =20 struct { uint32_t clk_25mhz; uint32_t clk_125mhz; diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index bee0b2bb39d..1ef12de4c8f 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -40,10 +40,11 @@ #include "hw/misc/xlnx-versal-trng.h" #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "hw/misc/xlnx-versal-cfu.h" #include "hw/misc/xlnx-versal-cframe-reg.h" #include "hw/or-irq.h" +#include "hw/misc/xlnx-versal-crl.h" =20 #define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72") #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") #define GEM_REVISION 0x40070106 =20 @@ -149,10 +150,12 @@ typedef struct VersalMap { size_t num_cframe; struct VersalCfuCframeCfg { uint32_t blktype_frames[7]; } cframe_cfg[15]; } cfu; + + VersalSimplePeriphMap crl; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, @@ -213,10 +216,12 @@ static const VersalMap VERSAL_MAP =3D { { { 38498, 3841, 15361, 13, 7, 3, 1 } }, { { 38498, 3841, 15361, 13, 7, 3, 1 } }, { { 38498, 3841, 15361, 13, 7, 3, 1 } }, }, }, + + .crl =3D { 0xff5e0000, 10 }, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -1113,31 +1118,28 @@ static void versal_create_cfu(Versal *s, const stru= ct VersalCfuMap *map) sysbus_realize_and_unref(sbd, &error_fatal); memory_region_add_subregion(&s->mr_ps, map->cfu_sfr, sysbus_mmio_get_region(sbd, 0)); } =20 -static void versal_create_crl(Versal *s, qemu_irq *pic) +static inline void versal_create_crl(Versal *s) { - SysBusDevice *sbd; - int i; + const VersalMap *map; + const char *crl_class; + DeviceState *dev; =20 - object_initialize_child(OBJECT(s), "crl", &s->lpd.crl, - TYPE_XLNX_VERSAL_CRL); - sbd =3D SYS_BUS_DEVICE(&s->lpd.crl); + map =3D versal_get_map(s); =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.rpu.cpu); i++) { - g_autofree gchar *name =3D g_strdup_printf("cpu_r5[%d]", i); + crl_class =3D TYPE_XLNX_VERSAL_CRL; + dev =3D qdev_new(crl_class); + object_property_add_child(OBJECT(s), "crl", OBJECT(dev)); =20 - object_property_set_link(OBJECT(&s->lpd.crl), - name, OBJECT(&s->lpd.rpu.cpu[i]), - &error_abort); - } + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_abort); =20 - sysbus_realize(sbd, &error_fatal); - memory_region_add_subregion(&s->mr_ps, MM_CRL, - sysbus_mmio_get_region(sbd, 0)); - sysbus_connect_irq(sbd, 0, pic[VERSAL_CRL_IRQ]); + memory_region_add_subregion(&s->mr_ps, map->crl.addr, + sysbus_mmio_get_region(SYS_BUS_DEVICE(dev)= , 0)); + + versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(dev), 0, map->crl.irq); } =20 /* This takes the board allocated linear DDR memory and creates aliases * for each split DDR range/aperture on the Versal address map. */ @@ -1340,12 +1342,12 @@ static void versal_realize(DeviceState *dev, Error = **errp) =20 versal_create_bbram(s, &map->bbram); versal_create_trng(s, &map->trng); versal_create_rtc(s, &map->rtc); versal_create_cfu(s, &map->cfu); + versal_create_crl(s); =20 - versal_create_crl(s, pic); versal_map_ddr(s); versal_unimp(s); =20 /* Create the On Chip Memory (OCM). */ memory_region_init_ram(&s->lpd.mr_ocm, OBJECT(s), "ocm", --=20 2.50.1