From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dQwhGbay; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) 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) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76BFCC433D2; Mon, 13 Mar 2023 13:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678715126; bh=IOibGzO4aonZY/cw4yRAyqXDyLj57qA9NsOEHesyEuc=; h=From:To:Cc:Subject:Date:From; b=dQwhGbayw2AVxSXTtbF1UF4UFawkX51APrQAWl/mD8hmcBHhmBuXRy9wgJGalOCch JXyp+aFg5Tr7AjJuMs8JelVkiRQIiIyCLz0N1hxfIO5nx+lhUJALg2ImU3BSqdj6Pb ySeeEn+BuadETTvwpMiogchrTV0KMCbPJxGgBE1moM14dEwdeypYAIMa+qv5SzVmsL vVvevNcsIKxOoXxbvbnn3eGaKz+ndG09MQvB3gYD5JYF43Wj3ufB/ooaS5YBGhN/pb KXQcMsVA4/kdOpREoNUso7WHX4UC8s505p0yQd5NoynMQ7zfYhhJoZeiTkIt2BN+lw Wk/m+85+xVBYw== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, Ard Biesheuvel Subject: [PATCH] EmbeddedPkg/PrePiHobLib: Get rid of PeCoffLoaderProtocol Date: Mon, 13 Mar 2023 14:45:17 +0100 Message-Id: <20230313134517.3812991-1-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Signed-off-by: Ard Biesheuvel --- 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 } }=0D gEmbeddedExternalDeviceProtocolGuid =3D { 0x735F8C64, 0xD696, 0x44D0, { = 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }}=0D gEmbeddedGpioProtocolGuid =3D { 0x17a0a3d7, 0xc0a5, 0x4635, { = 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }}=0D - gPeCoffLoaderProtocolGuid =3D { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xF= E, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } }=0D gEmbeddedMmcHostProtocolGuid =3D { 0x3e591c00, 0x9e4a, 0x11df, {= 0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }}=0D gAndroidFastbootTransportProtocolGuid =3D { 0x74bd9fe0, 0x8902, 0x11e3, = {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}}=0D gAndroidFastbootPlatformProtocolGuid =3D { 0x524685a0, 0x89a0, 0x11e3, = {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}}=0D 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=0D );=0D =0D -VOID=0D -EFIAPI=0D -BuildPeCoffLoaderHob (=0D - VOID=0D - );=0D -=0D /**=0D Allocates one or more 4KB pages of type EfiBootServicesData.=0D =0D 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=0D -=0D - Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
=0D - Portions copyright (c) 2010, Apple Inc. All rights reserved.
=0D - SPDX-License-Identifier: BSD-2-Clause-Patent=0D -=0D -**/=0D -=0D -#ifndef __PE_COFF_LOADER_H__=0D -#define __PE_COFF_LOADER_H__=0D -=0D -// Needed for PE_COFF_LOADER_IMAGE_CONTEXT=0D -#include =0D -=0D -// B323179B-97FB-477E-B0FE-D88591FA11AB=0D -#define PE_COFF_LOADER_PROTOCOL_GUID \=0D - { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11= , 0xAB } }=0D -=0D -typedef struct _PE_COFF_LOADER_PROTOCOL PE_COFF_LOADER_PROTOCOL;=0D -=0D -/**=0D - Retrieves information about a PE/COFF image.=0D -=0D - Computes the PeCoffHeaderOffset, IsTeImage, ImageType, ImageAddress, Ima= geSize,=0D - DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders= , and=0D - DebugDirectoryEntryRva fields of the ImageContext structure.=0D - If ImageContext is NULL, then return RETURN_INVALID_PARAMETER.=0D - If the PE/COFF image accessed through the ImageRead service in the Image= Context=0D - structure is not a supported PE/COFF image type, then return RETURN_UNSU= PPORTED.=0D - If any errors occur while computing the fields of ImageContext,=0D - then the error status is returned in the ImageError field of ImageContex= t.=0D - If the image is a TE image, then SectionAlignment is set to 0.=0D - The ImageRead and Handle fields of ImageContext structure must be valid = prior=0D - to invoking this service.=0D -=0D - @param ImageContext Pointer to the image context structure= that describes the PE/COFF=0D - image that needs to be examined by thi= s function.=0D -=0D - @retval RETURN_SUCCESS The information on the PE/COFF image w= as collected.=0D - @retval RETURN_INVALID_PARAMETER ImageContext is NULL.=0D - @retval RETURN_UNSUPPORTED The PE/COFF image is not supported.=0D -=0D -**/=0D -typedef=0D -RETURN_STATUS=0D -(EFIAPI *PE_COFF_LOADER_GET_IMAGE_INFO)(=0D - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext=0D - );=0D -=0D -/**=0D - Applies relocation fixups to a PE/COFF image that was loaded with PeCoff= LoaderLoadImage().=0D -=0D - If the DestinationAddress field of ImageContext is 0, then use the Image= Address field of=0D - ImageContext as the relocation base address. Otherwise, use the Destina= tionAddress field=0D - of ImageContext as the relocation base address. The caller must allocat= e the relocation=0D - fixup log buffer and fill in the FixupData field of ImageContext prior t= o calling this function.=0D -=0D - The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType= , ImageAddress,=0D - ImageSize, DestinationAddress, RelocationsStripped, SectionAlignment, Si= zeOfHeaders,=0D - DebugDirectoryEntryRva, EntryPoint, FixupDataSize, CodeView, PdbPointer,= and FixupData of=0D - the ImageContext structure must be valid prior to invoking this service.= =0D -=0D - If ImageContext is NULL, then ASSERT().=0D -=0D - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data=0D - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations=0D - prior to transferring control to a PE/COFF image that is loaded using th= is library.=0D -=0D - @param ImageContext Pointer to the image context structure that = describes the PE/COFF=0D - image that is being relocated.=0D -=0D - @retval RETURN_SUCCESS The PE/COFF image was relocated.=0D - Extended status information is in the ImageE= rror field of ImageContext.=0D - @retval RETURN_LOAD_ERROR The image in not a valid PE/COFF image.=0D - Extended status information is in the ImageE= rror field of ImageContext.=0D - @retval RETURN_UNSUPPORTED A relocation record type is not supported.=0D - Extended status information is in the ImageE= rror field of ImageContext.=0D -=0D -**/=0D -typedef=0D -RETURN_STATUS=0D -(EFIAPI *PE_COFF_LOADER_RELOCATE_IMAGE)(=0D - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext=0D - );=0D -=0D -/**=0D - Loads a PE/COFF image into memory.=0D -=0D - Loads the PE/COFF image accessed through the ImageRead service of ImageC= ontext into the buffer=0D - specified by the ImageAddress and ImageSize fields of ImageContext. The= caller must allocate=0D - the load buffer and fill in the ImageAddress and ImageSize fields prior = to calling this function.=0D - The EntryPoint, FixupDataSize, CodeView, PdbPointer and HiiResourceData = fields of ImageContext are computed.=0D - The ImageRead, Handle, PeCoffHeaderOffset, IsTeImage, Machine, ImageType= , ImageAddress, ImageSize,=0D - DestinationAddress, RelocationsStripped, SectionAlignment, SizeOfHeaders= , and DebugDirectoryEntryRva=0D - fields of the ImageContext structure must be valid prior to invoking thi= s service.=0D -=0D - If ImageContext is NULL, then ASSERT().=0D -=0D - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data=0D - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations=0D - prior to transferring control to a PE/COFF image that is loaded using th= is library.=0D -=0D - @param ImageContext Pointer to the image context structure= that describes the PE/COFF=0D - image that is being loaded.=0D -=0D - @retval RETURN_SUCCESS The PE/COFF image was loaded into the = buffer specified by=0D - the ImageAddress and ImageSize fields = of ImageContext.=0D - Extended status information is in the = ImageError field of ImageContext.=0D - @retval RETURN_BUFFER_TOO_SMALL The caller did not provide a large eno= ugh buffer.=0D - Extended status information is in the = ImageError field of ImageContext.=0D - @retval RETURN_LOAD_ERROR The PE/COFF image is an EFI Runtime im= age with no relocations.=0D - Extended status information is in the = ImageError field of ImageContext.=0D - @retval RETURN_INVALID_PARAMETER The image address is invalid.=0D - Extended status information is in the = ImageError field of ImageContext.=0D -=0D -**/=0D -typedef=0D -RETURN_STATUS=0D -(EFIAPI *PE_COFF_LOADER_LOAD_IMAGE)(=0D - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext=0D - );=0D -=0D -/**=0D - Reads contents of a PE/COFF image from a buffer in system memory.=0D -=0D - This is the default implementation of a PE_COFF_LOADER_READ_FILE functio= n=0D - that assumes FileHandle pointer to the beginning of a PE/COFF image.=0D - This function reads contents of the PE/COFF image that starts at the sys= tem memory=0D - address specified by FileHandle. The read operation copies ReadSize byte= s from the=0D - PE/COFF image starting at byte offset FileOffset into the buffer specifi= ed by Buffer.=0D - The size of the buffer actually read is returned in ReadSize.=0D -=0D - If FileHandle is NULL, then ASSERT().=0D - If ReadSize is NULL, then ASSERT().=0D - If Buffer is NULL, then ASSERT().=0D -=0D - @param FileHandle Pointer to base of the input stream=0D - @param FileOffset Offset into the PE/COFF image to begin the rea= d operation.=0D - @param ReadSize On input, the size in bytes of the requested r= ead operation.=0D - On output, the number of bytes actually read.= =0D - @param Buffer Output buffer that contains the data read from= the PE/COFF image.=0D -=0D - @retval RETURN_SUCCESS Data is read from FileOffset from the Handle i= nto=0D - the buffer.=0D -**/=0D -typedef=0D -RETURN_STATUS=0D -(EFIAPI *PE_COFF_LOADER_READ_FROM_MEMORY)(=0D - IN VOID *FileHandle,=0D - IN UINTN FileOffset,=0D - IN OUT UINTN *ReadSize,=0D - OUT VOID *Buffer=0D - );=0D -=0D -/**=0D - Reapply fixups on a fixed up PE32/PE32+ image to allow virtual calling a= t EFI=0D - runtime.=0D -=0D - This function reapplies relocation fixups to the PE/COFF image specified= by ImageBase=0D - and ImageSize so the image will execute correctly when the PE/COFF image= is mapped=0D - to the address specified by VirtualImageBase. RelocationData must be ide= ntical=0D - to the FixupData buffer from the PE_COFF_LOADER_IMAGE_CONTEXT structure= =0D - after this PE/COFF image was relocated with PeCoffLoaderRelocateImage().= =0D -=0D - Note that if the platform does not maintain coherency between the instru= ction cache(s) and the data=0D - cache(s) in hardware, then the caller is responsible for performing cach= e maintenance operations=0D - prior to transferring control to a PE/COFF image that is loaded using th= is library.=0D -=0D - @param ImageBase Base address of a PE/COFF image that has been= loaded=0D - and relocated into system memory.=0D - @param VirtImageBase The request virtual address that the PE/COFF = image is to=0D - be fixed up for.=0D - @param ImageSize The size, in bytes, of the PE/COFF image.=0D - @param RelocationData A pointer to the relocation data that was col= lected when the PE/COFF=0D - image was relocated using PeCoffLoaderRelocat= eImage().=0D -=0D -**/=0D -typedef=0D -VOID=0D -(EFIAPI *PE_COFF_LOADER_RELOCATE_IMAGE_FOR_RUNTIME)(=0D - IN PHYSICAL_ADDRESS ImageBase,=0D - IN PHYSICAL_ADDRESS VirtImageBase,=0D - IN UINTN ImageSize,=0D - IN VOID *RelocationData=0D - );=0D -=0D -/**=0D - Unloads a loaded PE/COFF image from memory and releases its taken resour= ce.=0D - Releases any environment specific resources that were allocated when the= image=0D - specified by ImageContext was loaded using PeCoffLoaderLoadImage().=0D -=0D - For NT32 emulator, the PE/COFF image loaded by system needs to release.= =0D - For real platform, the PE/COFF image loaded by Core doesn't needs to be = unloaded,=0D - this function can simply return RETURN_SUCCESS.=0D -=0D - If ImageContext is NULL, then ASSERT().=0D -=0D - @param ImageContext Pointer to the image context structure= that describes the PE/COFF=0D - image to be unloaded.=0D -=0D - @retval RETURN_SUCCESS The PE/COFF image was unloaded success= fully.=0D -**/=0D -typedef=0D -RETURN_STATUS=0D -(EFIAPI *PE_COFF_LOADER_UNLOAD_IMAGE)(=0D - IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext=0D - );=0D -=0D -struct _PE_COFF_LOADER_PROTOCOL {=0D - PE_COFF_LOADER_GET_IMAGE_INFO GetImageInfo;=0D - PE_COFF_LOADER_LOAD_IMAGE LoadImage;=0D - PE_COFF_LOADER_RELOCATE_IMAGE RelocateImage;=0D - PE_COFF_LOADER_READ_FROM_MEMORY ReadFromMemory;=0D - PE_COFF_LOADER_RELOCATE_IMAGE_FOR_RUNTIME RelocateImageForRuntime;=0D - PE_COFF_LOADER_UNLOAD_IMAGE UnloadImage;=0D -};=0D -=0D -extern EFI_GUID gPeCoffLoaderProtocolGuid;=0D -=0D -#endif=0D 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 =0D #include =0D =0D -#include =0D #include =0D #include =0D #include =0D @@ -782,27 +781,6 @@ BuildExtractSectionHob ( BuildGuidDataHob (Guid, &Data, sizeof (Data));=0D }=0D =0D -PE_COFF_LOADER_PROTOCOL gPeCoffProtocol =3D {=0D - PeCoffLoaderGetImageInfo,=0D - PeCoffLoaderLoadImage,=0D - PeCoffLoaderRelocateImage,=0D - PeCoffLoaderImageReadFromMemory,=0D - PeCoffLoaderRelocateImageForRuntime,=0D - PeCoffLoaderUnloadImage=0D -};=0D -=0D -VOID=0D -EFIAPI=0D -BuildPeCoffLoaderHob (=0D - VOID=0D - )=0D -{=0D - VOID *Ptr;=0D -=0D - Ptr =3D &gPeCoffProtocol;=0D - BuildGuidDataHob (&gPeCoffLoaderProtocolGuid, &Ptr, sizeof (VOID *));=0D -}=0D -=0D // May want to put this into a library so you only need the PCD settings i= f you are using the feature?=0D VOID=0D BuildMemoryTypeInformationHob (=0D 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]=0D gEfiMemoryTypeInformationGuid=0D =0D -[Protocols]=0D - gPeCoffLoaderProtocolGuid=0D -=0D -=0D [FixedPcd.common]=0D gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory=0D gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS=0D --=20 2.39.2