From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76810+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76810+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1624301089; cv=none; d=zohomail.com; s=zohoarc; b=dbLvlXets335IUOxdl0d2UJ4ma5ikYot18xruH/zTOE9k4IkTD1aS7rsgABZgRj6G11Jxc1G1HPDlha3VMW5X5dJe90CSvG4yJntvVpkUFda5f3lp+1yeRCGmBsxD6WIx6UJNS9eNgyn/HmOK0hHBmq0olVbUG012HMsPLI/0GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624301089; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=tA1+nX3Gz0nnWJkFLakCCIuLnoxnEsfoQkKqMAK62qM=; b=iwgDKUXm6dfPIMDYEeD2s7PzPJamD1/VtHHcJVX9AMBYcedqax//15ItzQKgZkm1n6hxO53uEsms7On3jnD7/77SG6hm3oxCt2MdtDyYfGFiCzAw1nO+MsOxlJSqLLQ+0n2EzpzaLkh6KWOKJsUy6jgbgTjMxiTAG9NRCUnhknE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76810+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1624301089827980.4039625837548; Mon, 21 Jun 2021 11:44:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id nzyaYY1788612xSPo2m1HHOq; Mon, 21 Jun 2021 11:44:49 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.44355.1624265224391114153 for ; Mon, 21 Jun 2021 01:47:07 -0700 IronPort-SDR: 554LPkQRcMhNUdBlQFUCcpi07by2JjsXcw+cO9eeVInsb8sbxHTmirjUeNyozf9Dg9CwpSjLhI dpXDm7GUYgVQ== X-IronPort-AV: E=McAfee;i="6200,9189,10021"; a="206623626" X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="206623626" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2021 01:47:07 -0700 IronPort-SDR: HBZBbWEEIesdkFxG9fNaP2fou9XleeWjFsJFnRUv0OwM8IWDhGJuZimigVFVBfnHrF0MN414xo bNlgIg/yGbWA== X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="453813381" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2021 01:47:06 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You , DunTan Subject: [edk2-devel] [PATCH 1/2] UefiPayloadPkg: Add new structure for BootManagerMenuFile HOB Date: Mon, 21 Jun 2021 16:46:32 +0800 Message-Id: <20210621084633.1593-2-dun.tan@intel.com> In-Reply-To: <20210621084633.1593-1-dun.tan@intel.com> References: <20210621084633.1593-1-dun.tan@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dun.tan@intel.com X-Gm-Message-State: uUKIVTI2KyrZ4Cue5kPDX1hVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1624301089; bh=wJhmx1GPSsdLoKlGpbjyL3msHIz2NVsTgAanu6Jul5c=; h=Cc:Date:From:Reply-To:Subject:To; b=DVGhOtLdgVnRdF2Rzgx0wVvXNE7vyedalhdZFdKH4gp8j+i74uITnCxdfR+t4KDs8ME LpeBe7SWfhw66aG4ed6pf6DtlTiPYs8TNwn4TylftAzwbw3g+5dP4FGksDln3hgufrXmj KI1OIQfncET93fuItpxO6QAW9UMEdl0EomM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add new structure for BootManagerMenuFile HOB in UefiPayloadPkg Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: DunTan --- UefiPayloadPkg/Include/Guid/BootManagerMenu.h | 27 +++++++++++++++++++++++= ++++ UefiPayloadPkg/UefiPayloadPkg.dec | 3 +++ 2 files changed, 30 insertions(+) diff --git a/UefiPayloadPkg/Include/Guid/BootManagerMenu.h b/UefiPayloadPkg= /Include/Guid/BootManagerMenu.h new file mode 100644 index 0000000000..10fb874640 --- /dev/null +++ b/UefiPayloadPkg/Include/Guid/BootManagerMenu.h @@ -0,0 +1,27 @@ +/** @file + Define the structure for the Boot Manager Menu File. + +Copyright (c) 2021, Intel Corporation. All rights reserved.
+SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_H_ +#define UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_H_ + +#include +#include + +#pragma pack (1) + +typedef struct { + UNIVERSAL_PAYLOAD_GENERIC_HEADER Header; + GUID FileName; +} UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU; + +#pragma pack() + +#define UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_REVISION 1 + +extern GUID gUniversalPayloadBootManagerMenuFileGuid; +#endif diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec index 105e1f5a1c..850592976d 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -29,6 +29,9 @@ # gBmpImageGuid =3D { 0x878AC2CC, 0x5343, 0x46F2= , { 0xB5, 0x63, 0x51, 0xF8, 0x9D, 0xAF, 0x56, 0xBA } } =20 + ##include/Guid/BootManagerMenu.h + gUniversalPayloadBootManagerMenuFileGuid =3D { 0xdf939333, 0x42fc, 0x4b2= a, { 0xa5, 0x9e, 0xbb, 0xae, 0x82, 0x81, 0xfe, 0xef }} + 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 } } --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76810): https://edk2.groups.io/g/devel/message/76810 Mute This Topic: https://groups.io/mt/83696284/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76811+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76811+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1624301086; cv=none; d=zohomail.com; s=zohoarc; b=mnab//Oknfo6pQAb/nFRbA5r3Hj5R1ZfH4rHAL9dQJ8a0r8sR2kQLctW0CR+TL/ZbOe0n3uU4IUC39euf0xULReYthGjcu6IRdykLXU9LIk2VWLQzeQvpUMQITxj1CkrOxcXgLXZAUjP46jxGxBotf+K9Jtf7kDGDKi4rjYYvsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624301086; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Cc+y/tyCdcXDMKyXAHCzSAr/KErwQUUSmvjOg9ARD2Q=; b=KtQYGqSkmWT6Fy3C7RtskG/WgAzdqAXeZ0uTZDeHOKJJ9zgK3oI+K5ikiV59pAZoCll5ZInV2qen8+csVTyzTJPT6i01K5P5MyTdF8EOeLqMf7oYqIxF6+nZWoUtenRIJMCjEY17Ifpx7i9QZ1wQaa0daPZGApK32iLgJTmAYI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76811+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1624301086353415.02406747567704; Mon, 21 Jun 2021 11:44:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id DSZtYY1788612xbhTnxE1W1o; Mon, 21 Jun 2021 11:44:46 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.44355.1624265224391114153 for ; Mon, 21 Jun 2021 01:47:12 -0700 IronPort-SDR: w01Tj7ZhY/la95KJ2Gjp+KfOB2itnKDhCROSWz+sSLKVOKXodFMjGIdT8+wtjMDQ05TzcrkrgA XBcQUc5Fih+g== X-IronPort-AV: E=McAfee;i="6200,9189,10021"; a="206623643" X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="206623643" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2021 01:47:11 -0700 IronPort-SDR: XkTqYEA1tG7g5VeWPR9qQpNTCT1AWsiidZCXnIDrsZjZseRshs5qPbDD5wV/MBtLLuvCPE0rDm 31u22lZNDQow== X-IronPort-AV: E=Sophos;i="5.83,289,1616482800"; d="scan'208";a="453813401" X-Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2021 01:47:10 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You , DunTan Subject: [edk2-devel] [PATCH 2/2] UefiPayloadPkg: consume the BootManagerMenuFile HOB Date: Mon, 21 Jun 2021 16:46:33 +0800 Message-Id: <20210621084633.1593-3-dun.tan@intel.com> In-Reply-To: <20210621084633.1593-1-dun.tan@intel.com> References: <20210621084633.1593-1-dun.tan@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dun.tan@intel.com X-Gm-Message-State: iRWPu0wKXiVkYFhEsytOM00Ex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1624301086; bh=RfW5LEt2vkVClZHonajvJnL7So+BmIYBfyEeDCRxwzI=; h=Cc:Date:From:Reply-To:Subject:To; b=ZTwWCuFK9nrRmG7vDccdh/A4Ka2IfytrG/pqZC3tsb9E461QRJhbBWdAwU66yIyy7qs SqerhQsnlbZybf7Tk8mfiUeTyqKgYXbHKlh+uEpjNUdR4Honzc5Bx+7h/csYmccoCYdrM NvgwNvHfcbUU20aytJz9yHj9kH9TpOeG2OA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Consume the BootManagerMenuFile HOB in PlatformBootManagerLib This Lib is in UefiPayloadPkg Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: DunTan --- UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c |= 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |= 5 ++++- UefiPayloadPkg/UefiPayloadPkg.dsc |= 2 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index fce48d26a1..afd9664959 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -10,6 +10,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "PlatformBootManager.h" #include "PlatformConsole.h" #include +#include +#include =20 UNIVERSAL_PAYLOAD_PLATFORM_BOOT_MANAGER_OVERRIDE_PROTOCOL *mUniversalPayl= oadPlatformBootManagerOverrideInstance =3D NULL; =20 @@ -286,3 +288,52 @@ PlatformBootManagerUnableToBoot ( return; } =20 +/** + Get/update PcdBootManagerMenuFile from GUID HOB which will be assigned i= n bootloader. + + @retval EFI_SUCCESS The entry point is executed successfully. + @retval other Some error occurs. + +**/ +EFI_STATUS +EFIAPI +PlatformBootManagerLibConstructor ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable +) +{ + EFI_STATUS Status; + UINTN Size; + VOID *GuidHob; + UNIVERSAL_PAYLOAD_GENERIC_HEADER *GenericHeader; + UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *BootManagerMenuFile; + Status =3D EFI_SUCCESS; + GuidHob =3D GetFirstGuidHob (&gUniversalPayloadBootManagerMenuFileGuid); + // + // Find the buffer information and update PCDs + // + if (GuidHob =3D=3D NULL) { + // + // If the HOB is not create, the default value of PcdBootManagerMenuFi= le will be used. + // + return EFI_SUCCESS; + } + + GenericHeader =3D (UNIVERSAL_PAYLOAD_GENERIC_HEADER *) GET_GUID_HOB_DATA= (GuidHob); + if ((sizeof (UNIVERSAL_PAYLOAD_GENERIC_HEADER) > GET_GUID_HOB_DATA_SIZE = (GuidHob)) || (GenericHeader->Length > GET_GUID_HOB_DATA_SIZE (GuidHob))) { + return EFI_NOT_FOUND; + } + if (GenericHeader->Revision =3D=3D UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU_R= EVISION) { + BootManagerMenuFile =3D (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU *) GET_GU= ID_HOB_DATA (GuidHob); + if (BootManagerMenuFile->Header.Length < UNIVERSAL_PAYLOAD_SIZEOF_THRO= UGH_FIELD (UNIVERSAL_PAYLOAD_BOOT_MANAGER_MENU, FileName)) { + return EFI_NOT_FOUND; + } + Size =3D sizeof (BootManagerMenuFile->FileName); + Status =3D PcdSetPtrS (PcdBootManagerMenuFile, &Size, &BootManagerMenu= File->FileName); + } else { + return EFI_NOT_FOUND; + } + + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; +} diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf index 600a535282..9c4943a0e0 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf @@ -13,7 +13,7 @@ MODULE_TYPE =3D DXE_DRIVER VERSION_STRING =3D 1.0 LIBRARY_CLASS =3D PlatformBootManagerLib|DXE_DRIVER - + CONSTRUCTOR =3D PlatformBootManagerLibConstructor =20 # # The following information is for reference only and not required by the = build tools. @@ -46,9 +46,11 @@ HiiLib PrintLib PlatformHookLib + HobLib =20 [Guids] gEfiEndOfDxeEventGroupGuid + gUniversalPayloadBootManagerMenuFileGuid =20 [Protocols] gEfiGenericMemTestProtocolGuid ## CONSUMES @@ -70,3 +72,4 @@ gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload= Pkg.dsc index 21b360256b..e46b867d30 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -289,7 +289,6 @@ !endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable|TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } =20 =20 !if $(SOURCE_DEBUG_ENABLE) @@ -297,6 +296,7 @@ !endif =20 [PcdsPatchableInModule.common] + gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F !if $(SOURCE_DEBUG_ENABLE) --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76811): https://edk2.groups.io/g/devel/message/76811 Mute This Topic: https://groups.io/mt/83696285/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-