Revision: 18476
http://sourceforge.net/p/edk2/code/18476
Author: jyao1
Date: 2015-09-16 00:53:28 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
SecurityPkg: Reduce verbosity of TPM DEBUG messages
Some of the TPM/TPM2 DEBUG messages are at EFI_D_INFO level,
even though they are simply tracing functions that run on every boot even
if there is no TPM installed. Changed verbosity to EFI_D_VERBOSE.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Samer El-Haj-Mahmoud" <[email protected]>
Reviewed-by: "Jiewen Yao" <[email protected]>
Modified Paths:
--------------
trunk/edk2/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
trunk/edk2/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
trunk/edk2/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
trunk/edk2/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
Modified:
trunk/edk2/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
===================================================================
---
trunk/edk2/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
2015-09-15 08:47:05 UTC (rev 18475)
+++
trunk/edk2/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c
2015-09-16 00:53:28 UTC (rev 18476)
@@ -16,6 +16,7 @@
partition data carefully.
Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -447,7 +448,7 @@
// Tcg2 protocol is not installed. So, TPM2 is not present.
// Don't do any measurement, and directly return EFI_SUCCESS.
//
- DEBUG ((EFI_D_INFO, "DxeTpm2MeasureBootHandler - Tcg2 - %r\n", Status));
+ DEBUG ((EFI_D_VERBOSE, "DxeTpm2MeasureBootHandler - Tcg2 - %r\n", Status));
return EFI_SUCCESS;
}
Modified: trunk/edk2/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c
===================================================================
--- trunk/edk2/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c 2015-09-15
08:47:05 UTC (rev 18475)
+++ trunk/edk2/SecurityPkg/Library/HashLibTpm2/HashLibTpm2.c 2015-09-16
00:53:28 UTC (rev 18476)
@@ -2,6 +2,7 @@
Ihis library uses TPM2 device to calculation hash.
Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved. <BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -242,7 +243,7 @@
TPM2B_EVENT EventData;
TPM2B_DIGEST Result;
- DEBUG((EFI_D_INFO, "\n HashAndExtend Entry \n"));
+ DEBUG((EFI_D_VERBOSE, "\n HashAndExtend Entry \n"));
SequenceHandle = 0xFFFFFFFF; // Know bad value
@@ -262,7 +263,7 @@
if (EFI_ERROR(Status)) {
return EFI_DEVICE_ERROR;
}
- DEBUG((EFI_D_INFO, "\n Tpm2HashSequenceStart Success \n"));
+ DEBUG((EFI_D_VERBOSE, "\n Tpm2HashSequenceStart Success \n"));
Buffer = (UINT8 *)(UINTN)DataToHash;
for (HashLen = DataToHashLen; HashLen > sizeof(HashBuffer.buffer); HashLen
-= sizeof(HashBuffer.buffer)) {
@@ -276,7 +277,7 @@
return EFI_DEVICE_ERROR;
}
}
- DEBUG((EFI_D_INFO, "\n Tpm2SequenceUpdate Success \n"));
+ DEBUG((EFI_D_VERBOSE, "\n Tpm2SequenceUpdate Success \n"));
HashBuffer.size = (UINT16)HashLen;
CopyMem(HashBuffer.buffer, Buffer, (UINTN)HashLen);
@@ -294,7 +295,7 @@
if (EFI_ERROR(Status)) {
return EFI_DEVICE_ERROR;
}
- DEBUG((EFI_D_INFO, "\n Tpm2EventSequenceComplete Success \n"));
+ DEBUG((EFI_D_VERBOSE, "\n Tpm2EventSequenceComplete Success \n"));
} else {
Status = Tpm2SequenceComplete (
SequenceHandle,
@@ -304,7 +305,7 @@
if (EFI_ERROR(Status)) {
return EFI_DEVICE_ERROR;
}
- DEBUG((EFI_D_INFO, "\n Tpm2SequenceComplete Success \n"));
+ DEBUG((EFI_D_VERBOSE, "\n Tpm2SequenceComplete Success \n"));
DigestList->count = 1;
DigestList->digests[0].hashAlg = AlgoId;
@@ -316,7 +317,7 @@
if (EFI_ERROR(Status)) {
return EFI_DEVICE_ERROR;
}
- DEBUG((EFI_D_INFO, "\n Tpm2PcrExtend Success \n"));
+ DEBUG((EFI_D_VERBOSE, "\n Tpm2PcrExtend Success \n"));
}
return EFI_SUCCESS;
Modified: trunk/edk2/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
===================================================================
--- trunk/edk2/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
2015-09-15 08:47:05 UTC (rev 18475)
+++ trunk/edk2/SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12Tis.c
2015-09-16 00:53:28 UTC (rev 18476)
@@ -2,6 +2,7 @@
TIS (TPM Interface Specification) functions used by TPM1.2.
Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -381,22 +382,22 @@
DEBUG_CODE (
UINTN DebugSize;
- DEBUG ((EFI_D_INFO, "Tpm12TisTpmCommand Send - "));
+ DEBUG ((EFI_D_VERBOSE, "Tpm12TisTpmCommand Send - "));
if (SizeIn > 0x100) {
DebugSize = 0x40;
} else {
DebugSize = SizeIn;
}
for (Index = 0; Index < DebugSize; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferIn[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferIn[Index]));
}
if (DebugSize != SizeIn) {
- DEBUG ((EFI_D_INFO, "...... "));
+ DEBUG ((EFI_D_VERBOSE, "...... "));
for (Index = SizeIn - 0x20; Index < SizeIn; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferIn[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferIn[Index]));
}
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
TpmOutSize = 0;
@@ -467,11 +468,11 @@
}
}
DEBUG_CODE (
- DEBUG ((EFI_D_INFO, "Tpm12TisTpmCommand ReceiveHeader - "));
+ DEBUG ((EFI_D_VERBOSE, "Tpm12TisTpmCommand ReceiveHeader - "));
for (Index = 0; Index < sizeof (TPM_RSP_COMMAND_HDR); Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferOut[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferOut[Index]));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
//
// Check the reponse data header (tag,parasize and returncode )
@@ -510,11 +511,11 @@
}
Exit:
DEBUG_CODE (
- DEBUG ((EFI_D_INFO, "Tpm12TisTpmCommand Receive - "));
+ DEBUG ((EFI_D_VERBOSE, "Tpm12TisTpmCommand Receive - "));
for (Index = 0; Index < TpmOutSize; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferOut[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferOut[Index]));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
MmioWrite8((UINTN)&TisReg->Status, TIS_PC_STS_READY);
return Status;
Modified: trunk/edk2/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c
===================================================================
--- trunk/edk2/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c 2015-09-15
08:47:05 UTC (rev 18475)
+++ trunk/edk2/SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2Tis.c 2015-09-16
00:53:28 UTC (rev 18476)
@@ -2,6 +2,7 @@
TIS (TPM Interface Specification) functions used by dTPM2.0 library.
Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
@@ -387,22 +388,22 @@
DEBUG_CODE (
UINTN DebugSize;
- DEBUG ((EFI_D_INFO, "Tpm2TisTpmCommand Send - "));
+ DEBUG ((EFI_D_VERBOSE, "Tpm2TisTpmCommand Send - "));
if (SizeIn > 0x100) {
DebugSize = 0x40;
} else {
DebugSize = SizeIn;
}
for (Index = 0; Index < DebugSize; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferIn[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferIn[Index]));
}
if (DebugSize != SizeIn) {
- DEBUG ((EFI_D_INFO, "...... "));
+ DEBUG ((EFI_D_VERBOSE, "...... "));
for (Index = SizeIn - 0x20; Index < SizeIn; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferIn[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferIn[Index]));
}
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
TpmOutSize = 0;
@@ -477,11 +478,11 @@
}
}
DEBUG_CODE (
- DEBUG ((EFI_D_INFO, "TisTpmCommand ReceiveHeader - "));
+ DEBUG ((EFI_D_VERBOSE, "TisTpmCommand ReceiveHeader - "));
for (Index = 0; Index < sizeof (TPM2_RESPONSE_HEADER); Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferOut[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferOut[Index]));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
//
// Check the reponse data header (tag,parasize and returncode )
@@ -521,11 +522,11 @@
}
Exit:
DEBUG_CODE (
- DEBUG ((EFI_D_INFO, "Tpm2TisTpmCommand Receive - "));
+ DEBUG ((EFI_D_VERBOSE, "Tpm2TisTpmCommand Receive - "));
for (Index = 0; Index < TpmOutSize; Index++) {
- DEBUG ((EFI_D_INFO, "%02x ", BufferOut[Index]));
+ DEBUG ((EFI_D_VERBOSE, "%02x ", BufferOut[Index]));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((EFI_D_VERBOSE, "\n"));
);
MmioWrite8((UINTN)&TisReg->Status, TIS_PC_STS_READY);
return Status;
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
