From nobody Mon Feb 9 16:19:52 2026 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=1759390636; cv=pass; d=zohomail.com; s=zohoarc; b=mUEmmboMpzKMWHGO27SORMybWMQ8uyufZ0BBL9Fo5KcOKQkHh5Gz899zFdRaLNRC0GasIGZrC36HRCzhKAQN4PXzs8hgn2tucbHRuBVpNDIffKnCTnmqqz70/w3yVt0fdojECBV7p3hzvkgy/bsrPQLlET0lOB2Ac2Zuuynkn9c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759390636; 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=AdDcZu+HrsK0tAOT13DARTFVFFrFpPyzBVb9dicmXK23ft8+a0AkGHWmR8/IZLMsNsVVIBgb/BC+nO5CQCQwlHEN0vYpHGzh+H6Ql5JPsttUi807vL4MId4Jm73h9dvqCsxF4p6QWw6k43F5sFMzsAJ507L2Ny3mSxQdWA235/M= 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 1759390636672334.96181482870645; Thu, 2 Oct 2025 00:37:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4Dqd-0004oc-KF; Thu, 02 Oct 2025 03:35:31 -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 1v4DqW-0004lc-Q0; Thu, 02 Oct 2025 03:35:24 -0400 Received: from mail-westus3azlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c107::3] helo=PH0PR06CU001.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 1v4DqD-0008HW-85; Thu, 02 Oct 2025 03:35:23 -0400 Received: from BY5PR03CA0017.namprd03.prod.outlook.com (2603:10b6:a03:1e0::27) by MN2PR12MB4144.namprd12.prod.outlook.com (2603:10b6:208:15f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.18; Thu, 2 Oct 2025 07:34:39 +0000 Received: from CO1PEPF000044EE.namprd05.prod.outlook.com (2603:10b6:a03:1e0:cafe::9a) by BY5PR03CA0017.outlook.office365.com (2603:10b6:a03:1e0::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9182.15 via Frontend Transport; Thu, 2 Oct 2025 07:34:38 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by CO1PEPF000044EE.mail.protection.outlook.com (10.167.241.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9182.15 via Frontend Transport; Thu, 2 Oct 2025 07:34:38 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) 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; Thu, 2 Oct 2025 00:34:37 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb09.amd.com (10.181.42.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Thu, 2 Oct 2025 00:34:37 -0700 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Thu, 2 Oct 2025 00:34:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oXQV0fn+v8mTky2kvJ6j0xMlFu73JRYeCCu/gtCw6qAHNLyzETXCKUekyWQY5Tu/SvNicZm7D4BR3h1cJi4uEQyQJB5SpROdIe7fLKXeaiDhjxJu2UYk5Uxkwux+v8vdRSVSalj6XHRSclS5OTmrsxaJ43/qrgLzdsCxN6DchtGxP9dYVnhpWsE0IEsYRmqf0NVc4bMiBmsLIaYxcSaoa6UATqBar65dbA28PYR33b9ia9T7LeLPMM8l8id0HBZNDPpniIAE1RNcl8Lzqwm0PnV1Sj/cJoHnrE7x83Ae3MU51KO0LrNHOVX9OY0R4+63NRaTBLkaovX5E+8gOGe1pA== 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=fOGPOogCvYaiXApf/mrAE3JFP2BqlTmLtSux5mgN3fMMQCiwCUX/DADlv/DrTJ1izPTCG48Ht6PqYDaUDW919bE3xVpMjgTVqV+KqQgedmvKVu8EsUGc9UwBphXBEGlD1vTtzMV06qFIhs6bk/sYvOEK/BPebw+fuUexJMEhZPUkQ2QQlI0cjuswRJysFNW/lJ7GkjpbCwFFvXbL6WFPWww/lmx0htTF0I78lhYqhiFSWqhhJ7qSQ/8+I5NGJ87IydmnAMYkru5vbQOUs8+QagvumG3sPFE8ymaZNpYntlA/WDObgmkIuJlJS0688TKLnS+kNjVr9MRXCD/kc5JI9w== 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=LuKFR24C++Ef6Ucl4moq8gj4BpaGFSvBU/TaCRmYnUwVebBWr4B21dy7uJZ31tbdKMTIeDv+ftJm/uixs92RyzVuCcKm8yFgPPeI9aty3+7taVDEj301iJnG19FSqeL4SKRzTrEwQWqZO74fyGtDq4G6f/xt7u/XmBqlTKFoPz8= 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 , "Vikram Garhwal" , Alistair Francis Subject: [PATCH v2 3/7] hw/core/register: remove the calls to `register_finalize_block' Date: Thu, 2 Oct 2025 09:34:12 +0200 Message-ID: <20251002073418.109375-4-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002073418.109375-1-luc.michel@amd.com> References: <20251002073418.109375-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044EE:EE_|MN2PR12MB4144:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ca74608-17e7-482d-d8c9-08de0186248d 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?BUrbWRLs+qX4zsRbDUIx0gp9dlWAIuEF+loL56Vp11+pOne8PsvwUjMIHmFV?= =?us-ascii?Q?JnKNYJi0zw+t8Y3DW/EvTKpGzAlm5qnbXkR1ae4dPZ5IXilFoXLjC2jaHDNj?= =?us-ascii?Q?OCkQWLAH0nuVRgkqkuKN4E80vt8QB6Qs62YB8gWEzHptUnFmD4SA4Fae3312?= =?us-ascii?Q?37x4doNh3Q6GQOyR0icRJXfTa92VYU2rtiBuhJAOFl8ng3W+K7790lNDVYMS?= =?us-ascii?Q?NWUboro9ejVf8CAgZVHZpU/RulE5vplkIg+ac+QNLxf+IEkTOFDH0afqB8T3?= =?us-ascii?Q?VijuyN7gfqNRKQvkaWrdYGvcseKrUfK66AXz3gMz7ZkQ1KefRmzyyhlaO3Oq?= =?us-ascii?Q?7HJxGlRAGq75cCrNxBkjkJMtxCTenqGkUzKwlRKNFLaz2yOvd+4O4iHFcZFr?= =?us-ascii?Q?bqWlnnfuttuSzG2OdDhLZ2hE910pY6Pl8fFbfAwRCGDm5Ho/HjfpkwF/2CPq?= =?us-ascii?Q?xIWk/fYkzDOzVnzXk3ckHJyhHYM02ej3cfj5WG7qS6AQEAgCPKWXVOS/VINX?= =?us-ascii?Q?Wzp82REKvaw5BnllvRzexrv7p0nA2Csysk+6Ny7chYzIqbPe1iEn+7P9HnsC?= =?us-ascii?Q?HhW3WWGPaOPeunQx15wMLaIzWhnPIgat3htftN6dRcBTWDPWRrazLpROelE2?= =?us-ascii?Q?vI9f+qyidNr2Kp1cbKHLcyvbg7UluVovTbxvbYUpe6oDEAl3MJ3VSUdSch2B?= =?us-ascii?Q?KjKPCKHqHbyzfC1vwTvbNCyUceZzi9S1RMb0RZCVDVDHVb979udUrm9R3LCx?= =?us-ascii?Q?m6+DHrz5EZx89nm0BINq4VtTypHJQRdi35bW9Yjk9y6S0fFVf9iUdT9JT2Je?= =?us-ascii?Q?08cIynWUq0/pBINnxOd9BcN9wH7coD2EpoI2+oqHdwWBnaLFxTMcjQRI7rGl?= =?us-ascii?Q?l6II5XxY2ET/wfVIGm6WvlqyBF2R6CY5/8FF9zFiYUghP1YG/5y1PJRRiTWs?= =?us-ascii?Q?Z/mhxzhFDmPEBYmkrYEWeyRMtsxonN5MrOdB3TB5YYn5IsmoIAGcWegvwxcI?= =?us-ascii?Q?ZlgAy7N2Wqr/EBXd8cF4lqNtf3eUvYNw4KOO1uUjxfkcPOon6FHkp0+mNRJH?= =?us-ascii?Q?DpnaVJMnVC12cIIjbDJS72UafEL1BrX7ZhjC9NYtSPUlZ3FMJI2Y00XMWoCo?= =?us-ascii?Q?H9oCroBpcycPMJv29imKWFIYOqwFztu/zOHzCaACCbZkFrt9CbTUOFwkQvg/?= =?us-ascii?Q?YxQtaZHFwgRXsoRjNvxWU7Fm+aVYBGm9q3ZhjhujCBPEkKG3caLkjA2AZMI4?= =?us-ascii?Q?8X9j+0XWmniJVEQSwLIxIzCfc62lUbrgYi57x2Rin/LDpF2KmycJPxJ+ykUt?= =?us-ascii?Q?7J9k6nIGeX+Qpeo+/Cw6w8UvhXDeS5SOFzxoligSqYk6y4FRAg3UrQhIUvWW?= =?us-ascii?Q?TJi5f2Dk43tG8z6zcwnaFu2fYwI4yWwj17MEPArSPuP7K30n++mZyC0aF/lX?= =?us-ascii?Q?999U1sc4oSbVDet8KsH16MLNELQ7lh1mdUCBR+/MNU3jt3vGT3GiRyNwFhSd?= =?us-ascii?Q?l48jrw+27SWzs0ucTevSgcrQeigfQB8tOfZGARDZF4AL5myWI1radSbybl11?= =?us-ascii?Q?sDP1nEGDO0cg/zZmCXw=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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2025 07:34:38.2346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ca74608-17e7-482d-d8c9-08de0186248d 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: CO1PEPF000044EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4144 Received-SPF: permerror client-ip=2a01:111:f403:c107::3; envelope-from=Luc.Michel@amd.com; helo=PH0PR06CU001.outbound.protection.outlook.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, KHOP_HELO_FCRDNS=0.399, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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: 1759390638181116600 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