From nobody Sun Sep 21 21:43:16 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=1757671696; cv=pass; d=zohomail.com; s=zohoarc; b=KdhJBkhAX89Us0yi8WH6jtu2MUiLDE6aSaC4zNXB2JaUyUxPwQdh8ubHEGWYCpMTaMnxe7q4jHM82VpfHBkNM3iyL19IR52UdKEasQYNvIkp5yyF5Dkzz9OTpDEf1/lqJtDfK9WSlFWMdnF8RYyCFoY4d8d0oV8FStzmLt/zQQQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757671696; 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=gv4nxH8HkRk3cotOYv7YUbJ6H/52+Xnk5/u2aLGfvzg=; b=H8qQZl0ZYSR5BHM7eKAngVtLHO6ZroB7sUKUJocnXIbg8IYlN3j4Xwhpt3+Db52RA/SPXf7Em1vZA4CvwWdcvKmPCoStugrX79+pt9h5PyLg2YnK9FEJCoq9l0plL8YJuR9p1Z7kstvjwPuy29mw7FVcQC73gkhXeE+Ul38UHac= 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 1757671696422773.3625406220901; Fri, 12 Sep 2025 03:08:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ux0cN-0005jh-Aa; Fri, 12 Sep 2025 06:02:59 -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 1ux0cK-0005gi-Dj; Fri, 12 Sep 2025 06:02:56 -0400 Received: from mail-bn7nam10on20623.outbound.protection.outlook.com ([2a01:111:f403:2009::623] helo=NAM10-BN7-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 1ux0cG-0001Dt-10; Fri, 12 Sep 2025 06:02:56 -0400 Received: from DS7PR03CA0332.namprd03.prod.outlook.com (2603:10b6:8:55::19) by PH7PR12MB6636.namprd12.prod.outlook.com (2603:10b6:510:212::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Fri, 12 Sep 2025 10:02:43 +0000 Received: from DS1PEPF00017097.namprd05.prod.outlook.com (2603:10b6:8:55:cafe::84) by DS7PR03CA0332.outlook.office365.com (2603:10b6:8:55::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.17 via Frontend Transport; Fri, 12 Sep 2025 10:02:34 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by DS1PEPF00017097.mail.protection.outlook.com (10.167.18.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Fri, 12 Sep 2025 10:02:42 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 12 Sep 2025 03:01:29 -0700 Received: from satlexmb08.amd.com (10.181.42.217) 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, 12 Sep 2025 05:01:21 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 12 Sep 2025 03:01:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=acdAQ7GmhHM+izpApstsAY0VYwVTiVr4AYIWyec6btzlKl4GN51FmEvi/rfwbNwxcXcDIXghnwUTV7Yhy/ascfeMdNyw83sL4kXhKLsUmBZV+ajcY+Lw8kQgTUlomdhos5eAYj/5NFuWL/YKCnfjQOt5YtGaL2o997SerNIQVwzDsX72D8sszAuHIFsoOxLwexGqiIQ0xh3m0KeVvcRmOoHJQBw8nZmvH4hOsDgXDKqZBfW/X7zaUuEHYfXLbfmI7vFg8FTDp+l3E9wtH1svUWCr+EeVHJlCDHSKgQ37SausapsMkrtaMJJmfeo6fZEOW/QhIy2CXVQiytEP1dTcpg== 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=gv4nxH8HkRk3cotOYv7YUbJ6H/52+Xnk5/u2aLGfvzg=; b=FSstz2H0sTxhK9//XK4T3CsearVzVt6lba8FB/IXLLSSJ5w98Bj8mwEpY81msbAq09kJeBxt/4MnbL7Cx9fmoj7N/yLFMMuaj6tiq1ysh/REEWSumJeeFeruV0CcfoNYip7OUSOosKeVOTwFqH1oqnJars7nn3E9RNepe7hp7kLxNd7zwgCA/LVwAsqjk82ff39UZcpnBJ1gId4BR+f0atRfnCpUXGSHlOlP65UIIHsiotZovsy5oyqb3/d/K8ukC356zxgzHI9o4NasgzLXPqvgemOAlq2ToBgPLAQeaGfNMgRTYrMbZh2jZzS/s40RWFqXeQi0IYsQRJ+R9WlxNg== 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=gv4nxH8HkRk3cotOYv7YUbJ6H/52+Xnk5/u2aLGfvzg=; b=cu+KHPKSUiB+ydQQsAz2WMc+CnhbwSyKkF1iShqoa4G2SZRcQbcG5H/GgP5MDm+T9E3v1O1CtzcKLC/xK/lv3vbrLd8NCJCgZ+Rp07SRzMOpsiik1XflT8CuhBwtbYOJk4/SlcbnNS/2e+kQDa2dnPX/dUdRN07FgD9ieOVMNMw= 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=satlexmb08.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 v5 04/47] hw/arm/xlnx-versal: canfd: refactor creation Date: Fri, 12 Sep 2025 12:00:13 +0200 Message-ID: <20250912100059.103997-5-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250912100059.103997-1-luc.michel@amd.com> References: <20250912100059.103997-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: DS1PEPF00017097:EE_|PH7PR12MB6636:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f720f0d-92b9-4e9c-a28a-08ddf1e383b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZDFhSjF5K2dGZXBURmFzV21VL0pPVVZxcTVSTTV1UW9nTHI4aTJ4MEdvRzNZ?= =?utf-8?B?dkhpbTAwNlQvSE5IMU9TZ1ZEQnRBSVl3d3k0V1B1TmVvVXJpaTFmSFZIUmVo?= =?utf-8?B?aUdhNFJYSkRnOXFKNDhkd3FFdFcwcWNsbXJWZ281MUdtSUJxVDRUMXJSSGFM?= =?utf-8?B?NjQ3ZW44UzhjWGhDaW1LbTJvU3I3YkJ3OUliRVFna0hydnQ0K2NYVlBUZy9L?= =?utf-8?B?MXA1eGxhQkoyamVseUtMRDJ1NFphWG1NaXM5dENEcEFxZzkyZVg4QmI4MUQw?= =?utf-8?B?UDBuWWdDK2x1VytBZUUyNEwydUpJWDUvaXBZYmpBUVdSdTI1bTdGS1l2cUdu?= =?utf-8?B?c0k2TVNmbU9rR0hrMFhDNWpCR2dKdk51SnBIRWh4SmFiek5YU3RqVldxVXY5?= =?utf-8?B?aG1jM1VpVFVSdllIS1R5TTR0YjZiTGtUeFdqLzY3dWhSSXYwMytGNEtzRUt6?= =?utf-8?B?K2dCWTcwcmpYalllTVJaVlI5RUpXMENmNUJFaEFQbnJkblJSaVlnMVovQXla?= =?utf-8?B?aDl2SDRLRENnVEE3bXBGMS9rZFVsNHNLUTNmT0RaVHVXNERYc2tYd2xhMXE2?= =?utf-8?B?aG5saEw3dCtmWFF5UXRUY0ZSUSs0MUZ0ejU5MU1kUUxQc013bkYrSlpmdkh3?= =?utf-8?B?cEY4WlV5R2J6QkNaMmpGc1BBTVRMU2tIc2FUMFc3dEZXNVpNeVNTSlFOZmxk?= =?utf-8?B?TEFmQTlXQm8xdERNVjA0WUFHODhKckExenNIWFR4UEp4ZmxIZHc2TzRBTzhH?= =?utf-8?B?d0QvM2VFdWZjYmxqSXhpa045ZVMwRngrUENGNjl5MDc2NnZYcWZNOXM1OUlG?= =?utf-8?B?c0dyNHd2QVBGN25YMUQyUlhmOGhlZlljTmRFVHhMOG1OZGVDM1IwN3cxTk41?= =?utf-8?B?aThwRDBsdXdkalk1Z2YrTnA1bUVIYjA2QjQwb0JrOUprZ1NhZVNOYXZzQ01m?= =?utf-8?B?c1BYSDlRUUFGYXNsUUpsQklEQmgvUE5pb3ZlUXFYeTM4c2dKZk1ZVEsxUHhj?= =?utf-8?B?bENEVlpzVGY0cTBFR2JqcllyQ3haRTg4MTkveFJWZDhYU2wrRW45ZGg1SmNY?= =?utf-8?B?QXg1bkF4OWRJb0F3bWJhajA5YWsyRU5NVnZPUGpQVEFpNmdPaEpwSFFndnFK?= =?utf-8?B?endnQUpVRmFkTTkzUnU2YzFWdE00SE40TG13YThsdUM5ZlJ3enpBREdrMG5V?= =?utf-8?B?MUY2S0U2alY3eVNoSEZGdFVLdzJaT1czbFB5QTBKQWhCRkRGVjU4MkZISFdN?= =?utf-8?B?eS84clpsbnlLWVBsV1hrWUZaTzdOQ1M5NmV4WnNCRUVaNVA2N01YLzUyMnpT?= =?utf-8?B?OXdreWtpaUNhS0lCOWtjbXJ2MEFQWVdZWnRxNUp5M01wQS8xWjI0YVRyVEdo?= =?utf-8?B?WEFoNWxVeXN4ZHVRZytHZitiWit5MXg5dVlrbjlqTjgyVExicWZQTTAvdTAv?= =?utf-8?B?YTA3Z0tlOTMyaS9EY0FzV3RkNnVOQktJR01SM3g1dnJKU2o0dzJEQkYvK093?= =?utf-8?B?QkVlSW94elh4WFpYWXZtcXFBb2MwSWliYlhUdllrVU5zMmpOc2RvOGtDUzdG?= =?utf-8?B?d3Mzd2EzU2J3U1lNMzhHTzJvWG90bGhMbkhGQUlsZm9pMFd2dVZzZTFMQUxs?= =?utf-8?B?dkNTVXhFSG54V1Q4eExxVzUwY1N1N0lmbFNCeFpTYzZIU1dWVmsrdG9aMlpR?= =?utf-8?B?dmEzQzlmT2MwNmpuUnVNbVZYNWVSTXgrYmxpb3VWR3lIWngxSU8vN3lKWW15?= =?utf-8?B?bjAyM0pHc3QrWDlHaXVjcGMwc1RjQWVOcC96Y0h4TkdQZ2lISVkwZzc3czJk?= =?utf-8?B?OVhvYytYQWFKalVoNjBySzBxd0lqQlR1cFd3VGdkTWdlRFpIeWx3WmlBbVFj?= =?utf-8?B?TDJ4UFVjSVFEb0x6aDJoTER1REpudWF1QzlYOWdDYUZwYmxHcEh1RHl6aDd6?= =?utf-8?B?R2QzdlNGb3NCalhVNFRSbnJianRWR1gxZDh3RXFkeVV0VkUxajlOK2tOOGcw?= =?utf-8?B?WjcrNFB4V0lZSTljK080MXdRaHpRM0FMRGpHcE5HRktVWURibkQvblNZTXJK?= =?utf-8?Q?i7YBoq?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb08.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2025 10:02:42.5324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f720f0d-92b9-4e9c-a28a-08ddf1e383b6 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=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017097.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6636 Received-SPF: permerror client-ip=2a01:111:f403:2009::623; envelope-from=Luc.Michel@amd.com; helo=NAM10-BN7-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: 1757671697309116600 Refactor the CAN 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. The xlnx-versal-virt machine now dynamically creates the correct amount of CAN bus link properties based on the number of CAN controller advertised by the SoC. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/xlnx-versal.h | 7 +-- hw/arm/xlnx-versal-virt.c | 73 +++++++++------------------- hw/arm/xlnx-versal.c | 94 +++++++++++++++++++++++++----------- 3 files changed, 95 insertions(+), 79 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index b01ddeb1423..007c91b596e 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -29,11 +29,11 @@ #include "hw/ssi/xlnx-versal-ospi.h" #include "hw/dma/xlnx_csu_dma.h" #include "hw/misc/xlnx-versal-crl.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" #include "hw/misc/xlnx-versal-trng.h" -#include "hw/net/xlnx-versal-canfd.h" +#include "net/can_emu.h" #include "hw/misc/xlnx-versal-cfu.h" #include "hw/misc/xlnx-versal-cframe-reg.h" #include "target/arm/cpu.h" #include "hw/arm/xlnx-versal-version.h" =20 @@ -81,12 +81,10 @@ struct Versal { struct { CadenceGEMState gem[XLNX_VERSAL_NR_GEMS]; OrIRQState gem_irq_orgate[XLNX_VERSAL_NR_GEMS]; XlnxZDMA adma[XLNX_VERSAL_NR_ADMAS]; VersalUsb2 usb; - CanBusState *canbus[XLNX_VERSAL_NR_CANFD]; - XlnxVersalCANFDState canfd[XLNX_VERSAL_NR_CANFD]; } iou; =20 /* Real-time Processing Unit. */ struct { MemoryRegion mr; @@ -139,10 +137,11 @@ struct Versal { uint32_t clk_125mhz; } phandle; =20 struct { MemoryRegion *mr_ddr; + CanBusState **canbus; void *fdt; } cfg; }; =20 struct VersalClass { @@ -155,10 +154,12 @@ static inline void versal_set_fdt(Versal *s, void *fd= t) { g_assert(!qdev_is_realized(DEVICE(s))); s->cfg.fdt =3D fdt; } =20 +int versal_get_num_can(VersalVersion version); + /* Memory-map and IRQ definitions. Copied a subset from * auto-generated files. */ =20 #define VERSAL_GIC_MAINT_IRQ 9 #define VERSAL_TIMER_VIRT_IRQ 11 diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index e1deae11317..334252564be 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -41,15 +41,15 @@ struct VersalVirt { uint32_t ethernet_phy[2]; uint32_t clk_125Mhz; uint32_t clk_25Mhz; uint32_t usb; uint32_t dwc; - uint32_t canfd[2]; } phandle; struct arm_boot_info binfo; =20 - CanBusState *canbus[XLNX_VERSAL_NR_CANFD]; + CanBusState **canbus; + struct { bool secure; } cfg; char *ospi_model; }; @@ -207,42 +207,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_canfd_nodes(VersalVirt *s) -{ - uint64_t addrs[] =3D { MM_CANFD1, MM_CANFD0 }; - uint32_t size[] =3D { MM_CANFD1_SIZE, MM_CANFD0_SIZE }; - unsigned int irqs[] =3D { VERSAL_CANFD1_IRQ_0, VERSAL_CANFD0_IRQ_0 }; - const char clocknames[] =3D "can_clk\0s_axi_aclk"; - int i; - - /* Create and connect CANFD0 and CANFD1 nodes to canbus0. */ - for (i =3D 0; i < ARRAY_SIZE(addrs); i++) { - char *name =3D g_strdup_printf("/canfd@%" PRIx64, addrs[i]); - qemu_fdt_add_subnode(s->fdt, name); - - qemu_fdt_setprop_cell(s->fdt, name, "rx-fifo-depth", 0x40); - qemu_fdt_setprop_cell(s->fdt, name, "tx-mailbox-count", 0x20); - - qemu_fdt_setprop_cells(s->fdt, name, "clocks", - s->phandle.clk_25Mhz, s->phandle.clk_25Mhz); - 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); - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, addrs[i], 2, size[i]); - qemu_fdt_setprop_string(s->fdt, name, "compatible", - "xlnx,canfd-2.0"); - - g_free(name); - } -} - static void fdt_add_fixed_link_nodes(VersalVirt *s, char *gemname, uint32_t phandle) { char *name =3D g_strdup_printf("%s/fixed-link", gemname); =20 @@ -659,22 +627,25 @@ static void versal_virt_init(MachineState *machine) =20 object_initialize_child(OBJECT(machine), "xlnx-versal", &s->soc, TYPE_XLNX_VERSAL); object_property_set_link(OBJECT(&s->soc), "ddr", OBJECT(machine->ram), &error_abort); - object_property_set_link(OBJECT(&s->soc), "canbus0", OBJECT(s->canbus[= 0]), - &error_abort); - object_property_set_link(OBJECT(&s->soc), "canbus1", OBJECT(s->canbus[= 1]), - &error_abort); + + for (i =3D 0; i < versal_get_num_can(VERSAL_VER_VERSAL); i++) { + g_autofree char *prop_name =3D g_strdup_printf("canbus%d", i); + + object_property_set_link(OBJECT(&s->soc), prop_name, + OBJECT(s->canbus[i]), + &error_abort); + } =20 fdt_create(s); versal_set_fdt(&s->soc, s->fdt); sysbus_realize(SYS_BUS_DEVICE(&s->soc), &error_fatal); create_virtio_regions(s); =20 fdt_add_gem_nodes(s); - fdt_add_canfd_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_sd_nodes(s); @@ -753,30 +724,34 @@ static void versal_virt_init(MachineState *machine) } =20 static void versal_virt_machine_instance_init(Object *obj) { VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); + size_t i, num_can; + + num_can =3D versal_get_num_can(VERSAL_VER_VERSAL); + s->canbus =3D g_new0(CanBusState *, num_can); =20 /* - * User can set canbus0 and canbus1 properties to can-bus object and c= onnect - * to socketcan(optional) interface via command line. + * User can set canbusx properties to can-bus object and optionally co= nnect + * to socketcan interface via command line. */ - object_property_add_link(obj, "canbus0", TYPE_CAN_BUS, - (Object **)&s->canbus[0], - object_property_allow_set_link, - 0); - object_property_add_link(obj, "canbus1", TYPE_CAN_BUS, - (Object **)&s->canbus[1], - object_property_allow_set_link, - 0); + for (i =3D 0; i < num_can; i++) { + g_autofree char *prop_name =3D g_strdup_printf("canbus%zu", i); + + object_property_add_link(obj, prop_name, TYPE_CAN_BUS, + (Object **) &s->canbus[i], + object_property_allow_set_link, 0); + } } =20 static void versal_virt_machine_finalize(Object *obj) { VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); =20 g_free(s->ospi_model); + g_free(s->canbus); } =20 static void versal_virt_machine_class_init(ObjectClass *oc, const void *da= ta) { MachineClass *mc =3D MACHINE_CLASS(oc); diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 87468cbc291..7ed1001dab3 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -25,10 +25,11 @@ #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" #include "system/device_tree.h" #include "hw/arm/fdt.h" #include "hw/char/pl011.h" +#include "hw/net/xlnx-versal-canfd.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 @@ -41,16 +42,23 @@ typedef struct VersalSimplePeriphMap { } VersalSimplePeriphMap; =20 typedef struct VersalMap { VersalSimplePeriphMap uart[2]; size_t num_uart; + + VersalSimplePeriphMap canfd[4]; + size_t num_canfd; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, .num_uart =3D 2, + + .canfd[0] =3D { 0xff060000, 20 }, + .canfd[1] =3D { 0xff070000, 21 }, + .num_canfd =3D 2, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -284,40 +292,46 @@ static void versal_create_uart(Versal *s, if (chardev_idx =3D=3D 0) { qemu_fdt_setprop_string(s->cfg.fdt, "/chosen", "stdout-path", node= ); } } =20 -static void versal_create_canfds(Versal *s, qemu_irq *pic) +static void versal_create_canfd(Versal *s, const VersalSimplePeriphMap *ma= p, + CanBusState *bus) { - int i; - uint32_t irqs[] =3D { VERSAL_CANFD0_IRQ_0, VERSAL_CANFD1_IRQ_0}; - uint64_t addrs[] =3D { MM_CANFD0, MM_CANFD1 }; + SysBusDevice *sbd; + MemoryRegion *mr; + g_autofree char *node; + const char compatible[] =3D "xlnx,canfd-2.0"; + const char clocknames[] =3D "can_clk\0s_axi_aclk"; =20 - for (i =3D 0; i < ARRAY_SIZE(s->lpd.iou.canfd); i++) { - char *name =3D g_strdup_printf("canfd%d", i); - SysBusDevice *sbd; - MemoryRegion *mr; + sbd =3D SYS_BUS_DEVICE(qdev_new(TYPE_XILINX_CANFD)); + object_property_add_child(OBJECT(s), "canfd[*]", OBJECT(sbd)); =20 - object_initialize_child(OBJECT(s), name, &s->lpd.iou.canfd[i], - TYPE_XILINX_CANFD); - sbd =3D SYS_BUS_DEVICE(&s->lpd.iou.canfd[i]); + object_property_set_int(OBJECT(sbd), "ext_clk_freq", + 25 * 1000 * 1000 , &error_abort); =20 - object_property_set_int(OBJECT(&s->lpd.iou.canfd[i]), "ext_clk_fre= q", - XLNX_VERSAL_CANFD_REF_CLK , &error_abort); + object_property_set_link(OBJECT(sbd), "canfdbus", OBJECT(bus), + &error_abort); =20 - object_property_set_link(OBJECT(&s->lpd.iou.canfd[i]), "canfdbus", - OBJECT(s->lpd.iou.canbus[i]), - &error_abort); + sysbus_realize_and_unref(sbd, &error_fatal); =20 - sysbus_realize(sbd, &error_fatal); + mr =3D sysbus_mmio_get_region(sbd, 0); + memory_region_add_subregion(&s->mr_ps, map->addr, mr); =20 - mr =3D sysbus_mmio_get_region(sbd, 0); - memory_region_add_subregion(&s->mr_ps, addrs[i], mr); + versal_sysbus_connect_irq(s, sbd, 0, map->irq); =20 - sysbus_connect_irq(sbd, 0, pic[irqs[i]]); - g_free(name); - } + node =3D versal_fdt_add_simple_subnode(s, "/canfd", map->addr, 0x10000, + compatible, sizeof(compatible)); + qemu_fdt_setprop_cell(s->cfg.fdt, node, "rx-fifo-depth", 0x40); + qemu_fdt_setprop_cell(s->cfg.fdt, node, "tx-mailbox-count", 0x20); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "clocks", + s->phandle.clk_25mhz, s->phandle.clk_25mhz); + qemu_fdt_setprop(s->cfg.fdt, node, "clock-names", + clocknames, sizeof(clocknames)); + qemu_fdt_setprop_cells(s->cfg.fdt, node, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, map->irq, + GIC_FDT_IRQ_FLAGS_LEVEL_HI); } =20 static void versal_create_usbs(Versal *s, qemu_irq *pic) { DeviceState *dev; @@ -1046,11 +1060,14 @@ static void versal_realize(DeviceState *dev, Error = **errp) =20 for (i =3D 0; i < map->num_uart; i++) { versal_create_uart(s, &map->uart[i], i); } =20 - versal_create_canfds(s, pic); + for (i =3D 0; i < map->num_canfd; i++) { + versal_create_canfd(s, &map->canfd[i], s->cfg.canbus[i]); + } + versal_create_usbs(s, pic); versal_create_gems(s, pic); versal_create_admas(s, pic); versal_create_sds(s, pic); versal_create_pmc_apb_irq_orgate(s, pic); @@ -1074,28 +1091,50 @@ static void versal_realize(DeviceState *dev, Error = **errp) memory_region_add_subregion_overlap(&s->fpd.apu.mr, 0, &s->mr_ps, 0); memory_region_add_subregion_overlap(&s->lpd.rpu.mr, 0, &s->lpd.rpu.mr_ps_alias, 0); } =20 +int versal_get_num_can(VersalVersion version) +{ + const VersalMap *map =3D VERSION_TO_MAP[version]; + + return map->num_canfd; +} + static void versal_base_init(Object *obj) { Versal *s =3D XLNX_VERSAL_BASE(obj); + size_t i, num_can; =20 memory_region_init(&s->fpd.apu.mr, obj, "mr-apu", UINT64_MAX); memory_region_init(&s->lpd.rpu.mr, obj, "mr-rpu", UINT64_MAX); memory_region_init(&s->mr_ps, obj, "mr-ps-switch", UINT64_MAX); memory_region_init_alias(&s->lpd.rpu.mr_ps_alias, OBJECT(s), "mr-rpu-ps-alias", &s->mr_ps, 0, UINT64_MAX); + + num_can =3D versal_get_map(s)->num_canfd; + s->cfg.canbus =3D g_new0(CanBusState *, num_can); + + for (i =3D 0; i < num_can; i++) { + g_autofree char *prop_name =3D g_strdup_printf("canbus%zu", i); + + object_property_add_link(obj, prop_name, TYPE_CAN_BUS, + (Object **) &s->cfg.canbus[i], + object_property_allow_set_link, 0); + } +} + +static void versal_base_finalize(Object *obj) +{ + Versal *s =3D XLNX_VERSAL_BASE(obj); + + g_free(s->cfg.canbus); } =20 static const Property versal_properties[] =3D { DEFINE_PROP_LINK("ddr", Versal, cfg.mr_ddr, TYPE_MEMORY_REGION, MemoryRegion *), - DEFINE_PROP_LINK("canbus0", Versal, lpd.iou.canbus[0], - TYPE_CAN_BUS, CanBusState *), - DEFINE_PROP_LINK("canbus1", Versal, lpd.iou.canbus[1], - TYPE_CAN_BUS, CanBusState *), }; =20 static void versal_base_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -1115,10 +1154,11 @@ static void versal_class_init(ObjectClass *klass, c= onst void *data) static const TypeInfo versal_base_info =3D { .name =3D TYPE_XLNX_VERSAL_BASE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(Versal), .instance_init =3D versal_base_init, + .instance_finalize =3D versal_base_finalize, .class_init =3D versal_base_class_init, .class_size =3D sizeof(VersalClass), .abstract =3D true, }; =20 --=20 2.50.1