From nobody Sun May 19 05:00:16 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+104480+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+104480+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1683691117; cv=none; d=zohomail.com; s=zohoarc; b=IPlNh0m9yzL7Sb37yparVaJwS//AgBnhbjMlP25ImUeRXh8u04GyxtkXl9dMJt7gKhOTcjb7SeUeNbQ7JZfGY49WQrHVpGV1XvHyn1Mmzp9UQG6TgGi5z/kcLRDLbtWZ+dObjaI92Z3p3yqWbQslwKJJuFM6GppFFzWYgwPxQV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683691117; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=tbNdcDeG71nt4h1NEGuscHXJaYHadBA5Vqi7syLjdSQ=; b=ZnqrRaBoZjkKWQRtaU2wFlyEmGKDRctjgHRTaPS4XxQNk8gqbkH0QQdLIidS3DkHMIn5M8V9MP4YpUB/j5G0SXDFLFS+c3MG6FgaH6xFLAMyYQNx+JEegkytFkCyG+cHPFowSU11WffJ1Oqnc0ioWdSQhwMRwIqPPppLfVOmbqo= 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+104480+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 1683691116804516.0990522316241; Tue, 9 May 2023 20:58:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hk4oYY1788612x1hDthvorBN; Tue, 09 May 2023 20:58:36 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.8685.1683691114797196238 for ; Tue, 09 May 2023 20:58:35 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="352307275" X-IronPort-AV: E=Sophos;i="5.99,263,1677571200"; d="scan'208";a="352307275" X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2023 20:58:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="945549206" X-IronPort-AV: E=Sophos;i="5.99,263,1677571200"; d="scan'208";a="945549206" X-Received: from gdong1-mobl.amr.corp.intel.com ([10.212.24.100]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2023 20:58:33 -0700 From: "Guo Dong" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot shell issue for universal UEFI payload Date: Tue, 9 May 2023 20:58:17 -0700 Message-Id: <20230510035817.1023-1-guo.dong@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,guo.dong@intel.com X-Gm-Message-State: TqxF4SWHHzGriQnG7hzkwI2kx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683691116; bh=hZGUEWjtSfeChtT5Lm0Iff8zOv4DDWYPzXzuHM0oOHA=; h=Cc:Date:From:Reply-To:Subject:To; b=EqpSDVAZgNkPIuXxh9HnDQ0vgwDEUXEs/3n9coICJr55nSCxzuFzeo5mXLp5oczUgg8 GPaJV773iZZOJ2XiJ5Wet7rFKwcLaPnYVvw2R+Fn1nL91bqMMdN9LvxX4gswITsK7ySS2 4Xu/IRWo7JZ97MqD6WFSMBVyDHVZ/PWZwsQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683691119100100003 Content-Type: text/plain; charset="utf-8" From: Guo Dong After moving BDS driver to a new FV for universal UEFI payload, the shell boot option path is not correct since it used the BDS FV instead of DXE FV in its device path. This patch would find the correct FV by reading shell file. It also removed PcdShellFile by using gUefiShellFileGuid. Signed-off-by: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Reviewed-by: James Lu --- UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c |= 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-= ----- UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf |= 5 +++-- UefiPayloadPkg/UefiPayloadPkg.dec |= 3 --- 3 files changed, 73 insertions(+), 11 deletions(-) diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= ger.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c index 62637ae6aa..cf72783af1 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c @@ -2,7 +2,7 @@ This file include all platform action which can be customized by IBV/OEM. =20 -Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "PlatformConsole.h" #include #include +#include =20 /** Signal EndOfDxe event and install SMM Ready to lock protocol. @@ -89,6 +90,72 @@ PlatformFindLoadOption ( return -1; } =20 + +EFI_DEVICE_PATH_PROTOCOL * +BdsGetShellFvDevicePath ( + VOID + ) +{ + UINTN FvHandleCount; + EFI_HANDLE *FvHandleBuffer; + UINTN Index; + EFI_STATUS Status; + EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv; + UINTN Size; + UINT32 AuthenticationStatus; + EFI_DEVICE_PATH_PROTOCOL *DevicePath; + VOID *Buffer; + + Status =3D EFI_SUCCESS; + gBS->LocateHandleBuffer ( + ByProtocol, + &gEfiFirmwareVolume2ProtocolGuid, + NULL, + &FvHandleCount, + &FvHandleBuffer + ); + + for (Index =3D 0; Index < FvHandleCount; Index++) { + Buffer =3D NULL; + Size =3D 0; + gBS->HandleProtocol ( + FvHandleBuffer[Index], + &gEfiFirmwareVolume2ProtocolGuid, + (VOID **) &Fv + ); + Status =3D Fv->ReadSection ( + Fv, + &gUefiShellFileGuid, + EFI_SECTION_PE32, + 0, + &Buffer, + &Size, + &AuthenticationStatus + ); + if (!EFI_ERROR (Status)) { + // + // Found the shell file + // + break; + } + } + + if (EFI_ERROR (Status)) { + if (FvHandleCount) { + FreePool (FvHandleBuffer); + } + return NULL; + } + + DevicePath =3D DevicePathFromHandle (FvHandleBuffer[Index]); + + if (FvHandleCount) { + FreePool (FvHandleBuffer); + } + + return DevicePath; +} + /** Register a boot option using a file GUID in the FV. =20 @@ -109,15 +176,12 @@ PlatformRegisterFvBootOption ( EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions; UINTN BootOptionCount; MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode; - EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; EFI_DEVICE_PATH_PROTOCOL *DevicePath; =20 - Status =3D gBS->HandleProtocol (gImageHandle, &gEfiLoadedImageProtocolGu= id, (VOID **)&LoadedImage); - ASSERT_EFI_ERROR (Status); =20 EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid); DevicePath =3D AppendDevicePathNode ( - DevicePathFromHandle (LoadedImage->DeviceHandle), + BdsGetShellFvDevicePath(), (EFI_DEVICE_PATH_PROTOCOL *)&FileNode ); =20 @@ -248,7 +312,7 @@ PlatformBootManagerAfterConsole ( // // Register UEFI Shell // - PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile), L"UEFI Shell", L= OAD_OPTION_ACTIVE); + PlatformRegisterFvBootOption (&gUefiShellFileGuid, L"UEFI Shell", LOAD_O= PTION_ACTIVE); =20 if (FixedPcdGetBool (PcdBootManagerEscape)) { Print ( diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootMana= gerLib.inf index f9626175e2..a3951b7a7e 100644 --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.= inf @@ -1,7 +1,7 @@ ## @file # Include all platform action which can be customized by IBV/OEM. # -# Copyright (c) 2012 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2023, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -32,6 +32,7 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec UefiPayloadPkg/UefiPayloadPkg.dec + ShellPkg/ShellPkg.dec =20 [LibraryClasses] BaseLib @@ -52,6 +53,7 @@ [Guids] gEfiEndOfDxeEventGroupGuid gEdkiiBootManagerMenuFileGuid + gUefiShellFileGuid =20 [Protocols] gEfiGenericMemTestProtocolGuid ## CONSUMES @@ -69,7 +71,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand - gUefiPayloadPkgTokenSpaceGuid.PcdShellFile gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayload= Pkg.dec index a23a7b5a78..8d111f3a90 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dec +++ b/UefiPayloadPkg/UefiPayloadPkg.dec @@ -67,9 +67,6 @@ gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize|0|UINT3= 2|0x10000002 ## Save bootloader parameter gUefiPayloadPkgTokenSpaceGuid.PcdBootloaderParameter|0|UINT64|0x10000004 =20 -## FFS filename to find the shell application. -gUefiPayloadPkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E,= 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }|VOID*|0= x10000005 - ## Used to help reduce fragmentation in the EFI memory map gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x19|UINT3= 2|0x10000012 gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT32|0x= 10000013 --=20 2.39.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 (#104480): https://edk2.groups.io/g/devel/message/104480 Mute This Topic: https://groups.io/mt/98799622/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-