EFI_STATUS\r
EFIAPI\r
LoadRecoveryCapsule (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_RECOVERY_MODULE_PPI *This\r
+ IN EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_RECOVERY_MODULE_PPI *This\r
);\r
\r
-EFI_PEI_RECOVERY_MODULE_PPI mRecoveryPpi = {\r
+EFI_PEI_RECOVERY_MODULE_PPI mRecoveryPpi = {\r
LoadRecoveryCapsule\r
};\r
\r
-EFI_PEI_PPI_DESCRIPTOR mRecoveryPpiList = {\r
+EFI_PEI_PPI_DESCRIPTOR mRecoveryPpiList = {\r
(EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
&gEfiPeiRecoveryModulePpiGuid,\r
&mRecoveryPpi\r
**/\r
EFI_STATUS\r
ParseRecoveryDataFile (\r
- IN UINT8 *DataBuffer,\r
- IN UINTN BufferSize,\r
- IN OUT CONFIG_HEADER *ConfigHeader,\r
- IN OUT RECOVERY_CONFIG_DATA **RecoveryArray\r
+ IN UINT8 *DataBuffer,\r
+ IN UINTN BufferSize,\r
+ IN OUT CONFIG_HEADER *ConfigHeader,\r
+ IN OUT RECOVERY_CONFIG_DATA **RecoveryArray\r
);\r
\r
/**\r
**/\r
BOOLEAN\r
IsSystemFmpImage (\r
- IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *FmpImageHeader\r
+ IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *FmpImageHeader\r
)\r
{\r
- GUID *Guid;\r
- UINTN Count;\r
- UINTN Index;\r
+ GUID *Guid;\r
+ UINTN Count;\r
+ UINTN Index;\r
\r
- Guid = PcdGetPtr(PcdSystemFmpCapsuleImageTypeIdGuid);\r
- Count = PcdGetSize(PcdSystemFmpCapsuleImageTypeIdGuid) / sizeof(GUID);\r
+ Guid = PcdGetPtr (PcdSystemFmpCapsuleImageTypeIdGuid);\r
+ Count = PcdGetSize (PcdSystemFmpCapsuleImageTypeIdGuid) / sizeof (GUID);\r
\r
for (Index = 0; Index < Count; Index++, Guid++) {\r
- if (CompareGuid(&FmpImageHeader->UpdateImageTypeId, Guid)) {\r
+ if (CompareGuid (&FmpImageHeader->UpdateImageTypeId, Guid)) {\r
return TRUE;\r
}\r
}\r
IN EFI_GUID *CapsuleGuid\r
)\r
{\r
- if (CompareGuid(&gEfiFmpCapsuleGuid, CapsuleGuid)) {\r
+ if (CompareGuid (&gEfiFmpCapsuleGuid, CapsuleGuid)) {\r
return TRUE;\r
}\r
\r
**/\r
BOOLEAN\r
IsSystemFmpCapsuleImage (\r
- IN EFI_CAPSULE_HEADER *CapsuleHeader\r
+ IN EFI_CAPSULE_HEADER *CapsuleHeader\r
)\r
{\r
- EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader;\r
- EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader;\r
- UINT64 *ItemOffsetList;\r
- UINT32 ItemNum;\r
- UINTN Index;\r
+ EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader;\r
+ EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader;\r
+ UINT64 *ItemOffsetList;\r
+ UINT32 ItemNum;\r
+ UINTN Index;\r
\r
- FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *) ((UINT8 *) CapsuleHeader + CapsuleHeader->HeaderSize);\r
+ FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *)((UINT8 *)CapsuleHeader + CapsuleHeader->HeaderSize);\r
\r
if (FmpCapsuleHeader->EmbeddedDriverCount != 0) {\r
return FALSE;\r
ItemOffsetList = (UINT64 *)(FmpCapsuleHeader + 1);\r
\r
for (Index = 0; Index < ItemNum; Index++) {\r
- ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);\r
- if (!IsSystemFmpImage(ImageHeader)) {\r
+ ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);\r
+ if (!IsSystemFmpImage (ImageHeader)) {\r
return FALSE;\r
}\r
}\r
if (CapsuleHeader->CapsuleImageSize != CapsuleSize) {\r
return FALSE;\r
}\r
+\r
if (CapsuleHeader->HeaderSize >= CapsuleHeader->CapsuleImageSize) {\r
return FALSE;\r
}\r
+\r
return TRUE;\r
}\r
\r
**/\r
EFI_STATUS\r
ValidateFmpCapsule (\r
- IN EFI_CAPSULE_HEADER *CapsuleHeader,\r
- OUT BOOLEAN *IsSystemFmp OPTIONAL,\r
- OUT UINT16 *EmbeddedDriverCount OPTIONAL\r
+ IN EFI_CAPSULE_HEADER *CapsuleHeader,\r
+ OUT BOOLEAN *IsSystemFmp OPTIONAL,\r
+ OUT UINT16 *EmbeddedDriverCount OPTIONAL\r
)\r
{\r
- EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader;\r
- UINT8 *EndOfCapsule;\r
- EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader;\r
- UINT8 *EndOfPayload;\r
- UINT64 *ItemOffsetList;\r
- UINT32 ItemNum;\r
- UINTN Index;\r
- UINTN FmpCapsuleSize;\r
- UINTN FmpCapsuleHeaderSize;\r
- UINT64 FmpImageSize;\r
- UINTN FmpImageHeaderSize;\r
+ EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *FmpCapsuleHeader;\r
+ UINT8 *EndOfCapsule;\r
+ EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader;\r
+ UINT8 *EndOfPayload;\r
+ UINT64 *ItemOffsetList;\r
+ UINT32 ItemNum;\r
+ UINTN Index;\r
+ UINTN FmpCapsuleSize;\r
+ UINTN FmpCapsuleHeaderSize;\r
+ UINT64 FmpImageSize;\r
+ UINTN FmpImageHeaderSize;\r
\r
if (CapsuleHeader->HeaderSize >= CapsuleHeader->CapsuleImageSize) {\r
- DEBUG((DEBUG_ERROR, "HeaderSize(0x%x) >= CapsuleImageSize(0x%x)\n", CapsuleHeader->HeaderSize, CapsuleHeader->CapsuleImageSize));\r
+ DEBUG ((DEBUG_ERROR, "HeaderSize(0x%x) >= CapsuleImageSize(0x%x)\n", CapsuleHeader->HeaderSize, CapsuleHeader->CapsuleImageSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *) ((UINT8 *) CapsuleHeader + CapsuleHeader->HeaderSize);\r
- EndOfCapsule = (UINT8 *) CapsuleHeader + CapsuleHeader->CapsuleImageSize;\r
+ FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *)((UINT8 *)CapsuleHeader + CapsuleHeader->HeaderSize);\r
+ EndOfCapsule = (UINT8 *)CapsuleHeader + CapsuleHeader->CapsuleImageSize;\r
FmpCapsuleSize = (UINTN)EndOfCapsule - (UINTN)FmpCapsuleHeader;\r
\r
- if (FmpCapsuleSize < sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER)) {\r
- DEBUG((DEBUG_ERROR, "FmpCapsuleSize(0x%x) < EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER\n", FmpCapsuleSize));\r
+ if (FmpCapsuleSize < sizeof (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER)) {\r
+ DEBUG ((DEBUG_ERROR, "FmpCapsuleSize(0x%x) < EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER\n", FmpCapsuleSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
// Check EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER\r
if (FmpCapsuleHeader->Version != EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION) {\r
- DEBUG((DEBUG_ERROR, "FmpCapsuleHeader->Version(0x%x) != EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION\n", FmpCapsuleHeader->Version));\r
+ DEBUG ((DEBUG_ERROR, "FmpCapsuleHeader->Version(0x%x) != EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER_INIT_VERSION\n", FmpCapsuleHeader->Version));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
ItemOffsetList = (UINT64 *)(FmpCapsuleHeader + 1);\r
\r
// No overflow\r
ItemNum = FmpCapsuleHeader->EmbeddedDriverCount + FmpCapsuleHeader->PayloadItemCount;\r
\r
- if ((FmpCapsuleSize - sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER))/sizeof(UINT64) < ItemNum) {\r
- DEBUG((DEBUG_ERROR, "ItemNum(0x%x) too big\n", ItemNum));\r
+ if ((FmpCapsuleSize - sizeof (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER))/sizeof (UINT64) < ItemNum) {\r
+ DEBUG ((DEBUG_ERROR, "ItemNum(0x%x) too big\n", ItemNum));\r
return EFI_INVALID_PARAMETER;\r
}\r
- FmpCapsuleHeaderSize = sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER) + sizeof(UINT64)*ItemNum;\r
+\r
+ FmpCapsuleHeaderSize = sizeof (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER) + sizeof (UINT64)*ItemNum;\r
\r
// Check ItemOffsetList\r
for (Index = 0; Index < ItemNum; Index++) {\r
if (ItemOffsetList[Index] >= FmpCapsuleSize) {\r
- DEBUG((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) >= FmpCapsuleSize(0x%x)\n", Index, ItemOffsetList[Index], FmpCapsuleSize));\r
+ DEBUG ((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) >= FmpCapsuleSize(0x%x)\n", Index, ItemOffsetList[Index], FmpCapsuleSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
if (ItemOffsetList[Index] < FmpCapsuleHeaderSize) {\r
- DEBUG((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) < FmpCapsuleHeaderSize(0x%x)\n", Index, ItemOffsetList[Index], FmpCapsuleHeaderSize));\r
+ DEBUG ((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) < FmpCapsuleHeaderSize(0x%x)\n", Index, ItemOffsetList[Index], FmpCapsuleHeaderSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
//\r
// All the address in ItemOffsetList must be stored in ascending order\r
//\r
if (Index > 0) {\r
if (ItemOffsetList[Index] <= ItemOffsetList[Index - 1]) {\r
- DEBUG((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) < ItemOffsetList[%d](0x%x)\n", Index, ItemOffsetList[Index], Index, ItemOffsetList[Index - 1]));\r
+ DEBUG ((DEBUG_ERROR, "ItemOffsetList[%d](0x%lx) < ItemOffsetList[%d](0x%x)\n", Index, ItemOffsetList[Index], Index, ItemOffsetList[Index - 1]));\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
\r
// Check EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER\r
for (Index = FmpCapsuleHeader->EmbeddedDriverCount; Index < ItemNum; Index++) {\r
- ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);\r
+ ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[Index]);\r
if (Index == ItemNum - 1) {\r
EndOfPayload = (UINT8 *)((UINTN)EndOfCapsule - (UINTN)FmpCapsuleHeader);\r
} else {\r
EndOfPayload = (UINT8 *)(UINTN)ItemOffsetList[Index+1];\r
}\r
+\r
FmpImageSize = (UINTN)EndOfPayload - ItemOffsetList[Index];\r
\r
- if (FmpImageSize < OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance)) {\r
- DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER\n", FmpImageSize));\r
+ if (FmpImageSize < OFFSET_OF (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance)) {\r
+ DEBUG ((DEBUG_ERROR, "FmpImageSize(0x%lx) < EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER\n", FmpImageSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
- FmpImageHeaderSize = sizeof(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER);\r
+\r
+ FmpImageHeaderSize = sizeof (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER);\r
if ((ImageHeader->Version > EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER_INIT_VERSION) ||\r
- (ImageHeader->Version < 1)) {\r
- DEBUG((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHeader->Version));\r
+ (ImageHeader->Version < 1))\r
+ {\r
+ DEBUG ((DEBUG_ERROR, "ImageHeader->Version(0x%x) Unknown\n", ImageHeader->Version));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
///\r
/// Current Init ImageHeader version is 3. UpdateHardwareInstance field was added in version 2\r
/// and ImageCapsuleSupport field was added in version 3\r
///\r
if (ImageHeader->Version == 1) {\r
- FmpImageHeaderSize = OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance);\r
- } else if (ImageHeader->Version == 2){\r
- FmpImageHeaderSize = OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport);\r
+ FmpImageHeaderSize = OFFSET_OF (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance);\r
+ } else if (ImageHeader->Version == 2) {\r
+ FmpImageHeaderSize = OFFSET_OF (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport);\r
}\r
\r
// No overflow\r
if (FmpImageSize != (UINT64)FmpImageHeaderSize + (UINT64)ImageHeader->UpdateImageSize + (UINT64)ImageHeader->UpdateVendorCodeSize) {\r
- DEBUG((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize(0x%x) UpdateVendorCodeSize(0x%x)\n", FmpImageSize, ImageHeader->UpdateImageSize, ImageHeader->UpdateVendorCodeSize));\r
+ DEBUG ((DEBUG_ERROR, "FmpImageSize(0x%lx) mismatch, UpdateImageSize(0x%x) UpdateVendorCodeSize(0x%x)\n", FmpImageSize, ImageHeader->UpdateImageSize, ImageHeader->UpdateVendorCodeSize));\r
return EFI_INVALID_PARAMETER;\r
}\r
}\r
//\r
EndOfPayload = (UINT8 *)(FmpCapsuleHeader + 1);\r
if (EndOfPayload != EndOfCapsule) {\r
- DEBUG((DEBUG_ERROR, "EndOfPayload(0x%x) mismatch, EndOfCapsule(0x%x)\n", EndOfPayload, EndOfCapsule));\r
+ DEBUG ((DEBUG_ERROR, "EndOfPayload(0x%x) mismatch, EndOfCapsule(0x%x)\n", EndOfPayload, EndOfCapsule));\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
return EFI_UNSUPPORTED;\r
}\r
\r
// Check in system FMP capsule\r
//\r
if (IsSystemFmp != NULL) {\r
- *IsSystemFmp = IsSystemFmpCapsuleImage(CapsuleHeader);\r
+ *IsSystemFmp = IsSystemFmpCapsuleImage (CapsuleHeader);\r
}\r
\r
if (EmbeddedDriverCount != NULL) {\r
EFI_STATUS Status;\r
UINTN BootMode;\r
\r
- BootMode = GetBootModeHob();\r
- ASSERT(BootMode == BOOT_IN_RECOVERY_MODE);\r
+ BootMode = GetBootModeHob ();\r
+ ASSERT (BootMode == BOOT_IN_RECOVERY_MODE);\r
\r
Status = (**PeiServices).InstallPpi (PeiServices, &mRecoveryPpiList);\r
ASSERT_EFI_ERROR (Status);\r
EFI_STATUS\r
EFIAPI\r
CreateHobForRecoveryCapsule (\r
- IN VOID *FvImage,\r
- IN UINTN FvImageSize\r
+ IN VOID *FvImage,\r
+ IN UINTN FvImageSize\r
)\r
{\r
EFI_FIRMWARE_VOLUME_HEADER *FvHeader;\r
//\r
// FvImage should be at its required alignment.\r
//\r
- FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) FvImage;\r
+ FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)FvImage;\r
//\r
// Validate FV Header, if not as expected, return\r
//\r
if (ReadUnaligned32 (&FvHeader->Signature) != EFI_FVH_SIGNATURE) {\r
- DEBUG((DEBUG_ERROR, "CreateHobForRecoveryCapsule (Fv Signature Error)\n"));\r
+ DEBUG ((DEBUG_ERROR, "CreateHobForRecoveryCapsule (Fv Signature Error)\n"));\r
return EFI_VOLUME_CORRUPTED;\r
}\r
+\r
//\r
// If EFI_FVB2_WEAK_ALIGNMENT is set in the volume header then the first byte of the volume\r
// can be aligned on any power-of-two boundary. A weakly aligned volume can not be moved from\r
if (FvAlignment < 8) {\r
FvAlignment = 8;\r
}\r
+\r
//\r
// Allocate the aligned buffer for the FvImage.\r
//\r
- if ((UINTN) FvHeader % FvAlignment != 0) {\r
- DEBUG((DEBUG_INFO, "CreateHobForRecoveryCapsule (FvHeader 0x%lx is not aligned)\n", (UINT64)(UINTN)FvHeader));\r
+ if ((UINTN)FvHeader % FvAlignment != 0) {\r
+ DEBUG ((DEBUG_INFO, "CreateHobForRecoveryCapsule (FvHeader 0x%lx is not aligned)\n", (UINT64)(UINTN)FvHeader));\r
FvLength = ReadUnaligned64 (&FvHeader->FvLength);\r
- NewFvBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINTN) FvLength), FvAlignment);\r
+ NewFvBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES ((UINTN)FvLength), FvAlignment);\r
if (NewFvBuffer == NULL) {\r
- DEBUG((DEBUG_ERROR, "CreateHobForRecoveryCapsule (Not enough resource to allocate 0x%lx bytes)\n", FvLength));\r
+ DEBUG ((DEBUG_ERROR, "CreateHobForRecoveryCapsule (Not enough resource to allocate 0x%lx bytes)\n", FvLength));\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- CopyMem (NewFvBuffer, FvHeader, (UINTN) FvLength);\r
- FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) NewFvBuffer;\r
+\r
+ CopyMem (NewFvBuffer, FvHeader, (UINTN)FvLength);\r
+ FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)NewFvBuffer;\r
}\r
}\r
\r
- BuildFvHob((UINT64)(UINTN)FvHeader, FvHeader->FvLength);\r
- DEBUG((DEBUG_INFO, "BuildFvHob (FV in recovery) - 0x%lx - 0x%lx\n", (UINT64)(UINTN)FvHeader, FvHeader->FvLength));\r
+ BuildFvHob ((UINT64)(UINTN)FvHeader, FvHeader->FvLength);\r
+ DEBUG ((DEBUG_INFO, "BuildFvHob (FV in recovery) - 0x%lx - 0x%lx\n", (UINT64)(UINTN)FvHeader, FvHeader->FvLength));\r
\r
- PeiServicesInstallFvInfoPpi(\r
+ PeiServicesInstallFvInfoPpi (\r
&FvHeader->FileSystemGuid,\r
(VOID *)FvHeader,\r
(UINT32)FvHeader->FvLength,\r
**/\r
EFI_STATUS\r
RecoverImage (\r
- IN VOID *SystemFirmwareImage,\r
- IN UINTN SystemFirmwareImageSize,\r
- IN VOID *ConfigImage,\r
- IN UINTN ConfigImageSize\r
+ IN VOID *SystemFirmwareImage,\r
+ IN UINTN SystemFirmwareImageSize,\r
+ IN VOID *ConfigImage,\r
+ IN UINTN ConfigImageSize\r
)\r
{\r
- EFI_STATUS Status;\r
- RECOVERY_CONFIG_DATA *ConfigData;\r
- RECOVERY_CONFIG_DATA *RecoveryConfigData;\r
- CONFIG_HEADER ConfigHeader;\r
- UINTN Index;\r
+ EFI_STATUS Status;\r
+ RECOVERY_CONFIG_DATA *ConfigData;\r
+ RECOVERY_CONFIG_DATA *RecoveryConfigData;\r
+ CONFIG_HEADER ConfigHeader;\r
+ UINTN Index;\r
\r
if (ConfigImage == NULL) {\r
- DEBUG((DEBUG_INFO, "RecoverImage (NoConfig)\n"));\r
- Status = CreateHobForRecoveryCapsule(\r
+ DEBUG ((DEBUG_INFO, "RecoverImage (NoConfig)\n"));\r
+ Status = CreateHobForRecoveryCapsule (\r
SystemFirmwareImage,\r
SystemFirmwareImageSize\r
);\r
return Status;\r
}\r
\r
- ConfigData = NULL;\r
- ZeroMem (&ConfigHeader, sizeof(ConfigHeader));\r
- Status = ParseRecoveryDataFile (\r
- ConfigImage,\r
- ConfigImageSize,\r
- &ConfigHeader,\r
- &ConfigData\r
- );\r
- DEBUG((DEBUG_INFO, "ParseRecoveryDataFile - %r\n", Status));\r
- if (EFI_ERROR(Status)) {\r
+ ConfigData = NULL;\r
+ ZeroMem (&ConfigHeader, sizeof (ConfigHeader));\r
+ Status = ParseRecoveryDataFile (\r
+ ConfigImage,\r
+ ConfigImageSize,\r
+ &ConfigHeader,\r
+ &ConfigData\r
+ );\r
+ DEBUG ((DEBUG_INFO, "ParseRecoveryDataFile - %r\n", Status));\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
- DEBUG((DEBUG_INFO, "ConfigHeader.NumOfRecovery - 0x%x\n", ConfigHeader.NumOfRecovery));\r
- DEBUG((DEBUG_INFO, "PcdEdkiiSystemFirmwareFileGuid - %g\n", PcdGetPtr(PcdEdkiiSystemFirmwareFileGuid)));\r
\r
- Index = 0;\r
+ DEBUG ((DEBUG_INFO, "ConfigHeader.NumOfRecovery - 0x%x\n", ConfigHeader.NumOfRecovery));\r
+ DEBUG ((DEBUG_INFO, "PcdEdkiiSystemFirmwareFileGuid - %g\n", PcdGetPtr (PcdEdkiiSystemFirmwareFileGuid)));\r
+\r
+ Index = 0;\r
RecoveryConfigData = ConfigData;\r
while (Index < ConfigHeader.NumOfRecovery) {\r
- if (CompareGuid(&RecoveryConfigData->FileGuid, PcdGetPtr(PcdEdkiiSystemFirmwareFileGuid))) {\r
- DEBUG((DEBUG_INFO, "FileGuid - %g (processing)\n", &RecoveryConfigData->FileGuid));\r
+ if (CompareGuid (&RecoveryConfigData->FileGuid, PcdGetPtr (PcdEdkiiSystemFirmwareFileGuid))) {\r
+ DEBUG ((DEBUG_INFO, "FileGuid - %g (processing)\n", &RecoveryConfigData->FileGuid));\r
Status = CreateHobForRecoveryCapsule (\r
(UINT8 *)SystemFirmwareImage + RecoveryConfigData->ImageOffset,\r
RecoveryConfigData->Length\r
break;\r
}\r
} else {\r
- DEBUG((DEBUG_INFO, "FileGuid - %g (ignored)\n", &RecoveryConfigData->FileGuid));\r
+ DEBUG ((DEBUG_INFO, "FileGuid - %g (ignored)\n", &RecoveryConfigData->FileGuid));\r
}\r
\r
Index++;\r
IN UINTN Length\r
)\r
{\r
- UINT32 LastAttemptVersion;\r
- UINT32 LastAttemptStatus;\r
- EFI_STATUS Status;\r
- VOID *SystemFirmwareImage;\r
- UINTN SystemFirmwareImageSize;\r
- VOID *ConfigImage;\r
- UINTN ConfigImageSize;\r
- VOID *AuthenticatedImage;\r
- UINTN AuthenticatedImageSize;\r
+ UINT32 LastAttemptVersion;\r
+ UINT32 LastAttemptStatus;\r
+ EFI_STATUS Status;\r
+ VOID *SystemFirmwareImage;\r
+ UINTN SystemFirmwareImageSize;\r
+ VOID *ConfigImage;\r
+ UINTN ConfigImageSize;\r
+ VOID *AuthenticatedImage;\r
+ UINTN AuthenticatedImageSize;\r
\r
AuthenticatedImage = NULL;\r
AuthenticatedImageSize = 0;\r
\r
- Status = CapsuleAuthenticateSystemFirmware(Image, Length, TRUE, &LastAttemptVersion, &LastAttemptStatus, &AuthenticatedImage, &AuthenticatedImageSize);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((DEBUG_INFO, "CapsuleAuthenticateSystemFirmware - %r\n", Status));\r
+ Status = CapsuleAuthenticateSystemFirmware (Image, Length, TRUE, &LastAttemptVersion, &LastAttemptStatus, &AuthenticatedImage, &AuthenticatedImageSize);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((DEBUG_INFO, "CapsuleAuthenticateSystemFirmware - %r\n", Status));\r
return Status;\r
}\r
\r
- ExtractSystemFirmwareImage(AuthenticatedImage, AuthenticatedImageSize, &SystemFirmwareImage, &SystemFirmwareImageSize);\r
- ExtractConfigImage(AuthenticatedImage, AuthenticatedImageSize, &ConfigImage, &ConfigImageSize);\r
+ ExtractSystemFirmwareImage (AuthenticatedImage, AuthenticatedImageSize, &SystemFirmwareImage, &SystemFirmwareImageSize);\r
+ ExtractConfigImage (AuthenticatedImage, AuthenticatedImageSize, &ConfigImage, &ConfigImageSize);\r
\r
- Status = RecoverImage(SystemFirmwareImage, SystemFirmwareImageSize, ConfigImage, ConfigImageSize);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((DEBUG_INFO, "RecoverImage - %r\n", Status));\r
+ Status = RecoverImage (SystemFirmwareImage, SystemFirmwareImageSize, ConfigImage, ConfigImageSize);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((DEBUG_INFO, "RecoverImage - %r\n", Status));\r
return Status;\r
}\r
\r
}\r
\r
FmpCapsuleHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER *)((UINT8 *)CapsuleHeader + CapsuleHeader->HeaderSize);\r
- ItemOffsetList = (UINT64 *)(FmpCapsuleHeader + 1);\r
+ ItemOffsetList = (UINT64 *)(FmpCapsuleHeader + 1);\r
\r
for (ItemIndex = 0; ItemIndex < FmpCapsuleHeader->PayloadItemCount; ItemIndex++) {\r
ImageHeader = (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *)((UINT8 *)FmpCapsuleHeader + ItemOffsetList[ItemIndex]);\r
// If version is 2 Header should exclude ImageCapsuleSupport field.\r
//\r
if (ImageHeader->Version == 1) {\r
- Image = (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance);\r
+ Image = (UINT8 *)ImageHeader + OFFSET_OF (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, UpdateHardwareInstance);\r
} else {\r
- Image = (UINT8 *)ImageHeader + OFFSET_OF(EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport);\r
+ Image = (UINT8 *)ImageHeader + OFFSET_OF (EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER, ImageCapsuleSupport);\r
}\r
}\r
\r
Status = ProcessRecoveryImage (Image, ImageHeader->UpdateImageSize);\r
- if (EFI_ERROR(Status)) {\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
}\r
EFI_STATUS\r
EFIAPI\r
ProcessRecoveryCapsule (\r
- IN VOID *CapsuleBuffer,\r
- IN UINTN CapsuleSize\r
+ IN VOID *CapsuleBuffer,\r
+ IN UINTN CapsuleSize\r
)\r
{\r
- EFI_STATUS Status;\r
- BOOLEAN IsSystemFmp;\r
- EFI_CAPSULE_HEADER *CapsuleHeader;\r
+ EFI_STATUS Status;\r
+ BOOLEAN IsSystemFmp;\r
+ EFI_CAPSULE_HEADER *CapsuleHeader;\r
\r
CapsuleHeader = CapsuleBuffer;\r
if (!IsValidCapsuleHeader (CapsuleHeader, CapsuleSize)) {\r
- DEBUG((DEBUG_ERROR, "CapsuleImageSize incorrect\n"));\r
+ DEBUG ((DEBUG_ERROR, "CapsuleImageSize incorrect\n"));\r
return EFI_SECURITY_VIOLATION;\r
}\r
\r
//\r
// Check FMP capsule layout\r
//\r
- if (IsFmpCapsuleGuid(&CapsuleHeader->CapsuleGuid)) {\r
- DEBUG((DEBUG_INFO, "CreateHobForRecoveryCapsule\n"));\r
-\r
- DEBUG((DEBUG_INFO, "ProcessCapsuleImage for FmpCapsule ...\n"));\r
- DEBUG((DEBUG_INFO, "ValidateFmpCapsule ...\n"));\r
- Status = ValidateFmpCapsule(CapsuleHeader, &IsSystemFmp, NULL);\r
- DEBUG((DEBUG_INFO, "ValidateFmpCapsule - %r\n", Status));\r
- if (EFI_ERROR(Status)) {\r
+ if (IsFmpCapsuleGuid (&CapsuleHeader->CapsuleGuid)) {\r
+ DEBUG ((DEBUG_INFO, "CreateHobForRecoveryCapsule\n"));\r
+\r
+ DEBUG ((DEBUG_INFO, "ProcessCapsuleImage for FmpCapsule ...\n"));\r
+ DEBUG ((DEBUG_INFO, "ValidateFmpCapsule ...\n"));\r
+ Status = ValidateFmpCapsule (CapsuleHeader, &IsSystemFmp, NULL);\r
+ DEBUG ((DEBUG_INFO, "ValidateFmpCapsule - %r\n", Status));\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
//\r
// Process EFI FMP Capsule\r
//\r
- DEBUG((DEBUG_INFO, "ProcessFmpCapsuleImage ...\n"));\r
- Status = ProcessFmpCapsuleImage(CapsuleHeader, IsSystemFmp);\r
- DEBUG((DEBUG_INFO, "ProcessFmpCapsuleImage - %r\n", Status));\r
+ DEBUG ((DEBUG_INFO, "ProcessFmpCapsuleImage ...\n"));\r
+ Status = ProcessFmpCapsuleImage (CapsuleHeader, IsSystemFmp);\r
+ DEBUG ((DEBUG_INFO, "ProcessFmpCapsuleImage - %r\n", Status));\r
\r
- DEBUG((DEBUG_INFO, "CreateHobForRecoveryCapsule Done\n"));\r
+ DEBUG ((DEBUG_INFO, "CreateHobForRecoveryCapsule Done\n"));\r
return Status;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
LoadRecoveryCapsule (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_RECOVERY_MODULE_PPI *This\r
+ IN EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_RECOVERY_MODULE_PPI *This\r
)\r
{\r
EFI_STATUS Status;\r
EFI_GUID CapsuleType;\r
VOID *CapsuleBuffer;\r
\r
- DEBUG((DEBUG_INFO | DEBUG_LOAD, "Recovery Entry\n"));\r
+ DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Recovery Entry\n"));\r
\r
for (Instance = 0; ; Instance++) {\r
Status = PeiServicesLocatePpi (\r
if (EFI_ERROR (Status)) {\r
break;\r
}\r
+\r
NumberRecoveryCapsules = 0;\r
- Status = DeviceRecoveryPpi->GetNumberRecoveryCapsules (\r
- (EFI_PEI_SERVICES **)PeiServices,\r
- DeviceRecoveryPpi,\r
- &NumberRecoveryCapsules\r
- );\r
+ Status = DeviceRecoveryPpi->GetNumberRecoveryCapsules (\r
+ (EFI_PEI_SERVICES **)PeiServices,\r
+ DeviceRecoveryPpi,\r
+ &NumberRecoveryCapsules\r
+ );\r
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - GetNumberRecoveryCapsules (%d) - %r\n", NumberRecoveryCapsules, Status));\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
+\r
for (CapsuleInstance = 1; CapsuleInstance <= NumberRecoveryCapsules; CapsuleInstance++) {\r
CapsuleSize = 0;\r
- Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo (\r
- (EFI_PEI_SERVICES **)PeiServices,\r
- DeviceRecoveryPpi,\r
- CapsuleInstance,\r
- &CapsuleSize,\r
- &CapsuleType\r
- );\r
+ Status = DeviceRecoveryPpi->GetRecoveryCapsuleInfo (\r
+ (EFI_PEI_SERVICES **)PeiServices,\r
+ DeviceRecoveryPpi,\r
+ CapsuleInstance,\r
+ &CapsuleSize,\r
+ &CapsuleType\r
+ );\r
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - GetRecoveryCapsuleInfo (%d - %x) - %r\n", CapsuleInstance, CapsuleSize, Status));\r
if (EFI_ERROR (Status)) {\r
break;\r
}\r
\r
- CapsuleBuffer = AllocatePages (EFI_SIZE_TO_PAGES(CapsuleSize));\r
+ CapsuleBuffer = AllocatePages (EFI_SIZE_TO_PAGES (CapsuleSize));\r
if (CapsuleBuffer == NULL) {\r
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - AllocatePool fail\n"));\r
continue;\r
}\r
+\r
Status = DeviceRecoveryPpi->LoadRecoveryCapsule (\r
(EFI_PEI_SERVICES **)PeiServices,\r
DeviceRecoveryPpi,\r
);\r
DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d) - %r\n", CapsuleInstance, Status));\r
if (EFI_ERROR (Status)) {\r
- FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES(CapsuleSize));\r
+ FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES (CapsuleSize));\r
break;\r
}\r
+\r
//\r
// good, load capsule buffer\r
//\r
projects / mirror_edk2.git / blobdiff