tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the issue that S3BootScriptLabel() does not work to insert label when the specified position is not at the end of table. 

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13979 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lzeng14 2012-11-29 05:41:51 +00:00
parent bcb7667258
commit 93b21ade88
4 changed files with 24 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c
View File

@ -1201,14 +1201,16 @@ BootScriptExecuteInformation (
{ {
UINT32 Index; UINT32 Index;
EFI_BOOT_SCRIPT_INFORMATION Information; EFI_BOOT_SCRIPT_INFORMATION Information;
UINT8 *InformationData;
CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(Information)); CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(EFI_BOOT_SCRIPT_INFORMATION));
DEBUG ((EFI_D_INFO, "BootScriptExecuteInformation - 0x%08x\n", (UINTN)Information.Information)); InformationData = Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION);
DEBUG ((EFI_D_INFO, "BootScriptExecuteInformation - 0x%08x\n", (UINTN) InformationData));
DEBUG ((EFI_D_INFO, "BootScriptInformation: ")); DEBUG ((EFI_D_INFO, "BootScriptInformation: "));
for (Index = 0; Index < Information.InformationLength; Index++) { for (Index = 0; Index < Information.InformationLength; Index++) {
DEBUG ((EFI_D_INFO, "%02x ", *(UINT8 *)(UINTN)(Information.Information + Index))); DEBUG ((EFI_D_INFO, "%02x ", InformationData[Index]));
} }
DEBUG ((EFI_D_INFO, "\n")); DEBUG ((EFI_D_INFO, "\n"));
} }
@ -1227,14 +1229,16 @@ BootScriptExecuteLabel (
{ {
UINT32 Index; UINT32 Index;
EFI_BOOT_SCRIPT_INFORMATION Information; EFI_BOOT_SCRIPT_INFORMATION Information;
UINT8 *InformationData;
CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(Information)); CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(EFI_BOOT_SCRIPT_INFORMATION));
DEBUG ((EFI_D_INFO, "BootScriptExecuteLabel - 0x%08x\n", (UINTN)Information.Information)); InformationData = Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION);
DEBUG ((EFI_D_INFO, "BootScriptExecuteLabel - 0x%08x\n", (UINTN) InformationData));
DEBUG ((EFI_D_INFO, "BootScriptLabel: ")); DEBUG ((EFI_D_INFO, "BootScriptLabel: "));
for (Index = 0; Index < Information.InformationLength; Index++) { for (Index = 0; Index < Information.InformationLength; Index++) {
DEBUG ((EFI_D_INFO, "%02x ", *(UINT8 *)(UINTN)(Information.Information + Index))); DEBUG ((EFI_D_INFO, "%02x ", InformationData[Index]));
} }
DEBUG ((EFI_D_INFO, "\n")); DEBUG ((EFI_D_INFO, "\n"));
} }

4
MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptInternalFormat.h
View File

