From nobody Wed May 15 07:30:47 2024 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=1693501103; cv=pass; d=zohomail.com; s=zohoarc; b=e2BOx0VWLQmdtthXJwlk7dkJBaHstqjpIxo7W+81BZQfXgjTF2SWsQnx2yIG3t/32Mb428TwbgoRWxFzXNNSIO3uXdAtjtZ3ENkYN9AE1zgsYtxHb54jpfhWBDZGwevFY8xO9NemJBU5CStaZF+4A8qvodEKOkMp+fViX+A+xIA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501103; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kYVIUFfhd7F1xKgc8Iym0/HlvpD4oHxvRPRdFOekGUs=; b=Z8fOZkA/OLMoSuyq3HNuiA2zvCaTyIS3woXe3bFUVmuaVx5RsJdWrle0FKORaiisFQtzTyo4zJtbFlDJkZhXMyaJRyYIxiHXpQwfiipDpbx4BdtuGmSZ7ZKOtSF4vza+Nlq3o7irXVkaDJyzJeauAwKhDq20+Pl3xEkz3UxgaIE= 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 1693501103320193.57594341986817; Thu, 31 Aug 2023 09:58:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkys-0001Br-LD; Thu, 31 Aug 2023 12:57:18 -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 1qbkyp-00017H-EO for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:15 -0400 Received: from mail-bn7nam10on20601.outbound.protection.outlook.com ([2a01:111:f400:7e8a::601] 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 1qbkyk-0003Xb-T0 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:14 -0400 Received: from MW3PR05CA0011.namprd05.prod.outlook.com (2603:10b6:303:2b::16) by LV8PR12MB9450.namprd12.prod.outlook.com (2603:10b6:408:202::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20; Thu, 31 Aug 2023 16:57:06 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:303:2b:cafe::d1) by MW3PR05CA0011.outlook.office365.com (2603:10b6:303:2b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.12 via Frontend Transport; Thu, 31 Aug 2023 16:57:06 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:05 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 11:57:04 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 09:57:04 -0700 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iApKE9hvKzDw/85HrmJb2AOVoELkYtCf+TAn/n2ECPuzG3HDsGj4x+VgAcm6VczFBAPAx95/zF3f+ZmquBkaP015Wm/D8oPWcVDzs57VGYW99stGGF7jMGX7C6xkemlW6IVhvS7OsBiNmQbt7vh+rlFZoFZ+6ZOHF036rWBXk+l/Rb2k3hVrLQ8jGZWRnb8UKhktoI/JtDSqEtdBXfBWHrOdyXvXoKU3q5TYP5lpW06BNBHr8zWgnO8evnRX7ZSBvPYiU2fxNykTKH0384W8Ztx3oqKpDjmjj0tPNzfV9MNC+UdU5MD/fNwhLcKmUY4zQXOEQlI7c/5m74aiXf67Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=kYVIUFfhd7F1xKgc8Iym0/HlvpD4oHxvRPRdFOekGUs=; b=ilps1ygCYxFZc2IFoZTlcG+kc9tsyJfdjgu4lT3LpIJWFB3hbokLoXs5+RU+FiztbenPLvRjrMvsNRKqXSsR0aaxcpwerdE+BCjdajgXF9uCWok3h3cG7Si9SwDrH5/CKKRs5ziz6WL2OMpG4JEySM1DWMFr2HX91gW0EJZKuNL12qcJkSd0uk/ayysK7IV+/HmaP/IGgzf1n5bfZwuyFYsi1zCyPzYAJiK/fLkRitKaTB+nm8DNvJTvwS44EGWuInLPxqcamClLoKdpj8kc0Jx12P/UPR2jSlimBgdETYgPQhGsg1bJQXTPaEvzQJyISdxFnqSG0sJMpDvSUVHUsw== 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 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=kYVIUFfhd7F1xKgc8Iym0/HlvpD4oHxvRPRdFOekGUs=; b=M/oXbT1usP4wM5PnHfEopTkNisLT8OzYMp87zrZGscZw7B3shM5j0xRiJfgGfr2GG58qGQcgTx9vCngzmW2Y+wWVgDOK58q5KyurqtCkqjZJP9nu5UAPQa3T9KuOvsxzZns44Ca4gLAr1lvl+44R6xOsGzeASTL/RPfox7ZDuDI= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 1/8] hw/misc: Introduce the Xilinx CFI interface Date: Thu, 31 Aug 2023 17:56:54 +0100 Message-ID: <20230831165701.2016397-2-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|LV8PR12MB9450:EE_ X-MS-Office365-Filtering-Correlation-Id: ba239db0-07b7-42d5-389a-08dbaa434e46 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qqrGzMIqVcl5C/6cPhegegIxOgCsCRgLYfltjphgejyDrFai46Or37HcdjWnklBovTs5/pXfJkAI/JEPHhcErdfkYO+oGMHTCG7doDNUkcfrf2mp1tUDfmaRgttP20KAtkZjue07BovgXDlEORRnZuW8hbhIj42qZzMt5wMkhCrn/p9rCOf+gUwirieEEqj8Zfi+h4dfXA3hqnSlx4VBgHssYqCxJlVs1HBFPwwX9hwBilEtdmmCkxmi+XOPp6Yj1twkTRQumECqbCMpyN9pqIeo/dLeQ+PmbEwh4IqxC4OYEBj8t4INapDDfb4/eCu8TWNVeEzacF71xX2KsWz6eEcPh1XKRDFqHxTM25W0uuyGTNyLKyJX/LXRkHdv/emwf6dK/SDkAOCHXt5F7vLHP1uBh23//iCRabVpg3isktLl6VHQbUsoTywM8vXRvTr6DAPXzs6ddQW+LCqlfwULZpw2Wxb7Eay/tXNryJ9FgVD7XQEWXtLvc2KcAxko+X/Hx+OlVLu5Hg1foMG3FkjOhBsD8URaC+3H7Nym74wm63P5JOHjigcS2XY/6inWvjzP/ZWH/fjXK5K3ywO2RM3YMyC6Np7kjg4Xk9mn+KdIcrAbZG3boeT+iRaPaeC+0e4lqtZ1bQOmpzD+dt2kG01pwaWLZCePYgR6uhoUCzsOMa7ChQwOCduXciw1aH55kTmRiuI8tOv99dvaV21z8poR1dY9Fjtk8e3sb5TitxR5Y83DOvDX1cLxPO0kOWqTnTAGsovEIUUeaeCVkxp4IhdTQw== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(346002)(136003)(376002)(1800799009)(451199024)(186009)(82310400011)(40470700004)(46966006)(36840700001)(478600001)(40480700001)(40460700003)(54906003)(70586007)(70206006)(6916009)(82740400003)(81166007)(356005)(316002)(2906002)(41300700001)(2616005)(8676002)(86362001)(8936002)(5660300002)(4326008)(44832011)(426003)(47076005)(36860700001)(6666004)(26005)(336012)(1076003)(36756003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:05.4250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba239db0-07b7-42d5-389a-08dbaa434e46 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9450 Received-SPF: softfail client-ip=2a01:111:f400:7e8a::601; envelope-from=francisco.iglesias@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: 1693501104872100003 Content-Type: text/plain; charset="utf-8" Introduce the Xilinx Configuration Frame Interface (CFI) for transmitting CFI data packets between the Xilinx Configuration Frame Unit models (CFU_APB, CFU_FDRO and CFU_SFR), the Xilinx CFRAME controller (CFRAME_REG) and the Xilinx CFRAME broadcast controller (CFRAME_BCAST_REG) models (when emulating bitstream programming and readback). Signed-off-by: Francisco Iglesias Reviewed-by: Sai Pavan Boddu Acked-by: Edgar E. Iglesias --- MAINTAINERS | 6 ++++ hw/misc/meson.build | 1 + hw/misc/xlnx-cfi-if.c | 34 ++++++++++++++++++++ include/hw/misc/xlnx-cfi-if.h | 59 +++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 hw/misc/xlnx-cfi-if.c create mode 100644 include/hw/misc/xlnx-cfi-if.h diff --git a/MAINTAINERS b/MAINTAINERS index 6111b6b4d9..e0cd365462 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1034,6 +1034,12 @@ S: Maintained F: hw/ssi/xlnx-versal-ospi.c F: include/hw/ssi/xlnx-versal-ospi.h =20 +Xilinx Versal CFI +M: Francisco Iglesias +S: Maintained +F: hw/misc/xlnx-cfi-if.c +F: include/hw/misc/xlnx-cfi-if.h + STM32F100 M: Alexandre Iooss L: qemu-arm@nongnu.org diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 892f8b91c5..0c562f5e3e 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -97,6 +97,7 @@ specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: file= s('xlnx-versal-crl.c')) system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files( 'xlnx-versal-xramc.c', 'xlnx-versal-pmc-iou-slcr.c', + 'xlnx-cfi-if.c', )) system_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_s= yscfg.c')) system_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_s= yscfg.c')) diff --git a/hw/misc/xlnx-cfi-if.c b/hw/misc/xlnx-cfi-if.c new file mode 100644 index 0000000000..c45f05c4aa --- /dev/null +++ b/hw/misc/xlnx-cfi-if.c @@ -0,0 +1,34 @@ +/* + * Xilinx CFI interface + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#include "qemu/osdep.h" +#include "hw/misc/xlnx-cfi-if.h" + +void xlnx_cfi_transfer_packet(XlnxCfiIf *cfi_if, XlnxCfiPacket *pkt) +{ + XlnxCfiIfClass *xcic =3D XLNX_CFI_IF_GET_CLASS(cfi_if); + + if (xcic->cfi_transfer_packet) { + xcic->cfi_transfer_packet(cfi_if, pkt); + } +} + +static const TypeInfo xlnx_cfi_if_info =3D { + .name =3D TYPE_XLNX_CFI_IF, + .parent =3D TYPE_INTERFACE, + .class_size =3D sizeof(XlnxCfiIfClass), +}; + +static void xlnx_cfi_if_register_types(void) +{ + type_register_static(&xlnx_cfi_if_info); +} + +type_init(xlnx_cfi_if_register_types) + diff --git a/include/hw/misc/xlnx-cfi-if.h b/include/hw/misc/xlnx-cfi-if.h new file mode 100644 index 0000000000..f9bd12292d --- /dev/null +++ b/include/hw/misc/xlnx-cfi-if.h @@ -0,0 +1,59 @@ +/* + * Xilinx CFI interface + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef XLNX_CFI_IF_H +#define XLNX_CFI_IF_H 1 + +#include "qemu/help-texts.h" +#include "hw/hw.h" +#include "qom/object.h" + +#define TYPE_XLNX_CFI_IF "xlnx-cfi-if" +typedef struct XlnxCfiIfClass XlnxCfiIfClass; +DECLARE_CLASS_CHECKERS(XlnxCfiIfClass, XLNX_CFI_IF, TYPE_XLNX_CFI_IF) + +#define XLNX_CFI_IF(obj) \ + INTERFACE_CHECK(XlnxCfiIf, (obj), TYPE_XLNX_CFI_IF) + +typedef enum { + PACKET_TYPE_CFU =3D 0x52, + PACKET_TYPE_CFRAME =3D 0xA1, +} xlnx_cfi_packet_type; + +typedef enum { + CFRAME_FAR =3D 1, + CFRAME_SFR =3D 2, + CFRAME_FDRI =3D 4, + CFRAME_CMD =3D 6, +} xlnx_cfi_reg_addr; + +typedef struct XlnxCfiPacket { + uint8_t reg_addr; + uint32_t data[4]; +} XlnxCfiPacket; + +typedef struct XlnxCfiIf { + Object Parent; +} XlnxCfiIf; + +typedef struct XlnxCfiIfClass { + InterfaceClass parent; + + void (*cfi_transfer_packet)(XlnxCfiIf *cfi_if, XlnxCfiPacket *pkt); +} XlnxCfiIfClass; + +/** + * Transfer a XlnxCfiPacket. + * + * @cfi_if: the object implementing this interface + * @XlnxCfiPacket: a pointer to the XlnxCfiPacket to transfer + */ +void xlnx_cfi_transfer_packet(XlnxCfiIf *cfi_if, XlnxCfiPacket *pkt); + +#endif /* XLNX_CFI_IF_H */ --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501133; cv=pass; d=zohomail.com; s=zohoarc; b=V1hPmvZi+QFaH9LLvIuq/LAEcQrvM1OTWKvtxmhf+8BBAhU9A9rt428/yxMhBFhpUaDhp6Lm65nU4MHy3cTHnQhAEj8VAxWI6FfTQyF0Jf2e+I9zmYzri6dBeiRXZr7B9RzUs59WRBTUgEcUYTReisWoXMylhjA1RoeNvBnLlTU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501133; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e9SHItlAQjSTqN0xrYejzdl651JvBfZEfP1DZ2T+Oyg=; b=WH/SWc1k0hw9FA2lLYGqb/p24FEq63t8xT4mqCorDPOgVuMFBPD9dpOg/iOfLBNUoPvg+Qhqz19HVRoYuGxrlyLuy3nXIVaJcqRS6k9agxdZm2HrV2fVoKfc7s9le5FSF6NqHXBtj0AgZYXtsrXPUVjzGzPi8YqPYBX/8FNykI4= 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 1693501133697405.0187106142895; Thu, 31 Aug 2023 09:58:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzE-0001le-CU; Thu, 31 Aug 2023 12:57:40 -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 1qbkyq-00018y-NA for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:16 -0400 Received: from mail-dm6nam12on20612.outbound.protection.outlook.com ([2a01:111:f400:fe59::612] helo=NAM12-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 1qbkym-0003Ym-Q9 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:16 -0400 Received: from MW3PR05CA0007.namprd05.prod.outlook.com (2603:10b6:303:2b::12) by DS0PR12MB8413.namprd12.prod.outlook.com (2603:10b6:8:f9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20; Thu, 31 Aug 2023 16:57:06 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:303:2b:cafe::60) by MW3PR05CA0007.outlook.office365.com (2603:10b6:303:2b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.9 via Frontend Transport; Thu, 31 Aug 2023 16:57:06 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:06 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 11:57:06 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 09:57:06 -0700 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c60UDyTGM8Tm2TaE/zoP6l4ZLTBY7OYY5UTjy0cKfV22fZyWEgun75gq8T4u8RfNGUBv0yhuf722i3Mr5yGkn4DhhegBb/e5zzmsfvWYSXtVyhggBDejsc233uZ9Wbf3XgKNjLAets//y3wpnQVtyAfGUlYX8mbX0d4CGyI2tQM4mhmA2EpLdxytNA91uuKejQKCxHSnAyFFSAUWxKVmUhgk31RvvLKO+eTN7dIW6LIf8UY9lpmd+kjsmnw4ZT4hQMI2OvVRiF7f6winGCBnTQ5DxVOaTbM7OJTaUtH/863bMX7DfUOgY/+Yt3ztmJCiYndQBIP/2vmu9jpoFZdJIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=e9SHItlAQjSTqN0xrYejzdl651JvBfZEfP1DZ2T+Oyg=; b=c5+DvgyTbjFEJz0Xsu0NzDmZA7nZotDBkfmpi1MMEw4JDQ3mchml6t7ydwZlmj5IMOJxQ+3NIE87W1HwBKzpxVQug3d9BuFYqEUFiQoWbSKrkrozz4mfhvlH8Fll5N80m1Ho7PIFlWO8E9FXyvfju5iDFJYC4FtiXM8Nmh0GkH02quefY2N3wkzhNO9gDEULxhg+Rf8mdXTMpqLpG7WTMeIJDce6jCmSQnfv1h1okcH3wKuIr5coyKAu/dB7UKCPUR1GiDQoWTwhoQ2Lh08eaLk7fM8+U0Cv2uY6Irf23NjV4VYJ7WsapNP8NLa4YrmZVTvvu/n00vixt0PMBqrEqQ== 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 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=e9SHItlAQjSTqN0xrYejzdl651JvBfZEfP1DZ2T+Oyg=; b=VUccIYzorcYU11Nt5XnqtYjoRKjBjWw775r1ui+O0tFo/MfjnpdcrLpyY2OhHo75fc8zGn6WevGomJYoMy2p070Puf7BcETEJH1GT9ITRoZDDI3YAngJ/3Uk79m9yBMUsjlgkfbZA3r+yV/+cIYFi3zqjb/R0udPszUCe66c1aQ= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 2/8] hw/misc: Introduce a model of Xilinx Versal's CFU_APB Date: Thu, 31 Aug 2023 17:56:55 +0100 Message-ID: <20230831165701.2016397-3-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|DS0PR12MB8413:EE_ X-MS-Office365-Filtering-Correlation-Id: 93f59d0b-0f9e-467d-e20b-08dbaa434ef1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fkaVaCWVjkDt3EexX8+YVSA1AxjLqpacYK+xQxt6AjrYj/bABZ9XmNiqka1Jtpa3xtg/tRU+OQCsHTCtbs58zp+hs5i1n4naDZqcHxKQhPBBqEVPg9/vJJBcKJ/xGW56iQiODZnZ9noD/kg0QH9J3OwJCV25kUT0Bh0cTvcuqPOsyNjezBWX0fwLczrNTYcsF54KG2pYuqUHKnVMzahPn14saNES1gEoE4XMtQmNM+nCoHgE71qgGfUDALE2DPNqw8LwJxCDPHCZ4RoELlANQBVI5qxx8ubB4999HOHoOL2bjMO0fNbQZNH9DqpXA4lPK+KdkmMuTB6BS61m1GF7zs+bOzvMh/cBfjq03NLAmTjI8xGryFcjwr5RD2F9J+LPzgYy/bVv6+kWy3xQPJfT3pa5lkOYKPOGahX3SgiDTPKT2arCSPi4IUJ2b/PIiUcYgaCKKVP8RQUKVXENRWUbxMW8J5qA0adX+HPhkUMU8+GbSWwjapmhyp+tT7dyaqR3dbCA7mHMd0t2CsTeWqAIY6hbdE/1ok5Kfq6Y/eubmoHlzZcyrXyKVBqwd8MR0TRdEKaO7fHerYSRzHCG7MZunp3rPf0ZCBYiKfaHgc/ENMeqcB4ebbl6khlfC50QSfEhO0BH5TrmLvGs4g09WEcFWz3sTgDWq3wfuvuNQwv2aUcoX5hUdq0NJMzMFvTsuVU2reOqjXUjrh7XP+o0zG79XWEvoFwTq+zLytKG9Bv2mvaoVa3eOOsJHuTnf2Cx8Fav48dtvWS+2RmndxpRRGygSzHgubJq3998vBkQb+EpN3o= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(376002)(346002)(136003)(396003)(1800799009)(82310400011)(451199024)(186009)(40470700004)(46966006)(36840700001)(70206006)(41300700001)(8936002)(83380400001)(47076005)(40480700001)(336012)(36860700001)(8676002)(4326008)(966005)(478600001)(6666004)(6916009)(70586007)(316002)(2616005)(426003)(1076003)(26005)(54906003)(30864003)(2906002)(82740400003)(356005)(81166007)(5660300002)(40460700003)(36756003)(86362001)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:06.5656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93f59d0b-0f9e-467d-e20b-08dbaa434ef1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8413 Received-SPF: softfail client-ip=2a01:111:f400:fe59::612; envelope-from=francisco.iglesias@amd.com; helo=NAM12-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: 1693501135433100003 Content-Type: text/plain; charset="utf-8" Introduce a model of the software programming interface (CFU_APB) of Xilinx Versal's Configuration Frame Unit. Signed-off-by: Francisco Iglesias Reviewed-by: Peter Maydell --- MAINTAINERS | 2 + hw/misc/meson.build | 1 + hw/misc/xlnx-versal-cfu.c | 380 ++++++++++++++++++++++++++++++ include/hw/misc/xlnx-versal-cfu.h | 231 ++++++++++++++++++ 4 files changed, 614 insertions(+) create mode 100644 hw/misc/xlnx-versal-cfu.c create mode 100644 include/hw/misc/xlnx-versal-cfu.h diff --git a/MAINTAINERS b/MAINTAINERS index e0cd365462..847b997d73 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1039,6 +1039,8 @@ M: Francisco Iglesias S: Maintained F: hw/misc/xlnx-cfi-if.c F: include/hw/misc/xlnx-cfi-if.h +F: hw/misc/xlnx-versal-cfu.c +F: include/hw/misc/xlnx-versal-cfu.h =20 STM32F100 M: Alexandre Iooss diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 0c562f5e3e..d95cc3fd87 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -97,6 +97,7 @@ specific_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: file= s('xlnx-versal-crl.c')) system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files( 'xlnx-versal-xramc.c', 'xlnx-versal-pmc-iou-slcr.c', + 'xlnx-versal-cfu.c', 'xlnx-cfi-if.c', )) system_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_s= yscfg.c')) diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c new file mode 100644 index 0000000000..b2dc6ab211 --- /dev/null +++ b/hw/misc/xlnx-versal-cfu.c @@ -0,0 +1,380 @@ +/* + * QEMU model of the CFU Configuration Unit. + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Edgar E. Iglesias , + * Sai Pavan Boddu , + * Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "hw/irq.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/units.h" +#include "migration/vmstate.h" +#include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" +#include "hw/misc/xlnx-versal-cfu.h" + +#ifndef XLNX_VERSAL_CFU_APB_ERR_DEBUG +#define XLNX_VERSAL_CFU_APB_ERR_DEBUG 0 +#endif + +#define KEYHOLE_STREAM_4K (4 * KiB) +#define KEYHOLE_STREAM_256K (256 * KiB) +#define CFRAME_BROADCAST_ROW 0x1F + +bool update_wfifo(hwaddr addr, uint64_t value, + uint32_t *wfifo, uint32_t *wfifo_ret) +{ + unsigned int idx =3D extract32(addr, 2, 2); + + wfifo[idx] =3D value; + + if (idx =3D=3D 3) { + memcpy(wfifo_ret, wfifo, WFIFO_SZ * sizeof(uint32_t)); + memset(wfifo, 0, WFIFO_SZ * sizeof(uint32_t)); + return true; + } + + return false; +} + +static void cfu_imr_update_irq(XlnxVersalCFUAPB *s) +{ + bool pending =3D s->regs[R_CFU_ISR] & ~s->regs[R_CFU_IMR]; + qemu_set_irq(s->irq_cfu_imr, pending); +} + +static void cfu_isr_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(reg->opaque); + cfu_imr_update_irq(s); +} + +static uint64_t cfu_ier_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(reg->opaque); + uint32_t val =3D val64; + + s->regs[R_CFU_IMR] &=3D ~val; + cfu_imr_update_irq(s); + return 0; +} + +static uint64_t cfu_idr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(reg->opaque); + uint32_t val =3D val64; + + s->regs[R_CFU_IMR] |=3D val; + cfu_imr_update_irq(s); + return 0; +} + +static uint64_t cfu_itr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(reg->opaque); + uint32_t val =3D val64; + + s->regs[R_CFU_ISR] |=3D val; + cfu_imr_update_irq(s); + return 0; +} + +static void cfu_fgcr_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(reg->opaque); + uint32_t val =3D (uint32_t)val64; + + /* Do a scan. It always looks good. */ + if (FIELD_EX32(val, CFU_FGCR, SC_HBC_TRIGGER)) { + ARRAY_FIELD_DP32(s->regs, CFU_STATUS, SCAN_CLEAR_PASS, 1); + ARRAY_FIELD_DP32(s->regs, CFU_STATUS, SCAN_CLEAR_DONE, 1); + } +} + +static const RegisterAccessInfo cfu_apb_regs_info[] =3D { + { .name =3D "CFU_ISR", .addr =3D A_CFU_ISR, + .rsvd =3D 0xfffffc00, + .w1c =3D 0x3ff, + .post_write =3D cfu_isr_postw, + },{ .name =3D "CFU_IMR", .addr =3D A_CFU_IMR, + .reset =3D 0x3ff, + .rsvd =3D 0xfffffc00, + .ro =3D 0x3ff, + },{ .name =3D "CFU_IER", .addr =3D A_CFU_IER, + .rsvd =3D 0xfffffc00, + .pre_write =3D cfu_ier_prew, + },{ .name =3D "CFU_IDR", .addr =3D A_CFU_IDR, + .rsvd =3D 0xfffffc00, + .pre_write =3D cfu_idr_prew, + },{ .name =3D "CFU_ITR", .addr =3D A_CFU_ITR, + .rsvd =3D 0xfffffc00, + .pre_write =3D cfu_itr_prew, + },{ .name =3D "CFU_PROTECT", .addr =3D A_CFU_PROTECT, + .reset =3D 0x1, + },{ .name =3D "CFU_FGCR", .addr =3D A_CFU_FGCR, + .rsvd =3D 0xffff8000, + .post_write =3D cfu_fgcr_postw, + },{ .name =3D "CFU_CTL", .addr =3D A_CFU_CTL, + .rsvd =3D 0xffff0000, + },{ .name =3D "CFU_CRAM_RW", .addr =3D A_CFU_CRAM_RW, + .reset =3D 0x401f7d9, + .rsvd =3D 0xf8000000, + },{ .name =3D "CFU_MASK", .addr =3D A_CFU_MASK, + },{ .name =3D "CFU_CRC_EXPECT", .addr =3D A_CFU_CRC_EXPECT, + },{ .name =3D "CFU_CFRAME_LEFT_T0", .addr =3D A_CFU_CFRAME_LEFT_T0, + .rsvd =3D 0xfff00000, + },{ .name =3D "CFU_CFRAME_LEFT_T1", .addr =3D A_CFU_CFRAME_LEFT_T1, + .rsvd =3D 0xfff00000, + },{ .name =3D "CFU_CFRAME_LEFT_T2", .addr =3D A_CFU_CFRAME_LEFT_T2, + .rsvd =3D 0xfff00000, + },{ .name =3D "CFU_ROW_RANGE", .addr =3D A_CFU_ROW_RANGE, + .rsvd =3D 0xffffffc0, + .ro =3D 0x3f, + },{ .name =3D "CFU_STATUS", .addr =3D A_CFU_STATUS, + .rsvd =3D 0x80000000, + .ro =3D 0x7fffffff, + },{ .name =3D "CFU_INTERNAL_STATUS", .addr =3D A_CFU_INTERNAL_STATUS, + .rsvd =3D 0xff800000, + .ro =3D 0x7fffff, + },{ .name =3D "CFU_QWORD_CNT", .addr =3D A_CFU_QWORD_CNT, + .ro =3D 0xffffffff, + },{ .name =3D "CFU_CRC_LIVE", .addr =3D A_CFU_CRC_LIVE, + .ro =3D 0xffffffff, + },{ .name =3D "CFU_PENDING_READ_CNT", .addr =3D A_CFU_PENDING_READ_CN= T, + .rsvd =3D 0xfe000000, + .ro =3D 0x1ffffff, + },{ .name =3D "CFU_FDRI_CNT", .addr =3D A_CFU_FDRI_CNT, + .ro =3D 0xffffffff, + },{ .name =3D "CFU_ECO1", .addr =3D A_CFU_ECO1, + },{ .name =3D "CFU_ECO2", .addr =3D A_CFU_ECO2, + } +}; + +static void cfu_apb_reset(DeviceState *dev) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(dev); + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + memset(s->wfifo, 0, WFIFO_SZ * sizeof(uint32_t)); + + s->regs[R_CFU_STATUS] |=3D R_CFU_STATUS_HC_COMPLETE_MASK; + cfu_imr_update_irq(s); +} + +static const MemoryRegionOps cfu_apb_ops =3D { + .read =3D register_read_memory, + .write =3D register_write_memory, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static void cfu_transfer_cfi_packet(XlnxVersalCFUAPB *s, uint8_t row_addr, + XlnxCfiPacket *pkt) +{ + if (row_addr =3D=3D CFRAME_BROADCAST_ROW) { + for (int i =3D 0; i < ARRAY_SIZE(s->cfg.cframe); i++) { + if (s->cfg.cframe[i]) { + xlnx_cfi_transfer_packet(s->cfg.cframe[i], pkt); + } + } + } else { + assert(row_addr < ARRAY_SIZE(s->cfg.cframe)); + + if (s->cfg.cframe[row_addr]) { + xlnx_cfi_transfer_packet(s->cfg.cframe[row_addr], pkt); + } + } +} + +static uint64_t cfu_stream_read(void *opaque, hwaddr addr, unsigned size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported read from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); + return 0; +} + +static void cfu_stream_write(void *opaque, hwaddr addr, uint64_t value, + unsigned size) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(opaque); + uint32_t wfifo[WFIFO_SZ]; + + if (update_wfifo(addr, value, s->wfifo, wfifo)) { + uint8_t packet_type, row_addr, reg_addr; + + packet_type =3D extract32(wfifo[0], 24, 8); + row_addr =3D extract32(wfifo[0], 16, 5); + reg_addr =3D extract32(wfifo[0], 8, 6); + + /* Compressed bitstreams are not supported yet. */ + if (ARRAY_FIELD_EX32(s->regs, CFU_CTL, DECOMPRESS) =3D=3D 0) { + if (s->regs[R_CFU_FDRI_CNT]) { + XlnxCfiPacket pkt =3D { + .reg_addr =3D CFRAME_FDRI, + .data[0] =3D wfifo[0], + .data[1] =3D wfifo[1], + .data[2] =3D wfifo[2], + .data[3] =3D wfifo[3] + }; + + cfu_transfer_cfi_packet(s, s->fdri_row_addr, &pkt); + + s->regs[R_CFU_FDRI_CNT]--; + + } else if (packet_type =3D=3D PACKET_TYPE_CFU && + reg_addr =3D=3D CFRAME_FDRI) { + + /* Load R_CFU_FDRI_CNT, must be multiple of 25 */ + s->regs[R_CFU_FDRI_CNT] =3D wfifo[1]; + + /* Store target row_addr */ + s->fdri_row_addr =3D row_addr; + + if (wfifo[1] % 25 !=3D 0) { + qemu_log_mask(LOG_GUEST_ERROR, + "CFU FDRI_CNT is not loaded with " + "a multiple of 25 value\n"); + } + + } else if (packet_type =3D=3D PACKET_TYPE_CFRAME) { + XlnxCfiPacket pkt =3D { + .reg_addr =3D reg_addr, + .data[0] =3D wfifo[1], + .data[1] =3D wfifo[2], + .data[2] =3D wfifo[3], + }; + cfu_transfer_cfi_packet(s, row_addr, &pkt); + } + } + } +} + +static const MemoryRegionOps cfu_stream_ops =3D { + .read =3D cfu_stream_read, + .write =3D cfu_stream_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 8, + }, +}; + +static void cfu_apb_init(Object *obj) +{ + XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + unsigned int i; + char *name; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_VERSAL_CFU_APB, R_MAX * 4= ); + reg_array =3D + register_init_block32(DEVICE(obj), cfu_apb_regs_info, + ARRAY_SIZE(cfu_apb_regs_info), + s->regs_info, s->regs, + &cfu_apb_ops, + XLNX_VERSAL_CFU_APB_ERR_DEBUG, + R_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + for (i =3D 0; i < NUM_STREAM; i++) { + name =3D g_strdup_printf(TYPE_XLNX_VERSAL_CFU_APB "-stream%d", i); + memory_region_init_io(&s->iomem_stream[i], obj, &cfu_stream_ops, s, + name, i =3D=3D 0 ? KEYHOLE_STREAM_4K : + KEYHOLE_STREAM_256K); + sysbus_init_mmio(sbd, &s->iomem_stream[i]); + g_free(name); + } + sysbus_init_irq(sbd, &s->irq_cfu_imr); +} + +static Property cfu_props[] =3D { + DEFINE_PROP_LINK("cframe0", XlnxVersalCFUAPB, cfg.cframe[0], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe1", XlnxVersalCFUAPB, cfg.cframe[1], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe2", XlnxVersalCFUAPB, cfg.cframe[2], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe3", XlnxVersalCFUAPB, cfg.cframe[3], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe4", XlnxVersalCFUAPB, cfg.cframe[4], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe5", XlnxVersalCFUAPB, cfg.cframe[5], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe6", XlnxVersalCFUAPB, cfg.cframe[6], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe7", XlnxVersalCFUAPB, cfg.cframe[7], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe8", XlnxVersalCFUAPB, cfg.cframe[8], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe9", XlnxVersalCFUAPB, cfg.cframe[9], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe10", XlnxVersalCFUAPB, cfg.cframe[10], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe11", XlnxVersalCFUAPB, cfg.cframe[11], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe12", XlnxVersalCFUAPB, cfg.cframe[12], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe13", XlnxVersalCFUAPB, cfg.cframe[13], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe14", XlnxVersalCFUAPB, cfg.cframe[14], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_END_OF_LIST(), +}; + +static const VMStateDescription vmstate_cfu_apb =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_APB, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(wfifo, XlnxVersalCFUAPB, 4), + VMSTATE_UINT32_ARRAY(regs, XlnxVersalCFUAPB, R_MAX), + VMSTATE_UINT8(fdri_row_addr, XlnxVersalCFUAPB), + VMSTATE_END_OF_LIST(), + } +}; + +static void cfu_apb_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D cfu_apb_reset; + dc->vmsd =3D &vmstate_cfu_apb; + device_class_set_props(dc, cfu_props); +} + +static const TypeInfo cfu_apb_info =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_APB, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxVersalCFUAPB), + .class_init =3D cfu_apb_class_init, + .instance_init =3D cfu_apb_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_XLNX_CFI_IF }, + { } + } +}; + +static void cfu_apb_register_types(void) +{ + type_register_static(&cfu_apb_info); +} + +type_init(cfu_apb_register_types) diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versa= l-cfu.h new file mode 100644 index 0000000000..62d10caf27 --- /dev/null +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -0,0 +1,231 @@ +/* + * QEMU model of the CFU Configuration Unit. + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * References: + * [1] Versal ACAP Technical Reference Manual, + * https://www.xilinx.com/support/documentation/architecture-manuals/a= m011-versal-acap-trm.pdf + * + * [2] Versal ACAP Register Reference, + * https://www.xilinx.com/htmldocs/registers/am012/am012-versal-regist= er-reference.html + */ +#ifndef HW_MISC_XLNX_VERSAL_CFU_APB_H +#define HW_MISC_XLNX_VERSAL_CFU_APB_H + +#include "hw/sysbus.h" +#include "hw/register.h" +#include "hw/misc/xlnx-cfi-if.h" + +#define TYPE_XLNX_VERSAL_CFU_APB "xlnx,versal-cfu-apb" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUAPB, XLNX_VERSAL_CFU_APB) + +REG32(CFU_ISR, 0x0) + FIELD(CFU_ISR, USR_GTS_EVENT, 9, 1) + FIELD(CFU_ISR, USR_GSR_EVENT, 8, 1) + FIELD(CFU_ISR, SLVERR, 7, 1) + FIELD(CFU_ISR, DECOMP_ERROR, 6, 1) + FIELD(CFU_ISR, BAD_CFI_PACKET, 5, 1) + FIELD(CFU_ISR, AXI_ALIGN_ERROR, 4, 1) + FIELD(CFU_ISR, CFI_ROW_ERROR, 3, 1) + FIELD(CFU_ISR, CRC32_ERROR, 2, 1) + FIELD(CFU_ISR, CRC8_ERROR, 1, 1) + FIELD(CFU_ISR, SEU_ENDOFCALIB, 0, 1) +REG32(CFU_IMR, 0x4) + FIELD(CFU_IMR, USR_GTS_EVENT, 9, 1) + FIELD(CFU_IMR, USR_GSR_EVENT, 8, 1) + FIELD(CFU_IMR, SLVERR, 7, 1) + FIELD(CFU_IMR, DECOMP_ERROR, 6, 1) + FIELD(CFU_IMR, BAD_CFI_PACKET, 5, 1) + FIELD(CFU_IMR, AXI_ALIGN_ERROR, 4, 1) + FIELD(CFU_IMR, CFI_ROW_ERROR, 3, 1) + FIELD(CFU_IMR, CRC32_ERROR, 2, 1) + FIELD(CFU_IMR, CRC8_ERROR, 1, 1) + FIELD(CFU_IMR, SEU_ENDOFCALIB, 0, 1) +REG32(CFU_IER, 0x8) + FIELD(CFU_IER, USR_GTS_EVENT, 9, 1) + FIELD(CFU_IER, USR_GSR_EVENT, 8, 1) + FIELD(CFU_IER, SLVERR, 7, 1) + FIELD(CFU_IER, DECOMP_ERROR, 6, 1) + FIELD(CFU_IER, BAD_CFI_PACKET, 5, 1) + FIELD(CFU_IER, AXI_ALIGN_ERROR, 4, 1) + FIELD(CFU_IER, CFI_ROW_ERROR, 3, 1) + FIELD(CFU_IER, CRC32_ERROR, 2, 1) + FIELD(CFU_IER, CRC8_ERROR, 1, 1) + FIELD(CFU_IER, SEU_ENDOFCALIB, 0, 1) +REG32(CFU_IDR, 0xc) + FIELD(CFU_IDR, USR_GTS_EVENT, 9, 1) + FIELD(CFU_IDR, USR_GSR_EVENT, 8, 1) + FIELD(CFU_IDR, SLVERR, 7, 1) + FIELD(CFU_IDR, DECOMP_ERROR, 6, 1) + FIELD(CFU_IDR, BAD_CFI_PACKET, 5, 1) + FIELD(CFU_IDR, AXI_ALIGN_ERROR, 4, 1) + FIELD(CFU_IDR, CFI_ROW_ERROR, 3, 1) + FIELD(CFU_IDR, CRC32_ERROR, 2, 1) + FIELD(CFU_IDR, CRC8_ERROR, 1, 1) + FIELD(CFU_IDR, SEU_ENDOFCALIB, 0, 1) +REG32(CFU_ITR, 0x10) + FIELD(CFU_ITR, USR_GTS_EVENT, 9, 1) + FIELD(CFU_ITR, USR_GSR_EVENT, 8, 1) + FIELD(CFU_ITR, SLVERR, 7, 1) + FIELD(CFU_ITR, DECOMP_ERROR, 6, 1) + FIELD(CFU_ITR, BAD_CFI_PACKET, 5, 1) + FIELD(CFU_ITR, AXI_ALIGN_ERROR, 4, 1) + FIELD(CFU_ITR, CFI_ROW_ERROR, 3, 1) + FIELD(CFU_ITR, CRC32_ERROR, 2, 1) + FIELD(CFU_ITR, CRC8_ERROR, 1, 1) + FIELD(CFU_ITR, SEU_ENDOFCALIB, 0, 1) +REG32(CFU_PROTECT, 0x14) + FIELD(CFU_PROTECT, ACTIVE, 0, 1) +REG32(CFU_FGCR, 0x18) + FIELD(CFU_FGCR, GCLK_CAL, 14, 1) + FIELD(CFU_FGCR, SC_HBC_TRIGGER, 13, 1) + FIELD(CFU_FGCR, GLOW, 12, 1) + FIELD(CFU_FGCR, GPWRDWN, 11, 1) + FIELD(CFU_FGCR, GCAP, 10, 1) + FIELD(CFU_FGCR, GSCWE, 9, 1) + FIELD(CFU_FGCR, GHIGH_B, 8, 1) + FIELD(CFU_FGCR, GMC_B, 7, 1) + FIELD(CFU_FGCR, GWE, 6, 1) + FIELD(CFU_FGCR, GRESTORE, 5, 1) + FIELD(CFU_FGCR, GTS_CFG_B, 4, 1) + FIELD(CFU_FGCR, GLUTMASK, 3, 1) + FIELD(CFU_FGCR, EN_GLOBS_B, 2, 1) + FIELD(CFU_FGCR, EOS, 1, 1) + FIELD(CFU_FGCR, INIT_COMPLETE, 0, 1) +REG32(CFU_CTL, 0x1c) + FIELD(CFU_CTL, GSR_GSC, 15, 1) + FIELD(CFU_CTL, SLVERR_EN, 14, 1) + FIELD(CFU_CTL, CRC32_RESET, 13, 1) + FIELD(CFU_CTL, AXI_ERROR_EN, 12, 1) + FIELD(CFU_CTL, FLUSH_AXI, 11, 1) + FIELD(CFU_CTL, SSI_PER_SLR_PR, 10, 1) + FIELD(CFU_CTL, GCAP_CLK_EN, 9, 1) + FIELD(CFU_CTL, STATUS_SYNC_DISABLE, 8, 1) + FIELD(CFU_CTL, IGNORE_CFI_ERROR, 7, 1) + FIELD(CFU_CTL, CFRAME_DISABLE, 6, 1) + FIELD(CFU_CTL, QWORD_CNT_RESET, 5, 1) + FIELD(CFU_CTL, CRC8_DISABLE, 4, 1) + FIELD(CFU_CTL, CRC32_CHECK, 3, 1) + FIELD(CFU_CTL, DECOMPRESS, 2, 1) + FIELD(CFU_CTL, SEU_GO, 1, 1) + FIELD(CFU_CTL, CFI_LOCAL_RESET, 0, 1) +REG32(CFU_CRAM_RW, 0x20) + FIELD(CFU_CRAM_RW, RFIFO_AFULL_DEPTH, 18, 9) + FIELD(CFU_CRAM_RW, RD_WAVE_CNT_LEFT, 12, 6) + FIELD(CFU_CRAM_RW, RD_WAVE_CNT, 6, 6) + FIELD(CFU_CRAM_RW, WR_WAVE_CNT, 0, 6) +REG32(CFU_MASK, 0x28) +REG32(CFU_CRC_EXPECT, 0x2c) +REG32(CFU_CFRAME_LEFT_T0, 0x60) + FIELD(CFU_CFRAME_LEFT_T0, NUM, 0, 20) +REG32(CFU_CFRAME_LEFT_T1, 0x64) + FIELD(CFU_CFRAME_LEFT_T1, NUM, 0, 20) +REG32(CFU_CFRAME_LEFT_T2, 0x68) + FIELD(CFU_CFRAME_LEFT_T2, NUM, 0, 20) +REG32(CFU_ROW_RANGE, 0x6c) + FIELD(CFU_ROW_RANGE, HALF_FSR, 5, 1) + FIELD(CFU_ROW_RANGE, NUM, 0, 5) +REG32(CFU_STATUS, 0x100) + FIELD(CFU_STATUS, SEU_WRITE_ERROR, 30, 1) + FIELD(CFU_STATUS, FRCNT_ERROR, 29, 1) + FIELD(CFU_STATUS, RSVD_ERROR, 28, 1) + FIELD(CFU_STATUS, FDRO_ERROR, 27, 1) + FIELD(CFU_STATUS, FDRI_ERROR, 26, 1) + FIELD(CFU_STATUS, FDRI_READ_ERROR, 25, 1) + FIELD(CFU_STATUS, READ_FDRI_ERROR, 24, 1) + FIELD(CFU_STATUS, READ_SFR_ERROR, 23, 1) + FIELD(CFU_STATUS, READ_STREAM_ERROR, 22, 1) + FIELD(CFU_STATUS, UNKNOWN_STREAM_PKT, 21, 1) + FIELD(CFU_STATUS, USR_GTS, 20, 1) + FIELD(CFU_STATUS, USR_GSR, 19, 1) + FIELD(CFU_STATUS, AXI_BAD_WSTRB, 18, 1) + FIELD(CFU_STATUS, AXI_BAD_AR_SIZE, 17, 1) + FIELD(CFU_STATUS, AXI_BAD_AW_SIZE, 16, 1) + FIELD(CFU_STATUS, AXI_BAD_ARADDR, 15, 1) + FIELD(CFU_STATUS, AXI_BAD_AWADDR, 14, 1) + FIELD(CFU_STATUS, SCAN_CLEAR_PASS, 13, 1) + FIELD(CFU_STATUS, HC_SEC_ERROR, 12, 1) + FIELD(CFU_STATUS, GHIGH_B_ISHIGH, 11, 1) + FIELD(CFU_STATUS, GHIGH_B_ISLOW, 10, 1) + FIELD(CFU_STATUS, GMC_B_ISHIGH, 9, 1) + FIELD(CFU_STATUS, GMC_B_ISLOW, 8, 1) + FIELD(CFU_STATUS, GPWRDWN_B_ISHIGH, 7, 1) + FIELD(CFU_STATUS, CFI_SEU_CRC_ERROR, 6, 1) + FIELD(CFU_STATUS, CFI_SEU_ECC_ERROR, 5, 1) + FIELD(CFU_STATUS, CFI_SEU_HEARTBEAT, 4, 1) + FIELD(CFU_STATUS, SCAN_CLEAR_DONE, 3, 1) + FIELD(CFU_STATUS, HC_COMPLETE, 2, 1) + FIELD(CFU_STATUS, CFI_CFRAME_BUSY, 1, 1) + FIELD(CFU_STATUS, CFU_STREAM_BUSY, 0, 1) +REG32(CFU_INTERNAL_STATUS, 0x104) + FIELD(CFU_INTERNAL_STATUS, SSI_EOS, 22, 1) + FIELD(CFU_INTERNAL_STATUS, SSI_GWE, 21, 1) + FIELD(CFU_INTERNAL_STATUS, RFIFO_EMPTY, 20, 1) + FIELD(CFU_INTERNAL_STATUS, RFIFO_FULL, 19, 1) + FIELD(CFU_INTERNAL_STATUS, SEL_SFR, 18, 1) + FIELD(CFU_INTERNAL_STATUS, STREAM_CFRAME, 17, 1) + FIELD(CFU_INTERNAL_STATUS, FDRI_PHASE, 16, 1) + FIELD(CFU_INTERNAL_STATUS, CFI_PIPE_EN, 15, 1) + FIELD(CFU_INTERNAL_STATUS, AWFIFO_DCNT, 10, 5) + FIELD(CFU_INTERNAL_STATUS, WFIFO_DCNT, 5, 5) + FIELD(CFU_INTERNAL_STATUS, REPAIR_BUSY, 4, 1) + FIELD(CFU_INTERNAL_STATUS, TRIMU_BUSY, 3, 1) + FIELD(CFU_INTERNAL_STATUS, TRIMB_BUSY, 2, 1) + FIELD(CFU_INTERNAL_STATUS, HCLEANR_BUSY, 1, 1) + FIELD(CFU_INTERNAL_STATUS, HCLEAN_BUSY, 0, 1) +REG32(CFU_QWORD_CNT, 0x108) +REG32(CFU_CRC_LIVE, 0x10c) +REG32(CFU_PENDING_READ_CNT, 0x110) + FIELD(CFU_PENDING_READ_CNT, NUM, 0, 25) +REG32(CFU_FDRI_CNT, 0x114) +REG32(CFU_ECO1, 0x118) +REG32(CFU_ECO2, 0x11c) + +#define R_MAX (R_CFU_ECO2 + 1) + +#define NUM_STREAM 2 +#define WFIFO_SZ 4 + +struct XlnxVersalCFUAPB { + SysBusDevice parent_obj; + MemoryRegion iomem; + MemoryRegion iomem_stream[NUM_STREAM]; + qemu_irq irq_cfu_imr; + + /* 128-bit wfifo. */ + uint32_t wfifo[WFIFO_SZ]; + + uint32_t regs[R_MAX]; + RegisterInfo regs_info[R_MAX]; + + uint8_t fdri_row_addr; + + struct { + XlnxCfiIf *cframe[15]; + } cfg; +}; + +/** + * This is a helper function for updating a CFI data write fifo, an array = of 4 + * uint32_t and 128 bits of data that are allowed to be written through 4 + * sequential 32 bit accesses. After the last index has been written into = the + * write fifo (wfifo), the data is copied to and returned in a secondary f= ifo + * provided to the function (wfifo_ret), and the write fifo is cleared + * (zeroized). + * + * @addr: the address used when calculating the wfifo array index to update + * @value: the value to write into the wfifo array + * @wfifo: the wfifo to update + * @wfifo_out: will return the wfifo data when all 128 bits have been writ= ten + * + * @return: true if all 128 bits have been updated. + */ +bool update_wfifo(hwaddr addr, uint64_t value, + uint32_t *wfifo, uint32_t *wfifo_ret); + +#endif --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501051; cv=pass; d=zohomail.com; s=zohoarc; b=joontlpyDYRHtn0dnU1dmIMJZQFWg4BbceBVQ1nXtKq0C24BcmFKBKkMiEXD9+oZ2tH+EBI7ZbWSJeU8vOAaQjn42CL2/KBCnv5kg22MQGzjQedDqnp/0EhHs70tHIQsWh5y72AlMVJ+zZTcfDcZvZi5CLEif7VuMFwUl0OZqQk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501051; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dP9DJgnfmyBqIQPky8kPymTuxPZxwsqnJY/SEnS5AJY=; b=bLDMjI9Dd8sTF4Bf7nk6iCVc5vlranRCqb+hheJUPYJ2vdqIQmtI53WyGOfIpt+BxQKeNDdWjLNhcUgext+LW3qY3jCXTi6FDF/VtzLnTtz4/VaSmZdtvNF3os9Nkw1RkhDNin8wWZ8vZzjfBa0tPRrebEPITd5rfYFpElZKbTY= 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 1693501051834917.99472259609; Thu, 31 Aug 2023 09:57:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkz1-0001CV-PK; Thu, 31 Aug 2023 12:57:27 -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 1qbkys-0001Bv-Ho for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:18 -0400 Received: from mail-mw2nam12on20622.outbound.protection.outlook.com ([2a01:111:f400:fe5a::622] helo=NAM12-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 1qbkyp-0003cF-RV for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:18 -0400 Received: from CY5PR16CA0018.namprd16.prod.outlook.com (2603:10b6:930:10::19) by BN9PR12MB5083.namprd12.prod.outlook.com (2603:10b6:408:134::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 16:57:11 +0000 Received: from CY4PEPF0000EE34.namprd05.prod.outlook.com (2603:10b6:930:10:cafe::ee) by CY5PR16CA0018.outlook.office365.com (2603:10b6:930:10::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.18 via Frontend Transport; Thu, 31 Aug 2023 16:57:11 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000EE34.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:08 +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.27; Thu, 31 Aug 2023 11:57:07 -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.27; Thu, 31 Aug 2023 11:57:06 -0500 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b8INyjp74dCFd7ekIr0kiPC++qKoinctxU3cDKAAmjQDQPfdjAWF1vgloJrNpEEcfO/lb7mHdY/1uBrVYrr8YVxOht9HZ+Zz7s4mp8HPiHWqyQw7QwOZLWHrrSqtkUT3vqlq4N9bI/HOURh5meYEgZ78Ub0wTfE+PPWKwm3EG6HLg1Pu1YAhEiDjPkTM/s8ol0MzcoZapJlnzJLeX8tAAwQve/gDTfRlHWlYoDDEXzGgXzEiwpm1YiIizGiKg8i9/EgfsP08wlgk9ZcMlL027ikUh4XpWNk2zfSuy9Yvo6AW9yf0npzrO/ZuOW/FPiArvXnuJX1Bt5WLIv6k0P7kmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=dP9DJgnfmyBqIQPky8kPymTuxPZxwsqnJY/SEnS5AJY=; b=Qx5fInMhQd9GHypkT4L93nXBWjN03p5i5AqU2ZJnUUVCvBSy3cHv1/nQbndxtgn2bRR58In4O052/8IMW9V94NEDBFrHMmCp09deQHG6KwAV+6DkeFX22WSLzaa5M60KFZ/UaBUFkPAbROSeDKuX6n/H6gFD7Dck3cKBR6Ai78DuUXU4Fqis038IQEI0RR0rrVyhrRqnE2NTvAtEag9MDZ9iShp8BY4wrUI5q3cPDXq13S7fKwZj9TjESxdEw+f6an2CtOz3Y6UuSJd2pHWAGTR3fsFdIwizRQkMF2TUK4Y+XD4DvPY7ZGqiofPQ6N20nNZfiePnE43h3I5j7ES5EA== 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 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=dP9DJgnfmyBqIQPky8kPymTuxPZxwsqnJY/SEnS5AJY=; b=A5gm1qnj/8aFeDvFw7LoCasEti3f31JlURGm9q/6p/ThsMTnMeOmqk06Y2HGaq9/e0ENfqx9ZU6iQgvQgq8d1G72mNzwet8OXGcKQpXL8UIBPbCNkVkJHUAY4JGRTqs75rjqZbAk7hOKcGXhtNEMJ5qxDwQlyPCCnGKKmQwlieo= 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: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 3/8] hw/misc/xlnx-versal-cfu: Introduce a model of Xilinx Versal CFU_FDRO Date: Thu, 31 Aug 2023 17:56:56 +0100 Message-ID: <20230831165701.2016397-4-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE34:EE_|BN9PR12MB5083:EE_ X-MS-Office365-Filtering-Correlation-Id: bb5cd913-9e8f-47aa-c9b1-08dbaa434fe5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6C0K9ptlQFjyt3ZXhNMf05oGXg7vKUr89gRSiqKOwpwfw2u5I3xSojTsgMpKvt5WaqzFNLcFqq1v7eDIYya4ot8307OtpF8ObcMGikes4JrUO4a+GvdCEEGoXsf3JHgg41hspfyqxJe/dP3ZWB+IRL7XPaSyDxKaJRIUmYxRN5t66KT0/iRnxsrsMceYaFbjkDgjoHS6UPebzf83iXPvMQq9Pl/RR7rRU+9zE1Dj2yinC7NYkEfhCAYG/pAYI3tMxq/loX30oJgOwfWqUvgjBO5+zOG6jvY37LPFVPJMQoiuElA+vYyhEfSuGToAbLF/K3Q259MgB97w1NWGO9Rh5QQx/en9tnentj8nGirhdbfYMIVScSHFv/xxYXXY4bhht+rXK2GMH5S55ul3MASS5H/s3lalv4QvuxeaTi93yyxR8Cc3AcycM8UbhhmP9pCBwhAJOXrnUmzRNSOppo6iZAi1hX8+ctlx/w5LPXN/QWCtqhAvrRRclw/4c8J2sGVBRbHp6A9sK0ODhLvOtyc9YaovmwThYYNDMAU8RBB984bw8WP6ILTa7BTR1jGdpLCRXNXUEM1ZcVr4u5Qqfou+pewZQDvHMm4rwon1Cm/24U6K1x+g0xo0Fw6jL7wUu4nREQ/MnhWtiYdsOglqdDjJgGBnBBfs2Q5RhPFjri5nye31hXZ5gTkrI+4Tp7XS3EPARgyPuZH5I0nQvFWK/AEAPpKMxeWe708Sqeg6TA5zXU8tlSaeDqENpQrEsiWsrZ8J8LGixCnMHf9BPvGoHftiMg== 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:(13230031)(4636009)(136003)(396003)(376002)(346002)(39860400002)(1800799009)(82310400011)(451199024)(186009)(46966006)(40470700004)(36840700001)(82740400003)(6666004)(356005)(40460700003)(36756003)(86362001)(40480700001)(47076005)(36860700001)(81166007)(2906002)(2616005)(26005)(336012)(83380400001)(478600001)(70206006)(70586007)(8676002)(4326008)(426003)(5660300002)(8936002)(41300700001)(54906003)(44832011)(6916009)(316002)(1076003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:08.2109 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb5cd913-9e8f-47aa-c9b1-08dbaa434fe5 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: CY4PEPF0000EE34.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5083 Received-SPF: softfail client-ip=2a01:111:f400:fe5a::622; envelope-from=francisco.iglesias@amd.com; helo=NAM12-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: 1693501053115100001 Content-Type: text/plain; charset="utf-8" Introduce a model of Xilinx Versal's Configuration Frame Unit's data out port (CFU_FDRO). Signed-off-by: Francisco Iglesias Reviewed-by: Peter Maydell --- hw/misc/xlnx-versal-cfu.c | 96 +++++++++++++++++++++++++++++++ include/hw/misc/xlnx-versal-cfu.h | 12 ++++ 2 files changed, 108 insertions(+) diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index b2dc6ab211..255c1bf4b8 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -264,6 +264,25 @@ static void cfu_stream_write(void *opaque, hwaddr addr= , uint64_t value, } } =20 +static uint64_t cfu_fdro_read(void *opaque, hwaddr addr, unsigned size) +{ + XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(opaque); + uint64_t ret =3D 0; + + if (!fifo32_is_empty(&s->fdro_data)) { + ret =3D fifo32_pop(&s->fdro_data); + } + + return ret; +} + +static void cfu_fdro_write(void *opaque, hwaddr addr, uint64_t value, + unsigned size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported write from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); +} + static const MemoryRegionOps cfu_stream_ops =3D { .read =3D cfu_stream_read, .write =3D cfu_stream_write, @@ -274,6 +293,16 @@ static const MemoryRegionOps cfu_stream_ops =3D { }, }; =20 +static const MemoryRegionOps cfu_fdro_ops =3D { + .read =3D cfu_fdro_read, + .write =3D cfu_fdro_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + static void cfu_apb_init(Object *obj) { XlnxVersalCFUAPB *s =3D XLNX_VERSAL_CFU_APB(obj); @@ -305,6 +334,39 @@ static void cfu_apb_init(Object *obj) sysbus_init_irq(sbd, &s->irq_cfu_imr); } =20 +static void cfu_fdro_init(Object *obj) +{ + XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->iomem_fdro, obj, &cfu_fdro_ops, s, + TYPE_XLNX_VERSAL_CFU_FDRO, KEYHOLE_STREAM_4K); + sysbus_init_mmio(sbd, &s->iomem_fdro); + fifo32_create(&s->fdro_data, 8 * KiB / sizeof(uint32_t)); +} + +static void cfu_fdro_reset_enter(Object *obj, ResetType type) +{ + XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(obj); + + fifo32_reset(&s->fdro_data); +} + +static void cfu_fdro_cfi_transfer_packet(XlnxCfiIf *cfi_if, XlnxCfiPacket = *pkt) +{ + XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(cfi_if); + + if (fifo32_num_free(&s->fdro_data) >=3D ARRAY_SIZE(pkt->data)) { + for (int i =3D 0; i < ARRAY_SIZE(pkt->data); i++) { + fifo32_push(&s->fdro_data, pkt->data[i]); + } + } else { + /* It is a programming error to fill the fifo. */ + qemu_log_mask(LOG_GUEST_ERROR, + "CFU_FDRO: CFI data dropped due to full read fifo\n"= ); + } +} + static Property cfu_props[] =3D { DEFINE_PROP_LINK("cframe0", XlnxVersalCFUAPB, cfg.cframe[0], TYPE_XLNX_CFI_IF, XlnxCfiIf *), @@ -351,6 +413,16 @@ static const VMStateDescription vmstate_cfu_apb =3D { } }; =20 +static const VMStateDescription vmstate_cfu_fdro =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_FDRO, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_FIFO32(fdro_data, XlnxVersalCFUFDRO), + VMSTATE_END_OF_LIST(), + } +}; + static void cfu_apb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -360,6 +432,17 @@ static void cfu_apb_class_init(ObjectClass *klass, voi= d *data) device_class_set_props(dc, cfu_props); } =20 +static void cfu_fdro_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + XlnxCfiIfClass *xcic =3D XLNX_CFI_IF_CLASS(klass); + + dc->vmsd =3D &vmstate_cfu_fdro; + xcic->cfi_transfer_packet =3D cfu_fdro_cfi_transfer_packet; + rc->phases.enter =3D cfu_fdro_reset_enter; +} + static const TypeInfo cfu_apb_info =3D { .name =3D TYPE_XLNX_VERSAL_CFU_APB, .parent =3D TYPE_SYS_BUS_DEVICE, @@ -372,9 +455,22 @@ static const TypeInfo cfu_apb_info =3D { } }; =20 +static const TypeInfo cfu_fdro_info =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_FDRO, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxVersalCFUFDRO), + .class_init =3D cfu_fdro_class_init, + .instance_init =3D cfu_fdro_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_XLNX_CFI_IF }, + { } + } +}; + static void cfu_apb_register_types(void) { type_register_static(&cfu_apb_info); + type_register_static(&cfu_fdro_info); } =20 type_init(cfu_apb_register_types) diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versa= l-cfu.h index 62d10caf27..73e9a21af4 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -20,10 +20,14 @@ #include "hw/sysbus.h" #include "hw/register.h" #include "hw/misc/xlnx-cfi-if.h" +#include "qemu/fifo32.h" =20 #define TYPE_XLNX_VERSAL_CFU_APB "xlnx,versal-cfu-apb" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUAPB, XLNX_VERSAL_CFU_APB) =20 +#define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx,versal-cfu-fdro" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUFDRO, XLNX_VERSAL_CFU_FDRO) + REG32(CFU_ISR, 0x0) FIELD(CFU_ISR, USR_GTS_EVENT, 9, 1) FIELD(CFU_ISR, USR_GSR_EVENT, 8, 1) @@ -210,6 +214,14 @@ struct XlnxVersalCFUAPB { } cfg; }; =20 + +struct XlnxVersalCFUFDRO { + SysBusDevice parent_obj; + MemoryRegion iomem_fdro; + + Fifo32 fdro_data; +}; + /** * This is a helper function for updating a CFI data write fifo, an array = of 4 * uint32_t and 128 bits of data that are allowed to be written through 4 --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501098; cv=pass; d=zohomail.com; s=zohoarc; b=hm9VlkqSVyG7c4p/e2rzEiO4Df+YAP/0A2hcfQXPsiWrfgauxaJ81jzNt7S3RJnONuhEbo11FuZZS5t/pIHX3wfzfd98PBg68DoVj95Paw0HI04aF2jWG2qs2J+gOc+p7APmhmr/nW7swt0m7fupZ4DI33yuXgmUHFUuICNl5IM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501098; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L3K6zjYWsy6eN46xdaD2mGatwHnrAxG/IEIeslaDOLA=; b=Pr4EZ6lPnp47iO7EcnpPg3jK/f9IOZay4kMxku7ZHsw/EaMJDiAeXGyp0J8niInBIDyjnhU1BBGLvOTJ2pbQorK1bR88J5jI6hjUypZv2I0ZLR00+eLvrbYV+qv8mok1LLmx0zoMa1TdlQSDgcjW3J9pvdigPsWUCGMmh5EkV/4= 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 1693501098657452.0029038720895; Thu, 31 Aug 2023 09:58:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzD-0001cA-Nv; Thu, 31 Aug 2023 12:57:39 -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 1qbkyt-0001CQ-TI for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:21 -0400 Received: from mail-dm6nam10on2062e.outbound.protection.outlook.com ([2a01:111:f400:7e88::62e] 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 1qbkyr-0003cy-0k for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:19 -0400 Received: from CY5PR16CA0030.namprd16.prod.outlook.com (2603:10b6:930:10::15) by DM4PR12MB6328.namprd12.prod.outlook.com (2603:10b6:8:a0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.22; Thu, 31 Aug 2023 16:57:12 +0000 Received: from CY4PEPF0000EE34.namprd05.prod.outlook.com (2603:10b6:930:10:cafe::ac) by CY5PR16CA0030.outlook.office365.com (2603:10b6:930:10::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20 via Frontend Transport; Thu, 31 Aug 2023 16:57:12 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000EE34.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:12 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.27; Thu, 31 Aug 2023 11:57:09 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 09:57:08 -0700 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:07 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MFNqZAv2WJVDPUUqhNPu0xBGRojD8cynKBjC2GnGa7840FjPA1/QS9WMvfLjGfPyoDuwn7eGkpDXVutkoRuz+h6cS6pqLDqOYqFtwaHcgIYkyy+S4HFiLS7VxPKMgBLbA88B4RL5TzpHu5lMn6l6OI6t5o64onzqlKjspZbcBM+ZyHGgXv3h/EHNXfHGRd7L6t8jVdHwfWa8Xc6PyFUHv5TOj2A+K3GUTdl21NQNhNL/hmLkpe/ELMQFw+lhFprnLe/v8shBk++oZXvasBB4VJEw4C9VGaW9kasl/G4XSWiG+/5BwPPOxAi614jD8kQJzgxgNkSB8qE1VX9l0Iqa+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=L3K6zjYWsy6eN46xdaD2mGatwHnrAxG/IEIeslaDOLA=; b=H0qZyPYB9S8N61iYCd7fAeM8QUX/9paZjGzLQB1s6aofVriT2j4T6yiqLWxOGJwzS3nTxEoGcCa4DMnhy8eKNPxlSlDLg/oDziExMNu3F3YYPPqhOkoBuFKcQvQfx8+T37IU+CByLUpSpORxT0UQYu0e4wZlY2wzCQIrVrl2NpADwo9xMi2WR+0sKxM6yvMMmuU+AxJbjtFJ+hRudw9leu7qOsn+WMGV4BZaCJLo8YM+0VERXVCzhlQ1pllSxKgtfb3CtufGFtnq9NLUZLL11dWxFTwB4RjCyVsZL/PAee41iYUfGdX0nYOBKStwO/S4dB43luBKxsz6msWDFImosA== 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 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=L3K6zjYWsy6eN46xdaD2mGatwHnrAxG/IEIeslaDOLA=; b=V69FcZOPD/CVy/s4oajwfj2MPQE/Nn/43T51BjWDBobiWjCYYCn1QPKAMZ4/B4w7oJGsN5PV/fI1ezLo8qbPxwDH1Wi8k5ovOc+ZrwEyC0ahQEZ9pqUctY7gYvPbmUt5AXI4QN+BOdQMLnwgh2Bg3qowzY9eZp5Fckgyb96sikc= 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: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 4/8] hw/misc/xlnx-versal-cfu: Introduce a model of Xilinx Versal's CFU_SFR Date: Thu, 31 Aug 2023 17:56:57 +0100 Message-ID: <20230831165701.2016397-5-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE34:EE_|DM4PR12MB6328:EE_ X-MS-Office365-Filtering-Correlation-Id: 9465cef8-baf7-4a6e-3708-08dbaa43525b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wl/Intyi0/ySgu4oa10tvtTYAZ7rr969cCXqbJ1I07bgjZnR/gPbuily2gRoxsULVtUas/QGdCcWVURLC4FrOd2uCL5DgeMGugQs3f8N4Lmk8THCbG0xWgQusbrsAXAtRBV1xMkx802KBoWvcJfXj4ekuR401adnhXj9aCz9LEl4+uUW2UfCBzidaOtEOKlM3TyGHAebJLP/q5jH0Yg4g37mPVgRZFKro5Y3FfyL26Ubj3pMXukLgQ9V1dSOaghU4oq4QDTqtv7BuOf4EVJf4E6N84jUBM1SJuXBGyEqZCKIYsqQSwKycQbljTMLG7nLxBql46jyeRczM0keJb2zGj/NmHWqMG2cz9E6+PrySBY0I9T5VMzP4WsAXxPgATXLIUEzKPYh6hJ8f367AChlwv6cGTKCI/5IKBIqF3pDjG+eQZK6Oq3JqSyBcf79N4HVZ2Hm0jHz8twIRhMkG8WSZXcH/3CFMsv58gm7R0VwZ0EK9GLj3AFlm50WqnEyHkEg4VaJcYzIUIiN+aW8feIxu4+MOUWMff+ViG/NnjBoz124Zo06UXftBbPHcv1Qnxa7kZbuwCThT5qmqu5w7gUNL3JoTLOZttMdEIcdOciv1s/Ay1/EBTKf2FXaKWPPH9R+ttWEhYJ2StJwFFCPc6dM5BpC11qlGYAHsja0UMK37evB96UiNBvAxEAuwjy9p5D89/15gdFr7bbcD3e1xMsLgy+Oq/OmD2yTwZa5uZImHNtjzisMG0/dNxYcFB9vF7YPpxc+/Bd/7T2Dmm6bFVIQWQ== 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:(13230031)(4636009)(346002)(376002)(136003)(396003)(39860400002)(82310400011)(186009)(1800799009)(451199024)(36840700001)(40470700004)(46966006)(40480700001)(82740400003)(36756003)(41300700001)(336012)(426003)(1076003)(40460700003)(26005)(356005)(83380400001)(70586007)(70206006)(54906003)(81166007)(316002)(6916009)(478600001)(6666004)(2906002)(86362001)(5660300002)(44832011)(8936002)(2616005)(8676002)(36860700001)(47076005)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:12.3359 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9465cef8-baf7-4a6e-3708-08dbaa43525b 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: CY4PEPF0000EE34.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6328 Received-SPF: softfail client-ip=2a01:111:f400:7e88::62e; envelope-from=francisco.iglesias@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: 1693501100822100003 Content-Type: text/plain; charset="utf-8" Introduce a model of Xilinx Versal's Configuration Frame Unit's Single Frame Read port (CFU_SFR). Signed-off-by: Francisco Iglesias Reviewed-by: Peter Maydell --- hw/misc/xlnx-versal-cfu.c | 87 +++++++++++++++++++++++++++++++ include/hw/misc/xlnx-versal-cfu.h | 15 ++++++ 2 files changed, 102 insertions(+) diff --git a/hw/misc/xlnx-versal-cfu.c b/hw/misc/xlnx-versal-cfu.c index 255c1bf4b8..8e588ac1d8 100644 --- a/hw/misc/xlnx-versal-cfu.c +++ b/hw/misc/xlnx-versal-cfu.c @@ -264,6 +264,31 @@ static void cfu_stream_write(void *opaque, hwaddr addr= , uint64_t value, } } =20 +static uint64_t cfu_sfr_read(void *opaque, hwaddr addr, unsigned size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported read from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); + return 0; +} + +static void cfu_sfr_write(void *opaque, hwaddr addr, uint64_t value, + unsigned size) +{ + XlnxVersalCFUSFR *s =3D XLNX_VERSAL_CFU_SFR(opaque); + uint32_t wfifo[WFIFO_SZ]; + + if (update_wfifo(addr, value, s->wfifo, wfifo)) { + uint8_t row_addr =3D extract32(wfifo[0], 23, 5); + uint32_t frame_addr =3D extract32(wfifo[0], 0, 23); + XlnxCfiPacket pkt =3D { .reg_addr =3D CFRAME_SFR, + .data[0] =3D frame_addr }; + + if (s->cfg.cfu) { + cfu_transfer_cfi_packet(s->cfg.cfu, row_addr, &pkt); + } + } +} + static uint64_t cfu_fdro_read(void *opaque, hwaddr addr, unsigned size) { XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(opaque); @@ -293,6 +318,16 @@ static const MemoryRegionOps cfu_stream_ops =3D { }, }; =20 +static const MemoryRegionOps cfu_sfr_ops =3D { + .read =3D cfu_sfr_read, + .write =3D cfu_sfr_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + static const MemoryRegionOps cfu_fdro_ops =3D { .read =3D cfu_fdro_read, .write =3D cfu_fdro_write, @@ -334,6 +369,23 @@ static void cfu_apb_init(Object *obj) sysbus_init_irq(sbd, &s->irq_cfu_imr); } =20 +static void cfu_sfr_init(Object *obj) +{ + XlnxVersalCFUSFR *s =3D XLNX_VERSAL_CFU_SFR(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->iomem_sfr, obj, &cfu_sfr_ops, s, + TYPE_XLNX_VERSAL_CFU_SFR, KEYHOLE_STREAM_4K); + sysbus_init_mmio(sbd, &s->iomem_sfr); +} + +static void cfu_sfr_reset_enter(Object *obj, ResetType type) +{ + XlnxVersalCFUSFR *s =3D XLNX_VERSAL_CFU_SFR(obj); + + memset(s->wfifo, 0, WFIFO_SZ * sizeof(uint32_t)); +} + static void cfu_fdro_init(Object *obj) { XlnxVersalCFUFDRO *s =3D XLNX_VERSAL_CFU_FDRO(obj); @@ -401,6 +453,12 @@ static Property cfu_props[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static Property cfu_sfr_props[] =3D { + DEFINE_PROP_LINK("cfu", XlnxVersalCFUSFR, cfg.cfu, + TYPE_XLNX_VERSAL_CFU_APB, XlnxVersalCFUAPB *), + DEFINE_PROP_END_OF_LIST(), +}; + static const VMStateDescription vmstate_cfu_apb =3D { .name =3D TYPE_XLNX_VERSAL_CFU_APB, .version_id =3D 1, @@ -423,6 +481,16 @@ static const VMStateDescription vmstate_cfu_fdro =3D { } }; =20 +static const VMStateDescription vmstate_cfu_sfr =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_SFR, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(wfifo, XlnxVersalCFUSFR, 4), + VMSTATE_END_OF_LIST(), + } +}; + static void cfu_apb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -443,6 +511,16 @@ static void cfu_fdro_class_init(ObjectClass *klass, vo= id *data) rc->phases.enter =3D cfu_fdro_reset_enter; } =20 +static void cfu_sfr_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + device_class_set_props(dc, cfu_sfr_props); + dc->vmsd =3D &vmstate_cfu_sfr; + rc->phases.enter =3D cfu_sfr_reset_enter; +} + static const TypeInfo cfu_apb_info =3D { .name =3D TYPE_XLNX_VERSAL_CFU_APB, .parent =3D TYPE_SYS_BUS_DEVICE, @@ -467,10 +545,19 @@ static const TypeInfo cfu_fdro_info =3D { } }; =20 +static const TypeInfo cfu_sfr_info =3D { + .name =3D TYPE_XLNX_VERSAL_CFU_SFR, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxVersalCFUSFR), + .class_init =3D cfu_sfr_class_init, + .instance_init =3D cfu_sfr_init, +}; + static void cfu_apb_register_types(void) { type_register_static(&cfu_apb_info); type_register_static(&cfu_fdro_info); + type_register_static(&cfu_sfr_info); } =20 type_init(cfu_apb_register_types) diff --git a/include/hw/misc/xlnx-versal-cfu.h b/include/hw/misc/xlnx-versa= l-cfu.h index 73e9a21af4..86fb841053 100644 --- a/include/hw/misc/xlnx-versal-cfu.h +++ b/include/hw/misc/xlnx-versal-cfu.h @@ -28,6 +28,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUAPB, XLNX_VERSAL_= CFU_APB) #define TYPE_XLNX_VERSAL_CFU_FDRO "xlnx,versal-cfu-fdro" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUFDRO, XLNX_VERSAL_CFU_FDRO) =20 +#define TYPE_XLNX_VERSAL_CFU_SFR "xlnx,versal-cfu-sfr" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFUSFR, XLNX_VERSAL_CFU_SFR) + REG32(CFU_ISR, 0x0) FIELD(CFU_ISR, USR_GTS_EVENT, 9, 1) FIELD(CFU_ISR, USR_GSR_EVENT, 8, 1) @@ -222,6 +225,18 @@ struct XlnxVersalCFUFDRO { Fifo32 fdro_data; }; =20 +struct XlnxVersalCFUSFR { + SysBusDevice parent_obj; + MemoryRegion iomem_sfr; + + /* 128-bit wfifo. */ + uint32_t wfifo[WFIFO_SZ]; + + struct { + XlnxVersalCFUAPB *cfu; + } cfg; +}; + /** * This is a helper function for updating a CFI data write fifo, an array = of 4 * uint32_t and 128 bits of data that are allowed to be written through 4 --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501109; cv=pass; d=zohomail.com; s=zohoarc; b=PzDPkJ0uJ7Js88EgSTNVVDVMuYNg29TlGZnGSFEHOZjZpedqcEAePd7BgRkIad7reLcTCektaSWpaqcGR44WkMwzy9NPByWe1LXy56xK7YsPosiYMZMOM9a0lL7TyW0K1lE0k3U1TwUxn4H6oIMcUliYm+GvjqWA9neeBzfcU0Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501109; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3VYMkBPizDwk6JLvejt1kDgMwa9T0S0R4RQLpumTreM=; b=GLUQVtareT5M2B26oGrghWmMFvCpKdRyJGoRrS4CWA8K+AYLSLpjq+GTHXFJb3OcgphRivvDvLeXqXvbBAWb76SKkcQGXwsFDivDmrv8tJG5rnq8yI8nGuJx8zyp9fqtNhXFhdn0E8vvFvr8UX+7Qd9MQhf50SCQ+ZalRuh8Dqg= 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 1693501109291107.32356023622549; Thu, 31 Aug 2023 09:58:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzF-0001rf-QJ; Thu, 31 Aug 2023 12:57:41 -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 1qbkyx-0001Cg-1U for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:26 -0400 Received: from mail-mw2nam10on20617.outbound.protection.outlook.com ([2a01:111:f400:7e89::617] 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 1qbkys-0003dU-4b for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:22 -0400 Received: from MW4PR04CA0222.namprd04.prod.outlook.com (2603:10b6:303:87::17) by DM6PR12MB4074.namprd12.prod.outlook.com (2603:10b6:5:218::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 16:57:12 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:303:87:cafe::85) by MW4PR04CA0222.outlook.office365.com (2603:10b6:303:87::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34 via Frontend Transport; Thu, 31 Aug 2023 16:57:12 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:10 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 11:57:10 -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.27; Thu, 31 Aug 2023 11:57:09 -0500 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:08 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I9nu97QS3Js4bp/oFFdA6/y/01AjVTbNHjwd237r79aHAhk8FRh0NVOEu++cEtWS00D2CaFB17+6v7RZ0sbLxNg9cBGYyXc/wYXX+SvOtqbSvoLh6IdVlTIbLQPGQKFIh/oamb8FIJQmhcwkvRUzZqyPzJ15bXAcFpWi6nrr1oQVKGjEtV0dwqdltDQeJPZ7MQRmeJ3fH+GStIYkTX9YS43JGHwWxKnc06mrWS50h3U3Xmiag4A9/Z//o01zZNARVKMFTkXcDfpJcBRdXXE69UO25q0B1NChlPUbgtMRw3vTMROtB9DjdN1xZ4Keb3qnweSFG566SH+YejG82zLItg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=3VYMkBPizDwk6JLvejt1kDgMwa9T0S0R4RQLpumTreM=; b=mDPj+HtbI1OpkfsJXBBiS8KN5mw9OZfXbn5kxV2zPVzRtx44jknxeSRMAkJPqfhW30wyOO+M0U7d+9aXW/6TnibpQhNAPuwOkb9qo1ML1kBBCpUzy4JM/tnH35rDU4AJBpohBe7nKCicFa3YxatLmsz/gEtgvpsA+ofwliVIMOLyzidOklORIn+mm1e6mnGG+dz2xnYGKWlykV9qcrBsbQqTs00ZFkdmqt5An7pY9T67cyxmmz9/X8UUvRIuE71FQXeHgyNrMMAuOYY04yralSA62mvleac4LFE/66skTRHwenxnPxh+pZpobrPU3EW4Ml/msgcVD7BBztCzlAOmvg== 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 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=3VYMkBPizDwk6JLvejt1kDgMwa9T0S0R4RQLpumTreM=; b=nGaS+770q/DaxTh7ae84yniZ10qxbRvKdPWGue7AfuSowHNrS+EVyRNml0JnPPIW0VlQotr6pOHK0ETxhOUCRMrkag6FAy+no+D6v8GWfOGCSkil8kqeZ7u0mKhp5Uid6VIqVOGXcNQ7zpnf3DUPkGDuEN28Oo4v1YOS+YORK1Y= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 5/8] hw/misc: Introduce a model of Xilinx Versal's CFRAME_REG Date: Thu, 31 Aug 2023 17:56:58 +0100 Message-ID: <20230831165701.2016397-6-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F2:EE_|DM6PR12MB4074:EE_ X-MS-Office365-Filtering-Correlation-Id: 312fcb35-6146-4a12-43a7-08dbaa435185 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Hzb/MEU6CNNCYTwVxFDn9eueTTBNcKm0R8IOEzfeETY2VlPQ49A61+ipwazZmlGzmJ0cm3n77yD4OfVqtDMAD5l+oLHsLzlgs/AZtMaMf99oz8EDtuws15MzTmZkdkiEw0M86EvCOf5VaB+Yk+OPoUCYJPg4hGZGITMEN0+CXu0/U61NoTdHtZwk8IY1D7ZQukBQ5YkcekhC0axxT8kDQBDJvvlxtELbBk8BVsL90KEkLTMzPFitDRZS5t/Suu0+8CpiaQDyEUMLj2kIV5snmB81a6Io6UMLAjqIpOnFmp5285UM6HpOug8YkmoPBpzVbPOz1Q4/6iCRemO6s0Q8jUGohPjEC62rl9+jwvSw04LVoopp7WRQ4cPIY3tT7F+nqczbFYa0n/C/1+yIe71hfpzzIHwC0Z4AaX1v2JeSbVBzN5ayxygdYmvHkqGSFXJtBNn9rndzAIW3v5o29CzfQ8HIgZUs2bABB6kdP/pfsmBqvZ84v05jVsyV/9dYOSqwBZx/8JmmLZYScaC7be+qW7Ic7TvZWIvAGkIkZvUgsiH8t01OgHZIYgV6gtQqU4s9sMO5RIC2JOmAIM9X9672//dZMJn3E16uVLVYelSO09+p9zP9TqPKTQqFFHYNnyB+hr+pinvcvLSCNX7dS6zXobiYDAMek58l30slL0sVr1YtFF/Re4eyltl3JwBeHUCVP9S8u3L/EC/V5PFHV1ICtDfT6JVYois9Ez2BoJNl01b+aQmk7h95TtFMGRMnSJFXcIbN3MzsLbs9x6uqfU0KOXOxomvLF60MyzkBVilHEw= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(136003)(396003)(346002)(376002)(39860400002)(1800799009)(82310400011)(186009)(451199024)(46966006)(36840700001)(40470700004)(81166007)(356005)(82740400003)(6666004)(40460700003)(36756003)(86362001)(40480700001)(47076005)(36860700001)(1076003)(2906002)(2616005)(30864003)(336012)(26005)(426003)(966005)(83380400001)(70586007)(70206006)(8676002)(8936002)(4326008)(478600001)(5660300002)(44832011)(6916009)(41300700001)(54906003)(316002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:10.8713 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 312fcb35-6146-4a12-43a7-08dbaa435185 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4074 Received-SPF: softfail client-ip=2a01:111:f400:7e89::617; envelope-from=francisco.iglesias@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: 1693501110981100006 Content-Type: text/plain; charset="utf-8" Introduce a model of Xilinx Versal's Configuration Frame controller (CFRAME_REG). Signed-off-by: Francisco Iglesias --- MAINTAINERS | 2 + hw/misc/meson.build | 1 + hw/misc/xlnx-versal-cframe-reg.c | 697 +++++++++++++++++++++++ include/hw/misc/xlnx-versal-cframe-reg.h | 286 ++++++++++ 4 files changed, 986 insertions(+) create mode 100644 hw/misc/xlnx-versal-cframe-reg.c create mode 100644 include/hw/misc/xlnx-versal-cframe-reg.h diff --git a/MAINTAINERS b/MAINTAINERS index 847b997d73..645374c1d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1041,6 +1041,8 @@ F: hw/misc/xlnx-cfi-if.c F: include/hw/misc/xlnx-cfi-if.h F: hw/misc/xlnx-versal-cfu.c F: include/hw/misc/xlnx-versal-cfu.h +F: hw/misc/xlnx-versal-cframe-reg.c +F: include/hw/misc/xlnx-versal-cframe-reg.h =20 STM32F100 M: Alexandre Iooss diff --git a/hw/misc/meson.build b/hw/misc/meson.build index d95cc3fd87..1b425b03bd 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -99,6 +99,7 @@ system_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files( 'xlnx-versal-pmc-iou-slcr.c', 'xlnx-versal-cfu.c', 'xlnx-cfi-if.c', + 'xlnx-versal-cframe-reg.c', )) system_ss.add(when: 'CONFIG_STM32F2XX_SYSCFG', if_true: files('stm32f2xx_s= yscfg.c')) system_ss.add(when: 'CONFIG_STM32F4XX_SYSCFG', if_true: files('stm32f4xx_s= yscfg.c')) diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c new file mode 100644 index 0000000000..78db68f10c --- /dev/null +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -0,0 +1,697 @@ +/* + * QEMU model of the Configuration Frame Control module + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "hw/registerfields.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/units.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "migration/vmstate.h" +#include "hw/irq.h" +#include "hw/misc/xlnx-versal-cframe-reg.h" + +#ifndef XLNX_VERSAL_CFRAME_REG_ERR_DEBUG +#define XLNX_VERSAL_CFRAME_REG_ERR_DEBUG 0 +#endif + +#define KEYHOLE_STREAM_4K (4 * KiB) +#define N_WORDS_128BIT 4 + +#define MAX_BLOCKTYPE 6 +#define MAX_BLOCKTYPE_FRAMES 0xFFFFF + +enum { + CFRAME_CMD_WCFG =3D 1, + CFRAME_CMD_ROWON =3D 2, + CFRAME_CMD_ROWOFF =3D 3, + CFRAME_CMD_RCFG =3D 4, + CFRAME_CMD_DLPARK =3D 5, +}; + +static gint int_cmp(gconstpointer a, gconstpointer b, gpointer user_data) +{ + guint ua =3D GPOINTER_TO_UINT(a); + guint ub =3D GPOINTER_TO_UINT(b); + return (ua > ub) - (ua < ub); +} + +static void cfrm_imr_update_irq(XlnxVersalCFrameReg *s) +{ + bool pending =3D s->regs[R_CFRM_ISR0] & ~s->regs[R_CFRM_IMR0]; + qemu_set_irq(s->irq_cfrm_imr, pending); +} + +static void cfrm_isr_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + cfrm_imr_update_irq(s); +} + +static uint64_t cfrm_ier_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + s->regs[R_CFRM_IMR0] &=3D ~s->regs[R_CFRM_IER0]; + s->regs[R_CFRM_IER0] =3D 0; + cfrm_imr_update_irq(s); + return 0; +} + +static uint64_t cfrm_idr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + s->regs[R_CFRM_IMR0] |=3D s->regs[R_CFRM_IDR0]; + s->regs[R_CFRM_IDR0] =3D 0; + cfrm_imr_update_irq(s); + return 0; +} + +static uint64_t cfrm_itr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + s->regs[R_CFRM_ISR0] |=3D s->regs[R_CFRM_ITR0]; + s->regs[R_CFRM_ITR0] =3D 0; + cfrm_imr_update_irq(s); + return 0; +} + +static void cframe_incr_far(XlnxVersalCFrameReg *s) +{ + uint32_t faddr =3D ARRAY_FIELD_EX32(s->regs, FAR0, FRAME_ADDR); + uint32_t blktype =3D ARRAY_FIELD_EX32(s->regs, FAR0, BLOCKTYPE); + + assert(blktype <=3D MAX_BLOCKTYPE); + + faddr++; + if (faddr > s->cfg.blktype_num_frames[blktype]) { + /* Restart from 0 and increment block type */ + faddr =3D 0; + blktype++; + + assert(blktype <=3D MAX_BLOCKTYPE); + + ARRAY_FIELD_DP32(s->regs, FAR0, BLOCKTYPE, blktype); + } + + ARRAY_FIELD_DP32(s->regs, FAR0, FRAME_ADDR, faddr); +} + +static void cfrm_fdri_post_write(RegisterInfo *reg, uint64_t val) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + if (s->row_configured && s->rowon && s->wcfg) { + + if (fifo32_num_free(&s->new_f_data) >=3D N_WORDS_128BIT) { + fifo32_push(&s->new_f_data, s->regs[R_FDRI0]); + fifo32_push(&s->new_f_data, s->regs[R_FDRI1]); + fifo32_push(&s->new_f_data, s->regs[R_FDRI2]); + fifo32_push(&s->new_f_data, s->regs[R_FDRI3]); + } + + if (fifo32_is_full(&s->new_f_data)) { + uint32_t addr =3D extract32(s->regs[R_FAR0], 0, 23); + XlnxCFrame *f =3D g_new(XlnxCFrame, 1); + + for (int i =3D 0; i < FRAME_NUM_WORDS; i++) { + f->data[i] =3D fifo32_pop(&s->new_f_data); + } + + g_tree_replace(s->cframes, GUINT_TO_POINTER(addr), f); + + cframe_incr_far(s); + + fifo32_reset(&s->new_f_data); + } + } +} + +static void cfrm_readout_frames(XlnxVersalCFrameReg *s, uint32_t start_add= r, + uint32_t end_addr) +{ + /* + * NB: when our minimum glib version is at least 2.68 we can improve t= he + * performance of the cframe traversal by using g_tree_lookup_node and + * g_tree_node_next (instead of calling g_tree_lookup for finding each + * cframe). + */ + for (uint32_t addr =3D start_addr; addr < end_addr; addr++) { + XlnxCFrame *f =3D g_tree_lookup(s->cframes, GUINT_TO_POINTER(addr)= ); + + /* Transmit the data if a frame was found */ + if (f) { + for (int i =3D 0; i < FRAME_NUM_WORDS; i +=3D 4) { + XlnxCfiPacket pkt =3D {}; + + pkt.data[0] =3D f->data[i]; + pkt.data[1] =3D f->data[i + 1]; + pkt.data[2] =3D f->data[i + 2]; + pkt.data[3] =3D f->data[i + 3]; + + if (s->cfg.cfu_fdro) { + xlnx_cfi_transfer_packet(s->cfg.cfu_fdro, &pkt); + } + } + } + } +} + +static void cfrm_frcnt_post_write(RegisterInfo *reg, uint64_t val) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + if (s->row_configured && s->rowon && s->rcfg) { + uint32_t start_addr =3D extract32(s->regs[R_FAR0], 0, 23); + uint32_t end_addr =3D start_addr + s->regs[R_FRCNT0] / FRAME_NUM_Q= WORDS; + + cfrm_readout_frames(s, start_addr, end_addr); + } +} + +static void cfrm_cmd_post_write(RegisterInfo *reg, uint64_t val) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + if (s->row_configured) { + uint8_t cmd =3D ARRAY_FIELD_EX32(s->regs, CMD0, CMD); + + switch (cmd) { + case CFRAME_CMD_WCFG: + s->wcfg =3D true; + break; + case CFRAME_CMD_ROWON: + s->rowon =3D true; + break; + case CFRAME_CMD_ROWOFF: + s->rowon =3D false; + break; + case CFRAME_CMD_RCFG: + s->rcfg =3D true; + break; + case CFRAME_CMD_DLPARK: + s->wcfg =3D false; + s->rcfg =3D false; + break; + default: + break; + }; + } +} + +static uint64_t cfrm_last_frame_bot_post_read(RegisterInfo *reg, + uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + uint64_t val =3D 0; + + switch (reg->access->addr) { + case A_LAST_FRAME_BOT0: + val =3D FIELD_DP32(val, LAST_FRAME_BOT0, BLOCKTYPE1_LAST_FRAME_LSB, + s->cfg.blktype_num_frames[1]); + val =3D FIELD_DP32(val, LAST_FRAME_BOT0, BLOCKTYPE0_LAST_FRAME, + s->cfg.blktype_num_frames[0]); + break; + case A_LAST_FRAME_BOT1: + val =3D FIELD_DP32(val, LAST_FRAME_BOT1, BLOCKTYPE3_LAST_FRAME_LSB, + s->cfg.blktype_num_frames[3]); + val =3D FIELD_DP32(val, LAST_FRAME_BOT1, BLOCKTYPE2_LAST_FRAME, + s->cfg.blktype_num_frames[2]); + val =3D FIELD_DP32(val, LAST_FRAME_BOT1, BLOCKTYPE1_LAST_FRAME_MSB, + (s->cfg.blktype_num_frames[1] >> 12)); + break; + case A_LAST_FRAME_BOT2: + val =3D FIELD_DP32(val, LAST_FRAME_BOT2, BLOCKTYPE3_LAST_FRAME_MSB, + (s->cfg.blktype_num_frames[3] >> 4)); + break; + case A_LAST_FRAME_BOT3: + default: + break; + } + + return val; +} + +static uint64_t cfrm_last_frame_top_post_read(RegisterInfo *reg, + uint64_t val64) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + uint64_t val =3D 0; + + switch (reg->access->addr) { + case A_LAST_FRAME_TOP0: + val =3D FIELD_DP32(val, LAST_FRAME_TOP0, BLOCKTYPE5_LAST_FRAME_LSB, + s->cfg.blktype_num_frames[5]); + val =3D FIELD_DP32(val, LAST_FRAME_TOP0, BLOCKTYPE4_LAST_FRAME, + s->cfg.blktype_num_frames[4]); + break; + case A_LAST_FRAME_TOP1: + val =3D FIELD_DP32(val, LAST_FRAME_TOP1, BLOCKTYPE6_LAST_FRAME, + s->cfg.blktype_num_frames[6]); + val =3D FIELD_DP32(val, LAST_FRAME_TOP1, BLOCKTYPE5_LAST_FRAME_MSB, + (s->cfg.blktype_num_frames[5] >> 12)); + break; + case A_LAST_FRAME_TOP2: + case A_LAST_FRAME_BOT3: + default: + break; + } + + return val; +} + +static void cfrm_far_sfr_post_write(RegisterInfo *reg, uint64_t val) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(reg->opaque); + + if (s->row_configured && s->rowon && s->rcfg) { + uint32_t start_addr =3D extract32(s->regs[R_FAR_SFR0], 0, 23); + + /* Readback 1 frame */ + cfrm_readout_frames(s, start_addr, start_addr + 1); + } +} + +static const RegisterAccessInfo cframe_reg_regs_info[] =3D { + { .name =3D "CRC0", .addr =3D A_CRC0, + .rsvd =3D 0x00000000, + },{ .name =3D "CRC1", .addr =3D A_CRC0, + .rsvd =3D 0xffffffff, + },{ .name =3D "CRC2", .addr =3D A_CRC0, + .rsvd =3D 0xffffffff, + },{ .name =3D "CRC3", .addr =3D A_CRC0, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR0", .addr =3D A_FAR0, + .rsvd =3D 0xfe000000, + },{ .name =3D "FAR1", .addr =3D A_FAR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR2", .addr =3D A_FAR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR3", .addr =3D A_FAR3, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR_SFR0", .addr =3D A_FAR_SFR0, + .rsvd =3D 0xff800000, + },{ .name =3D "FAR_SFR1", .addr =3D A_FAR_SFR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR_SFR2", .addr =3D A_FAR_SFR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "FAR_SFR3", .addr =3D A_FAR_SFR3, + .rsvd =3D 0xffffffff, + .post_write =3D cfrm_far_sfr_post_write, + },{ .name =3D "FDRI0", .addr =3D A_FDRI0, + },{ .name =3D "FDRI1", .addr =3D A_FDRI1, + },{ .name =3D "FDRI2", .addr =3D A_FDRI2, + },{ .name =3D "FDRI3", .addr =3D A_FDRI3, + .post_write =3D cfrm_fdri_post_write, + },{ .name =3D "FRCNT0", .addr =3D A_FRCNT0, + .rsvd =3D 0x00000000, + },{ .name =3D "FRCNT1", .addr =3D A_FRCNT1, + .rsvd =3D 0xffffffff, + },{ .name =3D "FRCNT2", .addr =3D A_FRCNT2, + .rsvd =3D 0xffffffff, + },{ .name =3D "FRCNT3", .addr =3D A_FRCNT3, + .rsvd =3D 0xffffffff, + .post_write =3D cfrm_frcnt_post_write + },{ .name =3D "CMD0", .addr =3D A_CMD0, + .rsvd =3D 0xffffffe0, + },{ .name =3D "CMD1", .addr =3D A_CMD1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CMD2", .addr =3D A_CMD2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CMD3", .addr =3D A_CMD3, + .rsvd =3D 0xffffffff, + .post_write =3D cfrm_cmd_post_write + },{ .name =3D "CR_MASK0", .addr =3D A_CR_MASK0, + .rsvd =3D 0x00000000, + },{ .name =3D "CR_MASK1", .addr =3D A_CR_MASK1, + .rsvd =3D 0x00000000, + },{ .name =3D "CR_MASK2", .addr =3D A_CR_MASK2, + .rsvd =3D 0x00000000, + },{ .name =3D "CR_MASK3", .addr =3D A_CR_MASK3, + .rsvd =3D 0xffffffff, + },{ .name =3D "CTL0", .addr =3D A_CTL0, + .rsvd =3D 0xfffffff8, + },{ .name =3D "CTL1", .addr =3D A_CTL1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CTL2", .addr =3D A_CTL2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CTL3", .addr =3D A_CTL3, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_ISR0", .addr =3D A_CFRM_ISR0, + .rsvd =3D 0xffc04000, + .w1c =3D 0x3bfff, + },{ .name =3D "CFRM_ISR1", .addr =3D A_CFRM_ISR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_ISR2", .addr =3D A_CFRM_ISR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_ISR3", .addr =3D A_CFRM_ISR3, + .rsvd =3D 0xffffffff, + .post_write =3D cfrm_isr_postw, + },{ .name =3D "CFRM_IMR0", .addr =3D A_CFRM_IMR0, + .rsvd =3D 0xffc04000, + .ro =3D 0xfffff, + .reset =3D 0x3bfff, + },{ .name =3D "CFRM_IMR1", .addr =3D A_CFRM_IMR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IMR2", .addr =3D A_CFRM_IMR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IMR3", .addr =3D A_CFRM_IMR3, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IER0", .addr =3D A_CFRM_IER0, + .rsvd =3D 0xffc04000, + },{ .name =3D "CFRM_IER1", .addr =3D A_CFRM_IER1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IER2", .addr =3D A_CFRM_IER2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IER3", .addr =3D A_CFRM_IER3, + .rsvd =3D 0xffffffff, + .pre_write =3D cfrm_ier_prew, + },{ .name =3D "CFRM_IDR0", .addr =3D A_CFRM_IDR0, + .rsvd =3D 0xffc04000, + },{ .name =3D "CFRM_IDR1", .addr =3D A_CFRM_IDR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IDR2", .addr =3D A_CFRM_IDR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_IDR3", .addr =3D A_CFRM_IDR3, + .rsvd =3D 0xffffffff, + .pre_write =3D cfrm_idr_prew, + },{ .name =3D "CFRM_ITR0", .addr =3D A_CFRM_ITR0, + .rsvd =3D 0xffc04000, + },{ .name =3D "CFRM_ITR1", .addr =3D A_CFRM_ITR1, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_ITR2", .addr =3D A_CFRM_ITR2, + .rsvd =3D 0xffffffff, + },{ .name =3D "CFRM_ITR3", .addr =3D A_CFRM_ITR3, + .rsvd =3D 0xffffffff, + .pre_write =3D cfrm_itr_prew, + },{ .name =3D "SEU_SYNDRM00", .addr =3D A_SEU_SYNDRM00, + },{ .name =3D "SEU_SYNDRM01", .addr =3D A_SEU_SYNDRM01, + },{ .name =3D "SEU_SYNDRM02", .addr =3D A_SEU_SYNDRM02, + },{ .name =3D "SEU_SYNDRM03", .addr =3D A_SEU_SYNDRM03, + },{ .name =3D "SEU_SYNDRM10", .addr =3D A_SEU_SYNDRM10, + },{ .name =3D "SEU_SYNDRM11", .addr =3D A_SEU_SYNDRM11, + },{ .name =3D "SEU_SYNDRM12", .addr =3D A_SEU_SYNDRM12, + },{ .name =3D "SEU_SYNDRM13", .addr =3D A_SEU_SYNDRM13, + },{ .name =3D "SEU_SYNDRM20", .addr =3D A_SEU_SYNDRM20, + },{ .name =3D "SEU_SYNDRM21", .addr =3D A_SEU_SYNDRM21, + },{ .name =3D "SEU_SYNDRM22", .addr =3D A_SEU_SYNDRM22, + },{ .name =3D "SEU_SYNDRM23", .addr =3D A_SEU_SYNDRM23, + },{ .name =3D "SEU_SYNDRM30", .addr =3D A_SEU_SYNDRM30, + },{ .name =3D "SEU_SYNDRM31", .addr =3D A_SEU_SYNDRM31, + },{ .name =3D "SEU_SYNDRM32", .addr =3D A_SEU_SYNDRM32, + },{ .name =3D "SEU_SYNDRM33", .addr =3D A_SEU_SYNDRM33, + },{ .name =3D "SEU_VIRTUAL_SYNDRM0", .addr =3D A_SEU_VIRTUAL_SYNDRM0, + },{ .name =3D "SEU_VIRTUAL_SYNDRM1", .addr =3D A_SEU_VIRTUAL_SYNDRM1, + },{ .name =3D "SEU_VIRTUAL_SYNDRM2", .addr =3D A_SEU_VIRTUAL_SYNDRM2, + },{ .name =3D "SEU_VIRTUAL_SYNDRM3", .addr =3D A_SEU_VIRTUAL_SYNDRM3, + },{ .name =3D "SEU_CRC0", .addr =3D A_SEU_CRC0, + },{ .name =3D "SEU_CRC1", .addr =3D A_SEU_CRC1, + },{ .name =3D "SEU_CRC2", .addr =3D A_SEU_CRC2, + },{ .name =3D "SEU_CRC3", .addr =3D A_SEU_CRC3, + },{ .name =3D "CFRAME_FAR_BOT0", .addr =3D A_CFRAME_FAR_BOT0, + },{ .name =3D "CFRAME_FAR_BOT1", .addr =3D A_CFRAME_FAR_BOT1, + },{ .name =3D "CFRAME_FAR_BOT2", .addr =3D A_CFRAME_FAR_BOT2, + },{ .name =3D "CFRAME_FAR_BOT3", .addr =3D A_CFRAME_FAR_BOT3, + },{ .name =3D "CFRAME_FAR_TOP0", .addr =3D A_CFRAME_FAR_TOP0, + },{ .name =3D "CFRAME_FAR_TOP1", .addr =3D A_CFRAME_FAR_TOP1, + },{ .name =3D "CFRAME_FAR_TOP2", .addr =3D A_CFRAME_FAR_TOP2, + },{ .name =3D "CFRAME_FAR_TOP3", .addr =3D A_CFRAME_FAR_TOP3, + },{ .name =3D "LAST_FRAME_BOT0", .addr =3D A_LAST_FRAME_BOT0, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_bot_post_read, + },{ .name =3D "LAST_FRAME_BOT1", .addr =3D A_LAST_FRAME_BOT1, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_bot_post_read, + },{ .name =3D "LAST_FRAME_BOT2", .addr =3D A_LAST_FRAME_BOT2, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_bot_post_read, + },{ .name =3D "LAST_FRAME_BOT3", .addr =3D A_LAST_FRAME_BOT3, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_bot_post_read, + },{ .name =3D "LAST_FRAME_TOP0", .addr =3D A_LAST_FRAME_TOP0, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_top_post_read, + },{ .name =3D "LAST_FRAME_TOP1", .addr =3D A_LAST_FRAME_TOP1, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_top_post_read, + },{ .name =3D "LAST_FRAME_TOP2", .addr =3D A_LAST_FRAME_TOP2, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_top_post_read, + },{ .name =3D "LAST_FRAME_TOP3", .addr =3D A_LAST_FRAME_TOP3, + .ro =3D 0xffffffff, + .post_read =3D cfrm_last_frame_top_post_read, + } +}; + +static void cframe_reg_cfi_transfer_packet(XlnxCfiIf *cfi_if, + XlnxCfiPacket *pkt) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(cfi_if); + uint64_t we =3D MAKE_64BIT_MASK(0, 4 * 8); + + if (!s->row_configured) { + return; + } + + switch (pkt->reg_addr) { + case CFRAME_FAR: + s->regs[R_FAR0] =3D pkt->data[0]; + break; + case CFRAME_SFR: + s->regs[R_FAR_SFR0] =3D pkt->data[0]; + register_write(&s->regs_info[R_FAR_SFR3], 0, + we, object_get_typename(OBJECT(s)), + XLNX_VERSAL_CFRAME_REG_ERR_DEBUG); + break; + case CFRAME_FDRI: + s->regs[R_FDRI0] =3D pkt->data[0]; + s->regs[R_FDRI1] =3D pkt->data[1]; + s->regs[R_FDRI2] =3D pkt->data[2]; + register_write(&s->regs_info[R_FDRI3], pkt->data[3], + we, object_get_typename(OBJECT(s)), + XLNX_VERSAL_CFRAME_REG_ERR_DEBUG); + break; + case CFRAME_CMD: + ARRAY_FIELD_DP32(s->regs, CMD0, CMD, pkt->data[0]); + + register_write(&s->regs_info[R_CMD3], 0, + we, object_get_typename(OBJECT(s)), + XLNX_VERSAL_CFRAME_REG_ERR_DEBUG); + break; + default: + break; + } +} + +static uint64_t cframe_reg_fdri_read(void *opaque, hwaddr addr, unsigned s= ize) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported read from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); + return 0; +} + +static void cframe_reg_fdri_write(void *opaque, hwaddr addr, uint64_t valu= e, + unsigned size) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(opaque); + uint32_t wfifo[WFIFO_SZ]; + + if (update_wfifo(addr, value, s->wfifo, wfifo)) { + uint64_t we =3D MAKE_64BIT_MASK(0, 4 * 8); + + s->regs[R_FDRI0] =3D wfifo[0]; + s->regs[R_FDRI1] =3D wfifo[1]; + s->regs[R_FDRI2] =3D wfifo[2]; + register_write(&s->regs_info[R_FDRI3], wfifo[3], + we, object_get_typename(OBJECT(s)), + XLNX_VERSAL_CFRAME_REG_ERR_DEBUG); + } +} + +static void cframe_reg_reset_enter(Object *obj, ResetType type) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(obj); + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + memset(s->wfifo, 0, WFIFO_SZ * sizeof(uint32_t)); + fifo32_reset(&s->new_f_data); + + if (g_tree_nnodes(s->cframes)) { + /* + * Take a reference so when g_tree_destroy() unrefs it we keep the + * GTree and only destroy its contents. NB: when our minimum + * glib version is at least 2.70 we could use g_tree_remove_all(). + */ + g_tree_ref(s->cframes); + g_tree_destroy(s->cframes); + } +} + +static void cframe_reg_reset_hold(Object *obj) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(obj); + + cfrm_imr_update_irq(s); +} + +static const MemoryRegionOps cframe_reg_ops =3D { + .read =3D register_read_memory, + .write =3D register_write_memory, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static const MemoryRegionOps cframe_reg_fdri_ops =3D { + .read =3D cframe_reg_fdri_read, + .write =3D cframe_reg_fdri_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static void cframe_reg_realize(DeviceState *dev, Error **errp) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(dev); + + for (int i =3D 0; i < ARRAY_SIZE(s->cfg.blktype_num_frames); i++) { + if (s->cfg.blktype_num_frames[i] > MAX_BLOCKTYPE_FRAMES) { + error_setg(errp, + "blktype-frames%d > 0xFFFFF (max frame per block)", + i); + return; + } + if (s->cfg.blktype_num_frames[i]) { + s->row_configured =3D true; + } + } +} + +static void cframe_reg_init(Object *obj) +{ + XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_VERSAL_CFRAME_REG, + CFRAME_REG_R_MAX * 4); + reg_array =3D + register_init_block32(DEVICE(obj), cframe_reg_regs_info, + ARRAY_SIZE(cframe_reg_regs_info), + s->regs_info, s->regs, + &cframe_reg_ops, + XLNX_VERSAL_CFRAME_REG_ERR_DEBUG, + CFRAME_REG_R_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + memory_region_init_io(&s->iomem_fdri, obj, &cframe_reg_fdri_ops, s, + TYPE_XLNX_VERSAL_CFRAME_REG "-fdri", + KEYHOLE_STREAM_4K); + sysbus_init_mmio(sbd, &s->iomem_fdri); + sysbus_init_irq(sbd, &s->irq_cfrm_imr); + + s->cframes =3D g_tree_new_full((GCompareDataFunc)int_cmp, NULL, + NULL, (GDestroyNotify)g_free); + fifo32_create(&s->new_f_data, FRAME_NUM_WORDS); +} + +static const VMStateDescription vmstate_cframe =3D { + .name =3D "cframe", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(data, XlnxCFrame, FRAME_NUM_WORDS), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_cframe_reg =3D { + .name =3D TYPE_XLNX_VERSAL_CFRAME_REG, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(wfifo, XlnxVersalCFrameReg, 4), + VMSTATE_UINT32_ARRAY(regs, XlnxVersalCFrameReg, CFRAME_REG_R_MAX), + VMSTATE_BOOL(rowon, XlnxVersalCFrameReg), + VMSTATE_BOOL(wcfg, XlnxVersalCFrameReg), + VMSTATE_BOOL(rcfg, XlnxVersalCFrameReg), + VMSTATE_GTREE_DIRECT_KEY_V(cframes, XlnxVersalCFrameReg, 1, + &vmstate_cframe, XlnxCFrame), + VMSTATE_FIFO32(new_f_data, XlnxVersalCFrameReg), + VMSTATE_END_OF_LIST(), + } +}; + +static Property cframe_regs_props[] =3D { + DEFINE_PROP_LINK("cfu-fdro", XlnxVersalCFrameReg, cfg.cfu_fdro, + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_UINT32("blktype0-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[0], 0), + DEFINE_PROP_UINT32("blktype1-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[1], 0), + DEFINE_PROP_UINT32("blktype2-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[2], 0), + DEFINE_PROP_UINT32("blktype3-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[3], 0), + DEFINE_PROP_UINT32("blktype4-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[4], 0), + DEFINE_PROP_UINT32("blktype5-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[5], 0), + DEFINE_PROP_UINT32("blktype6-frames", XlnxVersalCFrameReg, + cfg.blktype_num_frames[6], 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void cframe_reg_class_init(ObjectClass *klass, void *data) +{ + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); + XlnxCfiIfClass *xcic =3D XLNX_CFI_IF_CLASS(klass); + + dc->vmsd =3D &vmstate_cframe_reg; + dc->realize =3D cframe_reg_realize; + rc->phases.enter =3D cframe_reg_reset_enter; + rc->phases.hold =3D cframe_reg_reset_hold; + device_class_set_props(dc, cframe_regs_props); + xcic->cfi_transfer_packet =3D cframe_reg_cfi_transfer_packet; +} + +static const TypeInfo cframe_reg_info =3D { + .name =3D TYPE_XLNX_VERSAL_CFRAME_REG, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxVersalCFrameReg), + .class_init =3D cframe_reg_class_init, + .instance_init =3D cframe_reg_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_XLNX_CFI_IF }, + { } + } +}; + +static void cframe_reg_register_types(void) +{ + type_register_static(&cframe_reg_info); +} + +type_init(cframe_reg_register_types) diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xln= x-versal-cframe-reg.h new file mode 100644 index 0000000000..f286d973bf --- /dev/null +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -0,0 +1,286 @@ +/* + * QEMU model of the Configuration Frame Control module + * + * Copyright (C) 2023, Advanced Micro Devices, Inc. + * + * Written by Francisco Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * References: + * [1] Versal ACAP Technical Reference Manual, + * https://www.xilinx.com/support/documentation/architecture-manuals/a= m011-versal-acap-trm.pdf + * + * [2] Versal ACAP Register Reference, + * https://www.xilinx.com/htmldocs/registers/am012/am012-versal-regist= er-reference.html + */ +#ifndef HW_MISC_XLNX_VERSAL_CFRAME_REG_H +#define HW_MISC_XLNX_VERSAL_CFRAME_REG_H + +#include "hw/sysbus.h" +#include "hw/register.h" +#include "hw/misc/xlnx-cfi-if.h" +#include "hw/misc/xlnx-versal-cfu.h" +#include "qemu/fifo32.h" + +#define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx,cframe-reg" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFrameReg, XLNX_VERSAL_CFRAME_REG) + +/* + * The registers in this module are 128 bits wide but it is ok to write + * and read them through 4 sequential 32 bit accesses (address[3:2] =3D 0, + * 1, 2, 3). + */ +REG32(CRC0, 0x0) + FIELD(CRC, CRC, 0, 32) +REG32(CRC1, 0x4) +REG32(CRC2, 0x8) +REG32(CRC3, 0xc) +REG32(FAR0, 0x10) + FIELD(FAR0, SEGMENT, 23, 2) + FIELD(FAR0, BLOCKTYPE, 20, 3) + FIELD(FAR0, FRAME_ADDR, 0, 20) +REG32(FAR1, 0x14) +REG32(FAR2, 0x18) +REG32(FAR3, 0x1c) +REG32(FAR_SFR0, 0x20) + FIELD(FAR_SFR0, BLOCKTYPE, 20, 3) + FIELD(FAR_SFR0, FRAME_ADDR, 0, 20) +REG32(FAR_SFR1, 0x24) +REG32(FAR_SFR2, 0x28) +REG32(FAR_SFR3, 0x2c) +REG32(FDRI0, 0x40) +REG32(FDRI1, 0x44) +REG32(FDRI2, 0x48) +REG32(FDRI3, 0x4c) +REG32(FRCNT0, 0x50) + FIELD(FRCNT0, FRCNT, 0, 32) +REG32(FRCNT1, 0x54) +REG32(FRCNT2, 0x58) +REG32(FRCNT3, 0x5c) +REG32(CMD0, 0x60) + FIELD(CMD0, CMD, 0, 5) +REG32(CMD1, 0x64) +REG32(CMD2, 0x68) +REG32(CMD3, 0x6c) +REG32(CR_MASK0, 0x70) +REG32(CR_MASK1, 0x74) +REG32(CR_MASK2, 0x78) +REG32(CR_MASK3, 0x7c) +REG32(CTL0, 0x80) + FIELD(CTL, PER_FRAME_CRC, 0, 1) +REG32(CTL1, 0x84) +REG32(CTL2, 0x88) +REG32(CTL3, 0x8c) +REG32(CFRM_ISR0, 0x150) + FIELD(CFRM_ISR0, READ_BROADCAST_ERROR, 21, 1) + FIELD(CFRM_ISR0, CMD_MISSING_ERROR, 20, 1) + FIELD(CFRM_ISR0, RW_ROWOFF_ERROR, 19, 1) + FIELD(CFRM_ISR0, READ_REG_ADDR_ERROR, 18, 1) + FIELD(CFRM_ISR0, READ_BLK_TYPE_ERROR, 17, 1) + FIELD(CFRM_ISR0, READ_FRAME_ADDR_ERROR, 16, 1) + FIELD(CFRM_ISR0, WRITE_REG_ADDR_ERROR, 15, 1) + FIELD(CFRM_ISR0, WRITE_BLK_TYPE_ERROR, 13, 1) + FIELD(CFRM_ISR0, WRITE_FRAME_ADDR_ERROR, 12, 1) + FIELD(CFRM_ISR0, MFW_OVERRUN_ERROR, 11, 1) + FIELD(CFRM_ISR0, FAR_FIFO_UNDERFLOW, 10, 1) + FIELD(CFRM_ISR0, FAR_FIFO_OVERFLOW, 9, 1) + FIELD(CFRM_ISR0, PER_FRAME_SEQ_ERROR, 8, 1) + FIELD(CFRM_ISR0, CRC_ERROR, 7, 1) + FIELD(CFRM_ISR0, WRITE_OVERRUN_ERROR, 6, 1) + FIELD(CFRM_ISR0, READ_OVERRUN_ERROR, 5, 1) + FIELD(CFRM_ISR0, CMD_INTERRUPT_ERROR, 4, 1) + FIELD(CFRM_ISR0, WRITE_INTERRUPT_ERROR, 3, 1) + FIELD(CFRM_ISR0, READ_INTERRUPT_ERROR, 2, 1) + FIELD(CFRM_ISR0, SEU_CRC_ERROR, 1, 1) + FIELD(CFRM_ISR0, SEU_ECC_ERROR, 0, 1) +REG32(CFRM_ISR1, 0x154) +REG32(CFRM_ISR2, 0x158) +REG32(CFRM_ISR3, 0x15c) +REG32(CFRM_IMR0, 0x160) + FIELD(CFRM_IMR0, READ_BROADCAST_ERROR, 21, 1) + FIELD(CFRM_IMR0, CMD_MISSING_ERROR, 20, 1) + FIELD(CFRM_IMR0, RW_ROWOFF_ERROR, 19, 1) + FIELD(CFRM_IMR0, READ_REG_ADDR_ERROR, 18, 1) + FIELD(CFRM_IMR0, READ_BLK_TYPE_ERROR, 17, 1) + FIELD(CFRM_IMR0, READ_FRAME_ADDR_ERROR, 16, 1) + FIELD(CFRM_IMR0, WRITE_REG_ADDR_ERROR, 15, 1) + FIELD(CFRM_IMR0, WRITE_BLK_TYPE_ERROR, 13, 1) + FIELD(CFRM_IMR0, WRITE_FRAME_ADDR_ERROR, 12, 1) + FIELD(CFRM_IMR0, MFW_OVERRUN_ERROR, 11, 1) + FIELD(CFRM_IMR0, FAR_FIFO_UNDERFLOW, 10, 1) + FIELD(CFRM_IMR0, FAR_FIFO_OVERFLOW, 9, 1) + FIELD(CFRM_IMR0, PER_FRAME_SEQ_ERROR, 8, 1) + FIELD(CFRM_IMR0, CRC_ERROR, 7, 1) + FIELD(CFRM_IMR0, WRITE_OVERRUN_ERROR, 6, 1) + FIELD(CFRM_IMR0, READ_OVERRUN_ERROR, 5, 1) + FIELD(CFRM_IMR0, CMD_INTERRUPT_ERROR, 4, 1) + FIELD(CFRM_IMR0, WRITE_INTERRUPT_ERROR, 3, 1) + FIELD(CFRM_IMR0, READ_INTERRUPT_ERROR, 2, 1) + FIELD(CFRM_IMR0, SEU_CRC_ERROR, 1, 1) + FIELD(CFRM_IMR0, SEU_ECC_ERROR, 0, 1) +REG32(CFRM_IMR1, 0x164) +REG32(CFRM_IMR2, 0x168) +REG32(CFRM_IMR3, 0x16c) +REG32(CFRM_IER0, 0x170) + FIELD(CFRM_IER0, READ_BROADCAST_ERROR, 21, 1) + FIELD(CFRM_IER0, CMD_MISSING_ERROR, 20, 1) + FIELD(CFRM_IER0, RW_ROWOFF_ERROR, 19, 1) + FIELD(CFRM_IER0, READ_REG_ADDR_ERROR, 18, 1) + FIELD(CFRM_IER0, READ_BLK_TYPE_ERROR, 17, 1) + FIELD(CFRM_IER0, READ_FRAME_ADDR_ERROR, 16, 1) + FIELD(CFRM_IER0, WRITE_REG_ADDR_ERROR, 15, 1) + FIELD(CFRM_IER0, WRITE_BLK_TYPE_ERROR, 13, 1) + FIELD(CFRM_IER0, WRITE_FRAME_ADDR_ERROR, 12, 1) + FIELD(CFRM_IER0, MFW_OVERRUN_ERROR, 11, 1) + FIELD(CFRM_IER0, FAR_FIFO_UNDERFLOW, 10, 1) + FIELD(CFRM_IER0, FAR_FIFO_OVERFLOW, 9, 1) + FIELD(CFRM_IER0, PER_FRAME_SEQ_ERROR, 8, 1) + FIELD(CFRM_IER0, CRC_ERROR, 7, 1) + FIELD(CFRM_IER0, WRITE_OVERRUN_ERROR, 6, 1) + FIELD(CFRM_IER0, READ_OVERRUN_ERROR, 5, 1) + FIELD(CFRM_IER0, CMD_INTERRUPT_ERROR, 4, 1) + FIELD(CFRM_IER0, WRITE_INTERRUPT_ERROR, 3, 1) + FIELD(CFRM_IER0, READ_INTERRUPT_ERROR, 2, 1) + FIELD(CFRM_IER0, SEU_CRC_ERROR, 1, 1) + FIELD(CFRM_IER0, SEU_ECC_ERROR, 0, 1) +REG32(CFRM_IER1, 0x174) +REG32(CFRM_IER2, 0x178) +REG32(CFRM_IER3, 0x17c) +REG32(CFRM_IDR0, 0x180) + FIELD(CFRM_IDR0, READ_BROADCAST_ERROR, 21, 1) + FIELD(CFRM_IDR0, CMD_MISSING_ERROR, 20, 1) + FIELD(CFRM_IDR0, RW_ROWOFF_ERROR, 19, 1) + FIELD(CFRM_IDR0, READ_REG_ADDR_ERROR, 18, 1) + FIELD(CFRM_IDR0, READ_BLK_TYPE_ERROR, 17, 1) + FIELD(CFRM_IDR0, READ_FRAME_ADDR_ERROR, 16, 1) + FIELD(CFRM_IDR0, WRITE_REG_ADDR_ERROR, 15, 1) + FIELD(CFRM_IDR0, WRITE_BLK_TYPE_ERROR, 13, 1) + FIELD(CFRM_IDR0, WRITE_FRAME_ADDR_ERROR, 12, 1) + FIELD(CFRM_IDR0, MFW_OVERRUN_ERROR, 11, 1) + FIELD(CFRM_IDR0, FAR_FIFO_UNDERFLOW, 10, 1) + FIELD(CFRM_IDR0, FAR_FIFO_OVERFLOW, 9, 1) + FIELD(CFRM_IDR0, PER_FRAME_SEQ_ERROR, 8, 1) + FIELD(CFRM_IDR0, CRC_ERROR, 7, 1) + FIELD(CFRM_IDR0, WRITE_OVERRUN_ERROR, 6, 1) + FIELD(CFRM_IDR0, READ_OVERRUN_ERROR, 5, 1) + FIELD(CFRM_IDR0, CMD_INTERRUPT_ERROR, 4, 1) + FIELD(CFRM_IDR0, WRITE_INTERRUPT_ERROR, 3, 1) + FIELD(CFRM_IDR0, READ_INTERRUPT_ERROR, 2, 1) + FIELD(CFRM_IDR0, SEU_CRC_ERROR, 1, 1) + FIELD(CFRM_IDR0, SEU_ECC_ERROR, 0, 1) +REG32(CFRM_IDR1, 0x184) +REG32(CFRM_IDR2, 0x188) +REG32(CFRM_IDR3, 0x18c) +REG32(CFRM_ITR0, 0x190) + FIELD(CFRM_ITR0, READ_BROADCAST_ERROR, 21, 1) + FIELD(CFRM_ITR0, CMD_MISSING_ERROR, 20, 1) + FIELD(CFRM_ITR0, RW_ROWOFF_ERROR, 19, 1) + FIELD(CFRM_ITR0, READ_REG_ADDR_ERROR, 18, 1) + FIELD(CFRM_ITR0, READ_BLK_TYPE_ERROR, 17, 1) + FIELD(CFRM_ITR0, READ_FRAME_ADDR_ERROR, 16, 1) + FIELD(CFRM_ITR0, WRITE_REG_ADDR_ERROR, 15, 1) + FIELD(CFRM_ITR0, WRITE_BLK_TYPE_ERROR, 13, 1) + FIELD(CFRM_ITR0, WRITE_FRAME_ADDR_ERROR, 12, 1) + FIELD(CFRM_ITR0, MFW_OVERRUN_ERROR, 11, 1) + FIELD(CFRM_ITR0, FAR_FIFO_UNDERFLOW, 10, 1) + FIELD(CFRM_ITR0, FAR_FIFO_OVERFLOW, 9, 1) + FIELD(CFRM_ITR0, PER_FRAME_SEQ_ERROR, 8, 1) + FIELD(CFRM_ITR0, CRC_ERROR, 7, 1) + FIELD(CFRM_ITR0, WRITE_OVERRUN_ERROR, 6, 1) + FIELD(CFRM_ITR0, READ_OVERRUN_ERROR, 5, 1) + FIELD(CFRM_ITR0, CMD_INTERRUPT_ERROR, 4, 1) + FIELD(CFRM_ITR0, WRITE_INTERRUPT_ERROR, 3, 1) + FIELD(CFRM_ITR0, READ_INTERRUPT_ERROR, 2, 1) + FIELD(CFRM_ITR0, SEU_CRC_ERROR, 1, 1) + FIELD(CFRM_ITR0, SEU_ECC_ERROR, 0, 1) +REG32(CFRM_ITR1, 0x194) +REG32(CFRM_ITR2, 0x198) +REG32(CFRM_ITR3, 0x19c) +REG32(SEU_SYNDRM00, 0x1a0) +REG32(SEU_SYNDRM01, 0x1a4) +REG32(SEU_SYNDRM02, 0x1a8) +REG32(SEU_SYNDRM03, 0x1ac) +REG32(SEU_SYNDRM10, 0x1b0) +REG32(SEU_SYNDRM11, 0x1b4) +REG32(SEU_SYNDRM12, 0x1b8) +REG32(SEU_SYNDRM13, 0x1bc) +REG32(SEU_SYNDRM20, 0x1c0) +REG32(SEU_SYNDRM21, 0x1c4) +REG32(SEU_SYNDRM22, 0x1c8) +REG32(SEU_SYNDRM23, 0x1cc) +REG32(SEU_SYNDRM30, 0x1d0) +REG32(SEU_SYNDRM31, 0x1d4) +REG32(SEU_SYNDRM32, 0x1d8) +REG32(SEU_SYNDRM33, 0x1dc) +REG32(SEU_VIRTUAL_SYNDRM0, 0x1e0) +REG32(SEU_VIRTUAL_SYNDRM1, 0x1e4) +REG32(SEU_VIRTUAL_SYNDRM2, 0x1e8) +REG32(SEU_VIRTUAL_SYNDRM3, 0x1ec) +REG32(SEU_CRC0, 0x1f0) +REG32(SEU_CRC1, 0x1f4) +REG32(SEU_CRC2, 0x1f8) +REG32(SEU_CRC3, 0x1fc) +REG32(CFRAME_FAR_BOT0, 0x200) +REG32(CFRAME_FAR_BOT1, 0x204) +REG32(CFRAME_FAR_BOT2, 0x208) +REG32(CFRAME_FAR_BOT3, 0x20c) +REG32(CFRAME_FAR_TOP0, 0x210) +REG32(CFRAME_FAR_TOP1, 0x214) +REG32(CFRAME_FAR_TOP2, 0x218) +REG32(CFRAME_FAR_TOP3, 0x21c) +REG32(LAST_FRAME_BOT0, 0x220) + FIELD(LAST_FRAME_BOT0, BLOCKTYPE1_LAST_FRAME_LSB, 20, 12) + FIELD(LAST_FRAME_BOT0, BLOCKTYPE0_LAST_FRAME, 0, 20) +REG32(LAST_FRAME_BOT1, 0x224) + FIELD(LAST_FRAME_BOT1, BLOCKTYPE3_LAST_FRAME_LSB, 28, 4) + FIELD(LAST_FRAME_BOT1, BLOCKTYPE2_LAST_FRAME, 8, 20) + FIELD(LAST_FRAME_BOT1, BLOCKTYPE1_LAST_FRAME_MSB, 0, 8) +REG32(LAST_FRAME_BOT2, 0x228) + FIELD(LAST_FRAME_BOT2, BLOCKTYPE3_LAST_FRAME_MSB, 0, 16) +REG32(LAST_FRAME_BOT3, 0x22c) +REG32(LAST_FRAME_TOP0, 0x230) + FIELD(LAST_FRAME_TOP0, BLOCKTYPE5_LAST_FRAME_LSB, 20, 12) + FIELD(LAST_FRAME_TOP0, BLOCKTYPE4_LAST_FRAME, 0, 20) +REG32(LAST_FRAME_TOP1, 0x234) + FIELD(LAST_FRAME_TOP1, BLOCKTYPE6_LAST_FRAME, 8, 20) + FIELD(LAST_FRAME_TOP1, BLOCKTYPE5_LAST_FRAME_MSB, 0, 8) +REG32(LAST_FRAME_TOP2, 0x238) +REG32(LAST_FRAME_TOP3, 0x23c) + +#define CFRAME_REG_R_MAX (R_LAST_FRAME_TOP3 + 1) + +#define FRAME_NUM_QWORDS 25 +#define FRAME_NUM_WORDS (FRAME_NUM_QWORDS * 4) /* 25 * 128 bits */ + +typedef struct XlnxCFrame { + uint32_t data[FRAME_NUM_WORDS]; +} XlnxCFrame; + +struct XlnxVersalCFrameReg { + SysBusDevice parent_obj; + MemoryRegion iomem; + MemoryRegion iomem_fdri; + qemu_irq irq_cfrm_imr; + + /* 128-bit wfifo. */ + uint32_t wfifo[WFIFO_SZ]; + + uint32_t regs[CFRAME_REG_R_MAX]; + RegisterInfo regs_info[CFRAME_REG_R_MAX]; + + bool rowon; + bool wcfg; + bool rcfg; + + GTree *cframes; + Fifo32 new_f_data; + + struct { + XlnxCfiIf *cfu_fdro; + uint32_t blktype_num_frames[7]; + } cfg; + bool row_configured; +}; + +#endif --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501109; cv=pass; d=zohomail.com; s=zohoarc; b=G6nLnQQuuRezMkgJZjTbg8Qc4eiSULMDifluEF3okY1JZIJZpy4m10YqN8uhO8imp3wI181PgM0Jy1g3Rnmt4RvRZ0gFimO7FCHUWlxjctXlzt9SvepikZhN+WSeVTk01hpK8DtMMRHkihctjvV93WfdAvdvg/8W2fk9jITfOnk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501109; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PlmBUBFnHafoH3wKL40OSkcDUt6CIpWrhXuMNEfPU0U=; b=M/Zw+OPkmE0nG0kPbX/bA7dHHYjbfTQottfpM78Ljrvu8vuvYdpRDB8ar0ep/xB4352hFErSh/UFlJ1n9odAy/m7xsuv7OmsucxDQX7/joEeULcNYPzU3/aIt+S1AjGFONbw1Mbc70hb3wfSB0odVjUKYGc0Q4Yd35XOYMSffYM= 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 1693501109163247.80521964625973; Thu, 31 Aug 2023 09:58:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzF-0001pu-AW; Thu, 31 Aug 2023 12:57:41 -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 1qbkyt-0001C9-7O for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:19 -0400 Received: from mail-dm6nam10on20618.outbound.protection.outlook.com ([2a01:111:f400:7e88::618] 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 1qbkyq-0003cs-De for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:18 -0400 Received: from CY5PR16CA0025.namprd16.prod.outlook.com (2603:10b6:930:10::17) by MW4PR12MB5603.namprd12.prod.outlook.com (2603:10b6:303:16a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.35; Thu, 31 Aug 2023 16:57:12 +0000 Received: from CY4PEPF0000EE34.namprd05.prod.outlook.com (2603:10b6:930:10:cafe::1b) by CY5PR16CA0025.outlook.office365.com (2603:10b6:930:10::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20 via Frontend Transport; Thu, 31 Aug 2023 16:57:12 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000EE34.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:12 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.27; Thu, 31 Aug 2023 11:57:11 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 09:57:11 -0700 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:10 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gm2j+1ynYb8ls6Jrm3YKxUN6y9yR4IeoB2iWvQ88sXWXapvo92l5/op/EXA63VfTj3E5zkOMZPtvM+q4A46oDQHTF/vxeBXij5av4+zhlr/dzNpeL3sHP2xLe09wSyOYxrpdaqHqb/JXZl77zyoAEfwEMqtTwbdDhRyaZe3Ul0D6tJwWamERc8rwGh6i8XBhZVae898zc7btRgYIu9QouQqJSh7mzRd6vLhKo2rDLlMx3ZMH05TvhfG0BaxvFZ64JHT8y2ZXEvMG8qXIpSJWw2OCby506kF6aP2KlS0E1TJWImPt8m7IT9zfXtY1ta47FsGtS7MSK+6OwRw6cbSV6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PlmBUBFnHafoH3wKL40OSkcDUt6CIpWrhXuMNEfPU0U=; b=mfd6Kxyom/ykWNsYCgZjX/Y12YBdnO2JmUwd9qgbo0l9lpXDwZY0EseDmPH5ujzxZrbWHun4gF6L+iZtZRJa6uAnuGsmgDDhXVS1Z+J94acAVGkf2UmAsdcKTXIV2c56PKw5RVnuLLxS+l4QuFsBNR+4wLfSp7JukF8QbBnSExsAL0QbmIqnduaf2hSzUgB2HoQMkXsQQR1+T5OMIg/2AU0Da2MHOoKlaiFiNiL/HphNaC72VrfQ9YGPeQZABQL5WnB7EgZWzMxk45kL5SDZp4orQ2+D5vP8jJJG60x389KKk/V6ytEoIaZ7CnfVOCeejNCiFlrcMJFOChE5fZltXg== 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 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=PlmBUBFnHafoH3wKL40OSkcDUt6CIpWrhXuMNEfPU0U=; b=VI0z3k8axS0N/kf3okcKBHPXjAMcnNvMFxQit35bcHgBfQVIXza1/t6E/X36eRPGq2tcWPDwKpyAwQgLnKSg3RpjX59+xPZS4f0eJ1VIVxAWMH5OQLOinHzFqwcHxlV1w2KY6GkQYxBejkLIFT4nHbpdVR/+y2otpmIPY1+F9/A= 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: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 6/8] hw/misc: Introduce a model of Xilinx Versal's CFRAME_BCAST_REG Date: Thu, 31 Aug 2023 17:56:59 +0100 Message-ID: <20230831165701.2016397-7-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE34:EE_|MW4PR12MB5603:EE_ X-MS-Office365-Filtering-Correlation-Id: 74607c21-2823-4c4a-341e-08dbaa435299 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FfpfQAz+37mImWX66sZHHZzvhynw+IPfD1of+cnUuUWJIiRVUK2op7w5AUAVZxDqkvTiHuzvjk4Nf+jESo6mlCrjzMngYUc2coyHHVRXFF9zPhEg2+YvRQBfOaMNxMkk2bGW42FdlxGLCFpoOZFrd6eqwd/HHQKu+hFVbiI8C4PCZinqLU8+ek6m72shlv8dBI47EiQdnxtjffFUJd8hpbvNTcd2YgHSCCFYJ9mGRBby8RVpu/mtbd/SZSYgx4OraUY+f4f5lmha0iinu55tdwhJRbV2IYpe7Cf/f3WZF9wjP0JnhxZWx9uUQHnfrw3cmwjjzH+cPz+0u/iytawl7ctYpQcLQXK3Xigzcog9co3A1eiId0iLHTyr/CaQFcbZIJ+HQI11lu17jQOZaBoS8nRDGrJbIwikwB/4q0h5wklSS/WKkXY6lldpMOb6WjUBXw8Sg2Q1qcq7+fGCnsrDwM6jmBKuA5KXl0Tsrx53FGl0eZDsoTq+14Lwe2ekYrRbVSpwq8ibSRbFg/s9vvpn8KWUpM/n/L7Mk4mkwYI8EgnMTaOCQ+35EVEdpPyE1O28ci4qkKfZiBTogiUiOTR906JU2i7AGCkvCiksqq1MZhWowqPjjOaChMGlYi2GDqHwhghVVbDcGP/lC6J//iy5AppaYyjiLO1lQkjkPznevAUu/b316nL1jlt6Mws/csjywNyyR6UKSQxcKLshhVtAbh5iXBvHU5x8LeWPK3n6noxPVzLMfZysVblV6cLgVU5hfSoQnR5JZWDM1QEKR+MXZg== 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:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(186009)(82310400011)(1800799009)(451199024)(36840700001)(46966006)(40470700004)(36860700001)(40460700003)(41300700001)(26005)(356005)(82740400003)(6666004)(86362001)(83380400001)(478600001)(47076005)(81166007)(426003)(336012)(1076003)(2616005)(40480700001)(70206006)(70586007)(6916009)(2906002)(54906003)(36756003)(316002)(5660300002)(8936002)(4326008)(8676002)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:12.7422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74607c21-2823-4c4a-341e-08dbaa435299 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: CY4PEPF0000EE34.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5603 Received-SPF: softfail client-ip=2a01:111:f400:7e88::618; envelope-from=francisco.iglesias@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: 1693501110959100005 Content-Type: text/plain; charset="utf-8" Introduce a model of Xilinx Versal's Configuration Frame broadcast controller (CFRAME_BCAST_REG). Signed-off-by: Francisco Iglesias Reviewed-by: Peter Maydell --- hw/misc/xlnx-versal-cframe-reg.c | 161 +++++++++++++++++++++++ include/hw/misc/xlnx-versal-cframe-reg.h | 17 +++ 2 files changed, 178 insertions(+) diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-= reg.c index 78db68f10c..8e8ec0715a 100644 --- a/hw/misc/xlnx-versal-cframe-reg.c +++ b/hw/misc/xlnx-versal-cframe-reg.c @@ -569,6 +569,83 @@ static const MemoryRegionOps cframe_reg_fdri_ops =3D { }, }; =20 +static uint64_t cframes_bcast_reg_read(void *opaque, hwaddr addr, unsigned= size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported read from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); + return 0; +} + +static void cframes_bcast_write(XlnxVersalCFrameBcastReg *s, uint8_t reg_a= ddr, + uint32_t *wfifo) +{ + XlnxCfiPacket pkt =3D { + .reg_addr =3D reg_addr, + .data[0] =3D wfifo[0], + .data[1] =3D wfifo[1], + .data[2] =3D wfifo[2], + .data[3] =3D wfifo[3] + }; + + for (int i =3D 0; i < ARRAY_SIZE(s->cfg.cframe); i++) { + if (s->cfg.cframe[i]) { + xlnx_cfi_transfer_packet(s->cfg.cframe[i], &pkt); + } + } +} + +static void cframes_bcast_reg_write(void *opaque, hwaddr addr, uint64_t va= lue, + unsigned size) +{ + XlnxVersalCFrameBcastReg *s =3D XLNX_VERSAL_CFRAME_BCAST_REG(opaque); + uint32_t wfifo[WFIFO_SZ]; + + if (update_wfifo(addr, value, s->wfifo, wfifo)) { + uint8_t reg_addr =3D extract32(addr, 4, 6); + + cframes_bcast_write(s, reg_addr, wfifo); + } +} + +static uint64_t cframes_bcast_fdri_read(void *opaque, hwaddr addr, + unsigned size) +{ + qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported read from addr=3D%" + HWADDR_PRIx "\n", __func__, addr); + return 0; +} + +static void cframes_bcast_fdri_write(void *opaque, hwaddr addr, uint64_t v= alue, + unsigned size) +{ + XlnxVersalCFrameBcastReg *s =3D XLNX_VERSAL_CFRAME_BCAST_REG(opaque); + uint32_t wfifo[WFIFO_SZ]; + + if (update_wfifo(addr, value, s->wfifo, wfifo)) { + cframes_bcast_write(s, CFRAME_FDRI, wfifo); + } +} + +static const MemoryRegionOps cframes_bcast_reg_reg_ops =3D { + .read =3D cframes_bcast_reg_read, + .write =3D cframes_bcast_reg_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static const MemoryRegionOps cframes_bcast_reg_fdri_ops =3D { + .read =3D cframes_bcast_fdri_read, + .write =3D cframes_bcast_fdri_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + static void cframe_reg_realize(DeviceState *dev, Error **errp) { XlnxVersalCFrameReg *s =3D XLNX_VERSAL_CFRAME_REG(dev); @@ -663,6 +740,71 @@ static Property cframe_regs_props[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void cframe_bcast_reg_init(Object *obj) +{ + XlnxVersalCFrameBcastReg *s =3D XLNX_VERSAL_CFRAME_BCAST_REG(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->iomem_reg, obj, &cframes_bcast_reg_reg_ops, = s, + TYPE_XLNX_VERSAL_CFRAME_BCAST_REG, KEYHOLE_STREA= M_4K); + memory_region_init_io(&s->iomem_fdri, obj, &cframes_bcast_reg_fdri_ops= , s, + TYPE_XLNX_VERSAL_CFRAME_BCAST_REG "-fdri", + KEYHOLE_STREAM_4K); + sysbus_init_mmio(sbd, &s->iomem_reg); + sysbus_init_mmio(sbd, &s->iomem_fdri); +} + +static void cframe_bcast_reg_reset_enter(Object *obj, ResetType type) +{ + XlnxVersalCFrameBcastReg *s =3D XLNX_VERSAL_CFRAME_BCAST_REG(obj); + + memset(s->wfifo, 0, WFIFO_SZ * sizeof(uint32_t)); +} + +static const VMStateDescription vmstate_cframe_bcast_reg =3D { + .name =3D TYPE_XLNX_VERSAL_CFRAME_BCAST_REG, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(wfifo, XlnxVersalCFrameBcastReg, 4), + VMSTATE_END_OF_LIST(), + } +}; + +static Property cframe_bcast_regs_props[] =3D { + DEFINE_PROP_LINK("cframe0", XlnxVersalCFrameBcastReg, cfg.cframe[0], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe1", XlnxVersalCFrameBcastReg, cfg.cframe[1], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe2", XlnxVersalCFrameBcastReg, cfg.cframe[2], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe3", XlnxVersalCFrameBcastReg, cfg.cframe[3], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe4", XlnxVersalCFrameBcastReg, cfg.cframe[4], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe5", XlnxVersalCFrameBcastReg, cfg.cframe[5], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe6", XlnxVersalCFrameBcastReg, cfg.cframe[6], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe7", XlnxVersalCFrameBcastReg, cfg.cframe[7], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe8", XlnxVersalCFrameBcastReg, cfg.cframe[8], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe9", XlnxVersalCFrameBcastReg, cfg.cframe[9], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe10", XlnxVersalCFrameBcastReg, cfg.cframe[10], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe11", XlnxVersalCFrameBcastReg, cfg.cframe[11], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe12", XlnxVersalCFrameBcastReg, cfg.cframe[12], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe13", XlnxVersalCFrameBcastReg, cfg.cframe[13], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_LINK("cframe14", XlnxVersalCFrameBcastReg, cfg.cframe[14], + TYPE_XLNX_CFI_IF, XlnxCfiIf *), + DEFINE_PROP_END_OF_LIST(), +}; + static void cframe_reg_class_init(ObjectClass *klass, void *data) { ResettableClass *rc =3D RESETTABLE_CLASS(klass); @@ -677,6 +819,16 @@ static void cframe_reg_class_init(ObjectClass *klass, = void *data) xcic->cfi_transfer_packet =3D cframe_reg_cfi_transfer_packet; } =20 +static void cframe_bcast_reg_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + dc->vmsd =3D &vmstate_cframe_bcast_reg; + device_class_set_props(dc, cframe_bcast_regs_props); + rc->phases.enter =3D cframe_bcast_reg_reset_enter; +} + static const TypeInfo cframe_reg_info =3D { .name =3D TYPE_XLNX_VERSAL_CFRAME_REG, .parent =3D TYPE_SYS_BUS_DEVICE, @@ -689,9 +841,18 @@ static const TypeInfo cframe_reg_info =3D { } }; =20 +static const TypeInfo cframe_bcast_reg_info =3D { + .name =3D TYPE_XLNX_VERSAL_CFRAME_BCAST_REG, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxVersalCFrameBcastReg), + .class_init =3D cframe_bcast_reg_class_init, + .instance_init =3D cframe_bcast_reg_init, +}; + static void cframe_reg_register_types(void) { type_register_static(&cframe_reg_info); + type_register_static(&cframe_bcast_reg_info); } =20 type_init(cframe_reg_register_types) diff --git a/include/hw/misc/xlnx-versal-cframe-reg.h b/include/hw/misc/xln= x-versal-cframe-reg.h index f286d973bf..a14fbd7fe4 100644 --- a/include/hw/misc/xlnx-versal-cframe-reg.h +++ b/include/hw/misc/xlnx-versal-cframe-reg.h @@ -26,6 +26,10 @@ #define TYPE_XLNX_VERSAL_CFRAME_REG "xlnx,cframe-reg" OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFrameReg, XLNX_VERSAL_CFRAME_REG) =20 +#define TYPE_XLNX_VERSAL_CFRAME_BCAST_REG "xlnx.cframe-bcast-reg" +OBJECT_DECLARE_SIMPLE_TYPE(XlnxVersalCFrameBcastReg, + XLNX_VERSAL_CFRAME_BCAST_REG) + /* * The registers in this module are 128 bits wide but it is ok to write * and read them through 4 sequential 32 bit accesses (address[3:2] =3D 0, @@ -283,4 +287,17 @@ struct XlnxVersalCFrameReg { bool row_configured; }; =20 +struct XlnxVersalCFrameBcastReg { + SysBusDevice parent_obj; + MemoryRegion iomem_reg; + MemoryRegion iomem_fdri; + + /* 128-bit wfifo. */ + uint32_t wfifo[WFIFO_SZ]; + + struct { + XlnxCfiIf *cframe[15]; + } cfg; +}; + #endif --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501076; cv=pass; d=zohomail.com; s=zohoarc; b=Ivr9ovGhks3to+FQ1MD4JJZgyOU8GlNPqFARLps5XJWpGWjIHcBNL1ZSI0z6gYt1E+l5C0D8fge8YfgfjZMpnZ5Q6I+jTR8llK5W2b9Z6vXNRhMBArK74HvTnjaPf1kqSnKkxSNRuutUIRivXbJCtgC4KB1rV7lX2JZ/aCOV5dM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PQ+lddYVIVTyHUZJvwGaDUPTBiw80FboOA1+/NRIf+w=; b=Z/2rZ4F9lairgGbN+PLWf/dj0t71zUW8cvCWcpsUfYWqb1idUcaVRSuN2zftewkxkXq+Z8uzzYgcWX4lcD+1fdU7+EjBsvaVuDwcbmIzPyBjrJ1ajQh0WEk3mnCfQlz5YH7fsGl1TWcHmJ/spy+1AWjZKASoW0SbBSuCvVYSalM= 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 1693501076720961.9614735353459; Thu, 31 Aug 2023 09:57:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzB-0001ab-N6; Thu, 31 Aug 2023 12:57:38 -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 1qbkyw-0001CY-Ef for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:26 -0400 Received: from mail-dm6nam10on2062d.outbound.protection.outlook.com ([2a01:111:f400:7e88::62d] 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 1qbkyt-0003eC-GK for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:21 -0400 Received: from CY5PR22CA0005.namprd22.prod.outlook.com (2603:10b6:930:16::28) by IA1PR12MB6412.namprd12.prod.outlook.com (2603:10b6:208:3af::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 16:57:15 +0000 Received: from CY4PEPF0000EE30.namprd05.prod.outlook.com (2603:10b6:930:16:cafe::8b) by CY5PR22CA0005.outlook.office365.com (2603:10b6:930:16::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20 via Frontend Transport; Thu, 31 Aug 2023 16:57:14 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000EE30.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:14 +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.27; Thu, 31 Aug 2023 11:57:13 -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.27; Thu, 31 Aug 2023 11:57:12 -0500 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:11 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k23xFMeO+KWHSKASgeOf6zADu1KfhSR7mlv9+mHYougZIwr/iZF0zsYbuUq74O/sHRc4uFCQP7VXilzOgFHMf8hfO2O4+V4tHeEdU9SCJrkHIjRucCLljceClbE+IaB9ecJmAW/UyV7j+SbmUr0DStn0kw6bSycaqldSuqfRNdZ7j4bXWRlhxLUZkwSROOZYxujGMHSUurfC854p6f8I6I0dUBFVf/Y2p2GDg9Rom6ZJw8/20l1CfqBN0f2FF3EIrHr3CkKJFqV0N5iNt94vgAqMyldB35awXiXKoUNZtQ4o3ry0tYfJjg7kFzD1N7V19UanIL8V4SOaGnDZfGUUkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PQ+lddYVIVTyHUZJvwGaDUPTBiw80FboOA1+/NRIf+w=; b=Hw0XeprpEWioFeL+Ho28IejXfKoJSAma/ukqWWYnYvlS7TEDYG9WEKCHg5UbcRTbBbjTRuHeWKqxZTEWlDKwh12Ttu56tmdw1Mbc9wbBdXsvMgHSKC7FESpZNtvgF5neCNztgw7ahY9LfYYN7/YCRRGBm/QfqALGXnvLdKWxVx7slShoS4G6AX5EXAsHyr8eDvyZ6sc+KH0AUh9JnfK+zNeRnHRqcF5O0xEPUByscymEOfLERwrR6LnbXHfJGfu3aXL2CHOSVc51/vMauO0h74zmQBuCHFBdmDk18wihh1zDZHc1FbDOmPXbazpJT5J5rA6YZ86WOZrvGhwrIoLyLQ== 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 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=PQ+lddYVIVTyHUZJvwGaDUPTBiw80FboOA1+/NRIf+w=; b=sIGfbxeiKhdRYecFTaBtjnIMJLfQdoiPHQF855JSPSpUJLY4Xx/E/2jQ4rOvZ1Xg40PU3E1LfK/7QRJdukzd5UduWLCbMy7iHq8PuZEwwNJrF10keipzkrPaQhVWcfQOBOE07qQucNy7Yr9HXpGyxJaDdAo41RKC27y3xsY9yQU= 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: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 7/8] hw/arm/xlnx-versal: Connect the CFU_APB, CFU_FDRO and CFU_SFR Date: Thu, 31 Aug 2023 17:57:00 +0100 Message-ID: <20230831165701.2016397-8-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE30:EE_|IA1PR12MB6412:EE_ X-MS-Office365-Filtering-Correlation-Id: 47386498-06a3-4634-93c6-08dbaa43539e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CbhDUaCfd0tgatXkYM58r30LtzmC7Cp+rOfMAmnJh6SWcOmLBSJgi/+E8HFFiK2KdfQX/BfBsuMLqYy8w45SakTd/cLMkBgsf7PGXdREBHSkEXDDERBc308WfwdMSXSMovMlehN9BRBn3Xq4M/h6ffbcyjuSUCGA3dkJc2XfYwsj7Fr98z28EP22X5wdlV7x3JDHYck2FcVFhxiTVmBXiyktGmpdzLfqmQ+M/KT5SZvAQHADmZTT1KSJMhHM+bkr6Ya4SflBgBfgNDLRMfLoGcN+8Y3ooQ4cbAPJ4sP+XKDcM8xprSNsY66gSHAK1A9eLREU9OAUshlpJevOhYahfL+FNZM5aGaDvlVcgn3w9G0rH/bvNWiOgOcWyc84BhSlGvmPyM7aQFgIhXpTPJkFxabY96YNBYlspf0l8b3gGeMJDShq9tc6a4iwxlxujh+F0Lj1u9r42YD+ajVmwVVDhw385FKkB/rQnRvovT99XXOKgoC/PefsZEXYmwWZFgdte7AD8ZllhpqeeNVX9ZDwBLXOEBC+vjr2ea9gXpAsoLTe0GzNQlCGO2PXKWwi2s6HNeVF1voVO48NxfRQKwBRCtepaAFxKE/LGuSGK29/db3Hngvb4TTe4aLAY0y4qQmsH1WIptTx1/thapkizv5TPbkgiDXmKhxdItOIJxWuT84gk19uSLDWsN/UqhS8eW8Bz/xYvvqOSTJ3lf2FF/YQXQ4bwePzdwvaYS09I2dO9R50eYD4xJPmcyRlef/ma0rcjvIOz2t/1uhk640p87MpnQ== 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:(13230031)(4636009)(346002)(396003)(376002)(39860400002)(136003)(82310400011)(451199024)(1800799009)(186009)(46966006)(36840700001)(40470700004)(6666004)(478600001)(2906002)(1076003)(2616005)(336012)(426003)(26005)(316002)(6916009)(41300700001)(44832011)(54906003)(70206006)(70586007)(5660300002)(4326008)(8676002)(8936002)(36756003)(40460700003)(40480700001)(47076005)(86362001)(36860700001)(81166007)(82740400003)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:14.4551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47386498-06a3-4634-93c6-08dbaa43539e 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: CY4PEPF0000EE30.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6412 Received-SPF: softfail client-ip=2a01:111:f400:7e88::62d; envelope-from=francisco.iglesias@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: 1693501077403100001 Content-Type: text/plain; charset="utf-8" Connect the Configuration Frame Unit (CFU_APB, CFU_FDRO and CFU_SFR) to the Versal machine. Signed-off-by: Francisco Iglesias Acked-by: Edgar E. Iglesias Reviewed-by: Peter Maydell --- hw/arm/xlnx-versal.c | 42 ++++++++++++++++++++++++++++++++++++ include/hw/arm/xlnx-versal.h | 16 ++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 60bf5fe657..3f4b4b1560 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -570,6 +570,47 @@ static void versal_create_ospi(Versal *s, qemu_irq *pi= c) qdev_connect_gpio_out(orgate, 0, pic[VERSAL_OSPI_IRQ]); } =20 +static void versal_create_cfu(Versal *s, qemu_irq *pic) +{ + SysBusDevice *sbd; + + /* CFU FDRO */ + object_initialize_child(OBJECT(s), "cfu-fdro", &s->pmc.cfu_fdro, + TYPE_XLNX_VERSAL_CFU_FDRO); + sbd =3D SYS_BUS_DEVICE(&s->pmc.cfu_fdro); + + sysbus_realize(sbd, &error_fatal); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_FDRO, + sysbus_mmio_get_region(sbd, 0)); + + /* CFU APB */ + object_initialize_child(OBJECT(s), "cfu-apb", &s->pmc.cfu_apb, + TYPE_XLNX_VERSAL_CFU_APB); + sbd =3D SYS_BUS_DEVICE(&s->pmc.cfu_apb); + + sysbus_realize(sbd, &error_fatal); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_APB, + sysbus_mmio_get_region(sbd, 0)); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_STREAM, + sysbus_mmio_get_region(sbd, 1)); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_STREAM_2, + sysbus_mmio_get_region(sbd, 2)); + sysbus_connect_irq(sbd, 0, pic[VERSAL_CFU_IRQ_0]); + + /* CFU SFR */ + object_initialize_child(OBJECT(s), "cfu-sfr", &s->pmc.cfu_sfr, + TYPE_XLNX_VERSAL_CFU_SFR); + + sbd =3D SYS_BUS_DEVICE(&s->pmc.cfu_sfr); + + object_property_set_link(OBJECT(&s->pmc.cfu_sfr), + "cfu", OBJECT(&s->pmc.cfu_apb), &error_abort); + + sysbus_realize(sbd, &error_fatal); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_SFR, + sysbus_mmio_get_region(sbd, 0)); +} + static void versal_create_crl(Versal *s, qemu_irq *pic) { SysBusDevice *sbd; @@ -763,6 +804,7 @@ static void versal_realize(DeviceState *dev, Error **er= rp) 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 diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 39ee31185c..29b9c60301 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -32,6 +32,7 @@ #include "hw/misc/xlnx-versal-crl.h" #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" #include "hw/net/xlnx-versal-canfd.h" +#include "hw/misc/xlnx-versal-cfu.h" =20 #define TYPE_XLNX_VERSAL "xlnx-versal" OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL) @@ -117,6 +118,9 @@ struct Versal { XlnxEFuse efuse; XlnxVersalEFuseCtrl efuse_ctrl; XlnxVersalEFuseCache efuse_cache; + XlnxVersalCFUAPB cfu_apb; + XlnxVersalCFUFDRO cfu_fdro; + XlnxVersalCFUSFR cfu_sfr; =20 OrIRQState apb_irq_orgate; } pmc; @@ -147,6 +151,7 @@ struct Versal { #define VERSAL_GEM1_WAKE_IRQ_0 59 #define VERSAL_ADMA_IRQ_0 60 #define VERSAL_XRAM_IRQ_0 79 +#define VERSAL_CFU_IRQ_0 120 #define VERSAL_PMC_APB_IRQ 121 #define VERSAL_OSPI_IRQ 124 #define VERSAL_SD0_IRQ_0 126 @@ -240,6 +245,17 @@ struct Versal { #define MM_PMC_EFUSE_CACHE 0xf1250000 #define MM_PMC_EFUSE_CACHE_SIZE 0x00C00 =20 +#define MM_PMC_CFU_APB 0xf12b0000 +#define MM_PMC_CFU_APB_SIZE 0x10000 +#define MM_PMC_CFU_STREAM 0xf12c0000 +#define MM_PMC_CFU_STREAM_SIZE 0x1000 +#define MM_PMC_CFU_SFR 0xf12c1000 +#define MM_PMC_CFU_SFR_SIZE 0x1000 +#define MM_PMC_CFU_FDRO 0xf12c2000 +#define MM_PMC_CFU_FDRO_SIZE 0x1000 +#define MM_PMC_CFU_STREAM_2 0xf1f80000 +#define MM_PMC_CFU_STREAM_2_SIZE 0x40000 + #define MM_PMC_CRP 0xf1260000U #define MM_PMC_CRP_SIZE 0x10000 #define MM_PMC_RTC 0xf12a0000 --=20 2.34.1 From nobody Wed May 15 07:30:47 2024 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=1693501088; cv=pass; d=zohomail.com; s=zohoarc; b=OeNgCwGOsjjuLGO9k+I+Quv8xXRlC6Ii073kg71fI0IjaBZfP7jreMvnDMEx+AA0ofuXJbKqoHXdNxAOAhjfcPP+9AYv5ZfFT+MR6nbEItV8UptuttzH9OYm1YCfe7OvIxeRxRUoeEHdV0RHXY6AFZTj2Cpd2N2jTVfsMCH/86Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693501088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wG3Tv2m3grnATlhKb6xXipJorZEirfPz5WweItlp1io=; b=WtXeUOaw0mGKBHOvnw1bnsymeY2peBhPu2mazNfnRshmdbBL0Erp2qwHHzQPJ5X6FAch8j0sHoLAkoLrmOVlOqgE2kQ7JbdCjnFv5q7s9VMGwWqTU3RxTifIMYF4bJzFnRAVW3LMCaWhbiiNNv5wDKFLUxUk35dMOtyWseO2GNg= 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 1693501088824937.6242966007005; Thu, 31 Aug 2023 09:58:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbkzE-0001nz-MF; Thu, 31 Aug 2023 12:57:40 -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 1qbkyy-0001Cm-5s for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:26 -0400 Received: from mail-dm6nam11on2061e.outbound.protection.outlook.com ([2a01:111:f400:7eaa::61e] helo=NAM11-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 1qbkyu-0003f6-EH for qemu-devel@nongnu.org; Thu, 31 Aug 2023 12:57:23 -0400 Received: from MW4PR03CA0080.namprd03.prod.outlook.com (2603:10b6:303:b6::25) by CY8PR12MB8241.namprd12.prod.outlook.com (2603:10b6:930:76::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 16:57:16 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:303:b6:cafe::2b) by MW4PR03CA0080.outlook.office365.com (2603:10b6:303:b6::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.22 via Frontend Transport; Thu, 31 Aug 2023 16:57:16 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6745.17 via Frontend Transport; Thu, 31 Aug 2023 16:57:15 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 31 Aug 2023 11:57:14 -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.27; Thu, 31 Aug 2023 11:57:14 -0500 Received: from xdcsswbld02.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Thu, 31 Aug 2023 11:57:13 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gdsQsoUpR8eUOA0FfB/8Ya9k5pqWm4y27ym2bzunA5lPp6fflCwD6P5oyhIuuZCCeoltqvswcAPL/CxDgLkdxYVMTDAlL9TmgffVC7vU21PqiRUYQ/vk0R6Xal3iLzNVS7UUFKy+xQROZ4nOIOheaEqnA1MIfPAnoPlkrQs6JafPxJX0VpeS7nF2LtNgLsI/EC7IB1iyeTtcYBLNa8Imu9GCTpKzKlA6ZJIsabOD4iGTShZAYdQy8wAvZhp+4nGPHdFjyzFa2l9fSL8OmHUMRhQxGybJ/PFnE+cTHZJq/Z9n10IP/EEgXlj5ywPqKtcU5a+wYAMnCV50+18xZ4Kb0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=wG3Tv2m3grnATlhKb6xXipJorZEirfPz5WweItlp1io=; b=LjOjlLTATU7luRufj5kKhl60XS/1SOM6eDkVYgscR4yExuNSNYiXfbV1jfSnRHj03N28c7bB2V0U/wV8raapMMOripzmG6tvDonGoWCp0wc5+9TC4m/G87/HGq1AFWrE6fn8LaobaL0/AH1Y1hNr/3+m5ix2EqgwBLfN3WvrFbwh4fm8Ez54JNpGK4gEFA0m877kq6TKGr2Q8D3MmxnI/cCjDic39uQ9NgWh6bfyycjy0KigF9HSTCPF+rCdiBC4Gq53bH47GQj9zcKWIpjeZOTwO8lLt0xKTpPgTK0OE+Rwuqg/0z/NbF8P7ZzkxSUV21nhxMBCQ0BL/MuQjVBHTw== 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 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=wG3Tv2m3grnATlhKb6xXipJorZEirfPz5WweItlp1io=; b=cmuxR4d+5CpGlir5AtiCrlkAJJWAUhNOgxJH6RGfKTUhQpSL1290QPCl+scBScVF3P3In/CD5hze4Vz+d564xuky4KLJqzsu+Wxq6RlH8mZsZfZlMipQfeTPvbazKYQtZVi+Qo4idza4RW5wPaG4iWq9ivt/09AX9ow0oEUrRDE= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Francisco Iglesias To: CC: , , , , , , , Subject: [PATCH v5 8/8] hw/arm/versal: Connect the CFRAME_REG and CFRAME_BCAST_REG Date: Thu, 31 Aug 2023 17:57:01 +0100 Message-ID: <20230831165701.2016397-9-francisco.iglesias@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831165701.2016397-1-francisco.iglesias@amd.com> References: <20230831165701.2016397-1-francisco.iglesias@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|CY8PR12MB8241:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d11982b-c365-4309-5db9-08dbaa43546b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ts8e2Sxr1e7uF19sWA9Xy5NJBMzSyqpuZSVtBYgZs4yNnB5FA3VhD0lnHNWn0r/YzJGp0LnS/DupgnCaObRXQq8OdR/rT0hemx8JJZLP1uK53j2o+/BAQ6X40D05iiWd9iYIuih4LbREU9DdNQJZbfUkulsWY7WSSdnBldqQmPdXc2tNNkpf5fNP/+UVnYriJU63aQzzseZaW0kU5RPfB58U0De/BwgbBjuJEYNkTiKXqNtravmdzW/wvFDQH3OFrw8+pWOyTXlgdacrRXurFnF1fyK1GkF9Sn0diUo2TZYlG8/kxMGORbZLbhLA+PHcrirB3y9kJffaEseTgogkqdpnQ0vGEJ9kDps7rGznH9w2zIIB1AXEabt6/Smxk7xCqV18NmhzpxbjCVNUg1+ZDK6UApaCdHfkox9YdGIze8MOs6TDNVkuJ/Si72AvWsrf2/aMdfMvxlDxwplG9m8iM/NsHzliXuUh1fWuMsvpO90lNnfIX/hpZoQq85hQIWRldmRzBWDgFzuQkTlmJHqQc4qq8juw8fEsFFHdDZY9rvJOVScY4rCXhhTKe46iFXSGtGTab41HIPHvbi+QABMrJhOZg8sH62pJ8+paHZwK2qCGNUvM/3tpjx05akJiv5ezatpXWAB6jO4zAkSp1pGeqC7UK/YDJakW2wZwfCTyAWRB2zirTOuRDzOdQl2O6yvKazIjAKWToZRC9e3OYKzea3u2t6RC8AG8aCmVC969yKhXhL5bMzEh7YE6gDFAnXknDcl3s+qbWOS/p52pgubkrA== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(4636009)(346002)(39860400002)(136003)(376002)(396003)(1800799009)(186009)(82310400011)(451199024)(40470700004)(46966006)(36840700001)(40460700003)(41300700001)(356005)(82740400003)(81166007)(6666004)(86362001)(2616005)(478600001)(47076005)(83380400001)(336012)(26005)(426003)(1076003)(36860700001)(40480700001)(70586007)(70206006)(36756003)(54906003)(6916009)(316002)(2906002)(4326008)(8936002)(8676002)(5660300002)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 16:57:15.7191 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d11982b-c365-4309-5db9-08dbaa43546b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8241 Received-SPF: softfail client-ip=2a01:111:f400:7eaa::61e; envelope-from=francisco.iglesias@amd.com; helo=NAM11-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: 1693501089703100001 Content-Type: text/plain; charset="utf-8" Connect the Configuration Frame controller (CFRAME_REG) and the Configuration Frame broadcast controller (CFRAME_BCAST_REG) to the Versal machine. Signed-off-by: Francisco Iglesias Reviewed-by: Peter Maydell --- hw/arm/xlnx-versal.c | 113 ++++++++++++++++++++++++++++++++++- include/hw/arm/xlnx-versal.h | 69 +++++++++++++++++++++ 2 files changed, 181 insertions(+), 1 deletion(-) diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 3f4b4b1560..fa556d8764 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -27,7 +27,7 @@ #define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f") #define GEM_REVISION 0x40070106 =20 -#define VERSAL_NUM_PMC_APB_IRQS 3 +#define VERSAL_NUM_PMC_APB_IRQS 18 #define NUM_OSPI_IRQ_LINES 3 =20 static void versal_create_apu_cpus(Versal *s) @@ -341,6 +341,7 @@ static void versal_create_pmc_apb_irq_orgate(Versal *s,= qemu_irq *pic) * - RTC * - BBRAM * - PMC SLCR + * - CFRAME regs (input 3 - 17 to the orgate) */ object_initialize_child(OBJECT(s), "pmc-apb-irq-orgate", &s->pmc.apb_irq_orgate, TYPE_OR_IRQ); @@ -573,6 +574,42 @@ static void versal_create_ospi(Versal *s, qemu_irq *pi= c) static void versal_create_cfu(Versal *s, qemu_irq *pic) { SysBusDevice *sbd; + DeviceState *dev; + int i; + const struct { + uint64_t reg_base; + uint64_t fdri_base; + } cframe_addr[] =3D { + { MM_PMC_CFRAME0_REG, MM_PMC_CFRAME0_FDRI }, + { MM_PMC_CFRAME1_REG, MM_PMC_CFRAME1_FDRI }, + { MM_PMC_CFRAME2_REG, MM_PMC_CFRAME2_FDRI }, + { MM_PMC_CFRAME3_REG, MM_PMC_CFRAME3_FDRI }, + { MM_PMC_CFRAME4_REG, MM_PMC_CFRAME4_FDRI }, + { MM_PMC_CFRAME5_REG, MM_PMC_CFRAME5_FDRI }, + { MM_PMC_CFRAME6_REG, MM_PMC_CFRAME6_FDRI }, + { MM_PMC_CFRAME7_REG, MM_PMC_CFRAME7_FDRI }, + { MM_PMC_CFRAME8_REG, MM_PMC_CFRAME8_FDRI }, + { MM_PMC_CFRAME9_REG, MM_PMC_CFRAME9_FDRI }, + { MM_PMC_CFRAME10_REG, MM_PMC_CFRAME10_FDRI }, + { MM_PMC_CFRAME11_REG, MM_PMC_CFRAME11_FDRI }, + { MM_PMC_CFRAME12_REG, MM_PMC_CFRAME12_FDRI }, + { MM_PMC_CFRAME13_REG, MM_PMC_CFRAME13_FDRI }, + { MM_PMC_CFRAME14_REG, MM_PMC_CFRAME14_FDRI }, + }; + const struct { + uint32_t blktype0_frames; + uint32_t blktype1_frames; + uint32_t blktype2_frames; + uint32_t blktype3_frames; + uint32_t blktype4_frames; + uint32_t blktype5_frames; + uint32_t blktype6_frames; + } cframe_cfg[] =3D { + [0] =3D { 34111, 3528, 12800, 11, 5, 1, 1 }, + [1] =3D { 38498, 3841, 15361, 13, 7, 3, 1 }, + [2] =3D { 38498, 3841, 15361, 13, 7, 3, 1 }, + [3] =3D { 38498, 3841, 15361, 13, 7, 3, 1 }, + }; =20 /* CFU FDRO */ object_initialize_child(OBJECT(s), "cfu-fdro", &s->pmc.cfu_fdro, @@ -583,10 +620,84 @@ static void versal_create_cfu(Versal *s, qemu_irq *pi= c) memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_FDRO, sysbus_mmio_get_region(sbd, 0)); =20 + /* CFRAME REG */ + for (i =3D 0; i < ARRAY_SIZE(s->pmc.cframe); i++) { + g_autofree char *name =3D g_strdup_printf("cframe%d", i); + + object_initialize_child(OBJECT(s), name, &s->pmc.cframe[i], + TYPE_XLNX_VERSAL_CFRAME_REG); + + sbd =3D SYS_BUS_DEVICE(&s->pmc.cframe[i]); + dev =3D DEVICE(&s->pmc.cframe[i]); + + if (i < ARRAY_SIZE(cframe_cfg)) { + object_property_set_int(OBJECT(dev), "blktype0-frames", + cframe_cfg[i].blktype0_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype1-frames", + cframe_cfg[i].blktype1_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype2-frames", + cframe_cfg[i].blktype2_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype3-frames", + cframe_cfg[i].blktype3_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype4-frames", + cframe_cfg[i].blktype4_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype5-frames", + cframe_cfg[i].blktype5_frames, + &error_abort); + object_property_set_int(OBJECT(dev), "blktype6-frames", + cframe_cfg[i].blktype6_frames, + &error_abort); + } + object_property_set_link(OBJECT(dev), "cfu-fdro", + OBJECT(&s->pmc.cfu_fdro), &error_fatal); + + sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); + + memory_region_add_subregion(&s->mr_ps, cframe_addr[i].reg_base, + sysbus_mmio_get_region(sbd, 0)); + memory_region_add_subregion(&s->mr_ps, cframe_addr[i].fdri_base, + sysbus_mmio_get_region(sbd, 1)); + sysbus_connect_irq(sbd, 0, + qdev_get_gpio_in(DEVICE(&s->pmc.apb_irq_orgate), + 3 + i)); + } + + /* CFRAME BCAST */ + object_initialize_child(OBJECT(s), "cframe_bcast", &s->pmc.cframe_bcas= t, + TYPE_XLNX_VERSAL_CFRAME_BCAST_REG); + + sbd =3D SYS_BUS_DEVICE(&s->pmc.cframe_bcast); + dev =3D DEVICE(&s->pmc.cframe_bcast); + + for (i =3D 0; i < ARRAY_SIZE(s->pmc.cframe); i++) { + g_autofree char *propname =3D g_strdup_printf("cframe%d", i); + object_property_set_link(OBJECT(dev), propname, + OBJECT(&s->pmc.cframe[i]), &error_fatal); + } + + sysbus_realize(sbd, &error_fatal); + + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFRAME_BCAST_REG, + sysbus_mmio_get_region(sbd, 0)); + memory_region_add_subregion(&s->mr_ps, MM_PMC_CFRAME_BCAST_FDRI, + sysbus_mmio_get_region(sbd, 1)); + /* CFU APB */ object_initialize_child(OBJECT(s), "cfu-apb", &s->pmc.cfu_apb, TYPE_XLNX_VERSAL_CFU_APB); sbd =3D SYS_BUS_DEVICE(&s->pmc.cfu_apb); + dev =3D DEVICE(&s->pmc.cfu_apb); + + for (i =3D 0; i < ARRAY_SIZE(s->pmc.cframe); i++) { + g_autofree char *propname =3D g_strdup_printf("cframe%d", i); + object_property_set_link(OBJECT(dev), propname, + OBJECT(&s->pmc.cframe[i]), &error_fatal); + } =20 sysbus_realize(sbd, &error_fatal); memory_region_add_subregion(&s->mr_ps, MM_PMC_CFU_APB, diff --git a/include/hw/arm/xlnx-versal.h b/include/hw/arm/xlnx-versal.h index 29b9c60301..7b419f88c2 100644 --- a/include/hw/arm/xlnx-versal.h +++ b/include/hw/arm/xlnx-versal.h @@ -33,6 +33,7 @@ #include "hw/misc/xlnx-versal-pmc-iou-slcr.h" #include "hw/net/xlnx-versal-canfd.h" #include "hw/misc/xlnx-versal-cfu.h" +#include "hw/misc/xlnx-versal-cframe-reg.h" =20 #define TYPE_XLNX_VERSAL "xlnx-versal" OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL) @@ -47,6 +48,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(Versal, XLNX_VERSAL) #define XLNX_VERSAL_NR_IRQS 192 #define XLNX_VERSAL_NR_CANFD 2 #define XLNX_VERSAL_CANFD_REF_CLK (24 * 1000 * 1000) +#define XLNX_VERSAL_NR_CFRAME 15 =20 struct Versal { /*< private >*/ @@ -121,6 +123,8 @@ struct Versal { XlnxVersalCFUAPB cfu_apb; XlnxVersalCFUFDRO cfu_fdro; XlnxVersalCFUSFR cfu_sfr; + XlnxVersalCFrameReg cframe[XLNX_VERSAL_NR_CFRAME]; + XlnxVersalCFrameBcastReg cframe_bcast; =20 OrIRQState apb_irq_orgate; } pmc; @@ -256,6 +260,71 @@ struct Versal { #define MM_PMC_CFU_STREAM_2 0xf1f80000 #define MM_PMC_CFU_STREAM_2_SIZE 0x40000 =20 +#define MM_PMC_CFRAME0_REG 0xf12d0000 +#define MM_PMC_CFRAME0_REG_SIZE 0x1000 +#define MM_PMC_CFRAME0_FDRI 0xf12d1000 +#define MM_PMC_CFRAME0_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME1_REG 0xf12d2000 +#define MM_PMC_CFRAME1_REG_SIZE 0x1000 +#define MM_PMC_CFRAME1_FDRI 0xf12d3000 +#define MM_PMC_CFRAME1_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME2_REG 0xf12d4000 +#define MM_PMC_CFRAME2_REG_SIZE 0x1000 +#define MM_PMC_CFRAME2_FDRI 0xf12d5000 +#define MM_PMC_CFRAME2_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME3_REG 0xf12d6000 +#define MM_PMC_CFRAME3_REG_SIZE 0x1000 +#define MM_PMC_CFRAME3_FDRI 0xf12d7000 +#define MM_PMC_CFRAME3_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME4_REG 0xf12d8000 +#define MM_PMC_CFRAME4_REG_SIZE 0x1000 +#define MM_PMC_CFRAME4_FDRI 0xf12d9000 +#define MM_PMC_CFRAME4_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME5_REG 0xf12da000 +#define MM_PMC_CFRAME5_REG_SIZE 0x1000 +#define MM_PMC_CFRAME5_FDRI 0xf12db000 +#define MM_PMC_CFRAME5_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME6_REG 0xf12dc000 +#define MM_PMC_CFRAME6_REG_SIZE 0x1000 +#define MM_PMC_CFRAME6_FDRI 0xf12dd000 +#define MM_PMC_CFRAME6_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME7_REG 0xf12de000 +#define MM_PMC_CFRAME7_REG_SIZE 0x1000 +#define MM_PMC_CFRAME7_FDRI 0xf12df000 +#define MM_PMC_CFRAME7_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME8_REG 0xf12e0000 +#define MM_PMC_CFRAME8_REG_SIZE 0x1000 +#define MM_PMC_CFRAME8_FDRI 0xf12e1000 +#define MM_PMC_CFRAME8_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME9_REG 0xf12e2000 +#define MM_PMC_CFRAME9_REG_SIZE 0x1000 +#define MM_PMC_CFRAME9_FDRI 0xf12e3000 +#define MM_PMC_CFRAME9_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME10_REG 0xf12e4000 +#define MM_PMC_CFRAME10_REG_SIZE 0x1000 +#define MM_PMC_CFRAME10_FDRI 0xf12e5000 +#define MM_PMC_CFRAME10_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME11_REG 0xf12e6000 +#define MM_PMC_CFRAME11_REG_SIZE 0x1000 +#define MM_PMC_CFRAME11_FDRI 0xf12e7000 +#define MM_PMC_CFRAME11_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME12_REG 0xf12e8000 +#define MM_PMC_CFRAME12_REG_SIZE 0x1000 +#define MM_PMC_CFRAME12_FDRI 0xf12e9000 +#define MM_PMC_CFRAME12_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME13_REG 0xf12ea000 +#define MM_PMC_CFRAME13_REG_SIZE 0x1000 +#define MM_PMC_CFRAME13_FDRI 0xf12eb000 +#define MM_PMC_CFRAME13_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME14_REG 0xf12ec000 +#define MM_PMC_CFRAME14_REG_SIZE 0x1000 +#define MM_PMC_CFRAME14_FDRI 0xf12ed000 +#define MM_PMC_CFRAME14_FDRI_SIZE 0x1000 +#define MM_PMC_CFRAME_BCAST_REG 0xf12ee000 +#define MM_PMC_CFRAME_BCAST_REG_SIZE 0x1000 +#define MM_PMC_CFRAME_BCAST_FDRI 0xf12ef000 +#define MM_PMC_CFRAME_BCAST_FDRI_SIZE 0x1000 + #define MM_PMC_CRP 0xf1260000U #define MM_PMC_CRP_SIZE 0x10000 #define MM_PMC_RTC 0xf12a0000 --=20 2.34.1