X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FLibrary%2FPeiServicesLib%2FPeiServicesLib.c;h=3428addcc63bff491a10c335db9fd3ff56d45a70;hp=5782e5132ff811bc1a56996363bfbd4588d7daee;hb=ed84519ce846cda4bc175d8d18ee03937090176d;hpb=3831f3e9a921eb7b8dbfcaf06acdf9eef9127204 diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c index 5782e5132f..3428addcc6 100644 --- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c @@ -1,11 +1,11 @@ /** @file Implementation for PEI Services Library. - Copyright (c) 2006 - 2008, Intel Corporation
- All rights reserved. This program and the accompanying materials + Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php + http://opensource.org/licenses/bsd-license.php. THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @@ -16,6 +16,7 @@ #include #include +#include #include #include @@ -24,15 +25,6 @@ #include #include - -GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_PEI_PPI_DESCRIPTOR mPpiListTemplate[] = { - { - (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), - &gEfiPeiFirmwareVolumeInfoPpiGuid, - NULL - } -}; - /** This service enables a given PEIM to register an interface into the PEI Foundation. @@ -60,8 +52,8 @@ PeiServicesInstallPpi ( /** This service enables PEIMs to replace an entry in the PPI database with an alternate entry. - @param OldPpi Pointer to the old PEI PPI Descriptors. - @param NewPpi Pointer to the new PEI PPI Descriptors. + @param OldPpi The pointer to the old PEI PPI Descriptors. + @param NewPpi The pointer to the new PEI PPI Descriptors. @retval EFI_SUCCESS The interface was successfully installed. @retval EFI_INVALID_PARAMETER The OldPpi or NewPpi is NULL. @@ -117,13 +109,14 @@ PeiServicesLocatePpi ( This service enables PEIMs to register a given service to be invoked when another service is installed or reinstalled. - @param NotifyList A pointer to the list of notification interfaces that the caller - shall install. + @param NotifyList A pointer to the list of notification interfaces + that the caller shall install. @retval EFI_SUCCESS The interface was successfully installed. @retval EFI_INVALID_PARAMETER The NotifyList pointer is NULL. - @retval EFI_INVALID_PARAMETER Any of the PEI notify descriptors in the list do not have the - EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES bit set in the Flags field. + @retval EFI_INVALID_PARAMETER Any of the PEI notify descriptors in the list do + not have the EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES + bit set in the Flags field. @retval EFI_OUT_OF_RESOURCES There is no additional space in the PPI database. **/ @@ -183,8 +176,9 @@ PeiServicesSetBootMode ( /** This service enables a PEIM to ascertain the address of the list of HOBs in memory. - @param HobList A pointer to the list of HOBs that the PEI Foundation will initialize. - + @param HobList A pointer to the list of HOBs that the PEI Foundation + will initialize. + @retval EFI_SUCCESS The list was successfully returned. @retval EFI_NOT_AVAILABLE_YET The HOB list is not yet published. @@ -206,7 +200,8 @@ PeiServicesGetHobList ( @param Type The type of HOB to be installed. @param Length The length of the HOB to be added. - @param Hob The address of a pointer that will contain the HOB header. + @param Hob The address of a pointer that will contain the + HOB header. @retval EFI_SUCCESS The HOB was successfully created. @retval EFI_OUT_OF_RESOURCES There is no additional space for HOB creation. @@ -229,9 +224,10 @@ PeiServicesCreateHob ( /** This service enables PEIMs to discover additional firmware volumes. - @param Instance This instance of the firmware volume to find. The value 0 is the - Boot Firmware Volume (BFV). - @param VolumeHandle Handle of the firmware volume header of the volume to return. + @param Instance This instance of the firmware volume to find. The + value 0 is the Boot Firmware Volume (BFV). + @param VolumeHandle Handle of the firmware volume header of the volume + to return. @retval EFI_SUCCESS The volume was found. @retval EFI_NOT_FOUND The volume was not found. @@ -255,8 +251,9 @@ PeiServicesFfsFindNextVolume ( This service enables PEIMs to discover additional firmware files. @param SearchType A filter to find files only of this type. - @param VolumeHandle Pointer to the firmware volume header of the volume to search. - This parameter must point to a valid FFS volume. + @param VolumeHandle The pointer to the firmware volume header of the + volume to search. This parameter must point to a + valid FFS volume. @param FileHandle Handle of the current file from which to begin searching. @retval EFI_SUCCESS The file was found. @@ -282,8 +279,8 @@ PeiServicesFfsFindNextFile ( This service enables PEIMs to discover sections of a given type within a valid FFS file. @param SectionType The value of the section type to find. - @param FileHandle A pointer to the file header that contains the set of sections to - be searched. + @param FileHandle A pointer to the file header that contains the set + of sections to be searched. @param SectionData A pointer to the discovered section, if successful. @retval EFI_SUCCESS The section was found. @@ -304,6 +301,36 @@ PeiServicesFfsFindSectionData ( return (*PeiServices)->FfsFindSectionData (PeiServices, SectionType, FileHandle, SectionData); } +/** + This service enables PEIMs to discover sections of a given instance and type within a valid FFS file. + + @param SectionType The value of the section type to find. + @param SectionInstance Section instance to find. + @param FileHandle A pointer to the file header that contains the set + of sections to be searched. + @param SectionData A pointer to the discovered section, if successful. + @param AuthenticationStatus A pointer to the authentication status for this section. + + @retval EFI_SUCCESS The section was found. + @retval EFI_NOT_FOUND The section was not found. + +**/ +EFI_STATUS +EFIAPI +PeiServicesFfsFindSectionData3 ( + IN EFI_SECTION_TYPE SectionType, + IN UINTN SectionInstance, + IN EFI_PEI_FILE_HANDLE FileHandle, + OUT VOID **SectionData, + OUT UINT32 *AuthenticationStatus + ) +{ + CONST EFI_PEI_SERVICES **PeiServices; + + PeiServices = GetPeiServicesTablePointer (); + return (*PeiServices)->FindSectionData3 (PeiServices, SectionType, SectionInstance, FileHandle, SectionData, AuthenticationStatus); +} + /** This service enables PEIMs to register the permanent memory configuration that has been initialized with the PEI Foundation. @@ -330,11 +357,11 @@ PeiServicesInstallPeiMemory ( } /** - This service enables PEIMs to allocate memory after the permanent memory has been installed by a - PEIM. + This service enables PEIMs to allocate memory after the permanent memory has been + installed by a PEIM. @param MemoryType Type of memory to allocate. - @param Pages Number of pages to allocate. + @param Pages The number of pages to allocate. @param Memory Pointer of memory allocated. @retval EFI_SUCCESS The memory range was successfully allocated. @@ -361,8 +388,8 @@ PeiServicesAllocatePages ( This service allocates memory from the Hand-Off Block (HOB) heap. @param Size The number of bytes to allocate from the pool. - @param Buffer If the call succeeds, a pointer to a pointer to the allocate - buffer; undefined otherwise. + @param Buffer If the call succeeds, a pointer to a pointer to + the allocate buffer; otherwise, undefined. @retval EFI_SUCCESS The allocation was successful @retval EFI_OUT_OF_RESOURCES There is not enough heap to allocate the requested size. @@ -401,21 +428,21 @@ PeiServicesResetSystem ( } /** - This service is a wrapper for the PEI Service RegisterForShadow(), except the pointer to the PEI Services - Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface - Specification for details. + This service is a wrapper for the PEI Service RegisterForShadow(), except the + pointer to the PEI Services Table has been removed. See the Platform + Initialization Pre-EFI Initialization Core Interface Specification for details. - @param FileHandle PEIM's file handle. Must be the currently - executing PEIM. + @param FileHandle PEIM's file handle. Must be the currently + executing PEIM. - @retval EFI_SUCCESS The PEIM was successfully registered for - shadowing. + @retval EFI_SUCCESS The PEIM was successfully registered for + shadowing. @retval EFI_ALREADY_STARTED The PEIM was previously registered for shadowing. - @retval EFI_NOT_FOUND The FileHandle does not refer to a - valid file handle. + @retval EFI_NOT_FOUND The FileHandle does not refer to a + valid file handle. **/ EFI_STATUS EFIAPI @@ -431,17 +458,17 @@ PeiServicesRegisterForShadow ( Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface Specification for details. - @param FileHandle Handle of the file. + @param FileHandle The handle of the file. - @param FileInfo Upon exit, points to the file's - information. + @param FileInfo Upon exit, points to the file's + information. @retval EFI_SUCCESS File information returned. @retval EFI_INVALID_PARAMETER If FileHandle does not represent a valid file. - @retval EFI_INVALID_PARAMETER If FileInfo is NULL. + @retval EFI_INVALID_PARAMETER FileInfo is NULL. **/ EFI_STATUS @@ -454,19 +481,43 @@ PeiServicesFfsGetFileInfo ( return (*GetPeiServicesTablePointer())->FfsGetFileInfo (FileHandle, FileInfo); } +/** + This service is a wrapper for the PEI Service FfsGetFileInfo2(), except the pointer to the PEI Services + Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface + Specification for details. + + @param FileHandle The handle of the file. + @param FileInfo Upon exit, points to the file's + information. + + @retval EFI_SUCCESS File information returned. + @retval EFI_INVALID_PARAMETER If FileHandle does not + represent a valid file. + @retval EFI_INVALID_PARAMETER FileInfo is NULL. + +**/ +EFI_STATUS +EFIAPI +PeiServicesFfsGetFileInfo2 ( + IN CONST EFI_PEI_FILE_HANDLE FileHandle, + OUT EFI_FV_FILE_INFO2 *FileInfo + ) +{ + return (*GetPeiServicesTablePointer())->FfsGetFileInfo2 (FileHandle, FileInfo); +} /** This service is a wrapper for the PEI Service FfsFindByName(), except the pointer to the PEI Services Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface Specification for details. - @param FileName A pointer to the name of the file to - find within the firmware volume. + @param FileName A pointer to the name of the file to + find within the firmware volume. - @param VolumeHandle The firmware volume to search FileHandle - Upon exit, points to the found file's - handle or NULL if it could not be found. - @param FileHandle Pointer to found file handle + @param VolumeHandle The firmware volume to search FileHandle + Upon exit, points to the found file's + handle or NULL if it could not be found. + @param FileHandle The pointer to found file handle @retval EFI_SUCCESS File was found. @@ -493,10 +544,10 @@ PeiServicesFfsFindFileByName ( Table has been removed. See the Platform Initialization Pre-EFI Initialization Core Interface Specification for details. - @param VolumeHandle Handle of the volume. + @param VolumeHandle Handle of the volume. - @param VolumeInfo Upon exit, points to the volume's - information. + @param VolumeInfo Upon exit, points to the volume's + information. @retval EFI_SUCCESS File information returned. @@ -517,37 +568,46 @@ PeiServicesFfsGetVolumeInfo ( } /** - Install a EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance so the PEI Core will be notified about a new firmware volume. - - This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO_PPI using - the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance. - If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO_PPI, then ASSERT(). - If the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI can not be installed, then ASSERT(). - - - @param FvFormat Unique identifier of the format of the memory-mapped firmware volume. - This parameter is optional and may be NULL. - If NULL is specified, the EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed. - @param FvInfo Points to a buffer which allows the EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume. - The format of this buffer is specific to the FvFormat. For memory-mapped firmware volumes, - this typically points to the first byte of the firmware volume. - @param FvInfoSize The size, in bytes, of FvInfo. For memory-mapped firmware volumes, - this is typically the size of the firmware volume. - @param ParentFvName If the new firmware volume originated from a file in a different firmware volume, - then this parameter specifies the GUID name of the originating firmware volume. - Otherwise, this parameter must be NULL. - @param ParentFileName If the new firmware volume originated from a file in a different firmware volume, - then this parameter specifies the GUID file name of the originating firmware file. - Otherwise, this parameter must be NULL. + Install a EFI_PEI_FIRMWARE_VOLUME_INFO(2)_PPI instance so the PEI Core will be notified about a new firmware volume. + + This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO(2)_PPI using + the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO(2)_PPI instance. + If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO(2)_PPI, then ASSERT(). + If the EFI_PEI_FIRMWARE_VOLUME_INFO(2)_PPI can not be installed, then ASSERT(). + + @param InstallFvInfoPpi Install FvInfo Ppi if it is TRUE. Otherwise, install FvInfo2 Ppi. + @param FvFormat Unique identifier of the format of the memory-mapped + firmware volume. This parameter is optional and + may be NULL. If NULL is specified, the + EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed. + @param FvInfo Points to a buffer which allows the + EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume. + The format of this buffer is specific to the FvFormat. + For memory-mapped firmware volumes, this typically + points to the first byte of the firmware volume. + @param FvInfoSize The size, in bytes, of FvInfo. For memory-mapped + firmware volumes, this is typically the size of + the firmware volume. + @param ParentFvName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID name of the originating firmware + volume. Otherwise, this parameter must be NULL. + @param ParentFileName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID file name of the originating + firmware file. Otherwise, this parameter must be NULL. + @param AuthenticationStatus Authentication Status, it will be ignored if InstallFvInfoPpi is TRUE. **/ VOID EFIAPI -PeiServicesInstallFvInfoPpi ( +InternalPeiServicesInstallFvInfoPpi ( + IN BOOLEAN InstallFvInfoPpi, IN CONST EFI_GUID *FvFormat, OPTIONAL IN CONST VOID *FvInfo, IN UINT32 FvInfoSize, IN CONST EFI_GUID *ParentFvName, OPTIONAL - IN CONST EFI_GUID *ParentFileName OPTIONAL + IN CONST EFI_GUID *ParentFileName, OPTIONAL + IN UINT32 AuthenticationStatus ) { EFI_STATUS Status; @@ -555,11 +615,26 @@ PeiServicesInstallFvInfoPpi ( EFI_PEI_PPI_DESCRIPTOR *FvInfoPpiDescriptor; EFI_GUID *ParentFvNameValue; EFI_GUID *ParentFileNameValue; + EFI_GUID *PpiGuid; ParentFvNameValue = NULL; ParentFileNameValue = NULL; - FvInfoPpi = AllocateZeroPool (sizeof (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI)); - ASSERT(FvInfoPpi != NULL); + if (InstallFvInfoPpi) { + // + // To install FvInfo Ppi. + // + FvInfoPpi = AllocateZeroPool (sizeof (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI)); + ASSERT (FvInfoPpi != NULL); + PpiGuid = &gEfiPeiFirmwareVolumeInfoPpiGuid; + } else { + // + // To install FvInfo2 Ppi. + // + FvInfoPpi = AllocateZeroPool (sizeof (EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI)); + ASSERT (FvInfoPpi != NULL); + ((EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI *) FvInfoPpi)->AuthenticationStatus = AuthenticationStatus; + PpiGuid = &gEfiPeiFirmwareVolumeInfo2PpiGuid; + } if (FvFormat != NULL) { CopyGuid (&FvInfoPpi->FvFormat, FvFormat); @@ -570,7 +645,7 @@ PeiServicesInstallFvInfoPpi ( FvInfoPpi->FvInfoSize = FvInfoSize; if (ParentFvName != NULL) { ParentFvNameValue = AllocateCopyPool (sizeof (EFI_GUID), ParentFvName); - ASSERT (ParentFvNameValue != NULL); + ASSERT (ParentFvNameValue != NULL); FvInfoPpi->ParentFvName = ParentFvNameValue; } if (ParentFileName != NULL) { @@ -579,12 +654,100 @@ PeiServicesInstallFvInfoPpi ( FvInfoPpi->ParentFileName = ParentFileNameValue; } - FvInfoPpiDescriptor = AllocateCopyPool (sizeof(EFI_PEI_PPI_DESCRIPTOR), mPpiListTemplate); + FvInfoPpiDescriptor = AllocatePool (sizeof (EFI_PEI_PPI_DESCRIPTOR)); ASSERT (FvInfoPpiDescriptor != NULL); + FvInfoPpiDescriptor->Guid = PpiGuid; + FvInfoPpiDescriptor->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST; FvInfoPpiDescriptor->Ppi = (VOID *) FvInfoPpi; Status = PeiServicesInstallPpi (FvInfoPpiDescriptor); ASSERT_EFI_ERROR (Status); } +/** + Install a EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance so the PEI Core will be notified about a new firmware volume. + + This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO_PPI using + the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI instance. + If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO_PPI, then ASSERT(). + If the EFI_PEI_FIRMWARE_VOLUME_INFO_PPI can not be installed, then ASSERT(). + + @param FvFormat Unique identifier of the format of the memory-mapped + firmware volume. This parameter is optional and + may be NULL. If NULL is specified, the + EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed. + @param FvInfo Points to a buffer which allows the + EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume. + The format of this buffer is specific to the FvFormat. + For memory-mapped firmware volumes, this typically + points to the first byte of the firmware volume. + @param FvInfoSize The size, in bytes, of FvInfo. For memory-mapped + firmware volumes, this is typically the size of + the firmware volume. + @param ParentFvName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID name of the originating firmware + volume. Otherwise, this parameter must be NULL. + @param ParentFileName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID file name of the originating + firmware file. Otherwise, this parameter must be NULL. +**/ +VOID +EFIAPI +PeiServicesInstallFvInfoPpi ( + IN CONST EFI_GUID *FvFormat, OPTIONAL + IN CONST VOID *FvInfo, + IN UINT32 FvInfoSize, + IN CONST EFI_GUID *ParentFvName, OPTIONAL + IN CONST EFI_GUID *ParentFileName OPTIONAL + ) +{ + InternalPeiServicesInstallFvInfoPpi (TRUE, FvFormat, FvInfo, FvInfoSize, ParentFvName, ParentFileName, 0); +} + +/** + Install a EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI instance so the PEI Core will be notified about a new firmware volume. + + This function allocates, initializes, and installs a new EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI using + the parameters passed in to initialize the fields of the EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI instance. + If the resources can not be allocated for EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI, then ASSERT(). + If the EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI can not be installed, then ASSERT(). + + @param FvFormat Unique identifier of the format of the memory-mapped + firmware volume. This parameter is optional and + may be NULL. If NULL is specified, the + EFI_FIRMWARE_FILE_SYSTEM2_GUID format is assumed. + @param FvInfo Points to a buffer which allows the + EFI_PEI_FIRMWARE_VOLUME_PPI to process the volume. + The format of this buffer is specific to the FvFormat. + For memory-mapped firmware volumes, this typically + points to the first byte of the firmware volume. + @param FvInfoSize The size, in bytes, of FvInfo. For memory-mapped + firmware volumes, this is typically the size of + the firmware volume. + @param ParentFvName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID name of the originating firmware + volume. Otherwise, this parameter must be NULL. + @param ParentFileName If the new firmware volume originated from a file + in a different firmware volume, then this parameter + specifies the GUID file name of the originating + firmware file. Otherwise, this parameter must be NULL. + @param AuthenticationStatus Authentication Status +**/ +VOID +EFIAPI +PeiServicesInstallFvInfo2Ppi ( + IN CONST EFI_GUID *FvFormat, OPTIONAL + IN CONST VOID *FvInfo, + IN UINT32 FvInfoSize, + IN CONST EFI_GUID *ParentFvName, OPTIONAL + IN CONST EFI_GUID *ParentFileName, OPTIONAL + IN UINT32 AuthenticationStatus + ) +{ + InternalPeiServicesInstallFvInfoPpi (FALSE, FvFormat, FvInfo, FvInfoSize, ParentFvName, ParentFileName, AuthenticationStatus); +} +