UefiPayloadPkg: Remove SystemTableInfo GUID.

SystemTableInfo GUID is not a Spec defined GUID.
The latest SBL and CBL produces ACPI and SMBIOS table information.
So removing the SystemTableInfo GUID implementation.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>

Signed-off-by: Guo Dong <guo.dong@intel.com>
Signed-off-by: Thiyagu Kesavan Balakrishnan <thiyagux.kesavan.balakrishnan@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

12 files changed, 95 insertions, 72 deletions

diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h
index 3332a30eae..b16ca4cc59 100644
--- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h
+++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h
@@ -20,7 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/HobLib.h>

 

 #include <Guid/SmBios.h>

-#include <Guid/SystemTableInfoGuid.h>

 #include <Guid/AcpiBoardInfoGuid.h>

 #include <Guid/GraphicsInfoHob.h>

 

diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf
index 1ccb250991..96d85d2b1d 100644
--- a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf
+++ b/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf
@@ -42,7 +42,6 @@
   HobLib

 

 [Guids]

-  gUefiSystemTableInfoGuid

   gUefiAcpiBoardInfoGuid

   gEfiGraphicsInfoHobGuid

 

diff --git a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h b/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h
deleted file mode 100644
index e742dd0ca5..0000000000
--- a/UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/** @file

-  This file defines the hob structure for system tables like ACPI, SMBIOS tables.

-

-  Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#ifndef SYSTEM_TABLE_INFO_GUID_H_

-#define SYSTEM_TABLE_INFO_GUID_H_

-

-///

-/// System Table Information GUID

-///

-extern EFI_GUID gUefiSystemTableInfoGuid;

-

-typedef struct {

-  UINT8     Revision;

-  UINT8     Reserved0[3];

-  UINT64    AcpiTableBase;

-  UINT32    AcpiTableSize;

-  UINT64    SmbiosTableBase;

-  UINT32    SmbiosTableSize;

-} SYSTEM_TABLE_INFO;

-

-#endif

diff --git a/UefiPayloadPkg/Include/Library/BlParseLib.h b/UefiPayloadPkg/Include/Library/BlParseLib.h
index 7198e419bd..fb7bb0cb0e 100644
--- a/UefiPayloadPkg/Include/Library/BlParseLib.h
+++ b/UefiPayloadPkg/Include/Library/BlParseLib.h
@@ -13,8 +13,9 @@
 #include <Guid/GraphicsInfoHob.h>

 #include <Guid/MemoryMapInfoGuid.h>

 #include <Guid/SerialPortInfoGuid.h>

-#include <Guid/SystemTableInfoGuid.h>

 #include <Guid/AcpiBoardInfoGuid.h>

+#include <UniversalPayload/AcpiTable.h>

+#include <UniversalPayload/SmbiosTable.h>

 

 #define GET_BOOTLOADER_PARAMETER()      PcdGet64 (PcdBootloaderParameter)

 

@@ -55,9 +56,9 @@ ParseMemoryInfo (
   );

 

 /**

-  Acquire acpi table and smbios table from slim bootloader

+  Acquire SMBIOS table from bootloader.

 

-  @param  SystemTableInfo           Pointer to the system table info

+  @param  SmbiosTable           Pointer to the system table info

 

   @retval RETURN_SUCCESS            Successfully find out the tables.

   @retval RETURN_NOT_FOUND          Failed to find the tables.

@@ -65,10 +66,24 @@ ParseMemoryInfo (
 **/

 RETURN_STATUS

 EFIAPI

