From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mx.groups.io with SMTP id smtpd.web10.10683.1631629106829530595 for ; Tue, 14 Sep 2021 07:18:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=rRJllvOv; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: stefanb@linux.ibm.com) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.0.43) with SMTP id 18EE8Dm7010134; Tue, 14 Sep 2021 10:18:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=Sq5xb6QSb9drULUxtFQtTLy3wfJUPPWzPov/2LIGWf8=; b=rRJllvOvoisV280riQ2T7q7NFchyNH2Clp14IQyUJDAROwVcZNsDNwtIwGNVzuSNcTzx d0bfovuimoDocJO4LbLzqQ2YynSunLrV1MnjWQpKseAv28wkOTCRl4g70j6dKXxaeu3p FGzTGkyjXDWZRl11YVoODV0OlpCKs+p/+tjQ3ryeLKSYUTl/FYDdbZ5kw254qCt3oBrN sqAvKe/eqquy+puym3IwfpHEMNKpj9R8pg9xtE6DTJ9iP9veAJOGmjuOHPv7KneqfLXu +MOEGKyEeoyeBgPxmxBky0IDXeaSUcqKR9pphlcM0MjrAd3PKi/NOirc3nfrEgKxjQ2O 2g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3b2w82883a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Sep 2021 10:18:25 -0400 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 18EE9mfM022693; Tue, 14 Sep 2021 10:18:25 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 3b2w82882v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Sep 2021 10:18:25 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 18EEBnep025044; Tue, 14 Sep 2021 14:18:23 GMT Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by ppma01dal.us.ibm.com with ESMTP id 3b0m3cqugc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Sep 2021 14:18:23 +0000 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 18EEIMie38797788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Sep 2021 14:18:22 GMT Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 61CCD6A051; Tue, 14 Sep 2021 14:18:22 +0000 (GMT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EBBDC6A04F; Tue, 14 Sep 2021 14:18:21 +0000 (GMT) Received: from sbct-2.pok.ibm.com (unknown [9.47.158.152]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 14 Sep 2021 14:18:21 +0000 (GMT) From: "Stefan Berger" To: devel@edk2.groups.io Cc: mhaeuser@posteo.de, spbrogan@outlook.com, marcandre.lureau@redhat.com, kraxel@redhat.com, jiewen.yao@intel.com, Stefan Berger , Stefan Berger Subject: [PATCH v2 4/4] OvmfPkg: Reference new Tcg2PlatformPei in the build system Date: Tue, 14 Sep 2021 10:18:18 -0400 Message-Id: <20210914141818.2583900-5-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210914141818.2583900-1-stefanb@linux.ibm.com> References: <20210914141818.2583900-1-stefanb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 9WE1UhgndzxWX8ZgGCw78TuE7xlorAI0 X-Proofpoint-ORIG-GUID: sFh9zxvtkfxCMqavutEchR6sfz9GUORW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.687,Hydra:6.0.235,FMLib:17.0.607.475 definitions=2020-10-13_15,2020-10-13_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxscore=0 bulkscore=0 malwarescore=0 impostorscore=0 phishscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001 definitions=main-2109140082 Content-Transfer-Encoding: quoted-printable From: Stefan Berger Compile the Tcg2PlatformPei related code now to support TPM 2 platform hierachy disablement if the TPM state cannot be resumed upon S3 resume. Signed-off-by: Stefan Berger --- OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ++++ OvmfPkg/AmdSev/AmdSevX64.fdf | 1 + OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32.fdf | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32X64.fdf | 1 + OvmfPkg/OvmfPkgX64.dsc | 4 ++++ OvmfPkg/OvmfPkgX64.fdf | 1 + 8 files changed, 20 insertions(+) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 3079f4b503..5ee5445116 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -637,6 +637,10 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D }=0D + SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {=0D + =0D + TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarc= hyLib/PeiDxeTpmPlatformHierarchyLib.inf=0D + }=0D !endif=0D =0D #=0D diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index a9f675303f..542722ac6b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -154,6 +154,7 @@ INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecrypt= Pei.inf INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/TcgPei/TcgPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D +INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf=0D !endif=0D =0D ##########################################################################= ######=0D diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 923a012f0c..6a5be97c05 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -717,6 +717,10 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D }=0D + SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {=0D + =0D + TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarc= hyLib/PeiDxeTpmPlatformHierarchyLib.inf=0D + }=0D !endif=0D =0D #=0D diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index bb3b53626e..775ea2d710 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -166,6 +166,7 @@ INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecrypt= Pei.inf INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/TcgPei/TcgPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D +INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf=0D !endif=0D =0D ##########################################################################= ######=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index b907b36973..71227d1b70 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -730,6 +730,10 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D }=0D + SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {=0D + =0D + TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarc= hyLib/PeiDxeTpmPlatformHierarchyLib.inf=0D + }=0D !endif=0D =0D [Components.X64]=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 030638ae78..245ca94044 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -166,6 +166,7 @@ INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecrypt= Pei.inf INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/TcgPei/TcgPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D +INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf=0D !endif=0D =0D ##########################################################################= ######=0D diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 8aca437a9b..52f7598cf1 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -729,6 +729,10 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D }=0D + SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {=0D + =0D + TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarc= hyLib/PeiDxeTpmPlatformHierarchyLib.inf=0D + }=0D !endif=0D =0D #=0D diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 888363ff9d..b6cc3cabdd 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -185,6 +185,7 @@ INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecrypt= Pei.inf INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/TcgPei/TcgPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D +INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf=0D !endif=0D =0D ##########################################################################= ######=0D --=20 2.31.1