sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch of PI tree to main trunk

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3918 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2
2007-09-24 11:38:43 +00:00
parent f6203b7192
commit b0d803fe3e
34 changed files with 2893 additions and 1393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
MdePkg/Library/DxePiLib/DxePiLib.c
View File

@@ -16,6 +16,7 @@
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/PiLib.h>
#include <Protocol/FirmwareVolume2.h>
#include <Protocol/LoadedImage.h>
@@ -40,7 +41,7 @@
**/
STATIC
EFI_STATUS
GetImageFromFv (
InternalGetImageFromFv (
IN EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv,
IN CONST EFI_GUID *NameGuid,
IN EFI_SECTION_TYPE SectionType,
@@ -193,7 +194,7 @@ GetSectionFromFvFile (
(VOID **) &ImageFv
);
if (!EFI_ERROR (Status)) {
Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);
Status = InternalGetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);
}
}
@@ -231,7 +232,7 @@ GetSectionFromFvFile (
continue;
}
Status = GetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);
Status = InternalGetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);
if (!EFI_ERROR (Status)) {
goto Done;
@@ -254,3 +255,216 @@ Done:
return Status;
}
EFI_HANDLE
EFIAPI
ImageHandleToFvHandle (
EFI_HANDLE ImageHandle
)
{
EFI_STATUS Status;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
ASSERT (ImageHandle != NULL);
Status = gBS->HandleProtocol (
(EFI_HANDLE *) ImageHandle,
&gEfiLoadedImageProtocolGuid,
(VOID **) &LoadedImage
);
ASSERT_EFI_ERROR (Status);
return LoadedImage->DeviceHandle;
}
EFI_STATUS
EFIAPI
GetSectionFromAnyFv (
IN CONST EFI_GUID *NameGuid,
IN EFI_SECTION_TYPE SectionType,
IN UINTN Instance,
OUT VOID **Buffer,
OUT UINTN *Size
)
{
EFI_STATUS Status;
EFI_HANDLE *HandleBuffer;
UINTN HandleCount;
UINTN Index;
EFI_HANDLE FvHandle;
EFI_TPL OldTpl;
//
// Search the FV that contain the caller's FFS first.
// FV builder can choose to build FFS into the this FV
// so that this implementation of GetSectionFromAnyFv
// will locate the FFS faster.
//
FvHandle = ImageHandleToFvHandle (gImageHandle);
Status = GetSectionFromFv (
FvHandle,
NameGuid,
SectionType,
Instance,
Buffer,
Size
);
if (!EFI_ERROR (Status)) {
return EFI_SUCCESS;
}
OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
HandleBuffer = NULL;
Status = gBS->LocateHandleBuffer (
ByProtocol,
&gEfiFirmwareVolume2ProtocolGuid,
NULL,
&HandleCount,
&HandleBuffer
);
if (EFI_ERROR (Status)) {
goto Done;
}
for (Index = 0; Index < HandleCount; ++Index) {
//
// Skip the FV that contain the caller's FFS
//
if (HandleBuffer[Index] == FvHandle) {
continue;
}
Status = GetSectionFromFv (
HandleBuffer[Index],
NameGuid,
SectionType,
Instance,
Buffer,
Size
);
if (!EFI_ERROR (Status)) {
goto Done;
}
}
if (Index == HandleCount) {
Status = EFI_NOT_FOUND;
}
Done:
gBS->RestoreTPL (OldTpl);
if (HandleBuffer != NULL) {
FreePool(HandleBuffer);
}
return Status;
}
EFI_STATUS
EFIAPI
GetSectionFromFv (
IN EFI_HANDLE FvHandle,
IN CONST EFI_GUID *NameGuid,
IN EFI_SECTION_TYPE SectionType,
IN UINTN Instance,
OUT VOID **Buffer,
OUT UINTN *Size
)
{
EFI_STATUS Status;
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
UINT32 AuthenticationStatus;
ASSERT (FvHandle != NULL);
Status = gBS->HandleProtocol (
FvHandle,
&gEfiFirmwareVolume2ProtocolGuid,
(VOID **) &Fv
);
if (EFI_ERROR (Status)) {
return Status;
}
//
// Read desired section content in NameGuid file
//
*Buffer = NULL;
*Size = 0;
Status = Fv->ReadSection (
Fv,
NameGuid,
SectionType,
0,
Buffer,
Size,
&AuthenticationStatus
);
if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {
//
// Try reading PE32 section, if the required section is TE type
//
*Buffer = NULL;
*Size = 0;
Status = Fv->ReadSection (
Fv,
NameGuid,
EFI_SECTION_PE32,
0,
Buffer,
Size,
&AuthenticationStatus
);
}
return Status;
}
EFI_STATUS
EFIAPI
GetSectionFromCurrentFv (
IN CONST EFI_GUID *NameGuid,
IN EFI_SECTION_TYPE SectionType,
IN UINTN Instance,
OUT VOID **Buffer,
OUT UINTN *Size
)
{
return GetSectionFromFv(
ImageHandleToFvHandle(gImageHandle),
NameGuid,
SectionType,
Instance,
Buffer,
Size
);
}
EFI_STATUS
EFIAPI
GetSectionFromCurrentFfs (
IN EFI_SECTION_TYPE SectionType,
IN UINTN Instance,
OUT VOID **Buffer,
OUT UINTN *Size
)
{
return GetSectionFromFv(
ImageHandleToFvHandle(gImageHandle),
&gEfiCallerIdGuid,
SectionType,
Instance,
Buffer,
Size
);
}

67
MdePkg/Library/PeiPiLib/PeiPiLib.c Normal file
View File

