diff options
| author | czhang46 <czhang46@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-22 04:35:59 +0000 |
|---|---|---|
| committer | czhang46 <czhang46@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-22 04:35:59 +0000 |
| commit | 6f6c7857c27272da66205b0257f95689aabb6e88 (patch) | |
| tree | 1eb47ea0cfb9df512dcd19f716cf3336677cdcea /SecurityPkg/Tcg/TcgPei | |
| parent | fc78c48e2094fe9d43aa4a73a4bf4f90d6ecf84b (diff) | |
| download | edk2-6f6c7857c27272da66205b0257f95689aabb6e88.tar.gz edk2-6f6c7857c27272da66205b0257f95689aabb6e88.tar.bz2 edk2-6f6c7857c27272da66205b0257f95689aabb6e88.zip | |
Remove TPM selftest on S3 boot path to save time
Signed-off-by : Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by : Dong Guo <guo.dong@intel.com>
Reviewed-by : Yao Jiewen <jieweng.yao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13873 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg/Tcg/TcgPei')
| -rw-r--r-- | SecurityPkg/Tcg/TcgPei/TcgPei.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c index 60d9192103..350e60e561 100644 --- a/SecurityPkg/Tcg/TcgPei/TcgPei.c +++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c @@ -707,10 +707,17 @@ PeimEntryMA ( 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);
}
|