From nobody Fri May 17 12:14:41 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+113027+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 1704171157264402.73046731222485; Mon, 1 Jan 2024 20:52:37 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=gadmRVTM3LKz2h3RRclE+4h7JDMaoobZYnqFRTqHlyI=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: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=1704171156; v=1; b=tS5poKZEF3EClNqhGETH7y/biLC+6pAl2w6SRONDqlg3d4dI4vR0s39MtvZasPLv1XtXNU3S jqAPGA3AhLgOYqQT5eLNYz9SVFzVBpuspM8q4Uy1eZWmg2qNOiMb71Udi0Xz6iG2LFtEGM2+yL9 tLOfWtx1E9zfoWJrmvtpWiXo= X-Received: by 127.0.0.2 with SMTP id LH8xYY1788612xSTB8mjEjfX; Mon, 01 Jan 2024 20:52:36 -0800 X-Received: from NAM02-DM3-obe.outbound.protection.outlook.com (NAM02-DM3-obe.outbound.protection.outlook.com [40.107.95.51]) by mx.groups.io with SMTP id smtpd.web11.23010.1704171156123975191 for ; Mon, 01 Jan 2024 20:52:36 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XC0YEks3h7tgc7DY7Zq/MF+RgMppPytHuV3GN1gNMu5fxsOpqtmhkzJFuC4EPxqx2aFmhz8wpVqeYChjzXH9ZxmsOA2rnFBsevCER7Zu5ORgyIyob7GuzpWagoBtGGg+acBIaK3itxio4eQweCS6FZR7eWIOa4J8i3/GB797RaqnXOpGhpL6DIPMJlnCcZJFBVdfkRlAObeWXUnXBsehRYV8R6L5M7DNYWIVlDMe/LipYa8sNIFm4wnNANxFAlQa8nkcMNHQmv19dJ6+fWhJi1pIqOiGuyD6GuKRfWHRkAEiRFSJRAgvkdPZjxWXFgzFGtpJV8DV6VCnxxJpjY+wnw== 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=hH5edFCuCrbHDxuPWIoVJ1dtEP4KqFH2dMni2hxyz7g=; b=h4AnzG9Mox2SPvSJTWztOSPfTZPse0vSDxiXjgmLLNTqGXEpdWibUCz8vcs5ykJ/3lL0jRk5QGYcNxYva6zk9lZoNf2vFQ8mTubbM9rTBb+iqXUIO4aF8IS7nRG4olHO7L6nGYKLAHy/ehvXwYYRMwMqqHPFnoNn9uLNT59O02OXoamiu2hL0nwMwz/gDia+QyHO3Zf1gX950iUHypsf/38StMLj+ENQA5K/ZqqJRHepQqbp5TmXCHQX44r8CDPklFLFRnvdrxfNaMdjtPdz6fFtAnp2r6DLSQoz5kcC5jz6E/YmVRXDF9xJ9K2YCKWlUdgkYw3FIVQ2P2jG1xXBYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io 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) X-Received: from CYXPR02CA0018.namprd02.prod.outlook.com (2603:10b6:930:cf::11) by IA1PR12MB8310.namprd12.prod.outlook.com (2603:10b6:208:3ff::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.24; Tue, 2 Jan 2024 04:52:33 +0000 X-Received: from CY4PEPF0000E9DA.namprd05.prod.outlook.com (2603:10b6:930:cf:cafe::3b) by CYXPR02CA0018.outlook.office365.com (2603:10b6:930:cf::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25 via Frontend Transport; Tue, 2 Jan 2024 04:52:33 +0000 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 groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+113027+1787277+3901457@groups.io; helo=mail02.groups.io; 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=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9DA.mail.protection.outlook.com (10.167.241.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7159.9 via Frontend Transport; Tue, 2 Jan 2024 04:52:33 +0000 X-Received: from SATLEXMB06.amd.com (10.181.40.147) 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.34; Mon, 1 Jan 2024 22:52:31 -0600 X-Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 1 Jan 2024 22:52:13 -0600 X-Received: from BLR-LAB-SFW01.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Mon, 1 Jan 2024 22:52:11 -0600 From: "Abdul Lateef Attar via groups.io" To: CC: Abdul Lateef Attar , Pierre Gondois , Sami Mujawar Subject: [edk2-devel] [PATCH v1 1/1] DynamicTablesPkg: Fix X64 compilation errors Date: Tue, 2 Jan 2024 10:22:02 +0530 Message-ID: <90b7c3f026208ea2055293fb34a829d60ba5e1a8.1704170833.git.AbdulLateef.Attar@amd.com> In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DA:EE_|IA1PR12MB8310:EE_ X-MS-Office365-Filtering-Correlation-Id: 182d84c8-5570-49f0-1957-08dc0b4ea1f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 5JMJziscdjQxcPuSZTd3tSt8WEnHQQWYUpkX3BsY6ohrwuCpSqq2ZTqsdcfA3367DF0AFbYy9Eg1HqRxdSm4jIFvPC5+trquxDop1Rb5lkSxc/5XGfKOlHrKjT4cCarmD3hTuDrgA/qk7Zdf3Snhm5fGFKbu5E402GaB54mJHIxZa4EBYwmNvn/BDsrZqCOCnZblkY3B0w66zWAOoFdcGmssj1EYrQGVEKdptU3IBTJSab9byIze2+RQvcbcMUQVva4IsvetnOeUPwrcBNHjSukI9v5mzRWSEqY13wN3lRYxJp/KrRJaxYWQFcbpsLDy6ukp50Mv0UaolHdoXqMabjkmLsruE3wcsXRuw0FrQ4JCJH1BuR3NEHxrQtgvgY+Qk1k7isbABynblf8BltoS/X9b0luc7XE5l2riG8HawnQfd4geA7YccvB4BkfkQOAV6TamvK0ToZYlPgdEv2IkCiQ6gCJFEcxlW46NhjQnAMUdOKzYyqqXXDEhKP3uuRktvZVQdsb7s0FYMqqvntxz5WAWoZbilDKG28y6ZISN8zi+EEhefmtXmk7UdQZgECcGv+9HKvELZUDRJWyDAdHGhbnqamGlcv9yZKRjANQLNwJl5J4XWr9U5j7V2Ap+0cjjrnVhxOP757bEpFLpHAAdTK4Z5NaHH8U7WhnYByKdhO5l7ASY8e+UdyjjvUErhC7XwiwrPjStBntoImWo3eUjTnFzCDKJEiNGfi3hBBx59hlqUbRg9nfxAHVIZJRgJ1wmubM/PLYHQXICo+AWhC96Z92ssIAEau79zMPEA0DtjgfaFOK5z3uFrR9Bf/8KM1HC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2024 04:52:33.1092 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 182d84c8-5570-49f0-1957-08dc0b4ea1f3 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8310 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,AbdulLateef.Attar@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: xYupf6NQSD3M5yBUtVbCfPkbx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704171157725100002 Content-Type: text/plain; charset="utf-8" From: Abdul Lateef Attar Add the support for X64 compilation to the CI. Fix the compilation errors. Cc: Pierre Gondois Cc: Sami Mujawar Signed-off-by: Abdul Lateef Attar --- DynamicTablesPkg/DynamicTables.dsc.inc | 17 ++++++++++++----- DynamicTablesPkg/DynamicTablesPkg.dsc | 7 +++++-- .../Library/Common/AmlLib/AmlLib.inf | 2 ++ .../Library/Common/AmlLib/CodeGen/AmlCodeGen.c | 4 ++-- .../Common/DynamicPlatRepoLib/DynamicPlatRepo.c | 7 ++++--- .../Library/Common/TableHelperLib/TableHelper.c | 2 ++ .../Common/TableHelperLib/TableHelperLib.inf | 2 ++ 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/DynamicTablesPkg/DynamicTables.dsc.inc b/DynamicTablesPkg/Dyna= micTables.dsc.inc index 9d4312c4e8..804fb00a85 100644 --- a/DynamicTablesPkg/DynamicTables.dsc.inc +++ b/DynamicTablesPkg/DynamicTables.dsc.inc @@ -2,6 +2,7 @@ # Dsc include file for Dynamic Tables Framework. # # Copyright (c) 2017 - 2022, Arm Limited. All rights reserved.
+# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -21,6 +22,17 @@ SmbiosStringTableLib|DynamicTablesPkg/Library/Common/SmbiosStringTableLi= b/SmbiosStringTableLib.inf =20 [Components.common] + # + # Dynamic Table Factory Dxe + # + DynamicTablesPkg/Drivers/DynamicTableFactoryDxe/DynamicTableFactoryDxe.i= nf + + # + # Dynamic Tables Manager Dxe + # + DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.i= nf + +[Components.ARM, Components.AARCH64] # # Generators # @@ -70,8 +82,3 @@ NULL|DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLi= bArm.inf } =20 - # - # Dynamic Tables Manager Dxe - # - DynamicTablesPkg/Drivers/DynamicTableManagerDxe/DynamicTableManagerDxe.i= nf - diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/Dynam= icTablesPkg.dsc index bd5084a900..a2db14efaf 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dsc +++ b/DynamicTablesPkg/DynamicTablesPkg.dsc @@ -3,6 +3,7 @@ # # Copyright (c) 2019, Linaro Limited. All rights reserved.
# Copyright (c) 2019 - 2022, Arm Limited. All rights reserved.
+# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -14,7 +15,7 @@ PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x0001001a OUTPUT_DIRECTORY =3D Build/DynamicTables - SUPPORTED_ARCHITECTURES =3D ARM|AARCH64 + SUPPORTED_ARCHITECTURES =3D ARM|AARCH64|X64 BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER =3D DEFAULT =20 @@ -44,10 +45,12 @@ DynamicTablesPkg/Library/Common/SsdtPcieSupportLib/SsdtPcieSupportLib.inf DynamicTablesPkg/Library/Common/SsdtSerialPortFixupLib/SsdtSerialPortFix= upLib.inf DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf - DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf DynamicTablesPkg/Library/Common/SmbiosStringTableLib/SmbiosStringTableLi= b.inf =20 +[Components.ARM, Components.AARCH64] + DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf + [BuildOptions] *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACES =20 diff --git a/DynamicTablesPkg/Library/Common/AmlLib/AmlLib.inf b/DynamicTab= lesPkg/Library/Common/AmlLib/AmlLib.inf index 723de3ad44..6d0aa6ff93 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/AmlLib.inf +++ b/DynamicTablesPkg/Library/Common/AmlLib/AmlLib.inf @@ -2,6 +2,7 @@ # AML Generation Library # # Copyright (c) 2019 - 2021, Arm Limited. All rights reserved.
+# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -68,6 +69,7 @@ [LibraryClasses] AcpiHelperLib BaseLib + MemoryAllocationLib =20 [BuildOptions] *_*_*_CC_FLAGS =3D -DAML_HANDLE diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/= DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c index 893ace20ae..d4e3e252cb 100644 --- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c +++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c @@ -2,7 +2,7 @@ AML Code Generation. =20 Copyright (c) 2020 - 2022, Arm Limited. All rights reserved.
- Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.
+ Copyright (C) 2023 - 2024, Advanced Micro Devices, Inc. All rights reser= ved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -922,7 +922,7 @@ AmlCodeGenNameUnicodeString ( Status =3D AmlCreateDataNode ( EAmlNodeDataTypeRaw, (CONST UINT8 *)String, - StrSize (String), + (UINT32)StrSize (String), &DataNode ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlat= Repo.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo= .c index bc713f30b2..bdeb5c78ae 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepo.c @@ -2,6 +2,7 @@ Dynamic Platform Info Repository =20 Copyright (c) 2021, Arm Limited. All rights reserved.
+ Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -287,8 +288,8 @@ GroupCmObjNodes ( =20 CmObjDesc =3D &This->ArmCmObjArray[ArmObjIndex]; CmObjDesc->ObjectId =3D CmObjId; - CmObjDesc->Size =3D Size; - CmObjDesc->Count =3D Count; + CmObjDesc->Size =3D (UINT32)Size; + CmObjDesc->Count =3D (UINT32)Count; CmObjDesc->Data =3D GroupedData; =20 return Status; @@ -340,7 +341,7 @@ DynamicPlatRepoFinalise ( // (the array is wrapped in a CmObjDesc). // - Add the Token/CmObj binding to the token mapper. for (ArmObjIndex =3D 0; ArmObjIndex < EArmObjMax; ArmObjIndex++) { - Status =3D GroupCmObjNodes (This, ArmObjIndex); + Status =3D GroupCmObjNodes (This, (UINT32)ArmObjIndex); if (EFI_ERROR (Status)) { ASSERT (0); // Free the TokenMapper. diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c b= /DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c index 0decd3dc0e..e33d6e656b 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c @@ -2,6 +2,7 @@ Table Helper =20 Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
+ Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -16,6 +17,7 @@ #include #include #include +#include =20 /** The GetCgfMgrInfo function gets the CM_STD_OBJ_CONFIGURATION_MANAGER_I= NFO object from the Configuration Manager. diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.= inf b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf index abbf4bc38c..8df5ab848e 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelperLib.inf @@ -2,6 +2,7 @@ # Table Helper # # Copyright (c) 2017 - 2021, ARM Limited. All rights reserved. +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -25,3 +26,4 @@ =20 [LibraryClasses] BaseLib + AmlLib --=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 (#113027): https://edk2.groups.io/g/devel/message/113027 Mute This Topic: https://groups.io/mt/103476725/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-