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

[mirror_edk2.git] / SecurityPkg / Tcg / TrEEDxe / TrEEDxe.c

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