From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 25865AC1802 for ; Mon, 8 Jan 2024 18:13:14 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=AoLbUkHpgoex95d95ln0UtyM1vLpx/zjZDy01FxM07k=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1704737593; v=1; b=RqjDzZtKYBhpBsCe+W/eMNMgh5wY3i6MgaLbX7zeNEWwlp+UZ10+8WN/SwwtBIriDNNBpdri Lipztepr3TyEsnTdXRuEH9f3FwIauWK0ps8IN5fY5Ofr1b3e2QCXp5jOM6ob+20TUZPWS50bbOm QEX33GT98YhYF9troKTqYHxA= X-Received: by 127.0.0.2 with SMTP id CVFhYY7687511xSOYRKIFNTe; Mon, 08 Jan 2024 10:13:13 -0800 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.86]) by mx.groups.io with SMTP id smtpd.web10.4554.1704737592776170793 for ; Mon, 08 Jan 2024 10:13:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=moa8kjRvptaWs+xkJRl6+Brc1rqwJd0MUBGVQWeNsH640FRpcs7lT8ANVo8nXMmHC40lA7WdfaHk0hcPcyiKOZ+NXtlb6Fw3SF8LRQVzXpKoJmGs6aP/CZtGxaOxUXzFVqPlhhy1mVIRxcZJZz+793zZuVVBamiIBx8lQ7tgnKb8+PiNqXaREeIl+G+Mg+Jcpo/2TeO+WDDU06iNYs+bu/a7nu40Ex/OKW+MYPWa5gBUjB1OLeHqiH2TaK8Auw3cjFuqChkyu+BOM/gCNPzkVIbJOBS33PuFvnpRipBQu6wBnQzWg6XKbu0SGjwcaYlzwmo3ttJrd2X5lhkl19WshQ== 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=8dc2ihMKONXtMQ+betfNABnGg4so69iDwDi+3Z5u8m4=; b=OFm0uO9KGvqaHRtVn+9S6PN44rjPzrZJYNjMew5JtWiggIECjAsVxfWZrh02D+OjqurwgyT3S1qpbzsLocF8QnhNfPt6Vfh2iHstY+bLplloBRR/mVFnOmi3f/CxwEFd72A6MLp6uCnXBv91H20FRz2b/ZZsQC6a6PiM31UhY5rmYRoPhR2kay3/+imdE2yOk7wN/Qf6RXQGht/u72VayqrNU+fHW8ontdsM/a6qVeYFWrv3HeZu5Cv9DQS52fw7nPXNwoFj7HBqZQy0u5tgSvHQPevasNFce7EKNLp5F/yqD/BP29Ae1nmygUOn/kVwyD/b/8JQLer0NmmPqdHQpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=edk2.groups.io 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 (0) X-Received: from BL1PR13CA0409.namprd13.prod.outlook.com (2603:10b6:208:2c2::24) by SA1PR12MB6775.namprd12.prod.outlook.com (2603:10b6:806:25a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 18:13:09 +0000 X-Received: from MN1PEPF0000ECD8.namprd02.prod.outlook.com (2603:10b6:208:2c2:cafe::d2) by BL1PR13CA0409.outlook.office365.com (2603:10b6:208:2c2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.14 via Frontend Transport; Mon, 8 Jan 2024 18:13:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.161) by MN1PEPF0000ECD8.mail.protection.outlook.com (10.167.242.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.13 via Frontend Transport; Mon, 8 Jan 2024 18:13:08 +0000 X-Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 8 Jan 2024 10:12:56 -0800 X-Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 8 Jan 2024 10:12:56 -0800 X-Received: from localhost.localdomain (10.127.8.11) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Mon, 8 Jan 2024 10:12:56 -0800 From: "Jeshua Smith via groups.io" To: CC: , , , , , , Jeshua Smith , Ashish Singhal Subject: [edk2-devel] [PATCH] DynamicTablesPkg/SSDT: Remove incorrect root node check Date: Mon, 8 Jan 2024 10:12:45 -0800 Message-ID: MIME-Version: 1.0 X-NVConfidentiality: public X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD8:EE_|SA1PR12MB6775:EE_ X-MS-Office365-Filtering-Correlation-Id: 8b25f3f0-c509-4fde-c0ec-08dc107577fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: NQHPlgU4QjfcvPi8Dm99wwWeETrUy8KwByklyFG1ZHmIuDBuWel260w0Uq+ZnNy3KeruPYYEFyC26Cy7E3klfcUo1YeXhqGlQD3bt1UtMmratfG/DBditbhMLY0GkVC2Ag8LHhhKDn+d5c/2KrfWIPp+5vOlXRCOELvfivqBGnJrYTCb8Aan/hDqEs2Cjc0esmkchmkrDz3kTQiMTJIGnGfincS2BKhMb80zu+HUmk+F043d6ZZeV43hbKimsciHYbSQXpV8XEBchQu1a9TzjSUiXzZGNpPnqpVR8u6Qbq9+IcKFOgit4yyV1439riW6yp9exlULEGLrh4IOAz71McX6Mj/OBP//ygWZmMIrrcBBj0y5ynEkLcTXbnWauk93hFuAHzSr24aP0ULvAm0nzGRfh6kIB6ND6jFjppOKiK993JzHKgv+dJJpLQwBhS4oiuzuWpknE9wpO366FZKoGpD6gvXdAvDgOQXWixduzPfH1CHyDfj8tcU3pNIMssey4t3DPWJfxx0DtJ3/EbA8o1MW6xCcLwn7f+JDfBeoVxWjCDR7WbSmfo4c7FHGB4Vr9dw36Xg2GUNddwbAId+xBgo6vVPjms2q1IwnNTJ8MKv1iuRue+KMgSBpSWdQ0UDVVaqO0MJUG5NqJ5+oM3IHcGO3fsvsWwtSDkeBuCtw8dARSSdukfdRu4+vGA/M6eUf7HOHDSzYU7nQhrF7z4XKiQoewp0ohm6vABukGJUikrY2QZ31Fdy56NbjAfgin1V+ X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 18:13:08.8007 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b25f3f0-c509-4fde-c0ec-08dc107577fc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD8.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6775 Precedence: Bulk 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,jeshuas@nvidia.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: HuRY26o2OMgz3dyiOKrtPtWdx7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=RqjDzZtK; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io The code was incorrectly assuming that root nodes had to be physical package nodes and vice versa. This is not always true, so the check is being removed. Signed-off-by: Jeshua Smith Tested-by: Ashish Singhal Reviewed-by: Ashish Singhal --- .../SsdtCpuTopologyGenerator.c | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTop= ologyLibArm/SsdtCpuTopologyGenerator.c index 724f33c660..4ad9508f57 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtCpuTopologyLibArm/SsdtCpuTo= pologyGenerator.c @@ -983,7 +983,6 @@ CreateAmlProcessorContainer ( @param [in] NodeFlags Flags of the ProcNode to check. @param [in] IsLeaf The ProcNode is a leaf. @param [in] NodeToken NodeToken of the ProcNode. - @param [in] ParentNodeToken Parent NodeToken of the ProcNode. =20 @retval EFI_SUCCESS Success. @retval EFI_INVALID_PARAMETER Invalid parameter. @@ -994,26 +993,16 @@ EFIAPI CheckProcNode ( UINT32 NodeFlags, BOOLEAN IsLeaf, - CM_OBJECT_TOKEN NodeToken, - CM_OBJECT_TOKEN ParentNodeToken + CM_OBJECT_TOKEN NodeToken ) { BOOLEAN InvalidFlags; - BOOLEAN HasPhysicalPackageBit; - BOOLEAN IsTopLevelNode; - - HasPhysicalPackageBit =3D (NodeFlags & EFI_ACPI_6_3_PPTT_PACKAGE_PHYSICA= L) =3D=3D - EFI_ACPI_6_3_PPTT_PACKAGE_PHYSICAL; - IsTopLevelNode =3D (ParentNodeToken =3D=3D CM_NULL_TOKEN); - - // A top-level node is a Physical Package and conversely. - InvalidFlags =3D HasPhysicalPackageBit ^ IsTopLevelNode; =20 // Check Leaf specific flags. if (IsLeaf) { - InvalidFlags |=3D ((NodeFlags & PPTT_LEAF_MASK) !=3D PPTT_LEAF_MASK); + InvalidFlags =3D ((NodeFlags & PPTT_LEAF_MASK) !=3D PPTT_LEAF_MASK); } else { - InvalidFlags |=3D ((NodeFlags & PPTT_LEAF_MASK) !=3D 0); + InvalidFlags =3D ((NodeFlags & PPTT_LEAF_MASK) !=3D 0); } =20 if (InvalidFlags) { @@ -1086,8 +1075,7 @@ CreateAmlCpuTopologyTree ( Status =3D CheckProcNode ( Generator->ProcNodeList[Index].Flags, TRUE, - Generator->ProcNodeList[Index].Token, - NodeToken + Generator->ProcNodeList[Index].Token ); if (EFI_ERROR (Status)) { ASSERT (0); @@ -1119,8 +1107,7 @@ CreateAmlCpuTopologyTree ( Status =3D CheckProcNode ( Generator->ProcNodeList[Index].Flags, FALSE, - Generator->ProcNodeList[Index].Token, - NodeToken + Generator->ProcNodeList[Index].Token ); if (EFI_ERROR (Status)) { ASSERT (0); --=20 2.34.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 (#113407): https://edk2.groups.io/g/devel/message/113407 Mute This Topic: https://groups.io/mt/103603398/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-