Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg/CapsuleLib: Add CapsuleTarget support. 

UEFI spec requires CapsuleTarget to be a device path associated
with FMP producer.

Cc: Feng Tian <feng.tian@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Jiewen Yao 2016-12-23 15:42:27 +08:00
parent 0a64f49fde
commit 8f6db16134
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c
View File

@ -100,6 +100,7 @@ RecordCapsuleStatusVariable (
@param[in] CapsuleStatus The capsule process stauts @param[in] CapsuleStatus The capsule process stauts
@param[in] PayloadIndex FMP payload index @param[in] PayloadIndex FMP payload index
@param[in] ImageHeader FMP image header @param[in] ImageHeader FMP image header
@param[in] FmpDevicePath DevicePath associated with the FMP producer
@retval EFI_SUCCESS The capsule status variable is recorded. @retval EFI_SUCCESS The capsule status variable is recorded.
@retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable. @retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable.
@ -109,7 +110,8 @@ RecordFmpCapsuleStatusVariable (
IN EFI_CAPSULE_HEADER *CapsuleHeader, IN EFI_CAPSULE_HEADER *CapsuleHeader,
IN EFI_STATUS CapsuleStatus, IN EFI_STATUS CapsuleStatus,
IN UINTN PayloadIndex, IN UINTN PayloadIndex,
IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader,
IN EFI_DEVICE_PATH_PROTOCOL *FmpDevicePath OPTIONAL
); );
/** /**
@ -818,6 +820,7 @@ ProcessFmpCapsuleImage (
UINTN Index2; UINTN Index2;
MEMMAP_DEVICE_PATH MemMapNode; MEMMAP_DEVICE_PATH MemMapNode;
EFI_DEVICE_PATH_PROTOCOL *DriverDevicePath; EFI_DEVICE_PATH_PROTOCOL *DriverDevicePath;
EFI_DEVICE_PATH_PROTOCOL *FmpDevicePath;
ESRT_MANAGEMENT_PROTOCOL *EsrtProtocol; ESRT_MANAGEMENT_PROTOCOL *EsrtProtocol;
EFI_SYSTEM_RESOURCE_ENTRY EsrtEntry; EFI_SYSTEM_RESOURCE_ENTRY EsrtEntry;
VOID *VendorCode; VOID *VendorCode;
@ -941,6 +944,13 @@ ProcessFmpCapsuleImage (
continue; continue;
} }
FmpDevicePath = NULL;
gBS->HandleProtocol(
HandleBuffer[Index1],
&gEfiDevicePathProtocolGuid,
(VOID **)&FmpDevicePath
);
ImageInfoSize = 0; ImageInfoSize = 0;
Status = Fmp->GetImageInfo ( Status = Fmp->GetImageInfo (
Fmp, Fmp,
@ -1060,7 +1070,8 @@ ProcessFmpCapsuleImage (
CapsuleHeader, // CapsuleGuid CapsuleHeader, // CapsuleGuid
Status, // CapsuleStatus Status, // CapsuleStatus
Index - FmpCapsuleHeader->EmbeddedDriverCount, // PayloadIndex Index - FmpCapsuleHeader->EmbeddedDriverCount, // PayloadIndex
ImageHeader // ImageHeader ImageHeader, // ImageHeader
FmpDevicePath // FmpDevicePath
); );
if (StatusRet != EFI_SUCCESS) { if (StatusRet != EFI_SUCCESS) {
StatusRet = Status; StatusRet = Status;

30
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c
View File

@ -30,6 +30,7 @@
#include <Library/HobLib.h> #include <Library/HobLib.h>
#include <Library/PrintLib.h> #include <Library/PrintLib.h>
#include <Library/ReportStatusCodeLib.h> #include <Library/ReportStatusCodeLib.h>
#include <Library/DevicePathLib.h>
#include <Library/CapsuleLib.h> #include <Library/CapsuleLib.h>
#include <IndustryStandard/WindowsUxCapsule.h> #include <IndustryStandard/WindowsUxCapsule.h>
@ -280,6 +281,7 @@ RecordCapsuleStatusVariable (
@param[in] CapsuleStatus The capsule process stauts @param[in] CapsuleStatus The capsule process stauts
@param[in] PayloadIndex FMP payload index @param[in] PayloadIndex FMP payload index
@param[in] ImageHeader FMP image header @param[in] ImageHeader FMP image header
@param[in] FmpDevicePath DevicePath associated with the FMP producer
@retval EFI_SUCCESS The capsule status variable is recorded. @retval EFI_SUCCESS The capsule status variable is recorded.
@retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable. @retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable.
@ -289,26 +291,37 @@ RecordFmpCapsuleStatusVariable (
IN EFI_CAPSULE_HEADER *CapsuleHeader, IN EFI_CAPSULE_HEADER *CapsuleHeader,
IN EFI_STATUS CapsuleStatus, IN EFI_STATUS CapsuleStatus,
IN UINTN PayloadIndex, IN UINTN PayloadIndex,
IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader,
IN EFI_DEVICE_PATH_PROTOCOL *FmpDevicePath OPTIONAL
) )
{ {
EFI_CAPSULE_RESULT_VARIABLE_HEADER *CapsuleResultVariableHeader; EFI_CAPSULE_RESULT_VARIABLE_HEADER *CapsuleResultVariableHeader;
EFI_CAPSULE_RESULT_VARIABLE_FMP *CapsuleResultVariableFmp; EFI_CAPSULE_RESULT_VARIABLE_FMP *CapsuleResultVariableFmp;
EFI_STATUS Status; EFI_STATUS Status;
UINT8 *CapsuleResultVariable; UINT8 *CapsuleResultVariable;
UINT32 CapsuleResultVariableSize; UINTN CapsuleResultVariableSize;
CHAR16 *DevicePathStr;
UINTN DevicePathStrSize;
CapsuleResultVariable = NULL; DevicePathStr = NULL;
if (FmpDevicePath != NULL) {
DevicePathStr = ConvertDevicePathToText (FmpDevicePath, FALSE, FALSE);
}
if (DevicePathStr != NULL) {
DevicePathStrSize = StrSize(DevicePathStr);
} else {
DevicePathStrSize = sizeof(CHAR16);
}
// //
// Allocate zero CHAR16 for CapsuleFileName and CapsuleTarget. // Allocate zero CHAR16 for CapsuleFileName.
// //
CapsuleResultVariableSize = sizeof(EFI_CAPSULE_RESULT_VARIABLE_HEADER) + sizeof(EFI_CAPSULE_RESULT_VARIABLE_FMP) + sizeof(CHAR16) * 2; CapsuleResultVariableSize = sizeof(EFI_CAPSULE_RESULT_VARIABLE_HEADER) + sizeof(EFI_CAPSULE_RESULT_VARIABLE_FMP) + sizeof(CHAR16) + DevicePathStrSize;
CapsuleResultVariable = AllocateZeroPool (CapsuleResultVariableSize); CapsuleResultVariable = AllocateZeroPool (CapsuleResultVariableSize);
if (CapsuleResultVariable == NULL) { if (CapsuleResultVariable == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
CapsuleResultVariableHeader = (VOID *)CapsuleResultVariable; CapsuleResultVariableHeader = (VOID *)CapsuleResultVariable;
CapsuleResultVariableHeader->VariableTotalSize = CapsuleResultVariableSize; CapsuleResultVariableHeader->VariableTotalSize = (UINT32)CapsuleResultVariableSize;
CapsuleResultVariableHeader->Reserved = 0; CapsuleResultVariableHeader->Reserved = 0;
CopyGuid(&CapsuleResultVariableHeader->CapsuleGuid, &CapsuleHeader->CapsuleGuid); CopyGuid(&CapsuleResultVariableHeader->CapsuleGuid, &CapsuleHeader->CapsuleGuid);
ZeroMem(&CapsuleResultVariableHeader->CapsuleProcessed, sizeof(CapsuleResultVariableHeader->CapsuleProcessed)); ZeroMem(&CapsuleResultVariableHeader->CapsuleProcessed, sizeof(CapsuleResultVariableHeader->CapsuleProcessed));
@ -320,6 +333,11 @@ RecordFmpCapsuleStatusVariable (
CapsuleResultVariableFmp->PayloadIndex = (UINT8)PayloadIndex; CapsuleResultVariableFmp->PayloadIndex = (UINT8)PayloadIndex;
CapsuleResultVariableFmp->UpdateImageIndex = ImageHeader->UpdateImageIndex; CapsuleResultVariableFmp->UpdateImageIndex = ImageHeader->UpdateImageIndex;
CopyGuid (&CapsuleResultVariableFmp->UpdateImageTypeId, &ImageHeader->UpdateImageTypeId); CopyGuid (&CapsuleResultVariableFmp->UpdateImageTypeId, &ImageHeader->UpdateImageTypeId);
if (DevicePathStr != NULL) {
CopyMem ((UINT8 *)CapsuleResultVariableFmp + sizeof(EFI_CAPSULE_RESULT_VARIABLE_FMP) + sizeof(CHAR16), DevicePathStr, DevicePathStrSize);
FreePool (DevicePathStr);
DevicePathStr = NULL;
}
// //
// Save Local Cache // Save Local Cache

4
MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c
View File

@ -64,6 +64,7 @@ RecordCapsuleStatusVariable (
@param[in] CapsuleStatus The capsule process stauts @param[in] CapsuleStatus The capsule process stauts
@param[in] PayloadIndex FMP payload index @param[in] PayloadIndex FMP payload index
@param[in] ImageHeader FMP image header @param[in] ImageHeader FMP image header
@param[in] FmpDevicePath DevicePath associated with the FMP producer
@retval EFI_SUCCESS The capsule status variable is recorded. @retval EFI_SUCCESS The capsule status variable is recorded.
@retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable. @retval EFI_OUT_OF_RESOURCES No resource to record the capsule status variable.
@ -73,7 +74,8 @@ RecordFmpCapsuleStatusVariable (
IN EFI_CAPSULE_HEADER *CapsuleHeader, IN EFI_CAPSULE_HEADER *CapsuleHeader,
IN EFI_STATUS CapsuleStatus, IN EFI_STATUS CapsuleStatus,
IN UINTN PayloadIndex, IN UINTN PayloadIndex,
IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader IN EFI_FIRMWARE_MANAGEMENT_CAPSULE_IMAGE_HEADER *ImageHeader,
IN EFI_DEVICE_PATH_PROTOCOL *FmpDevicePath OPTIONAL
) )
{ {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;