From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: zhichao.gao@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Thu, 11 Apr 2019 00:20:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Apr 2019 00:20:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,336,1549958400"; d="scan'208";a="163305376" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 11 Apr 2019 00:20:29 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 11 Apr 2019 00:20:29 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 11 Apr 2019 00:20:28 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.39]) with mapi id 14.03.0415.000; Thu, 11 Apr 2019 15:20:26 +0800 From: "Gao, Zhichao" To: "Gao, Zhichao" , "devel@edk2.groups.io" CC: Bret Barkelew , Michael Turner , "Gao, Liming" , "Zeng, Star" , "Ni, Ray" , "Wang, Jian J" , "Wu, Hao A" , Sean Brogan Subject: Re: [edk2] [PATCH] MdeModulePkg/CapsulePei: Update the debug code to print 64bit data Thread-Topic: [edk2] [PATCH] MdeModulePkg/CapsulePei: Update the debug code to print 64bit data Thread-Index: AQHU6RgJ4qbW1SvgjUeaAPbD2nHSfKY2mi9w Date: Thu, 11 Apr 2019 07:20:25 +0000 Message-ID: <3CE959C139B4C44DBEA1810E3AA6F9000B7C16D5@SHSMSX101.ccr.corp.intel.com> References: <20190402055020.8656-1-zhichao.gao@intel.com> In-Reply-To: <20190402055020.8656-1-zhichao.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhichao.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Resend to gourps.io. And add the missing people. Thanks, Zhichao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Zhichao Gao > Sent: Tuesday, April 2, 2019 1:50 PM > To: edk2-devel@lists.01.org > Cc: Bret Barkelew ; Michael Turner > ; Gao, Liming ; > Zeng, Star > Subject: [edk2] [PATCH] MdeModulePkg/CapsulePei: Update the debug > code to print 64bit data >=20 > From: Bret Barkelew >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1677 >=20 > For some pointer and UINT64 data, the debug code print with '%x'. > Which would loss the upper 32bit data. So update '%x' to '%lx' > for these data. > Change the DEBUG PrintLevel from EFI_D_ version to DEBUG_ version. > DEBUG_ version is recommended to use. >=20 > Cc: Jian J Wang > Cc: Ray Ni > Cc: Star Zeng > Cc: Liming Gao > Cc: Sean Brogan > Cc: Michael Turner > Cc: Bret Barkelew > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Zhichao Gao > --- > .../CapsulePei/Common/CapsuleCoalesce.c | 90 +++++++++---------- > .../Universal/CapsulePei/UefiCapsule.c | 46 +++++----- > .../Universal/CapsulePei/X64/X64Entry.c | 2 +- > 3 files changed, 69 insertions(+), 69 deletions(-) >=20 > diff --git > a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c > b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c > index 3575a94d0f..2a527054bd 100644 > --- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c > +++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c > @@ -258,7 +258,7 @@ ValidateCapsuleByMemoryResource ( > // Sanity Check > // > if (Size > MAX_ADDRESS) { > - DEBUG ((EFI_D_ERROR, "ERROR: Size(0x%lx) > MAX_ADDRESS\n", Size)); > + DEBUG ((DEBUG_ERROR, "ERROR: Size(0x%lx) > MAX_ADDRESS\n", Size)); > return FALSE; > } >=20 > @@ -266,7 +266,7 @@ ValidateCapsuleByMemoryResource ( > // Sanity Check > // > if (Address > (MAX_ADDRESS - Size)) { > - DEBUG ((EFI_D_ERROR, "ERROR: Address(0x%lx) > (MAX_ADDRESS - > Size(0x%lx))\n", Address, Size)); > + DEBUG ((DEBUG_ERROR, "ERROR: Address(0x%lx) > (MAX_ADDRESS - > + Size(0x%lx))\n", Address, Size)); > return FALSE; > } >=20 > @@ -280,14 +280,14 @@ ValidateCapsuleByMemoryResource ( > for (Index =3D 0; MemoryResource[Index].ResourceLength !=3D 0; Index++= ) { > if ((Address >=3D MemoryResource[Index].PhysicalStart) && > ((Address + Size) <=3D (MemoryResource[Index].PhysicalStart + > MemoryResource[Index].ResourceLength))) { > - DEBUG ((EFI_D_INFO, "Address(0x%lx) Size(0x%lx) in > MemoryResource[0x%x] - Start(0x%lx) Length(0x%lx)\n", > + DEBUG ((DEBUG_INFO, "Address(0x%lx) Size(0x%lx) in > + MemoryResource[0x%x] - Start(0x%lx) Length(0x%lx)\n", > Address, Size, > Index, MemoryResource[Index].PhysicalStart, > MemoryResource[Index].ResourceLength)); > return TRUE; > } > } >=20 > - DEBUG ((EFI_D_ERROR, "ERROR: Address(0x%lx) Size(0x%lx) not in any > MemoryResource\n", Address, Size)); > + DEBUG ((DEBUG_ERROR, "ERROR: Address(0x%lx) Size(0x%lx) not in any > + MemoryResource\n", Address, Size)); > return FALSE; > } >=20 > @@ -312,7 +312,7 @@ ValidateCapsuleIntegrity ( > UINTN CapsuleCount; > EFI_CAPSULE_BLOCK_DESCRIPTOR *Ptr; >=20 > - DEBUG ((EFI_D_INFO, "ValidateCapsuleIntegrity\n")); > + DEBUG ((DEBUG_INFO, "ValidateCapsuleIntegrity\n")); >=20 > // > // Go through the list to look for inconsistencies. Check for: > @@ -333,15 +333,15 @@ ValidateCapsuleIntegrity ( > return NULL; > } >=20 > - DEBUG ((EFI_D_INFO, "Ptr - 0x%x\n", Ptr)); > - DEBUG ((EFI_D_INFO, "Ptr->Length - 0x%x\n", Ptr->Length)); > - DEBUG ((EFI_D_INFO, "Ptr->Union - 0x%x\n", Ptr- > >Union.ContinuationPointer)); > + DEBUG ((DEBUG_INFO, "Ptr - 0x%lx\n", (UINT64)Ptr)); DEBUG > + ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length)); DEBUG > + ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", > + Ptr->Union.ContinuationPointer)); > while ((Ptr->Length !=3D 0) || (Ptr->Union.ContinuationPointer !=3D > (EFI_PHYSICAL_ADDRESS) (UINTN) NULL)) { > // > // Make sure the descriptor is aligned at UINT64 in memory > // > if ((UINTN) Ptr & (sizeof(UINT64) - 1)) { > - DEBUG ((EFI_D_ERROR, "ERROR: BlockList address failed alignment > check\n")); > + DEBUG ((DEBUG_ERROR, "ERROR: BlockList address failed alignment > + check\n")); > return NULL; > } >=20 > @@ -354,9 +354,9 @@ ValidateCapsuleIntegrity ( > if (!ValidateCapsuleByMemoryResource (MemoryResource, > (EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof > (EFI_CAPSULE_BLOCK_DESCRIPTOR))) { > return NULL; > } > - DEBUG ((EFI_D_INFO, "Ptr(C) - 0x%x\n", Ptr)); > - DEBUG ((EFI_D_INFO, "Ptr->Length - 0x%x\n", Ptr->Length)); > - DEBUG ((EFI_D_INFO, "Ptr->Union - 0x%x\n", Ptr- > >Union.ContinuationPointer)); > + DEBUG ((DEBUG_INFO, "Ptr(C) - 0x%lx\n", (UINT64)Ptr)); > + DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length)); > + DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", > + Ptr->Union.ContinuationPointer)); > } else { > if (!ValidateCapsuleByMemoryResource (MemoryResource, Ptr- > >Union.DataBlock, Ptr->Length)) { > return NULL; > @@ -375,14 +375,14 @@ ValidateCapsuleIntegrity ( > // Sanity check > // > if (Ptr->Length < sizeof(EFI_CAPSULE_HEADER)) { > - DEBUG ((EFI_D_ERROR, "ERROR: Ptr->Length(0x%lx) < > sizeof(EFI_CAPSULE_HEADER)\n", Ptr->Length)); > + DEBUG ((DEBUG_ERROR, "ERROR: Ptr->Length(0x%lx) < > + sizeof(EFI_CAPSULE_HEADER)\n", Ptr->Length)); > return NULL; > } > // > // Make sure HeaderSize field is valid > // > if (CapsuleHeader->HeaderSize > CapsuleHeader->CapsuleImageSize)= { > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleHeader->HeaderSize(0x%x) > > CapsuleHeader->CapsuleImageSize(0x%x)\n", CapsuleHeader->HeaderSize, > CapsuleHeader->CapsuleImageSize)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleHeader->HeaderSize(0x%x) > + > CapsuleHeader->CapsuleImageSize(0x%x)\n", CapsuleHeader- > >HeaderSize, > + CapsuleHeader->CapsuleImageSize)); > return NULL; > } > if (IsCapsuleCorrupted (CapsuleHeader)) { @@ -395,7 +395,7 @@ > ValidateCapsuleIntegrity ( > if (CapsuleSize >=3D Ptr->Length) { > CapsuleSize =3D CapsuleSize - Ptr->Length; > } else { > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleSize(0x%lx) < Ptr- > >Length(0x%lx)\n", CapsuleSize, Ptr->Length)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleSize(0x%lx) < > + Ptr->Length(0x%lx)\n", CapsuleSize, Ptr->Length)); > // > // Sanity check > // > @@ -409,9 +409,9 @@ ValidateCapsuleIntegrity ( > if (!ValidateCapsuleByMemoryResource (MemoryResource, > (EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof > (EFI_CAPSULE_BLOCK_DESCRIPTOR))) { > return NULL; > } > - DEBUG ((EFI_D_INFO, "Ptr(B) - 0x%x\n", Ptr)); > - DEBUG ((EFI_D_INFO, "Ptr->Length - 0x%x\n", Ptr->Length)); > - DEBUG ((EFI_D_INFO, "Ptr->Union - 0x%x\n", Ptr- > >Union.ContinuationPointer)); > + DEBUG ((DEBUG_INFO, "Ptr(B) - 0x%lx\n", (UINT64)Ptr)); > + DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length)); > + DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", > + Ptr->Union.ContinuationPointer)); > } > } >=20 > @@ -419,7 +419,7 @@ ValidateCapsuleIntegrity ( > // > // No any capsule is found in BlockList > // > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleCount(0x%x) =3D=3D 0\n", > CapsuleCount)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleCount(0x%x) =3D=3D 0\n", > + CapsuleCount)); > return NULL; > } >=20 > @@ -427,7 +427,7 @@ ValidateCapsuleIntegrity ( > // > // Capsule data is incomplete. > // > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleSize(0x%lx) !=3D 0\n", > CapsuleSize)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleSize(0x%lx) !=3D 0\n", > + CapsuleSize)); > return NULL; > } >=20 > @@ -515,7 +515,7 @@ RelocateBlockDescriptors ( > } >=20 > CopyMem ((VOID *) RelocBuffer, (VOID *) (UINTN) TempBlockDesc- > >Union.DataBlock, (UINTN) TempBlockDesc->Length); > - DEBUG ((EFI_D_INFO, "Capsule relocate descriptors from/to/size = 0x%lX > 0x%lX 0x%lX\n", TempBlockDesc->Union.DataBlock, > (UINT64)(UINTN)RelocBuffer, TempBlockDesc->Length)); > + DEBUG ((DEBUG_INFO, "Capsule relocate descriptors from/to/size > + 0x%lX 0x%lX 0x%lX\n", TempBlockDesc->Union.DataBlock, > + (UINT64)(UINTN)RelocBuffer, TempBlockDesc->Length)); > TempBlockDesc->Union.DataBlock =3D (EFI_PHYSICAL_ADDRESS) (UINTN= ) > RelocBuffer; > } > TempBlockDesc++; > @@ -552,7 +552,7 @@ RelocateBlockDescriptors ( > return NULL; > } > CopyMem ((VOID *) RelocBuffer, (VOID *) CurrBlockDescHead, > BlockListSize); > - DEBUG ((EFI_D_INFO, "Capsule reloc descriptor block #2\n")); > + DEBUG ((DEBUG_INFO, "Capsule reloc descriptor block #2\n")); > // > // Point the previous block's next point to this copied version. I= f > // the tail pointer is null, then this is the first descriptor blo= ck. > @@ -651,7 +651,7 @@ GetCapsuleInfo ( > UINTN ThisCapsuleImageSize; > EFI_CAPSULE_HEADER *CapsuleHeader; >=20 > - DEBUG ((EFI_D_INFO, "GetCapsuleInfo enter\n")); > + DEBUG ((DEBUG_INFO, "GetCapsuleInfo enter\n")); >=20 > ASSERT (Desc !=3D NULL); >=20 > @@ -673,7 +673,7 @@ GetCapsuleInfo ( > // While here we need check all capsules size. > // > if (Desc->Length >=3D (MAX_ADDRESS - Size)) { > - DEBUG ((EFI_D_ERROR, "ERROR: Desc->Length(0x%lx) >=3D > (MAX_ADDRESS - Size(0x%x))\n", Desc->Length, Size)); > + DEBUG ((DEBUG_ERROR, "ERROR: Desc->Length(0x%lx) >=3D > + (MAX_ADDRESS - Size(0x%x))\n", Desc->Length, Size)); > return EFI_OUT_OF_RESOURCES; > } > Size +=3D (UINTN) Desc->Length; > @@ -707,7 +707,7 @@ GetCapsuleInfo ( > // If no descriptors, then fail > // > if (Count =3D=3D 0) { > - DEBUG ((EFI_D_ERROR, "ERROR: Count =3D=3D 0\n")); > + DEBUG ((DEBUG_ERROR, "ERROR: Count =3D=3D 0\n")); > return EFI_NOT_FOUND; > } >=20 > @@ -787,7 +787,7 @@ CapsuleTestPatternPreCoalesce ( > UINT32 TestCounter; > UINT32 TestSize; >=20 > - DEBUG ((EFI_D_INFO, "CapsuleTestPatternPreCoalesce\n")); > + DEBUG ((DEBUG_INFO, "CapsuleTestPatternPreCoalesce\n")); >=20 > // > // Find first data descriptor > @@ -803,7 +803,7 @@ CapsuleTestPatternPreCoalesce ( > // First one better be long enough to at least hold the test signature > // > if (Desc->Length < sizeof (UINT32)) { > - DEBUG ((EFI_D_INFO, "Capsule test pattern pre-coalesce punted #1\n")= ); > + DEBUG ((DEBUG_INFO, "Capsule test pattern pre-coalesce punted > + #1\n")); > return ; > } >=20 > @@ -823,13 +823,13 @@ CapsuleTestPatternPreCoalesce ( > TestPtr +=3D 2; > while (1) { > if ((TestSize & 0x03) !=3D 0) { > - DEBUG ((EFI_D_INFO, "Capsule test pattern pre-coalesce punted #2\n= ")); > + DEBUG ((DEBUG_INFO, "Capsule test pattern pre-coalesce punted > + #2\n")); > return ; > } >=20 > while (TestSize > 0) { > if (*TestPtr !=3D TestCounter) { > - DEBUG ((EFI_D_INFO, "Capsule test pattern pre-coalesce failed da= ta > corruption check\n")); > + DEBUG ((DEBUG_INFO, "Capsule test pattern pre-coalesce failed > + data corruption check\n")); > return ; > } >=20 > @@ -873,7 +873,7 @@ BuildCapsuleDescriptors ( > EFI_CAPSULE_BLOCK_DESCRIPTOR *TempBlock; > EFI_CAPSULE_BLOCK_DESCRIPTOR *HeadBlock; >=20 > - DEBUG ((EFI_D_INFO, "BuildCapsuleDescriptors enter\n")); > + DEBUG ((DEBUG_INFO, "BuildCapsuleDescriptors enter\n")); >=20 > LastBlock =3D NULL; > HeadBlock =3D NULL; > @@ -904,7 +904,7 @@ BuildCapsuleDescriptors ( > } > } > } else { > - DEBUG ((EFI_D_ERROR, "ERROR: BlockListBuffer[Index](0x%lx) < > MAX_ADDRESS\n", BlockListBuffer[Index])); > + DEBUG ((DEBUG_ERROR, "ERROR: BlockListBuffer[Index](0x%lx) < > + MAX_ADDRESS\n", BlockListBuffer[Index])); > } > Index ++; > } > @@ -1022,7 +1022,7 @@ CapsuleDataCoalesce ( > EFI_CAPSULE_BLOCK_DESCRIPTOR *TempBlockDesc; > EFI_CAPSULE_BLOCK_DESCRIPTOR PrivateDataDesc[2]; >=20 > - DEBUG ((EFI_D_INFO, "CapsuleDataCoalesce enter\n")); > + DEBUG ((DEBUG_INFO, "CapsuleDataCoalesce enter\n")); >=20 > CapsuleIndex =3D 0; > SizeLeft =3D 0; > @@ -1055,15 +1055,15 @@ CapsuleDataCoalesce ( > if (EFI_ERROR (Status)) { > return Status; > } > - DEBUG ((EFI_D_INFO, "CapsuleSize - 0x%x\n", CapsuleSize)); > - DEBUG ((EFI_D_INFO, "CapsuleNumber - 0x%x\n", CapsuleNumber)); > - DEBUG ((EFI_D_INFO, "NumDescriptors - 0x%x\n", NumDescriptors)); > + DEBUG ((DEBUG_INFO, "CapsuleSize - 0x%x\n", CapsuleSize)); DEBUG > + ((DEBUG_INFO, "CapsuleNumber - 0x%x\n", CapsuleNumber)); DEBUG > + ((DEBUG_INFO, "NumDescriptors - 0x%x\n", NumDescriptors)); > if ((CapsuleSize =3D=3D 0) || (NumDescriptors =3D=3D 0) || (CapsuleNum= ber =3D=3D 0)) { > return EFI_NOT_FOUND; > } >=20 > if (CapsuleNumber - 1 >=3D (MAX_ADDRESS - (sizeof > (EFI_CAPSULE_PEIM_PRIVATE_DATA) + sizeof(UINT64))) / sizeof(UINT64)) { > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleNumber - 0x%x\n", > CapsuleNumber)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleNumber - 0x%x\n", > + CapsuleNumber)); > return EFI_BUFFER_TOO_SMALL; > } >=20 > @@ -1093,7 +1093,7 @@ CapsuleDataCoalesce ( > // Sanity check > // > if (CapsuleSize >=3D (MAX_ADDRESS - (sizeof > (EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * > sizeof(UINT64) + sizeof(UINT64)))) { > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleSize - 0x%x\n", CapsuleSize)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleSize - 0x%x\n", CapsuleSize)); > return EFI_BUFFER_TOO_SMALL; > } > // > @@ -1105,7 +1105,7 @@ CapsuleDataCoalesce ( > // Sanity check > // > if (NumDescriptors >=3D (MAX_ADDRESS / > sizeof(EFI_CAPSULE_BLOCK_DESCRIPTOR))) { > - DEBUG ((EFI_D_ERROR, "ERROR: NumDescriptors - 0x%x\n", > NumDescriptors)); > + DEBUG ((DEBUG_ERROR, "ERROR: NumDescriptors - 0x%x\n", > + NumDescriptors)); > return EFI_BUFFER_TOO_SMALL; > } > DescriptorsSize =3D NumDescriptors * sizeof > (EFI_CAPSULE_BLOCK_DESCRIPTOR); @@ -1113,7 +1113,7 @@ > CapsuleDataCoalesce ( > // Sanity check > // > if (DescriptorsSize >=3D (MAX_ADDRESS - CapsuleSize)) { > - DEBUG ((EFI_D_ERROR, "ERROR: DescriptorsSize - 0x%lx, CapsuleSize - > 0x%lx\n", (UINT64)DescriptorsSize, (UINT64)CapsuleSize)); > + DEBUG ((DEBUG_ERROR, "ERROR: DescriptorsSize - 0x%lx, CapsuleSize - > + 0x%lx\n", (UINT64)DescriptorsSize, (UINT64)CapsuleSize)); > return EFI_BUFFER_TOO_SMALL; > } >=20 > @@ -1121,10 +1121,10 @@ CapsuleDataCoalesce ( > // Don't go below some min address. If the base is below it, > // then move it up and adjust the size accordingly. > // > - DEBUG ((EFI_D_INFO, "Capsule Memory range from 0x%8X to 0x%8X\n", > (UINTN) *MemoryBase, (UINTN)*MemoryBase + *MemorySize)); > + DEBUG ((DEBUG_INFO, "Capsule Memory range from 0x%8X to 0x%8X\n", > + (UINTN) *MemoryBase, (UINTN)*MemoryBase + *MemorySize)); > if ((UINTN)*MemoryBase < (UINTN) MIN_COALESCE_ADDR) { > if (((UINTN)*MemoryBase + *MemorySize) < (UINTN) > MIN_COALESCE_ADDR) { > - DEBUG ((EFI_D_ERROR, "ERROR: *MemoryBase + *MemorySize - > 0x%x\n", (UINTN)*MemoryBase + *MemorySize)); > + DEBUG ((DEBUG_ERROR, "ERROR: *MemoryBase + *MemorySize - > 0x%x\n", > + (UINTN)*MemoryBase + *MemorySize)); > return EFI_BUFFER_TOO_SMALL; > } else { > *MemorySize =3D *MemorySize - ((UINTN) MIN_COALESCE_ADDR - > (UINTN) *MemoryBase); @@ -1133,13 +1133,13 @@ CapsuleDataCoalesce ( > } >=20 > if (*MemorySize <=3D (CapsuleSize + DescriptorsSize)) { > - DEBUG ((EFI_D_ERROR, "ERROR: CapsuleSize + DescriptorsSize - 0x%x\n"= , > CapsuleSize + DescriptorsSize)); > + DEBUG ((DEBUG_ERROR, "ERROR: CapsuleSize + DescriptorsSize - > + 0x%x\n", CapsuleSize + DescriptorsSize)); > return EFI_BUFFER_TOO_SMALL; > } >=20 > FreeMemBase =3D *MemoryBase; > FreeMemSize =3D *MemorySize; > - DEBUG ((EFI_D_INFO, "Capsule Free Memory from 0x%8X to 0x%8X\n", > (UINTN) FreeMemBase, (UINTN) FreeMemBase + FreeMemSize)); > + DEBUG ((DEBUG_INFO, "Capsule Free Memory from 0x%8X to 0x%8X\n", > + (UINTN) FreeMemBase, (UINTN) FreeMemBase + FreeMemSize)); >=20 > // > // Relocate all the block descriptors to low memory to make further @@= - > 1205,7 +1205,7 @@ CapsuleDataCoalesce ( > } >=20 > CopyMem ((VOID *) RelocPtr, (VOID *) (UINTN) TempBlockDesc- > >Union.DataBlock, (UINTN) TempBlockDesc->Length); > - DEBUG ((EFI_D_INFO, "Capsule reloc data block from 0x%8X to 0x%8= X > with size 0x%8X\n", > + DEBUG ((DEBUG_INFO, "Capsule reloc data block from 0x%8X to > + 0x%8X with size 0x%8X\n", > (UINTN) TempBlockDesc->Union.DataBlock, (UINTN) RelocPtr= , > (UINTN) TempBlockDesc->Length)); >=20 > TempBlockDesc->Union.DataBlock =3D (EFI_PHYSICAL_ADDRESS) (UINTN= ) > RelocPtr; @@ -1256,7 +1256,7 @@ CapsuleDataCoalesce ( > ASSERT (CurrentBlockDesc->Length <=3D SizeLeft); >=20 > CopyMem ((VOID *) DestPtr, (VOID *) (UINTN) (CurrentBlockDesc- > >Union.DataBlock), (UINTN)CurrentBlockDesc->Length); > - DEBUG ((EFI_D_INFO, "Capsule coalesce block no.0x%lX from 0x%lX to > 0x%lX with size 0x%lX\n",(UINT64)CapsuleTimes, > + DEBUG ((DEBUG_INFO, "Capsule coalesce block no.0x%lX from 0x%lX > + to 0x%lX with size 0x%lX\n",(UINT64)CapsuleTimes, > CurrentBlockDesc->Union.DataBlock, (UINT64)(UINTN)DestPtr, > CurrentBlockDesc->Length)); > DestPtr +=3D CurrentBlockDesc->Length; > SizeLeft -=3D CurrentBlockDesc->Length; diff --git > a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c > b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c > index 1131094c4f..f5ec1c20ec 100644 > --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c > +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c > @@ -427,7 +427,7 @@ ModeSwitch ( > if (ReservedRangeEnd < MemoryEnd64) { > MemoryBase64 =3D ReservedRangeEnd; > } else { > - DEBUG ((EFI_D_ERROR, "Memory is not enough to process capsule!\n")= ); > + DEBUG ((DEBUG_ERROR, "Memory is not enough to process > + capsule!\n")); > return EFI_OUT_OF_RESOURCES; > } > } else if (ReservedRangeBase < MemoryEnd64) { @@ -525,7 +525,7 @@ > FindCapsuleCoalesceImage ( > &AuthenticationState > ); > if (EFI_ERROR (Status)) { > - DEBUG ((EFI_D_ERROR, "Unable to find PE32 section in CapsuleX64 > image ffs %r!\n", Status)); > + DEBUG ((DEBUG_ERROR, "Unable to find PE32 section in CapsuleX64 > + image ffs %r!\n", Status)); > return Status; > } > *CoalesceImageMachineType =3D PeCoffLoaderGetMachineType ((VOID *) > (UINTN) CoalesceImageAddress); @@ -574,7 +574,7 @@ > GetLongModeContext ( > LongModeBuffer > ); > if (EFI_ERROR (Status)) { > - DEBUG (( EFI_D_ERROR, "Error Get LongModeBuffer variable %r!\n", > Status)); > + DEBUG (( DEBUG_ERROR, "Error Get LongModeBuffer variable %r!\n", > + Status)); > } > return Status; > } > @@ -734,7 +734,7 @@ BuildMemoryResourceDescriptor ( > } >=20 > if (Index =3D=3D 0) { > - DEBUG ((EFI_D_INFO | EFI_D_WARN, "No memory resource descriptor > reported in HOB list before capsule Coalesce\n")); > + DEBUG ((DEBUG_INFO | DEBUG_WARN, "No memory resource > descriptor > + reported in HOB list before capsule Coalesce\n")); > #if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64) > // > // Allocate memory to hold memory resource descriptor, @@ -746,7 > +746,7 @@ BuildMemoryResourceDescriptor ( >=20 > MemoryResource[0].PhysicalStart =3D 0; > MemoryResource[0].ResourceLength =3D LShiftU64 (1, > GetPhysicalAddressBits ()); > - DEBUG ((EFI_D_INFO, "MemoryResource[0x0] - Start(0x%0lx) > Length(0x%0lx)\n", > + DEBUG ((DEBUG_INFO, "MemoryResource[0x0] - Start(0x%0lx) > + Length(0x%0lx)\n", > MemoryResource[0x0].PhysicalStart, > MemoryResource[0x0].ResourceLength)); > return MemoryResource; > #else > @@ -770,7 +770,7 @@ BuildMemoryResourceDescriptor ( > while (Hob.Raw !=3D NULL) { > ResourceDescriptor =3D (EFI_HOB_RESOURCE_DESCRIPTOR *) Hob.Raw; > if (ResourceDescriptor->ResourceType =3D=3D > EFI_RESOURCE_SYSTEM_MEMORY) { > - DEBUG ((EFI_D_INFO, "MemoryResource[0x%x] - Start(0x%0lx) > Length(0x%0lx)\n", > + DEBUG ((DEBUG_INFO, "MemoryResource[0x%x] - Start(0x%0lx) > + Length(0x%0lx)\n", > Index, ResourceDescriptor->PhysicalStart, Reso= urceDescriptor- > >ResourceLength)); > MemoryResource[Index].PhysicalStart =3D ResourceDescriptor- > >PhysicalStart; > MemoryResource[Index].ResourceLength =3D ResourceDescriptor- > >ResourceLength; > @@ -973,7 +973,7 @@ CapsuleCoalesce ( > // > Status =3D PeiServicesGetBootMode (&BootMode); > if (EFI_ERROR (Status) || (BootMode !=3D BOOT_ON_FLASH_UPDATE)) { > - DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update > path.\n")); > + DEBUG ((DEBUG_ERROR, "Boot mode is not correct for capsule update > + path.\n")); > Status =3D EFI_NOT_FOUND; > goto Done; > } > @@ -1016,14 +1016,14 @@ CapsuleCoalesce ( > // > // There is no capsule variables, quit > // > - DEBUG ((EFI_D_INFO,"Capsule variable Index =3D %d\n", Index)); > + DEBUG ((DEBUG_INFO,"Capsule variable Index =3D %d\n", Index)); > break; > } > VariableCount++; > Index++; > } >=20 > - DEBUG ((EFI_D_INFO,"Capsule variable count =3D %d\n", VariableCount)); > + DEBUG ((DEBUG_INFO,"Capsule variable count =3D %d\n", VariableCount)); >=20 > // > // The last entry is the end flag. > @@ -1034,7 +1034,7 @@ CapsuleCoalesce ( > ); >=20 > if (Status !=3D EFI_SUCCESS) { > - DEBUG ((EFI_D_ERROR, "AllocatePages Failed!, Status =3D %x\n", Statu= s)); > + DEBUG ((DEBUG_ERROR, "AllocatePages Failed!, Status =3D %x\n", > + Status)); > goto Done; > } >=20 > @@ -1046,7 +1046,7 @@ CapsuleCoalesce ( > // > Status =3D GetCapsuleDescriptors (VariableArrayAddress); > if (EFI_ERROR (Status)) { > - DEBUG ((EFI_D_ERROR, "Fail to find capsule variables.\n")); > + DEBUG ((DEBUG_ERROR, "Fail to find capsule variables.\n")); > goto Done; > } >=20 > @@ -1064,14 +1064,14 @@ CapsuleCoalesce ( > CoalesceImageEntryPoint =3D 0; > Status =3D GetLongModeContext (&LongModeBuffer); > if (EFI_ERROR (Status)) { > - DEBUG ((EFI_D_ERROR, "Fail to find the variable for long mode > context!\n")); > + DEBUG ((DEBUG_ERROR, "Fail to find the variable for long mode > + context!\n")); > Status =3D EFI_NOT_FOUND; > goto Done; > } >=20 > Status =3D FindCapsuleCoalesceImage (&CoalesceImageEntryPoint, > &CoalesceImageMachineType); > if ((EFI_ERROR (Status)) || (CoalesceImageMachineType !=3D > EFI_IMAGE_MACHINE_X64)) { > - DEBUG ((EFI_D_ERROR, "Fail to find CapsuleX64 module in FV!\n")); > + DEBUG ((DEBUG_ERROR, "Fail to find CapsuleX64 module in FV!\n")); > Status =3D EFI_NOT_FOUND; > goto Done; > } > @@ -1091,14 +1091,14 @@ CapsuleCoalesce ( > Status =3D CapsuleDataCoalesce (PeiServices, (EFI_PHYSICAL_ADDRESS > *)(UINTN)VariableArrayAddress, MemoryResource, MemoryBase, > MemorySize); #endif >=20 > - DEBUG ((EFI_D_INFO, "Capsule Coalesce Status =3D %r!\n", Status)); > + DEBUG ((DEBUG_INFO, "Capsule Coalesce Status =3D %r!\n", Status)); >=20 > if (Status =3D=3D EFI_BUFFER_TOO_SMALL) { > - DEBUG ((EFI_D_ERROR, "There is not enough memory to process > capsule!\n")); > + DEBUG ((DEBUG_ERROR, "There is not enough memory to process > + capsule!\n")); > } >=20 > if (Status =3D=3D EFI_NOT_FOUND) { > - DEBUG ((EFI_D_ERROR, "Fail to parse capsule descriptor in memory!\n"= )); > + DEBUG ((DEBUG_ERROR, "Fail to parse capsule descriptor in > + memory!\n")); > REPORT_STATUS_CODE ( > EFI_ERROR_CODE | EFI_ERROR_MAJOR, > (EFI_SOFTWARE_PEI_MODULE | > EFI_SW_PEI_EC_INVALID_CAPSULE_DESCRIPTOR) > @@ -1163,7 +1163,7 @@ CapsuleTestPattern ( > // > if (*TestPtr =3D=3D 0x54534554) { > RetValue =3D TRUE; > - DEBUG ((EFI_D_INFO, "Capsule test pattern mode activated...\n")); > + DEBUG ((DEBUG_INFO, "Capsule test pattern mode activated...\n")); > TestSize =3D TestPtr[1] / sizeof (UINT32); > // > // Skip over the signature and the size fields in the pattern data h= eader > @@ -1172,7 +1172,7 @@ CapsuleTestPattern ( > TestCounter =3D 0; > while (TestSize > 0) { > if (*TestPtr !=3D TestCounter) { > - DEBUG ((EFI_D_INFO, "Capsule test pattern mode FAILED: > BaseAddr/FailAddr 0x%X 0x%X\n", > (UINT32)(UINTN)(EFI_CAPSULE_PEIM_PRIVATE_DATA *)CapsuleBase, > (UINT32)(UINTN)TestPtr)); > + DEBUG ((DEBUG_INFO, "Capsule test pattern mode FAILED: > + BaseAddr/FailAddr 0x%X 0x%X\n", > + (UINT32)(UINTN)(EFI_CAPSULE_PEIM_PRIVATE_DATA *)CapsuleBase, > + (UINT32)(UINTN)TestPtr)); > return TRUE; > } >=20 > @@ -1181,7 +1181,7 @@ CapsuleTestPattern ( > TestSize--; > } >=20 > - DEBUG ((EFI_D_INFO, "Capsule test pattern mode SUCCESS\n")); > + DEBUG ((DEBUG_INFO, "Capsule test pattern mode SUCCESS\n")); > } >=20 > return RetValue; > @@ -1226,11 +1226,11 @@ CreateState ( > return EFI_VOLUME_CORRUPTED; > } > if (PrivateData->CapsuleAllImageSize >=3D MAX_ADDRESS) { > - DEBUG ((EFI_D_ERROR, "CapsuleAllImageSize too big - 0x%lx\n", > PrivateData->CapsuleAllImageSize)); > + DEBUG ((DEBUG_ERROR, "CapsuleAllImageSize too big - 0x%lx\n", > + PrivateData->CapsuleAllImageSize)); > return EFI_OUT_OF_RESOURCES; > } > if (PrivateData->CapsuleNumber >=3D MAX_ADDRESS) { > - DEBUG ((EFI_D_ERROR, "CapsuleNumber too big - 0x%lx\n", PrivateData- > >CapsuleNumber)); > + DEBUG ((DEBUG_ERROR, "CapsuleNumber too big - 0x%lx\n", > + PrivateData->CapsuleNumber)); > return EFI_OUT_OF_RESOURCES; > } > // > @@ -1248,13 +1248,13 @@ CreateState ( > ); >=20 > if (Status !=3D EFI_SUCCESS) { > - DEBUG ((EFI_D_ERROR, "AllocatePages Failed!\n")); > + DEBUG ((DEBUG_ERROR, "AllocatePages Failed!\n")); > return Status; > } > // > // Copy to our new buffer for DXE > // > - DEBUG ((EFI_D_INFO, "Capsule copy from 0x%8X to 0x%8X with size > 0x%8X\n", (UINTN)((UINT8 *)PrivateData + > sizeof(EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * > sizeof(UINT64)), (UINTN) NewBuffer, Size)); > + DEBUG ((DEBUG_INFO, "Capsule copy from 0x%8X to 0x%8X with size > + 0x%8X\n", (UINTN)((UINT8 *)PrivateData + > + sizeof(EFI_CAPSULE_PEIM_PRIVATE_DATA) + (CapsuleNumber - 1) * > + sizeof(UINT64)), (UINTN) NewBuffer, Size)); > CopyMem ((VOID *) (UINTN) NewBuffer, (VOID *) (UINTN) ((UINT8 > *)PrivateData + sizeof(EFI_CAPSULE_PEIM_PRIVATE_DATA) + > (CapsuleNumber - 1) * sizeof(UINT64)), Size); > // > // Check for test data pattern. If it is the test pattern, then we'll = diff --git > a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c > b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c > index 40b7095194..2c309990fb 100644 > --- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c > +++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c > @@ -174,7 +174,7 @@ PageFaultHandler ( > AddressEncMask =3D PageFaultContext->AddressEncMask; >=20 > PFAddress =3D AsmReadCr2 (); > - DEBUG ((EFI_D_ERROR, "CapsuleX64 - PageFaultHandler: Cr2 - %lx\n", > PFAddress)); > + DEBUG ((DEBUG_ERROR, "CapsuleX64 - PageFaultHandler: Cr2 - %lx\n", > + PFAddress)); >=20 > if (PFAddress >=3D PhyMask + SIZE_4KB) { > return PageFaultContext->OriginalHandler; > -- > 2.21.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel