From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 102FA208AE346 for ; Thu, 14 Feb 2019 21:09:28 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2019 21:09:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,371,1544515200"; d="scan'208";a="118103120" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga008.jf.intel.com with ESMTP; 14 Feb 2019 21:09:27 -0800 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 21:09:12 -0800 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 21:09:10 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.207]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.232]) with mapi id 14.03.0415.000; Fri, 15 Feb 2019 13:09:08 +0800 From: "Zeng, Star" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Wang, Jian J" , "Zeng, Star" Thread-Topic: [PATCH v4 09/13] MdeModulePkg/SmmLockBoxLib: Use 'DEBUG_' prefix instead of 'EFI_D_' Thread-Index: AQHUwd+FdhgTcTnNzUGWlnh2vZU1QqXgVVVA Date: Fri, 15 Feb 2019 05:09:08 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483104026B775@shsmsx102.ccr.corp.intel.com> References: <20190211075738.16676-1-hao.a.wu@intel.com> <20190211075738.16676-11-hao.a.wu@intel.com> In-Reply-To: <20190211075738.16676-11-hao.a.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v4 09/13] MdeModulePkg/SmmLockBoxLib: Use 'DEBUG_' prefix instead of 'EFI_D_' X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2019 05:09:29 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: Wu, Hao A=20 Sent: Monday, February 11, 2019 3:58 PM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Wang, Jian J ; Z= eng, Star Subject: [PATCH v4 09/13] MdeModulePkg/SmmLockBoxLib: Use 'DEBUG_' prefix i= nstead of 'EFI_D_' This commit is out of the scope for BZ-1409. It is a coding style refinemen= t for the SmmLockBoxLib. More specifically, the commit will remove all the debug message display lev= el macros starting with 'EFI_D_' and replace them with macros starting with= 'DEBUG_'. Cc: Jian J Wang Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu Reviewed-by: Ray Ni Reviewed-by: Laszlo Ersek --- MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c | 22 +++--- MdeModu= lePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c | 26 +++---- MdeModulePkg/L= ibrary/SmmLockBoxLib/SmmLockBoxSmmLib.c | 78 ++++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeMod= ulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c index ac8bcd2ff7..0428decbac 100644 --- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c +++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c @@ -1,6 +1,6 @@ /** @file =20 -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions @@ -153,7 +153,7 @@ SaveLockBox ( UINT8 *CommBuffer; UINTN CommSize; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n")); =20 // // Basic check @@ -199,7 +199,7 @@ SaveLockBox ( =20 Status =3D (EFI_STATUS)LockBoxParameterSave->Header.ReturnStatus; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n", Status= )); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n",=20 + Status)); =20 // // Done @@ -235,7 +235,7 @@ SetLockBoxAttributes ( UINT8 *CommBuffer; UINTN CommSize; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes -=20 + Enter\n")); =20 // // Basic check @@ -281,7 +281,7 @@ SetLockBoxAttributes ( =20 Status =3D (EFI_STATUS)LockBoxParameterSetAttributes->Header.ReturnStatu= s; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit (%r)\n= ", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit=20 + (%r)\n", Status)); =20 // // Done @@ -322,7 +322,7 @@ UpdateLockBox ( UINT8 *CommBuffer; UINTN CommSize; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n")); =20 // // Basic check @@ -369,7 +369,7 @@ UpdateLockBox ( =20 Status =3D (EFI_STATUS)LockBoxParameterUpdate->Header.ReturnStatus; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n", Stat= us)); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n",=20 + Status)); =20 // // Done @@ -411,7 +411,7 @@ RestoreLockBox ( UINT8 *CommBuffer; UINTN CommSize; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n")); =20 // // Basic check @@ -467,7 +467,7 @@ RestoreLockBox ( =20 Status =3D (EFI_STATUS)LockBoxParameterRestore->Header.ReturnStatus; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n", Sta= tus)); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n",=20 + Status)); =20 // // Done @@ -496,7 +496,7 @@ RestoreAllLockBoxInPlace ( UINT8 *CommBuffer; UINTN CommSize; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n= ")); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace -=20 + Enter\n")); =20 SmmCommunication =3D LockBoxGetSmmCommProtocol (); if (SmmCommunication =3D=3D NULL) { @@ -532,7 +532,7 @@ RestoreAllLockBoxInPlace ( =20 Status =3D (EFI_STATUS)LockBoxParameterRestoreAllInPlace->Header.ReturnS= tatus; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit (%= r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit=20 + (%r)\n", Status)); =20 // // Done diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/MdeMod= ulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c index 8a168663c4..9f73480070 100644 --- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c +++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c @@ -1,6 +1,6 @@ /** @file =20 -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions @@ -542,7 +542,7 @@ RestoreLockBox ( // } EFI_SMM_COMMUNICATE_HEADER; // =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n")); =20 // // Basic check @@ -563,9 +563,9 @@ RestoreLockBox ( (VOID **)&SmmCommunicationPpi ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n",=20 + Status)); Status =3D InternalRestoreLockBoxFromSmram (Guid, Buffer, Length); - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", S= tatus)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit=20 + (%r)\n", Status)); return Status; } =20 @@ -581,13 +581,13 @@ RestoreLockBox ( CommHeader->MessageLength =3D sizeof(*LockBoxParameterRestore); } =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n", &CommBuffer[0]= )); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n",=20 + &CommBuffer[0])); if ((sizeof(UINTN) =3D=3D sizeof(UINT32)) && (FeaturePcdGet (PcdDxeIplSw= itchToLongMode)) ) { LockBoxParameterRestore =3D (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&Com= mBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINT= 64)]; } else { LockBoxParameterRestore =3D (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&Com= mBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINT= N)]; } - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore - %x\n", L= ockBoxParameterRestore)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore -=20 + %x\n", LockBoxParameterRestore)); LockBoxParameterRestore->Header.Command =3D EFI_SMM_LOCK_BOX_COMMAND_= RESTORE; LockBoxParameterRestore->Header.DataLength =3D sizeof(*LockBoxParameterR= estore); LockBoxParameterRestore->Header.ReturnStatus =3D (UINT64)-1; @@ -616,7 += 616,7 @@ RestoreLockBox ( // // Pei SMM communication not ready yet, so we access SMRAM directly // - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n",=20 + Status)); Status =3D InternalRestoreLockBoxFromSmram (Guid, Buffer, Length); LockBoxParameterRestore->Header.ReturnStatus =3D (UINT64)Status; if (Length !=3D NULL) { @@ -635,7 +635,7 @@ RestoreLockBox ( Status |=3D MAX_BIT; } =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Sta= tus)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n",=20 + Status)); =20 // // Done @@ -673,7 +673,7 @@ RestoreAllLockBoxInPlace ( // } EFI_SMM_COMMUNICATE_HEADER; // =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Enter\n= ")); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace -=20 + Enter\n")); =20 // // Get needed resource @@ -685,9 +685,9 @@ RestoreAllLockBoxInPlace ( (VOID **)&SmmCommunicationPpi ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LocatePpi - (%r)\n",=20 + Status)); Status =3D InternalRestoreAllLockBoxInPlaceFromSmram (); - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit = (%r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace -=20 + Exit (%r)\n", Status)); return Status; } =20 @@ -725,7 +725,7 @@ RestoreAllLockBoxInPlace ( // // Pei SMM communication not ready yet, so we access SMRAM directly // - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib Communicate - (%r)\n",=20 + Status)); Status =3D InternalRestoreAllLockBoxInPlaceFromSmram (); LockBoxParameterRestoreAllInPlace->Header.ReturnStatus =3D (UINT64)Sta= tus; } @@ -737,7 +737,7 @@ RestoreAllLockBoxInPlace ( Status |=3D MAX_BIT; } =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%= r)\n", Status)); + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit=20 + (%r)\n", Status)); =20 // // Done diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c b/MdeMod= ulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c index 54a81d6521..c912d187a4 100644 --- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c +++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c @@ -1,6 +1,6 @@ /** @file =20 -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions @@ -214,7 +214,7 @@ SmmLockBoxSmmConstruc= tor ( EFI_STATUS Status; SMM_LOCK_BOX_CONTEXT *SmmLockBoxContext; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Enter\n= ")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor -=20 + Enter\n")); =20 // // Register SmmReadyToLock notification. @@ -255,8 +255,8 @@ SmmLockBoxSmmConstructor ( // Find it. That means some other library instance is already run. // No need to install again, just return. // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - already inst= alled\n")); - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\= n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - already inst= alled\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor -=20 + Exit\n")); return EFI_SUCCESS; } =20 @@ -279,9 +279,9 @@ SmmLockBoxSmmConstructor ( ASSERT_EFI_ERROR (Status); mSmmConfigurationTableInstalled =3D TRUE; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - %x\n", (UINTN)= &mSmmLockBoxContext)); - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib LockBoxDataAddress - %x\n", (UINTN= )&mLockBoxQueue)); - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n"= )); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - %x\n",=20 + (UINTN)&mSmmLockBoxContext)); DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib=20 + LockBoxDataAddress - %x\n", (UINTN)&mLockBoxQueue)); DEBUG=20 + ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n")); =20 return Status; } @@ -306,7 +306,7 @@ SmmLockBoxSmmDestructor ( { EFI_STATUS Status; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a modu= le\n", gEfiCallerBaseName)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a=20 + module\n", gEfiCallerBaseName)); =20 if (mSmmConfigurationTableInstalled) { Status =3D gSmst->SmmInstallConfigurationTable ( @@ -316,7 +316,7 @@ S= mmLockBoxSmmDestructor ( 0 ); ASSERT_EFI_ERROR (Status); - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib uninstall SmmLockBoxCommunicatio= n configuration table\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib uninstall=20 + SmmLockBoxCommunication configuration table\n")); } =20 if (mSmmLockBoxRegistrationSmmReadyToLock !=3D NULL) { @@ -438,13 +438,1= 3 @@ SaveLockBox ( EFI_STATUS Status; LIST_ENTRY *LockBoxQueue; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n")); =20 // // Basic check // if ((Guid =3D=3D NULL) || (Buffer =3D=3D NULL) || (Length =3D=3D 0)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_= INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n",=20 + EFI_INVALID_PARAMETER)); return EFI_INVALID_PARAMETER; } =20 @@ -453,7 +453,7 @@ SaveLockBox ( // LockBox =3D InternalFindLockBoxByGuid (Guid); if (LockBox !=3D NULL) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_= ALREADY_STARTED)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n",=20 + EFI_ALREADY_STARTED)); return EFI_ALREADY_STARTED; } =20 @@ -468,7 +468,7 @@ SaveLockBox ( ); ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_= OUT_OF_RESOURCES)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n",=20 + EFI_OUT_OF_RESOURCES)); return EFI_OUT_OF_RESOURCES; } =20 @@ -483,7 +483,7 @@ SaveLockBox ( ASSERT_EFI_ERROR (Status); if (EFI_ERROR (Status)) { gSmst->SmmFreePages (SmramBuffer, EFI_SIZE_TO_PAGES (Length)); - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_= OUT_OF_RESOURCES)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n",=20 + EFI_OUT_OF_RESOURCES)); return EFI_OUT_OF_RESOURCES; } =20 @@ -503,7 +503,7 @@ SaveLockBox ( LockBox->SmramBuffer =3D SmramBuffer; =20 DEBUG (( - EFI_D_INFO, + DEBUG_INFO, "LockBoxGuid - %g, SmramBuffer - 0x%lx, Length - 0x%lx\n", &LockBox->Guid, LockBox->SmramBuffer, @@ -517,7 +517,7 @@ SaveLockBox ( // // Done // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_SU= CCESS)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n",=20 + EFI_SUCCESS)); return EFI_SUCCESS; } =20 @@ -543,22 +543,22 @@ SetLockBoxAttributes ( { SMM_LOCK_BOX_DATA *LockBox; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes -=20 + Enter\n")); =20 // // Basic check // if ((Guid =3D=3D NULL) || ((Attributes & ~(LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE | LOCK_BOX_ATTR= IBUTE_RESTORE_IN_S3_ONLY)) !=3D 0)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)= \n", EFI_INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit=20 + (%r)\n", EFI_INVALID_PARAMETER)); return EFI_INVALID_PARAMETER; } =20 if (((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) !=3D 0) && ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) !=3D 0)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)= \n", EFI_INVALID_PARAMETER)); - DEBUG ((EFI_D_INFO, " LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BO= X_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); - DEBUG ((EFI_D_INFO, " can not be set together\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)= \n", EFI_INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, " LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BO= X_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); + DEBUG ((DEBUG_INFO, " can not be set together\n")); return EFI_INVALID_PARAMETER; } =20 @@ -567,7 +567,7 @@ SetLockBoxAttributes ( // LockBox =3D InternalFindLockBoxByGuid (Guid); if (LockBox =3D=3D NULL) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)= \n", EFI_NOT_FOUND)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit=20 + (%r)\n", EFI_NOT_FOUND)); return EFI_NOT_FOUND; } =20 @@ -575,9 +575,9 @@ SetLockBoxAttributes ( ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) !=3D = 0)) || (((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) !=3D 0= ) && ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) !=3D 0))) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes 0x%lx 0x%lx= - Exit (%r)\n", LockBox->Attributes, Attributes, EFI_INVALID_PARAMETER)); - DEBUG ((EFI_D_INFO, " LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BO= X_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); - DEBUG ((EFI_D_INFO, " can not be set together\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes 0x%lx 0x%lx= - Exit (%r)\n", LockBox->Attributes, Attributes, EFI_INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, " LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE and LOCK_BO= X_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); + DEBUG ((DEBUG_INFO, " can not be set together\n")); return EFI_INVALID_PARAMETER; } =20 @@ -589,7 +589,7 @@ SetLockBoxAttributes ( // // Done // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n= ", EFI_SUCCESS)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit=20 + (%r)\n", EFI_SUCCESS)); return EFI_SUCCESS; } =20 @@ -620,13 +620,13 @@ UpdateLockBox ( { SMM_LOCK_BOX_DATA *LockBox; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n")); =20 // // Basic check // if ((Guid =3D=3D NULL) || (Buffer =3D=3D NULL) || (Length =3D=3D 0)) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EF= I_INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n",=20 + EFI_INVALID_PARAMETER)); return EFI_INVALID_PARAMETER; } =20 @@ -635,7 +635,7 @@ UpdateLockBox ( // LockBox =3D InternalFindLockBoxByGuid (Guid); if (LockBox =3D=3D NULL) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EF= I_NOT_FOUND)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n",=20 + EFI_NOT_FOUND)); return EFI_NOT_FOUND; } =20 @@ -643,7 +643,7 @@ UpdateLockBox ( // Update data // if (LockBox->Length < Offset + Length) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EF= I_BUFFER_TOO_SMALL)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n",=20 + EFI_BUFFER_TOO_SMALL)); return EFI_BUFFER_TOO_SMALL; } ASSERT ((UINTN)LockBox->SmramBuffer <=3D (MAX_ADDRESS - Offset)); @@ -65= 2,7 +652,7 @@ UpdateLockBox ( // // Done // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_= SUCCESS)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n",=20 + EFI_SUCCESS)); return EFI_SUCCESS; } =20 @@ -685,7 +685,7 @@ RestoreLockBox ( SMM_LOCK_BOX_DATA *LockBox; VOID *RestoreBuffer; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n")); =20 // // Restore this, Buffer and Length MUST be both NULL or both non-NULL @@= -693,7 +693,7 @@ RestoreLockBox ( if ((Guid =3D=3D NULL) || ((Buffer =3D=3D NULL) && (Length !=3D NULL)) || ((Buffer !=3D NULL) && (Length =3D=3D NULL))) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", E= FI_INVALID_PARAMETER)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit=20 + (%r)\n", EFI_INVALID_PARAMETER)); return EFI_INVALID_PARAMETER; } =20 @@ -705,7 +705,7 @@ RestoreLockBox ( // // Not found // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", E= FI_NOT_FOUND)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit=20 + (%r)\n", EFI_NOT_FOUND)); return EFI_NOT_FOUND; } =20 @@ -732,7 +732,7 @@ RestoreLockBox ( // restore to original buffer // if ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) =3D=3D= 0) { - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n",= EFI_WRITE_PROTECTED)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit=20 + (%r)\n", EFI_WRITE_PROTECTED)); return EFI_WRITE_PROTECTED; } RestoreBuffer =3D (VOID *)(UINTN)LockBox->Buffer; @@ -747,7 +747,7 @@ = RestoreLockBox ( // Input buffer is too small to hold all data. // *Length =3D (UINTN)LockBox->Length; - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n",= EFI_BUFFER_TOO_SMALL)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit=20 + (%r)\n", EFI_BUFFER_TOO_SMALL)); return EFI_BUFFER_TOO_SMALL; } *Length =3D (UINTN)LockBox->Length; @@ -761,7 +761,7 @@ RestoreLockBox ( // // Done // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI= _SUCCESS)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n",=20 + EFI_SUCCESS)); return EFI_SUCCESS; } =20 @@ -782,7 +782,7 @@ RestoreAllLockBoxInPlace ( LIST_ENTRY *Link; LIST_ENTRY *LockBoxQueue; =20 - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Enter\n= ")); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace -=20 + Enter\n")); =20 LockBoxQueue =3D InternalGetLockBoxQueue (); ASSERT (LockBoxQueue !=3D NULL); @@ -808,7 +808,7 @@ RestoreAllLockBoxInPlace ( // // Done // - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%= r)\n", EFI_SUCCESS)); + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit=20 + (%r)\n", EFI_SUCCESS)); return EFI_SUCCESS; } =20 -- 2.12.0.windows.1