[edk2-devel] [PATCH 1/1] EmbeddedPkg: Fix a build error in FwVol.c in X64 arch

[Abner Chang]

Merged.
________________________________
From: devel at edk2.groups.io <devel at edk2.groups.io> on behalf of Min Xu <min.m.xu at intel.com>
Sent: Thursday, January 27, 2022 12:39 PM
To: devel at edk2.groups.io <devel at edk2.groups.io>; Chang, Abner (HPS SW/FW Technologist) <abner.chang at hpe.com>
Cc: Leif Lindholm <leif at nuviainc.com>; Ard Biesheuvel <ardb+tianocore at kernel.org>; Schaefer, Daniel (ROM Janitor) <daniel.schaefer at hpe.com>
Subject: Re: [edk2-devel] [PATCH 1/1] EmbeddedPkg: Fix a build error in FwVol.c in X64 arch


This is the PR: https://github.com/tianocore/edk2/pull/2444



From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Abner Chang
Sent: Thursday, January 27, 2022 11:46 AM
To: Xu, Min M <min.m.xu at intel.com>; devel at edk2.groups.io
Cc: Leif Lindholm <leif at nuviainc.com>; Ard Biesheuvel <ardb+tianocore at kernel.org>; Schaefer, Daniel <daniel.schaefer at hpe.com>
Subject: Re: [edk2-devel] [PATCH 1/1] EmbeddedPkg: Fix a build error in FwVol.c in X64 arch



Reviewed-by: Abner Chang <abner.chang at hpe.com<mailto:abner.chang at hpe.com>>



Please create a PR (give me the link) for running Core CI, I will merge it once it gets passed through.



Thanks

Abner

________________________________

From: Min Xu <min.m.xu at intel.com<mailto:min.m.xu at intel.com>>
Sent: Thursday, January 27, 2022 11:36 AM
To: devel at edk2.groups.io<mailto:devel at edk2.groups.io> <devel at edk2.groups.io<mailto:devel at edk2.groups.io>>
Cc: Min Xu <min.m.xu at intel.com<mailto:min.m.xu at intel.com>>; Leif Lindholm <leif at nuviainc.com<mailto:leif at nuviainc.com>>; Ard Biesheuvel <ardb+tianocore at kernel.org<mailto:ardb+tianocore at kernel.org>>; Chang, Abner (HPS SW/FW Technologist) <abner.chang at hpe.com<mailto:abner.chang at hpe.com>>; Schaefer, Daniel (ROM Janitor) <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>
Subject: [PATCH 1/1] EmbeddedPkg: Fix a build error in FwVol.c in X64 arch



BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3814<https://bugzilla.tianocore.org/show_bug.cgi?id=3814>

CompressedDataLength is declared as UINTN which is UINT64 in X64 arch.
But the second parameter of UefiDecompressGetInfo() is declared as
UINT32. So a build error is triggered. To declare CompressedDataLength
as UINT32 to fix the build error.

Cc: Leif Lindholm <leif at nuviainc.com<mailto:leif at nuviainc.com>>
Cc: Ard Biesheuvel <ardb+tianocore at kernel.org<mailto:ardb+tianocore at kernel.org>>
Cc: Abner Chang <abner.chang at hpe.com<mailto:abner.chang at hpe.com>>
Cc: Daniel Schaefer <daniel.schaefer at hpe.com<mailto:daniel.schaefer at hpe.com>>
Signed-off-by: Min Xu <min.m.xu at intel.com<mailto:min.m.xu at intel.com>>
---
 EmbeddedPkg/Library/PrePiLib/FwVol.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c b/EmbeddedPkg/Library/PrePiLib/FwVol.c
index 92ae68f0d382..0a6d6925b7ea 100644
--- a/EmbeddedPkg/Library/PrePiLib/FwVol.c
+++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c
@@ -291,7 +291,7 @@ FfsProcessSection (
   UINT16                    SectionAttribute;
   UINT32                    AuthenticationStatus;
   CHAR8                     *CompressedData;
-  UINTN                     CompressedDataLength;
+  UINT32                    CompressedDataLength;

   *OutputBuffer = NULL;
   ParsedLength  = 0;
@@ -320,7 +320,7 @@ FfsProcessSection (
           }

           CompressedData       = (CHAR8 *)((EFI_COMPRESSION_SECTION2 *)Section + 1);
-          CompressedDataLength = (UINT32)SectionLength - sizeof (EFI_COMPRESSION_SECTION2);
+          CompressedDataLength = SectionLength - sizeof (EFI_COMPRESSION_SECTION2);
         } else {
           CompressionSection = (EFI_COMPRESSION_SECTION *)Section;
           SectionLength      = SECTION_SIZE (Section);
@@ -330,7 +330,7 @@ FfsProcessSection (
           }

           CompressedData       = (CHAR8 *)((EFI_COMPRESSION_SECTION *)Section + 1);
-          CompressedDataLength = (UINT32)SectionLength - sizeof (EFI_COMPRESSION_SECTION);
+          CompressedDataLength = SectionLength - sizeof (EFI_COMPRESSION_SECTION);
         }

         Status = UefiDecompressGetInfo (
--
2.29.2.windows.2




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86110): https://edk2.groups.io/g/devel/message/86110
Mute This Topic: https://groups.io/mt/88714427/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20220127/c4719eaa/attachment.htm>