From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BBE5E81844 for ; Sun, 25 Dec 2016 18:56:34 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 25 Dec 2016 18:56:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,404,1477983600"; d="scan'208";a="22787396" Received: from shzintpr02.sh.intel.com (HELO [10.7.209.21]) ([10.239.4.160]) by orsmga002.jf.intel.com with ESMTP; 25 Dec 2016 18:56:33 -0800 To: Jiewen Yao , edk2-devel@lists.01.org References: <1482508959-16144-1-git-send-email-jiewen.yao@intel.com> Cc: Feng Tian , Chao Zhang , star.zeng@intel.com From: "Zeng, Star" Message-ID: <63065c0b-9508-327c-693e-11a4f595aa09@intel.com> Date: Mon, 26 Dec 2016 10:56:03 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <1482508959-16144-1-git-send-email-jiewen.yao@intel.com> Subject: Re: [PATCH V2] MdeModulePkg/CapsuleLib: Add CapsuleTarget support. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 02:56:34 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Minor comment inline. On 2016/12/24 0:02, Jiewen Yao wrote: > UEFI spec requires CapsuleTarget to be a device path associated > with FMP producer. > > Cc: Feng Tian > Cc: Star Zeng > Cc: Chao Zhang > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jiewen Yao > --- > MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c | 15 +++++++++-- > MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c | 28 ++++++++++++++++---- > MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c | 4 ++- > 3 files changed, 39 insertions(+), 8 deletions(-) > > diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c > index af08886..2bb6ac8 100644 > --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c > +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.c > @@ -100,6 +100,7 @@ RecordCapsuleStatusVariable ( > @param[in] CapsuleStatus The capsule process stauts > @param[in] PayloadIndex FMP payload index > @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_OUT_OF_RESOURCES No resource to record the capsule status variable. > @@ -109,7 +110,8 @@ RecordFmpCapsuleStatusVariable ( > IN EFI_CAPSULE_HEADER *CapsuleHeader, > IN EFI_STATUS CapsuleStatus, > 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; > MEMMAP_DEVICE_PATH MemMapNode; > EFI_DEVICE_PATH_PROTOCOL *DriverDevicePath; > + EFI_DEVICE_PATH_PROTOCOL *FmpDevicePath; > ESRT_MANAGEMENT_PROTOCOL *EsrtProtocol; > EFI_SYSTEM_RESOURCE_ENTRY EsrtEntry; > VOID *VendorCode; > @@ -941,6 +944,13 @@ ProcessFmpCapsuleImage ( > continue; > } > > + FmpDevicePath = NULL; > + gBS->HandleProtocol( > + HandleBuffer[Index1], > + &gEfiDevicePathProtocolGuid, > + (VOID **)&FmpDevicePath > + ); > + > ImageInfoSize = 0; > Status = Fmp->GetImageInfo ( > Fmp, > @@ -1060,7 +1070,8 @@ ProcessFmpCapsuleImage ( > CapsuleHeader, // CapsuleGuid > Status, // CapsuleStatus > Index - FmpCapsuleHeader->EmbeddedDriverCount, // PayloadIndex > - ImageHeader // ImageHeader > + ImageHeader, // ImageHeader > + FmpDevicePath // FmpDevicePath > ); > if (StatusRet != EFI_SUCCESS) { > StatusRet = Status; > diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c > index d34eb25..bba30b5 100644 > --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c > +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLib.c > @@ -30,6 +30,7 @@ > #include > #include > #include > +#include > #include > > #include > @@ -280,6 +281,7 @@ RecordCapsuleStatusVariable ( > @param[in] CapsuleStatus The capsule process stauts > @param[in] PayloadIndex FMP payload index > @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_OUT_OF_RESOURCES No resource to record the capsule status variable. > @@ -289,26 +291,37 @@ RecordFmpCapsuleStatusVariable ( > IN EFI_CAPSULE_HEADER *CapsuleHeader, > IN EFI_STATUS CapsuleStatus, > 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_FMP *CapsuleResultVariableFmp; > EFI_STATUS Status; > 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. Does the comment need to be updated? > // > - 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); > if (CapsuleResultVariable == NULL) { > return EFI_OUT_OF_RESOURCES; > } > CapsuleResultVariableHeader = (VOID *)CapsuleResultVariable; > - CapsuleResultVariableHeader->VariableTotalSize = CapsuleResultVariableSize; > + CapsuleResultVariableHeader->VariableTotalSize = (UINT32)CapsuleResultVariableSize; > CapsuleResultVariableHeader->Reserved = 0; > CopyGuid(&CapsuleResultVariableHeader->CapsuleGuid, &CapsuleHeader->CapsuleGuid); > ZeroMem(&CapsuleResultVariableHeader->CapsuleProcessed, sizeof(CapsuleResultVariableHeader->CapsuleProcessed)); > @@ -320,6 +333,11 @@ RecordFmpCapsuleStatusVariable ( > CapsuleResultVariableFmp->PayloadIndex = (UINT8)PayloadIndex; > CapsuleResultVariableFmp->UpdateImageIndex = ImageHeader->UpdateImageIndex; > 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 > diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c > index bf550e5..6ab198d 100644 > --- a/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c > +++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleReportLibNull.c > @@ -64,6 +64,7 @@ RecordCapsuleStatusVariable ( > @param[in] CapsuleStatus The capsule process stauts > @param[in] PayloadIndex FMP payload index > @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_OUT_OF_RESOURCES No resource to record the capsule status variable. > @@ -73,7 +74,8 @@ RecordFmpCapsuleStatusVariable ( > IN EFI_CAPSULE_HEADER *CapsuleHeader, > IN EFI_STATUS CapsuleStatus, > 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; >