From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 576A274003D for ; Wed, 17 Jan 2024 09:35:54 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=2zstRwp7yjglS70vfLbiFXJ6oWkztrVSu0/fKtSu6bU=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1705484152; v=1; b=Bt95A0pAxeJdfwA9g7X00kyPBz72HkHvXOI2D5AaeIGRuUXhVc85IrG2kKmQYbtrAkywP1Iv ppn++VmlR/GalEdasnGK5XuurltKnqgO3qie8Vdw9Bsq8CybnMLcbRBJMZTV6zBDaMiNQ8hT19g l79GUBjj4X3Lh8ylEgcKWEvw= X-Received: by 127.0.0.2 with SMTP id ePThYY7687511xLeHHg69ZsY; Wed, 17 Jan 2024 01:35:52 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.5970.1705484152339486190 for ; Wed, 17 Jan 2024 01:35:52 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-4s8ZOCQsPfWL1i7GY2f1Vg-1; Wed, 17 Jan 2024 04:35:49 -0500 X-MC-Unique: 4s8ZOCQsPfWL1i7GY2f1Vg-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 98EC41064CC1 for ; Wed, 17 Jan 2024 09:35:49 +0000 (UTC) X-Received: from [10.39.192.21] (unknown [10.39.192.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E55ED51E3; Wed, 17 Jan 2024 09:35:48 +0000 (UTC) Message-ID: <9f928f55-a848-239f-9b7c-744af29984e6@redhat.com> Date: Wed, 17 Jan 2024 10:35:47 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 1/2] OvmfPkg: remove TPM1_ENABLE build option To: devel@edk2.groups.io, kraxel@redhat.com Cc: Oliver Steffen References: <20240116154229.554679-1-kraxel@redhat.com> <20240116154229.554679-2-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240116154229.554679-2-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 8M0QnZfOCoMp6oZHkmFETDErx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Bt95A0pA; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 1/16/24 16:42, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc | 6 ------ > OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc | 5 ----- > OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc | 3 --- > OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc | 9 --------- > OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc | 6 ------ > OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc | 3 --- > OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc | 5 ----- > OvmfPkg/PlatformCI/ReadMe.md | 2 +- > 8 files changed, 1 insertion(+), 38 deletions(-) >=20 > diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/I= nclude/Dsc/OvmfTpmComponentsDxe.dsc.inc > index 75ae09571e8c..eef20b77149a 100644 > --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc > +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc > @@ -15,12 +15,6 @@ > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > } > SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > -!if $(TPM1_ENABLE) =3D=3D TRUE > - SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { > - > - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceL= ibDTpm.inf > - } > -!endif > SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { > > TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHiera= rchyLib/PeiDxeTpmPlatformHierarchyLib.inf > diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/I= nclude/Dsc/OvmfTpmComponentsPei.dsc.inc > index fa486eed82d2..b91f29e5a64b 100644 > --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc > +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc > @@ -4,12 +4,7 @@ > =20 > !if $(TPM2_ENABLE) =3D=3D TRUE > OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf > -!if $(TPM1_ENABLE) =3D=3D TRUE > - OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf > - SecurityPkg/Tcg/TcgPei/TcgPei.inf > -!else > OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > -!endif > SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { > > HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCry= ptoRouterPei.inf > diff --git a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc b/OvmfPkg/Include= /Dsc/OvmfTpmDefines.dsc.inc > index a65564d8d9d2..ad3740a4737a 100644 > --- a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc > +++ b/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc > @@ -3,6 +3,3 @@ > ## > =20 > DEFINE TPM2_ENABLE =3D FALSE > - > - # has no effect unless TPM2_ENABLE =3D=3D TRUE > - DEFINE TPM1_ENABLE =3D TRUE > diff --git a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc b/OvmfPkg/Include/Ds= c/OvmfTpmLibs.dsc.inc > index b97244695b52..e02a5d02d1a5 100644 > --- a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc > +++ b/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc > @@ -4,9 +4,6 @@ > =20 > [LibraryClasses] > !if $(TPM2_ENABLE) =3D=3D TRUE > -!if $(TPM1_ENABLE) =3D=3D TRUE > - Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.in= f > -!endif > Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf > Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/Dx= eTcg2PhysicalPresenceLib.inf > Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLi= bNull.inf > @@ -27,16 +24,10 @@ [LibraryClasses] > [LibraryClasses.common.PEIM] > !if $(TPM2_ENABLE) =3D=3D TRUE > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > -!if $(TPM1_ENABLE) =3D=3D TRUE > - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDT= pm.inf > -!endif > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.= inf > !endif > =20 > [LibraryClasses.common.DXE_DRIVER] > !if $(TPM2_ENABLE) =3D=3D TRUE > -!if $(TPM1_ENABLE) =3D=3D TRUE > - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg= .inf > -!endif > Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.= inf > !endif > diff --git a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/In= clude/Dsc/OvmfTpmSecurityStub.dsc.inc > index 89455feca4d9..c40d6b0a0e78 100644 > --- a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc > +++ b/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc > @@ -2,12 +2,6 @@ > # SPDX-License-Identifier: BSD-2-Clause-Patent > ## > =20 > -!if $(TPM2_ENABLE) =3D=3D TRUE > -!if $(TPM1_ENABLE) =3D=3D TRUE > - NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib= .inf > -!endif > -!endif > - > !if $(TPM2_ENABLE) =3D=3D TRUE || $(CC_MEASUREMENT_ENABLE) =3D=3D TRUE > # > # DxeTpm2MeasureBootLib provides security service of TPM2 measure = boot and > diff --git a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc b/OvmfPkg/Include/Fdf= /OvmfTpmDxe.fdf.inc > index 7fc2bf8590a4..bd0be8fedbd5 100644 > --- a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc > +++ b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc > @@ -3,9 +3,6 @@ > ## > =20 > !if $(TPM2_ENABLE) =3D=3D TRUE > -!if $(TPM1_ENABLE) =3D=3D TRUE > -INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf > -!endif > INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf > INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > diff --git a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc b/OvmfPkg/Include/Fdf= /OvmfTpmPei.fdf.inc > index 9f8b9bdd5bed..add012afab67 100644 > --- a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc > +++ b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc > @@ -4,12 +4,7 @@ > =20 > !if $(TPM2_ENABLE) =3D=3D TRUE > INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf > -!if $(TPM1_ENABLE) =3D=3D TRUE > -INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf > -INF SecurityPkg/Tcg/TcgPei/TcgPei.inf > -!else > INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf > -!endif > INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf > !endif > diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md > index 10fa32ac489f..33b89df17bc5 100644 > --- a/OvmfPkg/PlatformCI/ReadMe.md > +++ b/OvmfPkg/PlatformCI/ReadMe.md > @@ -14,7 +14,7 @@ supported and are described below. > | IA32 | IA32 | OvmfPkgIa32.dsc | N= one | > | X64 | X64 | OvmfPkgIa64.dsc | N= one | > | IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | N= one | > -| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | S= ECURE_BOOT_ENABLE=3D1 SMM_REQUIRE=3D1 TPM1_ENABLE=3D1 TPM2_ENABLE=3D1 NETWO= RK_TLS_ENABLE=3D1 NETWORK_IP6_ENABLE=3D1 NETWORK_HTTP_BOOT_ENABLE=3D1 | > +| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | S= ECURE_BOOT_ENABLE=3D1 SMM_REQUIRE=3D1 TPM2_ENABLE=3D1 NETWORK_TLS_ENABLE=3D= 1 NETWORK_IP6_ENABLE=3D1 NETWORK_HTTP_BOOT_ENABLE=3D1 | > =20 > ## EDK2 Developer environment > =20 Reviewed-by: Laszlo Ersek -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113939): https://edk2.groups.io/g/devel/message/113939 Mute This Topic: https://groups.io/mt/103764206/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-