From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by mx.groups.io with SMTP id smtpd.web11.10487.1634827574657595352 for ; Thu, 21 Oct 2021 07:46:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=ANCrNLkZ; spf=pass (domain: linux.ibm.com, ip: 148.163.158.5, mailfrom: stefanb@linux.ibm.com) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19LEI2sH012440; Thu, 21 Oct 2021 10:46:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=gyJYLfhEFhRthC6FZrolynpA29SREOLd2gJsZb7VCAc=; b=ANCrNLkZsV9LL/9TiEHKmSLR093ZiMsKmTlK8FiqgqYISAxf6SlaHKe3QIF13KOs1K7j dtzkcOrWHb6wsTMLlhUzDBzgCjTGExAlI1NIDQIWuTjcd9C+saB278KD0hEewlvhiJkM 7Wk5fLiZQ1zAtfVNG9ssQu3ITMrkRBCw2C1aFUUPJubB/Du7xcWC97n9iB693zYsoJEK 6Ki+xdLKCGLBekrvIZF+2uyK3n4+G7gTaQq2ueqaBO0OedHkZny8TT78TlDiHt0KYLU1 IUWPYyy87gLoa2Dkgp57qu2bkH8O8RF7/gz2X6wtPaKtXEiryry/s4B3UwY0mdpBSpdk dA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3btxuty7de-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Oct 2021 10:46:11 -0400 Received: from m0127361.ppops.net (m0127361.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 19LEKLEj019591; Thu, 21 Oct 2021 10:46:11 -0400 Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com with ESMTP id 3btxuty7d5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Oct 2021 10:46:11 -0400 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19LEbKdW029058; Thu, 21 Oct 2021 14:46:10 GMT Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by ppma02dal.us.ibm.com with ESMTP id 3bqpcd7d03-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Oct 2021 14:46:10 +0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 19LEk9mI37552430 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 21 Oct 2021 14:46:09 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4AF6F13606E; Thu, 21 Oct 2021 14:46:09 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8842B136059; Thu, 21 Oct 2021 14:46:08 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP; Thu, 21 Oct 2021 14:46:08 +0000 (GMT) Subject: Re: [edk2-devel] [PATCH 2/4] OvmfPkg: create Tcg2ConfigPeiCompat12.inf To: devel@edk2.groups.io, kraxel@redhat.com Cc: James Bottomley , Min Xu , Jordan Justen , Erdem Aktas , Ard Biesheuvel , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Jiewen Yao , Tom Lendacky , Brijesh Singh References: <20211021122003.2008499-1-kraxel@redhat.com> <20211021122003.2008499-3-kraxel@redhat.com> From: "Stefan Berger" Message-ID: <0f7f648c-4dd6-a63b-925b-4f102466bdb4@linux.ibm.com> Date: Thu, 21 Oct 2021 10:46:06 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20211021122003.2008499-3-kraxel@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: PNZ7PVeE8bpuZMFmHvhhRHmgN1bt4wc_ X-Proofpoint-GUID: XThz01uUaH-cAHVYuKD_6HMFeh7sZyvl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-21_04,2021-10-21_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 malwarescore=0 impostorscore=0 mlxlogscore=999 clxscore=1015 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110210077 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US On 10/21/21 8:20 AM, Gerd Hoffmann wrote: > Split Tcg2ConfigPei.inf into two variants: Tcg2ConfigPeiCompat12.inf > with TPM 1.2 backward compatibility included and Tcg2ConfigPei.inf > supporting TPM 2.0 only. This allows x86 builds to choose whenever > TPM 1.2 support should be included or not by picking the one or the > other inf file. FYI: TPM 2 does not provide backwards compatibility to TPM 1.2. TPM 1.2 is its own implementation that is incompatible with TPM 2. So the extension 'Compat12' is a bit odd in this case. Tested-by: Stefan Berger [Tested with OvmfPkg/OvmfPkgX64.dsc] > > Switch x86 builds to Tcg2ConfigPeiCompat12.inf, so they continue to > have TPM 1.2 support. > > No functional change. > > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 2 +- > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 9 --------- > .../{Tcg2ConfigPei.inf => Tcg2ConfigPeiCompat12.inf} | 9 +-------- > OvmfPkg/OvmfTpmPei.fdf.inc | 2 +- > 4 files changed, 3 insertions(+), 19 deletions(-) > copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf => Tcg2ConfigPeiCompat12.inf} (84%) > > diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc > index 99fa7c13b3e7..b5dc20c4858c 100644 > --- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc > +++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc > @@ -4,7 +4,7 @@ > > !if $(TPM_ENABLE) == TRUE > OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf > - OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > + OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeiCompat12.inf > SecurityPkg/Tcg/TcgPei/TcgPei.inf > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { > > diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > index 39d1deeed16b..bf8b12da8195 100644 > --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > @@ -22,11 +22,6 @@ [Defines] > [Sources] > Tcg2ConfigPeim.c > Tpm12Support.h > - > -[Sources.IA32, Sources.X64] > - Tpm12Support.c > - > -[Sources.ARM, Sources.AARCH64] > Tpm12SupportNull.c > > [Packages] > @@ -41,10 +36,6 @@ [LibraryClasses] > PeiServicesLib > Tpm2DeviceLib > > -[LibraryClasses.IA32, LibraryClasses.X64] > - BaseLib > - Tpm12DeviceLib > - > [Guids] > gEfiTpmDeviceSelectedGuid ## PRODUCES ## GUID # Used as a PPI GUID > gEfiTpmDeviceInstanceTpm20DtpmGuid ## SOMETIMES_CONSUMES > diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeiCompat12.inf > similarity index 84% > copy from OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > copy to OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeiCompat12.inf > index 39d1deeed16b..919006f35cf1 100644 > --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeiCompat12.inf > @@ -14,7 +14,7 @@ > [Defines] > INF_VERSION = 0x00010005 > BASE_NAME = Tcg2ConfigPei > - FILE_GUID = BF7F2B0C-9F2F-4889-AB5C-12460022BE87 > + FILE_GUID = 8AD3148F-945F-46B4-8ACD-71469EA73945 > MODULE_TYPE = PEIM > VERSION_STRING = 1.0 > ENTRY_POINT = Tcg2ConfigPeimEntryPoint > @@ -22,13 +22,8 @@ [Defines] > [Sources] > Tcg2ConfigPeim.c > Tpm12Support.h > - > -[Sources.IA32, Sources.X64] > Tpm12Support.c > > -[Sources.ARM, Sources.AARCH64] > - Tpm12SupportNull.c > - > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > @@ -40,8 +35,6 @@ [LibraryClasses] > DebugLib > PeiServicesLib > Tpm2DeviceLib > - > -[LibraryClasses.IA32, LibraryClasses.X64] > BaseLib > Tpm12DeviceLib > > diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc > index 9aefd73d219c..6380d7660d40 100644 > --- a/OvmfPkg/OvmfTpmPei.fdf.inc > +++ b/OvmfPkg/OvmfTpmPei.fdf.inc > @@ -4,7 +4,7 @@ > > !if $(TPM_ENABLE) == TRUE > INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf > -INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeiCompat12.inf > INF SecurityPkg/Tcg/TcgPei/TcgPei.inf > INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf