From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 0090B9415EF for ; Wed, 3 Jul 2024 09:54:07 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=NdVoex3nT3nUwFH2h6wiDHgYJ6iQf7JKjbc3sjpPe4s=; c=relaxed/simple; d=groups.io; h=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:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1720000447; v=1; b=iyVilBIKDwjZ+GJ94xlBWSuM0XrHmR0rDnz+aUEm2GtLjJv6W7SIwT53k68mdVD7klVmcmv4 5o2y6suWmUCQDKYRR2JfgYpcTbbmzofH9DgE/8fnON9Cp+iCWdjVx8+zLnlTgj5FqTwbnuVBo2h /SHP7pulL95wtHUunO11uGh6jL/J4O1kjteWQYDfNw8FMHGmxOyoYIw1TYf1a/uWl8BDBGSBgbz HXaIQh+29u7r0+yWnennK8Mjq9Iunix4AlVVIAm4pbglDTOaqemeIzNqSuPHL2kCndXllvdv55k DEp4fHS9eBA/v8idztQuWhzz6W8OftNDMFAtzSWKoic4g== X-Received: by 127.0.0.2 with SMTP id KsZpYY7687511xKIjMhEDPzT; Wed, 03 Jul 2024 02:54:06 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.47399.1720000435637476548 for ; Wed, 03 Jul 2024 02:53:55 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 58ED8367; Wed, 3 Jul 2024 02:54:20 -0700 (PDT) X-Received: from e126645.home (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C16883F766; Wed, 3 Jul 2024 02:53:52 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , AbdulLateef Attar , Girish Mahadevan , Jeff Brasen , Jeshua Smith , Leif Lindholm , Meenakshi Aggarwal , Sami Mujawar , Sunil V L , Yeo Reum Yun Subject: [edk2-devel] [staging/dynamictables-reorg PATCH 2/2] DynamicTablesPkg: Add EFIAPI to generators hooks Date: Wed, 3 Jul 2024 11:53:40 +0200 Message-Id: <20240703095340.3402057-3-pierre.gondois@arm.com> In-Reply-To: <20240703095340.3402057-1-pierre.gondois@arm.com> References: <20240703095340.3402057-1-pierre.gondois@arm.com> MIME-Version: 1.0 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 Resent-Date: Wed, 03 Jul 2024 02:53:55 -0700 Resent-From: pierre.gondois@arm.com Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Vx5Hk4WBIiwZhHq0WSz6hRj8x7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=iyVilBIK; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io For X64 builds, the EFIAPI is replaced by '(__attribute__((ms_abi))'. This might lead to build error for some ACPI tablte generators due to function prototype mismatch. Add the EFIAPI to ACPI table generator hooks: - ACPI_TABLE_GENERATOR_BUILD_TABLEEX - ACPI_TABLE_GENERATOR_FREE_TABLEEX Signed-off-by: Pierre Gondois --- DynamicTablesPkg/Include/AcpiTableGenerator.h | 8 ++++---- .../Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c | 1 + .../Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c | 1 + .../Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c | 1 + .../Library/Acpi/Common/AcpiSratLib/SratGenerator.c | 1 + .../AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/DynamicTablesPkg/Include/AcpiTableGenerator.h b/DynamicTablesP= kg/Include/AcpiTableGenerator.h index d0eda011c301..f5c6179be082 100644 --- a/DynamicTablesPkg/Include/AcpiTableGenerator.h +++ b/DynamicTablesPkg/Include/AcpiTableGenerator.h @@ -214,7 +214,7 @@ typedef struct AcpiTableGenerator ACPI_TABLE_= GENERATOR; @return EFI_SUCCESS If the table is generated successfully or other=0D failure codes as returned by the generator.=0D **/=0D -typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) (=0D +typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLE)(=0D IN CONST ACPI_TABLE_GENERATOR *This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,= =0D IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,= =0D @@ -234,7 +234,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLE) ( @return EFI_SUCCESS If freed successfully or other failure codes=0D as returned by the generator.=0D **/=0D -typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) (=0D +typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLE)(=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableIn= fo,=0D IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProto= col,=0D @@ -257,7 +257,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLE) ( @return EFI_SUCCESS If the table is generated successfully or other=0D failure codes as returned by the generator.=0D **/=0D -typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX) (=0D +typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_BUILD_TABLEEX)(=0D IN CONST ACPI_TABLE_GENERATOR *This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,= =0D IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,= =0D @@ -280,7 +280,7 @@ typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_BUILD_TABLEEX= ) ( @return EFI_SUCCESS If freed successfully or other failure codes=0D as returned by the generator.=0D **/=0D -typedef EFI_STATUS (*ACPI_TABLE_GENERATOR_FREE_TABLEEX) (=0D +typedef EFI_STATUS (EFIAPI *ACPI_TABLE_GENERATOR_FREE_TABLEEX)(=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableIn= fo,=0D IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProto= col,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator= .c b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c index 722f9c17d541..40dea304e301 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c @@ -261,6 +261,7 @@ error_handler: **/=0D STATIC=0D EFI_STATUS=0D +EFIAPI=0D FreeMcfgTableResources (=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInf= o,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator= .c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c index 061e12bf1b3d..12e34f3e442c 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c @@ -1075,6 +1075,7 @@ error_handler: **/=0D STATIC=0D EFI_STATUS=0D +EFIAPI=0D FreePcctTableResources (=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInf= o,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c index 2b8088a07f44..fd465cbab0e9 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c @@ -1342,6 +1342,7 @@ error_handler: **/=0D STATIC=0D EFI_STATUS=0D +EFIAPI=0D FreePpttTableResources (=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInf= o,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator= .c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c index dcdacc4e966e..1a9434e6bd08 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c @@ -552,6 +552,7 @@ error_handler: **/=0D STATIC=0D EFI_STATUS=0D +EFIAPI=0D FreeSratTableResources (=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInf= o,=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/Ss= dtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpu= TopologyLib/SsdtCpuTopologyGenerator.c index f82b7449713c..994c6e44d0d7 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTo= pologyGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTo= pologyGenerator.c @@ -1313,6 +1313,7 @@ exit_handler: **/=0D STATIC=0D EFI_STATUS=0D +EFIAPI=0D FreeSsdtCpuTopologyTableResources (=0D IN CONST ACPI_TABLE_GENERATOR *CONST This,=0D IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInf= o,=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119779): https://edk2.groups.io/g/devel/message/119779 Mute This Topic: https://groups.io/mt/107016605/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-