From nobody Fri May 3 20:58:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+92487+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1660682791000820.8289720435163; Tue, 16 Aug 2022 13:46:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UH1dYY1788612x03UhxwikF1; Tue, 16 Aug 2022 13:46:30 -0700 X-Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com [40.107.102.88]) by mx.groups.io with SMTP id smtpd.web10.20884.1660682789691034580 for ; Tue, 16 Aug 2022 13:46:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IXYtc8myntTiiUjMzswz62xVA4KBl3jr0H43XrZK3/w4Qxa61Yej/bCKAspw+6fTKqb3/4f3NIAtqGDWvXsMqndjOpPw8x9LmRiyemfXzCv7yDX5LjD6MrC/lS//fZPs7L/iEShP4ToT668LBdrkP8Eb2VhTW2m3HP1F/BL+xBIVzatPGGAS7/Q+9VQke/+KitLi8rxmTccL9fvxWwklaRbdVQKqcEdnrtUOlPWXswl6byTGGL2y/N/01yrmLE/ykQBzLwTy9Exhu3z/UnTehXM0JgDnuDRLhEfUEwyzhR06MdW+nQhEiBkX0qis4lpjnP9mUlsx/bi8wg54JGQq+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H8zc1ZbxMUP1HXxKQ6YOy+vqyJoAPXQqshTh+eo1Fsk=; b=b099I8B+Mv6QsQwj7fXaZvgJwGDJjRJQisGTt3VyFSn9ix1lvMb56Imdy4ZhJCl9F+KmfNZNmpgR7tp38Qqv/YWFuuySGPKnupNRnyj/k43Lntd5eM+EdQsUwE1OzBMG3Oip5fYMF9pYn6hCueUnm+Y8ATEw+XjzCmoc9O8FHDQ+gsXKYWI935SvdGSWsKLlI9COPz75VFeiceuBpdl2SaCK5Ufge++4NxbIx6o+go3bgkdZRifbjn1OLxJthIggBz6/CsQW+aIrzo5AABg78AR0Cz/QLB2G+hiRkcQe7vyGqKoc9BTQXjEtU+V1oQUpqQ6CVL9slwsGC3xM8fpWtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from DM6PR06CA0070.namprd06.prod.outlook.com (2603:10b6:5:54::47) by BN7PR12MB2804.namprd12.prod.outlook.com (2603:10b6:408:2f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.17; Tue, 16 Aug 2022 20:46:19 +0000 X-Received: from DM6NAM11FT062.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::97) by DM6PR06CA0070.outlook.office365.com (2603:10b6:5:54::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.18 via Frontend Transport; Tue, 16 Aug 2022 20:46:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+92487+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (12.22.5.236) by DM6NAM11FT062.mail.protection.outlook.com (10.13.173.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5525.11 via Frontend Transport; Tue, 16 Aug 2022 20:46:19 +0000 X-Received: from drhqmail203.nvidia.com (10.126.190.182) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Tue, 16 Aug 2022 20:46:00 +0000 X-Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Tue, 16 Aug 2022 13:46:00 -0700 X-Received: from ed7fa55790ac.nvidia.com (10.127.8.9) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Tue, 16 Aug 2022 13:45:59 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH] DynamicTablesPkg: Correct cluster index Date: Tue, 16 Aug 2022 14:45:57 -0600 Message-ID: <81913483228a6d636f164831d41424717d46fbb4.1660682661.git.jbrasen@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a6267d0-af40-4f4a-2f29-08da7fc85f53 X-MS-TrafficTypeDiagnostic: BN7PR12MB2804:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: xgDhrzOEIG/kI1j3qJqr473ug4gwg1pTzwgZcxCfgEKkofh8j2aYrlSY1BYbmgXeMQlH5kKAenqP9P7sC09mxPsanmWqhKc38mouIMgohEksHv+p3tDdDFncka3JOW37JX4TiHdzvyh5lA9WwDfvIT2IxaFCZ0YOgzZJkbYiZRBeewQX2qTX4G2eKLCSN2yAPU3LcSqgBE/HXx1ZHL0uHzw1natNKaJW9NKyrtdmIYHJpYDYx3iNV/7zT9iVosGP10lOyE72d/LA4A5RUHMgxLyCufY/BmiYw/EwoQgJPsiVtQcW/jNTO2twvP7qceU7usv27ZcmaJPZD3OQki3g6GHERuOCqF7qikesTBMOalTjGqAOU3lxEVp6j7PmnlKmuabLgRtExc3U3O5XTPjcSsEqcekFdygTZOGh127htrOr1/F9IR239JhizFMJkiY6LA5M05FSBfiDe9tlUDMIYnPZaDrEcrh0c770rdPX473ynXUCx5RRyJpJCop//sQ2PvrPZoiIjX6SYZRMvqSCle+SpN8snYWcIKZVUmyoRg8XsztpJ8/rYF7+/1i6Kwer+FuJoKoDlKpHni+gHIG6cv3Iuebwkp3aWksH48wxdZSrIuycHG7CdDP5aYY4E5DmngxYSTushwsqoGkvMYVJBgaZd6Uj2YP1H0ZMO+rOQ2P7aad1bXO3otSMHPeehL7MhIqordAn2PSwCruOqvvq9M0hHfBUf7s9JGj5A+Y9F+1iEelOoCY5b8qkhCDUGr6AtNZtOVXDO91Js+9F4fersVhzckm08zr05oMVdqmoh6h15feEPPSuT10jF2wKuRk6KOciCFn2QvRMNCggR85jvw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 20:46:19.4414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a6267d0-af40-4f4a-2f29-08da7fc85f53 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.236];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT062.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2804 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jbrasen@nvidia.com X-Gm-Message-State: nNAJWklHkZlTFOTYXhM1Je0sx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1660682790; bh=uU8unllEtY8u+IcvnmnmNRV8X+8jaBRRWWdfBQq2wLM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YHLOCSTN9oJ1ccW4thE8/auVPNUXQySZcL0YZUFufux3MeMvbTatRNEE9hrRV4vlPvC c5h51lXjHtRDngj0yDxat5S84Yh2g6gAQhvsgPpM5kAdWk9dODPlYwU8Lpuqg33pTzYAT 1i5r59B2dU/uJVAh8gzjuziGqpqkEKoVMgo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1660682791554100001 Content-Type: text/plain; charset="utf-8" Current code will generate duplicate UID if there are nested clusters in the topology. Signed-off-by: Jeff Brasen --- .../SsdtCpuTopologyGenerator.c | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTop= ologyLibArm/SsdtCpuTopologyGenerator.c index 3266d8dd98..9295117f1f 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c @@ -706,6 +706,8 @@ CreateAmlCluster ( Cannot be CM_NULL_TOKEN. @param [in] ParentNode Parent node to attach the created node to. + @param [in,out] ClusterIndex Pointer to the current cluster index + to be used as UID. =20 @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Invalid parameter. @@ -718,13 +720,13 @@ CreateAmlCpuTopologyTree ( IN ACPI_CPU_TOPOLOGY_GENERATOR *Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, IN CM_OBJECT_TOKEN NodeToken, - IN AML_NODE_HANDLE ParentNode + IN AML_NODE_HANDLE ParentNode, + IN OUT UINT32 *ClusterIndex ) { EFI_STATUS Status; UINT32 Index; UINT32 CpuIndex; - UINT32 ClusterIndex; AML_OBJECT_NODE_HANDLE ClusterNode; =20 ASSERT (Generator !=3D NULL); @@ -733,9 +735,9 @@ CreateAmlCpuTopologyTree ( ASSERT (CfgMgrProtocol !=3D NULL); ASSERT (NodeToken !=3D CM_NULL_TOKEN); ASSERT (ParentNode !=3D NULL); + ASSERT (ClusterIndex !=3D NULL); =20 - CpuIndex =3D 0; - ClusterIndex =3D 0; + CpuIndex =3D 0; =20 for (Index =3D 0; Index < Generator->ProcNodeCount; Index++) { // Find the children of the CM_ARM_PROC_HIERARCHY_INFO @@ -790,7 +792,7 @@ CreateAmlCpuTopologyTree ( CfgMgrProtocol, ParentNode, &Generator->ProcNodeList[Index], - ClusterIndex, + *ClusterIndex, &ClusterNode ); if (EFI_ERROR (Status)) { @@ -800,7 +802,7 @@ CreateAmlCpuTopologyTree ( =20 // Nodes must have a unique name in the ASL namespace. // Reset the Cpu index whenever we create a new Cluster. - ClusterIndex++; + (*ClusterIndex)++; CpuIndex =3D 0; =20 // Recursively continue creating an AML tree. @@ -808,7 +810,8 @@ CreateAmlCpuTopologyTree ( Generator, CfgMgrProtocol, Generator->ProcNodeList[Index].Token, - ClusterNode + ClusterNode, + ClusterIndex ); if (EFI_ERROR (Status)) { ASSERT (0); @@ -845,6 +848,7 @@ CreateTopologyFromProcHierarchy ( EFI_STATUS Status; UINT32 Index; UINT32 TopLevelProcNodeIndex; + UINT32 ClusterIndex; =20 ASSERT (Generator !=3D NULL); ASSERT (Generator->ProcNodeCount !=3D 0); @@ -853,6 +857,7 @@ CreateTopologyFromProcHierarchy ( ASSERT (ScopeNode !=3D NULL); =20 TopLevelProcNodeIndex =3D MAX_UINT32; + ClusterIndex =3D 0; =20 Status =3D TokenTableInitialize (Generator, Generator->ProcNodeCount); if (EFI_ERROR (Status)) { @@ -887,7 +892,8 @@ CreateTopologyFromProcHierarchy ( Generator, CfgMgrProtocol, Generator->ProcNodeList[TopLevelProcNodeIndex].Token, - ScopeNode + ScopeNode, + &ClusterIndex ); if (EFI_ERROR (Status)) { ASSERT (0); --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#92487): https://edk2.groups.io/g/devel/message/92487 Mute This Topic: https://groups.io/mt/93067950/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-