]> git.proxmox.com Git - mirror_edk2.git/blobdiff - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SecurityPkg: Change use of EFI_D_* to DEBUG_*
[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Dxe / Tcg2Dxe.c
diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index 6d17616c1ce4236509dbf76f3a0d1a2bea60d1cb..02320bec9804640bd3cf96dc0c93eabe847332cf 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -158,7 +158,7 @@ InternalDumpData (
 {\r
   UINTN  Index;\r
   for (Index = 0; Index < Size; Index++) {\r
-    DEBUG ((EFI_D_INFO, "%02x", (UINTN)Data[Index]));\r
+    DEBUG ((DEBUG_INFO, "%02x", (UINTN)Data[Index]));\r
   }\r
 }\r
 \r
@@ -261,15 +261,15 @@ InternalDumpHex (
   Count = Size / COLUME_SIZE;\r
   Left  = Size % COLUME_SIZE;\r
   for (Index = 0; Index < Count; Index++) {\r
-    DEBUG ((EFI_D_INFO, "%04x: ", Index * COLUME_SIZE));\r
+    DEBUG ((DEBUG_INFO, "%04x: ", Index * COLUME_SIZE));\r
     InternalDumpData (Data + Index * COLUME_SIZE, COLUME_SIZE);\r
-    DEBUG ((EFI_D_INFO, "\n"));\r
+    DEBUG ((DEBUG_INFO, "\n"));\r
   }\r
 \r
   if (Left != 0) {\r
-    DEBUG ((EFI_D_INFO, "%04x: ", Index * COLUME_SIZE));\r
+    DEBUG ((DEBUG_INFO, "%04x: ", Index * COLUME_SIZE));\r
     InternalDumpData (Data + Index * COLUME_SIZE, Left);\r
-    DEBUG ((EFI_D_INFO, "\n"));\r
+    DEBUG ((DEBUG_INFO, "\n"));\r
   }\r
 }\r
 \r
@@ -402,7 +402,7 @@ Tcg2GetCapability (
         ProtocolCapability->StructureVersion.Minor = 0;\r
         ProtocolCapability->ProtocolVersion.Major = 1;\r
         ProtocolCapability->ProtocolVersion.Minor = 0;\r
-        DEBUG ((EFI_D_ERROR, "TreeGetCapability (Compatible) - %r\n", EFI_SUCCESS));\r
+        DEBUG ((DEBUG_ERROR, "TreeGetCapability (Compatible) - %r\n", EFI_SUCCESS));\r
         return EFI_SUCCESS;\r
       }\r
     }\r
@@ -427,15 +427,15 @@ DumpEvent (
 {\r
   UINTN                     Index;\r
 \r
-  DEBUG ((EFI_D_INFO, "  Event:\n"));\r
-  DEBUG ((EFI_D_INFO, "    PCRIndex  - %d\n", EventHdr->PCRIndex));\r
-  DEBUG ((EFI_D_INFO, "    EventType - 0x%08x\n", EventHdr->EventType));\r
-  DEBUG ((EFI_D_INFO, "    Digest    - "));\r
+  DEBUG ((DEBUG_INFO, "  Event:\n"));\r
+  DEBUG ((DEBUG_INFO, "    PCRIndex  - %d\n", EventHdr->PCRIndex));\r
+  DEBUG ((DEBUG_INFO, "    EventType - 0x%08x\n", EventHdr->EventType));\r
+  DEBUG ((DEBUG_INFO, "    Digest    - "));\r
   for (Index = 0; Index < sizeof(TCG_DIGEST); Index++) {\r
-    DEBUG ((EFI_D_INFO, "%02x ", EventHdr->Digest.digest[Index]));\r
+    DEBUG ((DEBUG_INFO, "%02x ", EventHdr->Digest.digest[Index]));\r
   }\r
-  DEBUG ((EFI_D_INFO, "\n"));\r
-  DEBUG ((EFI_D_INFO, "    EventSize - 0x%08x\n", EventHdr->EventSize));\r
+  DEBUG ((DEBUG_INFO, "\n"));\r
+  DEBUG ((DEBUG_INFO, "    EventSize - 0x%08x\n", EventHdr->EventSize));\r
   InternalDumpHex ((UINT8 *)(EventHdr + 1), EventHdr->EventSize);\r
 }\r
 \r
@@ -455,33 +455,33 @@ DumpTcgEfiSpecIdEventStruct (
   UINT8                            *VendorInfo;\r
   UINT32                           NumberOfAlgorithms;\r
 \r
-  DEBUG ((EFI_D_INFO, "  TCG_EfiSpecIDEventStruct:\n"));\r
-  DEBUG ((EFI_D_INFO, "    signature          - '"));\r
+  DEBUG ((DEBUG_INFO, "  TCG_EfiSpecIDEventStruct:\n"));\r
+  DEBUG ((DEBUG_INFO, "    signature          - '"));\r
   for (Index = 0; Index < sizeof(TcgEfiSpecIdEventStruct->signature); Index++) {\r
-    DEBUG ((EFI_D_INFO, "%c", TcgEfiSpecIdEventStruct->signature[Index]));\r
+    DEBUG ((DEBUG_INFO, "%c", TcgEfiSpecIdEventStruct->signature[Index]));\r
   }\r
-  DEBUG ((EFI_D_INFO, "'\n"));\r
-  DEBUG ((EFI_D_INFO, "    platformClass      - 0x%08x\n", TcgEfiSpecIdEventStruct->platformClass));\r
-  DEBUG ((EFI_D_INFO, "    specVersion        - %d.%d%d\n", TcgEfiSpecIdEventStruct->specVersionMajor, TcgEfiSpecIdEventStruct->specVersionMinor, TcgEfiSpecIdEventStruct->specErrata));\r
-  DEBUG ((EFI_D_INFO, "    uintnSize          - 0x%02x\n", TcgEfiSpecIdEventStruct->uintnSize));\r
+  DEBUG ((DEBUG_INFO, "'\n"));\r
+  DEBUG ((DEBUG_INFO, "    platformClass      - 0x%08x\n", TcgEfiSpecIdEventStruct->platformClass));\r
+  DEBUG ((DEBUG_INFO, "    specVersion        - %d.%d%d\n", TcgEfiSpecIdEventStruct->specVersionMajor, TcgEfiSpecIdEventStruct->specVersionMinor, TcgEfiSpecIdEventStruct->specErrata));\r
+  DEBUG ((DEBUG_INFO, "    uintnSize          - 0x%02x\n", TcgEfiSpecIdEventStruct->uintnSize));\r
 \r
   CopyMem (&NumberOfAlgorithms, TcgEfiSpecIdEventStruct + 1, sizeof(NumberOfAlgorithms));\r
-  DEBUG ((EFI_D_INFO, "    NumberOfAlgorithms - 0x%08x\n", NumberOfAlgorithms));\r
+  DEBUG ((DEBUG_INFO, "    NumberOfAlgorithms - 0x%08x\n", NumberOfAlgorithms));\r
 \r
   DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));\r
   for (Index = 0; Index < NumberOfAlgorithms; Index++) {\r
-    DEBUG ((EFI_D_INFO, "    digest(%d)\n", Index));\r
-    DEBUG ((EFI_D_INFO, "      algorithmId      - 0x%04x\n", DigestSize[Index].algorithmId));\r
-    DEBUG ((EFI_D_INFO, "      digestSize       - 0x%04x\n", DigestSize[Index].digestSize));\r
+    DEBUG ((DEBUG_INFO, "    digest(%d)\n", Index));\r
+    DEBUG ((DEBUG_INFO, "      algorithmId      - 0x%04x\n", DigestSize[Index].algorithmId));\r
+    DEBUG ((DEBUG_INFO, "      digestSize       - 0x%04x\n", DigestSize[Index].digestSize));\r
   }\r
   VendorInfoSize = (UINT8 *)&DigestSize[NumberOfAlgorithms];\r
-  DEBUG ((EFI_D_INFO, "    VendorInfoSize     - 0x%02x\n", *VendorInfoSize));\r
+  DEBUG ((DEBUG_INFO, "    VendorInfoSize     - 0x%02x\n", *VendorInfoSize));\r
   VendorInfo = VendorInfoSize + 1;\r
-  DEBUG ((EFI_D_INFO, "    VendorInfo         - "));\r
+  DEBUG ((DEBUG_INFO, "    VendorInfo         - "));\r
   for (Index = 0; Index < *VendorInfoSize; Index++) {\r
-    DEBUG ((EFI_D_INFO, "%02x ", VendorInfo[Index]));\r
+    DEBUG ((DEBUG_INFO, "%02x ", VendorInfo[Index]));\r
   }\r
-  DEBUG ((EFI_D_INFO, "\n"));\r
+  DEBUG ((DEBUG_INFO, "\n"));\r
 }\r
 \r
 /**\r
@@ -524,34 +524,34 @@ DumpEvent2 (
   UINT32                    EventSize;\r
   UINT8                     *EventBuffer;\r
 \r
-  DEBUG ((EFI_D_INFO, "  Event:\n"));\r
-  DEBUG ((EFI_D_INFO, "    PCRIndex  - %d\n", TcgPcrEvent2->PCRIndex));\r
-  DEBUG ((EFI_D_INFO, "    EventType - 0x%08x\n", TcgPcrEvent2->EventType));\r
+  DEBUG ((DEBUG_INFO, "  Event:\n"));\r
+  DEBUG ((DEBUG_INFO, "    PCRIndex  - %d\n", TcgPcrEvent2->PCRIndex));\r
+  DEBUG ((DEBUG_INFO, "    EventType - 0x%08x\n", TcgPcrEvent2->EventType));\r
 \r
-  DEBUG ((EFI_D_INFO, "    DigestCount: 0x%08x\n", TcgPcrEvent2->Digest.count));\r
+  DEBUG ((DEBUG_INFO, "    DigestCount: 0x%08x\n", TcgPcrEvent2->Digest.count));\r
 \r
   DigestCount = TcgPcrEvent2->Digest.count;\r
   HashAlgo = TcgPcrEvent2->Digest.digests[0].hashAlg;\r
   DigestBuffer = (UINT8 *)&TcgPcrEvent2->Digest.digests[0].digest;\r
   for (DigestIndex = 0; DigestIndex < DigestCount; DigestIndex++) {\r
-    DEBUG ((EFI_D_INFO, "      HashAlgo : 0x%04x\n", HashAlgo));\r
-    DEBUG ((EFI_D_INFO, "      Digest(%d): ", DigestIndex));\r
+    DEBUG ((DEBUG_INFO, "      HashAlgo : 0x%04x\n", HashAlgo));\r
+    DEBUG ((DEBUG_INFO, "      Digest(%d): ", DigestIndex));\r
     DigestSize = GetHashSizeFromAlgo (HashAlgo);\r
     for (Index = 0; Index < DigestSize; Index++) {\r
-      DEBUG ((EFI_D_INFO, "%02x ", DigestBuffer[Index]));\r
+      DEBUG ((DEBUG_INFO, "%02x ", DigestBuffer[Index]));\r
     }\r
-    DEBUG ((EFI_D_INFO, "\n"));\r
+    DEBUG ((DEBUG_INFO, "\n"));\r
     //\r
     // Prepare next\r
     //\r
     CopyMem (&HashAlgo, DigestBuffer + DigestSize, sizeof(TPMI_ALG_HASH));\r
     DigestBuffer = DigestBuffer + DigestSize + sizeof(TPMI_ALG_HASH);\r
   }\r
-  DEBUG ((EFI_D_INFO, "\n"));\r
+  DEBUG ((DEBUG_INFO, "\n"));\r
   DigestBuffer = DigestBuffer - sizeof(TPMI_ALG_HASH);\r
 \r
   CopyMem (&EventSize, DigestBuffer, sizeof(TcgPcrEvent2->EventSize));\r
-  DEBUG ((EFI_D_INFO, "    EventSize - 0x%08x\n", EventSize));\r
+  DEBUG ((DEBUG_INFO, "    EventSize - 0x%08x\n", EventSize));\r
   EventBuffer = DigestBuffer + sizeof(TcgPcrEvent2->EventSize);\r
   InternalDumpHex (EventBuffer, EventSize);\r
 }\r
@@ -617,7 +617,7 @@ DumpEventLog (
   TCG_EfiSpecIDEventStruct  *TcgEfiSpecIdEventStruct;\r
   UINTN                     NumberOfEvents;\r
 \r
-  DEBUG ((EFI_D_INFO, "EventLogFormat: (0x%x)\n", EventLogFormat));\r
+  DEBUG ((DEBUG_INFO, "EventLogFormat: (0x%x)\n", EventLogFormat));\r
 \r
   switch (EventLogFormat) {\r
   case EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2:\r
@@ -627,11 +627,11 @@ DumpEventLog (
       EventHdr = (TCG_PCR_EVENT_HDR *)((UINTN)EventHdr + sizeof(TCG_PCR_EVENT_HDR) + EventHdr->EventSize);\r
     }\r
     if (FinalEventsTable == NULL) {\r
-      DEBUG ((EFI_D_INFO, "FinalEventsTable: NOT FOUND\n"));\r
+      DEBUG ((DEBUG_INFO, "FinalEventsTable: NOT FOUND\n"));\r
     } else {\r
-      DEBUG ((EFI_D_INFO, "FinalEventsTable:    (0x%x)\n", FinalEventsTable));\r
-      DEBUG ((EFI_D_INFO, "  Version:           (0x%x)\n", FinalEventsTable->Version));\r
-      DEBUG ((EFI_D_INFO, "  NumberOfEvents:    (0x%x)\n", FinalEventsTable->NumberOfEvents));\r
+      DEBUG ((DEBUG_INFO, "FinalEventsTable:    (0x%x)\n", FinalEventsTable));\r
+      DEBUG ((DEBUG_INFO, "  Version:           (0x%x)\n", FinalEventsTable->Version));\r
+      DEBUG ((DEBUG_INFO, "  NumberOfEvents:    (0x%x)\n", FinalEventsTable->NumberOfEvents));\r
 \r
       EventHdr = (TCG_PCR_EVENT_HDR *)(UINTN)(FinalEventsTable + 1);\r
       for (NumberOfEvents = 0; NumberOfEvents < FinalEventsTable->NumberOfEvents; NumberOfEvents++) {\r
@@ -657,11 +657,11 @@ DumpEventLog (
     }\r
 \r
     if (FinalEventsTable == NULL) {\r
-      DEBUG ((EFI_D_INFO, "FinalEventsTable: NOT FOUND\n"));\r
+      DEBUG ((DEBUG_INFO, "FinalEventsTable: NOT FOUND\n"));\r
     } else {\r
-      DEBUG ((EFI_D_INFO, "FinalEventsTable:    (0x%x)\n", FinalEventsTable));\r
-      DEBUG ((EFI_D_INFO, "  Version:           (0x%x)\n", FinalEventsTable->Version));\r
-      DEBUG ((EFI_D_INFO, "  NumberOfEvents:    (0x%x)\n", FinalEventsTable->NumberOfEvents));\r
+      DEBUG ((DEBUG_INFO, "FinalEventsTable:    (0x%x)\n", FinalEventsTable));\r
+      DEBUG ((DEBUG_INFO, "  Version:           (0x%x)\n", FinalEventsTable->Version));\r
+      DEBUG ((DEBUG_INFO, "  NumberOfEvents:    (0x%x)\n", FinalEventsTable->NumberOfEvents));\r
 \r
       TcgPcrEvent2 = (TCG_PCR_EVENT2 *)(UINTN)(FinalEventsTable + 1);\r
       for (NumberOfEvents = 0; NumberOfEvents < FinalEventsTable->NumberOfEvents; NumberOfEvents++) {\r
@@ -704,7 +704,7 @@ Tcg2GetEventLog (
 {\r
   UINTN  Index;\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2GetEventLog ... (0x%x)\n", EventLogFormat));\r
+  DEBUG ((DEBUG_INFO, "Tcg2GetEventLog ... (0x%x)\n", EventLogFormat));\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -739,7 +739,7 @@ Tcg2GetEventLog (
 \r
   if (EventLogLocation != NULL) {\r
     *EventLogLocation = mTcgDxeData.EventLogAreaStruct[Index].Lasa;\r
-    DEBUG ((EFI_D_INFO, "Tcg2GetEventLog (EventLogLocation - %x)\n", *EventLogLocation));\r
+    DEBUG ((DEBUG_INFO, "Tcg2GetEventLog (EventLogLocation - %x)\n", *EventLogLocation));\r
   }\r
 \r
   if (EventLogLastEntry != NULL) {\r
@@ -748,15 +748,15 @@ Tcg2GetEventLog (
     } else {\r
       *EventLogLastEntry = (EFI_PHYSICAL_ADDRESS)(UINTN)mTcgDxeData.EventLogAreaStruct[Index].LastEvent;\r
     }\r
-    DEBUG ((EFI_D_INFO, "Tcg2GetEventLog (EventLogLastEntry - %x)\n", *EventLogLastEntry));\r
+    DEBUG ((DEBUG_INFO, "Tcg2GetEventLog (EventLogLastEntry - %x)\n", *EventLogLastEntry));\r
   }\r
 \r
   if (EventLogTruncated != NULL) {\r
     *EventLogTruncated = mTcgDxeData.EventLogAreaStruct[Index].EventLogTruncated;\r
-    DEBUG ((EFI_D_INFO, "Tcg2GetEventLog (EventLogTruncated - %x)\n", *EventLogTruncated));\r
+    DEBUG ((DEBUG_INFO, "Tcg2GetEventLog (EventLogTruncated - %x)\n", *EventLogTruncated));\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2GetEventLog - %r\n", EFI_SUCCESS));\r
+  DEBUG ((DEBUG_INFO, "Tcg2GetEventLog - %r\n", EFI_SUCCESS));\r
 \r
   // Dump Event Log for debug purpose\r
   if ((EventLogLocation != NULL) && (EventLogLastEntry != NULL)) {\r
@@ -979,8 +979,8 @@ TcgDxeLogEvent (
       // Increase the NumberOfEvents in FinalEventsTable\r
       //\r
       (mTcgDxeData.FinalEventsTable[Index])->NumberOfEvents ++;\r
-      DEBUG ((EFI_D_INFO, "FinalEventsTable->NumberOfEvents - 0x%x\n", (mTcgDxeData.FinalEventsTable[Index])->NumberOfEvents));\r
-      DEBUG ((EFI_D_INFO, "  Size - 0x%x\n", (UINTN)EventLogAreaStruct->EventLogSize));\r
+      DEBUG ((DEBUG_INFO, "FinalEventsTable->NumberOfEvents - 0x%x\n", (mTcgDxeData.FinalEventsTable[Index])->NumberOfEvents));\r
+      DEBUG ((DEBUG_INFO, "  Size - 0x%x\n", (UINTN)EventLogAreaStruct->EventLogSize));\r
     }\r
   }\r
 \r
@@ -1100,12 +1100,12 @@ TcgDxeLogHashEvent (
   UINT8                             *DigestBuffer;\r
   UINT32                            *EventSizePtr;\r
 \r
-  DEBUG ((EFI_D_INFO, "SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
+  DEBUG ((DEBUG_INFO, "SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
 \r
   RetStatus = EFI_SUCCESS;\r
   for (Index = 0; Index < sizeof(mTcg2EventInfo)/sizeof(mTcg2EventInfo[0]); Index++) {\r
     if ((mTcgDxeData.BsCap.SupportedEventLogs & mTcg2EventInfo[Index].LogFormat) != 0) {\r
-      DEBUG ((EFI_D_INFO, "  LogFormat - 0x%08x\n", mTcg2EventInfo[Index].LogFormat));\r
+      DEBUG ((DEBUG_INFO, "  LogFormat - 0x%08x\n", mTcg2EventInfo[Index].LogFormat));\r
       switch (mTcg2EventInfo[Index].LogFormat) {\r
       case EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2:\r
         Status = GetDigestFromDigestList (TPM_ALG_SHA1, DigestList, &NewEventHdr->Digest);\r
@@ -1223,7 +1223,7 @@ TcgDxeHashLogExtendEvent (
   }\r
 \r
   if (Status == EFI_DEVICE_ERROR) {\r
-    DEBUG ((EFI_D_ERROR, "TcgDxeHashLogExtendEvent - %r. Disable TPM.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "TcgDxeHashLogExtendEvent - %r. Disable TPM.\n", Status));\r
     mTcgDxeData.BsCap.TPMPresentFlag = FALSE;\r
     REPORT_STATUS_CODE (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
@@ -1307,7 +1307,7 @@ Tcg2HashLogExtendEvent (
       }\r
     }\r
     if (Status == EFI_DEVICE_ERROR) {\r
-      DEBUG ((EFI_D_ERROR, "MeasurePeImageAndExtend - %r. Disable TPM.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "MeasurePeImageAndExtend - %r. Disable TPM.\n", Status));\r
       mTcgDxeData.BsCap.TPMPresentFlag = FALSE;\r
       REPORT_STATUS_CODE (\r
         EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
@@ -1353,7 +1353,7 @@ Tcg2SubmitCommand (
 {\r
   EFI_STATUS    Status;\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2SubmitCommand ...\n"));\r
+  DEBUG ((DEBUG_INFO, "Tcg2SubmitCommand ...\n"));\r
 \r
   if ((This == NULL) ||\r
       (InputParameterBlockSize == 0) || (InputParameterBlock == NULL) ||\r
@@ -1378,7 +1378,7 @@ Tcg2SubmitCommand (
              &OutputParameterBlockSize,\r
              OutputParameterBlock\r
              );\r
-  DEBUG ((EFI_D_INFO, "Tcg2SubmitCommand - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "Tcg2SubmitCommand - %r\n", Status));\r
   return Status;\r
 }\r
 \r
@@ -1424,7 +1424,7 @@ Tcg2SetActivePCRBanks (
   EFI_STATUS  Status;\r
   UINT32      ReturnCode;\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2SetActivePCRBanks ... (0x%x)\n", ActivePcrBanks));\r
+  DEBUG ((DEBUG_INFO, "Tcg2SetActivePCRBanks ... (0x%x)\n", ActivePcrBanks));\r
 \r
   if (ActivePcrBanks == 0) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1451,7 +1451,7 @@ Tcg2SetActivePCRBanks (
     Status = EFI_DEVICE_ERROR;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2SetActivePCRBanks - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "Tcg2SetActivePCRBanks - %r\n", Status));\r
 \r
   return Status;\r
 }\r
@@ -1532,7 +1532,7 @@ SetupEventLog (
   UINT32                          NumberOfAlgorithms;\r
   TCG_EfiStartupLocalityEvent     StartupLocalityEvent;\r
 \r
-  DEBUG ((EFI_D_INFO, "SetupEventLog\n"));\r
+  DEBUG ((DEBUG_INFO, "SetupEventLog\n"));\r
 \r
   //\r
   // 1. Create Log Area\r
@@ -1939,7 +1939,7 @@ MeasureSeparatorEvent (
   TCG_PCR_EVENT_HDR                 TcgEvent;\r
   UINT32                            EventData;\r
 \r
-  DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));\r
+  DEBUG ((DEBUG_INFO, "MeasureSeparatorEvent Pcr - %x\n", PCRIndex));\r
 \r
   EventData = 0;\r
   TcgEvent.PCRIndex  = PCRIndex;\r
@@ -1984,8 +1984,8 @@ MeasureVariable (
   UINTN                             VarNameLength;\r
   UEFI_VARIABLE_DATA                *VarLog;\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2Dxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)PCRIndex, (UINTN)EventType));\r
-  DEBUG ((EFI_D_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
+  DEBUG ((DEBUG_INFO, "Tcg2Dxe: MeasureVariable (Pcr - %x, EventType - %x, ", (UINTN)PCRIndex, (UINTN)EventType));\r
+  DEBUG ((DEBUG_INFO, "VariableName - %s, VendorGuid - %g)\n", VarName, VendorGuid));\r
 \r
   VarNameLength      = StrLen (VarName);\r
   TcgEvent.PCRIndex  = PCRIndex;\r
@@ -2335,11 +2335,11 @@ MeasureSecureBootPolicy (
 \r
   if (PcdGetBool (PcdFirmwareDebuggerInitialized)) {\r
     Status = MeasureLaunchOfFirmwareDebugger ();\r
-    DEBUG ((EFI_D_INFO, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));\r
+    DEBUG ((DEBUG_INFO, "MeasureLaunchOfFirmwareDebugger - %r\n", Status));\r
   }\r
 \r
   Status = MeasureAllSecureVariables ();\r
-  DEBUG ((EFI_D_INFO, "MeasureAllSecureVariables - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "MeasureAllSecureVariables - %r\n", Status));\r
 \r
   //\r
   // We need measure Separator(7) here, because this event must be between SecureBootPolicy (Configure)\r
@@ -2348,7 +2348,7 @@ MeasureSecureBootPolicy (
   // the Authority measurement happen before ReadToBoot event.\r
   //\r
   Status = MeasureSeparatorEvent (7);\r
-  DEBUG ((EFI_D_INFO, "MeasureSeparatorEvent - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "MeasureSeparatorEvent - %r\n", Status));\r
   return ;\r
 }\r
 \r
@@ -2379,7 +2379,7 @@ OnReadyToBoot (
     //\r
     Status = MeasureHandoffTables ();\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "HOBs not Measured. Error!\n"));\r
+      DEBUG ((DEBUG_ERROR, "HOBs not Measured. Error!\n"));\r
     }\r
 \r
     //\r
@@ -2387,7 +2387,7 @@ OnReadyToBoot (
     //\r
     Status = MeasureAllBootVariables ();\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Boot Variables not Measured. Error!\n"));\r
+      DEBUG ((DEBUG_ERROR, "Boot Variables not Measured. Error!\n"));\r
     }\r
 \r
     //\r
@@ -2398,7 +2398,7 @@ OnReadyToBoot (
                EFI_CALLING_EFI_APPLICATION\r
                );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));\r
+      DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));\r
     }\r
 \r
     //\r
@@ -2432,7 +2432,7 @@ OnReadyToBoot (
                EFI_RETURNING_FROM_EFI_APPLICATION\r
                );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));\r
+      DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));\r
     }\r
 \r
     //\r
@@ -2444,11 +2444,11 @@ OnReadyToBoot (
                EFI_CALLING_EFI_APPLICATION\r
                );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));\r
+      DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_CALLING_EFI_APPLICATION));\r
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "TPM2 Tcg2Dxe Measure Data when ReadyToBoot\n"));\r
+  DEBUG ((DEBUG_INFO, "TPM2 Tcg2Dxe Measure Data when ReadyToBoot\n"));\r
   //\r
   // Increase boot attempt counter.\r
   //\r
@@ -2482,7 +2482,7 @@ OnExitBootServices (
              EFI_EXIT_BOOT_SERVICES_INVOCATION\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_INVOCATION));\r
+    DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_INVOCATION));\r
   }\r
 \r
   //\r
@@ -2493,7 +2493,7 @@ OnExitBootServices (
              EFI_EXIT_BOOT_SERVICES_SUCCEEDED\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_SUCCEEDED));\r
+    DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_SUCCEEDED));\r
   }\r
 }\r
 \r
@@ -2523,7 +2523,7 @@ OnExitBootServicesFailed (
              EFI_EXIT_BOOT_SERVICES_FAILED\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_FAILED));\r
+    DEBUG ((DEBUG_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_FAILED));\r
   }\r
 \r
 }\r
@@ -2646,13 +2646,13 @@ DriverEntry (
   }\r
 \r
   if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {\r
-    DEBUG ((EFI_D_ERROR, "TPM2 error!\n"));\r
+    DEBUG ((DEBUG_ERROR, "TPM2 error!\n"));\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
   Status = Tpm2RequestUseTpm ();\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "TPM2 not detected!\n"));\r
+    DEBUG ((DEBUG_ERROR, "TPM2 not detected!\n"));\r
     return Status;\r
   }\r
 \r
@@ -2667,14 +2667,14 @@ DriverEntry (
   mTcgDxeData.BsCap.StructureVersion.Major = 1;\r
   mTcgDxeData.BsCap.StructureVersion.Minor = 1;\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2.ProtocolVersion  - %02x.%02x\n", mTcgDxeData.BsCap.ProtocolVersion.Major, mTcgDxeData.BsCap.ProtocolVersion.Minor));\r
-  DEBUG ((EFI_D_INFO, "Tcg2.StructureVersion - %02x.%02x\n", mTcgDxeData.BsCap.StructureVersion.Major, mTcgDxeData.BsCap.StructureVersion.Minor));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.ProtocolVersion  - %02x.%02x\n", mTcgDxeData.BsCap.ProtocolVersion.Major, mTcgDxeData.BsCap.ProtocolVersion.Minor));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.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
+    DEBUG ((DEBUG_ERROR, "Tpm2GetCapabilityManufactureID fail!\n"));\r
   } else {\r
-    DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityManufactureID - %08x\n", mTcgDxeData.BsCap.ManufacturerID));\r
+    DEBUG ((DEBUG_INFO, "Tpm2GetCapabilityManufactureID - %08x\n", mTcgDxeData.BsCap.ManufacturerID));\r
   }\r
 \r
   DEBUG_CODE (\r
@@ -2683,19 +2683,19 @@ DriverEntry (
 \r
     Status = Tpm2GetCapabilityFirmwareVersion (&FirmwareVersion1, &FirmwareVersion2);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityFirmwareVersion fail!\n"));\r
+      DEBUG ((DEBUG_ERROR, "Tpm2GetCapabilityFirmwareVersion fail!\n"));\r
     } else {\r
-      DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n", FirmwareVersion1, FirmwareVersion2));\r
+      DEBUG ((DEBUG_INFO, "Tpm2GetCapabilityFirmwareVersion - %08x %08x\n", FirmwareVersion1, FirmwareVersion2));\r
     }\r
   );\r
 \r
   Status = Tpm2GetCapabilityMaxCommandResponseSize (&MaxCommandSize, &MaxResponseSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Tpm2GetCapabilityMaxCommandResponseSize fail!\n"));\r
+    DEBUG ((DEBUG_ERROR, "Tpm2GetCapabilityMaxCommandResponseSize fail!\n"));\r
   } else {\r
     mTcgDxeData.BsCap.MaxCommandSize  = (UINT16)MaxCommandSize;\r
     mTcgDxeData.BsCap.MaxResponseSize = (UINT16)MaxResponseSize;\r
-    DEBUG ((EFI_D_INFO, "Tpm2GetCapabilityMaxCommandResponseSize - %08x, %08x\n", MaxCommandSize, MaxResponseSize));\r
+    DEBUG ((DEBUG_INFO, "Tpm2GetCapabilityMaxCommandResponseSize - %08x, %08x\n", MaxCommandSize, MaxResponseSize));\r
   }\r
 \r
   //\r
@@ -2722,7 +2722,7 @@ DriverEntry (
   } else {\r
     mTcgDxeData.BsCap.NumberOfPCRBanks = PcdGet32 (PcdTcg2NumberOfPCRBanks);\r
     if (PcdGet32 (PcdTcg2NumberOfPCRBanks) > NumberOfPCRBanks) {\r
-      DEBUG ((EFI_D_ERROR, "ERROR: PcdTcg2NumberOfPCRBanks(0x%x) > NumberOfPCRBanks(0x%x)\n", PcdGet32 (PcdTcg2NumberOfPCRBanks), NumberOfPCRBanks));\r
+      DEBUG ((DEBUG_ERROR, "ERROR: PcdTcg2NumberOfPCRBanks(0x%x) > NumberOfPCRBanks(0x%x)\n", PcdGet32 (PcdTcg2NumberOfPCRBanks), NumberOfPCRBanks));\r
       mTcgDxeData.BsCap.NumberOfPCRBanks = NumberOfPCRBanks;\r
     }\r
   }\r
@@ -2735,10 +2735,10 @@ DriverEntry (
     mTcgDxeData.BsCap.SupportedEventLogs &= ~EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Tcg2.SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
-  DEBUG ((EFI_D_INFO, "Tcg2.HashAlgorithmBitmap - 0x%08x\n", mTcgDxeData.BsCap.HashAlgorithmBitmap));\r
-  DEBUG ((EFI_D_INFO, "Tcg2.NumberOfPCRBanks      - 0x%08x\n", mTcgDxeData.BsCap.NumberOfPCRBanks));\r
-  DEBUG ((EFI_D_INFO, "Tcg2.ActivePcrBanks        - 0x%08x\n", mTcgDxeData.BsCap.ActivePcrBanks));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.SupportedEventLogs - 0x%08x\n", mTcgDxeData.BsCap.SupportedEventLogs));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.HashAlgorithmBitmap - 0x%08x\n", mTcgDxeData.BsCap.HashAlgorithmBitmap));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.NumberOfPCRBanks      - 0x%08x\n", mTcgDxeData.BsCap.NumberOfPCRBanks));\r
+  DEBUG ((DEBUG_INFO, "Tcg2.ActivePcrBanks        - 0x%08x\n", mTcgDxeData.BsCap.ActivePcrBanks));\r
 \r
   if (mTcgDxeData.BsCap.TPMPresentFlag) {\r
     //\r
@@ -2795,7 +2795,7 @@ DriverEntry (
   // Install Tcg2Protocol\r
   //\r
   Status = InstallTcg2 ();\r
-  DEBUG ((EFI_D_INFO, "InstallTcg2 - %r\n", Status));\r
+  DEBUG ((DEBUG_INFO, "InstallTcg2 - %r\n", Status));\r
 \r
   return Status;\r
 }\r
EFI Development Kit II mirror for PVE