Revision: 13911
http://edk2.svn.sourceforge.net/edk2/?rev=13911&view=rev
Author: vanjeff
Date: 2012-11-01 07:58:44 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
Sync patch r13873 from main trunk.
Remove TPM selftest on S3 boot path to save time.
Revision Links:
--------------
http://edk2.svn.sourceforge.net/edk2/?rev=13873&view=rev
Modified Paths:
--------------
branches/UDK2010.SR1/SecurityPkg/Tcg/TcgPei/TcgPei.c
Modified: branches/UDK2010.SR1/SecurityPkg/Tcg/TcgPei/TcgPei.c
===================================================================
--- branches/UDK2010.SR1/SecurityPkg/Tcg/TcgPei/TcgPei.c 2012-11-01
07:57:24 UTC (rev 13910)
+++ branches/UDK2010.SR1/SecurityPkg/Tcg/TcgPei/TcgPei.c 2012-11-01
07:58:44 UTC (rev 13911)
@@ -608,10 +608,17 @@
if (EFI_ERROR (Status) ) {
return Status;
}
- Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices,
TpmHandle);
- if (EFI_ERROR (Status)) {
- return Status;
+
+ //
+ // TpmSelfTest is optional on S3 path, skip it to save S3 time
+ //
+ if (BootMode != BOOT_ON_S3_RESUME) {
+ Status = TpmCommContinueSelfTest ((EFI_PEI_SERVICES**)PeiServices,
TpmHandle);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
}
+
Status = PeiServicesInstallPpi (&mTpmInitializedPpiList);
ASSERT_EFI_ERROR (Status);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
