From nobody Sun Sep 21 21:58:15 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=1757672002; cv=pass; d=zohomail.com; s=zohoarc; b=IgS/sD/7L8HUhA4snnCnfIwnqB7KlTdetNfpjfaxzFd1/1rH3MO8tdNGli/81qwhhkJ7gXNKaqOcoPoUGQDJNrvxQcgjEYKgfyvVjdIxUn0pE5Ahpa34AlKNyYV8fr67yaSiQ1kopNAPwBdVPsms6kJd0CDuYBXRw5GnjpjMMvI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757672002; 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=FxGru8PK9rDs5PwRinBoqTOFq3Z7zxiNVCdZBIjh3HA=; b=g1pkKi4pleErX4t6uoCEcVocy4I9RYROzo5i9us19bnaRMn4SJBwPSpzD3Xzeb0c0K4osWkJmTsj23l0EYghfqqqbJnFBa2oaFusZZOlNmIOi5LKROX92yUa7qkSYIbcKzl3C9xEP66YUZaP0IjMjgQo2jeGj3RTs30QKMMFgCk= 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 17576720026921022.3622519077684; Fri, 12 Sep 2025 03:13:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ux0cc-0006Wd-Gn; Fri, 12 Sep 2025 06:03:14 -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 1ux0cQ-0005s9-Lq; Fri, 12 Sep 2025 06:03:03 -0400 Received: from mail-mw2nam10on20604.outbound.protection.outlook.com ([2a01:111:f403:2412::604] helo=NAM10-MW2-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 1ux0cK-0001GX-8i; Fri, 12 Sep 2025 06:03:02 -0400 Received: from DS7PR03CA0050.namprd03.prod.outlook.com (2603:10b6:5:3b5::25) by PH7PR12MB7257.namprd12.prod.outlook.com (2603:10b6:510:205::21) 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 DS1PEPF0001709A.namprd05.prod.outlook.com (2603:10b6:5:3b5:cafe::6e) by DS7PR03CA0050.outlook.office365.com (2603:10b6:5:3b5::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.18 via Frontend Transport; Fri, 12 Sep 2025 10:02:43 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by DS1PEPF0001709A.mail.protection.outlook.com (10.167.18.104) 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:43 +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:31 -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:30 -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:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RsiEunyFaE6kYcyOuc3xnR4chn0m1EqQv07WzkJYwsyTugfa9R734+INOAqoTRRKu5QiO3GwY9DqYbj881S1ts/x54T6dZ+9NFRSb49wDj2k7eBin1XuociwAgMVdcC741cXHflB+0RsQGXS6EueBQ3s756PHJ4jogOskjsmqnGQRsMT/uOZ8B9nQfMSB874bUxHnh1XUmv+VT77TY1ad4lJOKEyWl0nVvmOdt4KeKiz1xv5tFWa9f7vQq4WCA7OLJ5UAun9ksubR2Kd1UwdHvaE7I6wyO/FnrMMyZqNwNjL1bjwf6W7leauNsUfycTk6Xl5YEoJAzknRx+WdASDsQ== 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=FxGru8PK9rDs5PwRinBoqTOFq3Z7zxiNVCdZBIjh3HA=; b=SvnTgK4rfI2eytBOl2wzSTHCk8B0+m9N3ETFj62+xV3Us1DDSoI8XzGoKYzvlaBdDO31HMDRt4UzsRULEfFz0w7qum0vF9xw4zgGwKjfwNLT05GU4ikTQsVgwkHYkAvIDx9qNgqcY50xNDEtc4zgnj3V4F31mjI4r3JPQFUoreadtpb5Wny1bkE5OgCZCk49fDVchhjgJO+9e5NJsV6yN92NAYXHVUSQ4q2HHbcwAcTLkiFxW04vpiEsn4YN3dPQj010h7M18zuS/DpUt8rZI6K6kNI6GUEdvQlyIK/ZLXzYWfx3fPzSbvbq13cpA4hIOYiXrnJisNpeGMUJQ2bGwQ== 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=FxGru8PK9rDs5PwRinBoqTOFq3Z7zxiNVCdZBIjh3HA=; b=iaTTrR7tC/crsrKznMrWNFBhXPSEQY2Ir/GGTw9PKsiZuq/UO3+SWWn4NU6cs6EtPMsrscmLRHdtkYc0+S3LY3BvZAOwQcbwqmgydlscFJ5V4PiqcvoMqN9d39Q+s3T5pZp3D7Wp7K1k2qLv1dZ+UnbjgVNi2/lIKeGIs3WAIx8= 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 05/47] hw/arm/xlnx-versal: sdhci: refactor creation Date: Fri, 12 Sep 2025 12:00:14 +0200 Message-ID: <20250912100059.103997-6-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-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: DS1PEPF0001709A:EE_|PH7PR12MB7257:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d240508-1327-4fe4-7b88-08ddf1e38402 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?808aaxlEIEylq5siaeFZFTvuJfq+8FKFZ0TlqreiVUh9A648/gx6Cx2j633n?= =?us-ascii?Q?Zs4UkYgnFkZezBhkykJj3fPU8hLItgX7XErQJW6oiF2nBWZP63nvuzwjtvsy?= =?us-ascii?Q?GCeEmaTitz8rzEvZbZhnF5vR+wjKpyZe0OpcviFkjX6ddF4R4fY0f/mGm90l?= =?us-ascii?Q?Ukt4xIJdWTIEdLA+zBXrJspft87vvCBaJKoIfFNGxYpznGawQToqt7NjOk75?= =?us-ascii?Q?BBwi4D7kn2y7WwK2jZuyaZ4Z1jQKZnPX2fjcfxc0Nuk7mfgQJBwvY+3j0pgy?= =?us-ascii?Q?tb3468dlD8NypbAnAj9TNmyGHd+O6q232Ays2Rn7pye4+fMqWYrmxOAhBpQE?= =?us-ascii?Q?ps1sEr/GsUsu+ofdeR6/tRpZRC1IMosU6/vQlX3ChQfbPSp62qwsJbY7UHG+?= =?us-ascii?Q?ynuafizcg1sarOx/J4aPpUH76iuT5a6trdsoTC4VUSEwj6WJP2q1c+bc7HGG?= =?us-ascii?Q?bM+NaFX9+Jw9AtjFiErB2b0VdBYylYtuoIweccetD9QS3Mzp8FsRqPxt/yMt?= =?us-ascii?Q?UKvHfYvJ41YFfCr9Zrnf1KjHxMiTGDinThnBDGlZSk8fIp80E6HWovK1qYnH?= =?us-ascii?Q?0YPQHb66GUoJfcP99+Oa2BkVtjiBDZxnZZ6NEE00iKAQFZbv9DOfsdrqoH0z?= =?us-ascii?Q?iZOC3boPsw6+g+XdcXhraNO4xIfXnajXPFFBtq36WuXDRndukcDYD+WzanRO?= =?us-ascii?Q?AzkLT2HjqrwsJdhLOP/Zh4d76GS7989iB6omSqWEeMp/gGuEj+ma29XuViaP?= =?us-ascii?Q?kVABBJNr6UWLBrWu2KNfkJv0pCNRvQQfaVbi66d39Sr+Micp3miatyr/Tvuh?= =?us-ascii?Q?31zlM/42nGYK3L7yYUAe5UNEy4FUp3z7cs5Mot3f7gDl7ogLYfnIMjMypTm7?= =?us-ascii?Q?Zhczvcr1fxI5PzyXqvAMK0IlKzSmbnXg247jlCdCs7+i8tP5fjUZ+5QDERB2?= =?us-ascii?Q?4wMFlpKTtArVTLOZfLrv7NDk+gdJwAVecaxwdLBJ9zfZFFVCDyvbushKfpOW?= =?us-ascii?Q?wG3Glqs4VpGIS6E2CC1t78kmf6WFsaI/qxSwTdtTg12z0FTstoCWDEI62r+3?= =?us-ascii?Q?RCr2dkdypTwbCw5LZfxcanVJYZJK9b5kpuuAg++2q0efxL+fVEPH7QFcOqet?= =?us-ascii?Q?4pVocD4rABJb4mXKZ/GUmUZ+LGf/f1VzD/nc4TSF9YsTN5nEJNYyD2piQv2o?= =?us-ascii?Q?wxUArHTdvk6L3QL3qoDmEFJMEBPEGtuuVAyX+Dh8uZNQEa0CuwGCRlrJVfFN?= =?us-ascii?Q?S4A+VCFvBNCWS+pFf1QfYsdn/W0ly1/kImDJavuWl42+RyG9BzAHnAB4EEQ2?= =?us-ascii?Q?PcNnDUmCGb9INhZfYlCocEmUMQZKDXg0P2KGWwyWYI3XgmzghpoJHSobinmp?= =?us-ascii?Q?+MiishI0mTy0LV9MUn+h+DK0XGTLVtk/ovoCvFRUKqZIEBUVGI4TY4gCgeQY?= =?us-ascii?Q?0EAC8tcbTFCjdmPwVfStmiYLBLEttdjqV/55zhrGzl8j9A3VUNAfO8OOJdUZ?= =?us-ascii?Q?SgUhdmkta24+GFwJcP4aZuYBqzjPl6quQnz+?= 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)(36860700013)(376014)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2025 10:02:43.0280 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d240508-1327-4fe4-7b88-08ddf1e38402 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: DS1PEPF0001709A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7257 Received-SPF: permerror client-ip=2a01:111:f403:2412::604; envelope-from=Luc.Michel@amd.com; helo=NAM10-MW2-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: 1757672003171116600 Content-Type: text/plain; charset="utf-8" Refactor the SDHCI controllers creation using the VersalMap structure. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias --- include/hw/arm/xlnx-versal.h | 5 +- hw/arm/xlnx-versal-virt.c | 43 ++-------------- hw/arm/xlnx-versal.c | 96 ++++++++++++++++++++++++++++-------- 3 files changed, 83 insertions(+), 61 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 007c91b596e..4a7a2d85aac 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -14,11 +14,10 @@ #define XLNX_VERSAL_H =20 #include "hw/sysbus.h" #include "hw/cpu/cluster.h" #include "hw/or-irq.h" -#include "hw/sd/sdhci.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" @@ -103,11 +102,10 @@ struct Versal { } lpd; =20 /* The Platform Management Controller subsystem. */ struct { struct { - SDHCIState sd[XLNX_VERSAL_NR_SDS]; XlnxVersalPmcIouSlcr slcr; =20 struct { XlnxVersalOspi ospi; XlnxCSUDMA dma_src; @@ -154,11 +152,14 @@ static inline void versal_set_fdt(Versal *s, void *fd= t) { g_assert(!qdev_is_realized(DEVICE(s))); s->cfg.fdt =3D fdt; } =20 +void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk); + int versal_get_num_can(VersalVersion version); +int versal_get_num_sdhci(VersalVersion version); =20 /* Memory-map and IRQ definitions. Copied a subset from * auto-generated files. */ =20 #define VERSAL_GIC_MAINT_IRQ 9 diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 334252564be..52852082d4b 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -282,36 +282,10 @@ static void fdt_add_zdma_nodes(VersalVirt *s) qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat= )); g_free(name); } } =20 -static void fdt_add_sd_nodes(VersalVirt *s) -{ - const char clocknames[] =3D "clk_xin\0clk_ahb"; - const char compat[] =3D "arasan,sdhci-8.9a"; - int i; - - for (i =3D ARRAY_SIZE(s->soc.pmc.iou.sd) - 1; i >=3D 0; i--) { - uint64_t addr =3D MM_PMC_SD0 + MM_PMC_SD0_SIZE * i; - char *name =3D g_strdup_printf("/sdhci@%" PRIx64, addr); - - qemu_fdt_add_subnode(s->fdt, name); - - 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, VERSAL_SD0_IRQ_0 + i = * 2, - GIC_FDT_IRQ_FLAGS_LEVEL_HI); - qemu_fdt_setprop_sized_cells(s->fdt, name, "reg", - 2, addr, 2, MM_PMC_SD0_SIZE); - qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat= )); - g_free(name); - } -} - static void fdt_add_rtc_node(VersalVirt *s) { const char compat[] =3D "xlnx,zynqmp-rtc"; const char interrupt_names[] =3D "alarm\0sec"; char *name =3D g_strdup_printf("/rtc@%x", MM_PMC_RTC); @@ -562,20 +536,15 @@ static void efuse_attach_drive(XlnxEFuse *dev) if (blk) { qdev_prop_set_drive(DEVICE(dev), "drive", blk); } } =20 -static void sd_plugin_card(SDHCIState *sd, DriveInfo *di) +static void sd_plug_card(VersalVirt *s, int idx, DriveInfo *di) { BlockBackend *blk =3D di ? blk_by_legacy_dinfo(di) : NULL; - DeviceState *card; =20 - card =3D qdev_new(TYPE_SD_CARD); - object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card)); - qdev_prop_set_drive_err(card, "drive", blk, &error_fatal); - qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sd), "sd-bus"), - &error_fatal); + versal_sdhci_plug_card(&s->soc, idx, blk); } =20 static char *versal_get_ospi_model(Object *obj, Error **errp) { VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); @@ -646,11 +615,10 @@ static void versal_virt_init(MachineState *machine) 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_sd_nodes(s); fdt_add_rtc_node(s); fdt_add_bbram_node(s); fdt_add_efuse_ctrl_node(s); fdt_add_efuse_cache_node(s); fdt_add_cpu_nodes(s, psci_conduit); @@ -666,14 +634,13 @@ static void versal_virt_init(MachineState *machine) bbram_attach_drive(&s->soc.pmc.bbram); =20 /* Attach efuse backend, if given */ efuse_attach_drive(&s->soc.pmc.efuse); =20 - /* Plugin SD cards. */ - for (i =3D 0; i < ARRAY_SIZE(s->soc.pmc.iou.sd); i++) { - sd_plugin_card(&s->soc.pmc.iou.sd[i], - drive_get(IF_SD, 0, i)); + /* Plug SD cards */ + for (i =3D 0; i < versal_get_num_sdhci(VERSAL_VER_VERSAL); i++) { + sd_plug_card(s, i, drive_get(IF_SD, 0, i)); } =20 s->binfo.ram_size =3D machine->ram_size; s->binfo.loader_start =3D 0x0; s->binfo.get_dtb =3D versal_virt_get_dtb; diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 7ed1001dab3..4b4cca0487d 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -26,10 +26,11 @@ #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" +#include "hw/sd/sdhci.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 @@ -45,20 +46,27 @@ typedef struct VersalMap { VersalSimplePeriphMap uart[2]; size_t num_uart; =20 VersalSimplePeriphMap canfd[4]; size_t num_canfd; + + VersalSimplePeriphMap sdhci[2]; + size_t num_sdhci; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, .num_uart =3D 2, =20 .canfd[0] =3D { 0xff060000, 20 }, .canfd[1] =3D { 0xff070000, 21 }, .num_canfd =3D 2, + + .sdhci[0] =3D { 0xf1040000, 126 }, + .sdhci[1] =3D { 0xf1050000, 128 }, + .num_sdhci =3D 2, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -71,10 +79,22 @@ static inline VersalVersion versal_get_version(Versal *= s) static inline const VersalMap *versal_get_map(Versal *s) { return VERSION_TO_MAP[versal_get_version(s)]; } =20 +static inline Object *versal_get_child(Versal *s, const char *child) +{ + return object_resolve_path_at(OBJECT(s), child); +} + +static inline Object *versal_get_child_idx(Versal *s, const char *child, + size_t idx) +{ + g_autofree char *n =3D g_strdup_printf("%s[%zu]", child, idx); + + return versal_get_child(s, n); +} =20 static qemu_irq versal_get_irq(Versal *s, int irq_idx) { return qdev_get_gpio_in(DEVICE(&s->fpd.apu.gic), irq_idx); } @@ -422,36 +442,43 @@ static void versal_create_admas(Versal *s, qemu_irq *= pic) g_free(name); } } =20 #define SDHCI_CAPABILITIES 0x280737ec6481 /* Same as on ZynqMP. */ -static void versal_create_sds(Versal *s, qemu_irq *pic) +static void versal_create_sdhci(Versal *s, + const VersalSimplePeriphMap *map) { - int i; + DeviceState *dev; + MemoryRegion *mr; + g_autofree char *node; + const char compatible[] =3D "arasan,sdhci-8.9a"; + const char clocknames[] =3D "clk_xin\0clk_ahb"; =20 - for (i =3D 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) { - DeviceState *dev; - MemoryRegion *mr; + dev =3D qdev_new(TYPE_SYSBUS_SDHCI); + object_property_add_child(OBJECT(s), "sdhci[*]", OBJECT(dev)); =20 - object_initialize_child(OBJECT(s), "sd[*]", &s->pmc.iou.sd[i], - TYPE_SYSBUS_SDHCI); - dev =3D DEVICE(&s->pmc.iou.sd[i]); + object_property_set_uint(OBJECT(dev), "sd-spec-version", 3, + &error_fatal); + object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES, + &error_fatal); + object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 - object_property_set_uint(OBJECT(dev), "sd-spec-version", 3, - &error_fatal); - object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIE= S, - &error_fatal); - object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal); - 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, map->addr, mr); =20 - mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); - memory_region_add_subregion(&s->mr_ps, - MM_PMC_SD0 + i * MM_PMC_SD0_SIZE, mr); + versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(dev), 0, map->irq); =20 - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, - pic[VERSAL_SD0_IRQ_0 + i * 2]); - } + node =3D versal_fdt_add_simple_subnode(s, "/sdhci", map->addr, 0x10000, + compatible, sizeof(compatible)); + 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_pmc_apb_irq_orgate(Versal *s, qemu_irq *pic) { DeviceState *orgate; @@ -1064,14 +1091,17 @@ static void versal_realize(DeviceState *dev, Error = **errp) =20 for (i =3D 0; i < map->num_canfd; i++) { versal_create_canfd(s, &map->canfd[i], s->cfg.canbus[i]); } =20 + for (i =3D 0; i < map->num_sdhci; i++) { + versal_create_sdhci(s, &map->sdhci[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); versal_create_rtc(s, pic); versal_create_trng(s, pic); versal_create_xrams(s, pic); versal_create_bbram(s, pic); @@ -1091,17 +1121,41 @@ 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 +void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk) +{ + DeviceState *sdhci, *card; + + sdhci =3D DEVICE(versal_get_child_idx(s, "sdhci", sd_idx)); + + if (sdhci =3D=3D NULL) { + return; + } + + card =3D qdev_new(TYPE_SD_CARD); + object_property_add_child(OBJECT(sdhci), "card[*]", OBJECT(card)); + qdev_prop_set_drive_err(card, "drive", blk, &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sdhci), "sd-bus= "), + &error_fatal); +} + int versal_get_num_can(VersalVersion version) { const VersalMap *map =3D VERSION_TO_MAP[version]; =20 return map->num_canfd; } =20 +int versal_get_num_sdhci(VersalVersion version) +{ + const VersalMap *map =3D VERSION_TO_MAP[version]; + + return map->num_sdhci; +} + static void versal_base_init(Object *obj) { Versal *s =3D XLNX_VERSAL_BASE(obj); size_t i, num_can; =20 --=20 2.50.1