From nobody Sun May 5 18:15:45 2024 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+76436+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+76436+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1623530638; cv=none; d=zohomail.com; s=zohoarc; b=T0Rna7KLX92O0EExXQECa3/KGUeLNWPkv79WN3IXoGjjLCqBFJTDaBCeNy6u09cjF03jeu7+LF2vxaDSdMXH9xc9gFVQKCxyaeWX73J5/9MiyuJUN9yzrcLo4odVHXSlpmtB7t99EhG3jj/H2Kmzz86kFUE9mxKuf/jfmqMNDMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623530638; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=b+xW5hjAYdBh8tm5GL8B36cYLwExzKpMoFf6rAbwHaU=; b=OT/UJG+VkJxlBRip0Owwvvbi/rfBbSOI4k20priRlyvEX0id+txifTGXanaKrWxkX4AmX3JbD1cSkVCvbK6H1Js/ylebhg83KKRYIA5V8TVqG0SaVa/zWALJKbW2wB06aThGia8AqTu6XYSbVDADFAxRA4ShhvyEiYo62PLXoNI= 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+76436+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1623530638890404.94321314073113; Sat, 12 Jun 2021 13:43:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id U1xwYY1788612xuYijc1ltQ1; Sat, 12 Jun 2021 13:43:58 -0700 X-Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by mx.groups.io with SMTP id smtpd.web11.10328.1623530633155821637 for ; Sat, 12 Jun 2021 13:43:53 -0700 X-Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lsATr-00A9wW-1F; Sat, 12 Jun 2021 14:43:47 -0600 X-Received: from mta4.zcs.xmission.com ([166.70.13.68]) by in02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lsATp-0087h2-OE; Sat, 12 Jun 2021 14:43:46 -0600 X-Received: from localhost (localhost [127.0.0.1]) by mta4.zcs.xmission.com (Postfix) with ESMTP id 7968550106B; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) X-Amavis-Modified: Mail body modified (using disclaimer) - mta4.zcs.xmission.com X-Received: from mta4.zcs.xmission.com ([127.0.0.1]) by localhost (mta4.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id v71R94OzpQFz; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) X-Received: from photon.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta4.zcs.xmission.com (Postfix) with ESMTPSA id 347D6500F78; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) From: "Rebecca Cran" To: Peter Grehan , Laszlo Ersek , Ard Biesheuvel , Jordan Justen Cc: Rebecca Cran , devel@edk2.groups.io Date: Sat, 12 Jun 2021 14:43:40 -0600 Message-Id: <20210612204340.52290-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1lsATp-0087h2-OE;;;mid=<20210612204340.52290-1-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.68;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.68 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa04.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.2 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,TooManyTo_001,TooManyTo_002, TooManyTo_003 autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 0.5 TooManyTo_002 Multiple "To" Header Recipients 3x (uncommon) * 0.3 TooManyTo_001 Multiple "To" Header Recipients 2x (uncommon) * 0.6 TooManyTo_003 Multiple "To" Header Recipients 4x (uncommon) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; IP=ok Body=1 Fuz1=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa04 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: *;Peter Grehan , Laszlo Ersek , Ard Biesheuvel , Jordan Justen X-Spam-Relay-Country: X-Spam-Timing: total 753 ms - load_scoreonly_sql: 0.06 (0.0%), signal_user_changed: 13 (1.7%), b_tie_ro: 11 (1.5%), parse: 1.87 (0.2%), extract_message_metadata: 28 (3.7%), get_uri_detail_list: 5 (0.7%), tests_pri_-1000: 8 (1.0%), tests_pri_-950: 1.65 (0.2%), tests_pri_-900: 1.28 (0.2%), tests_pri_-90: 119 (15.9%), check_bayes: 98 (13.0%), b_tokenize: 20 (2.6%), b_tok_get_all: 13 (1.7%), b_comp_prob: 2.9 (0.4%), b_tok_touch_all: 58 (7.7%), b_finish: 1.25 (0.2%), tests_pri_0: 568 (75.4%), check_dkim_signature: 0.81 (0.1%), check_dkim_adsp: 44 (5.8%), poll_dns_idle: 33 (4.4%), tests_pri_10: 2.0 (0.3%), tests_pri_500: 7 (0.9%), rewrite_mail: 0.00 (0.0%) Subject: [edk2-devel] [PATCH] OvmfPkg/Bhyve: clean up TPM_ENABLE remnants X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.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,rebecca@bsdio.com X-Gm-Message-State: h0C1pytgptampitz8qfqNag9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623530638; bh=lDzBiuKp80tpxiELn61T3xO/Yil3w6dTcFtPf5Dwvzw=; h=Cc:Date:From:Reply-To:Subject:To; b=Du/XiHAOR9CzPz7KxSYnuC5Az7xhNKM+WdFkDol+B9aYdr1Foy1vIOxikdYjzoYotKQ 48g/qWlCehujekHFAmKqLCzpJ41sOTpUl6WSlkd3mMEkKvvBu0V7ZAjjQ3mSqnNQNty4r LIAM2CEJpAsCOQkco5aCNVpGchAat26mOzE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" TPM support hasn't been tested and any lines in the .dsc and .fdf files that appear to show support are bogus. Remove them. This fixes https://bugzilla.tianocore.org/show_bug.cgi?id=3D3354 . Signed-off-by: Rebecca Cran Acked-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek Reviewed-by: Peter Grehan --- OvmfPkg/Bhyve/BhyveX64.dsc | 64 -------------------- OvmfPkg/Bhyve/BhyveX64.fdf | 15 ----- 2 files changed, 79 deletions(-) diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index d8792812ab..cbf896e89b 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -31,8 +31,6 @@ DEFINE SECURE_BOOT_ENABLE =3D FALSE DEFINE SMM_REQUIRE =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE - DEFINE TPM_ENABLE =3D FALSE - DEFINE TPM_CONFIG_ENABLE =3D FALSE =20 # # Network definition @@ -221,16 +219,8 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf =20 - -!if $(TPM_ENABLE) =3D=3D TRUE - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf - Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeT= cg2PhysicalPresenceLib.inf - Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf -!else Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeT= cg2PhysicalPresenceLib.inf TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf -!endif =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -292,11 +282,6 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf =20 -!if $(TPM_ENABLE) =3D=3D TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf -!endif - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLi= b.inf =20 [LibraryClasses.common.DXE_CORE] @@ -366,9 +351,6 @@ !endif PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf -!if $(TPM_ENABLE) =3D=3D TRUE - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf -!endif =20 [LibraryClasses.common.UEFI_APPLICATION] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf @@ -563,22 +545,12 @@ =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 -!if $(TPM_ENABLE) =3D=3D TRUE - gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00= , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} -!endif - # MdeModulePkg resolution sets up the system display resolution gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0 gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0 gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0 gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0 =20 -[PcdsDynamicHii] -!if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE - gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|3|NV,BS -!endif - ##########################################################################= ###### # # Components Section - list of all EDK II Modules needed by this Platform. @@ -618,19 +590,6 @@ } =20 -!if $(TPM_ENABLE) =3D=3D TRUE - OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCrypt= oRouterPei.inf - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384= .inf - NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf - } -!endif - # # DXE Phase modules # @@ -653,9 +612,6 @@ !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf -!endif -!if $(TPM_ENABLE) =3D=3D TRUE - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf !endif } =20 @@ -841,23 +797,3 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf } =20 - - # - # TPM support - # -!if $(TPM_ENABLE) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { - - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibR= outerDxe.inf - NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCrypt= oRouterDxe.inf - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf - NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384= .inf - NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf - } -!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -!endif -!endif diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index 3eff36dac1..fbd63a395a 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -158,11 +158,6 @@ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2P= ei.inf INF OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf !endif =20 -!if $(TPM_ENABLE) =3D=3D TRUE -INF OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf -!endif - ##########################################################################= ###### =20 [FV.DXEFV] @@ -333,16 +328,6 @@ INF MdeModulePkg/Universal/FaultTolerantWriteDxe/Faul= tTolerantWriteDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif =20 -# -# TPM support -# -!if $(TPM_ENABLE) =3D=3D TRUE -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE -INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -!endif -!endif - ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] --=20 2.32.0 -=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 (#76436): https://edk2.groups.io/g/devel/message/76436 Mute This Topic: https://groups.io/mt/83497624/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-