@ -2,7 +2,7 @@
This file declares the internal Framework Boot Script format used by This file declares the internal Framework Boot Script format used by
the PI implementation of Script Saver and Executor. the PI implementation of Script Saver and Executor.
Copyright (c) 2006, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -145,7 +145,7 @@ typedef struct {
UINT16 OpCode; UINT16 OpCode;
UINT8 Length; UINT8 Length;
UINT32 InformationLength; UINT32 InformationLength;
EFI_PHYSICAL_ADDRESS Information; // UINT8 InformationData[InformationLength];
} EFI_BOOT_SCRIPT_INFORMATION; } EFI_BOOT_SCRIPT_INFORMATION;
typedef struct { typedef struct {

182
MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
View File

@ -54,10 +54,6 @@ EFI_GUID mBootScriptHeaderDataGuid = {
0x1810ab4a, 0x2314, 0x4df6, { 0x81, 0xeb, 0x67, 0xc6, 0xec, 0x5, 0x85, 0x91 } 0x1810ab4a, 0x2314, 0x4df6, { 0x81, 0xeb, 0x67, 0xc6, 0xec, 0x5, 0x85, 0x91 }
}; };
EFI_GUID mBootScriptInformationGuid = {
0x2c680508, 0x2b87, 0x46ab, { 0xb9, 0x8a, 0x49, 0xfc, 0x23, 0xf9, 0xf5, 0x95 }
};
/** /**
This is an internal function to add a terminate node the entry, recalculate the table This is an internal function to add a terminate node the entry, recalculate the table
length and fill into the table. length and fill into the table.
@ -103,113 +99,6 @@ S3BootScriptInternalCloseTable (
// //
} }
/**
This function return the total size of INFORMATION OPCODE in boot script table.
@return InformationBufferSize The total size of INFORMATION OPCODE in boot script table.
**/
UINTN
GetBootScriptInformationBufferSize (
VOID
)
{
UINT8 *S3TableBase;
UINT8 *Script;
UINTN TableLength;
EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader;
EFI_BOOT_SCRIPT_TABLE_HEADER TableHeader;
EFI_BOOT_SCRIPT_INFORMATION Information;
UINTN InformationBufferSize;
InformationBufferSize = 0;
S3TableBase = mS3BootScriptTablePtr->TableBase;
Script = S3TableBase;
CopyMem ((VOID*)&TableHeader, Script, sizeof(EFI_BOOT_SCRIPT_TABLE_HEADER));
TableLength = TableHeader.TableLength;
//
// Go through the ScriptTable
//
while ((UINTN) Script < (UINTN) (S3TableBase + TableLength)) {
CopyMem ((VOID*)&ScriptHeader, Script, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER));
switch (ScriptHeader.OpCode) {
case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:
CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(Information));
InformationBufferSize += Information.InformationLength;
break;
default:
break;
}
Script = Script + ScriptHeader.Length;
}
return InformationBufferSize;
}
/**
This function fix INFORMATION OPCODE in boot script table.
Originally, the Information buffer is pointer to EfiRuntimeServicesCode,
EfiRuntimeServicesData, or EfiACPIMemoryNVS. They are seperated.
Now, in order to save it to LockBox, we allocate a big EfiACPIMemoryNVS,
and fix the pointer for INFORMATION opcode InformationBuffer.
@param InformationBuffer The address of new Information buffer.
@param InformationBufferSize The size of new Information buffer.
**/
VOID
FixBootScriptInformation (
IN VOID *InformationBuffer,
IN UINTN InformationBufferSize
)
{
UINT8 *S3TableBase;
UINT8 *Script;
UINTN TableLength;
EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader;
EFI_BOOT_SCRIPT_TABLE_HEADER TableHeader;
EFI_BOOT_SCRIPT_INFORMATION Information;
UINTN FixedInformationBufferSize;
FixedInformationBufferSize = 0;
S3TableBase = mS3BootScriptTablePtr->TableBase;
Script = S3TableBase;
CopyMem ((VOID*)&TableHeader, Script, sizeof(EFI_BOOT_SCRIPT_TABLE_HEADER));
TableLength = TableHeader.TableLength;
//
// Go through the ScriptTable
//
while ((UINTN) Script < (UINTN) (S3TableBase + TableLength)) {
CopyMem ((VOID*)&ScriptHeader, Script, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER));
switch (ScriptHeader.OpCode) {
case EFI_BOOT_SCRIPT_INFORMATION_OPCODE:
CopyMem ((VOID*)&Information, (VOID*)Script, sizeof(Information));
CopyMem (
(VOID *)((UINTN)InformationBuffer + FixedInformationBufferSize),
(VOID *)(UINTN)Information.Information,
Information.InformationLength
);
gBS->FreePool ((VOID *)(UINTN)Information.Information);
Information.Information = (EFI_PHYSICAL_ADDRESS)((UINTN)InformationBuffer + FixedInformationBufferSize);
CopyMem ((VOID*)Script, (VOID*)&Information, sizeof(Information));
FixedInformationBufferSize += Information.InformationLength;
break;
default:
break;
}
Script = Script + ScriptHeader.Length;
}
ASSERT (FixedInformationBufferSize == InformationBufferSize);
return ;
}
/** /**
This function save boot script data to LockBox. This function save boot script data to LockBox.
1. BootSriptPrivate data, BootScript data - Image and DispatchContext are handled by platform. 1. BootSriptPrivate data, BootScript data - Image and DispatchContext are handled by platform.
@ -223,43 +112,6 @@ SaveBootScriptDataToLockBox (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS InformationBuffer;
UINTN InformationBufferSize;
//
// We need save BootScriptInformation to LockBox, because it is in
// EfiRuntimeServicesCode, EfiRuntimeServicesData, or EfiACPIMemoryNVS.
//
//
InformationBufferSize = GetBootScriptInformationBufferSize ();
if (InformationBufferSize != 0) {
InformationBuffer = 0xFFFFFFFF;
Status = gBS->AllocatePages (
AllocateMaxAddress,
EfiACPIMemoryNVS,
EFI_SIZE_TO_PAGES(InformationBufferSize),
&InformationBuffer
);
ASSERT_EFI_ERROR (Status);
//
// Fix BootScript information pointer
//
FixBootScriptInformation ((VOID *)(UINTN)InformationBuffer, InformationBufferSize);
//
// Save BootScript information to lockbox
//
Status = SaveLockBox (
&mBootScriptInformationGuid,
(VOID *)(UINTN)InformationBuffer,
InformationBufferSize
);
ASSERT_EFI_ERROR (Status);
Status = SetLockBoxAttributes (&mBootScriptInformationGuid, LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE);
ASSERT_EFI_ERROR (Status);
}
// //
// mS3BootScriptTablePtr->TableLength does not include EFI_BOOT_SCRIPT_TERMINATE, because we need add entry at runtime. // mS3BootScriptTablePtr->TableLength does not include EFI_BOOT_SCRIPT_TERMINATE, because we need add entry at runtime.
@ -1371,7 +1223,6 @@ S3BootScriptSaveMemPoll (
@param InformationLength Length of the data in bytes @param InformationLength Length of the data in bytes
@param Information Information to be logged in the boot scrpit @param Information Information to be logged in the boot scrpit
@retval RETURN_UNSUPPORTED If entering runtime, this method will not support.
@retval RETURN_OUT_OF_RESOURCES Not enough memory for the table do operation. @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table do operation.
@retval RETURN_SUCCESS Opcode is added. @retval RETURN_SUCCESS Opcode is added.
@ -1383,29 +1234,11 @@ S3BootScriptSaveInformation (
IN VOID *Information IN VOID *Information
) )
{ {
RETURN_STATUS Status;
UINT8 Length; UINT8 Length;
UINT8 *Script; UINT8 *Script;
VOID *Buffer;
EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; EFI_BOOT_SCRIPT_INFORMATION ScriptInformation;
if (mS3BootScriptTablePtr->AtRuntime) { Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION) + InformationLength);
return RETURN_UNSUPPORTED;
}
Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION));
//
// Use BootServicesData to hold the data, just in case caller free it.
// It will be copied into ACPINvs later.
//
Status = gBS->AllocatePool (
EfiBootServicesData,
InformationLength,
&Buffer
);
if (EFI_ERROR (Status)) {
return RETURN_OUT_OF_RESOURCES;
}
Script = S3BootScriptGetEntryAddAddress (Length); Script = S3BootScriptGetEntryAddAddress (Length);
if (Script == NULL) { if (Script == NULL) {
@ -1420,10 +1253,11 @@ S3BootScriptSaveInformation (
ScriptInformation.InformationLength = InformationLength; ScriptInformation.InformationLength = InformationLength;
CopyMem ((VOID *)(UINTN)Buffer, Information,(UINTN) InformationLength);
ScriptInformation.Information = (EFI_PHYSICAL_ADDRESS) (UINTN) Buffer;
CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION));
CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *) Information, (UINTN) InformationLength);
SyncBootScript ();
return RETURN_SUCCESS; return RETURN_SUCCESS;
} }
@ -1840,7 +1674,6 @@ S3BootScriptLabelInternal (
{ {
UINT8 Length; UINT8 Length;
UINT8 *Script; UINT8 *Script;
VOID *Buffer;
EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; EFI_BOOT_SCRIPT_INFORMATION ScriptInformation;
Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION) + InformationLength); Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION) + InformationLength);
@ -1849,7 +1682,6 @@ S3BootScriptLabelInternal (
if (Script == NULL) { if (Script == NULL) {
return RETURN_OUT_OF_RESOURCES; return RETURN_OUT_OF_RESOURCES;
} }
Buffer = Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION);
// //
// Build script data // Build script data
// //
@ -1859,10 +1691,8 @@ S3BootScriptLabelInternal (
ScriptInformation.InformationLength = InformationLength; ScriptInformation.InformationLength = InformationLength;
AsciiStrnCpy (Buffer, Information,(UINTN) InformationLength);
ScriptInformation.Information = (EFI_PHYSICAL_ADDRESS) (UINTN) Buffer;
CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION));
CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *) Information, (UINTN) InformationLength);
return S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); return S3BootScriptMoveLastOpcode (BeforeOrAfter, Position);

4
MdePkg/Include/Library/S3BootScriptLib.h
View File

@ -5,7 +5,7 @@
be provided in the Framework version library instance, which means some of these be provided in the Framework version library instance, which means some of these
APIs cannot be used if the underlying firmware is Framework and not PI. APIs cannot be used if the underlying firmware is Framework and not PI.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions are licensed and made available under the terms and conditions
@ -348,7 +348,6 @@ S3BootScriptSaveMemPoll (
@param[in] InformationLength Length of the data in bytes @param[in] InformationLength Length of the data in bytes
@param[in] Information Information to be logged in the boot scrpit @param[in] Information Information to be logged in the boot scrpit
@retval RETURN_UNSUPPORTED In runtime, this method is not supported.
@retval RETURN_OUT_OF_RESOURCES Not enough memory for the table to perform @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table to perform
the operation. the operation.
@retval RETURN_SUCCESS The opcode was added. @retval RETURN_SUCCESS The opcode was added.
@ -461,7 +460,6 @@ S3BootScriptSavePci2Poll (
@param[in] String The Null-terminated ASCII string to store into the S3 boot @param[in] String The Null-terminated ASCII string to store into the S3 boot
script table. script table.
@retval RETURN_UNSUPPORTED In runtime, this method is not supported.
@retval RETURN_OUT_OF_RESOURCES Not enough memory for the table to perform @retval RETURN_OUT_OF_RESOURCES Not enough memory for the table to perform
the operation. the operation.
@retval RETURN_SUCCESS The opcode was added. @retval RETURN_SUCCESS The opcode was added.