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.web08.32001.1635166484219749592 for ; Mon, 25 Oct 2021 05:54:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=jNytUBKe; spf=pass (domain: linux.ibm.com, ip: 148.163.158.5, mailfrom: stefanb@linux.ibm.com) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19PCM1wO027674; Mon, 25 Oct 2021 12:54:42 GMT 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=ypipKbaLZXvY/3IrJRp55eAQ8BpaUZ7ufdrmYa4Xmj0=; b=jNytUBKeZWf3tTeXsEqv/LADD56cGVwkXeLRZPDl7cE/rvG+ZiwcL2UWzQ30R/QUE8LE zm9T60mkEXEUx9vGCG+APAg1q1A4CtXgwZzy2wdB+j8tQSjDgq9/2B8lJyp+A/0yUd8S MIE+JLggQ7RSBj/Q3uW60u24WzrTp+8k3rZbWe9ParsUPfm0CL4uVkcfgXJLsupZVHHO Tutl6bCCRQuW97B2e14tXO1CXgGzeD5yhovRWHUB5JOmDUrwT4L46iuUrqUiH4mdRxBH X/SiCen8/Ss+wa6l39XNf4yzH9pWhf/bRh1Fr3RNm1fx8FbLnU6/0nAq9wgvLjfheJNR XQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bwt35mm38-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Oct 2021 12:54:41 +0000 Received: from m0098421.ppops.net (m0098421.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 19PCpjxf024607; Mon, 25 Oct 2021 12:54:41 GMT Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 3bwt35mm2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Oct 2021 12:54:41 +0000 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 19PCXRQf016021; Mon, 25 Oct 2021 12:54:40 GMT Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by ppma02wdc.us.ibm.com with ESMTP id 3bva1ambe2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Oct 2021 12:54:40 +0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 19PCsdmO19267986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Oct 2021 12:54:39 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A1502805E; Mon, 25 Oct 2021 12:54:39 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDD1F28064; Mon, 25 Oct 2021 12:54:38 +0000 (GMT) Received: from [9.47.158.152] (unknown [9.47.158.152]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 25 Oct 2021 12:54:38 +0000 (GMT) Subject: Re: [PATCH v2 3/5] OvmfPkg: create Tcg12ConfigPei.inf To: Gerd Hoffmann , devel@edk2.groups.io Cc: =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Jordan Justen , Min Xu , Brijesh Singh , Jiewen Yao , James Bottomley , Erdem Aktas , Tom Lendacky , Ard Biesheuvel References: <20211025121512.120926-1-kraxel@redhat.com> <20211025121512.120926-4-kraxel@redhat.com> From: "Stefan Berger" Message-ID: <215305c4-081b-8d6f-bd3c-897462ccbdde@linux.ibm.com> Date: Mon, 25 Oct 2021 08:54:38 -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: <20211025121512.120926-4-kraxel@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Mp_3DnSFZiRlW_oTGKA7nSLFncNLl3DN X-Proofpoint-GUID: l43hZrZ2eJ_T1NjkRRId8YiF1AhAjJdN 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-25_04,2021-10-25_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 adultscore=0 impostorscore=0 malwarescore=0 spamscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110250077 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US On 10/25/21 8:15 AM, Gerd Hoffmann wrote: > Split Tcg2ConfigPei.inf into two variants: Tcg12ConfigPei.inf with TPM > 1.2 backward compatibility included and Tcg2ConfigPei.inf supporting TPM backward compatibility included -> support > 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. > > Switch x86 builds to Tcg12ConfigPei.inf, so they continue to > have TPM 1.2 support. > > No functional change. > > Signed-off-by: Gerd Hoffmann Reviewed-by: Stefan Berger Tested-by: Stefan Berger > --- > OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 2 +- > .../{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} | 11 ++--------- > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 11 +---------- > OvmfPkg/OvmfTpmPei.fdf.inc | 2 +- > 4 files changed, 5 insertions(+), 21 deletions(-) > copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf => Tcg12ConfigPei.inf} (82%) > > diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc > index 99fa7c13b3e7..87d491da5047 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/Tcg12ConfigPei.inf > SecurityPkg/Tcg/TcgPei/TcgPei.inf > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { > > diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf > similarity index 82% > copy from OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > copy to OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf > index 39d1deeed16b..e8e0b88e6058 100644 > --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf > @@ -1,5 +1,5 @@ > ## @file > -# Set TPM device type > +# Set TPM device type - supports TPM 1.2 and 2.0 > # > # In SecurityPkg, this module initializes the TPM device type based on a UEFI > # variable and/or hardware detection. In OvmfPkg, the module only performs TPM > @@ -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/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > index 39d1deeed16b..51078c981374 100644 > --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > @@ -1,5 +1,5 @@ > ## @file > -# Set TPM device type > +# Set TPM device type - supports TPM 2.0 only > # > # In SecurityPkg, this module initializes the TPM device type based on a UEFI > # variable and/or hardware detection. In OvmfPkg, the module only performs TPM > @@ -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/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc > index 9aefd73d219c..709a608cc3bd 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/Tcg12ConfigPei.inf > INF SecurityPkg/Tcg/TcgPei/TcgPei.inf > INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf