> -----Original Message-----
> From: Michael Kubacki <michael.kuba...@microsoft.com>
> Sent: Saturday, August 14, 2021 4:02 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.w...@intel.com>; Wu, Hao A <hao.a...@intel.com>;
> Bi, Dandan <dandan...@intel.com>; Liming Gao
> <gaolim...@byosoft.com.cn>; De, Debkumar <debkumar...@intel.com>;
> Han, Harry <harry....@intel.com>; West, Catharine
> <catharine.w...@intel.com>; Marvin Häuser <mhaeu...@posteo.de>
> Subject: [PATCH v1 1/1] MdeModulePkg/PeiCore: Remove
> MigrateSecModulesInFv()
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3564
>
> This function has not been called since it was added in commit 9bedaec. If
> the function were to remain, it would need to be re-evaluated and tested.
> This change removes the function since it is not being used.
Reviewed-by: Hao A Wu <hao.a...@intel.com>
Will merge after the upcoming stable tag.
Best Regards,
Hao Wu
>
> Cc: Jian J Wang <jian.j.w...@intel.com>
> Cc: Hao A Wu <hao.a...@intel.com>
> Cc: Dandan Bi <dandan...@intel.com>
> Cc: Liming Gao <gaolim...@byosoft.com.cn>
> Cc: Debkumar De <debkumar...@intel.com>
> Cc: Harry Han <harry....@intel.com>
> Cc: Catharine West <catharine.w...@intel.com>
> Cc: Marvin Häuser <mhaeu...@posteo.de>
> Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com>
> ---
> MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 96 --------------------
> 1 file changed, 96 deletions(-)
>
> diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> index 3369585bcce8..61d4b67c64b9 100644
> --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> @@ -1057,102 +1057,6 @@ ConvertStatusCodeCallbacks (
> }
> }
>
> -/**
> - Migrates SEC modules in the given firmware volume.
> -
> - Migrating SECURITY_CORE files requires special treatment since they are
> not tracked for PEI dispatch.
> -
> - This functioun should be called after the FV has been copied to its post-
> memory location and the PEI Core FV list has
> - been updated.
> -
> - @param Private Pointer to the PeiCore's private data structure.
> - @param FvIndex The firmware volume index to migrate.
> - @param OrgFvHandle The handle to the firmware volume in temporary
> memory.
> -
> - @retval EFI_SUCCESS SEC modules were migrated successfully
> - @retval EFI_INVALID_PARAMETER The Private pointer is NULL or FvCount
> is invalid.
> - @retval EFI_NOT_FOUND Can't find valid FFS header.
> -
> -**/
> -EFI_STATUS
> -EFIAPI
> -MigrateSecModulesInFv (
> - IN PEI_CORE_INSTANCE *Private,
> - IN UINTN FvIndex,
> - IN UINTN OrgFvHandle
> - )
> -{
> - EFI_STATUS Status;
> - EFI_STATUS FindFileStatus;
> - EFI_PEI_FILE_HANDLE MigratedFileHandle;
> - EFI_PEI_FILE_HANDLE FileHandle;
> - UINT32 SectionAuthenticationStatus;
> - UINT32 FileSize;
> - VOID *OrgPe32SectionData;
> - VOID *Pe32SectionData;
> - EFI_FFS_FILE_HEADER *FfsFileHeader;
> - EFI_COMMON_SECTION_HEADER *Section;
> - BOOLEAN IsFfs3Fv;
> - UINTN SectionInstance;
> -
> - if (Private == NULL || FvIndex >= Private->FvCount) {
> - return EFI_INVALID_PARAMETER;
> - }
> -
> - do {
> - FindFileStatus = PeiFfsFindNextFile (
> - GetPeiServicesTablePointer (),
> - EFI_FV_FILETYPE_SECURITY_CORE,
> - Private->Fv[FvIndex].FvHandle,
> - &MigratedFileHandle
> - );
> - if (!EFI_ERROR (FindFileStatus ) && MigratedFileHandle != NULL) {
> - FileHandle = (EFI_PEI_FILE_HANDLE) ((UINTN) MigratedFileHandle -
> (UINTN) Private->Fv[FvIndex].FvHandle + OrgFvHandle);
> - FfsFileHeader = (EFI_FFS_FILE_HEADER *) MigratedFileHandle;
> -
> - DEBUG ((DEBUG_VERBOSE, " Migrating SEC_CORE MigratedFileHandle
> at 0x%x.\n", (UINTN) MigratedFileHandle));
> - DEBUG ((DEBUG_VERBOSE, " FileHandle at 0x%x.\n",
> (UINTN)
> FileHandle));
> -
> - IsFfs3Fv = CompareGuid (&Private->Fv[FvIndex].FvHeader-
> >FileSystemGuid, &gEfiFirmwareFileSystem3Guid);
> - if (IS_FFS_FILE2 (FfsFileHeader)) {
> - ASSERT (FFS_FILE2_SIZE (FfsFileHeader) > 0x00FFFFFF);
> - if (!IsFfs3Fv) {
> - DEBUG ((DEBUG_ERROR, "It is a FFS3 formatted file: %g in a non-FFS3
> formatted FV.\n", &FfsFileHeader->Name));
> - return EFI_NOT_FOUND;
> - }
> - Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *)
> FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER2));
> - FileSize = FFS_FILE2_SIZE (FfsFileHeader) - sizeof
> (EFI_FFS_FILE_HEADER2);
> - } else {
> - Section = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *)
> FfsFileHeader + sizeof (EFI_FFS_FILE_HEADER));
> - FileSize = FFS_FILE_SIZE (FfsFileHeader) - sizeof
> (EFI_FFS_FILE_HEADER);
> - }
> -
> - SectionInstance = 1;
> - SectionAuthenticationStatus = 0;
> - Status = ProcessSection (
> - GetPeiServicesTablePointer (),
> - EFI_SECTION_PE32,
> - &SectionInstance,
> - Section,
> - FileSize,
> - &Pe32SectionData,
> - &SectionAuthenticationStatus,
> - IsFfs3Fv
> - );
> -
> - if (!EFI_ERROR (Status)) {
> - OrgPe32SectionData = (VOID *) ((UINTN) Pe32SectionData - (UINTN)
> MigratedFileHandle + (UINTN) FileHandle);
> - DEBUG ((DEBUG_VERBOSE, " PE32 section in migrated file at
> 0x%x.\n",
> (UINTN) Pe32SectionData));
> - DEBUG ((DEBUG_VERBOSE, " PE32 section in original file at
> 0x%x.\n",
> (UINTN) OrgPe32SectionData));
> - Status = LoadAndRelocatePeCoffImageInPlace (OrgPe32SectionData,
> Pe32SectionData);
> - ASSERT_EFI_ERROR (Status);
> - }
> - }
> - } while (!EFI_ERROR (FindFileStatus));
> -
> - return EFI_SUCCESS;
> -}
> -
> /**
> Migrates PEIMs in the given firmware volume.
>
> --
> 2.29.2.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#79616): https://edk2.groups.io/g/devel/message/79616
Mute This Topic: https://groups.io/mt/84884623/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
