From nobody Thu Apr 25 20:10:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+85245+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85245+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1640976411; cv=none; d=zohomail.com; s=zohoarc; b=IU0QTL/Fq9VCME0EZXwnRzPm8SLe17IcgkRLHnl+Q6u/5ZUmdw802mSXeUz1p1rgfYPxegKudtu9uio8inTSfKJOr8+TV6zhHyN2Jo+1HIZS8/aLrR3bQfy08uMpFeVxdfQjs9EDVlei3Xps4cFHIObeqT9SlPoSBZNjIVz60aE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640976411; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=Wg0TOMWmmrphO1y3Ffn5HZWoMzCu88YnA63TqwLMkAQ=; b=IB+rKpp4vF3u5uQTeLX7GRpTWIzTVoxGkWem3eU+z1hsJGQU9JH/QXkzkClq/uB5Z20FV/rD8odG/M1WjwCAty0M+o1zyumwWkB33ueX+bCP/n8rlsMtdFqoRl/CESu0V9zghg9myyfLwgJr11J0WgcYkFUmu+yN4hXbFK/+JdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+85245+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1640976411185821.7563937169473; Fri, 31 Dec 2021 10:46:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id buK1YY1788612x2mRq46aI83; Fri, 31 Dec 2021 10:46:50 -0800 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web08.15740.1640976409486751890 for ; Fri, 31 Dec 2021 10:46:49 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10213"; a="241791424" X-IronPort-AV: E=Sophos;i="5.88,252,1635231600"; d="scan'208";a="241791424" X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2021 10:46:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,252,1635231600"; d="scan'208";a="589827994" X-Received: from basfe004.gar.corp.intel.com ([10.66.129.57]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Dec 2021 10:46:43 -0800 From: "Ashraf Ali S" To: devel@edk2.groups.io Cc: Ashraf Ali S , Rangasai V Chaganty , Digant H Solanki , Sangeetha V , Ray Ni , Dandan Bi , Liming Gao , Debkumar De , Harry Han , Catharine West , Star Zeng , Andrew Fish , Zhiguang Liu , Rebecca Cran , Peter Grehan Subject: [edk2-devel] [PATCH] Update FvLength to UINTN from UINT32 in FirmwareVolumeInfo Date: Sat, 1 Jan 2022 00:16:25 +0530 Message-Id: <87120c9f4689d35952a7957a136da35a54ec2154.1640976311.git.ashraf.ali.s@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ashraf.ali.s@intel.com X-Gm-Message-State: W1oRjxDs5GTcLN0UH4oRz0qpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1640976410; bh=Ip9gKZiFqRpVrYLm2BvFs26OxJ66G7wQoRWdMXi4Cm0=; h=Cc:Date:From:Reply-To:Subject:To; b=Pcptk/hY0NtgkwszY2m14NmO9i5m3Th9cdKGaKwJ/CauRuGaaY4SNl9SSqypPDF+vXp Hk3uCImdXOtoPV3a+mFdgpDGl3DarjLhytKycc273C8UvFv0Fuv3li69AXjpAhc6LqTv2 VSv1Lf1Fkr9qguAxH3klmepPDwmx8JD6l6I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1640976412912000001 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3792 Pi/PiFirmwareVolume FvLength has been assigned as UINT64, and Ppi/FirmwareVolumeInfo FvLength has mentioned as UINT32 which will break the X64 build, updating the FvLenth to UINTN will support for both Cc: Rangasai V Chaganty Cc: Digant H Solanki Cc: Sangeetha V Cc: Ray Ni Cc: Dandan Bi [dandanbi] Cc: Liming Gao [lgao4] Cc: Debkumar De Cc: Harry Han Cc: Catharine West Cc: Star Zeng Cc: Andrew Fish Cc: Liming Gao Cc: Zhiguang Liu Cc: Rebecca Cran Cc: Peter Grehan Signed-off-by: Ashraf Ali S --- EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c | 2 +- IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c | 2 +- IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c | 2 +- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 8 ++++---- MdeModulePkg/Core/Pei/FwVol/FwVol.h | 2 +- MdeModulePkg/Core/Pei/PeiMain.h | 2 +- MdePkg/Include/Library/PeiServicesLib.h | 4 ++-- MdePkg/Include/Ppi/FirmwareVolumeInfo.h | 2 +- MdePkg/Include/Ppi/FirmwareVolumeInfo2.h | 2 +- MdePkg/Library/PeiServicesLib/PeiServicesLib.c | 6 +++--- OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +- OvmfPkg/PlatformPei/Fv.c | 2 +- OvmfPkg/XenPlatformPei/Fv.c | 2 +- SecurityPkg/FvReportPei/FvReportPei.c | 2 +- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c b/Emula= torPkg/Library/SecPeiServicesLib/PeiServicesLib.c index 9409cbdb66..4cbe02a627 100644 --- a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c +++ b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c @@ -545,7 +545,7 @@ EFIAPI PeiServicesInstallFvInfoPpi ( IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL ) diff --git a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c b/IntelF= sp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c index b0c6b2f8a6..f5f3836635 100644 --- a/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c +++ b/IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c @@ -195,7 +195,7 @@ FspmWrapperInit ( PeiServicesInstallFvInfoPpi ( NULL, (VOID *)(UINTN)PcdGet32 (PcdFspmBaseAddress), - (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseA= ddress))->FvLength, + (UINTN)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspmBaseAd= dress))->FvLength, NULL, NULL ); diff --git a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c b/IntelF= sp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c index fadadd40e6..25a13e78fd 100644 --- a/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c +++ b/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.c @@ -426,7 +426,7 @@ FspsWrapperInitDispatchMode ( PeiServicesInstallFvInfoPpi ( NULL, (VOID *)(UINTN)PcdGet32 (PcdFspsBaseAddress), - (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAdd= ress))->FvLength, + (UINTN)((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdFspsBaseAddr= ess))->FvLength, NULL, NULL ); diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/Fw= Vol/FwVol.c index 60bbe57332..28c0c5d4da 100644 --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c @@ -1542,7 +1542,7 @@ ProcessFvFile ( PeiServicesInstallFvInfo2Ppi ( &FvHeader->FileSystemGuid, (VOID **)FvHeader, - (UINT32)FvHeader->FvLength, + (UINTN)FvHeader->FvLength, &ParentFvImageInfo.FvName, &FileInfo.FileName, AuthenticationStatus @@ -1551,7 +1551,7 @@ ProcessFvFile ( PeiServicesInstallFvInfoPpi ( &FvHeader->FileSystemGuid, (VOID **)FvHeader, - (UINT32)FvHeader->FvLength, + (UINTN)FvHeader->FvLength, &ParentFvImageInfo.FvName, &FileInfo.FileName ); @@ -2293,7 +2293,7 @@ FindUnknownFormatFvInfo ( IN PEI_CORE_INSTANCE *PrivateData, IN EFI_GUID *Format, OUT VOID **FvInfo, - OUT UINT32 *FvInfoSize, + OUT UINTN *FvInfoSize, OUT UINT32 *AuthenticationStatus ) { @@ -2350,7 +2350,7 @@ ThirdPartyFvPpiNotifyCallback ( PEI_CORE_INSTANCE *PrivateData; EFI_PEI_FIRMWARE_VOLUME_PPI *FvPpi; VOID *FvInfo; - UINT32 FvInfoSize; + UINTN FvInfoSize; UINT32 AuthenticationStatus; EFI_STATUS Status; EFI_PEI_FV_HANDLE FvHandle; diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h b/MdeModulePkg/Core/Pei/Fw= Vol/FwVol.h index 7d1dc9cba1..faf8cb4f64 100644 --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.h +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.h @@ -343,7 +343,7 @@ FindUnknownFormatFvInfo ( IN PEI_CORE_INSTANCE *PrivateData, IN EFI_GUID *Format, OUT VOID **FvInfo, - OUT UINT32 *FvInfoSize, + OUT UINTN *FvInfoSize, OUT UINT32 *AuthenticationStatus ); =20 diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMai= n.h index 556beddad5..a0db84e8ea 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.h +++ b/MdeModulePkg/Core/Pei/PeiMain.h @@ -151,7 +151,7 @@ typedef struct { typedef struct { EFI_GUID FvFormat; VOID *FvInfo; - UINT32 FvInfoSize; + UINTN FvInfoSize; UINT32 AuthenticationStatus; EFI_PEI_NOTIFY_DESCRIPTOR NotifyDescriptor; } PEI_CORE_UNKNOW_FORMAT_FV_INFO; diff --git a/MdePkg/Include/Library/PeiServicesLib.h b/MdePkg/Include/Libra= ry/PeiServicesLib.h index 0ca032e411..006d0a093b 100644 --- a/MdePkg/Include/Library/PeiServicesLib.h +++ b/MdePkg/Include/Library/PeiServicesLib.h @@ -485,7 +485,7 @@ EFIAPI PeiServicesInstallFvInfoPpi ( IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL ); @@ -525,7 +525,7 @@ EFIAPI PeiServicesInstallFvInfo2Ppi ( IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL, IN UINT32 AuthenticationStatus diff --git a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h b/MdePkg/Include/Ppi/F= irmwareVolumeInfo.h index 322989170d..6ef3b47297 100644 --- a/MdePkg/Include/Ppi/FirmwareVolumeInfo.h +++ b/MdePkg/Include/Ppi/FirmwareVolumeInfo.h @@ -39,7 +39,7 @@ struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI { /// Size of the data provided by FvInfo. For memory-mapped firmware volu= mes, /// this is typically the size of the firmware volume. /// - UINT32 FvInfoSize; + UINTN FvInfoSize; /// /// If the firmware volume originally came from a firmware file, then th= ese /// point to the parent firmware volume name and firmware volume file. diff --git a/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h b/MdePkg/Include/Ppi/= FirmwareVolumeInfo2.h index 398c5d09e3..0d0107900d 100644 --- a/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h +++ b/MdePkg/Include/Ppi/FirmwareVolumeInfo2.h @@ -39,7 +39,7 @@ struct _EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI { /// Size of the data provided by FvInfo. For memory-mapped firmware volu= mes, /// this is typically the size of the firmware volume. /// - UINT32 FvInfoSize; + UINTN FvInfoSize; /// /// If the firmware volume originally came from a firmware file, then th= ese /// point to the parent firmware volume name and firmware volume file. diff --git a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c b/MdePkg/Librar= y/PeiServicesLib/PeiServicesLib.c index 98cc69c3a2..89c840a017 100644 --- a/MdePkg/Library/PeiServicesLib/PeiServicesLib.c +++ b/MdePkg/Library/PeiServicesLib/PeiServicesLib.c @@ -622,7 +622,7 @@ InternalPeiServicesInstallFvInfoPpi ( IN BOOLEAN InstallFvInfoPpi, IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL, IN UINT32 AuthenticationStatus @@ -729,7 +729,7 @@ EFIAPI PeiServicesInstallFvInfoPpi ( IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL ) @@ -773,7 +773,7 @@ EFIAPI PeiServicesInstallFvInfo2Ppi ( IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, - IN UINT32 FvInfoSize, + IN UINTN FvInfoSize, IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL, IN UINT32 AuthenticationStatus diff --git a/OvmfPkg/Bhyve/PlatformPei/Fv.c b/OvmfPkg/Bhyve/PlatformPei/Fv.c index 575600aa70..49a3ec53bf 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Fv.c +++ b/OvmfPkg/Bhyve/PlatformPei/Fv.c @@ -83,7 +83,7 @@ PeiFvInitialization ( PeiServicesInstallFvInfoPpi ( NULL, (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase), - PcdGet32 (PcdOvmfDxeMemFvSize), + (UINTN)PcdGet32 (PcdOvmfDxeMemFvSize), NULL, NULL ); diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Fv.c index 8cd8cacc59..b88ac1c525 100644 --- a/OvmfPkg/PlatformPei/Fv.c +++ b/OvmfPkg/PlatformPei/Fv.c @@ -83,7 +83,7 @@ PeiFvInitialization ( PeiServicesInstallFvInfoPpi ( NULL, (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase), - PcdGet32 (PcdOvmfDxeMemFvSize), + (UINTN)PcdGet32 (PcdOvmfDxeMemFvSize), NULL, NULL ); diff --git a/OvmfPkg/XenPlatformPei/Fv.c b/OvmfPkg/XenPlatformPei/Fv.c index 871a2c1c5b..bcf7825c4e 100644 --- a/OvmfPkg/XenPlatformPei/Fv.c +++ b/OvmfPkg/XenPlatformPei/Fv.c @@ -65,7 +65,7 @@ PeiFvInitialization ( PeiServicesInstallFvInfoPpi ( NULL, (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase), - PcdGet32 (PcdOvmfDxeMemFvSize), + (UINTN)PcdGet32 (PcdOvmfDxeMemFvSize), NULL, NULL ); diff --git a/SecurityPkg/FvReportPei/FvReportPei.c b/SecurityPkg/FvReportPe= i/FvReportPei.c index 846605cda1..c43de87193 100644 --- a/SecurityPkg/FvReportPei/FvReportPei.c +++ b/SecurityPkg/FvReportPei/FvReportPei.c @@ -275,7 +275,7 @@ ReportHashedFv ( PeiServicesInstallFvInfoPpi ( FvFormat, (VOID *)(UINTN)FvInfo->Base, - (UINT32)FvInfo->Length, + (UINTN)FvInfo->Length, NULL, NULL ); diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index b361e90d25..cffaf0114d 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -483,7 +483,7 @@ CreateHobForRecoveryCapsule ( PeiServicesInstallFvInfoPpi ( &FvHeader->FileSystemGuid, (VOID *)FvHeader, - (UINT32)FvHeader->FvLength, + (UINTN)FvHeader->FvLength, NULL, NULL ); --=20 2.30.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85245): https://edk2.groups.io/g/devel/message/85245 Mute This Topic: https://groups.io/mt/88059953/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-