-ParseSystemTable (

-  OUT SYSTEM_TABLE_INFO     *SystemTableInfo

+ParseSmbiosTable (

+  OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE     *SmbiosTable

   );

 

+/**

+  Acquire ACPI table from bootloader.

+

+  @param  AcpiTableHob              Pointer to the ACPI table info.

+

+  @retval RETURN_SUCCESS            Successfully find out the tables.

+  @retval RETURN_NOT_FOUND          Failed to find the tables.

+

+**/

+RETURN_STATUS

+EFIAPI

+ParseAcpiTableInfo (

+  OUT UNIVERSAL_PAYLOAD_ACPI_TABLE        *AcpiTableHob

+  );

 

 /**

   Find the serial port information

diff --git a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
index 46314e5566..f73fcd8823 100644
--- a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
+++ b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c
@@ -410,9 +410,9 @@ ParseMemoryInfo (
 

 

 /**

-  Acquire acpi table and smbios table from coreboot

+  Acquire SMBIOS table from coreboot.

 

-  @param  SystemTableInfo          Pointer to the system table info

+  @param  SmbiosTable               Pointer to the SMBIOS table info.

 

   @retval RETURN_SUCCESS            Successfully find out the tables.

   @retval RETURN_NOT_FOUND          Failed to find the tables.

@@ -420,8 +420,8 @@ ParseMemoryInfo (
 **/

 RETURN_STATUS

 EFIAPI

-ParseSystemTable (

-  OUT SYSTEM_TABLE_INFO     *SystemTableInfo

+ParseSmbiosTable (

+  OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE     *SmbiosTable

   )

 {

   EFI_STATUS       Status;

@@ -432,17 +432,38 @@ ParseSystemTable (
   if (EFI_ERROR (Status)) {

     return EFI_NOT_FOUND;

   }

-  SystemTableInfo->SmbiosTableBase = (UINT64) (UINTN)MemTable;

-  SystemTableInfo->SmbiosTableSize = MemTableSize;

+  SmbiosTable->SmBiosEntryPoint = (UINT64) (UINTN)MemTable;

+

+  return RETURN_SUCCESS;

+}

+

+

+/**

+  Acquire ACPI table from coreboot.

+

+  @param  AcpiTableHob              Pointer to the ACPI table info.

+

+  @retval RETURN_SUCCESS            Successfully find out the tables.

+  @retval RETURN_NOT_FOUND          Failed to find the tables.

+

+**/

+RETURN_STATUS

+EFIAPI

+ParseAcpiTableInfo (

+  OUT UNIVERSAL_PAYLOAD_ACPI_TABLE        *AcpiTableHob

+  )

+{

+  EFI_STATUS       Status;

+  VOID             *MemTable;

+  UINT32           MemTableSize;

 

   Status = ParseCbMemTable (SIGNATURE_32 ('I', 'P', 'C', 'A'), &MemTable, &MemTableSize);

   if (EFI_ERROR (Status)) {

     return EFI_NOT_FOUND;

   }

-  SystemTableInfo->AcpiTableBase = (UINT64) (UINTN)MemTable;

-  SystemTableInfo->AcpiTableSize = MemTableSize;

+  AcpiTableHob->Rsdp = (UINT64) (UINTN)MemTable;

 

-  return Status;

+  return RETURN_SUCCESS;

 }

 

 

diff --git a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c
index eeb0dfe74a..e524e1b5f6 100644
--- a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c
+++ b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c
@@ -110,9 +110,9 @@ ParseMemoryInfo (
 }

 

 /**

-  Acquire acpi table and smbios table from slim bootloader

+  Acquire SMBIOS table from slim bootloader.

 

-  @param  SystemTableInfo           Pointer to the system table info

+  @param  SmbiosTable           Pointer to the SMBIOS table info.

 

   @retval RETURN_SUCCESS            Successfully find out the tables.

   @retval RETURN_NOT_FOUND          Failed to find the tables.

@@ -120,25 +120,53 @@ ParseMemoryInfo (
 **/

 RETURN_STATUS

 EFIAPI

-ParseSystemTable (

-  OUT SYSTEM_TABLE_INFO     *SystemTableInfo

+ParseSmbiosTable (

+    OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE     *SmbiosTable

   )

 {

-  SYSTEM_TABLE_INFO         *TableInfo;

+  UNIVERSAL_PAYLOAD_SMBIOS_TABLE         *TableInfo;

 

-  TableInfo = (SYSTEM_TABLE_INFO *)GetGuidHobDataFromSbl (&gUefiSystemTableInfoGuid);

+  TableInfo = (UNIVERSAL_PAYLOAD_SMBIOS_TABLE *)GetGuidHobDataFromSbl (&gUniversalPayloadSmbiosTableGuid);

   if (TableInfo == NULL) {

     ASSERT (FALSE);

     return RETURN_NOT_FOUND;

   }

 

-  CopyMem (SystemTableInfo, TableInfo, sizeof (SYSTEM_TABLE_INFO));

+  SmbiosTable->SmBiosEntryPoint = TableInfo->SmBiosEntryPoint;

 

   return RETURN_SUCCESS;

 }

 

 

 /**

+  Acquire ACPI table from slim bootloader.

+

+  @param  AcpiTableHob              Pointer to the ACPI table info.

+

+  @retval RETURN_SUCCESS            Successfully find out the tables.

+  @retval RETURN_NOT_FOUND          Failed to find the tables.

+

+**/

+RETURN_STATUS

+EFIAPI

+ParseAcpiTableInfo (

+  OUT UNIVERSAL_PAYLOAD_ACPI_TABLE        *AcpiTableHob

+  )

+{

+  UNIVERSAL_PAYLOAD_ACPI_TABLE         *TableInfo;

+

+  TableInfo = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GetGuidHobDataFromSbl (&gUniversalPayloadAcpiTableGuid);

+  if (TableInfo == NULL) {

+    ASSERT (FALSE);

+    return RETURN_NOT_FOUND;

+  }

+

+  AcpiTableHob->Rsdp = TableInfo->Rsdp;

+

+  return RETURN_SUCCESS;

+}

+

+/**

   Find the serial port information

 

   @param[out]  SerialPortInfo     Pointer to serial port info structure

diff --git a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf
index 535cca58a6..f83a10ccd8 100644
--- a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf
+++ b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf
@@ -36,7 +36,6 @@
   HobLib

 

 [Guids]

-  gUefiSystemTableInfoGuid

   gUefiSerialPortInfoGuid

   gLoaderMemoryMapInfoGuid

   gEfiGraphicsInfoHobGuid

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 9efe01d094..fee5cb90d5 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -224,8 +224,6 @@ BuildHobFromBl (
   )

 {

   EFI_STATUS                       Status;

-  SYSTEM_TABLE_INFO                SysTableInfo;

-  SYSTEM_TABLE_INFO                *NewSysTableInfo;

   ACPI_BOARD_INFO                  *AcpiBoardInfo;

   EFI_PEI_GRAPHICS_INFO_HOB        GfxInfo;

   EFI_PEI_GRAPHICS_INFO_HOB        *NewGfxInfo;

@@ -275,26 +273,17 @@ BuildHobFromBl (
 

 

   //

-  // Create guid hob for system tables like acpi table and smbios table

-  //

-  Status = ParseSystemTable(&SysTableInfo);

-  ASSERT_EFI_ERROR (Status);

-  if (!EFI_ERROR (Status)) {

-    NewSysTableInfo = BuildGuidHob (&gUefiSystemTableInfoGuid, sizeof (SYSTEM_TABLE_INFO));

-    ASSERT (NewSysTableInfo != NULL);

-    CopyMem (NewSysTableInfo, &SysTableInfo, sizeof (SYSTEM_TABLE_INFO));

-    DEBUG ((DEBUG_INFO, "Detected Acpi Table at 0x%lx, length 0x%x\n", SysTableInfo.AcpiTableBase, SysTableInfo.AcpiTableSize));

-    DEBUG ((DEBUG_INFO, "Detected Smbios Table at 0x%lx, length 0x%x\n", SysTableInfo.SmbiosTableBase, SysTableInfo.SmbiosTableSize));

-  }

-  //

   // Creat SmBios table Hob

   //

   SmBiosTableHob = BuildGuidHob (&gUniversalPayloadSmbiosTableGuid, sizeof (UNIVERSAL_PAYLOAD_SMBIOS_TABLE));

   ASSERT (SmBiosTableHob != NULL);

   SmBiosTableHob->Header.Revision = UNIVERSAL_PAYLOAD_SMBIOS_TABLE_REVISION;

   SmBiosTableHob->Header.Length = sizeof (UNIVERSAL_PAYLOAD_SMBIOS_TABLE);

-  SmBiosTableHob->SmBiosEntryPoint = SysTableInfo.SmbiosTableBase;

   DEBUG ((DEBUG_INFO, "Create smbios table gUniversalPayloadSmbiosTableGuid guid hob\n"));

+  Status = ParseSmbiosTable(SmBiosTableHob);

+  if (!EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_INFO, "Detected Smbios Table at 0x%lx\n", SmBiosTableHob->SmBiosEntryPoint));

+  }

 

   //

   // Creat ACPI table Hob

@@ -303,13 +292,16 @@ BuildHobFromBl (
   ASSERT (AcpiTableHob != NULL);

   AcpiTableHob->Header.Revision = UNIVERSAL_PAYLOAD_ACPI_TABLE_REVISION;

   AcpiTableHob->Header.Length = sizeof (UNIVERSAL_PAYLOAD_ACPI_TABLE);

-  AcpiTableHob->Rsdp = SysTableInfo.AcpiTableBase;

-  DEBUG ((DEBUG_INFO, "Create smbios table gUniversalPayloadAcpiTableGuid guid hob\n"));

+  DEBUG ((DEBUG_INFO, "Create ACPI table gUniversalPayloadAcpiTableGuid guid hob\n"));

+  Status = ParseAcpiTableInfo(AcpiTableHob);

+  if (!EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_INFO, "Detected ACPI Table at 0x%lx\n", AcpiTableHob->Rsdp));

+  }

 

   //

   // Create guid hob for acpi board information

   //

-  AcpiBoardInfo = BuildHobFromAcpi (SysTableInfo.AcpiTableBase);

+  AcpiBoardInfo = BuildHobFromAcpi (AcpiTableHob->Rsdp);

   ASSERT (AcpiBoardInfo != NULL);

 

   //

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index 637ed9c20b..716430e3cb 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -27,7 +27,6 @@
 #include <IndustryStandard/Acpi.h>

 #include <IndustryStandard/MemoryMappedConfigurationSpaceAccessTable.h>

 #include <Guid/SerialPortInfoGuid.h>

-#include <Guid/SystemTableInfoGuid.h>

 #include <Guid/MemoryMapInfoGuid.h>

 #include <Guid/AcpiBoardInfoGuid.h>

 #include <Guid/GraphicsInfoHob.h>

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
index 96e4bb81f4..07a678bd46 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
@@ -59,7 +59,6 @@
 [Guids]

   gEfiMemoryTypeInformationGuid

   gEfiFirmwareFileSystem2Guid

-  gUefiSystemTableInfoGuid

   gEfiGraphicsInfoHobGuid

   gEfiGraphicsDeviceInfoHobGuid

   gUefiAcpiBoardInfoGuid

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
index 928bd2e42b..a8576305ad 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
@@ -57,7 +57,6 @@
 [Guids]

   gEfiMemoryTypeInformationGuid

   gEfiFirmwareFileSystem2Guid

-  gUefiSystemTableInfoGuid

   gEfiGraphicsInfoHobGuid

   gEfiGraphicsDeviceInfoHobGuid

   gUefiAcpiBoardInfoGuid

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayloadPkg.dec
index e385dc7219..faa98eb98a 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dec
+++ b/UefiPayloadPkg/UefiPayloadPkg.dec
@@ -32,7 +32,6 @@
   ##include/Guid/BootManagerMenu.h

   gEdkiiBootManagerMenuFileGuid = { 0xdf939333, 0x42fc, 0x4b2a, { 0xa5, 0x9e, 0xbb, 0xae, 0x82, 0x81, 0xfe, 0xef }}

 

-  gUefiSystemTableInfoGuid = {0x16c8a6d0, 0xfe8a, 0x4082, {0xa2, 0x8, 0xcf, 0x89, 0xc4, 0x29, 0x4, 0x33}}

   gUefiAcpiBoardInfoGuid   = {0xad3d31b, 0xb3d8, 0x4506, {0xae, 0x71, 0x2e, 0xf1, 0x10, 0x6, 0xd9, 0xf}}

   gUefiSerialPortInfoGuid  = { 0x6c6872fe, 0x56a9, 0x4403, { 0xbb, 0x98, 0x95, 0x8d, 0x62, 0xde, 0x87, 0xf1 } }

   gLoaderMemoryMapInfoGuid = { 0xa1ff7424, 0x7a1a, 0x478e, { 0xa9, 0xe4, 0x92, 0xf3, 0x57, 0xd1, 0x28, 0x32 } }