From nobody Wed Feb 11 03:02:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+82454+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82454+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1634818862; cv=none; d=zohomail.com; s=zohoarc; b=nVcPCUPyIuTCHoonzUU8+Xf3m/dZkr2fQ9urGdB6I/CaMgQL5cB+Y1tjkHJuxgca2ue1HPeGONHeGccCO0IsaUGuNRYEFNIi3/WU6lvqY4xs+jjgirLD/NsN7SAcuEEGY4j7VqArHPUUSjuNCwuifGlgOjhzfSmNBpamJwME/oE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634818862; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=j13Q7oetrSwzKNtDpaZ0UldtGWamVcwO1Y7z+G+i3pk=; b=AJ/I/9vRM0DjTjtmMNRFBMrEcQRf5+mz+q/qOq997WjonV81OCeW8OO6X60hCAFyrjQf8HeDLYnQizvRWMIETbwNSGWwLC0VmQHPkE0EpVsjErZ4+AzB7YtUzNkDtW7HxNYWnozZzpnAoQxtbnTTPGjxtNLXoQRvysHmGvsVdQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82454+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1634818862168257.3585191364044; Thu, 21 Oct 2021 05:21:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WYuxYY1788612xgmjZIvtvhW; Thu, 21 Oct 2021 05:21:01 -0700 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.8584.1634818861111240016 for ; Thu, 21 Oct 2021 05:21:01 -0700 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-OnmGiNaWPTi4HrevIK0y7w-1; Thu, 21 Oct 2021 08:20:57 -0400 X-MC-Unique: OnmGiNaWPTi4HrevIK0y7w-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96A2810168C7; Thu, 21 Oct 2021 12:20:55 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26B9757CA4; Thu, 21 Oct 2021 12:20:32 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C2DAC180090A; Thu, 21 Oct 2021 14:20:03 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Gerd Hoffmann , James Bottomley , Min Xu , Jordan Justen , Erdem Aktas , Stefan Berger , Ard Biesheuvel , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Jiewen Yao , Tom Lendacky , Brijesh Singh Subject: [edk2-devel] [PATCH 2/4] OvmfPkg: create Tcg2ConfigPeiCompat12.inf Date: Thu, 21 Oct 2021 14:20:01 +0200 Message-Id: <20211021122003.2008499-3-kraxel@redhat.com> In-Reply-To: <20211021122003.2008499-1-kraxel@redhat.com> References: <20211021122003.2008499-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,kraxel@redhat.com X-Gm-Message-State: BtfyjPQjuqwcgih6vj2oH0kDx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634818861; bh=GXFOBmRTzelUGPhU5G6QAJ1DkUrvLLhS3EIH0b9/MQU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=mJ+fFcKDYYs3M369J6WfUIsC/GGLcwyGmBlpA8CYtHdtE7jfBbFuFLMGoTei2EBvpR0 Mhs2zdS1xYHqKgQioBnWLITJ0xq57X4Js1x8BI6imYPeY7C4snu56d9a6YNeLjBsPNdSH +sCOEsKXBhBEQweWitMYIpVshOpNFUXWsxc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634818864260100001 Content-Type: text/plain; charset="utf-8" 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. Switch x86 builds to Tcg2ConfigPeiCompat12.inf, so they continue to have TPM 1.2 support. No functional change. Signed-off-by: Gerd Hoffmann Tested-by: Stefan Berger --- OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 2 +- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 9 --------- .../{Tcg2ConfigPei.inf =3D> Tcg2ConfigPeiCompat12.inf} | 9 +-------- OvmfPkg/OvmfTpmPei.fdf.inc | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) copy OvmfPkg/Tcg/Tcg2Config/{Tcg2ConfigPei.inf =3D> Tcg2ConfigPeiCompat12.= inf} (84%) diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponen= tsPei.dsc.inc index 99fa7c13b3e7..b5dc20c4858c 100644 --- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc +++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc @@ -4,7 +4,7 @@ =20 !if $(TPM_ENABLE) =3D=3D 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/Tcg2Con= fig/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 =20 [Packages] @@ -41,10 +36,6 @@ [LibraryClasses] PeiServicesLib Tpm2DeviceLib =20 -[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/Tcg2Con= fig/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 =3D 0x00010005 BASE_NAME =3D Tcg2ConfigPei - FILE_GUID =3D BF7F2B0C-9F2F-4889-AB5C-12460022BE87 + FILE_GUID =3D 8AD3148F-945F-46B4-8ACD-71469EA73945 MODULE_TYPE =3D PEIM VERSION_STRING =3D 1.0 ENTRY_POINT =3D Tcg2ConfigPeimEntryPoint @@ -22,13 +22,8 @@ [Defines] [Sources] Tcg2ConfigPeim.c Tpm12Support.h - -[Sources.IA32, Sources.X64] Tpm12Support.c =20 -[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 =20 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 @@ =20 !if $(TPM_ENABLE) =3D=3D 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 --=20 2.31.1 -=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 (#82454): https://edk2.groups.io/g/devel/message/82454 Mute This Topic: https://groups.io/mt/86487985/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-