From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 A65EF211B158C for ; Wed, 30 Jan 2019 21:47:14 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jan 2019 21:47:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,543,1539673200"; d="scan'208";a="112528829" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.127]) ([10.239.9.127]) by orsmga006.jf.intel.com with ESMTP; 30 Jan 2019 21:47:12 -0800 To: Hao Wu , edk2-devel@lists.01.org Cc: Jian J Wang , Ray Ni , Star Zeng References: <20190131024854.4880-1-hao.a.wu@intel.com> <20190131024854.4880-10-hao.a.wu@intel.com> From: "Ni, Ruiyu" Message-ID: <96e2332c-e27f-f74c-641a-cf5f932f1ec2@Intel.com> Date: Thu, 31 Jan 2019 13:49:35 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20190131024854.4880-10-hao.a.wu@intel.com> Subject: Re: [PATCH v2 09/12] 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: Thu, 31 Jan 2019 05:47:14 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 1/31/2019 10:48 AM, Hao Wu wrote: > This commit is out of the scope for BZ-1409. It is a coding style > refinement for the SmmLockBoxLib. > > More specifically, the commit will remove all the debug message display > level macros starting with 'EFI_D_' and replace them with macros starting > with 'DEBUG_'. > > Cc: Jian J Wang > Cc: Ray Ni > Cc: Star Zeng > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu > --- > MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c | 22 +++--- > MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c | 26 +++---- > MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c | 78 ++++++++++---------- > 3 files changed, 63 insertions(+), 63 deletions(-) > > diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.c b/MdeModulePkg/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 > > -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> > This program and the accompanying materials > are licensed and made available under the terms and conditions > @@ -153,7 +153,7 @@ SaveLockBox ( > UINT8 *CommBuffer; > UINTN CommSize; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Enter\n")); > > // > // Basic check > @@ -199,7 +199,7 @@ SaveLockBox ( > > Status = (EFI_STATUS)LockBoxParameterSave->Header.ReturnStatus; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SaveLockBox - Exit (%r)\n", Status)); > > // > // Done > @@ -235,7 +235,7 @@ SetLockBoxAttributes ( > UINT8 *CommBuffer; > UINTN CommSize; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Enter\n")); > > // > // Basic check > @@ -281,7 +281,7 @@ SetLockBoxAttributes ( > > Status = (EFI_STATUS)LockBoxParameterSetAttributes->Header.ReturnStatus; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib SetLockBoxAttributes - Exit (%r)\n", Status)); > > // > // Done > @@ -322,7 +322,7 @@ UpdateLockBox ( > UINT8 *CommBuffer; > UINTN CommSize; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Enter\n")); > > // > // Basic check > @@ -369,7 +369,7 @@ UpdateLockBox ( > > Status = (EFI_STATUS)LockBoxParameterUpdate->Header.ReturnStatus; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib UpdateLockBox - Exit (%r)\n", Status)); > > // > // Done > @@ -411,7 +411,7 @@ RestoreLockBox ( > UINT8 *CommBuffer; > UINTN CommSize; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Enter\n")); > > // > // Basic check > @@ -467,7 +467,7 @@ RestoreLockBox ( > > Status = (EFI_STATUS)LockBoxParameterRestore->Header.ReturnStatus; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreLockBox - Exit (%r)\n", Status)); > > // > // Done > @@ -496,7 +496,7 @@ RestoreAllLockBoxInPlace ( > UINT8 *CommBuffer; > UINTN CommSize; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Enter\n")); > > SmmCommunication = LockBoxGetSmmCommProtocol (); > if (SmmCommunication == NULL) { > @@ -532,7 +532,7 @@ RestoreAllLockBoxInPlace ( > > Status = (EFI_STATUS)LockBoxParameterRestoreAllInPlace->Header.ReturnStatus; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxDxeLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > > // > // Done > diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.c b/MdeModulePkg/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 > > -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> > This program and the accompanying materials > are licensed and made available under the terms and conditions > @@ -542,7 +542,7 @@ RestoreLockBox ( > // } EFI_SMM_COMMUNICATE_HEADER; > // > > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Enter\n")); > > // > // 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", Status)); > Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length); > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status)); > return Status; > } > > @@ -581,13 +581,13 @@ RestoreLockBox ( > CommHeader->MessageLength = sizeof(*LockBoxParameterRestore); > } > > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n", &CommBuffer[0])); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib CommBuffer - %x\n", &CommBuffer[0])); > if ((sizeof(UINTN) == sizeof(UINT32)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) ) { > LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINT64)]; > } else { > LockBoxParameterRestore = (EFI_SMM_LOCK_BOX_PARAMETER_RESTORE *)&CommBuffer[OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, MessageLength) + sizeof(UINTN)]; > } > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore - %x\n", LockBoxParameterRestore)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib LockBoxParameterRestore - %x\n", LockBoxParameterRestore)); > LockBoxParameterRestore->Header.Command = EFI_SMM_LOCK_BOX_COMMAND_RESTORE; > LockBoxParameterRestore->Header.DataLength = sizeof(*LockBoxParameterRestore); > LockBoxParameterRestore->Header.ReturnStatus = (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", Status)); > Status = InternalRestoreLockBoxFromSmram (Guid, Buffer, Length); > LockBoxParameterRestore->Header.ReturnStatus = (UINT64)Status; > if (Length != NULL) { > @@ -635,7 +635,7 @@ RestoreLockBox ( > Status |= MAX_BIT; > } > > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreLockBox - Exit (%r)\n", Status)); > > // > // Done > @@ -673,7 +673,7 @@ RestoreAllLockBoxInPlace ( > // } EFI_SMM_COMMUNICATE_HEADER; > // > > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Enter\n")); > > // > // 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", Status)); > Status = InternalRestoreAllLockBoxInPlaceFromSmram (); > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > return Status; > } > > @@ -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", Status)); > Status = InternalRestoreAllLockBoxInPlaceFromSmram (); > LockBoxParameterRestoreAllInPlace->Header.ReturnStatus = (UINT64)Status; > } > @@ -737,7 +737,7 @@ RestoreAllLockBoxInPlace ( > Status |= MAX_BIT; > } > > - DEBUG ((EFI_D_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxPeiLib RestoreAllLockBoxInPlace - Exit (%r)\n", Status)); > > // > // Done > diff --git a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.c b/MdeModulePkg/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 > > -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
> > This program and the accompanying materials > are licensed and made available under the terms and conditions > @@ -214,7 +214,7 @@ SmmLockBoxSmmConstructor ( > EFI_STATUS Status; > SMM_LOCK_BOX_CONTEXT *SmmLockBoxContext; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Enter\n")); > > // > // 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 installed\n")); > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxContext - already installed\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n")); > return EFI_SUCCESS; > } > > @@ -279,9 +279,9 @@ SmmLockBoxSmmConstructor ( > ASSERT_EFI_ERROR (Status); > mSmmConfigurationTableInstalled = TRUE; > > - 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", (UINTN)&mSmmLockBoxContext)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib LockBoxDataAddress - %x\n", (UINTN)&mLockBoxQueue)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmConstructor - Exit\n")); > > return Status; > } > @@ -306,7 +306,7 @@ SmmLockBoxSmmDestructor ( > { > EFI_STATUS Status; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a module\n", gEfiCallerBaseName)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SmmLockBoxSmmDestructor in %a module\n", gEfiCallerBaseName)); > > if (mSmmConfigurationTableInstalled) { > Status = gSmst->SmmInstallConfigurationTable ( > @@ -316,7 +316,7 @@ SmmLockBoxSmmDestructor ( > 0 > ); > ASSERT_EFI_ERROR (Status); > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib uninstall SmmLockBoxCommunication configuration table\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib uninstall SmmLockBoxCommunication configuration table\n")); > } > > if (mSmmLockBoxRegistrationSmmReadyToLock != NULL) { > @@ -438,13 +438,13 @@ SaveLockBox ( > EFI_STATUS Status; > LIST_ENTRY *LockBoxQueue; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Enter\n")); > > // > // Basic check > // > if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > return EFI_INVALID_PARAMETER; > } > > @@ -453,7 +453,7 @@ SaveLockBox ( > // > LockBox = InternalFindLockBoxByGuid (Guid); > if (LockBox != NULL) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_ALREADY_STARTED)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_ALREADY_STARTED)); > return EFI_ALREADY_STARTED; > } > > @@ -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", EFI_OUT_OF_RESOURCES)); > return EFI_OUT_OF_RESOURCES; > } > > @@ -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", EFI_OUT_OF_RESOURCES)); > return EFI_OUT_OF_RESOURCES; > } > > @@ -503,7 +503,7 @@ SaveLockBox ( > LockBox->SmramBuffer = SmramBuffer; > > 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_SUCCESS)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SaveLockBox - Exit (%r)\n", EFI_SUCCESS)); > return EFI_SUCCESS; > } > > @@ -543,22 +543,22 @@ SetLockBoxAttributes ( > { > SMM_LOCK_BOX_DATA *LockBox; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Enter\n")); > > // > // Basic check > // > if ((Guid == NULL) || > ((Attributes & ~(LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE | LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY)) != 0)) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_INVALID_PARAMETER)); > return EFI_INVALID_PARAMETER; > } > > if (((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) && > ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 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_BOX_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_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); > + DEBUG ((DEBUG_INFO, " can not be set together\n")); > return EFI_INVALID_PARAMETER; > } > > @@ -567,7 +567,7 @@ SetLockBoxAttributes ( > // > LockBox = InternalFindLockBoxByGuid (Guid); > if (LockBox == NULL) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_NOT_FOUND)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_NOT_FOUND)); > return EFI_NOT_FOUND; > } > > @@ -575,9 +575,9 @@ SetLockBoxAttributes ( > ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 0)) || > (((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) != 0) && > ((Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY) != 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_BOX_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_BOX_ATTRIBUTE_RESTORE_IN_S3_ONLY\n\n")); > + DEBUG ((DEBUG_INFO, " can not be set together\n")); > return EFI_INVALID_PARAMETER; > } > > @@ -589,7 +589,7 @@ SetLockBoxAttributes ( > // > // Done > // > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_SUCCESS)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib SetLockBoxAttributes - Exit (%r)\n", EFI_SUCCESS)); > return EFI_SUCCESS; > } > > @@ -620,13 +620,13 @@ UpdateLockBox ( > { > SMM_LOCK_BOX_DATA *LockBox; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Enter\n")); > > // > // Basic check > // > if ((Guid == NULL) || (Buffer == NULL) || (Length == 0)) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > return EFI_INVALID_PARAMETER; > } > > @@ -635,7 +635,7 @@ UpdateLockBox ( > // > LockBox = InternalFindLockBoxByGuid (Guid); > if (LockBox == NULL) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_NOT_FOUND)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_NOT_FOUND)); > return EFI_NOT_FOUND; > } > > @@ -643,7 +643,7 @@ UpdateLockBox ( > // Update data > // > if (LockBox->Length < Offset + Length) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL)); > return EFI_BUFFER_TOO_SMALL; > } > ASSERT ((UINTN)LockBox->SmramBuffer <= (MAX_ADDRESS - Offset)); > @@ -652,7 +652,7 @@ UpdateLockBox ( > // > // Done > // > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_SUCCESS)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib UpdateLockBox - Exit (%r)\n", EFI_SUCCESS)); > return EFI_SUCCESS; > } > > @@ -685,7 +685,7 @@ RestoreLockBox ( > SMM_LOCK_BOX_DATA *LockBox; > VOID *RestoreBuffer; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Enter\n")); > > // > // Restore this, Buffer and Length MUST be both NULL or both non-NULL > @@ -693,7 +693,7 @@ RestoreLockBox ( > if ((Guid == NULL) || > ((Buffer == NULL) && (Length != NULL)) || > ((Buffer != NULL) && (Length == NULL))) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_INVALID_PARAMETER)); > return EFI_INVALID_PARAMETER; > } > > @@ -705,7 +705,7 @@ RestoreLockBox ( > // > // Not found > // > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_NOT_FOUND)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_NOT_FOUND)); > return EFI_NOT_FOUND; > } > > @@ -732,7 +732,7 @@ RestoreLockBox ( > // restore to original buffer > // > if ((LockBox->Attributes & LOCK_BOX_ATTRIBUTE_RESTORE_IN_PLACE) == 0) { > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_WRITE_PROTECTED)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_WRITE_PROTECTED)); > return EFI_WRITE_PROTECTED; > } > RestoreBuffer = (VOID *)(UINTN)LockBox->Buffer; > @@ -747,7 +747,7 @@ RestoreLockBox ( > // Input buffer is too small to hold all data. > // > *Length = (UINTN)LockBox->Length; > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreLockBox - Exit (%r)\n", EFI_BUFFER_TOO_SMALL)); > return EFI_BUFFER_TOO_SMALL; > } > *Length = (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", EFI_SUCCESS)); > return EFI_SUCCESS; > } > > @@ -782,7 +782,7 @@ RestoreAllLockBoxInPlace ( > LIST_ENTRY *Link; > LIST_ENTRY *LockBoxQueue; > > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Enter\n")); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Enter\n")); > > LockBoxQueue = InternalGetLockBoxQueue (); > ASSERT (LockBoxQueue != NULL); > @@ -808,7 +808,7 @@ RestoreAllLockBoxInPlace ( > // > // Done > // > - DEBUG ((EFI_D_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS)); > + DEBUG ((DEBUG_INFO, "SmmLockBoxSmmLib RestoreAllLockBoxInPlace - Exit (%r)\n", EFI_SUCCESS)); > return EFI_SUCCESS; > } > > Reviewed-by: Ray Ni -- Thanks, Ray