From nobody Sat Nov 15 05:14:22 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=1755678775; cv=pass; d=zohomail.com; s=zohoarc; b=GjDGV4HieXDYLlUOLM3M3veAQ3ojSQNzn8XbpK4ZKQpTJtx2h6dtFe8YvMCFkISu92hT58nzoIlzKZzI24XwRLb0YAup269wFa0ZTp3e3K2elsNGvwDJ01iZLURgw8q+8g/QHMOgvf0C9zAakIycuZ6qk06qyoz920eb6lo8iUI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755678775; 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=cYEwpNf143DK68PixfH48YkA5H+7NmB4eqvA+fjNNDE=; b=M3dbJsiZWHDTfTPfaBY5iznkRX9mBiRWSqdhyIZGqGgmoqi6Vor+FucZoRjamHdLIjy2FB4S4yXS8gUiPGu2mJnLLhSdaAALvotf4S8HEsyuAsbIcr76/pQRxoENY88UTGkaJ67/55p340zhrce9/uQXePucPaU+1XM2dLIAhGU= 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 1755678775835958.7049519529265; Wed, 20 Aug 2025 01:32:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uoe9V-0004Cg-8S; Wed, 20 Aug 2025 04:26:37 -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 1uoe9T-0004AF-7W; Wed, 20 Aug 2025 04:26:35 -0400 Received: from mail-dm6nam10on20630.outbound.protection.outlook.com ([2a01:111:f403:2413::630] helo=NAM10-DM6-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 1uoe9Q-0000sG-D7; Wed, 20 Aug 2025 04:26:34 -0400 Received: from BYAPR08CA0055.namprd08.prod.outlook.com (2603:10b6:a03:117::32) by MN0PR12MB6174.namprd12.prod.outlook.com (2603:10b6:208:3c5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.19; Wed, 20 Aug 2025 08:26:22 +0000 Received: from MWH0EPF000989E5.namprd02.prod.outlook.com (2603:10b6:a03:117:cafe::1a) by BYAPR08CA0055.outlook.office365.com (2603:10b6:a03:117::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.14 via Frontend Transport; Wed, 20 Aug 2025 08:26:21 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000989E5.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Wed, 20 Aug 2025 08:26:21 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 20 Aug 2025 03:26:21 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 20 Aug 2025 03:26:20 -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; Wed, 20 Aug 2025 03:26:19 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U3/R5ly94SzwIxf0Z8mL/h4kwUNy3Z15savmSzuhZ5PtviSZqNlf5QcEOP/2nbGOcEe8TtYZg/R/Do8hstqoJI68UW/kAHyuSsb5iXyN0pfnMDSp6NxlSNiVz9ax0uE91eHRFGDpjtL2Zumidhfsfaxlaf/sjzAAW5kx0WaqjRc/Zt93diZ+7WxRjIhaHYPsUXP3+CtsTkrxB22y1K3wFIYuGGzOT5AIeRja1lEiqVnJbRdSJ3HPCcwj4zGKhTLIX3+Q2qYQFY3yQ9x8/yWE6+6ojkXSleYFrc04pGTPwuzvNbDY91PSorgA+gYMw0P7mWGt+ajJ7qCnFYEp4s6OrA== 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=cYEwpNf143DK68PixfH48YkA5H+7NmB4eqvA+fjNNDE=; b=q1G6KpX5ag0sMk5KYFkT9ShW1inUdxe1iXGQWtH4qFwnm2iFZ2GBjm3DdjbHDsCSBfdPey+c61/1A/5MBbU5YUv5qjpTr/rwnECnMW99vxQw1FTFcV/cFHSm95MqhFUH8VbR0FN1tPRULjidoVeij0BdYD0IA/AOKV7BXMSRqoMg1LK0IUdcvjuJipF9prmh32hpc5UZbYrC0AAPpwC/QU29rgAhd1UyXPTF8zjJctqq5CJwMUcNWs41hU2U4JcTpG+UjVk3sOyFjGKL1gm/u8ntd/to5w07oxNMTKkyFcCyG5TFbZt3f8+9VSNoxdy8xb+HKgBvLhym5BpDLJEWag== 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=cYEwpNf143DK68PixfH48YkA5H+7NmB4eqvA+fjNNDE=; b=F+aV/FefscKmncfHa+JyFxm9OQdrd2hhsx6GAA8AzsWk6mIUtE2WoJlLdKvnM+I7WP+oBfLqaKAqkg9bAu+NwGRa+zE+mugWU3Wy9LheFDQ6mZmcDjXQ3/DZ8PRo2pssmdzQKUR3Si0iA2tRKMmqvLiMEheEdUf7UtqTWAIOn2w= 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=SATLEXMB04.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 v2 06/47] hw/arm/xlnx-versal: gem: refactor creation Date: Wed, 20 Aug 2025 10:25:05 +0200 Message-ID: <20250820082549.69724-7-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250820082549.69724-1-luc.michel@amd.com> References: <20250820082549.69724-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E5:EE_|MN0PR12MB6174:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b2f30d2-ecdd-4bda-7106-08dddfc33e99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3i1+VOFrgftEdmd+RfYdrorj6JJZgWuu/5SeJlaLBAgfoV1Ldn5nlftkWjAc?= =?us-ascii?Q?cEMColHwk05sib3XwZjuCFoxbnDWmKJlmXu0Q1KyC23+r5PvyPRSZq/ONDVK?= =?us-ascii?Q?UNUNTsXqDuGgm8Qof2VmBBM5JULwWZlvqdUnW7r6JBpHUyqk6pnIZariL6Gj?= =?us-ascii?Q?oIYZ+uQSvQ+J413/JaFzI0hkaKwtBP4TrqozNpNObAOMw8y5cgNRHctP6R/L?= =?us-ascii?Q?TIuidL8dZvHTrqfNbAxnJc4SDSEweDXCYOPmYrsUZ5gQ8psftDtFc7FoKFbM?= =?us-ascii?Q?jMSHnGbJssFIIyqT1zGfOEGfyCj0EBTYkZ1EDZi/VizWQP1STJUYvg0YgdRp?= =?us-ascii?Q?f/dPjYMj2e8yZ7Oym9AV10ZF0fVd1LsFeQzCO53msqIJe8bYMypHfOtSlyKR?= =?us-ascii?Q?NROZyXh4bpzbXSVCitUrNbmT2hZDuCJkxmfPgTUB/gnsCSI6GVpQ//G/7l+X?= =?us-ascii?Q?0Tryo3mX1k7w9RLZjKLz+aEilgdA5OM7SwUQ9f8wJ7TNHRjr+J879B2BtTYX?= =?us-ascii?Q?qmS/IHuvy3+sfZ4FLsCWeG6ql5IQsNR47mGMLZNqxYCTJ3ueHLl12RysucF1?= =?us-ascii?Q?BF7lE2rd1GIcy0QO0fjhSHctp6pd7fWSH/FVA9waGdhhqfrK9ePARer2vOez?= =?us-ascii?Q?jtlIsA9KXii9t9XhEwYX5tsGTBnKu5d+dDJiiwJvIYL4i28D4gPCUUb3GUI3?= =?us-ascii?Q?ucq1AJpjW/OtbnFa/MRwpYI+hIpa5CPZLrqWF1jGlyUrr19hsxbgctrxvcCj?= =?us-ascii?Q?hkL8nVyWKdAvoHGHsaFInz8y+kQCujH5GZG35MxRFw6uYz5+c4hBArK2snoc?= =?us-ascii?Q?GTyp311GJPlKXOMJ2ltR/tbMK9hDshHo5XOL3h2ube9yDVRnu7wKujUjMf5Q?= =?us-ascii?Q?AeBpeH/964BT0AFp/UO+W5BSU6i4e+a21lqtrAVY7xnK2g2EnW4oyxY/Op+q?= =?us-ascii?Q?OyGPPI2dazFkY4ExZjxch7pqUEY6+z3ujHOyA+HPzXXg5Vl+CyVji7vSUU67?= =?us-ascii?Q?f1Zea325ov4iAZbQmdpIDDy0AUgXlYtr/fSducV1NmSXCXKOWzMvVO3vEJ6j?= =?us-ascii?Q?6nVWEmvMkH5kW7CN22rrJHDZ3gbWLSsuL0sQC2vs1owa7gBBxSURyKibbVP+?= =?us-ascii?Q?+BgbH395CG1v8Qz2y9u/nhQKmnUZPVYlrH9FzhdWQLak/oxKAtvfWjJ9fc5v?= =?us-ascii?Q?QyB7af3zbtqSSwAouykHAehnBsR8UzLNe/buNTkLT0CYt3BAFnlNYLzcRGou?= =?us-ascii?Q?6hQpgt+oakPfDY3uzg6qU6dLfYn+6PGCkXlKlPRHBadI7k0b5/UO27WdxlWh?= =?us-ascii?Q?VDB6xgn0eVCym0JXtgfNV2iM28Ktn+siRxTrcwQqS6WhKAaW7GTfY3OGX6Rt?= =?us-ascii?Q?aT4k7FfuBxp886+EY0eQ5l0sWFm6lHcaxacawsPaHDa0GfmVKOXvdCNfeiuu?= =?us-ascii?Q?fzdjIujOvifVz9JBsBQpC/4grr6t6nIGAY6bykiDKOMMKdaiS1KL3UjYzT0t?= =?us-ascii?Q?xZ3JDv2YSIGVStEkMvL9z/q6k0yKwemix9Mk?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2025 08:26:21.6998 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b2f30d2-ecdd-4bda-7106-08dddfc33e99 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989E5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6174 Received-SPF: permerror client-ip=2a01:111:f403:2413::630; envelope-from=Luc.Michel@amd.com; helo=NAM10-DM6-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: 1755678777239116600 Content-Type: text/plain; charset="utf-8" Refactor the GEM ethernet controllers creation using the VersalMap structure. Note that the connection to the CRL is removed for now and will be re-added by next commits. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 3 - hw/arm/xlnx-versal-virt.c | 54 ------------- hw/arm/xlnx-versal.c | 151 +++++++++++++++++++++++++---------- 3 files changed, 108 insertions(+), 100 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 4a7a2d85aac..1fcc2b623da 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -16,11 +16,10 @@ #include "hw/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/or-irq.h" #include "hw/intc/arm_gicv3.h" #include "hw/dma/xlnx-zdma.h" -#include "hw/net/cadence_gem.h" #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "qom/object.h" #include "hw/usb/xlnx-usb-subsystem.h" #include "hw/misc/xlnx-versal-xramc.h" #include "hw/nvram/xlnx-bbram.h" @@ -76,12 +75,10 @@ struct Versal { =20 struct { MemoryRegion mr_ocm; =20 struct { - CadenceGEMState gem[XLNX_VERSAL_NR_GEMS]; - OrIRQState gem_irq_orgate[XLNX_VERSAL_NR_GEMS]; XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS]; VersalUsb2 usb; } iou; =20 /* Real-time Processing Unit. */ diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index f546ec10f6f..fa2d875f0ae 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -36,11 +36,10 @@ struct VersalVirt { =20 void *fdt; int fdt_size; struct { uint32_t gic; - uint32_t ethernet_phy[2]; uint32_t clk_125Mhz; uint32_t clk_25Mhz; uint32_t usb; uint32_t dwc; } phandle; @@ -55,23 +54,19 @@ struct VersalVirt { }; =20 static void fdt_create(VersalVirt *s) { MachineClass *mc =3D MACHINE_GET_CLASS(s); - int i; =20 s->fdt =3D create_device_tree(&s->fdt_size); if (!s->fdt) { error_report("create_device_tree() failed"); exit(1); } =20 /* Allocate all phandles. */ s->phandle.gic =3D qemu_fdt_alloc_phandle(s->fdt); - for (i =3D 0; i < ARRAY_SIZE(s->phandle.ethernet_phy); i++) { - s->phandle.ethernet_phy[i] =3D qemu_fdt_alloc_phandle(s->fdt); - } s->phandle.clk_25Mhz =3D qemu_fdt_alloc_phandle(s->fdt); s->phandle.clk_125Mhz =3D qemu_fdt_alloc_phandle(s->fdt); =20 s->phandle.usb =3D qemu_fdt_alloc_phandle(s->fdt); s->phandle.dwc =3D qemu_fdt_alloc_phandle(s->fdt); @@ -207,58 +202,10 @@ static void fdt_add_usb_xhci_nodes(VersalVirt *s) qemu_fdt_setprop_cell(s->fdt, name, "phandle", s->phandle.dwc); qemu_fdt_setprop_string(s->fdt, name, "maximum-speed", "high-speed"); g_free(name); } =20 -static void fdt_add_fixed_link_nodes(VersalVirt *s, char *gemname, - uint32_t phandle) -{ - char *name =3D g_strdup_printf("%s/fixed-link", gemname); - - qemu_fdt_add_subnode(s->fdt, name); - qemu_fdt_setprop_cell(s->fdt, name, "phandle", phandle); - qemu_fdt_setprop(s->fdt, name, "full-duplex", NULL, 0); - qemu_fdt_setprop_cell(s->fdt, name, "speed", 1000); - g_free(name); -} - -static void fdt_add_gem_nodes(VersalVirt *s) -{ - uint64_t addrs[] =3D { MM_GEM1, MM_GEM0 }; - unsigned int irqs[] =3D { VERSAL_GEM1_IRQ_0, VERSAL_GEM0_IRQ_0 }; - const char clocknames[] =3D "pclk\0hclk\0tx_clk\0rx_clk"; - const char compat_gem[] =3D "cdns,zynqmp-gem\0cdns,gem"; - int i; - - for (i =3D 0; i < ARRAY_SIZE(addrs); i++) { - char *name =3D g_strdup_printf("/ethernet@%" PRIx64, addrs[i]); - qemu_fdt_add_subnode(s->fdt, name); - - fdt_add_fixed_link_nodes(s, name, s->phandle.ethernet_phy[i]); - qemu_fdt_setprop_string(s->fdt, name, "phy-mode", "rgmii-id"); - qemu_fdt_setprop_cell(s->fdt, name, "phy-handle", - s->phandle.ethernet_phy[i]); - qemu_fdt_setprop_cells(s->fdt, name, "clocks", - s->phandle.clk_25Mhz, s->phandle.clk_25Mhz, - s->phandle.clk_125Mhz, s->phandle.clk_125Mh= z); - qemu_fdt_setprop(s->fdt, name, "clock-names", - clocknames, sizeof(clocknames)); - qemu_fdt_setprop_cells(s->fdt, name, "interrupts", - GIC_FDT_IRQ_TYPE_SPI, irqs[i], - GIC_FDT_IRQ_FLAGS_LEVEL_HI, - GIC_FDT_IRQ_TYPE_SPI, irqs[i], - GIC_FDT_IRQ_FLAGS_LEVEL_HI); - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, addrs[i], 2, 0x1000); - qemu_fdt_setprop(s->fdt, name, "compatible", - compat_gem, sizeof(compat_gem)); - qemu_fdt_setprop_cell(s->fdt, name, "#address-cells", 1); - qemu_fdt_setprop_cell(s->fdt, name, "#size-cells", 0); - g_free(name); - } -} - static void fdt_add_zdma_nodes(VersalVirt *s) { const char clocknames[] =3D "clk_main\0clk_apb"; const char compat[] =3D "xlnx,zynqmp-dma-1.0"; int i; @@ -607,11 +554,10 @@ static void versal_virt_init(MachineState *machine) &error_abort); } =20 fdt_create(s); versal_set_fdt(&s->soc, s->fdt); - fdt_add_gem_nodes(s); fdt_add_gic_nodes(s); fdt_add_timer_nodes(s); fdt_add_zdma_nodes(s); fdt_add_usb_xhci_nodes(s); fdt_add_rtc_node(s); diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index b963a05935b..062f9a91a6c 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -27,10 +27,11 @@ #include "system/device_tree.h" #include "hw/arm/fdt.h" #include "hw/char/pl011.h" #include "hw/net/xlnx-versal-canfd.h" #include "hw/sd/sdhci.h" +#include "hw/net/cadence_gem.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 @@ -49,10 +50,18 @@ typedef struct VersalMap { VersalSimplePeriphMap canfd[4]; size_t num_canfd; =20 VersalSimplePeriphMap sdhci[2]; size_t num_sdhci; + + struct VersalGemMap { + VersalSimplePeriphMap map; + size_t num_prio_queue; + const char *phy_mode; + const uint32_t speed; + } gem[3]; + size_t num_gem; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, @@ -63,10 +72,14 @@ static const VersalMap VERSAL_MAP =3D { .num_canfd =3D 2, =20 .sdhci[0] =3D { 0xf1040000, 126 }, .sdhci[1] =3D { 0xf1050000, 128 }, .num_sdhci =3D 2, + + .gem[0] =3D { { 0xff0c0000, 56 }, 2, "rgmii-id", 1000 }, + .gem[1] =3D { { 0xff0d0000, 58 }, 2, "rgmii-id", 1000 }, + .num_gem =3D 2, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -109,10 +122,22 @@ static void versal_sysbus_connect_irq(Versal *s, SysB= usDevice *sbd, } =20 sysbus_connect_irq(sbd, sbd_idx, irq); } =20 +static void versal_qdev_connect_gpio_out(Versal *s, DeviceState *dev, + int dev_idx, int irq_idx) +{ + qemu_irq irq =3D versal_get_irq(s, irq_idx); + + if (irq =3D=3D NULL) { + return; + } + + qdev_connect_gpio_out(dev, dev_idx, irq); +} + static inline char *versal_fdt_add_subnode(Versal *s, const char *path, uint64_t at, const char *compat, size_t compat_sz) { char *p; @@ -138,10 +163,25 @@ static inline char *versal_fdt_add_simple_subnode(Ver= sal *s, const char *path, =20 qemu_fdt_setprop_sized_cells(s->cfg.fdt, p, "reg", 2, addr, 2, len); return p; } =20 +static inline DeviceState *create_or_gate(Versal *s, Object *parent, + const char *name, uint16_t num_l= ines, + int irq_idx) +{ + DeviceState *or; + + or =3D qdev_new(TYPE_OR_IRQ); + qdev_prop_set_uint16(or, "num-lines", num_lines); + object_property_add_child(parent, name, OBJECT(or)); + qdev_realize_and_unref(or, NULL, &error_abort); + versal_qdev_connect_gpio_out(s, or, 0, irq_idx); + + return or; +} + static void versal_create_apu_cpus(Versal *s) { int i; =20 object_initialize_child(OBJECT(s), "apu-cluster", &s->fpd.apu.cluster, @@ -375,50 +415,80 @@ static void versal_create_usbs(Versal *s, qemu_irq *p= ic) =20 mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); memory_region_add_subregion(&s->mr_ps, MM_USB2_CTRL_REGS, mr); } =20 -static void versal_create_gems(Versal *s, qemu_irq *pic) +static void versal_create_gem(Versal *s, + const struct VersalGemMap *map) { + DeviceState *dev; + MemoryRegion *mr; + DeviceState *or; int i; + g_autofree char *node; + g_autofree char *phy_node; + int phy_phandle; + const char compatible[] =3D "cdns,zynqmp-gem\0cdns,gem"; + const char clocknames[] =3D "pclk\0hclk\0tx_clk\0rx_clk"; + g_autofree uint32_t *irq_prop; =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.gem); i++) { - static const int irqs[] =3D { VERSAL_GEM0_IRQ_0, VERSAL_GEM1_IRQ_0= }; - static const uint64_t addrs[] =3D { MM_GEM0, MM_GEM1 }; - char *name =3D g_strdup_printf("gem%d", i); - DeviceState *dev; - MemoryRegion *mr; - OrIRQState *or_irq; - - object_initialize_child(OBJECT(s), name, &s->lpd.iou.gem[i], - TYPE_CADENCE_GEM); - or_irq =3D &s->lpd.iou.gem_irq_orgate[i]; - object_initialize_child(OBJECT(s), "gem-irq-orgate[*]", - or_irq, TYPE_OR_IRQ); - dev =3D DEVICE(&s->lpd.iou.gem[i]); - qemu_configure_nic_device(dev, true, NULL); - object_property_set_int(OBJECT(dev), "phy-addr", 23, &error_abort); - object_property_set_int(OBJECT(dev), "num-priority-queues", 2, - &error_abort); - object_property_set_int(OBJECT(or_irq), - "num-lines", 2, &error_fatal); - qdev_realize(DEVICE(or_irq), NULL, &error_fatal); - qdev_connect_gpio_out(DEVICE(or_irq), 0, pic[irqs[i]]); - - object_property_set_link(OBJECT(dev), "dma", OBJECT(&s->mr_ps), - &error_abort); - sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); - - mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); - memory_region_add_subregion(&s->mr_ps, addrs[i], mr); - - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(DEVICE= (or_irq), 0)); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, qdev_get_gpio_in(DEVICE= (or_irq), 1)); - g_free(name); + dev =3D qdev_new(TYPE_CADENCE_GEM); + object_property_add_child(OBJECT(s), "gem[*]", OBJECT(dev)); + + qemu_configure_nic_device(dev, true, NULL); + object_property_set_int(OBJECT(dev), "phy-addr", 23, &error_abort); + object_property_set_int(OBJECT(dev), "num-priority-queues", + map->num_prio_queue, &error_abort); + + object_property_set_link(OBJECT(dev), "dma", OBJECT(&s->mr_ps), + &error_abort); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); + memory_region_add_subregion(&s->mr_ps, map->map.addr, mr); + + /* + * The GEM controller exposes one IRQ line per priority queue. In Vers= al + * family devices, those are OR'ed together. + */ + or =3D create_or_gate(s, OBJECT(dev), "irq-orgate", + map->num_prio_queue, map->map.irq); + + for (i =3D 0; i < map->num_prio_queue; i++) { + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, qdev_get_gpio_in(or, i)= ); + } + + node =3D versal_fdt_add_simple_subnode(s, "/ethernet", map->map.addr, = 0x1000, + compatible, sizeof(compatible)); + phy_node =3D g_strdup_printf("%s/fixed-link", node); + phy_phandle =3D qemu_fdt_alloc_phandle(s->cfg.fdt); + + /* Fixed link PHY node */ + qemu_fdt_add_subnode(s->cfg.fdt, phy_node); + qemu_fdt_setprop_cell(s->cfg.fdt, phy_node, "phandle", phy_phandle); + qemu_fdt_setprop(s->cfg.fdt, phy_node, "full-duplex", NULL, 0); + qemu_fdt_setprop_cell(s->cfg.fdt, phy_node, "speed", map->speed); + + qemu_fdt_setprop_string(s->cfg.fdt, node, "phy-mode", map->phy_mode); + qemu_fdt_setprop_cell(s->cfg.fdt, node, "phy-handle", phy_phandle); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "clocks", + s->phandle.clk_25mhz, s->phandle.clk_25mhz, + s->phandle.clk_125mhz, s->phandle.clk_125mhz); + qemu_fdt_setprop(s->cfg.fdt, node, "clock-names", + clocknames, sizeof(clocknames)); + + irq_prop =3D g_new(uint32_t, map->num_prio_queue * 3); + for (i =3D 0; i < map->num_prio_queue; i++) { + irq_prop[3 * i] =3D cpu_to_be32(GIC_FDT_IRQ_TYPE_SPI); + irq_prop[3 * i + 1] =3D cpu_to_be32(map->map.irq); + irq_prop[3 * i + 2] =3D cpu_to_be32(GIC_FDT_IRQ_FLAGS_LEVEL_HI); } + qemu_fdt_setprop(s->cfg.fdt, node, "interrupts", irq_prop, + sizeof(uint32_t) * map->num_prio_queue * 3); } =20 + static void versal_create_admas(Versal *s, qemu_irq *pic) { int i; =20 for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.adma); i++) { @@ -900,18 +970,10 @@ static void versal_create_crl(Versal *s, qemu_irq *pi= c) object_property_set_link(OBJECT(&s->lpd.crl), name, OBJECT(&s->lpd.rpu.cpu[i]), &error_abort); } =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.gem); i++) { - g_autofree gchar *name =3D g_strdup_printf("gem[%d]", i); - - object_property_set_link(OBJECT(&s->lpd.crl), - name, OBJECT(&s->lpd.iou.gem[i]), - &error_abort); - } - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.adma); i++) { g_autofree gchar *name =3D g_strdup_printf("adma[%d]", i); =20 object_property_set_link(OBJECT(&s->lpd.crl), name, OBJECT(&s->lpd.iou.adma[i]), @@ -1095,12 +1157,15 @@ static void versal_realize(DeviceState *dev, Error = **errp) =20 for (i =3D 0; i < map->num_sdhci; i++) { versal_create_sdhci(s, &map->sdhci[i]); } =20 + for (i =3D 0; i < map->num_gem; i++) { + versal_create_gem(s, &map->gem[i]); + } + versal_create_usbs(s, pic); - versal_create_gems(s, pic); versal_create_admas(s, pic); versal_create_pmc_apb_irq_orgate(s, pic); versal_create_rtc(s, pic); versal_create_trng(s, pic); versal_create_xrams(s, pic); --=20 2.50.1