@@ -0,0 +1,67 @@
/** @file
MDE PI library functions and macros for PEI phase
Copyright (c) 2007, 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
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <PiPei.h>
#include <Ppi/FirmwareVolumeInfo.h>
#include <Guid/FirmwareFileSystem2.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/PeiServicesLib.h>
#include <Library/PeiPiLib.h>
STATIC CONST EFI_PEI_FIRMWARE_VOLUME_INFO_PPI mFvInfoPpiTemplate = {
EFI_FIRMWARE_FILE_SYSTEM2_GUID,
NULL,
0, //FvInfoSize
NULL, //ParentFvName
NULL //ParentFileName;
};
VOID
EFIAPI
PeiPiLibBuildPiFvInfoPpi (
IN EFI_PHYSICAL_ADDRESS FvStart,
IN UINT64 FvLength,
IN EFI_GUID *ParentFvName,
IN EFI_GUID *ParentFileName
) {
EFI_STATUS Status;
EFI_PEI_FIRMWARE_VOLUME_INFO_PPI *FvInfoPpi;
EFI_PEI_PPI_DESCRIPTOR *FvInfoPpiDescriptor;
FvInfoPpi = AllocateCopyPool (sizeof (*FvInfoPpi), &mFvInfoPpiTemplate);
ASSERT( FvInfoPpi != NULL);
FvInfoPpi->FvInfo = (VOID *) (UINTN) FvStart;
FvInfoPpi->FvInfoSize = (UINT32) FvLength;
FvInfoPpi->ParentFvName = ParentFvName;
FvInfoPpi->ParentFileName = ParentFileName;
FvInfoPpiDescriptor = AllocatePool (sizeof(EFI_PEI_PPI_DESCRIPTOR));
ASSERT (FvInfoPpiDescriptor != NULL);
FvInfoPpiDescriptor->Flags = EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST;
FvInfoPpiDescriptor->Guid = &gEfiPeiFirmwareVolumeInfoPpiGuid;
FvInfoPpiDescriptor->Ppi = (VOID *) FvInfoPpi;
Status = PeiServicesInstallPpi (FvInfoPpiDescriptor);
ASSERT_EFI_ERROR (Status);
}

50
MdePkg/Library/PeiPiLib/PeiPiLib.inf Normal file
View File

@@ -0,0 +1,50 @@
#/** @file
# Component description file library instance for PiLib for PEI phase.
#
# Library to abstract utility functions that is related to PI Specification.
#
# Copyright (c) 2007, 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
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
#**/
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = PeiPiLib
FILE_GUID = 6196FE81-4FA4-469a-B759-2C4DFE935B79
MODULE_TYPE = PEIM
VERSION_STRING = 1.0
LIBRARY_CLASS = PiLib|PEIM
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
#
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
#
[Sources.common]
PeiPiLib.c
[Packages]
MdePkg/MdePkg.dec
[LibraryClasses]
MemoryAllocationLib
DebugLib
[Guids]
[Ppis]
gEfiPeiFirmwareVolumeInfoPpiGuid

51
MdePkg/Library/PeiServicesLib/PeiServicesLib.c
View File

@@ -379,9 +379,58 @@ EFIAPI
PeiServicesResetSystem (
VOID
)
{
CONST EFI_PEI_SERVICES **PeiServices;
PeiServices = (CONST EFI_PEI_SERVICES **) GetPeiServicesTablePointer ();
return (*PeiServices)->ResetSystem (PeiServices);
}
EFI_STATUS
EFIAPI
PeiServicesRegisterForShadow (
IN EFI_PEI_FILE_HANDLE FileHandle
)
{
EFI_PEI_SERVICES **PeiServices;
PeiServices = GetPeiServicesTablePointer ();
return (*PeiServices)->ResetSystem (PeiServices);
return (*PeiServices)->RegisterForShadow (FileHandle);
}
EFI_STATUS
EFIAPI
PeiServicesFfsGetFileInfo (
IN CONST EFI_PEI_FILE_HANDLE FileHandle,
OUT EFI_FV_FILE_INFO *FileInfo
)
{
EFI_PEI_SERVICES **PeiServices;
PeiServices = GetPeiServicesTablePointer ();
return (*PeiServices)->FfsGetFileInfo (FileHandle, FileInfo);
}
EFI_STATUS
EFIAPI
PeiServicesFfsFindFileByName (
IN CONST EFI_GUID *FileName,
IN CONST EFI_PEI_FV_HANDLE VolumeHandle,
OUT EFI_PEI_FILE_HANDLE *FileHandle
)
{
return (*GetPeiServicesTablePointer())->FfsFindFileByName (FileName, VolumeHandle, FileHandle);
}
EFI_STATUS
EFIAPI
PeiServicesFfsGetVolumeInfo (
IN EFI_PEI_FV_HANDLE VolumeHandle,
OUT EFI_FV_INFO *VolumeInfo
)
{
return (*GetPeiServicesTablePointer())->FfsGetVolumeInfo (VolumeHandle, VolumeInfo);
}

9
MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointer.c
View File

@@ -20,6 +20,15 @@
static EFI_PEI_SERVICES **gPeiServices;
VOID
EFIAPI
SetPeiServicesTablePointer (
EFI_PEI_SERVICES **PeiServices
)
{
gPeiServices = PeiServices;
}
/**
The function returns the pointer to PEI services.

9
MdePkg/Library/PeiServicesTablePointerLibMm7/PeiServicesTablePointer.c
View File

@@ -22,6 +22,15 @@
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
VOID
EFIAPI
SetPeiServicesTablePointer (
IN EFI_PEI_SERVICES **PeiServices
)
{
AsmWriteMm7 ((UINT64)(UINTN)PeiServices);
}
/**
The function returns the pointer to PeiServices.