Fix execution status & DEBUG message level mismatch. EFI_D_ERROR is used only when failure/case can’t be resolved by code.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Dong Guo <guo.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16320 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 8 insertions, 8 deletions

diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
index e098c81..0b2775d 100644
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
@@ -1,7 +1,7 @@
 /** @file

   The implementation of Extended SAL variable services.

 

-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials 

 are licensed and made available under the terms and conditions of the BSD License 

 which accompanies this distribution.  The full text of the license may be found at 

@@ -3244,7 +3244,7 @@ VariableCommonInitialize (
                );

   } else {

     Status = EFI_VOLUME_CORRUPTED;

-    DEBUG((EFI_D_INFO, "Variable Store header is corrupted\n"));

+    DEBUG((EFI_D_ERROR, "Variable Store header is corrupted\n"));

   }

 

 Done:

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
index 41e9b6f..1b625e7 100644
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
@@ -1,7 +1,7 @@
 /** @file

   Measure TrEE required variable.

 

-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -118,8 +118,8 @@ MeasureVariable (
        );

   }

 

-  DEBUG ((EFI_D_ERROR, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));

-  DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));

+  DEBUG ((EFI_D_INFO, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));

+  DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));

 

   Status = TpmMeasureAndLogData (

              7,

@@ -245,7 +245,7 @@ SecureBootHook (
              VariableData,

              VariableDataSize

              );

-  DEBUG ((EFI_D_ERROR, "MeasureBootPolicyVariable - %r\n", Status));

+  DEBUG ((EFI_D_INFO, "MeasureBootPolicyVariable - %r\n", Status));

 

   if (VariableData != NULL) {

     FreePool (VariableData);

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 8b9a8e2..c635614 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -1920,7 +1920,7 @@ DeleteKeyExchangeKey (
   ZeroMem (OldData, KekDataSize);

   while ((KekDataSize > 0) && (KekDataSize >= CertList->SignatureListSize)) {

     CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;

-    DEBUG ((DEBUG_ERROR, "       CertCount = %x\n", CertCount));

+    DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));

     if (CertCount != 0) {

       CopyMem (OldData + Offset, CertList, CertList->SignatureListSize);

       Offset += CertList->SignatureListSize;

@@ -2118,7 +2118,7 @@ DeleteSignature (
   ZeroMem (OldData, ItemDataSize);

   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {

     CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;

-    DEBUG ((DEBUG_ERROR, "       CertCount = %x\n", CertCount));

+    DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));

     if (CertCount != 0) {

       CopyMem (OldData + Offset, (UINT8*)(CertList), CertList->SignatureListSize);

       Offset += CertList->SignatureListSize;