From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.3585.1633981427980070348 for ; Mon, 11 Oct 2021 12:43:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=J8YjOXo1; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: maurice.ma@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="227241855" X-IronPort-AV: E=Sophos;i="5.85,365,1624345200"; d="scan'208";a="227241855" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 12:43:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,365,1624345200"; d="scan'208";a="490607081" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga008.jf.intel.com with ESMTP; 11 Oct 2021 12:43:47 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 11 Oct 2021 12:43:46 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 11 Oct 2021 12:43:46 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 11 Oct 2021 12:43:46 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.177) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 11 Oct 2021 12:43:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j+U23/RmGS2UCH53Iyo0Ua6ysr1D2YolntZv8EF5FC+9j3RnFspxlGnvdHcXiaib6D7SquNwgnmwRtd5nQfFfPGryRwliyr4CuIc1dbjFuMQTBZOS6+iYtdMxG1EYDtKcoz7OI/vIbnAfwABA8/ABSZJDQNJ/IVtbTu9Ii4AAfzTqc9JmqvUOyDWoQNUzHiSgFD5Ei2JMhhiggy/nHOzxM/aP4avwa1cXz0PwJxn3Q3h2iW0meiAYcZUDZpKWmqKnMBxiOnBlfPRM3LxXij9EzSR8YvgfxCyKpDpbLpg6hNHHHI0KMxnEeHFA4LtvoZtuAxYTunsoFJoSDULWpRtHg== 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=Tp2MudfnO+96UgBE9Pu6IL+1xAVNaNpUoGJ5eofhwFA=; b=OcInWciIch5sXEnxKHRmSBR7FZrTFBQrX7OFEgy2GveSorDmuZ+5WQRBUErSv0dT310lvCjKZbvlz7sjDrg3Jgh9Jlr4jBhryLWAo0ZZFlfbx3YpzY6v/2dLsxTmaB7vN8Mi8g4mHuNOyoCDnjdgCBeLBQ1lowRLHVFa62qSo1DXdMGHFImfSX1EhubZNgCAmmSEn24q99E7BtiGDY9gW8ri8vw5tZ74hxw5O0qt7DB3R/446gaHEgShMTg+h//hPkn+HNJztt5p8e/oGSYBOOYonMkeDRcw6YWeD2KmwIui7gPBjI8d8zGvsnD3ENK6KrU2xEf7Z6GIkkbV55ndig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tp2MudfnO+96UgBE9Pu6IL+1xAVNaNpUoGJ5eofhwFA=; b=J8YjOXo1u5d23DBRezkpGYpjZ2SIFqCO1C4L6BkhrLKp+gKy+0T/NGxWuEiE+37FVanlYgZR0S367zVLBna7/v0Bpt2g5wlEBNWlhuLJhXz5g1zn8EPzU2I8IvFLlwVVQEbDURkGzpXtttVI2cAduD/n1ToAQiVh3vkop9DwKTM= Received: from CO1PR11MB4945.namprd11.prod.outlook.com (2603:10b6:303:9c::8) by MWHPR11MB1904.namprd11.prod.outlook.com (2603:10b6:300:111::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Mon, 11 Oct 2021 19:42:59 +0000 Received: from CO1PR11MB4945.namprd11.prod.outlook.com ([fe80::752d:e1b:2ca:978f]) by CO1PR11MB4945.namprd11.prod.outlook.com ([fe80::752d:e1b:2ca:978f%9]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 19:42:59 +0000 From: "Ma, Maurice" To: "Kesavan Balakrishnan, ThiyaguX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "You, Benjamin" , "Liu, Zhiguang" Subject: Re: [PATCH] UefiPayloadPkg: Remove SystemTableInfo GUID. Thread-Topic: [PATCH] UefiPayloadPkg: Remove SystemTableInfo GUID. Thread-Index: AQHXvli4NuubKK7kJUOIq4i/XL23A6vOM6fg Date: Mon, 11 Oct 2021 19:42:59 +0000 Message-ID: References: <20211011042953.1248-1-thiyagux.kesavan.balakrishnan@intel.com> In-Reply-To: <20211011042953.1248-1-thiyagux.kesavan.balakrishnan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.200.16 dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ca52f8fa-880d-481a-f95f-08d98cef54ce x-ms-traffictypediagnostic: MWHPR11MB1904: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: abVAvqtgnxFzQMvn6gtnpyjnRW6TDeejXMRmanVDIg1qqpOzLgZNYmokPq+HRjotTR7o9+5Dz5Jgl+k5T+sTyO+WHT4PT8mzOxaGDQ9aWdtTbo8GxaVaY14BPyVXtuae/Z9WMc9VtBQbxQoqZXpdH9XgxZzURXT8nN243hrloxlog5XIVFt3mXRAYcUIJU24h86XlXsLM2xSTDpSLDYMnW7jP8Ms/whBgn9Tv0XKFJNHh1kz4gYM+7T+cpqprOkRnoX6ZTAH8JuwOO59QgnmBsO4/U4jbo6VVPRPInZxJexcIQ+I/ithlXbKXVW0UvHL+Qsav7pz3nkVhBzje+/9voFRGgnFB7spQgdPA/G5wcf9JF3ZrS008gEa4VAYUN3Vvw0Cx5P3dhktKhKnM9JmkOR0VQhemmB/aMfxBfuZINV1WmGs+ZYPeUR68xo3EwlMPXoxodiG6Mfdu+hUZCYsQae0E66nz13ZGrvxFvkb17sB9EreafM+ULljYAoosQT+agGPwcOrUrvwf2Lrh4FH9+aRnGMl7rAdugZuFm+HewxzU6b/FU72dfN8IJ6O1tmrE/UZU0fxIAATHk6BCL0sKx1WkopcVjRlXi7J9t7WiH1eQjp+3cmUG1erZOkRUny3M0WTV6jRj7a1ei3zk5Xz4uTQigbFhQb3FEbqKwRspDX+n1yb5Ou0jvu/qP6d0M0Mk2RcCkbN9R9KCk6/YDUCPw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4945.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(122000001)(110136005)(316002)(9686003)(2906002)(55016002)(5660300002)(33656002)(54906003)(83380400001)(38100700002)(64756008)(6506007)(26005)(76116006)(38070700005)(86362001)(8676002)(19627235002)(53546011)(107886003)(508600001)(66946007)(66446008)(71200400001)(186003)(8936002)(7696005)(66476007)(66556008)(4326008)(52536014);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?X+iPsnExLYY/59HXYyK379LotJplghMDPwAR67fE1n+/qfS5Ne61FrBMWkSf?= =?us-ascii?Q?f7qp7ixKchGiMH4HD66o57OzszXyR+xZ2TFuLie/KN71/LtjJk8DtZe4t9Gk?= =?us-ascii?Q?YsmJ62OllK4K2XRF65Ksl1+mtydRffSHO5gS9lK4vECRqAH4sXEZT8ESEIK4?= =?us-ascii?Q?Eh8OYpLamPxMgDl84Vyo3P4QdLit0MFP9q+TezX5pXaOet+s6TIFaYB9kxHX?= =?us-ascii?Q?A9CCqX//xxag18oeAqk6qsldKIpIDTB5wfIuUmhAEeGsiPr5HKnIdhgJbOfc?= =?us-ascii?Q?OASAxun8OpjeoXzr67hKxiO5Y6NAVGp6LzuWK8slb10CmA5YeENjRKrjwJsE?= =?us-ascii?Q?p9u3vFOaehi2NYp93dAwdIj4zstIJwUFPkjInprsko9z8OAgR7hcmv6xLv4P?= =?us-ascii?Q?5dcnT70MLMJXTVJ0BzC2vVLE7e/SLcothwZKivzivyeYgDXRIIoKaV/fGkte?= =?us-ascii?Q?vkSMesSPfm2o1EHutgijd3uY4XC4zsxByIE0/0UB8vKa5FQGmc3gFcwW2R7N?= =?us-ascii?Q?MGHXijtCkrn3gJ9xmO4iiKuw9iUcxPNoIkGSUx+NLwV3W3Py+tzkb27nRZAM?= =?us-ascii?Q?UZLhXQARh1cLBLfEPcqnYMKLxmVhmweH2mBgQmar8IxkcDpbc6Kw+jYbtdU5?= =?us-ascii?Q?FhoLnht1ZkWMURhebOlpc9Um15oiCEEOcmud/LzRy8iT0nnV7AWoGmMzxyM/?= =?us-ascii?Q?wsRVTTh0ave8Czy5SkgTRRufJ8G38VElW/XOZqQpleQvpX1iHyUXNi0D8ORf?= =?us-ascii?Q?GyNzBcAlW9sFbMPL7a7DFt9AzaxZCNbwC6lVcHzBKlIYiy336rxPHl9rH474?= =?us-ascii?Q?FoF6FdD4PZevL9sCGEs3mwTkh2mDH92AQfvmmZiY4nfygvFp8NESdRIG7kdU?= =?us-ascii?Q?zBAB6x6FXRaDd54O6OHFo9zRewfGf6AWU93nQXSp2WmMXXNWi5FecMNcMd5o?= =?us-ascii?Q?NAzi+aZLvoDYniqGC+BX+1+mArmguEn+UJ+6h92W5ZBUllGtg14sa8IXX5mZ?= =?us-ascii?Q?J6E4BcZKOxXIL/XbiqISkvgYWb3WT4OTg5Vo2X/lbh9rxOGRAmZR6PEd5PRe?= =?us-ascii?Q?jkL6XayUc9UH+gg3cuZUlO8CVdVjuYi+8Ku+etsl0NFiPPswdgfTnMmqM8Jr?= =?us-ascii?Q?GACIGRK6mPZVVIfvtoKrDXyBNeblK+RRhZ6eLvxmZ5Wo67UNyYmbaqY1s641?= =?us-ascii?Q?PMj8tL1bsHGarlWEpnLizKrHPHrcPiL+ZOogNPI/i66A8wUy/EF75otWMoSN?= =?us-ascii?Q?FH3lttWnlWej8JsbNpZWypbKI3SNeIOtrGvob1+45CekpTcARnm/RBMkgEz0?= =?us-ascii?Q?PJhTXqh3KJ+exRVGHjQrkOEv?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4945.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca52f8fa-880d-481a-f95f-08d98cef54ce X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2021 19:42:59.5288 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: +baObCDJyDoOY/Jc58NshTD05GHeCrchN+UHRmRzqzBu2UudWk7qvpveK7p0Is7rFd9cqYRstHPDorkVERCRDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1904 Return-Path: maurice.ma@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Maurice Ma > -----Original Message----- > From: Kesavan Balakrishnan, ThiyaguX > > Sent: Sunday, October 10, 2021 21:30 > To: devel@edk2.groups.io > Cc: Kesavan Balakrishnan, ThiyaguX > ; Ma, Maurice > ; Dong, Guo ; Ni, Ray > ; You, Benjamin ; Liu, > Zhiguang > Subject: [PATCH] UefiPayloadPkg: Remove SystemTableInfo GUID. >=20 > SystemTableInfo GUID is not a Spec defined GUID. > But the latest SBL uses SystemTableInfo to get ACPI and SMBIOS table > information. So moving the SystemTableInfo GUID implementation to > SblParseLib. >=20 > Cc: Maurice Ma > Cc: Guo Dong > Cc: Ray Ni > Cc: Benjamin You > Cc: Zhiguang Liu >=20 > Signed-off-by: Guo Dong > Signed-off-by: Thiyagu Kesavan Balakrishnan > > --- > UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf | 1 - > UefiPayloadPkg/Include/Library/BlParseLib.h | 2 ++ > UefiPayloadPkg/Library/CbParseLib/CbParseLib.c | 40 > +++++++++++++++++++++++++++++++--------- > UefiPayloadPkg/Library/SblParseLib/SblParseLib.c | 38 > +++++++++++++++++++++++++++++++++----- > UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 22 +++++++++= -- > ----------- > UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h | 1 - > UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 - > 7 files changed, 75 insertions(+), 30 deletions(-) >=20 > 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 >=20 > [Guids] > - gUefiSystemTableInfoGuid > gUefiAcpiBoardInfoGuid > gEfiGraphicsInfoHobGuid >=20 > diff --git a/UefiPayloadPkg/Include/Library/BlParseLib.h > b/UefiPayloadPkg/Include/Library/BlParseLib.h > index 1244190d4e..de1da356e5 100644 > --- a/UefiPayloadPkg/Include/Library/BlParseLib.h > +++ b/UefiPayloadPkg/Include/Library/BlParseLib.h > @@ -12,6 +12,8 @@ > #include > #include > #include > +#include #include > + >=20 > #ifndef __BOOTLOADER_PARSE_LIB__ > #define __BOOTLOADER_PARSE_LIB__ > diff --git a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c > b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c > index 4f90687e40..b260cfa04e 100644 > --- a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c > +++ b/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c > @@ -410,9 +410,9 @@ ParseMemoryInfo ( >=20 >=20 > /** > - Acquire acpi table and smbios table from coreboot > + Acquire SMBIOS table from coreboot. >=20 > - @param SystemTableInfo Pointer to the system table info > + @param SmbiosTable Pointer to the SMBIOS table info. >=20 > @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,39 @@ ParseSystemTable ( > if (EFI_ERROR (Status)) { > return EFI_NOT_FOUND; > } > - SystemTableInfo->SmbiosTableBase =3D (UINT64) (UINTN)MemTable; > - SystemTableInfo->SmbiosTableSize =3D MemTableSize; > + SmbiosTable->SmBiosEntryPoint =3D (UINT64) (UINTN)MemTable; >=20 > + 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 =3D ParseCbMemTable (SIGNATURE_32 ('I', 'P', 'C', 'A'), &MemTab= le, > &MemTableSize); > if (EFI_ERROR (Status)) { > return EFI_NOT_FOUND; > } > - SystemTableInfo->AcpiTableBase =3D (UINT64) (UINTN)MemTable; > - SystemTableInfo->AcpiTableSize =3D MemTableSize; > + AcpiTableHob->Rsdp =3D (UINT64) (UINTN)MemTable; >=20 > - return Status; > + return RETURN_SUCCESS; > } >=20 >=20 > diff --git a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c > b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c > index 7214fd87d2..0f83771e6e 100644 > --- a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c > +++ b/UefiPayloadPkg/Library/SblParseLib/SblParseLib.c > @@ -110,9 +110,9 @@ ParseMemoryInfo ( > } >=20 > /** > - Acquire acpi table and smbios table from slim bootloader > + Acquire SMBIOS table from slim bootloader. >=20 > - @param SystemTableInfo Pointer to the system table info > + @param SmbiosTable Pointer to the SMBIOS table info. >=20 > @retval RETURN_SUCCESS Successfully find out the tables. > @retval RETURN_NOT_FOUND Failed to find the tables. > @@ -120,8 +120,8 @@ ParseMemoryInfo ( > **/ > RETURN_STATUS > EFIAPI > -ParseSystemTable ( > - OUT SYSTEM_TABLE_INFO *SystemTableInfo > +ParseSmbiosTable ( > + OUT UNIVERSAL_PAYLOAD_SMBIOS_TABLE *SmbiosTable > ) > { > SYSTEM_TABLE_INFO *TableInfo; > @@ -132,12 +132,40 @@ ParseSystemTable ( > return RETURN_NOT_FOUND; > } >=20 > - CopyMem (SystemTableInfo, TableInfo, sizeof (SYSTEM_TABLE_INFO)); > + SmbiosTable->SmBiosEntryPoint =3D TableInfo->SmbiosTableBase; >=20 > return RETURN_SUCCESS; > } >=20 >=20 > +/** > + 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 > + ) > +{ > + SYSTEM_TABLE_INFO *TableInfo; > + > + TableInfo =3D (SYSTEM_TABLE_INFO *)GetGuidHobDataFromSbl > + (&gUefiSystemTableInfoGuid); if (TableInfo =3D=3D NULL) { > + ASSERT (FALSE); > + return RETURN_NOT_FOUND; > + } > + > + AcpiTableHob->Rsdp =3D TableInfo->AcpiTableBase; > + > + return RETURN_SUCCESS; > +} > + > /** > Find the serial port information >=20 > diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c > b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c > index f2ac3d2c69..ade81dbff5 100644 > --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c > +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c > @@ -274,18 +274,6 @@ BuildHobFromBl ( > } >=20 >=20 > - // > - // Create guid hob for system tables like acpi table and smbios table > - // > - Status =3D ParseSystemTable(&SysTableInfo); > - ASSERT_EFI_ERROR (Status); > - if (!EFI_ERROR (Status)) { > - NewSysTableInfo =3D BuildGuidHob (&gUefiSystemTableInfoGuid, sizeof > (SYSTEM_TABLE_INFO)); > - ASSERT (NewSysTableInfo !=3D 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 > // > @@ -295,6 +283,10 @@ BuildHobFromBl ( > SmBiosTableHob->Header.Length =3D sizeof > (UNIVERSAL_PAYLOAD_SMBIOS_TABLE); > SmBiosTableHob->SmBiosEntryPoint =3D SysTableInfo.SmbiosTableBase; > DEBUG ((DEBUG_INFO, "Create smbios table > gUniversalPayloadSmbiosTableGuid guid hob\n")); > + Status =3D ParseSmbiosTable(SmBiosTableHob); if (!EFI_ERROR (Status)) > + { > + DEBUG ((DEBUG_INFO, "Detected Smbios Table at 0x%lx\n", > + SmBiosTableHob->SmBiosEntryPoint)); > + } >=20 > // > // Creat ACPI table Hob > @@ -304,7 +296,11 @@ BuildHobFromBl ( > AcpiTableHob->Header.Revision =3D > UNIVERSAL_PAYLOAD_ACPI_TABLE_REVISION; > AcpiTableHob->Header.Length =3D sizeof > (UNIVERSAL_PAYLOAD_ACPI_TABLE); > AcpiTableHob->Rsdp =3D SysTableInfo.AcpiTableBase; > - DEBUG ((DEBUG_INFO, "Create smbios table > gUniversalPayloadAcpiTableGuid guid hob\n")); > + DEBUG ((DEBUG_INFO, "Create ACPI table > gUniversalPayloadAcpiTableGuid > + guid hob\n")); Status =3D ParseAcpiTableInfo(AcpiTableHob); if > + (!EFI_ERROR (Status)) { > + DEBUG ((DEBUG_INFO, "Detected ACPI Table at 0x%lx\n", > + AcpiTableHob->Rsdp)); } >=20 > // > // Create guid hob for acpi board information diff --git > a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h > b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h > index de51c2fba9..bc1ae10dcc 100644 > --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h > +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h > @@ -27,7 +27,6 @@ > #include > #include > > #include > -#include > #include > #include > #include > 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 > -- > 2.33.0.windows.2