From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web12.11187.1634831099206277724 for ; Thu, 21 Oct 2021 08:45:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=oQ+wvtPP; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: guo.dong@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10144"; a="216232542" X-IronPort-AV: E=Sophos;i="5.87,170,1631602800"; d="scan'208";a="216232542" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2021 08:44:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,170,1631602800"; d="scan'208";a="491828403" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga007.fm.intel.com with ESMTP; 21 Oct 2021 08:44:56 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Thu, 21 Oct 2021 08:44:56 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Thu, 21 Oct 2021 08:44:55 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Thu, 21 Oct 2021 08:44:55 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Thu, 21 Oct 2021 08:44:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m/LZJOtq7/efJRxC4HPF3vgB8lCkyU6DETOj0F0b0Of5EPTOehdtfQVafVcTDQWmyIpetgFStIyORUEFn9jXzqK+BCQgtKkBD+sdgJpUBK7jl7K8/GMj7juSOvEVP1GGfgbNYtIMXOW5M4OA7X/iYmnD6pXHpmi8L5sWDpsL8OKiU5UYSXYpXnVKOK9dluNfbTJmG/MsweyKDytK3c7beTG0ESnPP9drXgXZAqOwWN//3QRSXPsekO5C0j5Ml8UxG7tgBkZK1kDhJVBibo3XmE3dTb53KDW7fAOYyDVkhTD4cfkCO7zJOgmTfphSbbXPSy8lvkPT02jPerTmfv5QfQ== 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=e32n3nUyrKBkgYnA8xTA7zhY3RA9iphmOz3t1yKfhsI=; b=Vgt/SSeKKoMiCtviZrdLZ7MPFlm0T3i7wfWv2IY1+Yz+OL6qOomFuzHluSeNsohk86kcfK2Q9KavImsg60XIDvoCeCj0EspMY8HmU3zKRziNzGRG0nDXm/9GW4uOpzmu4WUknj5K2pEK7hSRYGWQBU+9hdbmQ1zTz3uTB+pF4SeHW+Z01MPxSiHxn7w5GwpOKC6nKDAxV6AqhPJ+oiyK3R1MNOq5MIHT1HVnhw1sRVhwmvuIrNNxUsnw95fGSUbwcClivpMc1Wjxk1LIwfh/EbA/TzLQn+1WTwtFwOjoKsid6zMY26Yj8NIPVxmVxyTKvidy4Wn/qhzjM+MXPLhpiA== 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=e32n3nUyrKBkgYnA8xTA7zhY3RA9iphmOz3t1yKfhsI=; b=oQ+wvtPPahe/JJv6zDynK35mALYCqqlvnsioQ48Qoqjqz3/meCgvHT3SJAx4Evez99psdMADSWdEt2cAEM4aBECIo9gLpMjOWX5YiMTYifOu2iTVN5uhzE9uqCxk90CewkjaPSvDOFjl9FDHyEUHOe4FXWut+HvPdAt6YXoOckg= Received: from BYAPR11MB3622.namprd11.prod.outlook.com (2603:10b6:a03:fe::30) by SJ0PR11MB4911.namprd11.prod.outlook.com (2603:10b6:a03:2ad::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Thu, 21 Oct 2021 15:44:54 +0000 Received: from BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::90e0:e0a7:9c0b:1f40]) by BYAPR11MB3622.namprd11.prod.outlook.com ([fe80::90e0:e0a7:9c0b:1f40%6]) with mapi id 15.20.4608.018; Thu, 21 Oct 2021 15:44:54 +0000 From: "Guo Dong" To: "Kesavan Balakrishnan, ThiyaguX" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "Ni, Ray" , "You, Benjamin" , "Liu, Zhiguang" Subject: Re: [PATCH v6] UefiPayloadPkg: Remove SystemTableInfo GUID. Thread-Topic: [PATCH v6] UefiPayloadPkg: Remove SystemTableInfo GUID. Thread-Index: AQHXxXiAAjztjJGCekiNxLnanByQJavdmiaA Date: Thu, 21 Oct 2021 15:44:54 +0000 Message-ID: References: <20211020060519.373-1-thiyagux.kesavan.balakrishnan@intel.com> In-Reply-To: <20211020060519.373-1-thiyagux.kesavan.balakrishnan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.200.16 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: 9e8958f1-cdfa-43cc-2fba-08d994a9ba82 x-ms-traffictypediagnostic: SJ0PR11MB4911: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AMAidevFwYf5lKQ8uQympE4Zl8VBFsE2+/vOYtOCfefl6NnIGL3ybW36TBOvCEq8LQ6KV61/gYN5LYnveY8rJ8Pr1qfLqz8Fnnm1RduAcS67tAzz8vWF1+YZ6uTvdLkZQkFxo5268OL3six2ZoKjaJJAzyBbPSyUw6VFT8d7yZ8fYavlbrRhp0+wE/P5/RMinsjvcefiGWpbzWpJOWmYEjaW58CmweqPfqA8aAauVuWcQ/CYRTmm6J2cPYpy/cJHaDCjE/owZ4dn8CWpApNQWef6Qz3BpAbnQuCDcr2J4Y5YtoQceLJrkHXBOeTlc5YrwwNbdpmjIJdSqkrnbSde8AVzS/PJVaJxx74kef9Db5gooPK1GG63OsQOZ5atEK9tOsh965eY5C0L/90ovraC1ISGhQBUJ5pcMJK9bpc4XAv5FUkPRMZOLqXj+5SpLYp0B8nZWluUKZHAVYN7juze9fSgBEFQC5UxtA90eJswbROzRNzUlMI+HdtyjVFU86+gN/GDjtLgaUfg1cZVnxOHTFkwFi+/W7V2iCcQfAOLO52R3VEbeLhPCnfHoFvbk/xn32cFZP+bkpCf2zV0Zwm1r183jMymeYchs/tE/DEkldE/jIkkaFInk5HpfhmFo9QS7tAVP/kNZmVHTvbkWqZih9Rrj3VYZm9Yb5tej+ubWkjdDPqA0Xr3BpIh/te+qxpPi+RYUX9h+wgjILqvskUF8Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3622.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6506007)(86362001)(33656002)(186003)(19627235002)(7696005)(71200400001)(4326008)(508600001)(53546011)(8676002)(2906002)(8936002)(30864003)(66556008)(66476007)(66946007)(107886003)(66446008)(64756008)(55016002)(9686003)(122000001)(52536014)(316002)(54906003)(110136005)(38070700005)(82960400001)(76116006)(83380400001)(38100700002)(5660300002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?x0S4QJcbhUBGEfH6sE0JdTPMYiHnLW0J6dV3J3mxaAYarSZfzpLTxHpHqLjd?= =?us-ascii?Q?i8qvheznKHzMTYVjUf9Ngetf+3jf3cYhRbra3Yb/bvu8/Zy9bLBFhHySAe+/?= =?us-ascii?Q?uw2PJ7UdLvxq/vMnFi+jq1tT5/dvPhz8SQeDcP6TeTFPeBYkjQTVELr08oAB?= =?us-ascii?Q?YxPl9Z+aGYh/cSpwiyPAA5AfNe0hPcjEEyV+hP7MpAG9XjNg2LQvI6gU0gC8?= =?us-ascii?Q?SB9AplYCFZxbniQ5xovIRd6GTQIhnWTF7q7QVDmA50/5K7+Oy4Be8AKxBKW+?= =?us-ascii?Q?I9XkFU+bIMjkShvqbip7muJpXnfivw/bnSGs3phz5us7SeIynYAO2ibAF/SL?= =?us-ascii?Q?kJrM96vPTZMEANBg5IA0iT1K8oOed1XMwFOOKZ4YQVTyf81USccXEBcRkwwP?= =?us-ascii?Q?tgGeGqLR7FMChCRGDkjU0TLJpcshENl9lFZaN61mu+OoN02YPeeWqpir39xy?= =?us-ascii?Q?KkK+527j6PMWwRJgj5zcqv7v/lptV2qhBqJVw4a0cdEZE+vSgVl5+Cvz81hs?= =?us-ascii?Q?ygMOI8f0iwZ9bSpxveas9+y8EY495Iv1bVDDXGthFdxWGZLCx07q2owsf+Ds?= =?us-ascii?Q?wLTjLtULS7Bxv1GXrZpUNj+hfd+CbdTbYHex2TA4EkgiLim2hFXrC2M/CIwz?= =?us-ascii?Q?MXdvI2HP5KcBiGiE2usqDcDrIvNsYlWmMKj7FTqvA1TCGRrxjrLmemKLP806?= =?us-ascii?Q?XYhPAlg1/XSBfCdKKi4xWmyoU+VobOi9pxjn3yPLwONBas16c3TBLwAswnUY?= =?us-ascii?Q?rc/EHl2fRYqDCYy56z8FxrEcov/WhAYhL9LAQobRbnJHj8TDy/3yZuM9FjGS?= =?us-ascii?Q?1yDwo6beej5x0sv47aGEOEnn1giJsxd0XSHQqDKbGRYLBCs1GSZwRcD/53aY?= =?us-ascii?Q?tdYrkhH93H17FHiVpZkG52jjRbCl1uGpO8SUTlDBJhm0Te+KG7V5R9QMYH+c?= =?us-ascii?Q?mLa+8WWG01svmE4o39JRjQCj5DkyZsDp/VBSPPKaxW2ggfCUoiu4kVZnziWX?= =?us-ascii?Q?g7qtPslUZUL61gIILytKr6K0aCTVyULGMf+eBfk4pcsbHcgD4TsbUWFeMKAn?= =?us-ascii?Q?KQtGBMKOh2k3DGCktjHI8tbb9pVWu7I5bZ32pYMJYymOqlbYoBpgzyTRoqxw?= =?us-ascii?Q?YweihGghjWcFf262G5NAi4P0DDK4nZR4kOFAIw0UpE0jWm2UyLwp7agCGw5M?= =?us-ascii?Q?WG+HfgbnUjtHYxEPx7p8woJfSEx4oQ4rCXuw/x7VuGBlpp3yOxkAcVzJu9L9?= =?us-ascii?Q?OTMgaWvm489PKyjPjYkql1XYbxKa4W2qzHANBCyQ5qh4majhuoOzxXttjQQR?= =?us-ascii?Q?Z+q/htlCKR7UedYZJBPml2eK/76IsSLOnYZ+vTQEqlo06noQbAiIvhyRj2Sv?= =?us-ascii?Q?WCJqIddH2z8R+m3e7VzWcxDyEqTJTqkGoEPPFTTRDASrES4KTxyIJLQdy0Rq?= =?us-ascii?Q?ubVGXofCU6HrA0D5iqTKv31XfGrWnIs1Yezqlz9QER6RR9V6Q4GdftwQqHlf?= =?us-ascii?Q?zGTmV6sBpgSeXr8=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3622.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e8958f1-cdfa-43cc-2fba-08d994a9ba82 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Oct 2021 15:44:54.7784 (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: guo.dong@intel.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4911 Return-Path: guo.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Guo Dong -----Original Message----- From: Kesavan Balakrishnan, ThiyaguX =20 Sent: Tuesday, October 19, 2021 11:05 PM To: devel@edk2.groups.io Cc: Kesavan Balakrishnan, ThiyaguX ; Ma, Maurice ; Dong, Guo ; Ni, = Ray ; You, Benjamin ; Liu, Zhigua= ng Subject: [PATCH v6] 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 Cc: Guo Dong Cc: Ray Ni Cc: Benjamin You Cc: Zhiguang Liu Signed-off-by: Guo Dong Signed-off-by: Thiyagu Kesavan Balakrishnan --- UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h | 1 - UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf | 1 - UefiPayloadPkg/Include/Guid/SystemTableInfoGuid.h | 26 -----------= --------------- UefiPayloadPkg/Include/Library/BlParseLib.h | 25 +++++++++++= +++++++++----- UefiPayloadPkg/Library/CbParseLib/CbParseLib.c | 40 +++++++++++= ++++++++++++++++++++--------- UefiPayloadPkg/Library/SblParseLib/SblParseLib.c | 42 +++++++++++= ++++++++++++++++++++++++------- UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf | 1 - UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 28 ++++++++++-= ----------------- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h | 1 - UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf | 1 - UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 1 - UefiPayloadPkg/UefiPayloadPkg.dec | 1 - 12 files changed, 96 insertions(+), 72 deletions(-) diff --git a/UefiPayloadPkg/BlSupportDxe/BlSupportDxe.h b/UefiPayloadPkg/Bl= SupportDxe/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 =20 #include -#include #include #include =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/Guid/SystemTableInfoGuid.h b/UefiPayloa= dPkg/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.
- 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/I= nclude/Library/BlParseLib.h index 7198e419bd..fb7bb0cb0e 100644 --- a/UefiPayloadPkg/Include/Library/BlParseLib.h +++ b/UefiPayloadPkg/Include/Library/BlParseLib.h @@ -13,8 +13,9 @@ #include #include #include -#include #include +#include #include=20 + =20 #define GET_BOOTLOADER_PARAMETER() PcdGet64 (PcdBootloaderParameter) =20 @@ -55,9 +56,9 @@ ParseMemoryInfo ( ); =20 /** - Acquire acpi table and smbios table from slim bootloader + Acquire SMBIOS table from bootloader. =20 - @param SystemTableInfo Pointer to the system table info + @param SmbiosTable Pointer to the system table info =20 @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 ); =20 +/** + 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 + ); =20 /** Find the serial port information diff --git a/UefiPayloadPkg/Library/CbParseLib/CbParseLib.c b/UefiPayloadPk= g/Library/CbParseLib/CbParseLib.c index 46314e5566..61c5683260 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; + + 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; =20 Status =3D ParseCbMemTable (SIGNATURE_32 ('I', 'P', 'C', 'A'), &MemTable= , &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/UefiPayload= Pkg/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 ( } =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,24 +120,52 @@ 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; =20 - TableInfo =3D (SYSTEM_TABLE_INFO *)GetGuidHobDataFromSbl (&gUefiSystemTa= bleInfoGuid); + TableInfo =3D (UNIVERSAL_PAYLOAD_SMBIOS_TABLE *)GetGuidHobDataFromSbl=20 + (&gUniversalPayloadSmbiosTableGuid); if (TableInfo =3D=3D NULL) { ASSERT (FALSE); return RETURN_NOT_FOUND; } =20 - CopyMem (SystemTableInfo, TableInfo, sizeof (SYSTEM_TABLE_INFO)); + SmbiosTable->SmBiosEntryPoint =3D TableInfo->SmBiosEntryPoint; =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 + ) +{ + UNIVERSAL_PAYLOAD_ACPI_TABLE *TableInfo; + + TableInfo =3D (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GetGuidHobDataFromSbl=20 + (&gUniversalPayloadAcpiTableGuid); + if (TableInfo =3D=3D NULL) { + ASSERT (FALSE); + return RETURN_NOT_FOUND; + } + + AcpiTableHob->Rsdp =3D TableInfo->Rsdp; + + return RETURN_SUCCESS; +} + /** Find the serial port information =20 diff --git a/UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf b/UefiPaylo= adPkg/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 =20 [Guids] - gUefiSystemTableInfoGuid gUefiSerialPortInfoGuid gLoaderMemoryMapInfoGuid gEfiGraphicsInfoHobGuid diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/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; @@ -274,18 +272,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 (S= YSTEM_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", Sys= TableInfo.AcpiTableBase, SysTableInfo.AcpiTableSize)); - DEBUG ((DEBUG_INFO, "Detected Smbios Table at 0x%lx, length 0x%x\n", S= ysTableInfo.SmbiosTableBase, SysTableInfo.SmbiosTableSize)); - } // // Creat SmBios table Hob // @@ -293,8 +279,11 @@ BuildHobFromBl ( ASSERT (SmBiosTableHob !=3D NULL); SmBiosTableHob->Header.Revision =3D UNIVERSAL_PAYLOAD_SMBIOS_TABLE_REVIS= ION; SmBiosTableHob->Header.Length =3D sizeof (UNIVERSAL_PAYLOAD_SMBIOS_TABLE= ); - SmBiosTableHob->SmBiosEntryPoint =3D SysTableInfo.SmbiosTableBase; DEBUG ((DEBUG_INFO, "Create smbios table gUniversalPayloadSmbiosTableGui= d guid hob\n")); + Status =3D ParseSmbiosTable(SmBiosTableHob); if (!EFI_ERROR (Status))=20 + { + DEBUG ((DEBUG_INFO, "Detected Smbios Table at 0x%lx\n",=20 + SmBiosTableHob->SmBiosEntryPoint)); + } =20 // // Creat ACPI table Hob @@ -303,13 +292,16 @@ BuildHobFromBl ( ASSERT (AcpiTableHob !=3D NULL); 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=20 + guid hob\n")); Status =3D ParseAcpiTableInfo(AcpiTableHob); if=20 + (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "Detected ACPI Table at 0x%lx\n",=20 + AcpiTableHob->Rsdp)); } =20 // // Create guid hob for acpi board information // - AcpiBoardInfo =3D BuildHobFromAcpi (SysTableInfo.AcpiTableBase); + AcpiBoardInfo =3D BuildHobFromAcpi (AcpiTableHob->Rsdp); ASSERT (AcpiBoardInfo !=3D NULL); =20 // diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.h index 637ed9c20b..716430e3cb 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/UefiPayloadEntry.inf b/UefiPay= loadPkg/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/Ue= fiPayloadPkg/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/UefiPayload= Pkg.dec index e5e8db8863..25f3b978f1 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -32,7 +32,6 @@ ##include/Guid/BootManagerMenu.h gEdkiiBootManagerMenuFileGuid =3D { 0xdf939333, 0x42fc, 0x4b2a, { 0xa5, = 0x9e, 0xbb, 0xae, 0x82, 0x81, 0xfe, 0xef }} =20 - gUefiSystemTableInfoGuid =3D {0x16c8a6d0, 0xfe8a, 0x4082, {0xa2, 0x8, 0x= cf, 0x89, 0xc4, 0x29, 0x4, 0x33}} gUefiAcpiBoardInfoGuid =3D {0xad3d31b, 0xb3d8, 0x4506, {0xae, 0x71, 0x= 2e, 0xf1, 0x10, 0x6, 0xd9, 0xf}} gUefiSerialPortInfoGuid =3D { 0x6c6872fe, 0x56a9, 0x4403, { 0xbb, 0x98,= 0x95, 0x8d, 0x62, 0xde, 0x87, 0xf1 } } gLoaderMemoryMapInfoGuid =3D { 0xa1ff7424, 0x7a1a, 0x478e, { 0xa9, 0xe4,= 0x92, 0xf3, 0x57, 0xd1, 0x28, 0x32 } } -- 2.33.0.windows.2