924da87b5c
Signed-off-by: Jinhua Cao <caojinhua1@huawei.com> Signed-off-by: yezengruan <yezengruan@huawei.com>
64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
From 5134d284aafd4816e265b5c551ee32d6eb43bbc8 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
|
Date: Mon, 13 Sep 2021 22:21:04 +0800
|
|
Subject: [PATCH 7/8] SecurityPkg/Tcg: Make Tcg2PlatformPei buildable and fix
|
|
style issues
|
|
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
|
|
---
|
|
SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 11 ++++++-----
|
|
SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf | 4 ++--
|
|
2 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c b/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
|
|
index 66ec75ad0e..21d2c1433d 100644
|
|
--- a/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
|
|
+++ b/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
|
|
@@ -1,4 +1,5 @@
|
|
/** @file
|
|
+ Configure TPM 2 platform hierarchy on TPM state resume failure on S3 resume
|
|
|
|
Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
|
|
Copyright (c) Microsoft Corporation.<BR>
|
|
@@ -24,12 +25,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
/**
|
|
This function handles PlatformInit task at the end of PEI
|
|
|
|
- @param[in] PeiServices Pointer to PEI Services Table.
|
|
- @param[in] NotifyDesc Pointer to the descriptor for the Notification event that
|
|
- caused this function to execute.
|
|
- @param[in] Ppi Pointer to the PPI data associated with this function.
|
|
+ @param[in] PeiServices Pointer to PEI Services Table.
|
|
+ @param[in] NotifyDescriptor Pointer to the descriptor for the Notification event that
|
|
+ caused this function to execute.
|
|
+ @param[in] Ppi Pointer to the PPI data associated with this function.
|
|
|
|
- @retval EFI_SUCCESS The function completes successfully
|
|
+ @retval EFI_SUCCESS The function completes successfully
|
|
@retval others
|
|
**/
|
|
EFI_STATUS
|
|
diff --git a/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf b/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
|
|
index 579f09b940..6f57de025b 100644
|
|
--- a/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
|
|
+++ b/SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
|
|
@@ -1,4 +1,5 @@
|
|
-### @file
|
|
+## @file
|
|
+# Configure TPM 2 platform hierarchy on TPM state resume failure on S3 resume
|
|
#
|
|
# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
|
|
#
|
|
@@ -35,7 +36,6 @@
|
|
[Packages]
|
|
MdePkg/MdePkg.dec
|
|
SecurityPkg/SecurityPkg.dec
|
|
- MinPlatformPkg/MinPlatformPkg.dec
|
|
|
|
[Sources]
|
|
Tcg2PlatformPei.c
|
|
--
|
|
2.27.0
|
|
|