From 1436aea4d5707e672672a11bda72be2c63c936c3 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:02 -0800 Subject: MdeModulePkg: Apply uncrustify changes REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the MdeModulePkg package Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Liming Gao --- .../Library/PiDxeS3BootScriptLib/BootScriptSave.c | 1244 +++++++++++--------- 1 file changed, 663 insertions(+), 581 deletions(-) (limited to 'MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c') diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c index 20378502c8..f8d4983d81 100644 --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c @@ -94,37 +94,37 @@ **/ -SCRIPT_TABLE_PRIVATE_DATA *mS3BootScriptTablePtr; +SCRIPT_TABLE_PRIVATE_DATA *mS3BootScriptTablePtr; // // Allocate SMM copy because we can not use mS3BootScriptTablePtr after SmmReadyToLock in InSmm. // -SCRIPT_TABLE_PRIVATE_DATA *mS3BootScriptTableSmmPtr; +SCRIPT_TABLE_PRIVATE_DATA *mS3BootScriptTableSmmPtr; -EFI_GUID mBootScriptDataGuid = { +EFI_GUID mBootScriptDataGuid = { 0xaea6b965, 0xdcf5, 0x4311, { 0xb4, 0xb8, 0xf, 0x12, 0x46, 0x44, 0x94, 0xd2 } }; -EFI_GUID mBootScriptDataBootTimeGuid = { +EFI_GUID mBootScriptDataBootTimeGuid = { 0xb5af1d7a, 0xb8cf, 0x4eb3, { 0x89, 0x25, 0xa8, 0x20, 0xe1, 0x6b, 0x68, 0x7d } }; -EFI_GUID mBootScriptTableBaseGuid = { +EFI_GUID mBootScriptTableBaseGuid = { 0x1810ab4a, 0x2314, 0x4df6, { 0x81, 0xeb, 0x67, 0xc6, 0xec, 0x5, 0x85, 0x91 } }; -EFI_GUID mBootScriptSmmPrivateDataGuid = { +EFI_GUID mBootScriptSmmPrivateDataGuid = { 0x627ee2da, 0x3bf9, 0x439b, { 0x92, 0x9f, 0x2e, 0xe, 0x6e, 0x9d, 0xba, 0x62 } }; -EFI_EVENT mEventDxeSmmReadyToLock = NULL; -VOID *mRegistrationSmmExitBootServices = NULL; -VOID *mRegistrationSmmLegacyBoot = NULL; -VOID *mRegistrationSmmReadyToLock = NULL; -BOOLEAN mS3BootScriptTableAllocated = FALSE; -BOOLEAN mS3BootScriptTableSmmAllocated = FALSE; -EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL; -BOOLEAN mS3BootScriptAcpiS3Enable = TRUE; +EFI_EVENT mEventDxeSmmReadyToLock = NULL; +VOID *mRegistrationSmmExitBootServices = NULL; +VOID *mRegistrationSmmLegacyBoot = NULL; +VOID *mRegistrationSmmReadyToLock = NULL; +BOOLEAN mS3BootScriptTableAllocated = FALSE; +BOOLEAN mS3BootScriptTableSmmAllocated = FALSE; +EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL; +BOOLEAN mS3BootScriptAcpiS3Enable = TRUE; /** This is an internal function to add a terminate node the entry, recalculate the table @@ -132,14 +132,15 @@ BOOLEAN mS3BootScriptAcpiS3Enable = TRUE; @return the base address of the boot script table. **/ -UINT8* +UINT8 * S3BootScriptInternalCloseTable ( VOID ) { - UINT8 *S3TableBase; - EFI_BOOT_SCRIPT_TERMINATE ScriptTerminate; - EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; + UINT8 *S3TableBase; + EFI_BOOT_SCRIPT_TERMINATE ScriptTerminate; + EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; + S3TableBase = mS3BootScriptTablePtr->TableBase; if (S3TableBase == NULL) { @@ -148,20 +149,19 @@ S3BootScriptInternalCloseTable ( // return S3TableBase; } + // // Append the termination entry. // - ScriptTerminate.OpCode = S3_BOOT_SCRIPT_LIB_TERMINATE_OPCODE; - ScriptTerminate.Length = (UINT8) sizeof (EFI_BOOT_SCRIPT_TERMINATE); + ScriptTerminate.OpCode = S3_BOOT_SCRIPT_LIB_TERMINATE_OPCODE; + ScriptTerminate.Length = (UINT8)sizeof (EFI_BOOT_SCRIPT_TERMINATE); CopyMem (mS3BootScriptTablePtr->TableBase + mS3BootScriptTablePtr->TableLength, &ScriptTerminate, sizeof (EFI_BOOT_SCRIPT_TERMINATE)); // // fill the table length // - ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER*)(mS3BootScriptTablePtr->TableBase); + ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER *)(mS3BootScriptTablePtr->TableBase); ScriptTableInfo->TableLength = mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE); - - return S3TableBase; // // NOTE: Here we did NOT adjust the mS3BootScriptTablePtr->TableLength to @@ -180,7 +180,7 @@ SaveBootScriptDataToLockBox ( VOID ) { - EFI_STATUS Status; + EFI_STATUS Status; // // Save whole memory copy into LockBox. @@ -203,7 +203,7 @@ SaveBootScriptDataToLockBox ( Status = SaveLockBox ( &mBootScriptTableBaseGuid, (VOID *)&mS3BootScriptTablePtr->TableBase, - sizeof(mS3BootScriptTablePtr->TableBase) + sizeof (mS3BootScriptTablePtr->TableBase) ); ASSERT_EFI_ERROR (Status); @@ -225,8 +225,8 @@ S3BootScriptEventCallBack ( IN VOID *Context ) { - EFI_STATUS Status; - VOID *Interface; + EFI_STATUS Status; + VOID *Interface; // // Try to locate it because EfiCreateProtocolNotifyEvent will trigger it once when registration. @@ -238,7 +238,7 @@ S3BootScriptEventCallBack ( &Interface ); if (EFI_ERROR (Status)) { - return ; + return; } // @@ -295,7 +295,7 @@ S3BootScriptSmmEventCallBack ( // Save a SMM copy. If TableBase is NOT null, it means SMM copy has been ready, skip copy mem. // if (mS3BootScriptTableSmmPtr->TableBase == NULL) { - CopyMem (mS3BootScriptTableSmmPtr, mS3BootScriptTablePtr, sizeof(*mS3BootScriptTablePtr)); + CopyMem (mS3BootScriptTableSmmPtr, mS3BootScriptTablePtr, sizeof (*mS3BootScriptTablePtr)); // // Set InSmm, we allow boot script update when InSmm, but not allow boot script outside SMM. @@ -303,6 +303,7 @@ S3BootScriptSmmEventCallBack ( // mS3BootScriptTableSmmPtr->InSmm = TRUE; } + // // We should not use ACPI Reserved copy, because it is not safe. // @@ -325,7 +326,7 @@ SaveBootTimeDataToLockBox ( VOID ) { - EFI_STATUS Status; + EFI_STATUS Status; // // ACPI Reserved copy is not safe, restore from BootScriptData LockBox first, @@ -344,7 +345,7 @@ SaveBootTimeDataToLockBox ( // Status = SaveLockBox ( &mBootScriptDataBootTimeGuid, - (VOID *) mS3BootScriptTablePtr->TableBase, + (VOID *)mS3BootScriptTablePtr->TableBase, mS3BootScriptTablePtr->BootTimeScriptLength ); ASSERT_EFI_ERROR (Status); @@ -360,17 +361,17 @@ SaveSmmPriviateDataToLockBoxAtRuntime ( VOID ) { - EFI_STATUS Status; + EFI_STATUS Status; // // Save boot script SMM private data with BackFromS3 = TRUE. // mS3BootScriptTablePtr->BackFromS3 = TRUE; - Status = SaveLockBox ( - &mBootScriptSmmPrivateDataGuid, - (VOID *) mS3BootScriptTablePtr, - sizeof (SCRIPT_TABLE_PRIVATE_DATA) - ); + Status = SaveLockBox ( + &mBootScriptSmmPrivateDataGuid, + (VOID *)mS3BootScriptTablePtr, + sizeof (SCRIPT_TABLE_PRIVATE_DATA) + ); ASSERT_EFI_ERROR (Status); Status = SetLockBoxAttributes (&mBootScriptSmmPrivateDataGuid, LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE); @@ -395,13 +396,13 @@ SaveSmmPriviateDataToLockBoxAtRuntime ( EFI_STATUS EFIAPI S3BootScriptSmmAtRuntimeCallBack ( - IN CONST EFI_GUID *Protocol, - IN VOID *Interface, - IN EFI_HANDLE Handle + IN CONST EFI_GUID *Protocol, + IN VOID *Interface, + IN EFI_HANDLE Handle ) { if (!mS3BootScriptTablePtr->AtRuntime) { - mS3BootScriptTablePtr->BootTimeScriptLength = (UINT32) (mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)); + mS3BootScriptTablePtr->BootTimeScriptLength = (UINT32)(mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)); SaveBootTimeDataToLockBox (); mS3BootScriptTablePtr->AtRuntime = TRUE; @@ -425,17 +426,17 @@ S3BootScriptSmmAtRuntimeCallBack ( RETURN_STATUS EFIAPI S3BootScriptLibInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status; - SCRIPT_TABLE_PRIVATE_DATA *S3TablePtr; - SCRIPT_TABLE_PRIVATE_DATA *S3TableSmmPtr; - VOID *Registration; - EFI_SMM_BASE2_PROTOCOL *SmmBase2; - BOOLEAN InSmm; - EFI_PHYSICAL_ADDRESS Buffer; + EFI_STATUS Status; + SCRIPT_TABLE_PRIVATE_DATA *S3TablePtr; + SCRIPT_TABLE_PRIVATE_DATA *S3TableSmmPtr; + VOID *Registration; + EFI_SMM_BASE2_PROTOCOL *SmmBase2; + BOOLEAN InSmm; + EFI_PHYSICAL_ADDRESS Buffer; if (!PcdGetBool (PcdAcpiS3Enable)) { mS3BootScriptAcpiS3Enable = FALSE; @@ -443,7 +444,7 @@ S3BootScriptLibInitialize ( return RETURN_SUCCESS; } - S3TablePtr = (SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivateDataPtr); + S3TablePtr = (SCRIPT_TABLE_PRIVATE_DATA *)(UINTN)PcdGet64 (PcdS3BootScriptTablePrivateDataPtr); // // The Boot script private data is not be initialized. create it // @@ -452,16 +453,16 @@ S3BootScriptLibInitialize ( Status = gBS->AllocatePages ( AllocateMaxAddress, EfiReservedMemoryType, - EFI_SIZE_TO_PAGES(sizeof(SCRIPT_TABLE_PRIVATE_DATA)), + EFI_SIZE_TO_PAGES (sizeof (SCRIPT_TABLE_PRIVATE_DATA)), &Buffer ); ASSERT_EFI_ERROR (Status); mS3BootScriptTableAllocated = TRUE; - S3TablePtr = (VOID *) (UINTN) Buffer; + S3TablePtr = (VOID *)(UINTN)Buffer; - Status = PcdSet64S (PcdS3BootScriptTablePrivateDataPtr, (UINT64) (UINTN)S3TablePtr); + Status = PcdSet64S (PcdS3BootScriptTablePrivateDataPtr, (UINT64)(UINTN)S3TablePtr); ASSERT_EFI_ERROR (Status); - ZeroMem (S3TablePtr, sizeof(SCRIPT_TABLE_PRIVATE_DATA)); + ZeroMem (S3TablePtr, sizeof (SCRIPT_TABLE_PRIVATE_DATA)); // // Create event to notify the library system enter the SmmLocked phase. // @@ -474,22 +475,26 @@ S3BootScriptLibInitialize ( ); ASSERT (mEventDxeSmmReadyToLock != NULL); } + mS3BootScriptTablePtr = S3TablePtr; // // Get InSmm, we need to register SmmReadyToLock if this library is linked to SMM driver. // - Status = gBS->LocateProtocol (&gEfiSmmBase2ProtocolGuid, NULL, (VOID**) &SmmBase2); + Status = gBS->LocateProtocol (&gEfiSmmBase2ProtocolGuid, NULL, (VOID **)&SmmBase2); if (EFI_ERROR (Status)) { return RETURN_SUCCESS; } + Status = SmmBase2->InSmm (SmmBase2, &InSmm); if (EFI_ERROR (Status)) { return RETURN_SUCCESS; } + if (!InSmm) { return RETURN_SUCCESS; } + // // Good, we are in SMM // @@ -498,22 +503,22 @@ S3BootScriptLibInitialize ( return RETURN_SUCCESS; } - S3TableSmmPtr = (SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivateSmmDataPtr); + S3TableSmmPtr = (SCRIPT_TABLE_PRIVATE_DATA *)(UINTN)PcdGet64 (PcdS3BootScriptTablePrivateSmmDataPtr); // // The Boot script private data in SMM is not be initialized. create it // if (S3TableSmmPtr == 0) { Status = mBootScriptSmst->SmmAllocatePool ( EfiRuntimeServicesData, - sizeof(SCRIPT_TABLE_PRIVATE_DATA), - (VOID **) &S3TableSmmPtr + sizeof (SCRIPT_TABLE_PRIVATE_DATA), + (VOID **)&S3TableSmmPtr ); ASSERT_EFI_ERROR (Status); mS3BootScriptTableSmmAllocated = TRUE; - Status = PcdSet64S (PcdS3BootScriptTablePrivateSmmDataPtr, (UINT64) (UINTN)S3TableSmmPtr); + Status = PcdSet64S (PcdS3BootScriptTablePrivateSmmDataPtr, (UINT64)(UINTN)S3TableSmmPtr); ASSERT_EFI_ERROR (Status); - ZeroMem (S3TableSmmPtr, sizeof(SCRIPT_TABLE_PRIVATE_DATA)); + ZeroMem (S3TableSmmPtr, sizeof (SCRIPT_TABLE_PRIVATE_DATA)); // // Register SmmExitBootServices and SmmLegacyBoot notification. @@ -532,6 +537,7 @@ S3BootScriptLibInitialize ( ); ASSERT_EFI_ERROR (Status); } + mS3BootScriptTableSmmPtr = S3TableSmmPtr; // @@ -563,11 +569,11 @@ S3BootScriptLibInitialize ( RETURN_STATUS EFIAPI S3BootScriptLibDeinitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status; + EFI_STATUS Status; if (!mS3BootScriptAcpiS3Enable) { return RETURN_SUCCESS; @@ -595,6 +601,7 @@ S3BootScriptLibDeinitialize ( ); ASSERT_EFI_ERROR (Status); } + if (mRegistrationSmmLegacyBoot != NULL) { // // Unregister SmmLegacyBoot notification. @@ -606,6 +613,7 @@ S3BootScriptLibDeinitialize ( ); ASSERT_EFI_ERROR (Status); } + if (mRegistrationSmmReadyToLock != NULL) { // // Unregister SmmReadyToLock notification. @@ -623,11 +631,12 @@ S3BootScriptLibDeinitialize ( // Free the resources allocated and set PCDs to 0. // if (mS3BootScriptTableAllocated) { - Status = gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) mS3BootScriptTablePtr, EFI_SIZE_TO_PAGES(sizeof(SCRIPT_TABLE_PRIVATE_DATA))); + Status = gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)mS3BootScriptTablePtr, EFI_SIZE_TO_PAGES (sizeof (SCRIPT_TABLE_PRIVATE_DATA))); ASSERT_EFI_ERROR (Status); Status = PcdSet64S (PcdS3BootScriptTablePrivateDataPtr, 0); ASSERT_EFI_ERROR (Status); } + if ((mBootScriptSmst != NULL) && mS3BootScriptTableSmmAllocated) { Status = mBootScriptSmst->SmmFreePool (mS3BootScriptTableSmmPtr); ASSERT_EFI_ERROR (Status); @@ -648,95 +657,98 @@ S3BootScriptLibDeinitialize ( @retval the address from which the a new s3 boot script entry will write into **/ -UINT8* +UINT8 * S3BootScriptGetBootTimeEntryAddAddress ( UINT8 EntryLength ) { - EFI_PHYSICAL_ADDRESS S3TableBase; - EFI_PHYSICAL_ADDRESS NewS3TableBase; - UINT8 *NewEntryPtr; - UINT32 TableLength; - UINT16 PageNumber; - EFI_STATUS Status; - EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; - - S3TableBase = (EFI_PHYSICAL_ADDRESS)(UINTN)(mS3BootScriptTablePtr->TableBase); - if (S3TableBase == 0) { - // - // The table is not exist. This is the first to add entry. - // Allocate ACPI script table space under 4G memory. - // - S3TableBase = 0xffffffff; - Status = gBS->AllocatePages ( - AllocateMaxAddress, - EfiReservedMemoryType, - 2 + PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber), - (EFI_PHYSICAL_ADDRESS*)&S3TableBase - ); + EFI_PHYSICAL_ADDRESS S3TableBase; + EFI_PHYSICAL_ADDRESS NewS3TableBase; + UINT8 *NewEntryPtr; + UINT32 TableLength; + UINT16 PageNumber; + EFI_STATUS Status; + EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; + + S3TableBase = (EFI_PHYSICAL_ADDRESS)(UINTN)(mS3BootScriptTablePtr->TableBase); + if (S3TableBase == 0) { + // + // The table is not exist. This is the first to add entry. + // Allocate ACPI script table space under 4G memory. + // + S3TableBase = 0xffffffff; + Status = gBS->AllocatePages ( + AllocateMaxAddress, + EfiReservedMemoryType, + 2 + PcdGet16 (PcdS3BootScriptRuntimeTableReservePageNumber), + (EFI_PHYSICAL_ADDRESS *)&S3TableBase + ); + + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return 0; + } - if (EFI_ERROR(Status)) { - ASSERT_EFI_ERROR (Status); - return 0; - } - // - // Fill Table Header - // - ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER*)(UINTN)S3TableBase; - ScriptTableInfo->OpCode = S3_BOOT_SCRIPT_LIB_TABLE_OPCODE; - ScriptTableInfo->Length = (UINT8) sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); - ScriptTableInfo->Version = BOOT_SCRIPT_TABLE_VERSION; - ScriptTableInfo->TableLength = 0; // will be calculate at CloseTable - mS3BootScriptTablePtr->TableLength = sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); - mS3BootScriptTablePtr->TableBase = (UINT8*)(UINTN)S3TableBase; - mS3BootScriptTablePtr->TableMemoryPageNumber = (UINT16)(2 + PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber)); - } - - // Here we do not count the reserved memory for runtime script table. - PageNumber = (UINT16) (mS3BootScriptTablePtr->TableMemoryPageNumber - PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber)); - TableLength = mS3BootScriptTablePtr->TableLength; - if (EFI_PAGES_TO_SIZE ((UINTN) PageNumber) < (TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE))) { - // - // The buffer is too small to hold the table, Reallocate the buffer - // - NewS3TableBase = 0xffffffff; - Status = gBS->AllocatePages ( - AllocateMaxAddress, - EfiReservedMemoryType, - 2 + PageNumber + PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber), - (EFI_PHYSICAL_ADDRESS*)&NewS3TableBase - ); + // + // Fill Table Header + // + ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER *)(UINTN)S3TableBase; + ScriptTableInfo->OpCode = S3_BOOT_SCRIPT_LIB_TABLE_OPCODE; + ScriptTableInfo->Length = (UINT8)sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); + ScriptTableInfo->Version = BOOT_SCRIPT_TABLE_VERSION; + ScriptTableInfo->TableLength = 0; // will be calculate at CloseTable + mS3BootScriptTablePtr->TableLength = sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); + mS3BootScriptTablePtr->TableBase = (UINT8 *)(UINTN)S3TableBase; + mS3BootScriptTablePtr->TableMemoryPageNumber = (UINT16)(2 + PcdGet16 (PcdS3BootScriptRuntimeTableReservePageNumber)); + } + + // Here we do not count the reserved memory for runtime script table. + PageNumber = (UINT16)(mS3BootScriptTablePtr->TableMemoryPageNumber - PcdGet16 (PcdS3BootScriptRuntimeTableReservePageNumber)); + TableLength = mS3BootScriptTablePtr->TableLength; + if (EFI_PAGES_TO_SIZE ((UINTN)PageNumber) < (TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE))) { + // + // The buffer is too small to hold the table, Reallocate the buffer + // + NewS3TableBase = 0xffffffff; + Status = gBS->AllocatePages ( + AllocateMaxAddress, + EfiReservedMemoryType, + 2 + PageNumber + PcdGet16 (PcdS3BootScriptRuntimeTableReservePageNumber), + (EFI_PHYSICAL_ADDRESS *)&NewS3TableBase + ); + + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return 0; + } + + CopyMem ((VOID *)(UINTN)NewS3TableBase, (VOID *)(UINTN)S3TableBase, TableLength); + gBS->FreePages (S3TableBase, mS3BootScriptTablePtr->TableMemoryPageNumber); + + mS3BootScriptTablePtr->TableBase = (UINT8 *)(UINTN)NewS3TableBase; + mS3BootScriptTablePtr->TableMemoryPageNumber = (UINT16)(2 + PageNumber + PcdGet16 (PcdS3BootScriptRuntimeTableReservePageNumber)); + } + + // + // calculate the the start address for the new entry. + // + NewEntryPtr = mS3BootScriptTablePtr->TableBase + TableLength; + + // + // update the table lenghth + // + mS3BootScriptTablePtr->TableLength = TableLength + EntryLength; - if (EFI_ERROR(Status)) { - ASSERT_EFI_ERROR (Status); - return 0; - } - - CopyMem ((VOID*)(UINTN)NewS3TableBase, (VOID*)(UINTN)S3TableBase, TableLength); - gBS->FreePages (S3TableBase, mS3BootScriptTablePtr->TableMemoryPageNumber); - - mS3BootScriptTablePtr->TableBase = (UINT8*)(UINTN)NewS3TableBase; - mS3BootScriptTablePtr->TableMemoryPageNumber = (UINT16) (2 + PageNumber + PcdGet16(PcdS3BootScriptRuntimeTableReservePageNumber)); - } - // - // calculate the the start address for the new entry. - // - NewEntryPtr = mS3BootScriptTablePtr->TableBase + TableLength; - - // - // update the table lenghth - // - mS3BootScriptTablePtr->TableLength = TableLength + EntryLength; - - // - // In the boot time, we will not append the termination entry to the boot script - // table until the callers think there is no boot time data that should be added and - // it is caller's responsibility to explicit call the CloseTable. - // - // - - return NewEntryPtr; + // + // In the boot time, we will not append the termination entry to the boot script + // table until the callers think there is no boot time data that should be added and + // it is caller's responsibility to explicit call the CloseTable. + // + // + + return NewEntryPtr; } + /** To get the start address from which a new runtime(after SmmReadyToLock) s3 boot script entry will write into. In this case, it should be ensured that there is enough buffer to hold the entry. @@ -745,26 +757,27 @@ S3BootScriptGetBootTimeEntryAddAddress ( @retval the address from which the a new s3 runtime(after SmmReadyToLock) script entry will write into **/ -UINT8* +UINT8 * S3BootScriptGetRuntimeEntryAddAddress ( UINT8 EntryLength ) { - UINT8 *NewEntryPtr; - - NewEntryPtr = NULL; - // - // Check if the memory range reserved for S3 Boot Script table is large enough to hold the node. - // - if ((mS3BootScriptTablePtr->TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)) <= EFI_PAGES_TO_SIZE ((UINTN) (mS3BootScriptTablePtr->TableMemoryPageNumber))) { - NewEntryPtr = mS3BootScriptTablePtr->TableBase + mS3BootScriptTablePtr->TableLength; - mS3BootScriptTablePtr->TableLength = mS3BootScriptTablePtr->TableLength + EntryLength; - // - // Append a terminate node on every insert - // - S3BootScriptInternalCloseTable (); - } - return (UINT8*)NewEntryPtr; + UINT8 *NewEntryPtr; + + NewEntryPtr = NULL; + // + // Check if the memory range reserved for S3 Boot Script table is large enough to hold the node. + // + if ((mS3BootScriptTablePtr->TableLength + EntryLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)) <= EFI_PAGES_TO_SIZE ((UINTN)(mS3BootScriptTablePtr->TableMemoryPageNumber))) { + NewEntryPtr = mS3BootScriptTablePtr->TableBase + mS3BootScriptTablePtr->TableLength; + mS3BootScriptTablePtr->TableLength = mS3BootScriptTablePtr->TableLength + EntryLength; + // + // Append a terminate node on every insert + // + S3BootScriptInternalCloseTable (); + } + + return (UINT8 *)NewEntryPtr; } /** @@ -776,18 +789,18 @@ RestoreBootTimeDataFromLockBox ( VOID ) { - EFI_STATUS Status; - UINTN LockBoxLength; + EFI_STATUS Status; + UINTN LockBoxLength; // // Restore boot time boot script data from LockBox. // LockBoxLength = mS3BootScriptTablePtr->BootTimeScriptLength; - Status = RestoreLockBox ( - &mBootScriptDataBootTimeGuid, - (VOID *) mS3BootScriptTablePtr->TableBase, - &LockBoxLength - ); + Status = RestoreLockBox ( + &mBootScriptDataBootTimeGuid, + (VOID *)mS3BootScriptTablePtr->TableBase, + &LockBoxLength + ); ASSERT_EFI_ERROR (Status); // @@ -796,7 +809,7 @@ RestoreBootTimeDataFromLockBox ( Status = UpdateLockBox ( &mBootScriptDataGuid, 0, - (VOID *) mS3BootScriptTablePtr->TableBase, + (VOID *)mS3BootScriptTablePtr->TableBase, LockBoxLength ); ASSERT_EFI_ERROR (Status); @@ -804,7 +817,7 @@ RestoreBootTimeDataFromLockBox ( // // Update TableLength. // - mS3BootScriptTablePtr->TableLength = (UINT32) (mS3BootScriptTablePtr->BootTimeScriptLength - sizeof (EFI_BOOT_SCRIPT_TERMINATE)); + mS3BootScriptTablePtr->TableLength = (UINT32)(mS3BootScriptTablePtr->BootTimeScriptLength - sizeof (EFI_BOOT_SCRIPT_TERMINATE)); } /** @@ -814,12 +827,12 @@ RestoreBootTimeDataFromLockBox ( @retval the address from which the a new s3 boot script entry will write into **/ -UINT8* +UINT8 * S3BootScriptGetEntryAddAddress ( UINT8 EntryLength ) { - UINT8* NewEntryPtr; + UINT8 *NewEntryPtr; if (!mS3BootScriptAcpiS3Enable) { return NULL; @@ -847,12 +860,12 @@ S3BootScriptGetEntryAddAddress ( mS3BootScriptTablePtr->BackFromS3 = FALSE; } - NewEntryPtr = S3BootScriptGetRuntimeEntryAddAddress (EntryLength); + NewEntryPtr = S3BootScriptGetRuntimeEntryAddAddress (EntryLength); } else { - NewEntryPtr = S3BootScriptGetBootTimeEntryAddAddress (EntryLength); + NewEntryPtr = S3BootScriptGetBootTimeEntryAddAddress (EntryLength); } - return NewEntryPtr; + return NewEntryPtr; } /** @@ -863,7 +876,7 @@ S3BootScriptGetEntryAddAddress ( **/ VOID SyncBootScript ( - IN UINT8 *Script + IN UINT8 *Script ) { EFI_STATUS Status; @@ -875,12 +888,12 @@ SyncBootScript ( // If it is not after SmmReadyToLock in SMM, // just return. // - return ; + return; } - ScriptOffset = (UINT32) (Script - mS3BootScriptTablePtr->TableBase); + ScriptOffset = (UINT32)(Script - mS3BootScriptTablePtr->TableBase); - TotalScriptLength = (UINT32) (mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)); + TotalScriptLength = (UINT32)(mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE)); // // Update BootScriptData @@ -932,26 +945,27 @@ SyncBootScript ( @note this function could only called in boot time phase **/ -UINT8* +UINT8 * EFIAPI S3BootScriptCloseTable ( VOID ) { - UINT8 *S3TableBase; - UINT32 TableLength; - UINT8 *Buffer; - EFI_STATUS Status; - EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; + UINT8 *S3TableBase; + UINT32 TableLength; + UINT8 *Buffer; + EFI_STATUS Status; + EFI_BOOT_SCRIPT_TABLE_HEADER *ScriptTableInfo; S3TableBase = mS3BootScriptTablePtr->TableBase; if (S3TableBase == 0) { return 0; } + // // Append the termination record the S3 boot script table // - S3BootScriptInternalCloseTable(); + S3BootScriptInternalCloseTable (); TableLength = mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE); // // Allocate the buffer and copy the boot script to the buffer. @@ -959,11 +973,12 @@ S3BootScriptCloseTable ( Status = gBS->AllocatePool ( EfiBootServicesData, (UINTN)TableLength, - (VOID **) &Buffer + (VOID **)&Buffer ); if (EFI_ERROR (Status)) { - return 0; + return 0; } + CopyMem (Buffer, S3TableBase, TableLength); // @@ -971,14 +986,15 @@ S3BootScriptCloseTable ( // will write the record to the first entry of the table. // // Fill the table header. - ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER*)S3TableBase; + ScriptTableInfo = (EFI_BOOT_SCRIPT_TABLE_HEADER *)S3TableBase; ScriptTableInfo->OpCode = S3_BOOT_SCRIPT_LIB_TABLE_OPCODE; - ScriptTableInfo->Length = (UINT8) sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); + ScriptTableInfo->Length = (UINT8)sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); ScriptTableInfo->TableLength = 0; // will be calculate at close the table mS3BootScriptTablePtr->TableLength = sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); return Buffer; } + /** Save I/O write to boot script @@ -993,33 +1009,36 @@ S3BootScriptCloseTable ( RETURN_STATUS EFIAPI S3BootScriptSaveIoWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN UINTN Count, - IN VOID *Buffer + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN UINTN Count, + IN VOID *Buffer ) { UINT8 Length; - UINT8 *Script; + UINT8 *Script; UINT8 WidthInByte; EFI_BOOT_SCRIPT_IO_WRITE ScriptIoWrite; - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); // // Truncation check // if ((Count > MAX_UINT8) || - (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_IO_WRITE))) { + (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_IO_WRITE))) + { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_WRITE) + (WidthInByte * Count)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // save script data // @@ -1027,9 +1046,9 @@ S3BootScriptSaveIoWrite ( ScriptIoWrite.Length = Length; ScriptIoWrite.Width = Width; ScriptIoWrite.Address = Address; - ScriptIoWrite.Count = (UINT32) Count; - CopyMem ((VOID*)Script, (VOID*)&ScriptIoWrite, sizeof(EFI_BOOT_SCRIPT_IO_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_IO_WRITE)), Buffer, WidthInByte * Count); + ScriptIoWrite.Count = (UINT32)Count; + CopyMem ((VOID *)Script, (VOID *)&ScriptIoWrite, sizeof (EFI_BOOT_SCRIPT_IO_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_IO_WRITE)), Buffer, WidthInByte * Count); SyncBootScript (Script); @@ -1050,24 +1069,25 @@ S3BootScriptSaveIoWrite ( RETURN_STATUS EFIAPI S3BootScriptSaveIoReadWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_IO_READ_WRITE ScriptIoReadWrite; - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // @@ -1076,14 +1096,15 @@ S3BootScriptSaveIoReadWrite ( ScriptIoReadWrite.Width = Width; ScriptIoReadWrite.Address = Address; - CopyMem ((VOID*)Script, (VOID*)&ScriptIoReadWrite, sizeof(EFI_BOOT_SCRIPT_IO_READ_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE)), Data, WidthInByte); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE) + WidthInByte), DataMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptIoReadWrite, sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE)), Data, WidthInByte); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_IO_READ_WRITE) + WidthInByte), DataMask, WidthInByte); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for a memory write operation into a specified boot script table. @@ -1098,48 +1119,52 @@ S3BootScriptSaveIoReadWrite ( RETURN_STATUS EFIAPI S3BootScriptSaveMemWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN UINTN Count, - IN VOID *Buffer + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN UINTN Count, + IN VOID *Buffer ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_MEM_WRITE ScriptMemWrite; - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); // // Truncation check // if ((Count > MAX_UINT8) || - (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_MEM_WRITE))) { + (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_MEM_WRITE))) + { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_WRITE) + (WidthInByte * Count)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptMemWrite.OpCode = EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE; - ScriptMemWrite.Length = Length; - ScriptMemWrite.Width = Width; - ScriptMemWrite.Address = Address; - ScriptMemWrite.Count = (UINT32) Count; + ScriptMemWrite.OpCode = EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE; + ScriptMemWrite.Length = Length; + ScriptMemWrite.Width = Width; + ScriptMemWrite.Address = Address; + ScriptMemWrite.Count = (UINT32)Count; - CopyMem ((VOID*)Script, (VOID*)&ScriptMemWrite, sizeof(EFI_BOOT_SCRIPT_MEM_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_WRITE)), Buffer, WidthInByte * Count); + CopyMem ((VOID *)Script, (VOID *)&ScriptMemWrite, sizeof (EFI_BOOT_SCRIPT_MEM_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_WRITE)), Buffer, WidthInByte * Count); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for a memory modify operation into a specified boot script table. @@ -1154,40 +1179,42 @@ S3BootScriptSaveMemWrite ( RETURN_STATUS EFIAPI S3BootScriptSaveMemReadWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_MEM_READ_WRITE ScriptMemReadWrite; - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptMemReadWrite.OpCode = EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE; - ScriptMemReadWrite.Length = Length; - ScriptMemReadWrite.Width = Width; - ScriptMemReadWrite.Address = Address; + ScriptMemReadWrite.OpCode = EFI_BOOT_SCRIPT_MEM_READ_WRITE_OPCODE; + ScriptMemReadWrite.Length = Length; + ScriptMemReadWrite.Width = Width; + ScriptMemReadWrite.Address = Address; - CopyMem ((VOID*)Script, (VOID*)&ScriptMemReadWrite , sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE)), Data, WidthInByte); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE) + WidthInByte), DataMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptMemReadWrite, sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE)), Data, WidthInByte); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_READ_WRITE) + WidthInByte), DataMask, WidthInByte); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for a PCI configuration space write operation into a specified boot script table. @@ -1204,54 +1231,59 @@ S3BootScriptSaveMemReadWrite ( RETURN_STATUS EFIAPI S3BootScriptSavePciCfgWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN UINTN Count, - IN VOID *Buffer + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN UINTN Count, + IN VOID *Buffer ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE ScriptPciWrite; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); // // Truncation check // if ((Count > MAX_UINT8) || - (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE))) { + (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE))) + { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE) + (WidthInByte * Count)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPciWrite.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE; - ScriptPciWrite.Length = Length; - ScriptPciWrite.Width = Width; - ScriptPciWrite.Address = Address; - ScriptPciWrite.Count = (UINT32) Count; + ScriptPciWrite.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE_OPCODE; + ScriptPciWrite.Length = Length; + ScriptPciWrite.Width = Width; + ScriptPciWrite.Address = Address; + ScriptPciWrite.Count = (UINT32)Count; - CopyMem ((VOID*)Script, (VOID*)&ScriptPciWrite, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE)), Buffer, WidthInByte * Count); + CopyMem ((VOID *)Script, (VOID *)&ScriptPciWrite, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_WRITE)), Buffer, WidthInByte * Count); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for a PCI configuration space modify operation into a specified boot script table. @@ -1268,42 +1300,44 @@ S3BootScriptSavePciCfgWrite ( RETURN_STATUS EFIAPI S3BootScriptSavePciCfgReadWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE ScriptPciReadWrite; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPciReadWrite.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE; - ScriptPciReadWrite.Length = Length; - ScriptPciReadWrite.Width = Width; - ScriptPciReadWrite.Address = Address; + ScriptPciReadWrite.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE; + ScriptPciReadWrite.Length = Length; + ScriptPciReadWrite.Width = Width; + ScriptPciReadWrite.Address = Address; - CopyMem ((VOID*)Script, (VOID*)&ScriptPciReadWrite, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE)), Data, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptPciReadWrite, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE)), Data, WidthInByte); CopyMem ( - (VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE) + WidthInByte), + (VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE) + WidthInByte), DataMask, WidthInByte ); @@ -1312,6 +1346,7 @@ S3BootScriptSavePciCfgReadWrite ( return RETURN_SUCCESS; } + /** Adds a record for a PCI configuration 2 space write operation into a specified boot script table. @@ -1329,56 +1364,61 @@ S3BootScriptSavePciCfgReadWrite ( RETURN_STATUS EFIAPI S3BootScriptSavePciCfg2Write ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT16 Segment, - IN UINT64 Address, - IN UINTN Count, - IN VOID *Buffer + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT16 Segment, + IN UINT64 Address, + IN UINTN Count, + IN VOID *Buffer ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE ScriptPciWrite2; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); // // Truncation check // if ((Count > MAX_UINT8) || - (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE))) { + (WidthInByte * Count > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE))) + { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE) + (WidthInByte * Count)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPciWrite2.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE; - ScriptPciWrite2.Length = Length; - ScriptPciWrite2.Width = Width; - ScriptPciWrite2.Address = Address; - ScriptPciWrite2.Segment = Segment; - ScriptPciWrite2.Count = (UINT32)Count; + ScriptPciWrite2.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE_OPCODE; + ScriptPciWrite2.Length = Length; + ScriptPciWrite2.Width = Width; + ScriptPciWrite2.Address = Address; + ScriptPciWrite2.Segment = Segment; + ScriptPciWrite2.Count = (UINT32)Count; - CopyMem ((VOID*)Script, (VOID*)&ScriptPciWrite2, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE)), Buffer, WidthInByte * Count); + CopyMem ((VOID *)Script, (VOID *)&ScriptPciWrite2, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_WRITE)), Buffer, WidthInByte * Count); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for a PCI configuration 2 space modify operation into a specified boot script table. @@ -1396,44 +1436,46 @@ S3BootScriptSavePciCfg2Write ( RETURN_STATUS EFIAPI S3BootScriptSavePciCfg2ReadWrite ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT16 Segment, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT16 Segment, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE ScriptPciReadWrite2; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPciReadWrite2.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE; - ScriptPciReadWrite2.Length = Length; - ScriptPciReadWrite2.Width = Width; - ScriptPciReadWrite2.Segment = Segment; - ScriptPciReadWrite2.Address = Address; + ScriptPciReadWrite2.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE_OPCODE; + ScriptPciReadWrite2.Length = Length; + ScriptPciReadWrite2.Width = Width; + ScriptPciReadWrite2.Segment = Segment; + ScriptPciReadWrite2.Address = Address; - CopyMem ((VOID*)Script, (VOID*)&ScriptPciReadWrite2, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE)), Data, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptPciReadWrite2, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE)), Data, WidthInByte); CopyMem ( - (VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE) + WidthInByte), + (VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_READ_WRITE) + WidthInByte), DataMask, WidthInByte ); @@ -1477,19 +1519,19 @@ S3BootScriptSavePciCfg2ReadWrite ( **/ EFI_STATUS CheckParameters ( - IN UINTN SmBusAddress, - IN EFI_SMBUS_OPERATION Operation, - IN OUT UINTN *Length, - IN VOID *Buffer + IN UINTN SmBusAddress, + IN EFI_SMBUS_OPERATION Operation, + IN OUT UINTN *Length, + IN VOID *Buffer ) { - EFI_STATUS Status; - UINTN RequiredLen; - EFI_SMBUS_DEVICE_COMMAND Command; - BOOLEAN PecCheck; + EFI_STATUS Status; + UINTN RequiredLen; + EFI_SMBUS_DEVICE_COMMAND Command; + BOOLEAN PecCheck; - Command = SMBUS_LIB_COMMAND (SmBusAddress); - PecCheck = SMBUS_LIB_PEC (SmBusAddress); + Command = SMBUS_LIB_COMMAND (SmBusAddress); + PecCheck = SMBUS_LIB_PEC (SmBusAddress); // // Set default value to be 2: // for SmbusReadWord, SmbusWriteWord and SmbusProcessCall. @@ -1499,32 +1541,35 @@ CheckParameters ( switch (Operation) { case EfiSmbusQuickRead: case EfiSmbusQuickWrite: - if (PecCheck || Command != 0) { + if (PecCheck || (Command != 0)) { return EFI_UNSUPPORTED; } + break; case EfiSmbusReceiveByte: case EfiSmbusSendByte: if (Command != 0) { return EFI_UNSUPPORTED; } - // - // Cascade to check length parameter. - // + + // + // Cascade to check length parameter. + // case EfiSmbusReadByte: case EfiSmbusWriteByte: RequiredLen = 1; - // - // Cascade to check length parameter. - // + // + // Cascade to check length parameter. + // case EfiSmbusReadWord: case EfiSmbusWriteWord: case EfiSmbusProcessCall: - if (Buffer == NULL || Length == NULL) { + if ((Buffer == NULL) || (Length == NULL)) { return EFI_INVALID_PARAMETER; } else if (*Length < RequiredLen) { Status = EFI_BUFFER_TOO_SMALL; } + *Length = RequiredLen; break; case EfiSmbusReadBlock: @@ -1533,13 +1578,16 @@ CheckParameters ( if ((Buffer == NULL) || (Length == NULL) || (*Length < MIN_SMBUS_BLOCK_LEN) || - (*Length > MAX_SMBUS_BLOCK_LEN)) { + (*Length > MAX_SMBUS_BLOCK_LEN)) + { return EFI_INVALID_PARAMETER; } + break; default: return EFI_INVALID_PARAMETER; } + return Status; } @@ -1558,16 +1606,16 @@ CheckParameters ( RETURN_STATUS EFIAPI S3BootScriptSaveSmbusExecute ( - IN UINTN SmBusAddress, - IN EFI_SMBUS_OPERATION Operation, - IN UINTN *Length, - IN VOID *Buffer + IN UINTN SmBusAddress, + IN EFI_SMBUS_OPERATION Operation, + IN UINTN *Length, + IN VOID *Buffer ) { - EFI_STATUS Status; - UINTN BufferLength; - UINT8 DataSize; - UINT8 *Script; + EFI_STATUS Status; + UINTN BufferLength; + UINT8 DataSize; + UINT8 *Script; EFI_BOOT_SCRIPT_SMBUS_EXECUTE ScriptSmbusExecute; if (Length == NULL) { @@ -1587,24 +1635,26 @@ S3BootScriptSaveSmbusExecute ( if (BufferLength > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE)) { return RETURN_OUT_OF_RESOURCES; } + DataSize = (UINT8)(sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE) + BufferLength); Script = S3BootScriptGetEntryAddAddress (DataSize); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // ScriptSmbusExecute.OpCode = EFI_BOOT_SCRIPT_SMBUS_EXECUTE_OPCODE; ScriptSmbusExecute.Length = DataSize; - ScriptSmbusExecute.SmBusAddress = (UINT64) SmBusAddress; + ScriptSmbusExecute.SmBusAddress = (UINT64)SmBusAddress; ScriptSmbusExecute.Operation = Operation; - ScriptSmbusExecute.DataSize = (UINT32) BufferLength; + ScriptSmbusExecute.DataSize = (UINT32)BufferLength; - CopyMem ((VOID*)Script, (VOID*)&ScriptSmbusExecute, sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE)); + CopyMem ((VOID *)Script, (VOID *)&ScriptSmbusExecute, sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE)); CopyMem ( - (VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE)), + (VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_SMBUS_EXECUTE)), Buffer, BufferLength ); @@ -1613,6 +1663,7 @@ S3BootScriptSaveSmbusExecute ( return RETURN_SUCCESS; } + /** Adds a record for an execution stall on the processor into a specified boot script table. @@ -1624,11 +1675,11 @@ S3BootScriptSaveSmbusExecute ( RETURN_STATUS EFIAPI S3BootScriptSaveStall ( - IN UINTN Duration + IN UINTN Duration ) { - UINT8 Length; - UINT8 *Script; + UINT8 Length; + UINT8 *Script; EFI_BOOT_SCRIPT_STALL ScriptStall; Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_STALL)); @@ -1637,19 +1688,21 @@ S3BootScriptSaveStall ( if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptStall.OpCode = EFI_BOOT_SCRIPT_STALL_OPCODE; - ScriptStall.Length = Length; - ScriptStall.Duration = Duration; + ScriptStall.OpCode = EFI_BOOT_SCRIPT_STALL_OPCODE; + ScriptStall.Length = Length; + ScriptStall.Duration = Duration; - CopyMem ((VOID*)Script, (VOID*)&ScriptStall, sizeof (EFI_BOOT_SCRIPT_STALL)); + CopyMem ((VOID *)Script, (VOID *)&ScriptStall, sizeof (EFI_BOOT_SCRIPT_STALL)); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for dispatching specified arbitrary code into a specified boot script table. @@ -1662,34 +1715,36 @@ S3BootScriptSaveStall ( RETURN_STATUS EFIAPI S3BootScriptSaveDispatch2 ( - IN VOID *EntryPoint, - IN VOID *Context + IN VOID *EntryPoint, + IN VOID *Context ) { - UINT8 Length; - UINT8 *Script; + UINT8 Length; + UINT8 *Script; EFI_BOOT_SCRIPT_DISPATCH_2 ScriptDispatch2; + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_DISPATCH_2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // ScriptDispatch2.OpCode = EFI_BOOT_SCRIPT_DISPATCH_2_OPCODE; ScriptDispatch2.Length = Length; ScriptDispatch2.EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)EntryPoint; - ScriptDispatch2.Context = (EFI_PHYSICAL_ADDRESS)(UINTN)Context; + ScriptDispatch2.Context = (EFI_PHYSICAL_ADDRESS)(UINTN)Context; - CopyMem ((VOID*)Script, (VOID*)&ScriptDispatch2, sizeof (EFI_BOOT_SCRIPT_DISPATCH_2)); + CopyMem ((VOID *)Script, (VOID *)&ScriptDispatch2, sizeof (EFI_BOOT_SCRIPT_DISPATCH_2)); SyncBootScript (Script); return RETURN_SUCCESS; - } + /** Adds a record for memory reads of the memory location and continues when the exit criteria is satisfied or after a defined duration. @@ -1713,20 +1768,20 @@ S3BootScriptSaveDispatch2 ( RETURN_STATUS EFIAPI S3BootScriptSaveMemPoll ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN VOID *BitMask, - IN VOID *BitValue, - IN UINTN Duration, - IN UINT64 LoopTimes + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN VOID *BitMask, + IN VOID *BitValue, + IN UINTN Duration, + IN UINT64 LoopTimes ) { - UINT8 Length; - UINT8 *Script; - UINT8 WidthInByte; - EFI_BOOT_SCRIPT_MEM_POLL ScriptMemPoll; + UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; + EFI_BOOT_SCRIPT_MEM_POLL ScriptMemPoll; - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_MEM_POLL) + (WidthInByte * 2)); @@ -1734,24 +1789,26 @@ S3BootScriptSaveMemPoll ( if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptMemPoll.OpCode = EFI_BOOT_SCRIPT_MEM_POLL_OPCODE; - ScriptMemPoll.Length = Length; - ScriptMemPoll.Width = Width; - ScriptMemPoll.Address = Address; - ScriptMemPoll.Duration = Duration; + ScriptMemPoll.OpCode = EFI_BOOT_SCRIPT_MEM_POLL_OPCODE; + ScriptMemPoll.Length = Length; + ScriptMemPoll.Width = Width; + ScriptMemPoll.Address = Address; + ScriptMemPoll.Duration = Duration; ScriptMemPoll.LoopTimes = LoopTimes; - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_MEM_POLL)), BitValue, WidthInByte); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_MEM_POLL) + WidthInByte), BitMask, WidthInByte); - CopyMem ((VOID*)Script, (VOID*)&ScriptMemPoll, sizeof (EFI_BOOT_SCRIPT_MEM_POLL)); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_POLL)), BitValue, WidthInByte); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_MEM_POLL) + WidthInByte), BitMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptMemPoll, sizeof (EFI_BOOT_SCRIPT_MEM_POLL)); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Store arbitrary information in the boot script table. This opcode is a no-op on dispatch and is only used for debugging script issues. @@ -1766,12 +1823,12 @@ S3BootScriptSaveMemPoll ( RETURN_STATUS EFIAPI S3BootScriptSaveInformation ( - IN UINT32 InformationLength, - IN VOID *Information + IN UINT32 InformationLength, + IN VOID *Information ) { - UINT8 Length; - UINT8 *Script; + UINT8 Length; + UINT8 *Script; EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; // @@ -1780,29 +1837,30 @@ S3BootScriptSaveInformation ( if (InformationLength > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_INFORMATION)) { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION) + InformationLength); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptInformation.OpCode = EFI_BOOT_SCRIPT_INFORMATION_OPCODE; - ScriptInformation.Length = Length; - + ScriptInformation.OpCode = EFI_BOOT_SCRIPT_INFORMATION_OPCODE; + ScriptInformation.Length = Length; ScriptInformation.InformationLength = InformationLength; - CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *) Information, (UINTN) InformationLength); + CopyMem ((VOID *)Script, (VOID *)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *)Information, (UINTN)InformationLength); SyncBootScript (Script); return RETURN_SUCCESS; - } + /** Store a string in the boot script table. This opcode is a no-op on dispatch and is only used for debugging script issues. @@ -1816,14 +1874,15 @@ S3BootScriptSaveInformation ( RETURN_STATUS EFIAPI S3BootScriptSaveInformationAsciiString ( - IN CONST CHAR8 *String + IN CONST CHAR8 *String ) { return S3BootScriptSaveInformation ( - (UINT32) AsciiStrLen (String) + 1, - (VOID*) String + (UINT32)AsciiStrLen (String) + 1, + (VOID *)String ); } + /** Adds a record for dispatching specified arbitrary code into a specified boot script table. @@ -1835,11 +1894,11 @@ S3BootScriptSaveInformationAsciiString ( RETURN_STATUS EFIAPI S3BootScriptSaveDispatch ( - IN VOID *EntryPoint + IN VOID *EntryPoint ) { - UINT8 Length; - UINT8 *Script; + UINT8 Length; + UINT8 *Script; EFI_BOOT_SCRIPT_DISPATCH ScriptDispatch; Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_DISPATCH)); @@ -1848,6 +1907,7 @@ S3BootScriptSaveDispatch ( if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // @@ -1855,13 +1915,13 @@ S3BootScriptSaveDispatch ( ScriptDispatch.Length = Length; ScriptDispatch.EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)EntryPoint; - CopyMem ((VOID*)Script, (VOID*)&ScriptDispatch, sizeof (EFI_BOOT_SCRIPT_DISPATCH)); + CopyMem ((VOID *)Script, (VOID *)&ScriptDispatch, sizeof (EFI_BOOT_SCRIPT_DISPATCH)); SyncBootScript (Script); return RETURN_SUCCESS; - } + /** Adds a record for I/O reads the I/O location and continues when the exit criteria is satisfied or after a defined duration. @@ -1881,38 +1941,38 @@ S3BootScriptSaveDispatch ( RETURN_STATUS EFIAPI S3BootScriptSaveIoPoll ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, IN VOID *Data, IN VOID *DataMask, - IN UINT64 Delay + IN UINT64 Delay ) { - UINT8 WidthInByte; - UINT8 *Script; - UINT8 Length; + UINT8 WidthInByte; + UINT8 *Script; + UINT8 Length; EFI_BOOT_SCRIPT_IO_POLL ScriptIoPoll; - - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_POLL) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_POLL) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptIoPoll.OpCode = EFI_BOOT_SCRIPT_IO_POLL_OPCODE; - ScriptIoPoll.Length = (UINT8) (sizeof (EFI_BOOT_SCRIPT_IO_POLL) + (WidthInByte * 2)); - ScriptIoPoll.Width = Width; - ScriptIoPoll.Address = Address; - ScriptIoPoll.Delay = Delay; + ScriptIoPoll.OpCode = EFI_BOOT_SCRIPT_IO_POLL_OPCODE; + ScriptIoPoll.Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_IO_POLL) + (WidthInByte * 2)); + ScriptIoPoll.Width = Width; + ScriptIoPoll.Address = Address; + ScriptIoPoll.Delay = Delay; - CopyMem ((VOID*)Script, (VOID*)&ScriptIoPoll, sizeof (EFI_BOOT_SCRIPT_IO_POLL)); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_IO_POLL)), Data, WidthInByte); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_IO_POLL) + WidthInByte), DataMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptIoPoll, sizeof (EFI_BOOT_SCRIPT_IO_POLL)); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_IO_POLL)), Data, WidthInByte); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_IO_POLL) + WidthInByte), DataMask, WidthInByte); SyncBootScript (Script); @@ -1939,48 +1999,51 @@ S3BootScriptSaveIoPoll ( RETURN_STATUS EFIAPI S3BootScriptSavePciPoll ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask, - IN UINT64 Delay -) + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask, + IN UINT64 Delay + ) { - UINT8 *Script; - UINT8 WidthInByte; - UINT8 Length; + UINT8 *Script; + UINT8 WidthInByte; + UINT8 Length; EFI_BOOT_SCRIPT_PCI_CONFIG_POLL ScriptPciPoll; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPciPoll.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE; - ScriptPciPoll.Length = (UINT8) (sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + (WidthInByte * 2)); - ScriptPciPoll.Width = Width; - ScriptPciPoll.Address = Address; - ScriptPciPoll.Delay = Delay; + ScriptPciPoll.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG_POLL_OPCODE; + ScriptPciPoll.Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + (WidthInByte * 2)); + ScriptPciPoll.Width = Width; + ScriptPciPoll.Address = Address; + ScriptPciPoll.Delay = Delay; - CopyMem ((VOID*)Script, (VOID*)&ScriptPciPoll, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL)); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL)), Data, WidthInByte); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + WidthInByte), DataMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptPciPoll, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL)); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL)), Data, WidthInByte); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG_POLL) + WidthInByte), DataMask, WidthInByte); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Adds a record for PCI configuration space reads and continues when the exit criteria is satisfied or after a defined duration. @@ -2002,50 +2065,53 @@ S3BootScriptSavePciPoll ( RETURN_STATUS EFIAPI S3BootScriptSavePci2Poll ( - IN S3_BOOT_SCRIPT_LIB_WIDTH Width, - IN UINT16 Segment, - IN UINT64 Address, - IN VOID *Data, - IN VOID *DataMask, - IN UINT64 Delay -) + IN S3_BOOT_SCRIPT_LIB_WIDTH Width, + IN UINT16 Segment, + IN UINT64 Address, + IN VOID *Data, + IN VOID *DataMask, + IN UINT64 Delay + ) { - UINT8 WidthInByte; - UINT8 *Script; - UINT8 Length; + UINT8 WidthInByte; + UINT8 *Script; + UINT8 Length; EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL ScriptPci2Poll; - if (Width == S3BootScriptWidthUint64 || - Width == S3BootScriptWidthFifoUint64 || - Width == S3BootScriptWidthFillUint64) { + if ((Width == S3BootScriptWidthUint64) || + (Width == S3BootScriptWidthFifoUint64) || + (Width == S3BootScriptWidthFillUint64)) + { return EFI_INVALID_PARAMETER; } - WidthInByte = (UINT8) (0x01 << (Width & 0x03)); - Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + (WidthInByte * 2)); + WidthInByte = (UINT8)(0x01 << (Width & 0x03)); + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + (WidthInByte * 2)); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptPci2Poll.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE; - ScriptPci2Poll.Length = (UINT8) (sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + (WidthInByte * 2)); - ScriptPci2Poll.Width = Width; - ScriptPci2Poll.Segment = Segment; - ScriptPci2Poll.Address = Address; - ScriptPci2Poll.Delay = Delay; + ScriptPci2Poll.OpCode = EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL_OPCODE; + ScriptPci2Poll.Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + (WidthInByte * 2)); + ScriptPci2Poll.Width = Width; + ScriptPci2Poll.Segment = Segment; + ScriptPci2Poll.Address = Address; + ScriptPci2Poll.Delay = Delay; - CopyMem ((VOID*)Script, (VOID*)&ScriptPci2Poll, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL)); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL)), Data, WidthInByte); - CopyMem ((UINT8 *) (Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + WidthInByte), DataMask, WidthInByte); + CopyMem ((VOID *)Script, (VOID *)&ScriptPci2Poll, sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL)); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL)), Data, WidthInByte); + CopyMem ((UINT8 *)(Script + sizeof (EFI_BOOT_SCRIPT_PCI_CONFIG2_POLL) + WidthInByte), DataMask, WidthInByte); SyncBootScript (Script); return RETURN_SUCCESS; } + /** Do the calculation of start address from which a new s3 boot script entry will write into. @@ -2058,59 +2124,61 @@ S3BootScriptSavePci2Poll ( **/ VOID S3BootScriptCalculateInsertAddress ( - IN UINT8 EntryLength, + IN UINT8 EntryLength, IN VOID *Position OPTIONAL, - IN BOOLEAN BeforeOrAfter OPTIONAL, - OUT UINT8 **Script + IN BOOLEAN BeforeOrAfter OPTIONAL, + OUT UINT8 **Script ) { - UINTN TableLength; - UINT8 *S3TableBase; - UINTN PositionOffset; - EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader; - // - // The entry inserting to table is already added to the end of the table - // - TableLength = mS3BootScriptTablePtr->TableLength - EntryLength; - S3TableBase = mS3BootScriptTablePtr->TableBase ; - // - // calculate the Position offset - // - if (Position != NULL) { - PositionOffset = (UINTN)Position - (UINTN)S3TableBase; - - // - // If the BeforeOrAfter is FALSE, that means to insert the node right after the node. - // - if (!BeforeOrAfter) { - CopyMem ((VOID*)&ScriptHeader, Position, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER)); - PositionOffset += (ScriptHeader.Length); - } - // - // Insert the node before the adjusted Position - // - CopyMem (S3TableBase+PositionOffset+EntryLength, S3TableBase+PositionOffset, TableLength - PositionOffset); - // - // calculate the the start address for the new entry. - // - *Script = S3TableBase + PositionOffset; - - } else { - if (!BeforeOrAfter) { - // - // Insert the node to the end of the table - // - *Script = S3TableBase + TableLength; - } else { - // - // Insert the node to the beginning of the table - // - PositionOffset = (UINTN) sizeof(EFI_BOOT_SCRIPT_TABLE_HEADER); - CopyMem (S3TableBase+PositionOffset+EntryLength, S3TableBase+PositionOffset, TableLength - PositionOffset); - *Script = S3TableBase + PositionOffset; - } - } + UINTN TableLength; + UINT8 *S3TableBase; + UINTN PositionOffset; + EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader; + + // + // The entry inserting to table is already added to the end of the table + // + TableLength = mS3BootScriptTablePtr->TableLength - EntryLength; + S3TableBase = mS3BootScriptTablePtr->TableBase; + // + // calculate the Position offset + // + if (Position != NULL) { + PositionOffset = (UINTN)Position - (UINTN)S3TableBase; + + // + // If the BeforeOrAfter is FALSE, that means to insert the node right after the node. + // + if (!BeforeOrAfter) { + CopyMem ((VOID *)&ScriptHeader, Position, sizeof (EFI_BOOT_SCRIPT_COMMON_HEADER)); + PositionOffset += (ScriptHeader.Length); + } + + // + // Insert the node before the adjusted Position + // + CopyMem (S3TableBase+PositionOffset+EntryLength, S3TableBase+PositionOffset, TableLength - PositionOffset); + // + // calculate the the start address for the new entry. + // + *Script = S3TableBase + PositionOffset; + } else { + if (!BeforeOrAfter) { + // + // Insert the node to the end of the table + // + *Script = S3TableBase + TableLength; + } else { + // + // Insert the node to the beginning of the table + // + PositionOffset = (UINTN)sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); + CopyMem (S3TableBase+PositionOffset+EntryLength, S3TableBase+PositionOffset, TableLength - PositionOffset); + *Script = S3TableBase + PositionOffset; + } + } } + /** Move the last boot script entry to the position @@ -2129,21 +2197,21 @@ S3BootScriptCalculateInsertAddress ( RETURN_STATUS EFIAPI S3BootScriptMoveLastOpcode ( - IN BOOLEAN BeforeOrAfter, - IN OUT VOID **Position OPTIONAL -) + IN BOOLEAN BeforeOrAfter, + IN OUT VOID **Position OPTIONAL + ) { - UINT8* Script; - VOID *TempPosition; - UINTN StartAddress; - UINT32 TableLength; + UINT8 *Script; + VOID *TempPosition; + UINTN StartAddress; + UINT32 TableLength; EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader; - BOOLEAN ValidatePosition; - UINT8* LastOpcode; - UINT8 TempBootScriptEntry[BOOT_SCRIPT_NODE_MAX_LENGTH]; + BOOLEAN ValidatePosition; + UINT8 *LastOpcode; + UINT8 TempBootScriptEntry[BOOT_SCRIPT_NODE_MAX_LENGTH]; ValidatePosition = FALSE; - TempPosition = (Position == NULL) ? NULL:(*Position); + TempPosition = (Position == NULL) ? NULL : (*Position); // // Check that the script is initialized and synced without adding an entry to the script. @@ -2152,38 +2220,42 @@ S3BootScriptMoveLastOpcode ( if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + Script = mS3BootScriptTablePtr->TableBase; - StartAddress = (UINTN) Script; - TableLength = mS3BootScriptTablePtr->TableLength; - Script = Script + sizeof(EFI_BOOT_SCRIPT_TABLE_HEADER); - LastOpcode = Script; + StartAddress = (UINTN)Script; + TableLength = mS3BootScriptTablePtr->TableLength; + Script = Script + sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER); + LastOpcode = Script; // // Find the last boot Script Entry which is not the terminate node // - while ((UINTN) Script < (UINTN) (StartAddress + TableLength)) { - CopyMem ((VOID*)&ScriptHeader, Script, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER)); - if (TempPosition != NULL && TempPosition == Script) { + while ((UINTN)Script < (UINTN)(StartAddress + TableLength)) { + CopyMem ((VOID *)&ScriptHeader, Script, sizeof (EFI_BOOT_SCRIPT_COMMON_HEADER)); + if ((TempPosition != NULL) && (TempPosition == Script)) { // // If the position is specified, the position must be pointed to a boot script entry start address. // ValidatePosition = TRUE; } + if (ScriptHeader.OpCode != S3_BOOT_SCRIPT_LIB_TERMINATE_OPCODE) { LastOpcode = Script; } - Script = Script + ScriptHeader.Length; + + Script = Script + ScriptHeader.Length; } + // // If the position is specified, but not the start of a boot script entry, it is a invalid input // - if (TempPosition != NULL && !ValidatePosition) { + if ((TempPosition != NULL) && !ValidatePosition) { return RETURN_INVALID_PARAMETER; } - CopyMem ((VOID*)&ScriptHeader, LastOpcode, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER)); + CopyMem ((VOID *)&ScriptHeader, LastOpcode, sizeof (EFI_BOOT_SCRIPT_COMMON_HEADER)); - CopyMem((VOID*)TempBootScriptEntry, LastOpcode, ScriptHeader.Length); + CopyMem ((VOID *)TempBootScriptEntry, LastOpcode, ScriptHeader.Length); // // Find the right position to write the node in // @@ -2192,11 +2264,11 @@ S3BootScriptMoveLastOpcode ( TempPosition, BeforeOrAfter, &Script - ); + ); // // Copy the node to Boot script table // - CopyMem((VOID*)Script, (VOID*)TempBootScriptEntry, ScriptHeader.Length); + CopyMem ((VOID *)Script, (VOID *)TempBootScriptEntry, ScriptHeader.Length); SyncBootScript (Script); @@ -2206,8 +2278,10 @@ S3BootScriptMoveLastOpcode ( if (Position != NULL) { *Position = Script; } + return RETURN_SUCCESS; } + /** Create a Label node in the boot script table. @@ -2229,14 +2303,14 @@ S3BootScriptMoveLastOpcode ( RETURN_STATUS EFIAPI S3BootScriptLabelInternal ( - IN BOOLEAN BeforeOrAfter, - IN OUT VOID **Position OPTIONAL, - IN UINT32 InformationLength, - IN CONST CHAR8 *Information + IN BOOLEAN BeforeOrAfter, + IN OUT VOID **Position OPTIONAL, + IN UINT32 InformationLength, + IN CONST CHAR8 *Information ) { - UINT8 Length; - UINT8 *Script; + UINT8 Length; + UINT8 *Script; EFI_BOOT_SCRIPT_INFORMATION ScriptInformation; // @@ -2245,29 +2319,30 @@ S3BootScriptLabelInternal ( if (InformationLength > MAX_UINT8 - sizeof (EFI_BOOT_SCRIPT_INFORMATION)) { return RETURN_OUT_OF_RESOURCES; } + Length = (UINT8)(sizeof (EFI_BOOT_SCRIPT_INFORMATION) + InformationLength); Script = S3BootScriptGetEntryAddAddress (Length); if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + // // Build script data // - ScriptInformation.OpCode = S3_BOOT_SCRIPT_LIB_LABEL_OPCODE; - ScriptInformation.Length = Length; - + ScriptInformation.OpCode = S3_BOOT_SCRIPT_LIB_LABEL_OPCODE; + ScriptInformation.Length = Length; ScriptInformation.InformationLength = InformationLength; - CopyMem ((VOID*)Script, (VOID*)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); - CopyMem ((VOID*)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *) Information, (UINTN) InformationLength); + CopyMem ((VOID *)Script, (VOID *)&ScriptInformation, sizeof (EFI_BOOT_SCRIPT_INFORMATION)); + CopyMem ((VOID *)(Script + sizeof (EFI_BOOT_SCRIPT_INFORMATION)), (VOID *)Information, (UINTN)InformationLength); SyncBootScript (Script); return S3BootScriptMoveLastOpcode (BeforeOrAfter, Position); - } + /** Find a label within the boot script table and, if not present, optionally create it. @@ -2293,24 +2368,26 @@ S3BootScriptLabelInternal ( RETURN_STATUS EFIAPI S3BootScriptLabel ( - IN BOOLEAN BeforeOrAfter, - IN BOOLEAN CreateIfNotFound, - IN OUT VOID **Position OPTIONAL, - IN CONST CHAR8 *Label + IN BOOLEAN BeforeOrAfter, + IN BOOLEAN CreateIfNotFound, + IN OUT VOID **Position OPTIONAL, + IN CONST CHAR8 *Label ) { - UINT8* Script; - UINTN StartAddress; - UINT32 TableLength; + UINT8 *Script; + UINTN StartAddress; + UINT32 TableLength; EFI_BOOT_SCRIPT_COMMON_HEADER ScriptHeader; EFI_BOOT_SCRIPT_TABLE_HEADER TableHeader; UINT32 LabelLength; + // // Check NULL Label // if (Label == NULL) { return EFI_INVALID_PARAMETER; } + // // Check empty Label // @@ -2332,27 +2409,29 @@ S3BootScriptLabel ( // Check the header and search for existing label. // Script = mS3BootScriptTablePtr->TableBase; - CopyMem ((VOID*)&TableHeader, Script, sizeof(EFI_BOOT_SCRIPT_TABLE_HEADER)); + CopyMem ((VOID *)&TableHeader, Script, sizeof (EFI_BOOT_SCRIPT_TABLE_HEADER)); if (TableHeader.OpCode != S3_BOOT_SCRIPT_LIB_TABLE_OPCODE) { return EFI_INVALID_PARAMETER; } - StartAddress = (UINTN) Script; - TableLength = mS3BootScriptTablePtr->TableLength; - Script = Script + TableHeader.Length; - while ((UINTN) Script < (UINTN) (StartAddress + TableLength)) { - CopyMem ((VOID*)&ScriptHeader, Script, sizeof(EFI_BOOT_SCRIPT_COMMON_HEADER)); + StartAddress = (UINTN)Script; + TableLength = mS3BootScriptTablePtr->TableLength; + Script = Script + TableHeader.Length; + while ((UINTN)Script < (UINTN)(StartAddress + TableLength)) { + CopyMem ((VOID *)&ScriptHeader, Script, sizeof (EFI_BOOT_SCRIPT_COMMON_HEADER)); if (ScriptHeader.OpCode == S3_BOOT_SCRIPT_LIB_LABEL_OPCODE) { - if (AsciiStrCmp ((CHAR8 *)(UINTN)(Script+sizeof(EFI_BOOT_SCRIPT_INFORMATION)), Label) == 0) { + if (AsciiStrCmp ((CHAR8 *)(UINTN)(Script+sizeof (EFI_BOOT_SCRIPT_INFORMATION)), Label) == 0) { (*Position) = Script; return EFI_SUCCESS; } } - Script = Script + ScriptHeader.Length; + + Script = Script + ScriptHeader.Length; } + if (CreateIfNotFound) { - LabelLength = (UINT32)AsciiStrSize(Label); - return S3BootScriptLabelInternal (BeforeOrAfter,Position, LabelLength, Label); + LabelLength = (UINT32)AsciiStrSize (Label); + return S3BootScriptLabelInternal (BeforeOrAfter, Position, LabelLength, Label); } else { return EFI_NOT_FOUND; } @@ -2375,13 +2454,13 @@ S3BootScriptLabel ( RETURN_STATUS EFIAPI S3BootScriptCompare ( - IN UINT8 *Position1, - IN UINT8 *Position2, - OUT UINTN *RelativePosition + IN UINT8 *Position1, + IN UINT8 *Position2, + OUT UINTN *RelativePosition ) { - UINT8* Script; - UINT32 TableLength; + UINT8 *Script; + UINT32 TableLength; if (RelativePosition == NULL) { return EFI_INVALID_PARAMETER; @@ -2394,19 +2473,22 @@ S3BootScriptCompare ( if (Script == NULL) { return RETURN_OUT_OF_RESOURCES; } + Script = mS3BootScriptTablePtr->TableBase; // // mS3BootScriptTablePtr->TableLength does not include the termination node, so add it up // TableLength = mS3BootScriptTablePtr->TableLength + sizeof (EFI_BOOT_SCRIPT_TERMINATE); - if (Position1 < Script || Position1 > Script+TableLength) { + if ((Position1 < Script) || (Position1 > Script+TableLength)) { return EFI_INVALID_PARAMETER; } - if (Position2 < Script || Position2 > Script+TableLength) { + + if ((Position2 < Script) || (Position2 > Script+TableLength)) { return EFI_INVALID_PARAMETER; } - *RelativePosition = (Position1 < Position2)?-1:((Position1 == Position2)?0:1); + + *RelativePosition = (Position1 < Position2) ? -1 : ((Position1 == Position2) ? 0 : 1); return EFI_SUCCESS; } -- cgit v1.2.3