From nobody Fri Nov 14 22:23:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718041; cv=pass; d=zohomail.com; s=zohoarc; b=aCr8otOfM/BFxgEF9N4xdhK0UPvt/e283NMfNN2yLhU4lCBFwLlfmu2uktGWz9eXbfTGcrtTKr6FS5k/gBdAsU29UTvFAMDRehjeyXSEXFQkLrKRPV5Sj2I5rEqugf9VLYvmBt36npRXmZUP8eOh51Arpjjks/Wc8LJwJ0jGPg4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718041; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ALSJf63g6EOqbxWBGxPBCqT5/sgAAMPwNIqmQ0Mu/5I=; b=PJpHSxL8RR+j6AyPwJAa+9KP2yFJe/r2ABjURLoTW5w+CFs+Uqb5hO7cg0frSyBj74XOemaz3bD0xrCAqXXGtLf39qjp5foWAdGyxhEW/qPXQrNCkeBDnbP1Z8nMZXPgtFPB5R4ymZtaifPMLWmqKDQfbdWssIh72F8FUXXciFk= 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 1760718041658171.80748323584862; Fri, 17 Oct 2025 09:20:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAa-0005Th-BY; Fri, 17 Oct 2025 12:19:08 -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 1v9nAT-0005Qx-7I; Fri, 17 Oct 2025 12:19:01 -0400 Received: from mail-westus2azlp170120002.outbound.protection.outlook.com ([2a01:111:f403:c007::2] helo=MW6PR02CU001.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 1v9nAN-0007dC-6l; Fri, 17 Oct 2025 12:19:00 -0400 Received: from BN9PR03CA0154.namprd03.prod.outlook.com (2603:10b6:408:f4::9) by PH7PR12MB6394.namprd12.prod.outlook.com (2603:10b6:510:1fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.10; Fri, 17 Oct 2025 16:18:34 +0000 Received: from BN2PEPF0000449F.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::a3) by BN9PR03CA0154.outlook.office365.com (2603:10b6:408:f4::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9228.13 via Frontend Transport; Fri, 17 Oct 2025 16:18:34 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by BN2PEPF0000449F.mail.protection.outlook.com (10.167.243.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:34 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:32 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 17 Oct 2025 11:18:32 -0500 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VH3q3bOsTuB4GxmZ9Fay8b9pOnSMQIlScqi+BhiO0F002kjdgXnXzxaKcr2kXst2eweZ4u/iXQEIaj5H9mDBojDimNB/cn+/molHgUCqbxIwpm/W5MOGb1V1gHidN72IWNYR314s0LsGM1viwuxKaFwJ+odxtie0yiKNBu69u9sr2ACAQjNzCahzJVTLmEnm1MidIIfJ1Ehn0ciY0/nrX7KRXN2NpU3/qkmp8bWKBydkKE5CjQ9KW0OVjivTFOjE0NqxsWxiSLtvEl1Lf5u3WJb7KlpMdf+RQ5n36yO1b6G7vv5PAcgdAXmLEbRI7qmfU86OZhhcb4mLh/y3HEMJzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ALSJf63g6EOqbxWBGxPBCqT5/sgAAMPwNIqmQ0Mu/5I=; b=mR4eyDPNSOuKWnBE7pQJ6V2ikI4xM62BHjEZ+PHPm/kCqgocEMhVvv+c8u5UN4VvzS2EPSWDNngfqItOPlMWjZAqY1tlmOYkF5W7+1W9g0RCFQ84mMsVCcPg4zbxSmR9f9HFYxkzrRV53fi8dlPsbG6CB8C0cEeVG3JudCIDalggQ0htlngE9jduTjZNonJNOSlFlV6SYKfw4nvONEz1L6vHZj7Va3gcbSjpaqJWnRQAqZXzMfu8VOu8f39OGiYgTpPHX7dqVgPCc2bJV+rQKcGsFHWxiPL+PSH9x0eokC27nnFWBT5wa2VN4K26ZNPFEHMe5gXtMS9p9idrjdl5SQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ALSJf63g6EOqbxWBGxPBCqT5/sgAAMPwNIqmQ0Mu/5I=; b=v1qY3GbOHXBOI/AGsKo6RLIfZRRdewvjASYPHaCNJWI3KGJJgFiAadIOD6mfMcQUd+EOVp+fQrEgw0VKv9HvX4/P9twKnOx6fGWJ1eGbiWJpn3Vq9pj7H5ILu9ZwxIpCZY4Ifh2eEnGyd/WnnmLHrhbQPZqCMr3zUJbfJg7CCAw= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Alistair Francis" Subject: [PATCH v3 1/6] hw/core/register: remove the REGISTER device type Date: Fri, 17 Oct 2025 18:18:00 +0200 Message-ID: <20251017161809.235740-2-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000449F:EE_|PH7PR12MB6394:EE_ X-MS-Office365-Filtering-Correlation-Id: 93c80a4e-9b17-497a-ee8b-08de0d98d1f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?47Ur9laQrmdOpLt1sToPvx43TSDvbG+Z4w29+BqZdhejt/FoI4rWCkwquhTa?= =?us-ascii?Q?9ihQsLdsBxAwcPrd3InjGcJ11gl1inOPen0p2TFW1R3gtkhbthxuTfhQ488x?= =?us-ascii?Q?fR0yMsd2is7kQYXekFwqy1Ry3cMG64feuH/zaj8pwGUpMCySsw/x4KIRLhei?= =?us-ascii?Q?1zFKYj0HOpxaGGbl47lgzonx1EU2eqjIXANLBEUjqGEoOSAroU7LGdqJjo/n?= =?us-ascii?Q?sGy6XM8qgcxIHZbz/sR1Iva1Ake9SZpoRYt5p+kjjgMzTDKh/HbmQMX7OW6r?= =?us-ascii?Q?7TIFbYS/+3IVx0LB0RipJP18W9gQAsfSdd/fJdc9VT7fa0JF87YmJgItpQzq?= =?us-ascii?Q?J4Q59i0CBpJeT07w+6J2B99ZNq1Q3CFzGGtnkyAiydmz4yeXMePb8LtQx+C7?= =?us-ascii?Q?Iy0tUToDNdJeg+t0H/M6f6sRJqvbHA8odnt9pSkRTeCMWTImQB+dKoPaZCJe?= =?us-ascii?Q?GxKODFnSraaDvI+u7p6sYcKoij5cCSiTec96813quWcX30oMGQgO1zMA/FfT?= =?us-ascii?Q?txRroder6NW2LJ+osH81hq6rv5sQbzr0Td00vmH8lZ3+MNmE7SyStIP7C/eX?= =?us-ascii?Q?4J9ZhXZgkRiCXIW5qnQ9mTnGgVBJGK/dy2c0nczgkz2h5cVNRGSZu9Yi9P+h?= =?us-ascii?Q?iIpGGX5X7FkqqpAD2t7LPuHYVB2gmPbnCGs5SMkLlbuFSoj9KXjTbpYQ/Lev?= =?us-ascii?Q?0JE2hc70rN+GRwNPEJtV0+xSFxjkYOHpwf7V9/t5waxo/2iTad0m9dbK1Doh?= =?us-ascii?Q?3uEEGdf3SKl9ytoJzdjn0gJtP2OAA47SN+6HdEkQp6B6PMfAencnJ/Q0/PS2?= =?us-ascii?Q?LId4P8riceutph11EW77kHwQDYznQqneDkpSHk+ihHWRhY+93bsq18eDYak2?= =?us-ascii?Q?py02ywsfuvEjU91CGqxKRJ5Wo9fgVA2m0ATL4+vBnHXEgER/sKekDkfTOTDJ?= =?us-ascii?Q?9uiz7GLkpvgL3t6iGCnoe/K/7zKYmhvkz5T/iwQxocDcvhKhnjeg/6qwGawa?= =?us-ascii?Q?IzeeGN0C2l8DwtNNFjo/G+WUm4wcqDhyae1Dy3Fa0+JrXSZD0R8nB3LabSLV?= =?us-ascii?Q?Uu5J1JmuYEuzYuM9jQPT7a0PcSoRM4OFmDimgiXAzcRDktqKVZPeM28URPTm?= =?us-ascii?Q?L2lY9MANWmOuL5RISzkXgj9Turz+Wyieycnr7Vn9zsMXdUSACqteppgqbTDS?= =?us-ascii?Q?anVWTBPBh4K5/Fk1sOkGV/NAWBizz4A6uBoUG+pJLZFyUJcMrqHqaR0Co9He?= =?us-ascii?Q?09Ic576R5excalfL8sCMzO27OmU71uriJULbMvLyTtQGf4fdOOM/LF+GRdS6?= =?us-ascii?Q?KGQ+DRkPakqRm3c1IWJX+lVddrXYzCndEqf8a8Vb7NRxG9IUWLmEhNx07FXq?= =?us-ascii?Q?zsbvpi2aW8/TCfuFf+zU6j9QwDcWM3TY5fOJ8u1fKUVePeu8Ih5jPQzyyVud?= =?us-ascii?Q?GBej9Hkq1fHlWBDHVmfZq/vrVzzU+PzfziH5Jl2zsXBltENVbybmclwgiS2Y?= =?us-ascii?Q?MxiShpV7wILAAKu0MM/hjYhgxrwrY80LEBmiHpWG40NiNZy97H2aPrwpCdkb?= =?us-ascii?Q?jpj1vmjZqYwCsC4T4V8=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb08.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:34.1573 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93c80a4e-9b17-497a-ee8b-08de0d98d1f6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000449F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6394 Received-SPF: permerror client-ip=2a01:111:f403:c007::2; envelope-from=Luc.Michel@amd.com; helo=MW6PR02CU001.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_NONE=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: 1760718045106154100 Content-Type: text/plain; charset="utf-8" The REGISTER class (RegisterInfo struct) is currently a QOM type inheriting from DEVICE. This class has no real purpose: - the qdev API is not used, - according to the comment preceding it, the object_initialize call is here to zero-initialize the struct. However all the effective struct attributes are then initialized explicitly. - the object is never parented. This commits drops the REGISTER QOM type completely, leaving the RegisterInfo struct as a bare C struct. The register_register_types function is left empty here because it is reused in the next commit. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- include/hw/register.h | 7 ------- hw/core/register.c | 18 ------------------ hw/net/can/xlnx-versal-canfd.c | 2 -- 3 files changed, 27 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index a913c52aee5..4d13ea183c7 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -73,25 +73,18 @@ struct RegisterAccessInfo { * * @opaque: Opaque data for the register */ =20 struct RegisterInfo { - /* */ - DeviceState parent_obj; - - /* */ void *data; int data_size; =20 const RegisterAccessInfo *access; =20 void *opaque; }; =20 -#define TYPE_REGISTER "qemu-register" -DECLARE_INSTANCE_CHECKER(RegisterInfo, REGISTER, - TYPE_REGISTER) =20 /** * This structure is used to group all of the individual registers which a= re * modeled using the RegisterInfo structure. * diff --git a/hw/core/register.c b/hw/core/register.c index 3340df70b06..2553cb15aba 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -256,13 +256,10 @@ static RegisterInfoArray *register_init_block(DeviceS= tate *owner, =20 for (i =3D 0; i < num; i++) { int index =3D rae[i].addr / data_size; RegisterInfo *r =3D &ri[index]; =20 - /* Init the register, this will zero it. */ - object_initialize((void *)r, sizeof(*r), TYPE_REGISTER); - /* Set the properties of the register */ r->data =3D data + data_size * index; r->data_size =3D data_size; r->access =3D &rae[i]; r->opaque =3D owner; @@ -316,26 +313,11 @@ void register_finalize_block(RegisterInfoArray *r_arr= ay) { g_free(r_array->r); g_free(r_array); } =20 -static void register_class_init(ObjectClass *oc, const void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(oc); - - /* Reason: needs to be wired up to work */ - dc->user_creatable =3D false; -} - -static const TypeInfo register_info =3D { - .name =3D TYPE_REGISTER, - .parent =3D TYPE_DEVICE, - .class_init =3D register_class_init, - .instance_size =3D sizeof(RegisterInfo), -}; =20 static void register_register_types(void) { - type_register_static(®ister_info); } =20 type_init(register_register_types) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 343348660b5..99bbdd7d3fe 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1866,12 +1866,10 @@ static int canfd_populate_regarray(XlnxVersalCANFDS= tate *s, =20 for (i =3D 0; i < num_rae; i++) { int index =3D rae[i].addr / 4; RegisterInfo *r =3D &s->reg_info[index]; =20 - object_initialize(r, sizeof(*r), TYPE_REGISTER); - *r =3D (RegisterInfo) { .data =3D &s->regs[index], .data_size =3D sizeof(uint32_t), .access =3D &rae[i], .opaque =3D OBJECT(s), --=20 2.51.0 From nobody Fri Nov 14 22:23:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718044; cv=pass; d=zohomail.com; s=zohoarc; b=aLIw69LrBgJ37aeNjSKbpQqr4wYEwQz9oVtVjP9sPlgt9H3HFLNXWp17K5Y5AePAxxGC7TqFNQ3uipWbyR1or/wVbG5kDZZW3qxaiqzfIEVB/ekeOZl2g49GHFDlfGy9kDbRU6Ji7cPYruvhhOJhtr9u3zsILKRI6uQQB0XZmiM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718044; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Di4D+OyYjPLHl+aUkTfhgDQLFkbqjQY6ImPpmUSsT3s=; b=h/MP4sH8cHgyrJhcdHSj02qAQT/Txt8ydqPsV0Ouz+DhIB/9oUkPUcgO1O/lCyWq0KpEenerv9ULYKkFc6VOQrMMtGrKWMrw/Umjcsoxm6EfaXlpVI/txPuVIN0fbnRhniCz8qyFA2ArNI1rHHWPFvCwpkxwlDAH/0WTl8wBiFM= 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 1760718044768375.1283998999646; Fri, 17 Oct 2025 09:20:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAb-0005UF-70; Fri, 17 Oct 2025 12:19:09 -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 1v9nAW-0005SF-4A; Fri, 17 Oct 2025 12:19:04 -0400 Received: from mail-centralusazlp170110009.outbound.protection.outlook.com ([2a01:111:f403:c111::9] helo=DM5PR21CU001.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 1v9nAO-0007dY-Py; Fri, 17 Oct 2025 12:19:03 -0400 Received: from BN9PR03CA0171.namprd03.prod.outlook.com (2603:10b6:408:f4::26) by IA0PPF7D094C5BF.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bd4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.12; Fri, 17 Oct 2025 16:18:34 +0000 Received: from BN2PEPF0000449F.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::9d) by BN9PR03CA0171.outlook.office365.com (2603:10b6:408:f4::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9228.10 via Frontend Transport; Fri, 17 Oct 2025 16:18:34 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by BN2PEPF0000449F.mail.protection.outlook.com (10.167.243.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:34 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:34 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 17 Oct 2025 11:18:33 -0500 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:32 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UYlXKAQmM5DvgaFkd6wdoriJJvOj7toOFyJCP75ntswYfT9iJ57KI7HEYOq7ocTE5wIP2OwxCf4dTaWK4SPnPo2mP3MxebrlpOumJ9YsRhRSI9O6w9lbZtzK1fuJJQy6ZOnAKL1gTCwEhYzgxpq6S44l75BL8vDyn9Sje79IdTSzdZY8hpU0DujgWOP0LkPFQqpbHBXdIqx/uhkvgqzj4WWWYILMJZDJyqd8sOg4TqnmR9Fd8zYMOk2eF5HBmlazO7IIiUqaPDP/I7hvfbmb6WHk8wWXs9x5oGQCcSzBFyw5xQiQ53T9EzZRxOzt+itjFCjwbOqxOuMOc2o0c/1oXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Di4D+OyYjPLHl+aUkTfhgDQLFkbqjQY6ImPpmUSsT3s=; b=L53evjfQfE1gD1Fez3NMlNO0vf4LnH3Q8bwLR73JsnIam83WyhIcBi/wivci1kKPsM+Zcoa9M+N7hz6Fjb1HmEDhCHbUK5SDj4mayDyzXrdTSieAa489aQU3mAjkIpz7Wh5fh6+41wDQDj0aOP2LEJ/h+wwMBs60TSU+OyONeBa1DJbWYUpIRH8wVp4QzHPVPB43Awxg0PLW0htwRoDZ7YKN/9+uEdaoCBGISc9sw2TPfO+d96zv+xe1ey51FVCdkqae4iiSyUsuxkO+vayoUz3l6bB2GSDxBM64HE6qKQLf0TGtcauvqmgvsQ4N1zlCPSlpjwHJwQdWqAB2StVfMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Di4D+OyYjPLHl+aUkTfhgDQLFkbqjQY6ImPpmUSsT3s=; b=gh0C7g3d9k0U/89FbOHm475wplCP6TNWPG1jm9j8qQTcBSzt8gvO4tTLW88lsLEe6lVLX5o9ZcAHr7fOkEwkJ7hOXwmNBBMvrtkHluqElV3miYTUQfJZh3TnzeX5iqHnZ9PW7shYlSuaqZtYTbvtrpFBCk4zPlZYcM14JW2t9Io= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Alistair Francis" Subject: [PATCH v3 2/6] hw/core/register: add the REGISTER_ARRAY type Date: Fri, 17 Oct 2025 18:18:01 +0200 Message-ID: <20251017161809.235740-3-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB05.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000449F:EE_|IA0PPF7D094C5BF:EE_ X-MS-Office365-Filtering-Correlation-Id: 44c8f852-eb89-41ca-0198-08de0d98d252 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RWUL2v+P2ff80VdBrl4W4rL39d0bvBQVK/Q/L/B2NMiMZkB5kKx5tlgSqS7c?= =?us-ascii?Q?f82suTNK/9OOWrwHbZxdZ2L1LuxUooun9VeY7TN+yGYyczjssT845i4TwROz?= =?us-ascii?Q?+rdT8dmHf3/ILCEagGHerVXMkzuJ7quN+uLnSTSLfxJ6IHhJl8Q6oeJ4Dr3m?= =?us-ascii?Q?NFG8IwtB3B9LB7xC3vMFbtdHPknf1ompXaeAMhME+Ejh2b13chWkK2SxdHom?= =?us-ascii?Q?tpMf6ujNvqiltmZHdpeqJEeFoYkIf12a1H/b7s/pxACQc7jrU+4cISc3HnIb?= =?us-ascii?Q?Cti+iPj/8ePgOpRfIbjL4mrhO4IRKybxqM8EhYoA9zIUs4YpW6CDbRzscUqd?= =?us-ascii?Q?PX6H7Ii4BsWUMLzPzQgvmeOFJMg10qb0f1lkMbVaZEx7BrrYo59gpNEzkTTO?= =?us-ascii?Q?TY6SgovX5R5cn9RIafCpoz8JX4wdjgZlYQLZK+HYaZBuW7PVmSYxM/w5A65L?= =?us-ascii?Q?RDb7ZRtw+L/MewPXZmpvZD+7CS+ysY1txAP/NuIpChGjdJrtv1gkuPtdxuiq?= =?us-ascii?Q?u3393v4HY049vMAf194R/4K8+aB3XcuDKGiLthBHbHHrgCyhVuI3gn/00jBA?= =?us-ascii?Q?3RoIbDZ+mv17gIMmI5p+njNsrsSlq25impR5SbzrhcxeGSqBqphbz7JLqyZ+?= =?us-ascii?Q?JoPpXyBPrPcHYh/biLMDSptM8Xpsu2ec4Irl6MZB+XzGbe/Z1aVG6cauvVaV?= =?us-ascii?Q?xrwRkRNoM7/AA04qSdj6z4Btw2defluRXOEC4yyA1CYXRzTuWzzZSOsB4HU2?= =?us-ascii?Q?IVbueos0oNs0zVrn4AxXxx070KftbbBkpOYeqBYe2KpwmIwnpHBCLRTZZTw2?= =?us-ascii?Q?o/nHvPMaPbK0WmkzEXudm0yCQygvWuUQ2q+GUAodzj45qMHsKmJK3CNu2toW?= =?us-ascii?Q?iz+M/tawJ9xLJHmHtg3pH63qm8R2HoMb9oH1z3Sisklq5OHBmKJ1XJrhdT6F?= =?us-ascii?Q?t43Zf71FefEWsMbelOezG5V3OisELvFl9yXvoGwXeQx6bpdhuvdLwN7xNnMk?= =?us-ascii?Q?o4HxYT3XEYoo8zHjGn1mGyLafPhrzKYYDZpqS02knYYNin2Jup7UStxpC8jL?= =?us-ascii?Q?WMPUNSMXMnSHFB4yknoQt/Tfboj5H7zClO4JTg2GlWkQJmA/kqvC+Y/8xf3y?= =?us-ascii?Q?epmjBVeAjgUrrexRfFzhJwMx2a5b0rYgkOdM0RZXNYGEI8SaJc5gUZw8Cg8/?= =?us-ascii?Q?wtHfELv0xzva5GGjuI26WBusPTQGCLaseAiFJs/pEO4ALD9PnX0Yk0sdDXsN?= =?us-ascii?Q?TNzUeT729KwiLVjmcgmPhwqtzT43wa/rTN6g45bC2wo9TekBJs/ZzYjeQiv/?= =?us-ascii?Q?FlC0vDedddzXjqn/ugoQZ2oDbxWJ72gIl8+I1lL1xs7A/UVKjtZ7786obiy+?= =?us-ascii?Q?TojqUg5CfeD/dAKPtJrNsKy0HujItWRBl6gI2GwlAhp8SIqSo4GB+OQojPfe?= =?us-ascii?Q?Vb0ePWQ3Ich470uvef9BvNFO5/RKd9l+10SC4d9RjI6Rq6YWwnBCE5Inba+e?= =?us-ascii?Q?1GOAj7/yIpOo7Ey5E1X6//TE9JcmkB4IH48nhJuadLqQ3WOD59TfnmyGgpC9?= =?us-ascii?Q?E+G4k6NrsUpe67lKtvw=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb08.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:34.7541 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44c8f852-eb89-41ca-0198-08de0d98d252 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000449F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF7D094C5BF Received-SPF: permerror client-ip=2a01:111:f403:c111::9; envelope-from=Luc.Michel@amd.com; helo=DM5PR21CU001.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: 1760718047749158500 Content-Type: text/plain; charset="utf-8" Introduce the REGISTER_ARRAY QOM type. This type reuses the existing RegisterInfoArray struct. When `register_init_block' is called, it creates a REGISTER_ARRAY object and parents it to the calling device. This way it gets finalized when the device is. The memory region is parented to the REGISTER_ARRAY object to ensure correct finalizing order. The finalize function of the REGISTER_ARRAY type performs the necessary cleaning that used to be done by `register_finalize_block'. The latter is left empty and will be removed when all the register API users have been refactored. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- include/hw/register.h | 4 ++++ hw/core/register.c | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index 4d13ea183c7..65c82600e06 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -81,10 +81,12 @@ struct RegisterInfo { const RegisterAccessInfo *access; =20 void *opaque; }; =20 +#define TYPE_REGISTER_ARRAY "qemu-register-array" +OBJECT_DECLARE_SIMPLE_TYPE(RegisterInfoArray, REGISTER_ARRAY) =20 /** * This structure is used to group all of the individual registers which a= re * modeled using the RegisterInfo structure. * @@ -94,10 +96,12 @@ struct RegisterInfo { * * @mem: optional Memory region for the register */ =20 struct RegisterInfoArray { + Object parent_obj; + MemoryRegion mem; =20 int num_elements; RegisterInfo **r; =20 diff --git a/hw/core/register.c b/hw/core/register.c index 2553cb15aba..1612ad174f9 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -243,14 +243,20 @@ static RegisterInfoArray *register_init_block(DeviceS= tate *owner, bool debug_enabled, uint64_t memory_size, size_t data_size_bits) { const char *device_prefix =3D object_get_typename(OBJECT(owner)); - RegisterInfoArray *r_array =3D g_new0(RegisterInfoArray, 1); + Object *obj; + RegisterInfoArray *r_array; int data_size =3D data_size_bits >> 3; int i; =20 + obj =3D object_new(TYPE_REGISTER_ARRAY); + object_property_add_child(OBJECT(owner), "reg-array[*]", obj); + object_unref(obj); + + r_array =3D REGISTER_ARRAY(obj); r_array->r =3D g_new0(RegisterInfo *, num); r_array->num_elements =3D num; r_array->debug =3D debug_enabled; r_array->prefix =3D device_prefix; =20 @@ -265,11 +271,11 @@ static RegisterInfoArray *register_init_block(DeviceS= tate *owner, r->opaque =3D owner; =20 r_array->r[i] =3D r; } =20 - memory_region_init_io(&r_array->mem, OBJECT(owner), ops, r_array, + memory_region_init_io(&r_array->mem, OBJECT(r_array), ops, r_array, device_prefix, memory_size); =20 return r_array; } =20 @@ -307,17 +313,29 @@ RegisterInfoArray *register_init_block64(DeviceState = *owner, { return register_init_block(owner, rae, num, ri, (void *) data, ops, debug_enabled, memory_size, 64); } =20 -void register_finalize_block(RegisterInfoArray *r_array) +static void register_array_finalize(Object *obj) { + RegisterInfoArray *r_array =3D REGISTER_ARRAY(obj); + g_free(r_array->r); - g_free(r_array); } =20 +void register_finalize_block(RegisterInfoArray *r_array) +{ +} + +static const TypeInfo register_array_info =3D { + .name =3D TYPE_REGISTER_ARRAY, + .parent =3D TYPE_OBJECT, + .instance_size =3D sizeof(RegisterInfoArray), + .instance_finalize =3D register_array_finalize, +}; =20 static void register_register_types(void) { + type_register_static(®ister_array_info); } =20 type_init(register_register_types) --=20 2.51.0 From nobody Fri Nov 14 22:23:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718068; cv=pass; d=zohomail.com; s=zohoarc; b=TBVcO1PIoxFtSvUm4Rc73JipQXFOZkSYlRisCcl0zX8Bu2b1s8aMEsmhUMYxvQE/rcyv5YOErAzSdeoc9yjU+BUMzBWAhnff7RPee5kXHU+N7R84x7lD4XrATnNC/EUpyggQ4mNS9WQN1hYNolEQE/NNflC3W94p6AYCGlS8+AU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718068; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JOEOYx4MrjjaLF0Z1zZAB4qtICOXxN/H4XWiXH96VGk=; b=FvRwE3ZiM2RYI63Sw4gagl//980AJ0sD0l84nHCklfw+ovS3Lz1O5ugYKjjuyfW7velsk+gSHhyZonhqUPmMiaE9LOpsPOo96+S45mgY3NLN/itjB/2URzbJQOQTZ8XaFkI1kl9YsRNWiBoWjY5T0i06wTRVi1dKPo/pJizE/kY= 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 1760718068178650.8624330105387; Fri, 17 Oct 2025 09:21:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAd-0005Vw-HA; Fri, 17 Oct 2025 12:19:11 -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 1v9nAX-0005Sc-JY; Fri, 17 Oct 2025 12:19:06 -0400 Received: from mail-centralusazlp170110009.outbound.protection.outlook.com ([2a01:111:f403:c111::9] helo=DM5PR21CU001.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 1v9nAO-0007dN-AA; Fri, 17 Oct 2025 12:19:05 -0400 Received: from BN9PR03CA0164.namprd03.prod.outlook.com (2603:10b6:408:f4::19) by MW6PR12MB8661.namprd12.prod.outlook.com (2603:10b6:303:23f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.11; Fri, 17 Oct 2025 16:18:37 +0000 Received: from BN2PEPF0000449F.namprd02.prod.outlook.com (2603:10b6:408:f4:cafe::ae) by BN9PR03CA0164.outlook.office365.com (2603:10b6:408:f4::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9228.11 via Frontend Transport; Fri, 17 Oct 2025 16:18:37 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by BN2PEPF0000449F.mail.protection.outlook.com (10.167.243.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:37 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:36 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 17 Oct 2025 11:18:35 -0500 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cwavOdsx+r1HhY8ZLLmgfvdcC07KJ+Hk4X17ls+L9Fm1iIdLbHe1VhlwwmqlDaqVtMLHWIEemJNh8szquIHstSDZSR8AqU+MciNPwqxOFEpeTHxN6XwneT0HUG3R7I8lrX3NGKuZRivpVXKQcH3UD8xRDzMy+hlVsqBw0k1UfmDiLwcHtMpqmdI4WLQaH8+3qZAAMP/XhrR/r6FFfIH8BGkYYQrLdZPUgDWe0OPJddN2z+eDGq01h7DsoVURLti89aJAbN8glM56ILJP5kKZWlnz4fhmsiZ4qoGPVs28FlUJyrSyt9uXtCxT053/pQLptjoSiltKf6JMNSsDOC4sOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JOEOYx4MrjjaLF0Z1zZAB4qtICOXxN/H4XWiXH96VGk=; b=LSJ1U8oe4iUTHJpYQVZZsPeNmWoUeA0lbAH3w+stD7mB1p/Qew3BHntmXexAd63T83Kb82nAIaiiSLygn3Bdag2RfJB+8ObJNCIFsTbD3SlyTa0YZwNwbqlWha52v0+Eg8KLV7UDIci0hNDLpG5lVjJ1YR9iT/OHriitVm+Ycc2ClMHPNg64mmFm8TDSAuLkN0ZPuV2bHGd1eVZsQSL5MB/u2f/W0978i/Jfug9GIZx/Q4wzyUolK87xzG+Pr3gNJla889XnXx1aUgTy6V8WIr61atARECR0/LXtCehZidVWXKb0X7qvAL32rZf/Z8yIq/R2uaX+gSaFBCuxG29IIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JOEOYx4MrjjaLF0Z1zZAB4qtICOXxN/H4XWiXH96VGk=; b=l63FU7VQe91OmUpAZlTX9aLEn2Q5d+N6mmAhgcmp2dR1xQMw6kd81jTAsGe/qFRroJrJxcXpiXRFsi/exrorp2VVVBhMFqjkSDJ8l8eOj70Zjdqd2/HgrCGz5UVhEpenW/+B6nlnkyjfvrEdSsvtQ+JvG6ZxsQ7OWa4ERpJwzxM= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Alistair Francis" Subject: [PATCH v3 3/6] hw/core/register: remove the calls to `register_finalize_block' Date: Fri, 17 Oct 2025 18:18:02 +0200 Message-ID: <20251017161809.235740-4-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000449F:EE_|MW6PR12MB8661:EE_ X-MS-Office365-Filtering-Correlation-Id: f52f2feb-10c4-4a9f-51fb-08de0d98d3ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uGMG7JuZb8I4RJS/0rS7+MfrdHjSJgk8XMW/aHKLuVMbQCuhIh3PZ+FlfcNF?= =?us-ascii?Q?psx6nPfTCzP1mYcljWPeYRmFOQP3z7xYyXaFE6ZII/T1/k/mnyHeXFgtJ2EQ?= =?us-ascii?Q?wcs31oaCBxG5wD6Ol5xHuoONHQihva5TLgeDcZEDC56yZr0ASQ66LPGDbt5E?= =?us-ascii?Q?WqU4l6+qoXLV0TrbdDv4jdSmmg7jHDUrLpCqA9Ru0XnX0xyJukhcrHWL4NM1?= =?us-ascii?Q?5wgi5UNgrvLLb+TDWDEVIXY1TwFhWOqHfla+M4QJWoUFA4kZqNd69lWnPBto?= =?us-ascii?Q?ziMTMXznhfUPBTQdrtdM71T6KLzCTlWzdy7izR2lsNpuxd2YRP/0Hj8dsV1g?= =?us-ascii?Q?Vqi0HoM4RTtceUvmQgFUrrSu6dTN2kWbNvzbVBxHi4JgqEbht9p6B39EmL9v?= =?us-ascii?Q?5dywVEieVX4SEkZEIqy/KJB7NUmJ7X5GYNFsD0hq9zPFxF5IIl/KTlPOW9SE?= =?us-ascii?Q?F1E7zfs4DH4hZIsof4MmjMm26QX4jWiRY3Xc2xO0AmsvTkZp/gPrYQDYO72w?= =?us-ascii?Q?QCCuT0UZYzgEsCe6PHdAJqka1pSH8IOdBd6GsUWDi8pNMydgZ4hM2OBiaj/G?= =?us-ascii?Q?GhFQn3DqK1VUslXFAdZKwTPsYGzRwGKsnmX8S2CpA/gzXMzAjDP5mgHOnl4/?= =?us-ascii?Q?yYsf3tYyLmk/kzBvvcN49FAEoVjKjOdHo21zlzaRp0YdKu5FrsrZDG3M4BRO?= =?us-ascii?Q?91pRzhSQvOahD5xQXG4r+Wt5taUb5gxGFJ5vp4rHi+5aXswkg7oM8aPDsZsZ?= =?us-ascii?Q?189uU59BGXCjSN2rVKNCn8hHAldY9JnDK4JDKjRqK7pKVfLqRxHRLoaWQ+G1?= =?us-ascii?Q?ToPc102YxVNLHUrKKbB+eVYndLf6HswgA0+TPJBiBJxb1lhTdvCQP4n+AhYt?= =?us-ascii?Q?WBFLP38jJiVpxgd8t0lkvjio8lPMLa3AP1FXScLnBXMSIYERU++nzkDaRjo7?= =?us-ascii?Q?FuDqBj1pBr/RKNhmGyf3vRw6SK+C54wbyAD1WnWL/rxH+LPbwSC/bQAfXvaV?= =?us-ascii?Q?4DdI3XA9Z65Q1zcU3F8I0SDlmYuwb/42wPQD/ol4LvER5d/J322DI2cLvh3V?= =?us-ascii?Q?Cmi0+x6bA47ZgrKXhbGmXKeC6oNGVIghLahiUFZiDGfP+zyIaEiaNdFGrX4T?= =?us-ascii?Q?6ZLE5Ls608ukA++bHZT1qFqsnw920tIDa4INa7eUxTJlFjuDQVLeIv5yRupQ?= =?us-ascii?Q?dzzvBZ7BfTc84Lzm07CHdLU6Kq8221lCrZBi/7wTnUhV5+SWvqQ0dr5BgGs9?= =?us-ascii?Q?+mV1Vc8OHc1dnKutIYL+4fLKthG1tzPdB1JUXsmA1PhAF8tU5Qd/SrJZ7ENx?= =?us-ascii?Q?Z0BjJ9yoKTNS2hG3tnVlzABqACorzQCYaP0z64w9OzE537AzU9+20QGBo1eP?= =?us-ascii?Q?NqMl3doJfke/TKS1sgZYljsIE/efPXDVa+EjU9F6C8G8BWL1wZTuE08UmSEm?= =?us-ascii?Q?trBGuBHldWI4C8vd20sELj8hPXUr5vcD2IXC5RN5MwnOJZA1us3yl8zlUqIx?= =?us-ascii?Q?zy1w05aut7M4/OLjyEwW4EmvY1+79aE2E/wKh6S5tBctGtNOZk5M85dEISEh?= =?us-ascii?Q?S7rGcQyY5QZZwoPkn+4=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb08.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:37.0303 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f52f2feb-10c4-4a9f-51fb-08de0d98d3ad X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000449F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8661 Received-SPF: permerror client-ip=2a01:111:f403:c111::9; envelope-from=Luc.Michel@amd.com; helo=DM5PR21CU001.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: 1760718071046154100 Content-Type: text/plain; charset="utf-8" This function is now a no-op. The register array is parented to the device and get finalized when the device is. Drop all the calls to `register_finalize_block'. Drop the RegisterInfoArray reference when it is not used elsewhere in the device. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- include/hw/misc/xlnx-versal-crl.h | 1 - include/hw/misc/xlnx-versal-xramc.h | 1 - include/hw/misc/xlnx-zynqmp-apu-ctrl.h | 1 - include/hw/misc/xlnx-zynqmp-crf.h | 1 - include/hw/nvram/xlnx-bbram.h | 1 - hw/misc/xlnx-versal-crl.c | 38 +++++++++++--------------- hw/misc/xlnx-versal-trng.c | 1 - hw/misc/xlnx-versal-xramc.c | 12 ++------ hw/misc/xlnx-zynqmp-apu-ctrl.c | 12 ++------ hw/misc/xlnx-zynqmp-crf.c | 12 ++------ hw/nvram/xlnx-bbram.c | 13 ++------- hw/nvram/xlnx-versal-efuse-ctrl.c | 1 - hw/nvram/xlnx-zynqmp-efuse.c | 8 ------ 13 files changed, 28 insertions(+), 74 deletions(-) diff --git a/include/hw/misc/xlnx-versal-crl.h b/include/hw/misc/xlnx-versa= l-crl.h index f6b8694ebea..49ed500acde 100644 --- a/include/hw/misc/xlnx-versal-crl.h +++ b/include/hw/misc/xlnx-versal-crl.h @@ -531,11 +531,10 @@ REG32(VERSAL2_RST_OCM, 0x3d8) #define VERSAL2_CRL_R_MAX (R_VERSAL2_RST_OCM + 1) =20 struct XlnxVersalCRLBase { SysBusDevice parent_obj; =20 - RegisterInfoArray *reg_array; uint32_t *regs; }; =20 struct XlnxVersalCRLBaseClass { SysBusDeviceClass parent_class; diff --git a/include/hw/misc/xlnx-versal-xramc.h b/include/hw/misc/xlnx-ver= sal-xramc.h index d3d1862676f..35e4e8b91dd 100644 --- a/include/hw/misc/xlnx-versal-xramc.h +++ b/include/hw/misc/xlnx-versal-xramc.h @@ -88,10 +88,9 @@ typedef struct XlnxXramCtrl { struct { uint64_t size; unsigned int encoded_size; } cfg; =20 - RegisterInfoArray *reg_array; uint32_t regs[XRAM_CTRL_R_MAX]; RegisterInfo regs_info[XRAM_CTRL_R_MAX]; } XlnxXramCtrl; #endif diff --git a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h b/include/hw/misc/xlnx-= zynqmp-apu-ctrl.h index c3bf3c1583b..fbfe34aa7e5 100644 --- a/include/hw/misc/xlnx-zynqmp-apu-ctrl.h +++ b/include/hw/misc/xlnx-zynqmp-apu-ctrl.h @@ -83,11 +83,10 @@ struct XlnxZynqMPAPUCtrl { qemu_irq irq_imr; =20 uint8_t cpu_pwrdwn_req; uint8_t cpu_in_wfi; =20 - RegisterInfoArray *reg_array; uint32_t regs[APU_R_MAX]; RegisterInfo regs_info[APU_R_MAX]; }; =20 #endif diff --git a/include/hw/misc/xlnx-zynqmp-crf.h b/include/hw/misc/xlnx-zynqm= p-crf.h index 02ef0bdeeee..c746ae10397 100644 --- a/include/hw/misc/xlnx-zynqmp-crf.h +++ b/include/hw/misc/xlnx-zynqmp-crf.h @@ -201,11 +201,10 @@ REG32(RST_DDR_SS, 0x108) struct XlnxZynqMPCRF { SysBusDevice parent_obj; MemoryRegion iomem; qemu_irq irq_ir; =20 - RegisterInfoArray *reg_array; uint32_t regs[CRF_R_MAX]; RegisterInfo regs_info[CRF_R_MAX]; }; =20 #endif diff --git a/include/hw/nvram/xlnx-bbram.h b/include/hw/nvram/xlnx-bbram.h index 58acbe9f51b..af90900bfc6 100644 --- a/include/hw/nvram/xlnx-bbram.h +++ b/include/hw/nvram/xlnx-bbram.h @@ -45,11 +45,10 @@ struct XlnxBBRam { =20 uint32_t crc_zpads; bool bbram8_wo; bool blk_ro; =20 - RegisterInfoArray *reg_array; uint32_t regs[RMAX_XLNX_BBRAM]; RegisterInfo regs_info[RMAX_XLNX_BBRAM]; }; =20 #endif diff --git a/hw/misc/xlnx-versal-crl.c b/hw/misc/xlnx-versal-crl.c index 10e6af002ba..5987f32c716 100644 --- a/hw/misc/xlnx-versal-crl.c +++ b/hw/misc/xlnx-versal-crl.c @@ -632,21 +632,21 @@ static const MemoryRegionOps crl_ops =3D { static void versal_crl_init(Object *obj) { XlnxVersalCRL *s =3D XLNX_VERSAL_CRL(obj); XlnxVersalCRLBase *xvcb =3D XLNX_VERSAL_CRL_BASE(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; int i; =20 - xvcb->reg_array =3D - register_init_block32(DEVICE(obj), crl_regs_info, - ARRAY_SIZE(crl_regs_info), - s->regs_info, s->regs, - &crl_ops, - XLNX_VERSAL_CRL_ERR_DEBUG, - CRL_R_MAX * 4); + reg_array =3D register_init_block32(DEVICE(obj), crl_regs_info, + ARRAY_SIZE(crl_regs_info), + s->regs_info, s->regs, + &crl_ops, + XLNX_VERSAL_CRL_ERR_DEBUG, + CRL_R_MAX * 4); xvcb->regs =3D s->regs; - sysbus_init_mmio(sbd, &xvcb->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq); =20 for (i =3D 0; i < ARRAY_SIZE(s->cfg.rpu); ++i) { object_property_add_link(obj, "rpu[*]", TYPE_ARM_CPU, (Object **)&s->cfg.rpu[i], @@ -686,21 +686,22 @@ static void versal_crl_init(Object *obj) static void versal2_crl_init(Object *obj) { XlnxVersal2CRL *s =3D XLNX_VERSAL2_CRL(obj); XlnxVersalCRLBase *xvcb =3D XLNX_VERSAL_CRL_BASE(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; size_t i; =20 - xvcb->reg_array =3D register_init_block32(DEVICE(obj), versal2_crl_reg= s_info, - ARRAY_SIZE(versal2_crl_regs_in= fo), - s->regs_info, s->regs, - &crl_ops, - XLNX_VERSAL_CRL_ERR_DEBUG, - VERSAL2_CRL_R_MAX * 4); + reg_array =3D register_init_block32(DEVICE(obj), versal2_crl_regs_info, + ARRAY_SIZE(versal2_crl_regs_info), + s->regs_info, s->regs, + &crl_ops, + XLNX_VERSAL_CRL_ERR_DEBUG, + VERSAL2_CRL_R_MAX * 4); xvcb->regs =3D s->regs; =20 - sysbus_init_mmio(sbd, &xvcb->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); =20 for (i =3D 0; i < ARRAY_SIZE(s->cfg.rpu); ++i) { object_property_add_link(obj, "rpu[*]", TYPE_ARM_CPU, (Object **)&s->cfg.rpu[i], qdev_prop_allow_set_link_before_realize, @@ -748,16 +749,10 @@ static void versal2_crl_init(Object *obj) qdev_prop_allow_set_link_before_realize, OBJ_PROP_LINK_STRONG); } } =20 -static void crl_finalize(Object *obj) -{ - XlnxVersalCRLBase *s =3D XLNX_VERSAL_CRL_BASE(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_versal_crl =3D { .name =3D TYPE_XLNX_VERSAL_CRL, .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { @@ -802,11 +797,10 @@ static void versal2_crl_class_init(ObjectClass *klass= , const void *data) static const TypeInfo crl_base_info =3D { .name =3D TYPE_XLNX_VERSAL_CRL_BASE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxVersalCRLBase), .class_size =3D sizeof(XlnxVersalCRLBaseClass), - .instance_finalize =3D crl_finalize, .abstract =3D true, }; =20 static const TypeInfo versal_crl_info =3D { .name =3D TYPE_XLNX_VERSAL_CRL, diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index f34dd3ef352..2b573a45bdb 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -625,11 +625,10 @@ static void trng_init(Object *obj) =20 static void trng_finalize(Object *obj) { XlnxVersalTRng *s =3D XLNX_VERSAL_TRNG(obj); =20 - register_finalize_block(s->reg_array); g_rand_free(s->prng); s->prng =3D NULL; } =20 static void trng_reset_hold(Object *obj, ResetType type) diff --git a/hw/misc/xlnx-versal-xramc.c b/hw/misc/xlnx-versal-xramc.c index 07370b80c0d..d90f3e87c74 100644 --- a/hw/misc/xlnx-versal-xramc.c +++ b/hw/misc/xlnx-versal-xramc.c @@ -188,28 +188,23 @@ static void xram_ctrl_realize(DeviceState *dev, Error= **errp) =20 static void xram_ctrl_init(Object *obj) { XlnxXramCtrl *s =3D XLNX_XRAM_CTRL(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), xram_ctrl_regs_info, ARRAY_SIZE(xram_ctrl_regs_info), s->regs_info, s->regs, &xram_ctrl_ops, XLNX_XRAM_CTRL_ERR_DEBUG, XRAM_CTRL_R_MAX * 4); - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq); } =20 -static void xram_ctrl_finalize(Object *obj) -{ - XlnxXramCtrl *s =3D XLNX_XRAM_CTRL(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_xram_ctrl =3D { .name =3D TYPE_XLNX_XRAM_CTRL, .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { @@ -239,11 +234,10 @@ static const TypeInfo xram_ctrl_info =3D { .name =3D TYPE_XLNX_XRAM_CTRL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxXramCtrl), .class_init =3D xram_ctrl_class_init, .instance_init =3D xram_ctrl_init, - .instance_finalize =3D xram_ctrl_finalize, }; =20 static void xram_ctrl_register_types(void) { type_register_static(&xram_ctrl_info); diff --git a/hw/misc/xlnx-zynqmp-apu-ctrl.c b/hw/misc/xlnx-zynqmp-apu-ctrl.c index e85da32d99c..08777496d56 100644 --- a/hw/misc/xlnx-zynqmp-apu-ctrl.c +++ b/hw/misc/xlnx-zynqmp-apu-ctrl.c @@ -177,20 +177,21 @@ static void zynqmp_apu_handle_wfi(void *opaque, int i= rq, int level) } =20 static void zynqmp_apu_init(Object *obj) { XlnxZynqMPAPUCtrl *s =3D XLNX_ZYNQMP_APU_CTRL(obj); + RegisterInfoArray *reg_array; int i; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), zynqmp_apu_regs_info, ARRAY_SIZE(zynqmp_apu_regs_info), s->regs_info, s->regs, &zynqmp_apu_ops, XILINX_ZYNQMP_APU_ERR_DEBUG, APU_R_MAX * 4); - sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->reg_array->mem); + sysbus_init_mmio(SYS_BUS_DEVICE(obj), ®_array->mem); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq_imr); =20 for (i =3D 0; i < APU_MAX_CPU; ++i) { g_autofree gchar *prop_name =3D g_strdup_printf("cpu%d", i); object_property_add_link(obj, prop_name, TYPE_ARM_CPU, @@ -206,16 +207,10 @@ static void zynqmp_apu_init(Object *obj) "CPU_POWER_STATUS", 4); /* wfi_in is used as input from CPUs as wfi request. */ qdev_init_gpio_in_named(DEVICE(obj), zynqmp_apu_handle_wfi, "wfi_in", = 4); } =20 -static void zynqmp_apu_finalize(Object *obj) -{ - XlnxZynqMPAPUCtrl *s =3D XLNX_ZYNQMP_APU_CTRL(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_zynqmp_apu =3D { .name =3D TYPE_XLNX_ZYNQMP_APU_CTRL, .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { @@ -239,11 +234,10 @@ static const TypeInfo zynqmp_apu_info =3D { .name =3D TYPE_XLNX_ZYNQMP_APU_CTRL, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxZynqMPAPUCtrl), .class_init =3D zynqmp_apu_class_init, .instance_init =3D zynqmp_apu_init, - .instance_finalize =3D zynqmp_apu_finalize, }; =20 static void zynqmp_apu_register_types(void) { type_register_static(&zynqmp_apu_info); diff --git a/hw/misc/xlnx-zynqmp-crf.c b/hw/misc/xlnx-zynqmp-crf.c index cccca0e814e..d9c1bd50e4f 100644 --- a/hw/misc/xlnx-zynqmp-crf.c +++ b/hw/misc/xlnx-zynqmp-crf.c @@ -209,28 +209,23 @@ static const MemoryRegionOps crf_ops =3D { =20 static void crf_init(Object *obj) { XlnxZynqMPCRF *s =3D XLNX_ZYNQMP_CRF(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), crf_regs_info, ARRAY_SIZE(crf_regs_info), s->regs_info, s->regs, &crf_ops, XLNX_ZYNQMP_CRF_ERR_DEBUG, CRF_R_MAX * 4); - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq_ir); } =20 -static void crf_finalize(Object *obj) -{ - XlnxZynqMPCRF *s =3D XLNX_ZYNQMP_CRF(obj); - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_crf =3D { .name =3D TYPE_XLNX_ZYNQMP_CRF, .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { @@ -253,11 +248,10 @@ static const TypeInfo crf_info =3D { .name =3D TYPE_XLNX_ZYNQMP_CRF, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxZynqMPCRF), .class_init =3D crf_class_init, .instance_init =3D crf_init, - .instance_finalize =3D crf_finalize, }; =20 static void crf_register_types(void) { type_register_static(&crf_info); diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 5702bb3f310..22aefbc240d 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -454,30 +454,24 @@ static void bbram_ctrl_realize(DeviceState *dev, Erro= r **errp) =20 static void bbram_ctrl_init(Object *obj) { XlnxBBRam *s =3D XLNX_BBRAM(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; =20 - s->reg_array =3D + reg_array =3D register_init_block32(DEVICE(obj), bbram_ctrl_regs_info, ARRAY_SIZE(bbram_ctrl_regs_info), s->regs_info, s->regs, &bbram_ctrl_ops, XLNX_BBRAM_ERR_DEBUG, R_MAX * 4); =20 - sysbus_init_mmio(sbd, &s->reg_array->mem); + sysbus_init_mmio(sbd, ®_array->mem); sysbus_init_irq(sbd, &s->irq_bbram); } =20 -static void bbram_ctrl_finalize(Object *obj) -{ - XlnxBBRam *s =3D XLNX_BBRAM(obj); - - register_finalize_block(s->reg_array); -} - static void bbram_prop_set_drive(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { DeviceState *dev =3D DEVICE(obj); =20 @@ -540,11 +534,10 @@ static const TypeInfo bbram_ctrl_info =3D { .name =3D TYPE_XLNX_BBRAM, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxBBRam), .class_init =3D bbram_ctrl_class_init, .instance_init =3D bbram_ctrl_init, - .instance_finalize =3D bbram_ctrl_finalize, }; =20 static void bbram_ctrl_register_types(void) { type_register_static(&bbram_ctrl_info); diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse= -ctrl.c index 90962198008..6f17f32a0c3 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -726,11 +726,10 @@ static void efuse_ctrl_init(Object *obj) =20 static void efuse_ctrl_finalize(Object *obj) { XlnxVersalEFuseCtrl *s =3D XLNX_VERSAL_EFUSE_CTRL(obj); =20 - register_finalize_block(s->reg_array); g_free(s->extra_pg0_lock_spec); } =20 static const VMStateDescription vmstate_efuse_ctrl =3D { .name =3D TYPE_XLNX_VERSAL_EFUSE_CTRL, diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index 5a218c32e84..ce35bb0cc1f 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -814,17 +814,10 @@ static void zynqmp_efuse_init(Object *obj) =20 sysbus_init_mmio(sbd, &s->reg_array->mem); sysbus_init_irq(sbd, &s->irq); } =20 -static void zynqmp_efuse_finalize(Object *obj) -{ - XlnxZynqMPEFuse *s =3D XLNX_ZYNQMP_EFUSE(obj); - - register_finalize_block(s->reg_array); -} - static const VMStateDescription vmstate_efuse =3D { .name =3D TYPE_XLNX_ZYNQMP_EFUSE, .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { @@ -855,11 +848,10 @@ static const TypeInfo efuse_info =3D { .name =3D TYPE_XLNX_ZYNQMP_EFUSE, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(XlnxZynqMPEFuse), .class_init =3D zynqmp_efuse_class_init, .instance_init =3D zynqmp_efuse_init, - .instance_finalize =3D zynqmp_efuse_finalize, }; =20 static void efuse_register_types(void) { type_register_static(&efuse_info); --=20 2.51.0 From nobody Fri Nov 14 22:23:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718095; cv=pass; d=zohomail.com; s=zohoarc; b=JaoIWQaEuD6hVvdKutuEeOIcfMrRUvXGrStDpiHH7XktQdXmpMMJDyI80qxoHN8OxDbyEeJ3M9XEk6ZfDBnIxTMUlIJoukMry5f/MuXUU4SMQtQ7VxGstAcS0jLmfO3RMscEmf5cls8XU/AH1QSwTngZJfIgO2xpGSV6aZMsh0Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718095; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TyZTe82I9LNu6s0C8IbsX7nzfESH2ZT4972Ow3dfDt8=; b=CLwAy+6wSUVeh0tNfJFeA1I1uwvDEsJ74KwRT8DIHB1BHwOdOqOpzMV02JcAH/MoM+XPizJGAyhmkipxEQrqmJF09eiGQGKyxWeh46dT+JBagWfjAcZdojxZPtgRHXfAUZh6ulHku9x0VnrTm0/sDQZ9MmnmotHbb2Te3JfM6sA= 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 1760718095704585.3556247608847; Fri, 17 Oct 2025 09:21:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAb-0005Up-Hc; Fri, 17 Oct 2025 12:19:09 -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 1v9nAU-0005RI-Rj; Fri, 17 Oct 2025 12:19:02 -0400 Received: from mail-northcentralusazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c105::5] helo=CH5PR02CU005.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 1v9nAN-0007dT-Cg; Fri, 17 Oct 2025 12:19:02 -0400 Received: from PH8PR21CA0018.namprd21.prod.outlook.com (2603:10b6:510:2ce::8) by DM4PR12MB8557.namprd12.prod.outlook.com (2603:10b6:8:18b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.11; Fri, 17 Oct 2025 16:18:39 +0000 Received: from CY4PEPF0000EE31.namprd05.prod.outlook.com (2603:10b6:510:2ce:cafe::1d) by PH8PR21CA0018.outlook.office365.com (2603:10b6:510:2ce::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:42 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE31.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:39 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:37 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 17 Oct 2025 11:18:37 -0500 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VONYzctGqUeP1e83UBr1NlkllOtuKwbsHEUcCdXKhkLROYJnQfGeX/RAff0FUWN2OEMEyQgDSL52Ssl350ZHvcOS4GQchEtZCtmTM72gw7JQeJ308iLPeMe/ouOM3iYOUGoUb4JHucLDKnUFYa1piYD/JA+doh6mN/r5DQ/WA6iGirHdSSnRHxQU5Hhe7vP311bz2HFyTapUccXn4MYuVKeFsWWe9cXOWvWxqynxFVcGleUCDO3/oTnVI8NqyBjaeXApl+GC7bI1+tfwfAEwTD6qHvM9ZTCcBuzHzvrVDKX+5CP/MWbo4pNF1RXSuARQ/KDwtzx2XoNC1jrfchN5lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TyZTe82I9LNu6s0C8IbsX7nzfESH2ZT4972Ow3dfDt8=; b=HLMOP3g1Fff7YbN/zTPwnIDbsx9mm4cVcTrraaR00dheOxYHIyn4uAnqOeSrsoTRy01LDlXa757GDom2RuF/47e163vYDospxWJ91JROjhu/fPyptAoNVp1BkDMznsdl9yiyOQFEc0Qsl7TUukY6pKTkkuhv9/LkvTO3rGs/We/I+fO4sW5HmMuzJZOT+cAhMH2+nS4a9PjM/vRkcXgEEBnHkbQhWuu7jSIk5LTmAgxgCpUUmAURlKulCAvtliQpOigpHZPhl3O8lH2fibbUr01HGkZfQP1D9Qw9+rut1WbwM9Sk0GPGoTdWd++H0tNv69Khbe8uogHoD+yPfxKEDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TyZTe82I9LNu6s0C8IbsX7nzfESH2ZT4972Ow3dfDt8=; b=K6jhiLZXe8TAOfq1O3nAueouxbyzeiBUVWSbALKwKpcMeIbVsOeba987YQsYozDfGP2F0X/Zn/Hyy2iaBAd1yEXQTd/UNLLYkdOVfR0MDRRIfqKAfJLhwFkgn5XXzCfUhqOhX3T//GuJ51O+Fya1/xR6C2elqwlZi1g6+1WEkKw= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Alistair Francis" Subject: [PATCH v3 4/6] hw/core/register: remove the `register_finalize_block' function Date: Fri, 17 Oct 2025 18:18:03 +0200 Message-ID: <20251017161809.235740-5-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE31:EE_|DM4PR12MB8557:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c5fc49a-f1ac-4a1a-9bc3-08de0d98d4e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vTwBFxDciJ5I4i6Mi86YA/q1FsT2B0KFSd5e34tmJXLAMi/gtrfNZM79LxLW?= =?us-ascii?Q?PnIdUjD877gDbUpFUTmTiX1aVkkYYCqXp7OpTJHO0yl0XclBe48Fzp0ZHRkz?= =?us-ascii?Q?pHqgJuJQIka1RRl2TJHMOZt4j+s3TXwj5VUFCEcC+BlYjROt7oSdhXGK5DxG?= =?us-ascii?Q?Kj1D1iRvY06BfXoVQQRB03G1tuGsdEDE292hH+tMlgk0NAwqdp6H41rO4Kzv?= =?us-ascii?Q?mT0fhlQL2JA6RkMLB4WDl9aoyRwRScjQ5zEtT0IOLKghwnhdePPXs+Y8eF6k?= =?us-ascii?Q?y/MCKC2BY7+u8CpO84vap3IpDiXVQaDwYbrA/spyFzbTQ1kgC577fHuK63C/?= =?us-ascii?Q?l+15DCFSAsaNewOVlsBSpQWOu9laT8ziewpZg+Z98mGxzQYSZoEoR4JaBssR?= =?us-ascii?Q?fy31SsYwM5js/yqjDJeYEoKsP471JYPZ9pH1FFuKNzih7fWGxaMXVTFdaWE2?= =?us-ascii?Q?nnzRJXiWK4xTMWEWqP2XgGTz9uBA3yKtnojMpoK8Pj8ublTzY4pURxgXAtwj?= =?us-ascii?Q?oa3Nszxg4vFwtMWlGhqNP5lLQ5DltjgsElWylPmH1Zs6eNughcf8wZrT3SLb?= =?us-ascii?Q?XZGAKXundvkwAB/ISkA9bioR9xdJoa7jcingno8gjtZogaYuSdOGi8Pascxf?= =?us-ascii?Q?rVf1f56jLZYcAKrPmbqhGfoFSgrX0/K8Gn5RvS8vsIQO0jPXQsgNRWraiU1G?= =?us-ascii?Q?Su6KE78XI/RU3BErWmHnn+No5niMwPFaWHSTXrNifWxG6qX2CSkBZz2RqJNg?= =?us-ascii?Q?osSJ/D1WQfBj/yCL8Jvb2W4WFjWTXLhKtFAJYeq7Utt79iVOVmnFPiy11HKa?= =?us-ascii?Q?1IQ62xBeIPwlB+fgBTlrPEF9l53RS0LCKrgXrD6XkS2M+8Vjbcnx3tQC+qbI?= =?us-ascii?Q?PyGO/wwX7m4Z3JPkUq0uT/bnI2ZpPeXY2T4Sm84Pw8hOgG2x0WXLjTTxIrzW?= =?us-ascii?Q?awzI5U2YJtl9umyz/6FchCGzjy8+CSlsP2cFBFKJdub5gajv+23eltr2mt0C?= =?us-ascii?Q?G6sabQVfKGCo81EO6Oq6d4PBQXm8/Nbq2uC4geRPefcl+889mPjqF2Zhoc4z?= =?us-ascii?Q?R43FqepQ9/duJCG8F1seYrEU/gGBZDuZ3RHXOUrc5IksNtzOtKbhZb9NzRZ8?= =?us-ascii?Q?1V6GHhDzn1Cmi8yANLurbV3vid5OqPf2Bdl3dkwO7B2uc3Lw9nUB1MggtfNm?= =?us-ascii?Q?cWorBdS+/lXPVHciX80DQ7SwyELIgOmWXI9so4vtRcGP2BZjQEsphzlcrbl7?= =?us-ascii?Q?fp2zbXFO9VAMK32rln9uj4C3v8AQ6nkEjO1xy8DFpTDLyg7ZujsACexPgyxY?= =?us-ascii?Q?W7XY+yeZXFEtU6FAt/pve7mJznqOTtEMRGYU/YstLnEiB7Nrc0dQklTEiWeh?= =?us-ascii?Q?6HvwR706vhn5R3lIRLcA2MU5wYCAy1lD7Vc2hDAzdkyPq+qXrSWVu70PLqI5?= =?us-ascii?Q?S9+5ivEPUFCJb3faq5iYY/M3bqMTQjzFlCZpQuJn4JRMb8DUpfv1SAa6Gt5h?= =?us-ascii?Q?ODIicY4BInaBw6BNwC1bWVpxUBqCK8F6futNEqzIFlkY570ywlUM8TEbYYsS?= =?us-ascii?Q?E4yXQiSCWq2AyM8q0hI=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:39.0251 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c5fc49a-f1ac-4a1a-9bc3-08de0d98d4e4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE31.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8557 Received-SPF: permerror client-ip=2a01:111:f403:c105::5; envelope-from=Luc.Michel@amd.com; helo=CH5PR02CU005.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: 1760718097369154100 Content-Type: text/plain; charset="utf-8" This function is now unused. Drop it. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- include/hw/register.h | 14 -------------- hw/core/register.c | 4 ---- 2 files changed, 18 deletions(-) diff --git a/include/hw/register.h b/include/hw/register.h index 65c82600e06..7b0f4c8b7a6 100644 --- a/include/hw/register.h +++ b/include/hw/register.h @@ -207,20 +207,6 @@ RegisterInfoArray *register_init_block64(DeviceState *= owner, uint64_t *data, const MemoryRegionOps *ops, bool debug_enabled, uint64_t memory_size); =20 -/** - * This function should be called to cleanup the registers that were initi= alized - * when calling register_init_block32(). This function should only be call= ed - * from the device's instance_finalize function. - * - * Any memory operations that the device performed that require cleanup (s= uch - * as creating subregions) need to be called before calling this function. - * - * @r_array: A structure containing all of the registers, as returned by - * register_init_block32() - */ - -void register_finalize_block(RegisterInfoArray *r_array); - #endif diff --git a/hw/core/register.c b/hw/core/register.c index 1612ad174f9..81316d48597 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -320,14 +320,10 @@ static void register_array_finalize(Object *obj) RegisterInfoArray *r_array =3D REGISTER_ARRAY(obj); =20 g_free(r_array->r); } =20 -void register_finalize_block(RegisterInfoArray *r_array) -{ -} - static const TypeInfo register_array_info =3D { .name =3D TYPE_REGISTER_ARRAY, .parent =3D TYPE_OBJECT, .instance_size =3D sizeof(RegisterInfoArray), .instance_finalize =3D register_array_finalize, --=20 2.51.0 From nobody Fri Nov 14 22:23:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718080; cv=pass; d=zohomail.com; s=zohoarc; b=cPTiyMVPOq5eGD7vKJSuC8uxmnxes4iQolH7u4Pq8WjomS8cmRT+FH1+eqiAdIfbsMUR+SjZi2l3R7FODIyDyGxK4znY/XaHZG35Lkm9/XsuQVLqTNErndvyyEHO4zOoDrjKffxZVNjoVGInZyN1CC+MvI06uXUUBht6NDGft+8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718080; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Gh+Yya1wHvbBuLqOYpdP4I0kGXHgz9h1lYdmYyGbL7Y=; b=Xv1OirM1obgphB+gvUOhtPUrMCFXbIjSiDDjxcilQuSLSgdsp7LDvWTSbR6BC+QB1a2YOLwsAoWQD7EjHPndSxU68ti9sv+UgD297T3in/kLZw9zOBjlowGNr+reFofP3Y1SGr7C6tQy7UJoc03CzmMskmXdYX7G5p08r1paSOs= 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 176071807992579.30825257101185; Fri, 17 Oct 2025 09:21:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAX-0005S1-CX; Fri, 17 Oct 2025 12:19:06 -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 1v9nAT-0005Qy-CF; Fri, 17 Oct 2025 12:19:01 -0400 Received: from mail-westus3azlp170120001.outbound.protection.outlook.com ([2a01:111:f403:c107::1] helo=PH8PR06CU001.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 1v9nAN-0007dh-Dl; Fri, 17 Oct 2025 12:19:00 -0400 Received: from PH8PR21CA0011.namprd21.prod.outlook.com (2603:10b6:510:2ce::19) by MW6PR12MB8758.namprd12.prod.outlook.com (2603:10b6:303:23d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.10; Fri, 17 Oct 2025 16:18:40 +0000 Received: from CY4PEPF0000EE31.namprd05.prod.outlook.com (2603:10b6:510:2ce:cafe::c2) by PH8PR21CA0011.outlook.office365.com (2603:10b6:510:2ce::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:35 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE31.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:40 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:39 -0700 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SI2MFaVyBUH3a6t+as3jThdAKSUQ6E9Mksvw3TSPla1UcGyq/N/U6nGLdlQa9TdbpwFNvNBZKg4ZzyVWD6iWygCVJpzXP7iMqQcZAgg74oTuF1oz0qUiLmHspyuPBVU46UIm7mDq51bZOI/iGZuV0nrz6oZI8Vz2qSmsk6CwYHNLvrJnTShQ8gMb96dvMZtpsLNiUG4S1XbkWcLeGG8qucKP/SfHBYjQvitD+4opRIJ+YtV/tShKWYvQgPqetravJsbBv6NSdmCW+UejkdejXIvZ0c69O8VE7Q4LgByHq5WBql4iYnau+SWITdTXU63TsCu+Yt+MwLjqcagG0V3OPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Gh+Yya1wHvbBuLqOYpdP4I0kGXHgz9h1lYdmYyGbL7Y=; b=qLISv+FdjspRA8oEp9yf4H1tof2U/Gpk63F+t6n9RQLriU62RXwNrK2Evucj0RycWmuVna+6QcwGQqvEjPHbZPTfizmMkKquvALz2TOrN0t+GAOyKioFXbe87w/8Q8GoaJdyWKpNxZNd5i+sYQ9EKR8Bn2pNc5bSXSuIk9W975QsMpNnhDPGwWjLMJScJwA/Lixd3wn2Lx4R/EpKaz/ZgEHG84imMaRnR8V+a7xE7/l+F3Nhb0Q8yXPEARjzxlkCizJsXy+kz/huM/9yzt9xh34OWN1DSQTzqV2qHmAQdbQB/Ua86v6Oqreesjvrk0LrlDQI+SmNZizxUc8cO5kx9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Gh+Yya1wHvbBuLqOYpdP4I0kGXHgz9h1lYdmYyGbL7Y=; b=jG7o3Fpb5pZmNO/cQdKVOhBXHRgoBlxIhLX4ROHYE4qZBM2MnUOVUZcxsHbqrIc62eBuw12UFpv783I+0f+C+TaKlvLo36ZbHPBG9UGtxLTE6mTb/ZhtCyhgPTmSz3s8/h2lyFST8LfGTpG3lDEbNn21o2bZVBhEsYdq6LjgHyg= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PATCH v3 5/6] hw/net/can/xlnx-versal-canfd: refactor the banked registers logic Date: Fri, 17 Oct 2025 18:18:04 +0200 Message-ID: <20251017161809.235740-6-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE31:EE_|MW6PR12MB8758:EE_ X-MS-Office365-Filtering-Correlation-Id: decae2b2-56e7-4791-5e8b-08de0d98d595 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?p0vgx8JlQyI4C9fwwomrVn+eTGzU/untgyYlZ5nPXiLs7DOHYxZxwlu1/LXG?= =?us-ascii?Q?eFotm76E2jJfqFqVIJ6RFqlaE6vN3ej4juLLeYmhE5aDd91z7kvm3AoQm0sq?= =?us-ascii?Q?gAsqb5f1h0aGywJuqLQCqouIpAS+tRCAkszQJXR3GTiaaBDpP/SgYohb7HlC?= =?us-ascii?Q?WHF6XxmW0lNbWoseZVAQduW8suh5rP7TQEwgNbZ4tCRo1i8TeHXsrFt36TyF?= =?us-ascii?Q?tOAfNKtTZ1U9wi21n5TB99qLJB6R50F2ineqwLOTGy7ZAvJKyZDlJBzOl0yd?= =?us-ascii?Q?Cgd0RiqZbcDsaWqzqesGkWPzovJ9KgDxbFf8zkyXrfzbxSOuE7CME/gS2JyD?= =?us-ascii?Q?N60zM7XZ4ck9SP/OxarS8TLhXQyghkefcStS6SdqD/qK2KVPoPodMLm7oJLj?= =?us-ascii?Q?+LWf8UeKnOOyUEYbZV77O8SnaEqK72no5Dnf9X5JTVUeRPbskI2S3PWfmV9G?= =?us-ascii?Q?GWb4PhaDDlW5QQHGu0DQIaGe//nQ4JhCfOGgk6wYHPm/lW2Lva/5Xnx2iWP0?= =?us-ascii?Q?SnOWugHrAICN9nXtnZqQt2kSYZtji2hCdK+9KCoIX10yWQIh3PXYXcEqFO5b?= =?us-ascii?Q?3XE8H11QlHYkBKf8ijeGRnmIkDMAnLE8KdLf62h11ReV0mk9Ui6HRvtdIgdM?= =?us-ascii?Q?9VWL1OGufJfyp76Zj0JZ6Ez/rqzYug+ePqtdySczukgDmZ6k/tX8dv12aEHF?= =?us-ascii?Q?ykpmXTDICrBam38nfO0NncZAnnknp9PNjoK6WQ6+irrINHdAdBUZf2/73ZEG?= =?us-ascii?Q?5d1bcMS7KFjgbpC1xFQCFBxWPtjxZwVSurw/daDiKJJaj4ORn/hd/rFvT4Zd?= =?us-ascii?Q?JZIuR85gHQx0v7PodkwVpH9fktLp/Z8Yxu+uGsksDxMtd9ivnRi1g/XXR60S?= =?us-ascii?Q?Ze0R8Md/s+FsEEt2vvNr6fnoF1u9ygZr/oWSAtritLDzX0JNQ3j+l3XVOoGe?= =?us-ascii?Q?1V/RD9NiuCZGD8IolH2TGryxryUe0d3XPaNlgEQ2riYCD1L5q6fdvQevySFC?= =?us-ascii?Q?1RBu9xgzRbkZGR9N9CwlaR+QDVYCvH44tBrQlbE3eRO284ZAFKX+AkLhtRc/?= =?us-ascii?Q?6KQwKtZLmOd0nz35yjENaqppzTcF0KAMXAp5Bd3Vv8+A+LdTflcW+LBagSYd?= =?us-ascii?Q?oRR5ZZZ07KDIsJFWCplnsm+7y5h6jFUL391/S5asWkJZcy2HhfavWNWPZ6/+?= =?us-ascii?Q?hULy0fo51Ya16hSFhE/C6qn66I+pxsRmtLNO6MlLfTef5L0aboxLpyGSgZ9k?= =?us-ascii?Q?ZX14auhR/ZSGpHA3ZPPjC7AGuzaieex69FSetuwoex18+l7taVoo2UhOghXA?= =?us-ascii?Q?nOIQJ2YznVgDeqEO1HokNO7fO4Axy1vvgXbgHCjGApxDiEgSW/rljvk8v1iX?= =?us-ascii?Q?FMcMaTeTFLEEDL1dIZcrK7ulSn6WBYuml0omNUdfuKW/Qykz7yhVEtGinKni?= =?us-ascii?Q?6QP8oVbIeEsEedTgXXEdkUGJ86d1JTxkYVK2bVgXM98OaJp1ils5MXm1FX7Z?= =?us-ascii?Q?3giihnGw2V9EnQKCG8uKfHmpzCsOwodhDqqod2FiOonQnf8zEPB3gFpGL2k0?= =?us-ascii?Q?2YFYP6pxv/9IMZzY2UU=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:40.1834 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: decae2b2-56e7-4791-5e8b-08de0d98d595 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE31.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8758 Received-SPF: permerror client-ip=2a01:111:f403:c107::1; envelope-from=Luc.Michel@amd.com; helo=PH8PR06CU001.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_NONE=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: 1760718081730158500 Content-Type: text/plain; charset="utf-8" The CANFD device has several groups of registers: - the main control registers from 0x0 to 0xec - several banks of multiple registers. The number of banks is either hardcoded, or configurable using QOM properties: - Tx registers - Filter registers - Tx events registers - Rx0 registers - Rx1 registers As of now, all the registers are handled using the register API. The banked register logic results in a convoluted code to correctly allocate the register descriptors for the register API. This code bypasses the standard register API creation function (register_init_block). The resulting code leaks memory when the device is finalized. This commit introduces decoding logic for the banked registers. Those registers are quite simple in practice. Accessing them triggers no side-effect (only the filter registers need a check to catch guest invalid behaviour). Starting from the Tx events registers, they are all read-only. The main device memory region is changed to an I/O one, calling the new decoding logic when accessed. The register API memory region still overlaps all of it so for now the introduced code has no effect. The next commit will remove the register API usage for banked registers. Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- hw/net/can/xlnx-versal-canfd.c | 149 ++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 4 deletions(-) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 99bbdd7d3fe..c493664c2f1 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1408,10 +1408,27 @@ static uint64_t canfd_srr_pre_write(RegisterInfo *r= eg, uint64_t val64) } =20 return s->regs[R_SOFTWARE_RESET_REGISTER]; } =20 +static void filter_reg_write(XlnxVersalCANFDState *s, hwaddr addr, + size_t bank_idx, uint32_t val) +{ + size_t reg_idx =3D addr / sizeof(uint32_t); + + if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & + (1 << bank_idx))) { + s->regs[reg_idx] =3D val; + } else { + g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); + + qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter register 0x%" + HWADDR_PRIx " changed while filter %zu enabled\n", + path, addr, bank_idx + 1); + } +} + static uint64_t filter_mask(RegisterInfo *reg, uint64_t val64) { XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); uint32_t reg_idx =3D (reg->access->addr) / 4; uint32_t val =3D val64; @@ -1761,13 +1778,137 @@ static const RegisterAccessInfo canfd_regs_info[] = =3D { static void xlnx_versal_canfd_ptimer_cb(void *opaque) { /* No action required on the timer rollover. */ } =20 +static bool canfd_decode_reg_bank(XlnxVersalCANFDState *s, hwaddr addr, + hwaddr first_reg, hwaddr last_reg, + size_t num_banks, size_t *idx, size_t *o= ffset) +{ + hwaddr base =3D addr - first_reg; + hwaddr span =3D last_reg - first_reg + sizeof(uint32_t); + + *idx =3D base / span; + + if (*idx >=3D num_banks) { + return false; + } + + *offset =3D base % span; + *offset +=3D first_reg; + + return true; +} + +/* + * Decode the given addr into a (idx, offset) pair: + * - idx is the bank index of the register at addr, + * - offset is the register offset relative to bank 0 + * + * @return true is the decoding succeded, false otherwise + */ +static bool canfd_decode_addr(XlnxVersalCANFDState *s, hwaddr addr, + size_t *idx, hwaddr *offset) +{ + if (addr <=3D A_RX_FIFO_WATERMARK_REGISTER) { + /* from 0x0 to 0xec. Handled by the register API */ + g_assert_not_reached(); + } else if (addr < A_TB_ID_REGISTER) { + /* no register in this gap */ + return false; + } else if (addr < A_AFMR_REGISTER) { + /* TX registers */ + return canfd_decode_reg_bank(s, addr, + A_TB_ID_REGISTER, A_TB_DW15_REGISTER, + s->cfg.tx_fifo, idx, offset); + } else if (addr < A_TXE_FIFO_TB_ID_REGISTER) { + /* Filter registers */ + return canfd_decode_reg_bank(s, addr, + A_AFMR_REGISTER, A_AFIR_REGISTER, + 32, idx, offset); + } else if (addr < A_RB_ID_REGISTER) { + /* TX event registers */ + return canfd_decode_reg_bank(s, addr, + A_TXE_FIFO_TB_ID_REGISTER, + A_TXE_FIFO_TB_DLC_REGISTER, + 32, idx, offset); + } else if (addr < A_RB_ID_REGISTER_1) { + /* RX0 registers */ + return canfd_decode_reg_bank(s, addr, + A_RB_ID_REGISTER, + A_RB_DW15_REGISTER, + s->cfg.rx0_fifo, idx, offset); + } else if (addr <=3D A_RB_DW15_REGISTER_1) { + /* RX1 registers */ + return canfd_decode_reg_bank(s, addr, + A_RB_ID_REGISTER_1, + A_RB_DW15_REGISTER_1, + s->cfg.rx1_fifo, idx, offset); + } + + /* decode error */ + return false; +} + +static uint64_t canfd_read(void *opaque, hwaddr addr, unsigned size) +{ + XlnxVersalCANFDState *s =3D XILINX_CANFD(opaque); + size_t bank_idx; + hwaddr reg_offset; + uint64_t ret; + + if (!canfd_decode_addr(s, addr, &bank_idx, ®_offset)) { + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": read to unknown register at address 0x%" + HWADDR_PRIx "\n", addr); + return 0; + } + + switch (reg_offset) { + default: + ret =3D s->regs[addr / sizeof(uint32_t)]; + } + + return ret; +} + +static void canfd_write(void *opaque, hwaddr addr, uint64_t value, + unsigned size) +{ + XlnxVersalCANFDState *s =3D XILINX_CANFD(opaque); + size_t bank_idx; + hwaddr reg_offset; + + if (!canfd_decode_addr(s, addr, &bank_idx, ®_offset)) { + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": write to unknown register at address 0x%" + HWADDR_PRIx "\n", addr); + return; + } + + if (addr >=3D A_TXE_FIFO_TB_ID_REGISTER) { + /* All registers from TX event regs to the end are read-only */ + qemu_log_mask(LOG_GUEST_ERROR, TYPE_XILINX_CANFD + ": write to read-only register at 0x%" HWADDR_PRIx "= \n", + addr); + return; + } + + switch (reg_offset) { + case A_AFMR_REGISTER: + case A_AFIR_REGISTER: + filter_reg_write(s, addr, bank_idx, value); + break; + + default: + s->regs[addr / sizeof(uint32_t)] =3D value; + } +} + static const MemoryRegionOps canfd_ops =3D { - .read =3D register_read_memory, - .write =3D register_write_memory, + .read =3D canfd_read, + .write =3D canfd_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, .max_access_size =3D 4, }, @@ -2016,12 +2157,12 @@ static void canfd_realize(DeviceState *dev, Error *= *errp) =20 static void canfd_init(Object *obj) { XlnxVersalCANFDState *s =3D XILINX_CANFD(obj); =20 - memory_region_init(&s->iomem, obj, TYPE_XILINX_CANFD, - XLNX_VERSAL_CANFD_R_MAX * 4); + memory_region_init_io(&s->iomem, obj, &canfd_ops, s, TYPE_XILINX_CANFD, + XLNX_VERSAL_CANFD_R_MAX * 4); } =20 static const VMStateDescription vmstate_canfd =3D { .name =3D TYPE_XILINX_CANFD, .version_id =3D 1, --=20 2.51.0 From nobody Fri Nov 14 22:23:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1760718081; cv=pass; d=zohomail.com; s=zohoarc; b=Xe96cLfCFJqIhrcoDHCn+4AnFsynEl8NmQE31Eg4mG2BkDzpWWBR5LfbCyiAuA+7O/ZDbVWA1KgFZljNysTI92Xk32oId2Ns0i0AJaNQ5G9NItLiZKumOGJbswnX02OMpWPoSmIsB9B+ouJDlISj4dTBKXKET0E29XurXafxr4s= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760718081; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BdAOd/EUmGFD7tZM3WnBt5YGeDjC5brmyqZBulN7VJI=; b=TsO31RA0zRS9i1ZXQJmaR1JHuwM/lV3NZkM4UNf+dXUTDWdNJcHc4BMJ1R07dYU3sfsZQ68ihASvNAZmbFc3hlyRdkM1JtvMsm2pX7Ef5IKF6sn0yOHfzA4rkeQSCVZrTiIGGMSXjoZuUatx1gJkJZ9LUTCEOsiQwpqLFmrg70Q= 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 1760718081207717.3980302916134; Fri, 17 Oct 2025 09:21:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9nAb-0005Ur-QS; Fri, 17 Oct 2025 12:19:09 -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 1v9nAW-0005SH-IH; Fri, 17 Oct 2025 12:19:04 -0400 Received: from mail-westus3azlp170100009.outbound.protection.outlook.com ([2a01:111:f403:c107::9] helo=PH7PR06CU001.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 1v9nAO-0007eM-Fe; Fri, 17 Oct 2025 12:19:04 -0400 Received: from PH8PR21CA0018.namprd21.prod.outlook.com (2603:10b6:510:2ce::8) by DS7PR12MB6142.namprd12.prod.outlook.com (2603:10b6:8:9a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.13; Fri, 17 Oct 2025 16:18:43 +0000 Received: from CY4PEPF0000EE31.namprd05.prod.outlook.com (2603:10b6:510:2ce:cafe::a) by PH8PR21CA0018.outlook.office365.com (2603:10b6:510:2ce::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:45 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EE31.mail.protection.outlook.com (10.167.242.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9253.7 via Frontend Transport; Fri, 17 Oct 2025 16:18:42 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Fri, 17 Oct 2025 09:18:41 -0700 Received: from XFR-LUMICHEL-L2.amd.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 17 Oct 2025 09:18:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PJZifyp4jelrxuuKPivJWry55SteK4iFouam1F3xwJq2L6ShUyYnt1/8n3OeHaUVcZr5YdX1ygLhbFTCcxDdCnL25hjB+pJqGdRlfMgM0clE5+tgiTNPs+u9kkYoaXD3V7JI2+gkqIhcWvCH8qcgAlE5e5s4bve7mT8boFyD4ZzmZ0FU5h2tvy0Bj/Ih3LrwP7GiVTo9GEnMwvDtPx3FYvtcaC/ZOyOLnpQBxXGTE5FhiNVr8TXoiLl+7zIGVm94T6+rbFYl6oQVBlFa+6KumjrZvcDb1SajI/IO/8QGc9w5frBNtKJAD4zSn1KqFFFYflpBj9dQeeMR/txdhnxWwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BdAOd/EUmGFD7tZM3WnBt5YGeDjC5brmyqZBulN7VJI=; b=GGy6ZCEp3TiN2/1c8wd8l0WqATskhDKIRy1nW5+OUXCk57OuDbVqUO8hQXu9ggWFTWagP9QT7eoHNfFISRBnnJl/VETN7vec9tn/2vqfUgHsoNLw7/Jz0/aRVDD0s8qqXvUVPkCH6+UBo+E6IpAJPZLO8nZHq/6p3Qc2HP2Gg+nj/G7pIOeIkJ/6Z/Nqc6ufIsOCxwAixHfC1taGC4mcMCjqUpdJdOK73OKBvjQIRe5gTSC9s0diiKI1TlE9luyC4r/OG0osv/EOCZyWaMSKnJRIe3ZTjLnpjLCo8KGGcZMB6SGR/Fp6SV8Ex+KymZfaZka6HYi5Q8+2Q+KlX3qHHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BdAOd/EUmGFD7tZM3WnBt5YGeDjC5brmyqZBulN7VJI=; b=AQrrQZthQPJRAa84PtW4mzGH2XlnPZjxe0fBVUivdm9o/4sXGdNzyuNfiz/ECit2hPSYEwf3ZAJUecIIXd55VREEYFQauEqhmAIJIOz/Xdu1BzNdPT/vpvaxIDZ9CNU2ObPLelZ96YzZbJyli0jn+WzOQlRz4rOpPzeGSdtN5lY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PATCH v3 6/6] hw/net/can/xlnx-versal-canfd: remove register API usage for banked regs Date: Fri, 17 Oct 2025 18:18:05 +0200 Message-ID: <20251017161809.235740-7-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017161809.235740-1-luc.michel@amd.com> References: <20251017161809.235740-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE31:EE_|DS7PR12MB6142:EE_ X-MS-Office365-Filtering-Correlation-Id: 0811a846-8b67-4202-3b14-08de0d98d6d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?F9DwADQn+8rqnHlFUOn1n21cALfC84JMo9jIdrGUUk22CNHx8JfX3ST0uRpP?= =?us-ascii?Q?IHcUJqjw8njRekKP4ule0CuV+CkmBFzJ3dMW/E1dEzvWOwO6fjFgsgkzfdOX?= =?us-ascii?Q?Fs8G8ppZEvItp/qb/7wqJU5OBNoo5fg5WZ9UoNP4+R2XoknzBeW6Wm/7F6wv?= =?us-ascii?Q?8LpEPznDmwtohdWpbcf5+otKQw/weB/ZMLSwkXNh24fAr7AU/f6ewg6u/4Nf?= =?us-ascii?Q?M9VdTT87nC7TaiMaROf6S7F5sbXAKMx9k56IqhNL27SIOqfYVaPO8IGCoEtU?= =?us-ascii?Q?+JpVepZcD33vg3rNQE4YVGLPwk6hynUKgyitu0VwDLMzfR3wVEkAMI8ep+8c?= =?us-ascii?Q?XnriLZnxrRwBoLIkR0I1tygVNzBUsU1GM/Xw+9BQAnv6BYQ0ErArQalUmeIE?= =?us-ascii?Q?kTrERQ8vzAn+nlVe0qWUfiayr33RREWQe8cfaNVjEVyOSiDD/1lWDRVoI50a?= =?us-ascii?Q?xQ2jYuGspiLONfviq1c2e3YA9Hbfq6WGJpR0q/LgYKIWmkdqsxI/4uKmiSGm?= =?us-ascii?Q?0TQOCicbsk7vYvaNMvCwsja9z/jSLcYjubtnClizhiVAbXOrhri7v52dS+J+?= =?us-ascii?Q?3SmVxAfomgnM5MMgw8K7yKXx3hlesstFuHFwtesX4T/F5kh0lwiVBNmiPXIB?= =?us-ascii?Q?/3ppJwhug/YGwj433fS+QiA+27uYCSkjyFjgrq0eXdHIS79sIgg6BQc0kamq?= =?us-ascii?Q?0vak6XJ1q724rEM2O5H0dFy7LfrHmqLjZ5aerMtsDjaFxoJByHrWxUCt9ZSR?= =?us-ascii?Q?sAGW7cD3Q9hv32D9YOGX2CnZSzbboYrBDUb0hpLdQOUqO2wdPPvMAkPGvhhK?= =?us-ascii?Q?NgHFotthdIyVfOBS4h1NiChWGPWWGrKST/ottYgnXxtDU2Bwz2wFt3oeRicg?= =?us-ascii?Q?VWnfX+l5EbVPIYwD24nmdyr0Wf8WYzpIWZQLXsw6uvbLGzIhGGsztyASnMpR?= =?us-ascii?Q?IMO9/Z+d3Hf+gXMfme6XqllPhhQq7oFShf8kBF9Ncw6/P9BKfnpWJ7UZJ2Ox?= =?us-ascii?Q?YsHk8eXjhaQmGP3Ziq1ZwGhwZ4HYvuaOfw4QR9VsHNByonTjugNmgd7UX+Av?= =?us-ascii?Q?LVDlKtIdgKXOUazc6OyxULGO4wfgM5LSfWonrY2i7PKzlN1mw2VJaRWgOZvb?= =?us-ascii?Q?HYQf6ReJ6OCO6ZK79BPLEiPhpA5UhHYvWh8cpbUo4ssSkTg+9luM61JDcWZ6?= =?us-ascii?Q?U8y7eZtoAlSmJSIfhWc8hhuWclum8vzufzgaPAxAYZgfO2krOBtPtA2ia5Yp?= =?us-ascii?Q?mDO+ZvKwjJYhkKNujWd9EQHAm8xpYE+By4fEgFFuPBEL+3YSeW1zJvEp/4Sk?= =?us-ascii?Q?fo4LSZvTd6cogR80k2g/ECAtxhMtPS6nlt0qIupV0T6AONDQ+XnHhJJ83g1J?= =?us-ascii?Q?PfDnarspxjGB5JdNMFaNxJUYGQ5YBYuQN9dEFPXgcwxjY7aLrG6PTZAGjEo0?= =?us-ascii?Q?Nf9HWZK8KACAHn/7tgFiAzI5bWE1STcjZon9oiAsx/X52Qw/+v2Z2b3Nlci7?= =?us-ascii?Q?/3k+DtFn+irQXkVHwTrlYMySSidufW06VkkfGq6F8hE9N4KGdy3m4yoGiN1b?= =?us-ascii?Q?qf1xkYFvltFYtmaSNi8=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2025 16:18:42.2995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0811a846-8b67-4202-3b14-08de0d98d6d8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE31.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6142 Received-SPF: permerror client-ip=2a01:111:f403:c107::9; envelope-from=Luc.Michel@amd.com; helo=PH7PR06CU001.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_NONE=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: 1760718083713158500 Content-Type: text/plain; charset="utf-8" Now that we have a simple decoding logic for all the banked registers, remove the register API usage for them. This restricts the register API usage to only the base registers (from 0x0 to 0xec). This also removes all the custom code that was creating register descriptors for the register API and was leading to memory leaks when the device was finalized. Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Luc Michel --- include/hw/net/xlnx-versal-canfd.h | 8 - hw/net/can/xlnx-versal-canfd.c | 303 ++--------------------------- 2 files changed, 15 insertions(+), 296 deletions(-) diff --git a/include/hw/net/xlnx-versal-canfd.h b/include/hw/net/xlnx-versa= l-canfd.h index ad3104dd13f..396f90d6dc1 100644 --- a/include/hw/net/xlnx-versal-canfd.h +++ b/include/hw/net/xlnx-versal-canfd.h @@ -52,18 +52,10 @@ typedef struct XlnxVersalCANFDState { =20 qemu_irq irq_canfd_int; qemu_irq irq_addr_err; =20 RegisterInfo reg_info[XLNX_VERSAL_CANFD_R_MAX]; - RegisterAccessInfo *tx_regs; - RegisterAccessInfo *rx0_regs; - RegisterAccessInfo *rx1_regs; - RegisterAccessInfo *af_regs; - RegisterAccessInfo *txe_regs; - RegisterAccessInfo *rx_mailbox_regs; - RegisterAccessInfo *af_mask_regs_mailbox; - uint32_t regs[XLNX_VERSAL_CANFD_R_MAX]; =20 ptimer_state *canfd_timer; =20 CanBusClientState bus_client; diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index c493664c2f1..e8aa4fc8764 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -1425,50 +1425,10 @@ static void filter_reg_write(XlnxVersalCANFDState *= s, hwaddr addr, HWADDR_PRIx " changed while filter %zu enabled\n", path, addr, bank_idx + 1); } } =20 -static uint64_t filter_mask(RegisterInfo *reg, uint64_t val64) -{ - XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); - uint32_t reg_idx =3D (reg->access->addr) / 4; - uint32_t val =3D val64; - uint32_t filter_offset =3D (reg_idx - R_AFMR_REGISTER) / 2; - - if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & - (1 << filter_offset))) { - s->regs[reg_idx] =3D val; - } else { - g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); - - qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter %d not enabl= ed\n", - path, filter_offset + 1); - } - - return s->regs[reg_idx]; -} - -static uint64_t filter_id(RegisterInfo *reg, uint64_t val64) -{ - XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); - hwaddr reg_idx =3D (reg->access->addr) / 4; - uint32_t val =3D val64; - uint32_t filter_offset =3D (reg_idx - R_AFIR_REGISTER) / 2; - - if (!(s->regs[R_ACCEPTANCE_FILTER_CONTROL_REGISTER] & - (1 << filter_offset))) { - s->regs[reg_idx] =3D val; - } else { - g_autofree char *path =3D object_get_canonical_path(OBJECT(s)); - - qemu_log_mask(LOG_GUEST_ERROR, "%s: Acceptance filter %d not enabl= ed\n", - path, filter_offset + 1); - } - - return s->regs[reg_idx]; -} - static uint64_t canfd_tx_fifo_status_prew(RegisterInfo *reg, uint64_t val6= 4) { XlnxVersalCANFDState *s =3D XILINX_CANFD(reg->opaque); uint32_t val =3D val64; uint8_t read_ind =3D 0; @@ -1590,129 +1550,10 @@ static uint64_t canfd_write_check_prew(RegisterInf= o *reg, uint64_t val64) return val; } return 0; } =20 -static const RegisterAccessInfo canfd_tx_regs[] =3D { - { .name =3D "TB_ID_REGISTER", .addr =3D A_TB_ID_REGISTER, - },{ .name =3D "TB0_DLC_REGISTER", .addr =3D A_TB0_DLC_REGISTER, - },{ .name =3D "TB_DW0_REGISTER", .addr =3D A_TB_DW0_REGISTER, - },{ .name =3D "TB_DW1_REGISTER", .addr =3D A_TB_DW1_REGISTER, - },{ .name =3D "TB_DW2_REGISTER", .addr =3D A_TB_DW2_REGISTER, - },{ .name =3D "TB_DW3_REGISTER", .addr =3D A_TB_DW3_REGISTER, - },{ .name =3D "TB_DW4_REGISTER", .addr =3D A_TB_DW4_REGISTER, - },{ .name =3D "TB_DW5_REGISTER", .addr =3D A_TB_DW5_REGISTER, - },{ .name =3D "TB_DW6_REGISTER", .addr =3D A_TB_DW6_REGISTER, - },{ .name =3D "TB_DW7_REGISTER", .addr =3D A_TB_DW7_REGISTER, - },{ .name =3D "TB_DW8_REGISTER", .addr =3D A_TB_DW8_REGISTER, - },{ .name =3D "TB_DW9_REGISTER", .addr =3D A_TB_DW9_REGISTER, - },{ .name =3D "TB_DW10_REGISTER", .addr =3D A_TB_DW10_REGISTER, - },{ .name =3D "TB_DW11_REGISTER", .addr =3D A_TB_DW11_REGISTER, - },{ .name =3D "TB_DW12_REGISTER", .addr =3D A_TB_DW12_REGISTER, - },{ .name =3D "TB_DW13_REGISTER", .addr =3D A_TB_DW13_REGISTER, - },{ .name =3D "TB_DW14_REGISTER", .addr =3D A_TB_DW14_REGISTER, - },{ .name =3D "TB_DW15_REGISTER", .addr =3D A_TB_DW15_REGISTER, - } -}; - -static const RegisterAccessInfo canfd_rx0_regs[] =3D { - { .name =3D "RB_ID_REGISTER", .addr =3D A_RB_ID_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DLC_REGISTER", .addr =3D A_RB_DLC_REGISTER, - .ro =3D 0xfe1fffff, - },{ .name =3D "RB_DW0_REGISTER", .addr =3D A_RB_DW0_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW1_REGISTER", .addr =3D A_RB_DW1_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW2_REGISTER", .addr =3D A_RB_DW2_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW3_REGISTER", .addr =3D A_RB_DW3_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW4_REGISTER", .addr =3D A_RB_DW4_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW5_REGISTER", .addr =3D A_RB_DW5_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW6_REGISTER", .addr =3D A_RB_DW6_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW7_REGISTER", .addr =3D A_RB_DW7_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW8_REGISTER", .addr =3D A_RB_DW8_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW9_REGISTER", .addr =3D A_RB_DW9_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW10_REGISTER", .addr =3D A_RB_DW10_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW11_REGISTER", .addr =3D A_RB_DW11_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW12_REGISTER", .addr =3D A_RB_DW12_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW13_REGISTER", .addr =3D A_RB_DW13_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW14_REGISTER", .addr =3D A_RB_DW14_REGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW15_REGISTER", .addr =3D A_RB_DW15_REGISTER, - .ro =3D 0xffffffff, - } -}; - -static const RegisterAccessInfo canfd_rx1_regs[] =3D { - { .name =3D "RB_ID_REGISTER_1", .addr =3D A_RB_ID_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DLC_REGISTER_1", .addr =3D A_RB_DLC_REGISTER_1, - .ro =3D 0xfe1fffff, - },{ .name =3D "RB0_DW0_REGISTER_1", .addr =3D A_RB0_DW0_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW1_REGISTER_1", .addr =3D A_RB_DW1_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW2_REGISTER_1", .addr =3D A_RB_DW2_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW3_REGISTER_1", .addr =3D A_RB_DW3_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW4_REGISTER_1", .addr =3D A_RB_DW4_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW5_REGISTER_1", .addr =3D A_RB_DW5_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW6_REGISTER_1", .addr =3D A_RB_DW6_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW7_REGISTER_1", .addr =3D A_RB_DW7_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW8_REGISTER_1", .addr =3D A_RB_DW8_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW9_REGISTER_1", .addr =3D A_RB_DW9_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW10_REGISTER_1", .addr =3D A_RB_DW10_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW11_REGISTER_1", .addr =3D A_RB_DW11_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW12_REGISTER_1", .addr =3D A_RB_DW12_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW13_REGISTER_1", .addr =3D A_RB_DW13_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW14_REGISTER_1", .addr =3D A_RB_DW14_REGISTER_1, - .ro =3D 0xffffffff, - },{ .name =3D "RB_DW15_REGISTER_1", .addr =3D A_RB_DW15_REGISTER_1, - .ro =3D 0xffffffff, - } -}; - -/* Acceptance filter registers. */ -static const RegisterAccessInfo canfd_af_regs[] =3D { - { .name =3D "AFMR_REGISTER", .addr =3D A_AFMR_REGISTER, - .pre_write =3D filter_mask, - },{ .name =3D "AFIR_REGISTER", .addr =3D A_AFIR_REGISTER, - .pre_write =3D filter_id, - } -}; - -static const RegisterAccessInfo canfd_txe_regs[] =3D { - { .name =3D "TXE_FIFO_TB_ID_REGISTER", .addr =3D A_TXE_FIFO_TB_ID_R= EGISTER, - .ro =3D 0xffffffff, - },{ .name =3D "TXE_FIFO_TB_DLC_REGISTER", .addr =3D A_TXE_FIFO_TB_DLC= _REGISTER, - .ro =3D 0xffffffff, - } -}; - static const RegisterAccessInfo canfd_regs_info[] =3D { { .name =3D "SOFTWARE_RESET_REGISTER", .addr =3D A_SOFTWARE_RESET_R= EGISTER, .pre_write =3D canfd_srr_pre_write, },{ .name =3D "MODE_SELECT_REGISTER", .addr =3D A_MODE_SELECT_REGISTE= R, .pre_write =3D canfd_msr_pre_write, @@ -1912,10 +1753,20 @@ static const MemoryRegionOps canfd_ops =3D { .min_access_size =3D 4, .max_access_size =3D 4, }, }; =20 +static const MemoryRegionOps canfd_regs_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 canfd_reset(DeviceState *dev) { XlnxVersalCANFDState *s =3D XILINX_CANFD(dev); unsigned int i; =20 @@ -1991,144 +1842,20 @@ static int xlnx_canfd_connect_to_bus(XlnxVersalCAN= FDState *s, s->bus_client.info =3D &canfd_xilinx_bus_client_info; =20 return can_bus_insert_client(bus, &s->bus_client); } =20 -#define NUM_REG_PER_AF ARRAY_SIZE(canfd_af_regs) -#define NUM_AF 32 -#define NUM_REG_PER_TXE ARRAY_SIZE(canfd_txe_regs) -#define NUM_TXE 32 - -static int canfd_populate_regarray(XlnxVersalCANFDState *s, - RegisterInfoArray *r_array, int pos, - const RegisterAccessInfo *rae, - int num_rae) -{ - int i; - - for (i =3D 0; i < num_rae; i++) { - int index =3D rae[i].addr / 4; - RegisterInfo *r =3D &s->reg_info[index]; - - *r =3D (RegisterInfo) { - .data =3D &s->regs[index], - .data_size =3D sizeof(uint32_t), - .access =3D &rae[i], - .opaque =3D OBJECT(s), - }; - - r_array->r[i + pos] =3D r; - } - return i + pos; -} - -static void canfd_create_rai(RegisterAccessInfo *rai_array, - const RegisterAccessInfo *canfd_regs, - int template_rai_array_sz, - int num_template_to_copy) -{ - int i; - int reg_num; - - for (reg_num =3D 0; reg_num < num_template_to_copy; reg_num++) { - int pos =3D reg_num * template_rai_array_sz; - - memcpy(rai_array + pos, canfd_regs, - template_rai_array_sz * sizeof(RegisterAccessInfo)); - - for (i =3D 0; i < template_rai_array_sz; i++) { - const char *name =3D canfd_regs[i].name; - uint64_t addr =3D canfd_regs[i].addr; - rai_array[i + pos].name =3D g_strdup_printf("%s%d", name, reg_= num); - rai_array[i + pos].addr =3D addr + pos * 4; - } - } -} - -static RegisterInfoArray *canfd_create_regarray(XlnxVersalCANFDState *s) -{ - const char *device_prefix =3D object_get_typename(OBJECT(s)); - uint64_t memory_size =3D XLNX_VERSAL_CANFD_R_MAX * 4; - int num_regs; - int pos =3D 0; - RegisterInfoArray *r_array; - - num_regs =3D ARRAY_SIZE(canfd_regs_info) + - s->cfg.tx_fifo * NUM_REGS_PER_MSG_SPACE + - s->cfg.rx0_fifo * NUM_REGS_PER_MSG_SPACE + - NUM_AF * NUM_REG_PER_AF + - NUM_TXE * NUM_REG_PER_TXE; - - s->tx_regs =3D g_new0(RegisterAccessInfo, - s->cfg.tx_fifo * ARRAY_SIZE(canfd_tx_regs)); - - canfd_create_rai(s->tx_regs, canfd_tx_regs, - ARRAY_SIZE(canfd_tx_regs), s->cfg.tx_fifo); - - s->rx0_regs =3D g_new0(RegisterAccessInfo, - s->cfg.rx0_fifo * ARRAY_SIZE(canfd_rx0_regs)); - - canfd_create_rai(s->rx0_regs, canfd_rx0_regs, - ARRAY_SIZE(canfd_rx0_regs), s->cfg.rx0_fifo); - - s->af_regs =3D g_new0(RegisterAccessInfo, - NUM_AF * ARRAY_SIZE(canfd_af_regs)); - - canfd_create_rai(s->af_regs, canfd_af_regs, - ARRAY_SIZE(canfd_af_regs), NUM_AF); - - s->txe_regs =3D g_new0(RegisterAccessInfo, - NUM_TXE * ARRAY_SIZE(canfd_txe_regs)); - - canfd_create_rai(s->txe_regs, canfd_txe_regs, - ARRAY_SIZE(canfd_txe_regs), NUM_TXE); - - if (s->cfg.enable_rx_fifo1) { - num_regs +=3D s->cfg.rx1_fifo * NUM_REGS_PER_MSG_SPACE; - - s->rx1_regs =3D g_new0(RegisterAccessInfo, - s->cfg.rx1_fifo * ARRAY_SIZE(canfd_rx1_regs)); - - canfd_create_rai(s->rx1_regs, canfd_rx1_regs, - ARRAY_SIZE(canfd_rx1_regs), s->cfg.rx1_fifo); - } - - r_array =3D g_new0(RegisterInfoArray, 1); - r_array->r =3D g_new0(RegisterInfo * , num_regs); - r_array->num_elements =3D num_regs; - r_array->prefix =3D device_prefix; - - pos =3D canfd_populate_regarray(s, r_array, pos, - canfd_regs_info, - ARRAY_SIZE(canfd_regs_info)); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->tx_regs, s->cfg.tx_fifo * - NUM_REGS_PER_MSG_SPACE); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->rx0_regs, s->cfg.rx0_fifo * - NUM_REGS_PER_MSG_SPACE); - if (s->cfg.enable_rx_fifo1) { - pos =3D canfd_populate_regarray(s, r_array, pos, - s->rx1_regs, s->cfg.rx1_fifo * - NUM_REGS_PER_MSG_SPACE); - } - pos =3D canfd_populate_regarray(s, r_array, pos, - s->af_regs, NUM_AF * NUM_REG_PER_AF); - pos =3D canfd_populate_regarray(s, r_array, pos, - s->txe_regs, NUM_TXE * NUM_REG_PER_TXE); - - memory_region_init_io(&r_array->mem, OBJECT(s), &canfd_ops, r_array, - device_prefix, memory_size); - return r_array; -} - static void canfd_realize(DeviceState *dev, Error **errp) { XlnxVersalCANFDState *s =3D XILINX_CANFD(dev); RegisterInfoArray *reg_array; =20 - reg_array =3D canfd_create_regarray(s); + reg_array =3D register_init_block32(dev, canfd_regs_info, + ARRAY_SIZE(canfd_regs_info), s->reg_= info, + s->regs, &canfd_regs_ops, false, + A_RX_FIFO_WATERMARK_REGISTER + + sizeof(uint32_t)); memory_region_add_subregion(&s->iomem, 0x00, ®_array->mem); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq_canfd_int); =20 if (s->canfdbus) { --=20 2.51.0