From nobody Sun Sep 21 21:58:06 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=1757672174; cv=pass; d=zohomail.com; s=zohoarc; b=fekntmKhBODX9o+eoaUpO0SKcn8TzQtHeqP+pVbkYmPp2SvKMUuaCoNp0YGHFOksaoBK+rsuziDYThWD5lH3cCdwXTHPpK7TypN68jFbH+5/A9VsGfyVuzLJ2k7EciJziYH53M0JY/OZoLO1uiKBaEzfzEKe8bdImQXCmZ5mnbM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757672174; 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=X542wgyej7cmRr+0JGFeEHs1iGzwcKaNfStnxB6UduE=; b=b0J5QzK3GTTQmapbPAgjqn6lXgVfI6QTP9LLIVyS8Tf98GOCg4hu49g8D6Ii8dA82eEDg9sX9v+KyR8qUQqfOZ5ekM0jV4O2sY2A8M10v3J2q2/ZG70mW2BJFLKZEu1XxPu310LLZUCCShXTKFcbOCDCQprfA0WVP7r74tywVsY= 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 1757672174582312.52339061215946; Fri, 12 Sep 2025 03:16:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ux0cn-00074L-15; Fri, 12 Sep 2025 06:03:25 -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 1ux0cU-00063K-RZ; Fri, 12 Sep 2025 06:03:06 -0400 Received: from mail-bn8nam12on2062d.outbound.protection.outlook.com ([2a01:111:f403:2418::62d] 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 1ux0cP-0001IQ-SH; Fri, 12 Sep 2025 06:03:05 -0400 Received: from DM6PR03CA0060.namprd03.prod.outlook.com (2603:10b6:5:100::37) by DS0PR12MB8320.namprd12.prod.outlook.com (2603:10b6:8:f8::14) 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:52 +0000 Received: from DS3PEPF000099E1.namprd04.prod.outlook.com (2603:10b6:5:100:cafe::9b) by DM6PR03CA0060.outlook.office365.com (2603:10b6:5:100::37) 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:52 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by DS3PEPF000099E1.mail.protection.outlook.com (10.167.17.196) 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:51 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by satlexmb07.amd.com (10.181.42.216) 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:41 -0700 Received: from satlexmb08.amd.com (10.181.42.217) 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; Fri, 12 Sep 2025 05:01:41 -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:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c7EMDIPiuGbVOZT1/8qoAVqnZSqCwoEsXhKZLe36apNNDm3HXhaf6E4w4BvdNF082/iABbAy8H82VjlYoPaNuqZNXTY9oZd2P2Vc4rY/SX1sJG7wtd0OYZDUPtECHIWAbs5SfqiObenAlGMy3FzUqJ0Q1GfSirdB0miAWJmz8Wwiv1L4G8o96RcDKF0wdIk1CxqvYcqu9Jwxen2pV0HTPbyq0elc2aJ1ZnSzxDgz1atakz6lWm+RKaNRNPu3dnjDwakAN1qjAiF69NJA4L7C2ZTuKNMDpTglj8Vk7R2Qst54RBIKRd56P7W3cjlQW6v2j7YaYslD8CuQ+BGKvvPGKQ== 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=X542wgyej7cmRr+0JGFeEHs1iGzwcKaNfStnxB6UduE=; b=gJB7pt9ZHzxi99gxkB4ShQZLY/pV0pL0wyHOihIjjm2Vx4V3chV2iwk25/lHgJJgcUC+6CsXmh0F55l8RcJZpR3fVE89UMS8GoPXCGFSWH+U4yXpLHwhGSVFXKQkLuLbhX9CIKKtQGvko/0WafrrymiERfnuhD9Vcyyer71Y2fmwSJZiw5s2VdWQiCAV+6TaPVirCMt6EBk7BNnQAS5NIDuiUlDwJiwU80FDOnM7myhE5InxFX963fczV0XXqS4ynSyOgp/4oEXw5GJpS6ZZrxVk9NmnGx8NSeuSwBzM5iEFnah3wNQApu2wi3w2B1nIKLy2m1EeAvAaRsXcPZ+jpw== 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=X542wgyej7cmRr+0JGFeEHs1iGzwcKaNfStnxB6UduE=; b=Ay7cq0jUwT1y5upsp/GKbDHLq3IoO+vQy4XNhGcmLru1Z4MOiCkLtgbGyfI1EufESn0Daul4alAwD9N0F7fR3ysv60mGBxi/0k5Si/ovD44NvHrmqo0t7vQJSRg51z4wG6BdQiU30yS8/w1vHBY13HYoSjI4anJlMJ8/cUl7+pw= 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=satlexmb07.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 11/47] hw/arm/xlnx-versal: ospi: refactor creation Date: Fri, 12 Sep 2025 12:00:20 +0200 Message-ID: <20250912100059.103997-12-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E1:EE_|DS0PR12MB8320:EE_ X-MS-Office365-Filtering-Correlation-Id: b876ff36-843f-4915-6f5b-08ddf1e38944 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rJtaQOmoczmxMerOjWaYHHSZjmWVT5cCOGVZDV/CnHzUfAPkxu3H1JFxNIcZ?= =?us-ascii?Q?ZSqsstM6YB2CLqSC/ApFg/LcBRZaDteahKug6HZHTA7EPwnN7qrJZVDDJTLg?= =?us-ascii?Q?AA9ood14yj9io0ybINmhR9C7idj1Yu+ZrA7Y8nzxq1+DYFaQ9rIvx0/C8hMq?= =?us-ascii?Q?L+DF84NA4X5oWA4+Wq1eoT2ckhLPOXlYV6fUZhLesbybOXFdPhw/+aanOmll?= =?us-ascii?Q?o59i9syw/iW7pktgsWd/CWYei5DqYpJtTrK3IM0gRFkYwkdAKv2WcAViqW5p?= =?us-ascii?Q?tw4+ac13TpgbcSjLTxHn4bWMGSWXGJpQf8pPPNTukZgcfLY8FlIzHXUFQjTX?= =?us-ascii?Q?JZNokHIa8jQNHP0vgBTgy9Id/d7OU0rLunc7Wo9iDeGz5zeJYVbTZa0U24to?= =?us-ascii?Q?nKhrVD1OGlYdiuhSTo0FuD48P9gH4gMhj6sh/hWTkJrP6RbsfDNa/AVbLUgT?= =?us-ascii?Q?ZGQzJhG6063W8hPdDb2jZE82/c7LyF+8J8hGyrDXjFyZwZG7GE+38XtvY/UJ?= =?us-ascii?Q?Vch7SEX2BMSlYLTc7dqKQZqEMC0RsPDhBmkeQkBvxPhVBjFCLsOQZUGir87e?= =?us-ascii?Q?n3EULsIDO0TuLkYMB8x7tCdY3F40QP5ZwKPnjEcrFDZemqPnJQdADaw3GP5A?= =?us-ascii?Q?eZPDFRRjILaVKTqYEgjYySgk8yy8wBxxAeYLkit9pjZe6lLAy4NA3CJvSuiB?= =?us-ascii?Q?75DoAPqCdFcqTPkzC8fl8oUT6YDWjSMPxmHkt8m7jEBSn7E6PdNxXfOHi6IW?= =?us-ascii?Q?H8s3NOwP+agXy2bVf7G66sM0la2yTh48nGr0VHbiL65AJJSwQ8ia3YduyjoH?= =?us-ascii?Q?UJZ3QyAINwv/MsiDbVWDcbFGtKmZBjPVfWog9kU2XT5rEkaGJ9mqTEN/vhwW?= =?us-ascii?Q?lGfe0Zo16OMYcZaQi/kOPv3jkpPXdzn72Pj8a6UGttqEitQD7phRM3w7MUuU?= =?us-ascii?Q?bEIS5AYJky1xnS8k6024Asn0R8nERTUUf+vxlownAXOjzBTfAxFR1Kt+6mwL?= =?us-ascii?Q?jbs5ttzeO12ktUqCh8Z5h1lUukm3T/5E0epeji8towxNOmSwjHbj9A/4kgid?= =?us-ascii?Q?vXQaAEE9EIJFF13a7jvex6IWQbCqdu98SnfGFGDVzbHQMKmN/4lqnyWlYHJl?= =?us-ascii?Q?JR7Ic6oqlgpHRDSAGCIa7000OX/SoDL42pUTekOahLH/pgh2yBOeCexdSYz3?= =?us-ascii?Q?nr1BoF7JApgXaUp77Hbx4VT3tyDSNiz6gt+Ay8Pw6rD+GHc513SOX9+ZgR78?= =?us-ascii?Q?lY/C7z3GpeNzZJ5NGV2xx1KQRU5k6skmK2g+wKLORBeaBuj+CgiCqPxXa+oz?= =?us-ascii?Q?+67V8Yr+W66R7KHtMf2lK9ITL7z9lrmyHMo/OfUZMbhR5QSHMdYYjplfef/s?= =?us-ascii?Q?BtAYFHBOaTYSalD9KDsOvaqfrHymnwRq/Cz9dZH5pnVYXBqbkpjo8xFcNIVg?= =?us-ascii?Q?9xcyfj/WDwN6l0NPZedmudzWSkxMiPN54kaye/NjOqNFKUCPX/smNGP4qDcU?= =?us-ascii?Q?u0l/I0EzmiZf3lxWbC4Z8t0aCiYS/+6M4Y1E?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2025 10:02:51.8509 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b876ff36-843f-4915-6f5b-08ddf1e38944 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E1.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8320 Received-SPF: permerror client-ip=2a01:111:f403:2418::62d; 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: 1757672175478116600 Content-Type: text/plain; charset="utf-8" Refactor the OSPI controller creation using the VersalMap structure. Note that the connection to the PMC IOU SLCR 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 | 12 +-- hw/arm/xlnx-versal-virt.c | 41 ++++------ hw/arm/xlnx-versal.c | 142 ++++++++++++++++++++--------------- 3 files changed, 98 insertions(+), 97 deletions(-) diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 79ca9b13321..b7ef255d6fd 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -18,12 +18,10 @@ #include "hw/or-irq.h" #include "hw/intc/arm_gicv3.h" #include "hw/rtc/xlnx-zynqmp-rtc.h" #include "qom/object.h" #include "hw/nvram/xlnx-bbram.h" -#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 "net/can_emu.h" #include "hw/misc/xlnx-versal-cfu.h" @@ -86,18 +84,10 @@ struct Versal { =20 /* The Platform Management Controller subsystem. */ struct { struct { XlnxVersalPmcIouSlcr slcr; - - struct { - XlnxVersalOspi ospi; - XlnxCSUDMA dma_src; - XlnxCSUDMA dma_dst; - MemoryRegion linear_mr; - OrIRQState irq_orgate; - } ospi; } iou; =20 XlnxZynqMPRTC rtc; XlnxVersalTRng trng; XlnxBBRam bbram; @@ -134,10 +124,12 @@ static inline void versal_set_fdt(Versal *s, void *fd= t) s->cfg.fdt =3D fdt; } =20 void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk); void versal_efuse_attach_drive(Versal *s, BlockBackend *blk); +void versal_ospi_create_flash(Versal *s, int flash_idx, const char *flash_= mdl, + BlockBackend *blk); =20 int versal_get_num_can(VersalVersion version); int versal_get_num_sdhci(VersalVersion version); =20 /* Memory-map and IRQ definitions. Copied a subset from diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index b6c49dafe09..a948e24aea0 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -46,12 +46,12 @@ struct VersalVirt { =20 CanBusState **canbus; =20 struct { bool secure; + char *ospi_model; } cfg; - char *ospi_model; }; =20 static void fdt_create(VersalVirt *s) { MachineClass *mc =3D MACHINE_GET_CLASS(s); @@ -379,19 +379,19 @@ static void sd_plug_card(VersalVirt *s, int idx, Driv= eInfo *di) =20 static char *versal_get_ospi_model(Object *obj, Error **errp) { VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); =20 - return g_strdup(s->ospi_model); + return g_strdup(s->cfg.ospi_model); } =20 static void versal_set_ospi_model(Object *obj, const char *value, Error **= errp) { VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); =20 - g_free(s->ospi_model); - s->ospi_model =3D g_strdup(value); + g_free(s->cfg.ospi_model); + s->cfg.ospi_model =3D g_strdup(value); } =20 =20 static void versal_virt_init(MachineState *machine) { @@ -480,42 +480,31 @@ static void versal_virt_init(MachineState *machine) s->binfo.dtb_limit =3D 0x1000000; } arm_load_kernel(&s->soc.fpd.apu.cpu[0], machine, &s->binfo); =20 for (i =3D 0; i < XLNX_VERSAL_NUM_OSPI_FLASH; i++) { - BusState *spi_bus; - DeviceState *flash_dev; ObjectClass *flash_klass; - qemu_irq cs_line; DriveInfo *dinfo =3D drive_get(IF_MTD, 0, i); + BlockBackend *blk; + const char *mdl; =20 - spi_bus =3D qdev_get_child_bus(DEVICE(&s->soc.pmc.iou.ospi), "spi0= "); - - if (s->ospi_model) { - flash_klass =3D object_class_by_name(s->ospi_model); + if (s->cfg.ospi_model) { + flash_klass =3D object_class_by_name(s->cfg.ospi_model); if (!flash_klass || object_class_is_abstract(flash_klass) || !object_class_dynamic_cast(flash_klass, TYPE_M25P80)) { error_report("'%s' is either abstract or" - " not a subtype of m25p80", s->ospi_model); + " not a subtype of m25p80", s->cfg.ospi_model); exit(1); } + mdl =3D s->cfg.ospi_model; + } else { + mdl =3D "mt35xu01g"; } =20 - flash_dev =3D qdev_new(s->ospi_model ? s->ospi_model : "mt35xu01g"= ); - - if (dinfo) { - qdev_prop_set_drive_err(flash_dev, "drive", - blk_by_legacy_dinfo(dinfo), &error_fat= al); - } - qdev_prop_set_uint8(flash_dev, "cs", i); - qdev_realize_and_unref(flash_dev, spi_bus, &error_fatal); - - cs_line =3D qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS, 0); - - sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.pmc.iou.ospi), - i + 1, cs_line); + blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; + versal_ospi_create_flash(&s->soc, i, mdl, blk); } } =20 static void versal_virt_machine_instance_init(Object *obj) { @@ -540,11 +529,11 @@ static void versal_virt_machine_instance_init(Object = *obj) =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->cfg.ospi_model); g_free(s->canbus); } =20 static void versal_virt_machine_class_init(ObjectClass *oc, const void *da= ta) { diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 7aaa8dda077..4a70cb79bf9 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -32,10 +32,11 @@ #include "hw/net/cadence_gem.h" #include "hw/dma/xlnx-zdma.h" #include "hw/misc/xlnx-versal-xramc.h" #include "hw/usb/xlnx-usb-subsystem.h" #include "hw/nvram/xlnx-versal-efuse.h" +#include "hw/ssi/xlnx-versal-ospi.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 @@ -93,10 +94,19 @@ typedef struct VersalMap { struct VersalEfuseMap { uint64_t ctrl; uint64_t cache; int irq; } efuse; + + struct VersalOspiMap { + uint64_t ctrl; + uint64_t dac; + uint64_t dac_sz; + uint64_t dma_src; + uint64_t dma_dst; + int irq; + } ospi; } VersalMap; =20 static const VersalMap VERSAL_MAP =3D { .uart[0] =3D { 0xff000000, 18 }, .uart[1] =3D { 0xff010000, 19 }, @@ -126,10 +136,17 @@ static const VersalMap VERSAL_MAP =3D { =20 .usb[0] =3D { .xhci =3D 0xfe200000, .ctrl =3D 0xff9d0000, .irq =3D 22 = }, .num_usb =3D 1, =20 .efuse =3D { .ctrl =3D 0xf1240000, .cache =3D 0xf1250000, .irq =3D 139= }, + + .ospi =3D { + .ctrl =3D 0xf1010000, + .dac =3D 0xc0000000, .dac_sz =3D 0x20000000, + .dma_src =3D 0xf1011000, .dma_dst =3D 0xf1011800, + .irq =3D 124, + }, }; =20 static const VersalMap *VERSION_TO_MAP[] =3D { [VERSAL_VER_VERSAL] =3D &VERSAL_MAP, }; @@ -813,99 +830,78 @@ static void versal_create_pmc_iou_slcr(Versal *s, qem= u_irq *pic) =20 sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(DEVICE(&s->pmc.apb_irq_orgate), 2)= ); } =20 -static void versal_create_ospi(Versal *s, qemu_irq *pic) +static DeviceState *versal_create_ospi(Versal *s, + const struct VersalOspiMap *map) { SysBusDevice *sbd; MemoryRegion *mr_dac; - qemu_irq ospi_mux_sel; - DeviceState *orgate; + DeviceState *dev, *dma_dst, *dma_src, *orgate; + MemoryRegion *linear_mr =3D g_new(MemoryRegion, 1); =20 - memory_region_init(&s->pmc.iou.ospi.linear_mr, OBJECT(s), - "versal-ospi-linear-mr" , MM_PMC_OSPI_DAC_SIZE); + dev =3D qdev_new(TYPE_XILINX_VERSAL_OSPI); + object_property_add_child(OBJECT(s), "ospi", OBJECT(dev)); =20 - object_initialize_child(OBJECT(s), "versal-ospi", &s->pmc.iou.ospi.osp= i, - TYPE_XILINX_VERSAL_OSPI); + memory_region_init(linear_mr, OBJECT(dev), "linear-mr", map->dac_sz); =20 - mr_dac =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->pmc.iou.ospi.ospi= ), 1); - memory_region_add_subregion(&s->pmc.iou.ospi.linear_mr, 0x0, mr_dac); + mr_dac =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1); + memory_region_add_subregion(linear_mr, 0x0, mr_dac); =20 /* Create the OSPI destination DMA */ - object_initialize_child(OBJECT(s), "versal-ospi-dma-dst", - &s->pmc.iou.ospi.dma_dst, - TYPE_XLNX_CSU_DMA); + dma_dst =3D qdev_new(TYPE_XLNX_CSU_DMA); + object_property_add_child(OBJECT(dev), "dma-dst-dev", OBJECT(dma_dst)); + object_property_set_link(OBJECT(dma_dst), "dma", + OBJECT(get_system_memory()), &error_abort); =20 - object_property_set_link(OBJECT(&s->pmc.iou.ospi.dma_dst), - "dma", OBJECT(get_system_memory()), - &error_abort); + sbd =3D SYS_BUS_DEVICE(dma_dst); + sysbus_realize_and_unref(sbd, &error_fatal); =20 - sbd =3D SYS_BUS_DEVICE(&s->pmc.iou.ospi.dma_dst); - sysbus_realize(sbd, &error_fatal); - - memory_region_add_subregion(&s->mr_ps, MM_PMC_OSPI_DMA_DST, + memory_region_add_subregion(&s->mr_ps, map->dma_dst, sysbus_mmio_get_region(sbd, 0)); =20 /* Create the OSPI source DMA */ - object_initialize_child(OBJECT(s), "versal-ospi-dma-src", - &s->pmc.iou.ospi.dma_src, - TYPE_XLNX_CSU_DMA); + dma_src =3D qdev_new(TYPE_XLNX_CSU_DMA); + object_property_add_child(OBJECT(dev), "dma-src-dev", OBJECT(dma_src)); =20 - object_property_set_bool(OBJECT(&s->pmc.iou.ospi.dma_src), "is-dst", - false, &error_abort); + object_property_set_bool(OBJECT(dma_src), "is-dst", false, &error_abor= t); =20 - object_property_set_link(OBJECT(&s->pmc.iou.ospi.dma_src), - "dma", OBJECT(mr_dac), &error_abort); - - object_property_set_link(OBJECT(&s->pmc.iou.ospi.dma_src), - "stream-connected-dma", - OBJECT(&s->pmc.iou.ospi.dma_dst), + object_property_set_link(OBJECT(dma_src), "dma", OBJECT(mr_dac), &error_abort); =20 - sbd =3D SYS_BUS_DEVICE(&s->pmc.iou.ospi.dma_src); - sysbus_realize(sbd, &error_fatal); + object_property_set_link(OBJECT(dma_src), "stream-connected-dma", + OBJECT(dma_dst), &error_abort); =20 - memory_region_add_subregion(&s->mr_ps, MM_PMC_OSPI_DMA_SRC, + sbd =3D SYS_BUS_DEVICE(dma_src); + sysbus_realize_and_unref(sbd, &error_fatal); + + memory_region_add_subregion(&s->mr_ps, map->dma_src, sysbus_mmio_get_region(sbd, 0)); =20 /* Realize the OSPI */ - object_property_set_link(OBJECT(&s->pmc.iou.ospi.ospi), "dma-src", - OBJECT(&s->pmc.iou.ospi.dma_src), &error_abor= t); + object_property_set_link(OBJECT(dev), "dma-src", + OBJECT(dma_src), &error_abort); =20 - sbd =3D SYS_BUS_DEVICE(&s->pmc.iou.ospi.ospi); - sysbus_realize(sbd, &error_fatal); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); =20 - memory_region_add_subregion(&s->mr_ps, MM_PMC_OSPI, + memory_region_add_subregion(&s->mr_ps, map->ctrl, sysbus_mmio_get_region(sbd, 0)); =20 - memory_region_add_subregion(&s->mr_ps, MM_PMC_OSPI_DAC, - &s->pmc.iou.ospi.linear_mr); - - /* ospi_mux_sel */ - ospi_mux_sel =3D qdev_get_gpio_in_named(DEVICE(&s->pmc.iou.ospi.ospi), - "ospi-mux-sel", 0); - qdev_connect_gpio_out_named(DEVICE(&s->pmc.iou.slcr), "ospi-mux-sel", = 0, - ospi_mux_sel); + memory_region_add_subregion(&s->mr_ps, map->dac, + linear_mr); =20 /* OSPI irq */ - object_initialize_child(OBJECT(s), "ospi-irq-orgate", - &s->pmc.iou.ospi.irq_orgate, TYPE_OR_IRQ); - object_property_set_int(OBJECT(&s->pmc.iou.ospi.irq_orgate), - "num-lines", NUM_OSPI_IRQ_LINES, &error_fatal); + orgate =3D create_or_gate(s, OBJECT(dev), "irq-orgate", NUM_OSPI_IRQ_L= INES, + map->irq); =20 - orgate =3D DEVICE(&s->pmc.iou.ospi.irq_orgate); - qdev_realize(orgate, NULL, &error_fatal); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(orgate, 0)= ); + sysbus_connect_irq(SYS_BUS_DEVICE(dma_src), 0, qdev_get_gpio_in(orgate= , 1)); + sysbus_connect_irq(SYS_BUS_DEVICE(dma_dst), 0, qdev_get_gpio_in(orgate= , 2)); =20 - sysbus_connect_irq(SYS_BUS_DEVICE(&s->pmc.iou.ospi.ospi), 0, - qdev_get_gpio_in(orgate, 0)); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->pmc.iou.ospi.dma_src), 0, - qdev_get_gpio_in(orgate, 1)); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->pmc.iou.ospi.dma_dst), 0, - qdev_get_gpio_in(orgate, 2)); - - qdev_connect_gpio_out(orgate, 0, pic[VERSAL_OSPI_IRQ]); + return dev; } =20 static void versal_create_cfu(Versal *s, qemu_irq *pic) { SysBusDevice *sbd; @@ -1268,17 +1264,17 @@ static void versal_realize(DeviceState *dev, Error = **errp) for (i =3D 0; i < map->num_usb; i++) { versal_create_usb(s, &map->usb[i]); } =20 versal_create_efuse(s, &map->efuse); + versal_create_ospi(s, &map->ospi); =20 versal_create_pmc_apb_irq_orgate(s, pic); versal_create_rtc(s, pic); versal_create_trng(s, pic); versal_create_bbram(s, pic); versal_create_pmc_iou_slcr(s, pic); - versal_create_ospi(s, pic); versal_create_crl(s, pic); versal_create_cfu(s, pic); versal_map_ddr(s); versal_unimp(s); =20 @@ -1320,10 +1316,34 @@ void versal_efuse_attach_drive(Versal *s, BlockBack= end *blk) } =20 qdev_prop_set_drive(efuse, "drive", blk); } =20 +void versal_ospi_create_flash(Versal *s, int flash_idx, const char *flash_= mdl, + BlockBackend *blk) +{ + BusState *spi_bus; + DeviceState *flash, *ospi; + qemu_irq cs_line; + + ospi =3D DEVICE(versal_get_child(s, "ospi")); + spi_bus =3D qdev_get_child_bus(ospi, "spi0"); + + flash =3D qdev_new(flash_mdl); + + if (blk) { + qdev_prop_set_drive_err(flash, "drive", blk, &error_fatal); + } + qdev_prop_set_uint8(flash, "cs", flash_idx); + qdev_realize_and_unref(flash, spi_bus, &error_fatal); + + cs_line =3D qdev_get_gpio_in_named(flash, SSI_GPIO_CS, 0); + + sysbus_connect_irq(SYS_BUS_DEVICE(ospi), + flash_idx + 1, cs_line); +} + int versal_get_num_can(VersalVersion version) { const VersalMap *map =3D VERSION_TO_MAP[version]; =20 return map->num_canfd; --=20 2.50.1