From nobody Fri Mar 29 11:57:48 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+101094+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+101094+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1678715129; cv=none; d=zohomail.com; s=zohoarc; b=I4KMR4cROXb1sEn5IH1jZ0RMMJh7ueBUasslKBa7t7uGtlkrJVNVfL+Mk9MtgN84mN6uWum+vJ3/Ma2XRrZQy+xOvU3QqEIDop6G0CYnX2YyBdj7EYE1r4+j0+mQzScz8Ynw7xuLm26oACBC2CQpT2tkoUdmoUPJDn/gQffeCJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678715129; 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=wFFEy5XKV1forJomIsw6G5CZUseahosaATUa4cXluuw=; b=J9qylbso9pDNd4IpESWMmGDBNbshIqUkmfXFkes+T9fPR26nt+nrARzcIMa76znPKK8KOCsn/HQlhCrNgbPHq6P8GqgXgDEx4YT7rHhMYdYTJlBuW+MtkMs0fLwJyEM7Jqy33LOtCCzxknycwV3jOqPctm2ChVnyW1H3x/BvWu0= 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+101094+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 1678715129248938.5281603926263; Mon, 13 Mar 2023 06:45:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 65QEYY1788612xfsGWADsnzX; Mon, 13 Mar 2023 06:45:28 -0700 X-Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.19743.1678715127637392614 for ; Mon, 13 Mar 2023 06:45:27 -0700 X-Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DBF21612AE; Mon, 13 Mar 2023 13:45:26 +0000 (UTC) X-Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76BFCC433D2; Mon, 13 Mar 2023 13:45:25 +0000 (UTC) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, Ard Biesheuvel Subject: [edk2-devel] [PATCH] EmbeddedPkg/PrePiHobLib: Get rid of PeCoffLoaderProtocol Date: Mon, 13 Mar 2023 14:45:17 +0100 Message-Id: <20230313134517.3812991-1-ardb@kernel.org> 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,ardb@kernel.org X-Gm-Message-State: 310CYhusXVyrWNYFIGLYSMcvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678715128; bh=g3i3xNHni8sm3TZaIfIQupwaz0gPG5Ags32Dvc0XAX8=; h=Cc:Date:From:Reply-To:Subject:To; b=thzLqpGLLkNRQWmJ4lmzmWg2UT5CTZX93geW7q++tWifTE9K11obXxcfmrlsqEpQnwN kumh/LLaKiWk1gwYNtD+xSA145ngT493b3o+/JkZgC9bGsKmLBuuIOpXPHv5YUWjRxtpu hCgm9KQwQGJUhSXBw6PU39AEEmyPJ76RUFg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678715130429100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- EmbeddedPkg/EmbeddedPkg.dec | 1 - EmbeddedPkg/Include/Library/PrePiLib.h | 6 - EmbeddedPkg/Include/Protocol/PeCoffLoader.h | 220 -------------------- EmbeddedPkg/Library/PrePiHobLib/Hob.c | 22 -- EmbeddedPkg/Library/PrePiLib/PrePiLib.inf | 4 - 5 files changed, 253 deletions(-) delete mode 100644 EmbeddedPkg/Include/Protocol/PeCoffLoader.h diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 341ef5e6a679..010af91bed65 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -78,7 +78,6 @@ [Protocols.common] gEmbeddedDeviceGuid =3D { 0xbf4b9d10, 0x13ec, 0x43dd, { 0x88, 0x80, 0x= e9, 0xb, 0x71, 0x8f, 0x27, 0xde } } gEmbeddedExternalDeviceProtocolGuid =3D { 0x735F8C64, 0xD696, 0x44D0, { = 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }} gEmbeddedGpioProtocolGuid =3D { 0x17a0a3d7, 0xc0a5, 0x4635, { = 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }} - gPeCoffLoaderProtocolGuid =3D { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xF= E, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } } gEmbeddedMmcHostProtocolGuid =3D { 0x3e591c00, 0x9e4a, 0x11df, {= 0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }} gAndroidFastbootTransportProtocolGuid =3D { 0x74bd9fe0, 0x8902, 0x11e3, = {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}} gAndroidFastbootPlatformProtocolGuid =3D { 0x524685a0, 0x89a0, 0x11e3, = {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}} diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/L= ibrary/PrePiLib.h index 14f2bbc38dae..eb4bcec30fa1 100644 --- a/EmbeddedPkg/Include/Library/PrePiLib.h +++ b/EmbeddedPkg/Include/Library/PrePiLib.h @@ -673,12 +673,6 @@ BuildExtractSectionHob ( IN EXTRACT_GUIDED_SECTION_DECODE_HANDLER SectionExtraction ); =20 -VOID -EFIAPI -BuildPeCoffLoaderHob ( - VOID - ); - /** Allocates one or more 4KB pages of type EfiBootServicesData. =20 diff --git a/EmbeddedPkg/Include/Protocol/PeCoffLoader.h b/EmbeddedPkg/Incl= ude/Protocol/PeCoffLoader.h deleted file mode 100644 index 08738e99276a..000000000000 --- a/EmbeddedPkg/Include/Protocol/PeCoffLoader.h +++ /dev/null @@ -1,220 +0,0 @@ -/** @file - - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
- Portions copyright (c) 2010, Apple Inc. All rights reserved.
- SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef __PE_COFF_LOADER_H__ -#define __PE_COFF_LOADER_H__ - -// Needed for PE_COFF_LOADER_IMAGE_CONTEXT -#include - -// B323179B-97FB-477E-B0FE-D88591FA11AB -#define PE_COFF_LOADER_PROTOCOL_GUID \ - { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11= , 0xAB } } - -typedef struct _PE_COFF_LOADER_PROTOCOL PE_COFF_LOADER_PROTOCOL; - -/** - Retrieves information about a PE/COFF image. - - Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, Ima= geSize, - DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders= , and - DebugDirectoryEntryRva fields of the ImageContext structure. - If ImageContext is NULL, then return RETURN_INVALID_PARAMETER. - If the PE/COFF image accessed through the ImageRead service in the Image= Context - structure is not a supported PE/COFF image type, then return RETURN_UNSU= PPORTED. - If any errors occur while computing the fields of ImageContext, - then the error status is returned in the ImageError field of ImageContex= t. - If the image is a TE image, then SectionAlignment is set to 0. - The ImageRead and Handle fields of ImageContext structure must be valid = prior - to invoking this service. - - @param ImageContext Pointer to the image context structure= that describes the PE/COFF - image that needs to be examined by thi= s function. - - @retval RETURN_SUCCESS The information on the PE/COFF image w= as collected. - @retval RETURN_INVALID_PARAMETER ImageContext is NULL. - @retval RETURN_UNSUPPORTED The PE/COFF image is not supported. - -**/ -typedef -RETURN_STATUS -(EFIAPI *PE_COFF_LOADER_GET_IMAGE_INFO)( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -/** - Applies relocation fixups to a PE/COFF image that was loaded with PeCoff= LoaderLoadImage(). - - If the DestinationAddress field of ImageContext is 0, then use the Image= Address field of - ImageContext as the relocation base address. Otherwise, use the Destina= tionAddress field - of ImageContext as the relocation base address. The caller must allocat= e the relocation - fixup log buffer and fill in the FixupData field of ImageContext prior t= o calling this function. - - The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType= , ImageAddress, - ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, Si= zeOfHeaders, - DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer,= and FixupData of - the ImageContext structure must be valid prior to invoking this service. - - If ImageContext is NULL, then ASSERT(). - - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations - prior to transferring control to a PE/COFF image that is loaded using th= is library. - - @param ImageContext Pointer to the image context structure that = describes the PE/COFF - image that is being relocated. - - @retval RETURN_SUCCESS The PE/COFF image was relocated. - Extended status information is in the ImageE= rror field of ImageContext. - @retval RETURN_LOAD_ERROR The image in not a valid PE/COFF image. - Extended status information is in the ImageE= rror field of ImageContext. - @retval RETURN_UNSUPPORTED A relocation record type is not supported. - Extended status information is in the ImageE= rror field of ImageContext. - -**/ -typedef -RETURN_STATUS -(EFIAPI *PE_COFF_LOADER_RELOCATE_IMAGE)( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -/** - Loads a PE/COFF image into memory. - - Loads the PE/COFF image accessed through the ImageRead service of ImageC= ontext into the buffer - specified by the ImageAddress and ImageSize fields of ImageContext. The= caller must allocate - the load buffer and fill in the ImageAddress and ImageSize fields prior = to calling this function. - The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData = fields of ImageContext are computed. - The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType= , ImageAddress, ImageSize, - DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders= , and DebugDirectoryEntryRva - fields of the ImageContext structure must be valid prior to invoking thi= s service. - - If ImageContext is NULL, then ASSERT(). - - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations - prior to transferring control to a PE/COFF image that is loaded using th= is library. - - @param ImageContext Pointer to the image context structure= that describes the PE/COFF - image that is being loaded. - - @retval RETURN_SUCCESS The PE/COFF image was loaded into the = buffer specified by - the ImageAddress and ImageSize fields = of ImageContext. - Extended status information is in the = ImageError field of ImageContext. - @retval RETURN_BUFFER_TOO_SMALL The caller did not provide a large eno= ugh buffer. - Extended status information is in the = ImageError field of ImageContext. - @retval RETURN_LOAD_ERROR The PE/COFF image is an EFI Runtime im= age with no relocations. - Extended status information is in the = ImageError field of ImageContext. - @retval RETURN_INVALID_PARAMETER The image address is invalid. - Extended status information is in the = ImageError field of ImageContext. - -**/ -typedef -RETURN_STATUS -(EFIAPI *PE_COFF_LOADER_LOAD_IMAGE)( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -/** - Reads contents of a PE/COFF image from a buffer in system memory. - - This is the default implementation of a PE_COFF_LOADER_READ_FILE function - that assumes FileHandle pointer to the beginning of a PE/COFF image. - This function reads contents of the PE/COFF image that starts at the sys= tem memory - address specified by FileHandle. The read operation copies ReadSize byte= s from the - PE/COFF image starting at byte offset FileOffset into the buffer specifi= ed by Buffer. - The size of the buffer actually read is returned in ReadSize. - - If FileHandle is NULL, then ASSERT(). - If ReadSize is NULL, then ASSERT(). - If Buffer is NULL, then ASSERT(). - - @param FileHandle Pointer to base of the input stream - @param FileOffset Offset into the PE/COFF image to begin the rea= d operation. - @param ReadSize On input, the size in bytes of the requested r= ead operation. - On output, the number of bytes actually read. - @param Buffer Output buffer that contains the data read from= the PE/COFF image. - - @retval RETURN_SUCCESS Data is read from FileOffset from the Handle i= nto - the buffer. -**/ -typedef -RETURN_STATUS -(EFIAPI *PE_COFF_LOADER_READ_FROM_MEMORY)( - IN VOID *FileHandle, - IN UINTN FileOffset, - IN OUT UINTN *ReadSize, - OUT VOID *Buffer - ); - -/** - Reapply fixups on a fixed up PE32/PE32+ image to allow virtual calling a= t EFI - runtime. - - This function reapplies relocation fixups to the PE/COFF image specified= by ImageBase - and ImageSize so the image will execute correctly when the PE/COFF image= is mapped - to the address specified by VirtualImageBase. RelocationData must be ide= ntical - to the FixupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure - after this PE/COFF image was relocated with PeCoffLoaderRelocateImage(). - - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations - prior to transferring control to a PE/COFF image that is loaded using th= is library. - - @param ImageBase Base address of a PE/COFF image that has been= loaded - and relocated into system memory. - @param VirtImageBase The request virtual address that the PE/COFF = image is to - be fixed up for. - @param ImageSize The size, in bytes, of the PE/COFF image. - @param RelocationData A pointer to the relocation data that was col= lected when the PE/COFF - image was relocated using PeCoffLoaderRelocat= eImage(). - -**/ -typedef -VOID -(EFIAPI *PE_COFF_LOADER_RELOCATE_IMAGE_FOR_RUNTIME)( - IN PHYSICAL_ADDRESS ImageBase, - IN PHYSICAL_ADDRESS VirtImageBase, - IN UINTN ImageSize, - IN VOID *RelocationData - ); - -/** - Unloads a loaded PE/COFF image from memory and releases its taken resour= ce. - Releases any environment specific resources that were allocated when the= image - specified by ImageContext was loaded using PeCoffLoaderLoadImage(). - - For NT32 emulator, the PE/COFF image loaded by system needs to release. - For real platform, the PE/COFF image loaded by Core doesn't needs to be = unloaded, - this function can simply return RETURN_SUCCESS. - - If ImageContext is NULL, then ASSERT(). - - @param ImageContext Pointer to the image context structure= that describes the PE/COFF - image to be unloaded. - - @retval RETURN_SUCCESS The PE/COFF image was unloaded success= fully. -**/ -typedef -RETURN_STATUS -(EFIAPI *PE_COFF_LOADER_UNLOAD_IMAGE)( - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ); - -struct _PE_COFF_LOADER_PROTOCOL { - PE_COFF_LOADER_GET_IMAGE_INFO GetImageInfo; - PE_COFF_LOADER_LOAD_IMAGE LoadImage; - PE_COFF_LOADER_RELOCATE_IMAGE RelocateImage; - PE_COFF_LOADER_READ_FROM_MEMORY ReadFromMemory; - PE_COFF_LOADER_RELOCATE_IMAGE_FOR_RUNTIME RelocateImageForRuntime; - PE_COFF_LOADER_UNLOAD_IMAGE UnloadImage; -}; - -extern EFI_GUID gPeCoffLoaderProtocolGuid; - -#endif diff --git a/EmbeddedPkg/Library/PrePiHobLib/Hob.c b/EmbeddedPkg/Library/Pr= ePiHobLib/Hob.c index 8eb175aa96f9..a43383b510d8 100644 --- a/EmbeddedPkg/Library/PrePiHobLib/Hob.c +++ b/EmbeddedPkg/Library/PrePiHobLib/Hob.c @@ -17,7 +17,6 @@ #include #include =20 -#include #include #include #include @@ -782,27 +781,6 @@ BuildExtractSectionHob ( BuildGuidDataHob (Guid, &Data, sizeof (Data)); } =20 -PE_COFF_LOADER_PROTOCOL gPeCoffProtocol =3D { - PeCoffLoaderGetImageInfo, - PeCoffLoaderLoadImage, - PeCoffLoaderRelocateImage, - PeCoffLoaderImageReadFromMemory, - PeCoffLoaderRelocateImageForRuntime, - PeCoffLoaderUnloadImage -}; - -VOID -EFIAPI -BuildPeCoffLoaderHob ( - VOID - ) -{ - VOID *Ptr; - - Ptr =3D &gPeCoffProtocol; - BuildGuidDataHob (&gPeCoffLoaderProtocolGuid, &Ptr, sizeof (VOID *)); -} - // May want to put this into a library so you only need the PCD settings i= f you are using the feature? VOID BuildMemoryTypeInformationHob ( diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf b/EmbeddedPkg/Librar= y/PrePiLib/PrePiLib.inf index 2df5928c51d5..f7f3880f331c 100644 --- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf +++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.inf @@ -65,10 +65,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] [Guids] gEfiMemoryTypeInformationGuid =20 -[Protocols] - gPeCoffLoaderProtocolGuid - - [FixedPcd.common] gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS --=20 2.39.2 -=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 (#101094): https://edk2.groups.io/g/devel/message/101094 Mute This Topic: https://groups.io/mt/97580566/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-