From bdbbedea949eb4b10d24110c0e559b03c7a6bce4 Mon Sep 17 00:00:00 2001 From: Sami Mujawar Date: Mon, 25 Feb 2019 20:36:57 +0000 Subject: [PATCH] Revert "DynamicTablesPkg: Add OEM Info" This reverts commit c788bdaba47536447ae37518a96d92e0da54aad7. Reverting this patch as Soft Feature Freeze for edk2-stable201903 started on 22 Feb 2019. Cc: Laszlo Ersek Cc: Alexei Fedorov Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- .../Include/Library/TableHelperLib.h | 4 +-- .../Include/StandardNameSpaceObjects.h | 18 ------------- .../Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c | 2 +- .../Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c | 2 +- .../Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c | 2 +- .../Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 2 +- .../Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c | 2 +- .../Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c | 2 +- .../Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c | 2 +- .../Common/TableHelperLib/TableHelper.c | 26 +++++-------------- 10 files changed, 16 insertions(+), 46 deletions(-) diff --git a/DynamicTablesPkg/Include/Library/TableHelperLib.h b/DynamicTablesPkg/Include/Library/TableHelperLib.h index 0f872bc3d0..3c4e1d23d2 100644 --- a/DynamicTablesPkg/Include/Library/TableHelperLib.h +++ b/DynamicTablesPkg/Include/Library/TableHelperLib.h @@ -45,7 +45,7 @@ GetCgfMgrInfo ( @param [in] Generator Pointer to the ACPI table Generator. @param [in,out] AcpiHeader Pointer to the ACPI table header to be updated. - @param [in] AcpiTableInfo Pointer to the ACPI table info structure. + @param [in] Revision Revision of the ACPI table. @param [in] Length Length of the ACPI table. @retval EFI_SUCCESS The ACPI table is updated successfully. @@ -61,7 +61,7 @@ AddAcpiHeader ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, IN CONST ACPI_TABLE_GENERATOR * CONST Generator, IN OUT EFI_ACPI_DESCRIPTION_HEADER * CONST AcpiHeader, - IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo, + IN CONST UINT32 Revision, IN CONST UINT32 Length ); diff --git a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h index 58503858b2..4377ee8f78 100644 --- a/DynamicTablesPkg/Include/StandardNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/StandardNameSpaceObjects.h @@ -93,24 +93,6 @@ typedef struct CmAStdObjAcpiTableInfo { /// Optional pointer to the ACPI table data EFI_ACPI_DESCRIPTION_HEADER * AcpiTableData; - /// An OEM-supplied string that the OEM uses to identify the particular - /// data table. This field is particularly useful when defining a definition - /// block to distinguish definition block functions. The OEM assigns each - /// dissimilar table a new OEM Table ID. - /// This field could be constructed using the SIGNATURE_64() macro. - /// e.g. SIGNATURE_64 ('A','R','M','H','G','T','D','T') - /// Note: If this field is not populated (has value of Zero), then the - /// Generators shall populate this information using part of the - /// CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.OemId field and the - /// ACPI table signature. - UINT64 OemTableId; - - /// An OEM-supplied revision number. Larger numbers are assumed to be - /// newer revisions. - /// Note: If this field is not populated (has value of Zero), then the - /// Generators shall populate this information using the revision of the - /// Configuration Manager (CM_STD_OBJ_CONFIGURATION_MANAGER_INFO.Revision). - UINT32 OemRevision; } CM_STD_OBJ_ACPI_TABLE_INFO; /** A structure used to describe the SMBIOS table generators to be invoked. diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c index 697cfc46ab..e21e2b6606 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiDbg2LibArm/Dbg2Generator.c @@ -342,7 +342,7 @@ BuildDbg2Table ( CfgMgrProtocol, This, (EFI_ACPI_DESCRIPTION_HEADER*)&AcpiDbg2, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, sizeof (DBG2_TABLE) ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c index 6699901b42..62927b51d6 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c @@ -537,7 +537,7 @@ BuildFadtTable ( CfgMgrProtocol, This, (EFI_ACPI_DESCRIPTION_HEADER*)&AcpiFadt, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, sizeof (EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE) ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c index d58794ee3e..70f52507bc 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c @@ -518,7 +518,7 @@ BuildGtdtTable ( CfgMgrProtocol, This, &Gtdt->Header, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, TableSize ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index 2bac7a59ea..b53c4bb477 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -1798,7 +1798,7 @@ BuildIortTable ( CfgMgrProtocol, This, &Iort->Header, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, TableSize ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c index 1ee0b9e006..0679475830 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c @@ -569,7 +569,7 @@ BuildMadtTable ( CfgMgrProtocol, This, &Madt->Header, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, TableSize ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c index 2131683a35..29eb72bd91 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMcfgLibArm/McfgGenerator.c @@ -220,7 +220,7 @@ BuildMcfgTable ( CfgMgrProtocol, This, &Mcfg->Header, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, TableSize ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c index 6778d7673e..a4654acb39 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSpcrLibArm/SpcrGenerator.c @@ -211,7 +211,7 @@ BuildSpcrTable ( CfgMgrProtocol, This, (EFI_ACPI_DESCRIPTION_HEADER*)&AcpiSpcr, - AcpiTableInfo, + AcpiTableInfo->AcpiTableRevision, sizeof (EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE) ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c index 203207bac2..02860ddf23 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c @@ -100,7 +100,7 @@ GetCgfMgrInfo ( @param [in] Generator Pointer to the ACPI table Generator. @param [in,out] AcpiHeader Pointer to the ACPI table header to be updated. - @param [in] AcpiTableInfo Pointer to the ACPI table info structure. + @param [in] Revision Revision of the ACPI table. @param [in] Length Length of the ACPI table. @retval EFI_SUCCESS The ACPI table is updated successfully. @@ -116,7 +116,7 @@ AddAcpiHeader ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, IN CONST ACPI_TABLE_GENERATOR * CONST Generator, IN OUT EFI_ACPI_DESCRIPTION_HEADER * CONST AcpiHeader, - IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo, + IN CONST UINT32 Revision, IN CONST UINT32 Length ) { @@ -151,7 +151,7 @@ AddAcpiHeader ( // UINT32 Length AcpiHeader->Length = Length; // UINT8 Revision - AcpiHeader->Revision = AcpiTableInfo->AcpiTableRevision; + AcpiHeader->Revision = Revision; // UINT8 Checksum AcpiHeader->Checksum = 0; @@ -159,24 +159,12 @@ AddAcpiHeader ( CopyMem (AcpiHeader->OemId, CfgMfrInfo->OemId, sizeof (AcpiHeader->OemId)); // UINT64 OemTableId - if (AcpiTableInfo->OemTableId != 0) { - AcpiHeader->OemTableId = AcpiTableInfo->OemTableId; - } else { - AcpiHeader->OemTableId = SIGNATURE_32 ( - CfgMfrInfo->OemId[0], - CfgMfrInfo->OemId[1], - CfgMfrInfo->OemId[2], - CfgMfrInfo->OemId[3] - ) | - ((UINT64)Generator->AcpiTableSignature << 32); - } + AcpiHeader->OemTableId = Generator->CreatorId; + AcpiHeader->OemTableId <<= 32; + AcpiHeader->OemTableId |= Generator->AcpiTableSignature; // UINT32 OemRevision - if (AcpiTableInfo->OemRevision != 0) { - AcpiHeader->OemRevision = AcpiTableInfo->OemRevision; - } else { - AcpiHeader->OemRevision = CfgMfrInfo->Revision; - } + AcpiHeader->OemRevision = CfgMfrInfo->Revision; // UINT32 CreatorId AcpiHeader->CreatorId = Generator->CreatorId; -- 2.39.2