From nobody Mon Feb 9 11:33:55 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=1758109828; cv=pass; d=zohomail.com; s=zohoarc; b=EzwhpcMY9lx5l5xPepYD7D30liyyHhiIGAnUyOvstET6rwbIZuq1U1K2/1+00lAG0R4uJoDeN/MS4AoIYR3GXedYC8DbNRi9sCiarm3c4nQlfYbkcH095MW+ZsfpHfbgwj2rkn0MYKSia4Oem15a0u3FwfZQwfhhC4pQ8DEF4cY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109828; 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=GVc7wjetViZwJPd+5rpxt1GwQ+s9787iGXNojg/TB7Q=; b=UxttWl3n+W9BBecQDZ4R2eUYJ9OXAiNQdpHdlF5RWeFyVQepEnIeweoBngOE8t+CalvzN9HLgYz7F5ywbAHvQptR2szWBD9aIy0dXOj+8+eEOTkrwBpMIePP22yU3uM1s9cvLJEihxRCvloE/BzCUcvrzluTVJ/3rIsT/Fs+h/A= 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 1758109828756386.12879969757137; Wed, 17 Sep 2025 04:50:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqfb-0007qy-E5; Wed, 17 Sep 2025 07:49:58 -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 1uyqb7-0002hn-GA; Wed, 17 Sep 2025 07:45:33 -0400 Received: from mail-eastusazlp170120007.outbound.protection.outlook.com ([2a01:111:f403:c101::7] helo=BL0PR03CU003.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 1uyqb3-0001ot-7b; Wed, 17 Sep 2025 07:45:17 -0400 Received: from MN0PR05CA0015.namprd05.prod.outlook.com (2603:10b6:208:52c::28) by CH2PR12MB4149.namprd12.prod.outlook.com (2603:10b6:610:7c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Wed, 17 Sep 2025 11:45:08 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:208:52c:cafe::b1) by MN0PR05CA0015.outlook.office365.com (2603:10b6:208:52c::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.14 via Frontend Transport; Wed, 17 Sep 2025 11:45:08 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:08 +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; Wed, 17 Sep 2025 04:45:02 -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; Wed, 17 Sep 2025 04:45:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PoMbhzZWO3PQwExDN9jKlkc4TKHeIxvEZWJugGCdN/82PJWF4eDJY0FjCGavqMxDRZgv7gRViUMoxEauXUDOPrtTSjD6TmRCiD/VQW0iO78NJYZ92yuslvU18tZAgCVzOZS1ml9iJ1M2xMbmBhiMnlkBJw7OZdXVQ2wJWvDO4l/Uk+T4tHBTbnC8ygmB6lu13FjgZX1ArlRiLbcEZ0Ke1/DOK3miwJ8UrZPiS14Jh0W5X/qqmWKIiAuIs3gVepgTPkv66YUVg3HOjzDqgQrEd4iJ5XXCjWb+p66uzFfLldAqAixEGT4HpcWCc0Yybcjy7ZKD+ZWOByncOK41O2woGA== 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=GVc7wjetViZwJPd+5rpxt1GwQ+s9787iGXNojg/TB7Q=; b=VVBCDUBMLwxjWMbtYhgIQ4wzdHWVaGtnezappheE3RQnf66o6heeOxT+B8jRzqvFgOSXC7N9pfmq//80HgYaSXKW4w8y/dxMRTAzegVs+nU3UlmxCXjn1qVGAmsvMeMe8DZ1oEKli9sgMcnjGZFkxxEXPpSuxQoKfst35Ds/SNkygdOANOTx1cttbanUkrEdCj9CEATk5dHpR6jSFYn/I+t0+wQXn57G4P9t3NvhUGAlNTKyceKiEfx/SUbtVijyt/lWzmrF8nGJw1LFqpQRcLiA3rIpygjh5JSkWxA9vYHG1Nr5GR3soFrXYnqEda3e8z0e4Vf5Dn8qkWKJtKSNlQ== 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=GVc7wjetViZwJPd+5rpxt1GwQ+s9787iGXNojg/TB7Q=; b=wgRcDEykV5rOSlSQ9BwBsEn4zzmr15Y6EOR/ciKC3eCOTzl0Zya6zIPemJZ74OvECaCOmZRsxHrC46E8VUEr/AlXmOQJbjlouTiOiCy024XTBkjxBP2JbtcYFam0+/RVWk1D35wi/mpcfyYFvQn/Ndk6zF3Diz+o6N2xLh4eiHs= 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 1/7] hw/core/register: remove the REGISTER device type Date: Wed, 17 Sep 2025 13:44:42 +0200 Message-ID: <20250917114450.175892-2-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|CH2PR12MB4149:EE_ X-MS-Office365-Filtering-Correlation-Id: 21254d70-36cb-45e6-80e1-08ddf5dfa6df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?id1dnHTK6hAbGt3kMgQy8jcrOllz3otrxnC0HHQWA9FUdgEiMeXRwSSgnMYa?= =?us-ascii?Q?/GypqW8w+PoLPG1u/UfJZRS7aYM5Fl0apCvwi3QkZESUggguikrOuNVwDpgx?= =?us-ascii?Q?fkC8vOJXBEZ7aNuZEBStu72GnKd7QwdGtHGZ+YuRR03BvKlxPg2D6Na5knFp?= =?us-ascii?Q?/E0aDxdHQooTaJ3M9R/ArmPN1IHmvPN6SN2F8s0kUOLmQhQwl+hPqQI9oCHA?= =?us-ascii?Q?2RPpREukgxzbJCONR/IQGjYsoTAFTutiwMSLg5mmkQMZbrRaQY42v/VUqrLI?= =?us-ascii?Q?jDoHWgTNP1/xIyzXByNSweDt+tfS5K5tl2RrVFMv+mUtI4lAqjyt2B5dCu36?= =?us-ascii?Q?lRIkES26yj9QidfSILQYC3wwad8iABeGNnP9buZihT+3wTqz3XDonVReViZW?= =?us-ascii?Q?tQa6znpoE2G4jzALhSntTQU7zMBFQCqV+jxY/7GSMeXmIsbXqmvU89rJGMC2?= =?us-ascii?Q?jQkVKPKNLRkeB+mLM6Ab6JMd8lQTEl60XIR8RE6XDcOXLRjFncYCrci/pjXN?= =?us-ascii?Q?TveoM1GkKI6g+PE7jEdoGC/w5FKfFpx8+l8yaB/t27mM0sDA+SJu/lnToORi?= =?us-ascii?Q?z9TfPNoynGo4XfaY7uo7vkL+hKwht9XldZGBp0FAtm8AZB/fJ8RW79D4F3bR?= =?us-ascii?Q?AdhzQ7FhWLg9sGQ/UVBtjACSSHuPZn9SU+Ea16DKy4cFx1bH/rgjeLOnHuta?= =?us-ascii?Q?jUkZtFQiug/aKO+2Tp759+spgjmLj58WGMri6eJoJlKPMQEFQ+LKgwzzGrlS?= =?us-ascii?Q?PSMe1rBkTKn7K+BoOicPKQQbmH5ehdrk3cOYQyoXfsCkmppEFY5BIUDIJQE8?= =?us-ascii?Q?qLuRhK04ghqVSymz4Ohzu2W5Cgs8O8KFUzKWtWiyqqbfYuKgOWlEQmzFBRgP?= =?us-ascii?Q?Zsc4riXcoN2SRPyGMfadb6eMp1iVJ7snu9hXTyNDVdlR5H0t3sNd3kALZjV5?= =?us-ascii?Q?wqDSKd/fsLgrns0RPPZVn61IUHrF/zHXctRhVZ7T+98chtUS80dRhBFDU51I?= =?us-ascii?Q?BKVPiw04a4Tfru70RV03MzNkuq5QCcpQZSyp6V1THbAbQ9VJTJ+G6IXx8+Zf?= =?us-ascii?Q?r6AKNjET0eFv51hizQvkQl33GA8Ftrd1rqCBkTw5WlPsfZYUPPmNaolfoeV3?= =?us-ascii?Q?waDXqA+dm4rsCngRSrB/hHqjd9TV7faUA8V+OvmDl2W6B302dHkCJCT1Nqwi?= =?us-ascii?Q?NJQSatdCxSMD5XP7nxEQd9vRvNJZr8hTjPYmFBF0CDa1DKB98RB1CUVHQXqn?= =?us-ascii?Q?3nsF2IDCR8Ihi7+fjDK5N6zynS7RgIlASXOR2x7odrlPhFikTpJwOwd/EHdO?= =?us-ascii?Q?eoUERcy6BHqKHgcPCCKBwTYUf3+3dxBB794urB5WIRKMaGIpj6t56UMeUiNZ?= =?us-ascii?Q?s3l5J7AUxpxKdFe1I3xahwR3XL4aCdyaNnddnFH/fcV7aziM3hGaO9R9UsWZ?= =?us-ascii?Q?HOhVU09TvEBGxvRLHpYrMzK6XOQ/eXBFskb/DcHJMYxrIxb3rL7wU3ewkTfn?= =?us-ascii?Q?7KX/ZrUCxrYzTE6Hvqkrx595oZ6Z6Z+fIuVR?= 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)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:08.2215 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21254d70-36cb-45e6-80e1-08ddf5dfa6df 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: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4149 Received-SPF: permerror client-ip=2a01:111:f403:c101::7; envelope-from=Luc.Michel@amd.com; helo=BL0PR03CU003.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: 1758109829420116600 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. Signed-off-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- include/hw/register.h | 7 ------- hw/core/register.c | 18 ------------------ 2 files changed, 25 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 8f63d9f227c..57dde29710c 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; @@ -317,26 +314,11 @@ void register_finalize_block(RegisterInfoArray *r_arr= ay) object_unparent(OBJECT(&r_array->mem)); 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) --=20 2.50.1 From nobody Mon Feb 9 11:33:55 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=1758109892; cv=pass; d=zohomail.com; s=zohoarc; b=etiuvl0LMLkkKIA85m5SoTe9T8i5Arf4jEIPsJrKFS4SLMLHTy8rUk9Rg34wlc+RR1ULo9f8xkykVBEWKSFxXkEMmPvwrWOmyK64XSxvvhL0lLEWJzGet9l3eBqXQJbqvAK4jm2HiQaf1p655cn804jLGp+EQI6K9LhMITi6aJ0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109892; 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=fb1MQlQftlmKR4RiuBV4l8tUleVNBLtd58xgtytc76Y=; b=jnH6kUoazol8g2Yh7eDZPEXM+znZKAWXr4nM8e4fBG5WFj5TQc8Z2wJJmHg8EjzcS/mulJZBanCd7u23geQ00qZfOnPrzBJXzUa6VAOpSENEq9sxpQBcz7iTuistxGyime3lDU30CBLFbXXTI9UPfpeQmYK6lkRcahjk0q1zD9M= 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 1758109892408848.577817010306; Wed, 17 Sep 2025 04:51:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqgu-0001Fx-W8; Wed, 17 Sep 2025 07:51:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uyqb9-0002i9-It; Wed, 17 Sep 2025 07:45:34 -0400 Received: from mail-westus2azlp170100005.outbound.protection.outlook.com ([2a01:111:f403:c005::5] helo=CO1PR03CU002.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 1uyqb7-0001pK-Lx; Wed, 17 Sep 2025 07:45:19 -0400 Received: from BN0PR02CA0006.namprd02.prod.outlook.com (2603:10b6:408:e4::11) by CY8PR12MB8340.namprd12.prod.outlook.com (2603:10b6:930:7a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.23; Wed, 17 Sep 2025 11:45:10 +0000 Received: from BL6PEPF00022570.namprd02.prod.outlook.com (2603:10b6:408:e4:cafe::4b) by BN0PR02CA0006.outlook.office365.com (2603:10b6:408:e4::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.13 via Frontend Transport; Wed, 17 Sep 2025 11:45:09 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF00022570.mail.protection.outlook.com (10.167.249.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:09 +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; Wed, 17 Sep 2025 04:45:04 -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; Wed, 17 Sep 2025 04:45:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eI73tWMbpKMdWTY9dEf9R4iuGLyke7vuBB/tMtLZwAp6Dhtvz2cAQ53xVH8iwgkSbmtVyYXwwg2MdQLAqtuEJo1nbmO1LlNMLXRgoJWSWyqM1jAoktnEakHV07Z51mnn39cCoJPFIJeluDvRc7W8tYvx/lJmeS6ewlqT1035KOCHEcWHZQqwYN6Dcb/7zRJeWdeajU81/ZrWXIlr77hin3obCVZEOnHnfoWilkfbwJ5FQDIA4FZ5Z7RNfhN1+CFBONnUX0UWCf678xG7acei/ZA/tdRF0x6vXFf/MmCOVES2f6lbop+GpXqJUzXXpKsT5KC5FrtXAwhKmOKgwbv0Ew== 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=fb1MQlQftlmKR4RiuBV4l8tUleVNBLtd58xgtytc76Y=; b=dTO5xfcwDq8fOGiujMUnAXQACPkZT9DoIqbTYcXnbjwOgQs0KBNvyw6ArRmv9hLGEZnfrofaHrTokSiBkqIyvBo+hRd7okTE8DCimI9o5ZpBNvt4Zkfke0GT+1VDRiyMehd8+boZmgsQkQYV4uK1HCmfXXziUSiorbXngK2iDqQbZU7oYN1JmSUsy2JaFBqg0vQrTN26JBXU9TLhrUBhCnHB9Ix8bCCmpfXLvauTfc/7p/ciT04peYpqrBQw7EAbyrJ92/Yv2UvBmLwzaSSU2TlpnJIpe1V0tMx29bVJAVhbITURyZ/M/LbW8MXh4LZzGAX7e2AD5vzcWwzzAOOMgw== 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=fb1MQlQftlmKR4RiuBV4l8tUleVNBLtd58xgtytc76Y=; b=hn8MmRkOSwtmiLZGJqpn1CLdMBZD9bIqDCk2hjv/5dWbOHUrv4HhJU9U+j5Hsprbrpta3tBWN1zLFlMP1t7/zy5DeKOJchqqWCZN9ziZ4yYCfL6+1XJbETEINyZ8UVDmTaKQ7u0o+vcMztdsMmbsiPHfFbXzhR2goseocJxAn7I= 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 2/7] hw/core/register: add the REGISTER_ARRAY type Date: Wed, 17 Sep 2025 13:44:43 +0200 Message-ID: <20250917114450.175892-3-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022570:EE_|CY8PR12MB8340:EE_ X-MS-Office365-Filtering-Correlation-Id: 08bf17d3-1d18-43ea-12c2-08ddf5dfa79e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4Ok2S0/WrVVbTuWyelfzmX/UdGE+xQby8JRUzjCcLoXhfSWpNVFAby9LkORe?= =?us-ascii?Q?NKhUtnXXgfJ4GY7G/K4xA1sivXK4aN6mExxy6nN9qisJpyG6cSp1WkpXmLcn?= =?us-ascii?Q?/hQxNnOe5sEC+NVxFGT7Yj9g49+HDbHxnE37/2RDWxuCgQLdz146Sv+NRTmy?= =?us-ascii?Q?Hx2/rfHDJOgnTaWxoQCrxSB1KJxnII1H/BOq7sTbyF5w2hZjlZFubXK/p4Ax?= =?us-ascii?Q?VjcmZ9vHIwY2liUa//Eh36sqAa2OvUvXHdJv07VIGogXxI9jSqryxgokUbCs?= =?us-ascii?Q?MwWZfE9CfGm7r5h9MFk7Orl3d6PyvD/RyEvAtRngR5w0eu5H2iPv5Jn46zlW?= =?us-ascii?Q?SFf8u0mPGcpWdirM4Tdc18pGpXIK6Exqsrc8Ygzx3gpUhLf0sr2aForubDsa?= =?us-ascii?Q?KNVRcY6coUlSgsIr1JjaGQfEprA9Gi+14TSW/6YpkpDi4xjwXkBNisJc1UJ8?= =?us-ascii?Q?nI3XklLZugc8sZR/ohNHkmxfBKPJcnynOAA3SGh7MV5OulIro2D68mk2kKzD?= =?us-ascii?Q?L3Z4ImGXC1ruy1m9wuWJ8ELLItJx+oBiOU91Y7/iXPXk7SFjWe36IVOeuQeA?= =?us-ascii?Q?R4RzcCilpNjoLtaf3qSG2kLjJuk2rG3yM4IqnSGkw9KIcYy76Fv1Ev/wBp/4?= =?us-ascii?Q?H53rENrJmlGM4UdYSrgorkTOXPmOzCtVCWK8xDhvudZf8pDm0tgAJEU4LamE?= =?us-ascii?Q?SbdgKDElWmFEB3vdFO5ueTIC7rEeOCSY+Gye6rQN4bbfAt1LsJWckqLhLMNw?= =?us-ascii?Q?6cNAH+0+b5aDs1QHvEeVGf/rMCNy20pw8gSm05nLn12HRiBdaNryn5ynZPI3?= =?us-ascii?Q?46DwA9W1e52NGbTcIkA4qED5UqW+5/Sx3NYTFFaS3YYndV5Iaot3yIRu7C38?= =?us-ascii?Q?ik0AaVmnI13rmMC+AC5Iiw6H3LuV31pwSsSxeoppun9PfK/+gMqkm0uZPLev?= =?us-ascii?Q?rSW4klqrwt9E6L/X/jGhe0CTS5jmMBZjbwl4bazSvYsI5tr0P2w3i/hqVMLq?= =?us-ascii?Q?N5ELZoINjPvn8q+nllaZzdEPk8zD4KpGHpdGrGBj9VbAXzPyvGWHWtiCu+l2?= =?us-ascii?Q?kxcIaJPwx3WqOioWb8ZPZRAh2dQ3PuGYxwAICq2D9QzFHeIfxOOFHd+VpMOO?= =?us-ascii?Q?dSeyxR25i++BpUo9cdpLFanOEkty/fAlCxi90Wy3+vpw5q4Uvw96YrOie/Ut?= =?us-ascii?Q?fCpJn2RCNH/ZA2+FfTraiwMi3FocfykigDNi5MwYiWZ7f2T9D0XKvRLUgq9s?= =?us-ascii?Q?O8JUuBYTmucUk7dKTPZWkqcDmg8nxZNREgbLBLUAYau3rSNKU0rywYTtEHQI?= =?us-ascii?Q?GO4PFrM9Xnou06EZRuaZMRuLDRyFcY8yaeSzhnyLMEOEhtCZvi9s56pF574N?= =?us-ascii?Q?lp2L18ZwxqKju0JneUPoRNOmqHWuNbwIdTU5CeopNa5hHHcjS4ilWhOEnUxg?= =?us-ascii?Q?4Cehm2j7Gxncf408bPNCeDbRy4pBAy3gPZ38LgAF3b/IQvcfRjIFGNKaoNxz?= =?us-ascii?Q?TLyXlBJE4s7RUOd7fFYmWVMvviJHGFrvLwGz?= 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)(376014)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:09.4700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08bf17d3-1d18-43ea-12c2-08ddf5dfa79e 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: BL6PEPF00022570.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8340 Received-SPF: permerror client-ip=2a01:111:f403:c005::5; envelope-from=Luc.Michel@amd.com; helo=CO1PR03CU002.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, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1758109894525116600 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 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. Signed-off-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- include/hw/register.h | 4 ++++ hw/core/register.c | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 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 57dde29710c..4d1cce02a55 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 @@ -307,18 +313,30 @@ 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); + object_unparent(OBJECT(&r_array->mem)); 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.50.1 From nobody Mon Feb 9 11:33:55 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=1758109785; cv=pass; d=zohomail.com; s=zohoarc; b=G7WMEBWiHqC7CtkLQLfMeCOwHutityThtu+RwMAB6AsM2LHQR4lwit/LzZ29VokO9LFJVj2Wwel3G1ONOQ0VhR1DERU/1KGSzn1eQsUHYJ1DMhAayeeTQQrHbK5MTKnajzaLXEsVA5Hh03fi+mt4xGTRqPtkLBkZf/3VP+u4d0I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109785; 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=rIpIFyWDsQMW/60nqRlO4+3KjxVM9If+h5iV+l0Il7A=; b=Tm+hKAkHMf/G+ty/yGLfYalTWp0vnCE+/xhZ3fhOQ0J6TEJ5NbOTkVkEqnQgUtNeshLEFsPQIRfEnqsDu3el2ywQZl0sCvyl8+S7P9dqMo2hiBFCdS5yYO1RcbRS1maGcSIWumg5xv/Eevl9h8CpmeIttoM+YETZ4K2ZfJA//lE= 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 1758109785596249.81238921079557; Wed, 17 Sep 2025 04:49:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqej-0006uI-Pb; Wed, 17 Sep 2025 07:49:01 -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 1uyqbQ-0002mf-K1; Wed, 17 Sep 2025 07:45:38 -0400 Received: from mail-southcentralusazlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c10d::3] helo=SN4PR0501CU005.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 1uyqbL-0001rP-UC; Wed, 17 Sep 2025 07:45:34 -0400 Received: from SA1P222CA0117.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::23) by IA1PR12MB6187.namprd12.prod.outlook.com (2603:10b6:208:3e5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.23; Wed, 17 Sep 2025 11:45:23 +0000 Received: from SN1PEPF00036F3E.namprd05.prod.outlook.com (2603:10b6:806:3c5:cafe::17) by SA1P222CA0117.outlook.office365.com (2603:10b6:806:3c5::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.14 via Frontend Transport; Wed, 17 Sep 2025 11:45:23 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF00036F3E.mail.protection.outlook.com (10.167.248.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:22 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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; Wed, 17 Sep 2025 04:45:06 -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; Wed, 17 Sep 2025 06:45:05 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Wed, 17 Sep 2025 04:45:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yRg9Vl6uOhx0hVMtBp51I1zwK4jlUsep/dLWhiXfuXjXJE6Y3pQ0X4llZrGTkjazntV6Bg1NoDwFKSjaLp4wBoj3v6sG81zNoE/1w4hYLmqeFG2GjXSyuXqQfzpnEZlOva+oLrmeLkahIsu6NDfxyJyxrmr4ki7CXx5kDnqbfsxRvsssNctbVzfuS/uTQP+J5hrwe+wAANuBnEsNdC5kYWzm67h2guyV9Qc7/Xd6kwgvyAjoHdGPJFdaVbSSwBisY9PuPoPRTtwKBdnwBE/ZAb/ckHviSv0/vlgH3nLwvFRvelWWNfQbSGr7JoZ0p861YVRkVrw8qXXglwlUjtR4NA== 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=rIpIFyWDsQMW/60nqRlO4+3KjxVM9If+h5iV+l0Il7A=; b=Sxo/sErUNfsBZwEbzp/P8fhJBWwBva58jv4DYAGVx6zGfoeWnr5Lv5LUob3Tw88Sle8oXfwsi9NA3VbS6j38hRXgUc/2rMXXbBMa0/pp5DL4Gri/3DDpfpZOm/EtjNS3t1OYv8EWDGh6vtdc7lOr2fZ3MimB+t7ysR9wqrkC8HntQP5/Nf2JIDjB3qMhRhVYII6XE0//gu3uTf9joOLfu+tA3kBeW2GMr63lgaJIMEIsb7nkuwJ4jLvj97d+gbFyCmhcd9DTMkVHVpG1/XakKGG8hDC1SVuhsgFOgM8aoYSzAFWa1O0poRWV27G1S1KkE7dph3k0AwByitvb+jQN8g== 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=rIpIFyWDsQMW/60nqRlO4+3KjxVM9If+h5iV+l0Il7A=; b=TmA5+gLnCCVsc5bgk6fyowodpB1Zn06r2cVEUvAG9JXrAtW0liu/sfzVSkGu6tctK9cGHwC2JnmWm1RBVgB3p30jnnicTd5DakT7RhvNDfYkHievkQHPFQkSuPowsSR9hbwH6c0u5acsN6V8/qSHFJ7sJEJuI/3q299AibOYUAg= 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 3/7] hw/core/register: remove the calls to `register_finalize_block' Date: Wed, 17 Sep 2025 13:44:44 +0200 Message-ID: <20250917114450.175892-4-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-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: SN1PEPF00036F3E:EE_|IA1PR12MB6187:EE_ X-MS-Office365-Filtering-Correlation-Id: 05e9c9b8-e7be-48da-511e-08ddf5dfafa6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3rC+Wygf76349wM9ZcLu1fZUjy3h81jvtOsy6gi8d1zThMpPZb89CHaC+fT6?= =?us-ascii?Q?P996p+X6JoNDLbZMQmxtZnzS9u4f9tHlEtyjHHxTEJ4EaqG4o478q1InovOm?= =?us-ascii?Q?2Xoy0ew34Sp0ExWGojDjBq0Ts2qWHOjAdos4Wi0Avz3636sRqsm+LyuXdvU6?= =?us-ascii?Q?/Ps5GrOHx4DYcanY2LYr2wtwyHwsoAp20B/TLutdNxjwjv8qip6F9n6eWRxR?= =?us-ascii?Q?fNtu6yOkdo+kEwG1w28ZOxPM7cz89oUOIwRUYkPY+4m8h/xl8vcYIoPDHNn0?= =?us-ascii?Q?J9MvAL3RbifUQPau0bgRicUucAbcziBKPJnWN3Lh2dfZTukDRZS3TdNMCjRz?= =?us-ascii?Q?2n2XQGXJfS8dsC5XnIb2N7+csOaL8/43xWjgDu0OxeqlOB/4IMBJat3augCW?= =?us-ascii?Q?AryrHfgdrCHhOrUGF8pYsg+/PK0M5htiKlAib2gAVJF0EjxJ5ZXaf3f9bMoj?= =?us-ascii?Q?nhs8N8+k0wUJ/wwb1S63GtzTzGXCOI4UNYRXgPTjCuvS/zJgZjmT645pPnPQ?= =?us-ascii?Q?PnJe3hIVpg/e+Om7A5vLLvFZzMaMpDPHKd2MaqOSLi1sMZcm1cBcpOo9r/B6?= =?us-ascii?Q?/cAaGGy2IvdtFQIW6FByTi3xh4MHLcF8rNV7kNK0reThVxs9oUoyE3HywQj7?= =?us-ascii?Q?niqhqPI4aUVZGoued0Ycn8iMlkH6Gpj4HCKSNa9EqN1ErS9DcQ2wl8M7ramA?= =?us-ascii?Q?D/dWes3c9eDpSSXXysmXRIW2S/Oag/4XBgUcAAq6iy+0QIRsVg1gP6mQGfSD?= =?us-ascii?Q?QW17PiHlWME1rnvWbJ3uQVvQn7griqVQl8HL2jvbsCnzcc0+jQgXBBbMO1Va?= =?us-ascii?Q?ZBnkxMx23PtNqnggOdTemUf5Gr5LgtwIO243dxmUIP866RHWGLG07PM4+7gH?= =?us-ascii?Q?sF9gxcGPJvN0poCeE8eFDdX1U+keGclQ4mfTrntchiScWsg9AGq/Cpg+fJCD?= =?us-ascii?Q?Bn3h8Z2+REwGUkjL8/ppwKoXne+K9xnjurr7gKeajb5SfqZx1+mpN3kXvhCb?= =?us-ascii?Q?ZdLzPj8zcbk8WCApbGocVoiqAbaoljqsQVsj9IcwP3pXzgfKty6iUevTrBz/?= =?us-ascii?Q?UNX39Cl2AkRtIGFdqMaozhfkLJgKCxRl2OZgu+T5rFe0YctofvKgNmkJa+Y9?= =?us-ascii?Q?TTy3XACtk7Ogo/ZbVQQCSqWIo/k8BI4dcugR6sEgE5wmusObDt61rlvFmud0?= =?us-ascii?Q?lZgEc2SjA4YgIG8DHxNm0Dwuw3Gs9HqXSaXQg4369iXcVojCDMy5SRyJY7Fl?= =?us-ascii?Q?rLsDYhqXPnMI4+/2GPbowunr+al05ye7OgZXdC5WBRMTzFwovmx3bH3KkYBq?= =?us-ascii?Q?Ugp3n/K0STMnUTbqqyh34MFnfvch+nuZvN6nEKHaZtnAJZlwEDHGCaetu1kG?= =?us-ascii?Q?c30O89VkPW15DLqIFEKqODqll+PQEVFPCsvTu9yQIBTEZhiepWQ3ezqZN5de?= =?us-ascii?Q?2UtyJA32tY65QbObg+Y5MrnRnrfjWLuxsnlfChSzRq7Q+j/cZFR9H2GJSX0v?= =?us-ascii?Q?bjQYttQbhRd6yoN6ZWc4wtsWkpnBna4uTvLR?= 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)(1800799024)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:22.9287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05e9c9b8-e7be-48da-511e-08ddf5dfafa6 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: SN1PEPF00036F3E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6187 Received-SPF: permerror client-ip=2a01:111:f403:c10d::3; envelope-from=Luc.Michel@amd.com; helo=SN4PR0501CU005.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: 1758109787268116600 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. Signed-off-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- 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.50.1 From nobody Mon Feb 9 11:33:55 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=1758109843; cv=pass; d=zohomail.com; s=zohoarc; b=JoANp2L0liXuOmdQcHASeylSFUkIkjp/ddpfIQsdmJn+th+S3fBMXlZazgCX1cT3GdCoO/ZrsER1JjVUL9LqhquQ+KNuuZp89V2pQRmW6U/Q7Gw4muZ8bfFVUVUR6lJC46lhzSPg/44W0nkYDgR069c+LXVKonlBVK0EU5JwQyY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109843; 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=hZora/Zm43hZ9643nj+hTtT2IUx/bOkEz1T3ktd0VFo=; b=d1oKTHTXUGOpCVuhcFtD7p27dmXqTzvKRdntmKaie6W2YIGFkG5VaU9RaDgUhGBcD2HR3t+z+mDTeILNcEeIWNzF41RbBd4qxVLN87X/1bwW+HSMRLmhDxYHNOZQOaxfNkYxwpEbbD53icPejIYuMTRkXopkwdRDsC55fXm8Z9g= 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 17581098436999.50234904136289; Wed, 17 Sep 2025 04:50:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqfx-0008RW-0F; Wed, 17 Sep 2025 07:50:17 -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 1uyqbY-0002os-8i; Wed, 17 Sep 2025 07:45:46 -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 1uyqbW-0001uo-99; Wed, 17 Sep 2025 07:45:43 -0400 Received: from SJ2PR07CA0014.namprd07.prod.outlook.com (2603:10b6:a03:505::7) by MW4PR12MB6801.namprd12.prod.outlook.com (2603:10b6:303:1e8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.21; Wed, 17 Sep 2025 11:45:34 +0000 Received: from CO1PEPF000066EC.namprd05.prod.outlook.com (2603:10b6:a03:505:cafe::f7) by SJ2PR07CA0014.outlook.office365.com (2603:10b6:a03:505::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.13 via Frontend Transport; Wed, 17 Sep 2025 11:45:33 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by CO1PEPF000066EC.mail.protection.outlook.com (10.167.249.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:33 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 17 Sep 2025 04:45:12 -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; Wed, 17 Sep 2025 04:45:07 -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; Wed, 17 Sep 2025 04:45:06 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kjHTpwBEmVpOpxCkYRYt3HF8oxH5p80Qqeu+qH2OACd/At44Lv7aLeS2ppmQtjWspYjRmvGz+dZonN77xTE/GUOvcrsaz4TpWKziYqVQ/DUQS5g1fSgozApVZxUkxSZdnMhoAw4mL4de2Zth5ZGi1U2SOp83uBFIj+np4xeod+zSWW6LYMWb093VXb+LQw7UMoYanVcbGRyizNpkLNetNtYx20oMtICMGxGtbLeipA0SwIeMHZvK31+NFFDgIJtm8YyY4OhJ7JRG/9Gk5Kh3aaW2WE/Gh/iIPa3SyafFPFES3m+IpQhN/vnKuAFmb6nLvRcK4wqKBh+2h6BZrJSILg== 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=hZora/Zm43hZ9643nj+hTtT2IUx/bOkEz1T3ktd0VFo=; b=ptS1VYrd5ALU/JAslmO+nzLNDKWiBF0+EtO47vt3a8jj9gGeFpQwBki8HJukZHkv5eD+XhnS9krnUyX70e990d0gMElhwSUNYd4Jk5b8nrv7wTZjD7VRv2U/Kl6/1Y1qhaC6BkMKjvL8QngesTF90ayM77UC0vpLkephukJJ7ppIXfQxO2MfKT54LkRdBFIDhdfNpoIjw2D8rWKoYk+wk+mZc5lgdEBxuDBwNBKXzu6bfSr6wch7oElgHnfmev1bWrISmdKAVQqpyZJNmZM2rEpbBQOytmIjGuxFXtoWxeXSofPqkVRaN1FeypRx4BYagKOO/NDnzIXltctg1B3I7A== 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=hZora/Zm43hZ9643nj+hTtT2IUx/bOkEz1T3ktd0VFo=; b=uF/Kr8adLD1H137VD8JLJRMdGCdGN5LRUk2OlNwlux0aV7hxOGZwaTdY6OKNMLw/F2pWtr6pzyX28CvrLyemKk9tVhhMPvUp+9I68pAUSJF99c1XY32GZWxCd3g9BhgC3Rh+lFWcgtSzxjYd8DE5NO52UFjG9/pHW8b4RfMZ3TE= 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 Subject: [PATCH 4/7] hw/core/register: remove the `register_finalize_block' function Date: Wed, 17 Sep 2025 13:44:45 +0200 Message-ID: <20250917114450.175892-5-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066EC:EE_|MW4PR12MB6801:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a3f1090-fc67-4009-8522-08ddf5dfb5f8 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?x/iHGVXAzN7rjfWQm3kkdrsOFCeSLEnXYEUCGrovXjdJf6u9c69CkzhddjGt?= =?us-ascii?Q?FlmnV6ON8RSrYWr/5rw/IYYjdmNEX3o9A2EO09CG/yBuz69/vMbAEK6dcjKt?= =?us-ascii?Q?d/UNG1M/+4p+tS8XBJfYfsmLxTPldDLvIDAFQuTkPTOW6JcueYOoqTEV5kMu?= =?us-ascii?Q?lRcbkdGwS5ywRBTVkIWiYq7TXYxE/L3chJhEeXCeGiJ2YdLlhCtOGISeJjtf?= =?us-ascii?Q?J7mNESdYMfI3Hwdo/5yQ+5so7hNpSJYI8EW/jP1SHedODdr0laF2+2J/Tdxi?= =?us-ascii?Q?x0/XpLFoEB3J6NeUlXaCgFFCKQQLwyKIFUIPu0hEcFCyP5jdBfz0h8Sq7h+E?= =?us-ascii?Q?jqiu6kEIgtvSwiysoZagF4zXPhJT7KA1PHDKrtx/HaAheHnmUyQxvTJJklwe?= =?us-ascii?Q?kjyuMQ9OqrXfeh6Gtz4NIRSEDcK8ydrGthMz6p4h9X78uW03krsK60qLF6mh?= =?us-ascii?Q?9VGFmoGPbna+scV4bVBO0JVCqP+g8Y88YZ1o1HKF1vYnL7o2UW8FtLpthoDe?= =?us-ascii?Q?2KMAYTEn6/Iwor24SFr+xc2o2KDLUGI4NTZrbqZrk2mBdrBh9zMF8kH8AfpE?= =?us-ascii?Q?lAKSRzbOaBTrv4EQRoM3bokVIqU259JtMY35jrHJWzW1W69JLJsQhnllW7tO?= =?us-ascii?Q?N75VLfIiBNWyNpvuIpxArvUuvHD3sgTamV9UIy3V21fYO8POUbdqFnvN6cOV?= =?us-ascii?Q?lRdXMdfZToHOxu6pQeHqpva8roPTbwF1U0qL8/Pyl3por+2CWGVQQN26naTa?= =?us-ascii?Q?AfPlMXVyWnYXxHZTgzMZMgaaqgtRTQBaYR+FAjNPTlOzfxiVSQfJ+Us/u+24?= =?us-ascii?Q?qgvMTy4bSf3qubx7AV3/ANeEFTD2ylyTIe8DhzK2jslfAMhqAbRmZPVuaUHi?= =?us-ascii?Q?bto+jPqJ784z19CdqQz+dI5bwrlqsZxC7amVec2ySlZ/BHt+MWrBLElVEnTm?= =?us-ascii?Q?KuPjfdFovEVM2vdG37KldUOYKSldJtxMigbu0wQd+WLutsMgdu+cW06G+/cN?= =?us-ascii?Q?Tk98YXFpe3dwEjainjUYbtpGiLs0/iSHQZhFMsQtbBMTfgv5oPVZu0THyNBo?= =?us-ascii?Q?NtlmoVW/8BfJcjx0uc1/Q/3iBV2/Cp0p8cOwVS3z+x95SAo9Kl6XDWeK5SoM?= =?us-ascii?Q?gEaLIPKGA7Bxb5JttlXWroBJwybwuiA68Hm7qO4clkREsGIfwNfJzQ2ERTeX?= =?us-ascii?Q?In40vTmEWiJiPpvrAC1aBN95dsNxyi/RfsSz/y1nH4Yh1YZc8xo5MFXa8KSG?= =?us-ascii?Q?gsT3FGVhaz6qG04alM0ktzgvKjILDBnrVqeyVLxEnrdecYpL3Rux79wQd9xd?= =?us-ascii?Q?ztv4huTZXSBnhFpIAKlqmRG9zoQ0YRx6xOmFNYsAI7UzOWavqCtP8qj3d2q1?= =?us-ascii?Q?dLtrDZ6vOw+bQpD8jtfd2KoxLDUnBuPw/OVFxaH1DCFAhOJtHT4O88JWDUdw?= =?us-ascii?Q?jPEhcPpWNYJM2+LoV2lRPR6ny4yY2rI9KVHao/KNWKGLW1chdenEdhVIJEms?= =?us-ascii?Q?+0qnrySfFyRIa4osv9ULa1srdq15Pdh8xDyz?= 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)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:33.4613 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a3f1090-fc67-4009-8522-08ddf5dfb5f8 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: CO1PEPF000066EC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6801 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: 1758109845583116600 Content-Type: text/plain; charset="utf-8" This function is now unused. Drop it. Signed-off-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- 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 4d1cce02a55..6cfcfcd2b14 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -321,14 +321,10 @@ static void register_array_finalize(Object *obj) =20 object_unparent(OBJECT(&r_array->mem)); 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.50.1 From nobody Mon Feb 9 11:33:55 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=1758109774; cv=pass; d=zohomail.com; s=zohoarc; b=QwpC1lqhp7R4bapW5n6WW3s69klgNY6DSUD7yfY+ipFhpVPwdNXMtD2dKtbTrj3ejRW3XuAZLEMWRjWs26oz7kzbwbXmT7Y3yiFgls7TMvFWg7jqsWPTOFynpjtxoMQV/JLFYWdzPPFe9a5ZuV5sy4+NmPlzpZNZLnNN7IcMWQs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109774; 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=4/rcxq6dXn3caikwL7HNdBBmWKjn1cVcanwIg8h3RMg=; b=U2DjQct5XxQ3dPCrUPeSUsCEnYKMiElj/2hxtmlk2zDyRga0Gz5w5wqPtuiCtGqgNhMOZaUF3KPuAws7ab/pH4wyEX7XLBLp4XAoL0fabcQs4vqQT91a3Z39pB7N6RQ7S6shNWZZ4BsXYscDgr98wR8OG4lNKSXp45D6r5+Z+6A= 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 1758109774454937.6945759462643; Wed, 17 Sep 2025 04:49:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqeQ-0006gy-T9; Wed, 17 Sep 2025 07:48:42 -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 1uyqbQ-0002me-KN; Wed, 17 Sep 2025 07:45:38 -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 1uyqbN-0001rX-06; Wed, 17 Sep 2025 07:45:34 -0400 Received: from SA1P222CA0122.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::17) by DS0PR12MB9446.namprd12.prod.outlook.com (2603:10b6:8:192::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.23; Wed, 17 Sep 2025 11:45:24 +0000 Received: from SN1PEPF00036F3E.namprd05.prod.outlook.com (2603:10b6:806:3c5:cafe::4a) by SA1P222CA0122.outlook.office365.com (2603:10b6:806:3c5::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.14 via Frontend Transport; Wed, 17 Sep 2025 11:45:22 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF00036F3E.mail.protection.outlook.com (10.167.248.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:24 +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; Wed, 17 Sep 2025 04:45:08 -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; Wed, 17 Sep 2025 04:45:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yLEc/nDCOfraNeQEvW4qOmP+IwjlixF6cFYdNwEDJMHday0vg+sgRPx9eofWRQKdMzUMy3Z9ar5P2nEWw+e6/868sQGICd1Hz/116Ma7G9Ne6NQdVRaPhxR9dT1EWTOoNWW5bO1NAYrJPFEoQwr0VqoG/YJMj7AXBW8JSv2SNlP8ks0iABNGtH9FIubbi8rQjEVsLwBKnlHU2dCYiVy+eWZvjrfzn0C69BKpR43wgRVrB6obU0h6MF05yOMhW6KDz4KZCpyL4JXLElkrM1r4DF/cWS5FKzFGBrqfr+taILtDguJPvNupXY+jWz60wqCMy4fL5tROdXgAXa33RkeXUA== 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=4/rcxq6dXn3caikwL7HNdBBmWKjn1cVcanwIg8h3RMg=; b=nDVXjRwtJjdzOoZEzcNsx6ySqnalimF8uMN+TvVV8dhIie9GDmpPDjHQly+2YDzmTejkcqYZFcEQroEjgsMhUL31YWQxP5kbLzKDIv+ySM3XFiXtWX/j3UhJBttaDq65rQ0MebJjh4PVESPTN12Lr55b5lmgcTLku7eOT07R6kDeDWfq0Vdb+ZG0GGYh7GEu6JTZmy0hDTY2PBbBAdIF4EqqnVDZ1P1nX5JGF0KvQf24GsBk4JJyI+607rElq21YPLOS/0rlzdRtT2uzyRscWvWy1fRAC7zcNGxiKAeD+k23+nRsCfRvm9ALIUigHcbGGCggAYRacq303RE0wORw/A== 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=4/rcxq6dXn3caikwL7HNdBBmWKjn1cVcanwIg8h3RMg=; b=02ELhJ4Yno6vcjNfJeByqNlJBon00vHEpK0v7+5OQB0BelM2pEQR6gAjq9OBoGkTrL+SdSlbAg+0G8yx/0GesjLx+UGvqwk7ASzukNTof5Lb6d8vp81kOKjOg3Pm3GOUCSGPLJQSr55ceB3XPAqI/pcgjgwmi1eAl4eo7sFhSN4= 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 5/7] hw/net/can/xlnx-versal-canfd: remove unused include directives Date: Wed, 17 Sep 2025 13:44:46 +0200 Message-ID: <20250917114450.175892-6-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3E:EE_|DS0PR12MB9446:EE_ X-MS-Office365-Filtering-Correlation-Id: 5af91353-ef2b-4780-21f5-08ddf5dfb06b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uhH3MoJiEjfRUCeimP5ce+JIdy6qYAUzTC8LDiKerkdQTMM329ur8//bnjMT?= =?us-ascii?Q?IAplC2gAcS6fJky7T+OuTBafcIYsdLX2i+LTvtDnqwHUS8MMSNf5tFg6rmJC?= =?us-ascii?Q?DMSxVGPAG8RPkBT50pmO/9uf5VRLB5/EsW5WAR40uoVj4OEdkGxU/BScKNlr?= =?us-ascii?Q?Vs2F8SyOxzukBQZRHIlCtCQxjUlsc8nSs1wYgPEI6Xacf4WsoNiKi+DSKpz6?= =?us-ascii?Q?idMt3hbvJISWkCEJy08U8kLiytC+hl0OLs3SXdnvpERHUS2PJs/06HB5BTlY?= =?us-ascii?Q?vLc1JZ8XYYIuFoijpZyvIJhXz+Hkjs7NfCIChITgNzLaNUxHFuXwomsqxVUM?= =?us-ascii?Q?MUGvCJWqoyrza9ENBfTK3iZdEcpuTUZUlp3TzCPoENXNvuYN2x9cm5CHmsth?= =?us-ascii?Q?AweJNeL5bLmenUJBsMFniKcibCS+WUs9MoQ3I0eCQqc6Sz91u2whkGhQzLlH?= =?us-ascii?Q?4q3Wr4Eo61NAEX8/h+1+dLPpfRKEiixvmGAnpP1zxS1v2vE9IFn9aMGvE417?= =?us-ascii?Q?kDP/57j3BaqdmN2FofeSBe/NsQxcPmRMAnNPobqpDJD9xN2lNknT1fqH4Xxg?= =?us-ascii?Q?6ndCGxKZTxilejtkn6xzAUkZF6yYsCwypLxCOI3VnBXG/iDRSFcwoOdbKM7b?= =?us-ascii?Q?B69dBsuE1KA6zYk3GBhFxh3rRWCzsg8ISiQa0KP6ofRK2gCizP4K+l3x5hNt?= =?us-ascii?Q?KrhqnC8Ht5GxO+SWX0wJ8phYg0oIff7XBGsOaDHxE7equRK310FCRMUEOQw8?= =?us-ascii?Q?wrgwwwYE3wyEohDqpUcgNDVEn3UkW/JhXO8RBmFC8zzOTt5rmTYGpDyILpoR?= =?us-ascii?Q?xcoXuYTTcaHlY/i66bRL3Mp9/KRH/wTmOSbkN0ntELJQYVcRi2guR8PRhIWU?= =?us-ascii?Q?Xcuep/JZq1cqBE00qqmUaq0lo3z/M5la+sICyHYzKaEpo1hl4mZSOAs2yj0L?= =?us-ascii?Q?zVpKSxNI5YDoB3gP02S6kDSc2a3o2VVtYrbuhkIYI5fySbu5B2jjhVhf2oYD?= =?us-ascii?Q?QjI8lOzM9Ire4kcPygDvrSxhdjapTzPr5xY3m/GbOfgaacOaye71McUOjFHB?= =?us-ascii?Q?iUNvyLdEm9db4JwRpVbBIVq89lx7vmHiwXKRx8nP5h8m3rLfpQFwztqCgq5T?= =?us-ascii?Q?1tDQ3qDKlj1gvMD7eZH/PoLA1BpP+dsZhZAicGwMMTSAEbqGrLk/icLK9JR2?= =?us-ascii?Q?X+zsmhzAMFAe0NSIoDvM/GWIfNRf/QXnhnmbwaE2AiZ+FkUUns/x+5yImBoC?= =?us-ascii?Q?YOPqSa0cpgRu6xcg7PX27hVmEBGtrPVnifoDzclVYyNbMnDNbh67YbmLqq0s?= =?us-ascii?Q?Q/4RmWP2tDrkI19OE/dM6JG/S8LgxI1awGNXHdJAR10pRaBFl829868/835s?= =?us-ascii?Q?mw5bOV1pWhcvDKbfujp5eCas4CHKb1pNvdB9F8MbAmZIwJUKjYO0gzEYibht?= =?us-ascii?Q?wi0NqGMfEJNcpjaX2Gs+yXW+MU7uxtJrI2t7mrMkHAPc/EUm241FY6tT1/IH?= =?us-ascii?Q?H+H/304OYfstRcqqSQ5POkYlCeTxBWkJaMZ/?= 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)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:24.2179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5af91353-ef2b-4780-21f5-08ddf5dfb06b 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: SN1PEPF00036F3E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9446 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: 1758109777183116600 Content-Type: text/plain; charset="utf-8" Drop unecessary include directives in xlnx-versal-canfd.c. Signed-off-by: Luc Michel Reviewed-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- hw/net/can/xlnx-versal-canfd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 3eb111949f8..343348660b5 100644 --- a/hw/net/can/xlnx-versal-canfd.c +++ b/hw/net/can/xlnx-versal-canfd.c @@ -33,16 +33,12 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/irq.h" #include "hw/register.h" #include "qapi/error.h" -#include "qemu/bitops.h" #include "qemu/log.h" -#include "qemu/cutils.h" -#include "qemu/event_notifier.h" #include "hw/qdev-properties.h" -#include "qom/object_interfaces.h" #include "migration/vmstate.h" #include "hw/net/xlnx-versal-canfd.h" #include "trace.h" =20 REG32(SOFTWARE_RESET_REGISTER, 0x0) --=20 2.50.1 From nobody Mon Feb 9 11:33:55 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=1758109894; cv=pass; d=zohomail.com; s=zohoarc; b=gp5Lqu5a70P9N/z31Fjeo/j628gOVSwZrHAOqegb3FdtNzQBtZVMTMNu5uk3U0mAuDYR8a+ZBUO3IxKiqIkSHS3CsA+DB3xUN72O/YRHu8NFBboohzIDt+/HuWE2u4+gAtlwcPKYY6aDCGJ+0kBdYmt8hPqYbCANOaqcnfZUqSM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758109894; 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=jHLqCSh80f+pJzfPw5wqXSO6whRkVPN9ypm0TIK6AU0=; b=brw+XKRqc1PKzaDETaLHlbU2RCTIObUpbfejxOUsHJG+MXPEPqPU2/DWqNjwwViytdO2OnjdwUur/AeYO4nb6j7s0vJCwBYg+zm8mL0WAYd40Dt8XX1yKLByng9ftnAVRG8IM/xB+3VetSma1zTaJwQq9YuCJ64MO1pC34I6vP4= 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 1758109894199669.2963812617717; Wed, 17 Sep 2025 04:51:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqh7-0001yV-Us; Wed, 17 Sep 2025 07:51:30 -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 1uyqbN-0002ll-LP; Wed, 17 Sep 2025 07:45:38 -0400 Received: from mail-northcentralusazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c105::7] helo=CH4PR04CU002.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 1uyqbK-0001qi-CI; Wed, 17 Sep 2025 07:45:33 -0400 Received: from SA1P222CA0106.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::11) by SA1PR12MB6798.namprd12.prod.outlook.com (2603:10b6:806:25a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Wed, 17 Sep 2025 11:45:25 +0000 Received: from SN1PEPF00036F3E.namprd05.prod.outlook.com (2603:10b6:806:3c5:cafe::82) by SA1P222CA0106.outlook.office365.com (2603:10b6:806:3c5::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.14 via Frontend Transport; Wed, 17 Sep 2025 11:45:25 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF00036F3E.mail.protection.outlook.com (10.167.248.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:25 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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; Wed, 17 Sep 2025 04:45:10 -0700 Received: from satlexmb08.amd.com (10.181.42.217) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 17 Sep 2025 06:45:10 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Wed, 17 Sep 2025 04:45:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b0jHB3GHyD7Ay1AUliJREH8fmC+kdhTZCpSWRpFtVCI0RARDChO1TxjYmlETjrucKG0/bjxeFMhAafRPREIOGGn1ydeLvrmxWq0qBb2alV8hj+b7LjuNQtpRJY26dr740iTSNnwxJfNsWoC5mKWlWIE9Pocef9M/gc0dpaXn1YrD2oYcNEcINvMvkxPDTkHUy5ywWcWO1lZtU9Q1hGvvhn85i5fJX/W19dr+3Ol//R8cSPJLx/F6Oy7mqK4UTyEM7jLHFWIfBmZXFNrlLiP62l5jVqLzAoIA57tElu6hZncv1AIHxbCz5m/vUer5bSkbuaVTGYye7NahMk/qvSi5dw== 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=jHLqCSh80f+pJzfPw5wqXSO6whRkVPN9ypm0TIK6AU0=; b=DbVP0VIAO01CYQPaZpSrneisnRrhBH/bjpfGwgu5g+ZzuAWUvhIaR7oFL1IGIbPmWi7b15HjKozeJjMT08J9ehJoEK+BTRl/YDxOloGcmOF8oCUBj3uyBpTg6vF/s2ZGNR+UkdlIadam4jHDskqGJBNWnQ0hnmtBMr54QPLqqp4Z7apXvvNz4q6HmH4Z95+olarZgsLc9h2AegCnh/+rKboYVvMw9LsJjef1Xnyq+KbSIzkKOEJPpRwND62vHgcq+UErEfclgKuwsqaumfJuuUOrCTSGdR4RFQPeKhyqZ3F/q37board5npGMHB11GqcYmwnARZ45TZN4VxUtlgEqw== 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=jHLqCSh80f+pJzfPw5wqXSO6whRkVPN9ypm0TIK6AU0=; b=UhkT3g3WkPTHnN+SIkEkQJJYp5NV8SBOEcGiVeAVnLqjEXQKMPym8q830nHpY1P5mJWtMRKHFJy0GrP6hq15//5XICH5wJeXFbUl/oNgHRdTK/x7G5QYgRYUEeK9VM1pUjgj3iT9B9mzvgfWyYwjO1LhWWxSF9vagehttHXkaDw= 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 6/7] hw/net/can/xlnx-versal-canfd: refactor the banked registers logic Date: Wed, 17 Sep 2025 13:44:47 +0200 Message-ID: <20250917114450.175892-7-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB03.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3E:EE_|SA1PR12MB6798:EE_ X-MS-Office365-Filtering-Correlation-Id: 2054cdb9-667d-4614-1cae-08ddf5dfb117 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?/+oydm2vi30jO1sIvOjt0Ch5kByr7t8DmaDU0faRg5muajkIimvhuN3XWSYC?= =?us-ascii?Q?tLhsFWS1hpYWUY9cjbtKbDrpAkm7DtNb1omOTUoVHi8c6CVpzkJNbjnxLSvZ?= =?us-ascii?Q?7RIPu8LIooh7RqVJbDLeeF9wtrmyWu7eBa7vm8INDBg3Cr19SjmzPTmZR8ro?= =?us-ascii?Q?u9SdcfSQ90l2NOBA+E9dB/YwsYx/EImHu64vY+8IyLpigstxyBnax2/rsp0O?= =?us-ascii?Q?eKTNmZKqbsrGsQJ1flEFRRyV8CQxfzXLuwVpXcdo+ZHzRMjHTY+oqvl1/Upc?= =?us-ascii?Q?aD6ixPDd/02m9aJ1l9LL41ZKz3B8EnlniY/h3iuVrEjQ0h3LbuQsE5yjPGQl?= =?us-ascii?Q?LzjafNqPZ4g8BMhfZsKEbTgNmVEHSsOfAOtPPsiq8+qSjuckOtzsyrz2ydET?= =?us-ascii?Q?asXFqA11IjtpzFA4swtQAks2ZsXfhI+pljKvCKWXmp2JjTQjcANHg/OoU4Fj?= =?us-ascii?Q?tNarrU/uC8XQ9XjSpVQaZ1LFoFmjQkLe2q8drT66CbXwKy9QEtI2HoAaRhDZ?= =?us-ascii?Q?Q6jw51baOwRorIEu5h/LOMjXpNuLCoVwtpidXHKC9NRvNr551g7ttbgFcSn+?= =?us-ascii?Q?oNgLyfJcNgwSxev+nDlTGsbxq6pg5/tPjrB5fCTWgxgaQ6WEO8H9mTdEFXbH?= =?us-ascii?Q?dTL5ZZdUiWbciv6hMJrpVfHi3PW932X/B4z8lFIwqoXK5BFNQ+mFCaSjDvD3?= =?us-ascii?Q?WRia4aAT9TBJa7UJc2SkdVk4tdCFzYeeYBKro+S/FwFWGgT10DqENsLpnEGK?= =?us-ascii?Q?LKtaE/pUehG/Cx4HCkbh+bG2AHl0QLk/gRB1TihMtmvRk7LhYYqpDxaPfyMv?= =?us-ascii?Q?5FJsEJFwCUj04HbnGCZywmH9dZWAVbZ2nCxQf89f+Q2AuzcxQP3YS+qWpxOS?= =?us-ascii?Q?fP3HqkaJAQ1vW/wt7im9TcYLYodfGFKohxTYRrl88WcGxWT3h0D8Qzh+9KLO?= =?us-ascii?Q?7Q0iTFRyiTtPbu1GMAG/5x4Nw1PsKvVEqB+WVuEnBTzh1KaBc5SVv1TQu+U3?= =?us-ascii?Q?LwRl3zA8SCEkAFijBI10kkabUdbUoo/J8KnU50laJX2Nl/LZTql7CMwJe19W?= =?us-ascii?Q?PWgaZ1EW68+c4Y5UWSBfjeJwiyvb3H3mEeSdWIZebD9hsLDUnFNRjZhLcrH6?= =?us-ascii?Q?0gEi4mpThnvzATnCQVwlJEO3Hyh1FAdaEUTkfwTGr9wvndlOd65VSRn/EeD6?= =?us-ascii?Q?+SB8vzWV3gckm20flvh5HLLAlK1Fl79MfYuzqYizNgvh62b8zh/UpMhXblOy?= =?us-ascii?Q?ADQ5QlOXGz0pZ4yDFvKZvlxqN8UjoJVuSTLDrLif/7hPA2lxOiAfEOXc/zF3?= =?us-ascii?Q?3t1FtBQohqtdlLkSRQ4cDzouxYx6mfOkrD4JAHbre+Rk8/EC8/nlRNs6xRB4?= =?us-ascii?Q?8A3tGnb8ZqOq1+kC2wt85+DkxdW8vMSF9csp4k99BqHNVScIFZKBQuMSM8N2?= =?us-ascii?Q?uMHW51aZVtuEzlBw27hr1jZZPvY6+TJalxWGnMJMjgqbG4NqZpEgpXODQiBB?= =?us-ascii?Q?9EDk9+IxSMJfF594YZNVliN2fHZp0AflGAB3?= 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)(1800799024)(36860700013)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:25.3698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2054cdb9-667d-4614-1cae-08ddf5dfb117 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: SN1PEPF00036F3E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6798 Received-SPF: permerror client-ip=2a01:111:f403:c105::7; envelope-from=Luc.Michel@amd.com; helo=CH4PR04CU002.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: 1758109896706116600 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. Signed-off-by: Luc Michel Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- hw/net/can/xlnx-versal-canfd.c | 155 ++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/hw/net/can/xlnx-versal-canfd.c b/hw/net/can/xlnx-versal-canfd.c index 343348660b5..81615bc52a6 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,11 +1778,145 @@ 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, size_t *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 canfd_read, + .write =3D canfd_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +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, @@ -2018,12 +2169,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.50.1 From nobody Mon Feb 9 11:33:55 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=1758110004; cv=pass; d=zohomail.com; s=zohoarc; b=GoIxsRbGx1JyrlDAccloTLLsNvqyos7Tx92CSn99aaZuFjcZnXXmzV8GGtE1RZIoD+kkYI6+1xuY5ecxTK51KVE6rwj2woNk6PnlrF9lOrde8gHpDQuTs+LBGtksfj5iEQ/HXbfzHc5GXgkfaZPyp3qgvCBE3MPpPDyahIxD3s4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758110004; 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=eMOpl3qNEntTC54I0UrCVD134WsVhW0KTLcb3rE4Rpc=; b=nAY4A1BTq4yt9I8HMdKLAuNZ3cuwyg76IBRbGpNvoj3mkzd3IM2JCu5NwA+fFagxO4l8tQb+Qkgs/Up1B5Fu/hw7aSqcfbu73lv5nVe+/IgkthtUJGKKMBVsdBVZl7eDPhqSY0LnVGzL6ysCul80U7mcOLlvhOTpbcXanxK5d90= 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 175811000420288.82043166037363; Wed, 17 Sep 2025 04:53:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyqhB-0002KN-JM; Wed, 17 Sep 2025 07:51:33 -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 1uyqbJ-0002l7-Af; Wed, 17 Sep 2025 07:45:38 -0400 Received: from mail-northcentralusazlp170100001.outbound.protection.outlook.com ([2a01:111:f403:c105::1] helo=CH1PR05CU001.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 1uyqbF-0001qB-Ox; Wed, 17 Sep 2025 07:45:28 -0400 Received: from BY1P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::10) by LV3PR12MB9117.namprd12.prod.outlook.com (2603:10b6:408:195::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.13; Wed, 17 Sep 2025 11:45:20 +0000 Received: from CO1PEPF000066EB.namprd05.prod.outlook.com (2603:10b6:a03:59d:cafe::e8) by BY1P220CA0003.outlook.office365.com (2603:10b6:a03:59d::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9137.14 via Frontend Transport; Wed, 17 Sep 2025 11:45:20 +0000 Received: from satlexmb08.amd.com (165.204.84.17) by CO1PEPF000066EB.mail.protection.outlook.com (10.167.249.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.12 via Frontend Transport; Wed, 17 Sep 2025 11:45:19 +0000 Received: from satlexmb08.amd.com (10.181.42.217) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Wed, 17 Sep 2025 04:45:11 -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; Wed, 17 Sep 2025 04:45:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oxuuDhOcm2fBuFkLqC9o1P58yFSqWl+6wRm0OXvH0pzNPcmJQTIp4tXag7IvIrGjX56AeGK7trWvVqkIvowIIzh9uq1n4xVr5PrBIiv8aHSN1u6zCLOC8jbUyGyzkCrxPqV8y1h+ZaNq+2xk3+RKeLSpvR+v/396rSph6F2iqGRMwrENSGpwjWqb17pztKWLmVUEsCBfhAfWqD5blbiXJYgk0qGOgyABa6B8Xu1po/4wqR7KcCqx5AkmuReCeM0+mRSswsf3+50127r3wnAaDcCXo4/CrW4NP/inDFtyVDvL5Znhq+SuiFmj7M/JOlQGI96aHp0J1jg55WXBxi5olg== 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=eMOpl3qNEntTC54I0UrCVD134WsVhW0KTLcb3rE4Rpc=; b=y5o+kBCjs/gmqWLcP6qQWUvaqFQDqYDf0thgOHokvJ4Qg7/1GF/YA+Z7pZ24tpZMRm1tfEGubzKMHXOf6z/RcxqKkCrbJWCn19bxZfrjXV+vFMN16dchWydjuw5ypV0cqtPLQEZe0AhAb0nfYKm4lU6SQRaOJ7rnPNAUm5dsKzZaXYfHgjbyK9dCcPxYKL3MEhEW3fqLe2lp/QNNEBi93cdTR9Vsg+IBc62+Wx9XA7930yqKCn6B5q5QaZThmfVrG0g5DLUW1Sj1qrOwDoC39kuhZVd3w9bjalwLQqbIUuaAbirdSJvDgSx4uX6vDtYO03gmMc95gGdQu4VkwxYHFA== 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=eMOpl3qNEntTC54I0UrCVD134WsVhW0KTLcb3rE4Rpc=; b=jIsU4ZeB47CoXP3AMGVIC6k06V60B2f6Dlg1dOUzL7mG45wDgL4YJn+34FjyW7eucKOVMTd1t50HusXqFSza2ov6H0uCiIyHauGm1ZVTqN0sIeAa+DGz3HXTKTDHCnv87aa7ovSktntLToaAzJSRVjqMRxOW3vAF0VOOyhi6MCU= 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 Subject: [PATCH 7/7] hw/net/can/xlnx-versal-canfd: remove register API usage for banked regs Date: Wed, 17 Sep 2025 13:44:48 +0200 Message-ID: <20250917114450.175892-8-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250917114450.175892-1-luc.michel@amd.com> References: <20250917114450.175892-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000066EB:EE_|LV3PR12MB9117:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fc04aef-e632-4d92-ddc9-08ddf5dfad6a 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?EYhY3iqSzpUCCx1Wm7Cunx8wLbslHh3jnrDSzmGebR4ZTKm/jHWR4ifse6yM?= =?us-ascii?Q?HNV04wwdIfWyVfBJZjkS2Y9ih8We+9R+CiR+GwMOE5FSClfK40oo06Kv3z40?= =?us-ascii?Q?0piS0VKcIhdX5LlVu0wxMqSnOZSEbO7MlBcZfpSR+UZxeVm8I4R35MA3OKa9?= =?us-ascii?Q?l5NWG+RakH/atrMWlnepfq8wOXewHxYzOlVYRRhFd3ul7OMSDtfS2Zy6+vj9?= =?us-ascii?Q?5dI36bg61uyls1MVRJ/QtGLBmJTtVtvmqROi3GfoeGpxVfMTTx5a5uEaKoYb?= =?us-ascii?Q?P7hPn/Ly1zyQcfcCH6qtbCO9pRNLlWrBLvd4N23Ko77rQk6Z7PJ4NHxdOaVF?= =?us-ascii?Q?NepNLgkRuHGTxVreNJzmXEj9SmX5O0i+EAvd7LXyJFVQWXeOn3d8D2b0Nauu?= =?us-ascii?Q?gENq7KA0x8HYIFR2X1brKGo1dNK6D2CVak9f+3Ktg9GIig3Oot775eA+gIM+?= =?us-ascii?Q?/W1pvMu4j5IAZmcCuIZcZ1SHk11SZd7nDf22cCmZ3hoZDPwy0aQ5K9OvFOrG?= =?us-ascii?Q?zM7+4i0Hx7j4rF6AnQf5bMi1zJKYO2iEgYEDI40GYAq216TDK9pGEBsVFDAB?= =?us-ascii?Q?99pjt06vF27mUcp4Hka9LE1+q5BZIixge7uSTX/S5NBhpjemC+jzOLg8kZZg?= =?us-ascii?Q?3EngnlLu5/3/AgfRKdLfkMTqpOxuHIMbsYqtgNHPUipCFgouqoGcSRXM78ra?= =?us-ascii?Q?/2guN+X8MgxuajEStkpBZWpK2HNoralGfTHzahkprdJFJQH9+L/PWoEk3OPD?= =?us-ascii?Q?yc5JU0mzH9fgG161qTHZ7g7Y7Z6+bayDknWFdA4pASK9M6WH4mozl+zvgOK7?= =?us-ascii?Q?+he1WDDchjFFbU0OPYEtL1ybxST/ScRD8Uy1kiLiTrbusG0oyCLFH5pX1XEx?= =?us-ascii?Q?TIi+RyKNkQq5KnB8MDS8zc9qdkZUrat9oNA+zt1RBV/INbKkesWNTe2XS4j5?= =?us-ascii?Q?R4JlSNS4Efoyjpo6c1n5MrcBcNFph8LEiFNrZv6AphMyZCNsEYDtEdbn6sDd?= =?us-ascii?Q?WrQjaKZGk+a8dkhn9V/sx6mB70aZ0ZR9eNmdHbqrVO5771GAEH3O4+dkk19S?= =?us-ascii?Q?JlRDh+jSzW8JmizTfbDh17WhvN3iv3TNjEVmqAG2g8u5optS63QnVNV7xGjI?= =?us-ascii?Q?jHEvA/mvkPP2WiwXB8MII30aFgW6zC+7al5K1I4YXFI8O1fMzTMkZSu8e02d?= =?us-ascii?Q?sz9nGdXV2YZO4TGONE+6oox1UeqJ0keycSDFqJjsu9CXQ6SI3X44ju8CzBb/?= =?us-ascii?Q?RHmUAsFySUo5QbAvDXz3uEgGkONWmMvDPttt7FCAiWeo31Am9DjRKANDiJed?= =?us-ascii?Q?mlxApW304NvNzKB2QbgBfU963xMsRtkPnJkhb4wbdQc2LoR2VBK4JUoE23B0?= =?us-ascii?Q?SBaYyrNx3YvPFz/k4o2w30hDHYAbFb9AnP/K+3hKUtl9ndKit2zoNt5iGhg+?= =?us-ascii?Q?mJqz8QeDr69iVjRfFi1NaDTA6XddebrYmwN3/pssTT5Ss0oCj3N4paXFKQRQ?= =?us-ascii?Q?liF8L/9yYgVXlYaPPWiQVKPPax4bstmZbNxY?= 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)(1800799024)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2025 11:45:19.1622 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6fc04aef-e632-4d92-ddc9-08ddf5dfad6a 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: CO1PEPF000066EB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9117 Received-SPF: permerror client-ip=2a01:111:f403:c105::1; envelope-from=Luc.Michel@amd.com; helo=CH1PR05CU001.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: 1758110006210116600 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. Signed-off-by: Luc Michel Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias --- include/hw/net/xlnx-versal-canfd.h | 8 - hw/net/can/xlnx-versal-canfd.c | 295 +---------------------------- 2 files changed, 5 insertions(+), 298 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 81615bc52a6..49f1b174b70 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, @@ -2001,146 +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]; - - 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), - }; - - 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.50.1