Fix execution status & DEBUG message level mismatch. EFI_D_ERROR is used only...

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

diff --git a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
index 172905169468896047d8b1baa3f57a9e3554f714..142b5469af6fc8909558ef7bc3cb668df595f93d 100644 (file)
--- a/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
+++ b/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implement defer image load services for user identification in UEFI2.2.\r
 \r
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -853,7 +853,7 @@ DxeDeferImageLoadHandler (
     return EFI_SUCCESS;\r
   }\r
  \r
-  DEBUG ((EFI_D_ERROR, "[Security] No user identified, the image is deferred to load!\n"));\r
+  DEBUG ((EFI_D_INFO, "[Security] No user identified, the image is deferred to load!\n"));\r
   PutDefferedImageInfo (File, FileBuffer, FileSize);\r
 \r
   //\r

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c b/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
index 2213423c3328eeba81810f1c77ee42e40223c34b..1dc29895f31af51f9f7acbcf72e6aa68a00a3086 100644 (file)
--- a/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/Measurement.c
@@ -1,7 +1,7 @@
 /** @file\r
   Measure TrEE required variable.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -312,7 +312,7 @@ SecureBootHook (
              Data,\r
              DataSize\r
              );\r
-  DEBUG ((EFI_D_ERROR, "MeasureBootPolicyVariable - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "MeasureBootPolicyVariable - %r\n", Status));\r
 \r
   if (!EFI_ERROR (Status)) {\r
     AddDataMeasured (VariableName, VendorGuid, Data, DataSize);\r

diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
index 8482031e437ead45300c5bd2939906c3374a1d7d..6b6a377b2ddd5516a83872b4354b762c5dc410e5 100644 (file)
--- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
@@ -509,7 +509,7 @@ DxeTpm2MeasureBootHandler (
             // Measure GPT disk.\r
             //\r
             Status = TrEEMeasureGptTable (TreeProtocol, Handle);\r
-            DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler - TrEEMeasureGptTable - %r\n", Status));\r
+            DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - TrEEMeasureGptTable - %r\n", Status));\r
             if (!EFI_ERROR (Status)) {\r
               //\r
               // GPT disk check done.\r
@@ -653,7 +653,7 @@ DxeTpm2MeasureBootHandler (
                ImageContext.ImageType, \r
                DevicePathNode\r
                );\r
-    DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler - TrEEMeasurePeImage - %r\n", Status));\r
+    DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - TrEEMeasurePeImage - %r\n", Status));\r
   }\r
 \r
   //\r
@@ -664,7 +664,7 @@ Finish:
     FreePool (OrigDevicePathNode);\r
   }\r
 \r
-  DEBUG ((EFI_D_ERROR, "DxeTpm2MeasureBootHandler - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - %r\n", Status));\r
 \r
   return Status;\r
 }\r

diff --git a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
index ea9a29c0f0818a2383b6138e3a3920d4ac7ba0b5..89ce436b7ca5d0a14ea2809749f449397e567ea0 100644 (file)
--- a/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
+++ b/SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.c
@@ -91,15 +91,15 @@ TpmCommandClear (
     CopyMem (LocalAuthSession.hmac.buffer, PlatformAuth->buffer, PlatformAuth->size);\r
   }\r
 \r
-  DEBUG ((EFI_D_ERROR, "Tpm2ClearControl ... \n"));\r
+  DEBUG ((EFI_D_INFO, "Tpm2ClearControl ... \n"));\r
   Status = Tpm2ClearControl (TPM_RH_PLATFORM, AuthSession, NO);\r
-  DEBUG ((EFI_D_ERROR, "Tpm2ClearControl - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "Tpm2ClearControl - %r\n", Status));\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
-  DEBUG ((EFI_D_ERROR, "Tpm2Clear ... \n"));\r
+  DEBUG ((EFI_D_INFO, "Tpm2Clear ... \n"));\r
   Status = Tpm2Clear (TPM_RH_PLATFORM, AuthSession);\r
-  DEBUG ((EFI_D_ERROR, "Tpm2Clear - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "Tpm2Clear - %r\n", Status));\r
 \r
 Done:\r
   ZeroMem (&LocalAuthSession.hmac, sizeof(LocalAuthSession.hmac));\r

diff --git a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
index 1e7eb2d77e89308ba5bc75f70eead68bde813a87..5bc8d01ad56028bfcf81b40f86e5b580dfac1c59 100644 (file)
--- a/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
+++ b/SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.c
@@ -3,7 +3,7 @@
   hash handler registerd, such as SHA1, SHA256.\r
   Platform can use PcdTpm2HashMask to mask some hash engines.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved. <BR>\r
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved. <BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -275,7 +275,7 @@ RegisterHashInterfaceLib (
       //\r
       // In PEI phase, there will be shadow driver dispatched again.\r
       //\r
-      DEBUG ((EFI_D_ERROR, "RegisterHashInterfaceLib - Override\n"));\r
+      DEBUG ((EFI_D_INFO, "RegisterHashInterfaceLib - Override\n"));\r
       CopyMem (&HashInterfaceHob->HashInterface[Index], HashInterface, sizeof(*HashInterface));\r
       return EFI_SUCCESS;\r
     }\r

diff --git a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
index a13bf80d622dd94c8bd2a2005faa1ca9584645e2..8e75140123face4c24cbf4a5968a263a8c4d1808 100644 (file)
--- a/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
+++ b/SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterPei.c
@@ -129,7 +129,7 @@ Tpm2RegisterTpm2DeviceLib (
     //\r
     // In PEI phase, there will be shadow driver dispatched again.\r
     //\r
-    DEBUG ((EFI_D_ERROR, "Tpm2RegisterTpm2DeviceLib - Override\n"));\r
+    DEBUG ((EFI_D_INFO, "Tpm2RegisterTpm2DeviceLib - Override\n"));\r
     CopyMem (Tpm2DeviceInterface, Tpm2Device, sizeof(*Tpm2Device));\r
     return EFI_SUCCESS;\r
   } else {\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c b/SecurityPkg/Tcg/TrEEConfig/TpmDetection.c
index 516f7c92a3097787ec3a9c4665db92cf555e3ba9..3706c2c96793c9c3a9934ec448ec04086bf062c2 100644 (file)
--- 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"));\r
     return FALSE;\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: Dtpm present\n"));\r
+    DEBUG ((EFI_D_INFO, "DetectTpmDevice: Dtpm present\n"));\r
     return TRUE;\r
   }\r
 }\r
@@ -76,7 +76,7 @@ DetectTpmDevice (
   // In S3, we rely on normal boot Detection, because we save to ReadOnly Variable in normal boot.\r
   //\r
   if (BootMode == BOOT_ON_S3_RESUME) {\r
-    DEBUG ((EFI_D_ERROR, "DetectTpmDevice: S3 mode\n"));\r
+    DEBUG ((EFI_D_INFO, "DetectTpmDevice: S3 mode\n"));\r
 \r
     Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
     ASSERT_EFI_ERROR (Status);\r
@@ -99,7 +99,7 @@ DetectTpmDevice (
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_ERROR, "DetectTpmDevice:\n"));\r
+  DEBUG ((EFI_D_INFO, "DetectTpmDevice:\n"));\r
   if (!IsDtpmPresent ()) {\r
     // dTPM not available\r
     return TPM_DEVICE_NULL;\r

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
index 9c1e917ab41bc669bae43f542f370d3d0fe2822e..579d096be5e2d97caf9af28b85c12040bcdbea88 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfigPeim.c
@@ -1,7 +1,7 @@
 /** @file\r
   The module entry point for TrEE configuration module.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -101,11 +101,11 @@ TrEEConfigPeimEntryPoint (
   //\r
   // Although we have SetupVariable info, we still need detect TPM device manually.\r
   //\r
-  DEBUG ((EFI_D_ERROR, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));\r
+  DEBUG ((EFI_D_INFO, "TrEEConfiguration.TpmDevice from Setup: %x\n", TrEEConfiguration.TpmDevice));\r
 \r
   if (PcdGetBool (PcdTpmAutoDetection)) {\r
     TpmDevice = DetectTpmDevice (TrEEConfiguration.TpmDevice);\r
-    DEBUG ((EFI_D_ERROR, "TpmDevice final: %x\n", TpmDevice));\r
+    DEBUG ((EFI_D_INFO, "TpmDevice final: %x\n", TpmDevice));\r
     if (TpmDevice != TPM_DEVICE_NULL) {\r
       TrEEConfiguration.TpmDevice = TpmDevice;\r
     }\r
@@ -125,7 +125,7 @@ TrEEConfigPeimEntryPoint (
     if (TpmDevice == mTpmInstanceId[Index].TpmDevice) {\r
       Size = sizeof(mTpmInstanceId[Index].TpmInstanceGuid);\r
       PcdSetPtr (PcdTpmInstanceGuid, &Size, &mTpmInstanceId[Index].TpmInstanceGuid);\r
-      DEBUG ((EFI_D_ERROR, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));\r
+      DEBUG ((EFI_D_INFO, "TpmDevice PCD: %g\n", &mTpmInstanceId[Index].TpmInstanceGuid));\r
       break;\r
     }\r
   }\r

diff --git a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
index 8db0fa0df01ddbe737b0c7c48d4bc8088fd456e5..2f159e0c6b0a63127bf8eaa34388b22163c98596 100644 (file)
--- a/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
+++ b/SecurityPkg/Tcg/TrEEDxe/TrEEDxe.c
@@ -364,7 +364,7 @@ TreeGetCapability (
   IN OUT TREE_BOOT_SERVICE_CAPABILITY *ProtocolCapability\r
   )\r
 {\r
-  DEBUG ((EFI_D_ERROR, "TreeGetCapability ...\n"));\r
+  DEBUG ((EFI_D_INFO, "TreeGetCapability ...\n"));\r
 \r
   if ((This == NULL) || (ProtocolCapability == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -376,7 +376,7 @@ TreeGetCapability (
   }\r
 \r
   CopyMem (ProtocolCapability, &mTcgDxeData.BsCap, mTcgDxeData.BsCap.Size);\r
-  DEBUG ((EFI_D_ERROR, "TreeGetCapability - %r\n", EFI_SUCCESS));\r
+  DEBUG ((EFI_D_INFO, "TreeGetCapability - %r\n", EFI_SUCCESS));\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -451,7 +451,7 @@ TreeGetEventLog (
 {\r
   UINTN  Index;\r
 \r
-  DEBUG ((EFI_D_ERROR, "TreeGetEventLog ...\n"));\r
+  DEBUG ((EFI_D_INFO, "TreeGetEventLog ...\n"));\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -482,7 +482,7 @@ TreeGetEventLog (
 \r
   if (EventLogLocation != NULL) {\r
     *EventLogLocation = mTcgDxeData.EventLogAreaStruct[Index].Lasa;\r
-    DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogLocation - %x)\n", *EventLogLocation));\r
+    DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogLocation - %x)\n", *EventLogLocation));\r
   }\r
 \r
   if (EventLogLastEntry != NULL) {\r
@@ -491,15 +491,15 @@ TreeGetEventLog (
     } else {\r
       *EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)mTcgDxeData.EventLogAreaStruct[Index].LastEvent;\r
     }\r
-    DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogLastEntry - %x)\n", *EventLogLastEntry));\r
+    DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogLastEntry - %x)\n", *EventLogLastEntry));\r
   }\r
 \r
   if (EventLogTruncated != NULL) {\r
     *EventLogTruncated = mTcgDxeData.EventLogAreaStruct[Index].EventLogTruncated;\r
-    DEBUG ((EFI_D_ERROR, "TreeGetEventLog (EventLogTruncated - %x)\n", *EventLogTruncated));\r
+    DEBUG ((EFI_D_INFO, "TreeGetEventLog (EventLogTruncated - %x)\n", *EventLogTruncated));\r
   }\r
 \r
-  DEBUG ((EFI_D_ERROR, "TreeGetEventLog - %r\n", EFI_SUCCESS));\r
+  DEBUG ((EFI_D_INFO, "TreeGetEventLog - %r\n", EFI_SUCCESS));\r
 \r
   // Dump Event Log for debug purpose\r
   if ((EventLogLocation != NULL) && (EventLogLastEntry != NULL)) {\r
@@ -860,7 +860,7 @@ TreeHashLogExtendEvent (
   TCG_PCR_EVENT_HDR  NewEventHdr;\r
   TPML_DIGEST_VALUES DigestList;\r
 \r
-  DEBUG ((EFI_D_ERROR, "TreeHashLogExtendEvent ...\n"));\r
+  DEBUG ((EFI_D_INFO, "TreeHashLogExtendEvent ...\n"));\r
 \r
   if ((This == NULL) || (DataToHash == 0) || (Event == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -902,7 +902,7 @@ TreeHashLogExtendEvent (
                Event->Event\r
                );\r
   }\r
-  DEBUG ((EFI_D_ERROR, "TreeHashLogExtendEvent - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "TreeHashLogExtendEvent - %r\n", Status));\r
   return Status;\r
 }\r
 \r
@@ -932,7 +932,7 @@ TreeSubmitCommand (
 {\r
   EFI_STATUS    Status;\r
 \r
-  DEBUG ((EFI_D_ERROR, "TreeSubmitCommand ...\n"));\r
+  DEBUG ((EFI_D_INFO, "TreeSubmitCommand ...\n"));\r
 \r
   if ((This == NULL) ||\r
       (InputParameterBlockSize == 0) || (InputParameterBlock == NULL) ||\r
@@ -957,7 +957,7 @@ TreeSubmitCommand (
              &OutputParameterBlockSize,\r
              OutputParameterBlock\r
              );\r
-  DEBUG ((EFI_D_ERROR, "TreeSubmitCommand - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "TreeSubmitCommand - %r\n", Status));\r
   return Status;\r
 }\r
 \r
@@ -1178,7 +1178,7 @@ MeasureSeparatorEvent (
   TCG_PCR_EVENT_HDR                 TcgEvent;\r
   UINT32                            EventData;\r
 \r
-  DEBUG ((EFI_D_ERROR, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));\r
+  DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));\r
 \r
   EventData = 0;\r
   TcgEvent.PCRIndex  = PCRIndex;\r
@@ -1223,8 +1223,8 @@ MeasureVariable (
   UINTN                             VarNameLength;\r
   EFI_VARIABLE_DATA_TREE            *VarLog;\r
 \r
-  DEBUG ((EFI_D_ERROR, "TrEEDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)PCRIndex, (UINTN)EventType));\r
-  DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
+  DEBUG ((EFI_D_INFO, "TrEEDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)PCRIndex, (UINTN)EventType));\r
+  DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
 \r
   VarNameLength      = StrLen (VarName);\r
   TcgEvent.PCRIndex  = PCRIndex;\r
@@ -1553,11 +1553,11 @@ MeasureSecureBootPolicy (
 \r
   if (PcdGetBool (PcdFirmwareDebuggerInitialized)) {\r
     Status = MeasureLaunchOfFirmwareDebugger ();\r
-    DEBUG ((EFI_D_ERROR, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));\r
+    DEBUG ((EFI_D_INFO, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));\r
   }\r
 \r
   Status = MeasureAllSecureVariables ();\r
-  DEBUG ((EFI_D_ERROR, "MeasureAllSecureVariables - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "MeasureAllSecureVariables - %r\n", Status));\r
 \r
   //\r
   // We need measure Separator(7) here, because this event must be between SecureBootPolicy (Configure)\r
@@ -1566,7 +1566,7 @@ MeasureSecureBootPolicy (
   // the Authority measurement happen before ReadToBoot event.\r
   //\r
   Status = MeasureSeparatorEvent (7);\r
-  DEBUG ((EFI_D_ERROR, "MeasureSeparatorEvent - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent - %r\n", Status));\r
   return ;\r
 }\r
 \r
@@ -1862,14 +1862,14 @@ DriverEntry (
   //\r
   // Fill information\r
   //\r
-  DEBUG ((EFI_D_ERROR, "TrEE.ProtocolVersion  - %02x.%02x\n", mTcgDxeData.BsCap.ProtocolVersion.Major, mTcgDxeData.BsCap.ProtocolVersion.Minor));\r
-  DEBUG ((EFI_D_ERROR, "TrEE.StructureVersion - %02x.%02x\n", mTcgDxeData.BsCap.StructureVersion.Major, mTcgDxeData.BsCap.StructureVersion.Minor));\r
+  DEBUG ((EFI_D_INFO, "TrEE.ProtocolVersion  - %02x.%02x\n", mTcgDxeData.BsCap.ProtocolVersion.Major, mTcgDxeData.BsCap.ProtocolVersion.Minor));\r
+  DEBUG ((EFI_D_INFO, "TrEE.StructureVersion - %02x.%02x\n", mTcgDxeData.BsCap.StructureVersion.Major, mTcgDxeData.BsCap.StructureVersion.Minor));\r
 \r
   Status = Tpm2GetCapabilityManufactureID (&mTcgDxeData.BsCap.ManufacturerID);\r
   if (EFI_ERROR (Status)) {\r
     DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityManufactureID fail!\n"));\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityManufactureID - %08x\n", mTcgDxeData.BsCap.ManufacturerID));\r
+    DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityManufactureID - %08x\n", mTcgDxeData.BsCap.ManufacturerID));\r
   }\r
 \r
   DEBUG_CODE (\r
@@ -1880,7 +1880,7 @@ DriverEntry (
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityFirmwareVersion fail!\n"));\r
     } else {\r
-      DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n", FirmwareVersion1, FirmwareVersion2));\r
+      DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n", FirmwareVersion1, FirmwareVersion2));\r
     }\r
   );\r
 \r
@@ -1890,7 +1890,7 @@ DriverEntry (
   } else {\r
     mTcgDxeData.BsCap.MaxCommandSize  = (UINT16)MaxCommandSize;\r
     mTcgDxeData.BsCap.MaxResponseSize = (UINT16)MaxResponseSize;\r
-    DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityMaxCommandResponseSize - %08x, %08x\n", MaxCommandSize, MaxResponseSize));\r
+    DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityMaxCommandResponseSize - %08x, %08x\n", MaxCommandSize, MaxResponseSize));\r
   }\r
 \r
   Status = Tpm2GetCapabilityPcrs (&Pcrs);\r
@@ -1898,10 +1898,10 @@ DriverEntry (
     DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityPcrs fail!\n"));\r
     TpmHashAlgorithmBitmap = TREE_BOOT_HASH_ALG_SHA1;\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityPcrs Count - %08x\n", Pcrs.count));\r
+    DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityPcrs Count - %08x\n", Pcrs.count));\r
     TpmHashAlgorithmBitmap = 0;\r
     for (Index = 0; Index < Pcrs.count; Index++) {\r
-      DEBUG ((EFI_D_ERROR, "hash - %x\n", Pcrs.pcrSelections[Index].hash));\r
+      DEBUG ((EFI_D_INFO, "hash - %x\n", Pcrs.pcrSelections[Index].hash));\r
       switch (Pcrs.pcrSelections[Index].hash) {\r
       case TPM_ALG_SHA1:\r
         TpmHashAlgorithmBitmap |= TREE_BOOT_HASH_ALG_SHA1;\r
@@ -1921,11 +1921,11 @@ DriverEntry (
       }\r
     }\r
   }\r
-  DEBUG ((EFI_D_ERROR, "TPM.HashAlgorithmBitmap - 0x%08x\n", TpmHashAlgorithmBitmap));\r
+  DEBUG ((EFI_D_INFO, "TPM.HashAlgorithmBitmap - 0x%08x\n", TpmHashAlgorithmBitmap));\r
 \r
-  DEBUG ((EFI_D_ERROR, "TrEE.SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
+  DEBUG ((EFI_D_INFO, "TrEE.SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
   mTcgDxeData.BsCap.HashAlgorithmBitmap = TpmHashAlgorithmBitmap;\r
-  DEBUG ((EFI_D_ERROR, "TrEE.HashAlgorithmBitmap - 0x%08x\n", mTcgDxeData.BsCap.HashAlgorithmBitmap));\r
+  DEBUG ((EFI_D_INFO, "TrEE.HashAlgorithmBitmap - 0x%08x\n", mTcgDxeData.BsCap.HashAlgorithmBitmap));\r
 \r
   if (mTcgDxeData.BsCap.TrEEPresentFlag) {\r
     //\r
@@ -1982,7 +1982,7 @@ DriverEntry (
   // Install TrEEProtocol\r
   //\r
   Status = InstallTrEE ();\r
-  DEBUG ((EFI_D_ERROR, "InstallTrEE - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "InstallTrEE - %r\n", Status));\r
 \r
   return Status;\r
 }\r

diff --git a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
index e098c81df31f80f49e549b04cb68ad0a9cbe8407..0b2775dac89b0df303937ae2b391a041cb3e7593 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
+++ b/SecurityPkg/VariableAuthenticated/EsalVariableDxeSal/Variable.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of Extended SAL variable services.\r
 \r
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -3244,7 +3244,7 @@ VariableCommonInitialize (
                );\r
   } else {\r
     Status = EFI_VOLUME_CORRUPTED;\r
-    DEBUG((EFI_D_INFO, "Variable Store header is corrupted\n"));\r
+    DEBUG((EFI_D_ERROR, "Variable Store header is corrupted\n"));\r
   }\r
 \r
 Done:\r

diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
index 41e9b6f5e0200a23354afd1ca4691f09534a1e3d..1b625e74692ac35a15f9010d7ac769172126614f 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Measurement.c
@@ -1,7 +1,7 @@
 /** @file\r
   Measure TrEE required variable.\r
 \r
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -118,8 +118,8 @@ MeasureVariable (
        );\r
   }\r
 \r
-  DEBUG ((EFI_D_ERROR, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));\r
-  DEBUG ((EFI_D_ERROR, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
+  DEBUG ((EFI_D_INFO, "AuthVariableDxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)7, (UINTN)EV_EFI_VARIABLE_AUTHORITY));\r
+  DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
 \r
   Status = TpmMeasureAndLogData (\r
              7,\r
@@ -245,7 +245,7 @@ SecureBootHook (
              VariableData,\r
              VariableDataSize\r
              );\r
-  DEBUG ((EFI_D_ERROR, "MeasureBootPolicyVariable - %r\n", Status));\r
+  DEBUG ((EFI_D_INFO, "MeasureBootPolicyVariable - %r\n", Status));\r
 \r
   if (VariableData != NULL) {\r
     FreePool (VariableData);\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 8b9a8e26a3a238cb482b1a67ebc0bbad881033ba..c6356143bc66721ed7c5fd1ef1b687d4a799194a 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -1920,7 +1920,7 @@ DeleteKeyExchangeKey (
   ZeroMem (OldData, KekDataSize);\r
   while ((KekDataSize > 0) && (KekDataSize >= CertList->SignatureListSize)) {\r
     CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
-    DEBUG ((DEBUG_ERROR, "       CertCount = %x\n", CertCount));\r
+    DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));\r
     if (CertCount != 0) {\r
       CopyMem (OldData + Offset, CertList, CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r
@@ -2118,7 +2118,7 @@ DeleteSignature (
   ZeroMem (OldData, ItemDataSize);\r
   while ((ItemDataSize > 0) && (ItemDataSize >= CertList->SignatureListSize)) {\r
     CertCount  = (CertList->SignatureListSize - sizeof (EFI_SIGNATURE_LIST) - CertList->SignatureHeaderSize) / CertList->SignatureSize;\r
-    DEBUG ((DEBUG_ERROR, "       CertCount = %x\n", CertCount));\r
+    DEBUG ((DEBUG_INFO, "       CertCount = %x\n", CertCount));\r
     if (CertCount != 0) {\r
       CopyMem (OldData + Offset, (UINT8*)(CertList), CertList->SignatureListSize);\r
       Offset += CertList->SignatureListSize;\r