/** @file\r
This module implements TrEE Protocol.\r
\r
-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2013 - 2016, 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
#include <PiDxe.h>\r
#include <IndustryStandard/Acpi.h>\r
#include <IndustryStandard/PeImage.h>\r
-#include <IndustryStandard/SmBios.h>\r
#include <IndustryStandard/TcpaAcpi.h>\r
\r
#include <Guid/GlobalVariable.h>\r
-#include <Guid/SmBios.h>\r
#include <Guid/HobList.h>\r
#include <Guid/TcgEventHob.h>\r
#include <Guid/EventGroup.h>\r
#include <Library/Tpm2DeviceLib.h>\r
#include <Library/HashLib.h>\r
#include <Library/PerformanceLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
\r
#define PERF_ID_TREE_DXE 0x3120\r
\r
EFI_GUID *VendorGuid;\r
} VARIABLE_TYPE;\r
\r
-#define EFI_TCG_LOG_AREA_SIZE 0x10000\r
-\r
#define TREE_DEFAULT_MAX_COMMAND_SIZE 0x1000\r
#define TREE_DEFAULT_MAX_RESPONSE_SIZE 0x1000\r
\r
typedef struct {\r
EFI_GUID *EventGuid;\r
TREE_EVENT_LOG_FORMAT LogFormat;\r
- UINT32 BootHashAlg;\r
- UINT16 DigestAlgID;\r
- TPMI_ALG_HASH TpmHashAlgo;\r
} TREE_EVENT_INFO_STRUCT;\r
\r
TREE_EVENT_INFO_STRUCT mTreeEventInfo[] = {\r
- {&gTcgEventEntryHobGuid, TREE_EVENT_LOG_FORMAT_TCG_1_2, TREE_BOOT_HASH_ALG_SHA1, 0, TPM_ALG_SHA1},\r
+ {&gTcgEventEntryHobGuid, TREE_EVENT_LOG_FORMAT_TCG_1_2},\r
};\r
\r
-#define TCG_EVENT_LOG_AREA_COUNT_MAX 5\r
+#define TCG_EVENT_LOG_AREA_COUNT_MAX 2\r
\r
typedef struct {\r
TREE_EVENT_LOG_FORMAT EventLogFormat;\r
PE/COFF image is external input, so this function will validate its data structure\r
within this image buffer before use.\r
\r
+ Notes: PE/COFF image is checked by BasePeCoffLib PeCoffLoaderGetImageInfo().\r
+\r
@param[in] PCRIndex TPM PCR index\r
@param[in] ImageAddress Start address of image buffer.\r
@param[in] ImageSize Image size\r
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
}\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
{\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
\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
} 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
return Status;\r
}\r
\r
-/**\r
- This function return hash algorithm from event log format.\r
-\r
- @param[in] EventLogFormat Event log format.\r
-\r
- @return hash algorithm.\r
-**/\r
-TPMI_ALG_HASH\r
-TrEEGetHashAlgoFromLogFormat (\r
- IN TREE_EVENT_LOG_FORMAT EventLogFormat\r
- )\r
-{\r
- UINTN Index;\r
-\r
- for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {\r
- if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {\r
- return mTreeEventInfo[Index].TpmHashAlgo;\r
- }\r
- }\r
- return TPM_ALG_SHA1;\r
-}\r
-\r
-/**\r
- This function return hash algorithm ID from event log format.\r
-\r
- @param[in] EventLogFormat Event log format.\r
-\r
- @return hash algorithm ID.\r
-**/\r
-UINT16\r
-TrEEGetAlgIDFromLogFormat (\r
- IN TREE_EVENT_LOG_FORMAT EventLogFormat\r
- )\r
-{\r
- UINTN Index;\r
-\r
- for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {\r
- if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {\r
- return mTreeEventInfo[Index].DigestAlgID;\r
- }\r
- }\r
- return 0;\r
-}\r
-\r
-/**\r
- This function return boot hash algorithm from event log format.\r
-\r
- @param[in] EventLogFormat Event log format.\r
-\r
- @return boot hash algorithm.\r
-**/\r
-UINT32\r
-TrEEGetBootHashAlgFromLogFormat (\r
- IN TREE_EVENT_LOG_FORMAT EventLogFormat\r
- )\r
-{\r
- UINTN Index;\r
-\r
- for (Index = 0; Index < sizeof(mTreeEventInfo)/sizeof(mTreeEventInfo[0]); Index++) {\r
- if (mTreeEventInfo[Index].LogFormat == EventLogFormat) {\r
- return mTreeEventInfo[Index].BootHashAlg;\r
- }\r
- }\r
- return TREE_BOOT_HASH_ALG_SHA1;\r
-}\r
-\r
-/**\r
- This function get digest from digest list.\r
-\r
- @param HashAlg digest algorithm\r
- @param DigestList digest list\r
- @param Digest digest\r
-\r
- @retval EFI_SUCCESS Sha1Digest is found and returned.\r
- @retval EFI_NOT_FOUND Sha1Digest is not found.\r
-**/\r
-EFI_STATUS\r
-Tpm2GetDigestFromDigestList (\r
- IN TPMI_ALG_HASH HashAlg,\r
- IN TPML_DIGEST_VALUES *DigestList,\r
- IN VOID *Digest\r
- )\r
-{\r
- UINTN Index;\r
- UINT16 DigestSize;\r
-\r
- DigestSize = GetHashSizeFromAlgo (HashAlg);\r
- for (Index = 0; Index < DigestList->count; Index++) {\r
- if (DigestList->digests[Index].hashAlg == HashAlg) {\r
- CopyMem (\r
- Digest,\r
- &DigestList->digests[Index].digest,\r
- DigestSize\r
- );\r
- return EFI_SUCCESS;\r
- }\r
- }\r
-\r
- return EFI_NOT_FOUND;\r
-}\r
-\r
/**\r
Add a new entry to the Event Log.\r
\r
DEBUG ((EFI_D_INFO, " LogFormat - 0x%08x\n", mTreeEventInfo[Index].LogFormat));\r
switch (mTreeEventInfo[Index].LogFormat) {\r
case TREE_EVENT_LOG_FORMAT_TCG_1_2:\r
- Status = Tpm2GetDigestFromDigestList (TPM_ALG_SHA1, DigestList, &NewEventHdr->Digest);\r
+ Status = GetDigestFromDigestList (TPM_ALG_SHA1, DigestList, &NewEventHdr->Digest);\r
if (!EFI_ERROR (Status)) {\r
//\r
// Enter critical region\r
{\r
EFI_STATUS Status;\r
TPML_DIGEST_VALUES DigestList;\r
+ \r
+ if (!mTcgDxeData.BsCap.TrEEPresentFlag) {\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
\r
Status = HashAndExtend (\r
NewEventHdr->PCRIndex,\r
}\r
}\r
\r
+ if (Status == EFI_DEVICE_ERROR) {\r
+ DEBUG ((EFI_D_ERROR, "TcgDxeHashLogExtendEvent - %r. Disable TPM.\n", Status));\r
+ mTcgDxeData.BsCap.TrEEPresentFlag = FALSE;\r
+ REPORT_STATUS_CODE (\r
+ EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+ (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)\r
+ );\r
+ }\r
+\r
return Status;\r
}\r
\r
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
Status = TcgDxeLogHashEvent (&DigestList, &NewEventHdr, Event->Event);\r
}\r
}\r
+ if (Status == EFI_DEVICE_ERROR) {\r
+ DEBUG ((EFI_D_ERROR, "MeasurePeImageAndExtend - %r. Disable TPM.\n", Status));\r
+ mTcgDxeData.BsCap.TrEEPresentFlag = FALSE;\r
+ REPORT_STATUS_CODE (\r
+ EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+ (PcdGet32 (PcdStatusCodeSubClassTpmDevice) | EFI_P_EC_INTERFACE_ERROR)\r
+ );\r
+ }\r
} else {\r
Status = TcgDxeHashLogExtendEvent (\r
Flags,\r
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
{\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
return EFI_UNSUPPORTED;\r
}\r
\r
- if (InputParameterBlockSize >= mTcgDxeData.BsCap.MaxCommandSize) {\r
+ if (InputParameterBlockSize > mTcgDxeData.BsCap.MaxCommandSize) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- if (OutputParameterBlockSize >= mTcgDxeData.BsCap.MaxResponseSize) {\r
+ if (OutputParameterBlockSize > mTcgDxeData.BsCap.MaxResponseSize) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
&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
Status = gBS->AllocatePages (\r
AllocateMaxAddress,\r
EfiACPIMemoryNVS,\r
- EFI_SIZE_TO_PAGES (EFI_TCG_LOG_AREA_SIZE),\r
+ EFI_SIZE_TO_PAGES (PcdGet32 (PcdTcgLogAreaMinLen)),\r
&Lasa\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
mTcgDxeData.EventLogAreaStruct[Index].Lasa = Lasa;\r
- mTcgDxeData.EventLogAreaStruct[Index].Laml = EFI_TCG_LOG_AREA_SIZE;\r
+ mTcgDxeData.EventLogAreaStruct[Index].Laml = PcdGet32 (PcdTcgLogAreaMinLen);\r
//\r
// To initialize them as 0xFF is recommended \r
// because the OS can know the last entry for that.\r
//\r
- SetMem ((VOID *)(UINTN)Lasa, EFI_TCG_LOG_AREA_SIZE, 0xFF);\r
+ SetMem ((VOID *)(UINTN)Lasa, PcdGet32 (PcdTcgLogAreaMinLen), 0xFF);\r
}\r
\r
//\r
//\r
if (PcdGet8 (PcdTpmPlatformClass) == TCG_PLATFORM_TYPE_CLIENT) {\r
mTcgClientAcpiTemplate.Lasa = mTcgDxeData.EventLogAreaStruct[0].Lasa;\r
- mTcgClientAcpiTemplate.Laml = EFI_TCG_LOG_AREA_SIZE;\r
+ mTcgClientAcpiTemplate.Laml = PcdGet32 (PcdTcgLogAreaMinLen);\r
} else {\r
mTcgServerAcpiTemplate.Lasa = mTcgDxeData.EventLogAreaStruct[0].Lasa;\r
- mTcgServerAcpiTemplate.Laml = EFI_TCG_LOG_AREA_SIZE;\r
+ mTcgServerAcpiTemplate.Laml = PcdGet32 (PcdTcgLogAreaMinLen);\r
}\r
\r
//\r
)\r
{\r
EFI_STATUS Status;\r
- SMBIOS_TABLE_ENTRY_POINT *SmbiosTable;\r
TCG_PCR_EVENT_HDR TcgEvent;\r
EFI_HANDOFF_TABLE_POINTERS HandoffTables;\r
UINTN ProcessorNum;\r
EFI_CPU_PHYSICAL_LOCATION *ProcessorLocBuf;\r
\r
ProcessorLocBuf = NULL;\r
-\r
- //\r
- // Measure SMBIOS with EV_EFI_HANDOFF_TABLES to PCR[1]\r
- //\r
- Status = EfiGetSystemConfigurationTable (\r
- &gEfiSmbiosTableGuid,\r
- (VOID **) &SmbiosTable\r
- );\r
-\r
- if (!EFI_ERROR (Status) && SmbiosTable != NULL) {\r
- TcgEvent.PCRIndex = 1;\r
- TcgEvent.EventType = EV_EFI_HANDOFF_TABLES;\r
- TcgEvent.EventSize = sizeof (HandoffTables);\r
-\r
- HandoffTables.NumberOfTables = 1;\r
- HandoffTables.TableEntry[0].VendorGuid = gEfiSmbiosTableGuid;\r
- HandoffTables.TableEntry[0].VendorTable = SmbiosTable;\r
-\r
- DEBUG ((DEBUG_INFO, "The Smbios Table starts at: 0x%x\n", SmbiosTable->TableAddress));\r
- DEBUG ((DEBUG_INFO, "The Smbios Table size: 0x%x\n", SmbiosTable->TableLength));\r
-\r
- Status = TcgDxeHashLogExtendEvent (\r
- 0,\r
- (UINT8*)(UINTN)SmbiosTable->TableAddress,\r
- SmbiosTable->TableLength,\r
- &TcgEvent,\r
- (UINT8*)&HandoffTables\r
- );\r
- }\r
+ Status = EFI_SUCCESS;\r
\r
if (PcdGet8 (PcdTpmPlatformClass) == TCG_PLATFORM_TYPE_SERVER) {\r
//\r
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
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
VarName,\r
VarNameLength * sizeof (*VarName)\r
);\r
- if (VarSize != 0) {\r
+ if (VarSize != 0 && VarData != NULL) {\r
CopyMem (\r
(CHAR16 *)VarLog->UnicodeName + VarNameLength,\r
VarData,\r
);\r
}\r
\r
- if (EventType == EV_EFI_VARIABLE_DRIVER_CONFIG) {\r
- //\r
- // Digest is the event data (EFI_VARIABLE_DATA_TREE)\r
- //\r
- Status = TcgDxeHashLogExtendEvent (\r
- 0,\r
- (UINT8*)VarLog,\r
- TcgEvent.EventSize,\r
- &TcgEvent,\r
- (UINT8*)VarLog\r
- );\r
- } else {\r
- Status = TcgDxeHashLogExtendEvent (\r
- 0,\r
- (UINT8*)VarData,\r
- VarSize,\r
- &TcgEvent,\r
- (UINT8*)VarLog\r
- );\r
- }\r
+ Status = TcgDxeHashLogExtendEvent (\r
+ 0,\r
+ (UINT8*)VarLog,\r
+ TcgEvent.EventSize,\r
+ &TcgEvent,\r
+ (UINT8*)VarLog\r
+ );\r
+\r
FreePool (VarLog);\r
return Status;\r
}\r
&BootCount,\r
(VOID **) &BootOrder\r
);\r
- if (Status == EFI_NOT_FOUND) {\r
+ if (Status == EFI_NOT_FOUND || BootOrder == NULL) {\r
return EFI_SUCCESS;\r
}\r
\r
\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
// 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
Status = TcgMeasureAction (\r
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
+ }\r
\r
//\r
// 2. Draw a line between pre-boot env and entering post-boot env.\r
//\r
for (PcrIndex = 0; PcrIndex < 7; PcrIndex++) {\r
Status = MeasureSeparatorEvent (PcrIndex);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "Seperator Event not Measured. Error!\n"));\r
+ }\r
}\r
\r
//\r
Status = TcgMeasureAction (\r
EFI_RETURNING_FROM_EFI_APPLICATOIN\r
);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));\r
+ }\r
}\r
\r
DEBUG ((EFI_D_INFO, "TPM2 TrEEDxe Measure Data when ReadyToBoot\n"));\r
EFI_EXIT_BOOT_SERVICES_INVOCATION\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_INVOCATION));\r
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_INVOCATION));\r
}\r
\r
//\r
EFI_EXIT_BOOT_SERVICES_SUCCEEDED\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_SUCCEEDED));\r
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_SUCCEEDED));\r
}\r
}\r
\r
EFI_EXIT_BOOT_SERVICES_FAILED\r
);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "%s not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_FAILED));\r
+ DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_EXIT_BOOT_SERVICES_FAILED));\r
}\r
\r
}\r
return EFI_UNSUPPORTED;\r
}\r
\r
+ if (GetFirstGuidHob (&gTpmErrorHobGuid) != NULL) {\r
+ DEBUG ((EFI_D_ERROR, "TPM2 error!\n"));\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
+ \r
Status = Tpm2RequestUseTpm ();\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((EFI_D_ERROR, "TPM not detected!\n"));\r
+ DEBUG ((EFI_D_ERROR, "TPM2 not detected!\n"));\r
return Status;\r
}\r
-\r
+ \r
//\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
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
} 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
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
}\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
// 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
projects / mirror_edk2.git / blobdiff