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

2 files changed, 7 insertions, 7 deletions

diff --git a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c b/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
index 516f7c92a3..3706c2c967 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
+++ b/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
@@ -46,7 +46,7 @@ IsDtpmPresent (
     DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm not present\n"));

     return FALSE;

   } else {

-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm present\n"));

+    DEBUG ((EFI_D_INFO, "DetectTpmDevice: Dtpm present\n"));

     return TRUE;

   }

 }

@@ -76,7 +76,7 @@ DetectTpmDevice (
   // In S3, we rely on normal boot Detection, because we save to ReadOnly Variable in normal boot.

   //

   if (BootMode == BOOT_ON_S3_RESUME) {

-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: S3 mode\n"));

+    DEBUG ((EFI_D_INFO, "DetectTpmDevice: S3 mode\n"));

 

     Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariablePpi);

     ASSERT_EFI_ERROR (Status);

@@ -99,7 +99,7 @@ DetectTpmDevice (
     }

   }

 

-  DEBUG ((EFI_D_ERROR, "DetectTpmDevice:\n"));

+  DEBUG ((EFI_D_INFO, "DetectTpmDevice:\n"));

   if (!IsDtpmPresent ()) {

     // dTPM not available

     return TPM_DEVICE_NULL;

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
index 9c1e917ab4..579d096be5 100644
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
@@ -1,7 +1,7 @@
 /** @file

   The module entry point for TrEE configuration module.

 

-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 

@@ -101,11 +101,11 @@ TrEEConfigPeimEntryPoint (
   //

   // Although we have SetupVariable info, we still need detect TPM device manually.

   //

-  DEBUG ((EFI_D_ERROR, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));

+  DEBUG ((EFI_D_INFO, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));

 

   if (PcdGetBool (PcdTpmAutoDetection)) {

     TpmDevice = DetectTpmDevice (TrEEConfiguration.TpmDevice);

-    DEBUG ((EFI_D_ERROR, "TpmDevice final: %x\n", TpmDevice));

+    DEBUG ((EFI_D_INFO, "TpmDevice final: %x\n", TpmDevice));

     if (TpmDevice != TPM_DEVICE_NULL) {

       TrEEConfiguration.TpmDevice = TpmDevice;

     }

@@ -125,7 +125,7 @@ TrEEConfigPeimEntryPoint (
     if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {

       Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);

       PcdSetPtr (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid);

-      DEBUG ((EFI_D_ERROR, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));

+      DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));

       break;

     }

   }