From 1dae37b163e1e08e719ac06fa86b3414b4ddfb2b Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Mon, 30 Oct 2023 11:56:48 +0000 Subject: automatic import of edk2 --- ...-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 0018-SecurityPkg-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch (limited to '0018-SecurityPkg-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch') diff --git a/0018-SecurityPkg-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch b/0018-SecurityPkg-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch new file mode 100644 index 0000000..3a51c88 --- /dev/null +++ b/0018-SecurityPkg-Tcg-Make-Tcg2PlatformPei-buildable-and-f.patch @@ -0,0 +1,63 @@ +From 5134d284aafd4816e265b5c551ee32d6eb43bbc8 Mon Sep 17 00:00:00 2001 +From: Stefan Berger +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 +Reviewed-by: Jiewen Yao +--- + 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.
+ Copyright (c) Microsoft Corporation.
+@@ -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.
+ # +@@ -35,7 +36,6 @@ + [Packages] + MdePkg/MdePkg.dec + SecurityPkg/SecurityPkg.dec +- MinPlatformPkg/MinPlatformPkg.dec + + [Sources] + Tcg2PlatformPei.c +-- +2.27.0 + -- cgit v1.2.3