From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mx.groups.io with SMTP id smtpd.web08.181.1623880517088453775 for ; Wed, 16 Jun 2021 14:55:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tBMwZIe+; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id 3E8DA613C1 for ; Wed, 16 Jun 2021 21:55:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623880516; bh=CQheZPwthuoXzbMu8MAa/8mQqQyFYxD3y9A4OLoZLtU=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=tBMwZIe+auUe8wV7XRT1t1wilDtTGOCNCiedOb7EClDWSqOzpAX24G4LGyq05scXi JgtF/O60zacG/ppSoUK45m4gJHwNO1s501eLx/ole+vG31F6SOc9Boh9kYEFTaOSp2 erm6IYTLK8/uyoU20sszyKo55I49zofrb0UxcafG0XZmj8sUOIypb6VjTQdCAjwLQb SwagAdb0MZ5s+OjWJPRk7qx2eVqK/quLFQ2QRDr9m0fOBYB2f0PO7cu5sr04qITt+S 0yVeCDP1CsoYK7dRGXuQJNfoeS5ev+y8+TWtR5o0FVY4LnD0zEzn9HOq9noTFBGq3P Pwp5u2kkTvtGA== Received: by mail-ot1-f46.google.com with SMTP id 7-20020a9d0d070000b0290439abcef697so4085399oti.2 for ; Wed, 16 Jun 2021 14:55:16 -0700 (PDT) X-Gm-Message-State: AOAM533XY9F62pnTA6y9sYEs+b5d7M7CNYTHkV0Z3v1fkkolzvza3cy9 4tHaSch5BlESp1i382F4eUOsfyoRLmiiWzDi9Gs= X-Google-Smtp-Source: ABdhPJxlrM5tDQjp8XVz94QoPFq+f7+1Mo2TnZPEcfO46O6WoplrQ35S4EuLWaKHqYq3CfV7LwzLl8/Tg45t9Tc+cL0= X-Received: by 2002:a9d:4c83:: with SMTP id m3mr1726899otf.77.1623880515426; Wed, 16 Jun 2021 14:55:15 -0700 (PDT) MIME-Version: 1.0 References: <20210612204340.52290-1-rebecca@bsdio.com> In-Reply-To: From: "Ard Biesheuvel" Date: Wed, 16 Jun 2021 23:55:03 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [PATCH] OvmfPkg/Bhyve: clean up TPM_ENABLE remnants To: Sean Brogan Cc: Michael Kinney , Peter Grehan , Laszlo Ersek , Ard Biesheuvel , Jordan Justen , Sean Brogan , Rebecca Cran , edk2-devel-groups-io Content-Type: text/plain; charset="UTF-8" On Wed, 16 Jun 2021 at 21:00, Sean Brogan wrote: > > Ard, > > The PR you are trying to "push" has a mergify merge in it which is > causing patchcheck to fail. > > https://github.com/tianocore/edk2/pull/1727/commits > Ah, I missed that. So the base of my branch was out of date, and the merge was done automatically, right? I think we still want linear history in EDK2, so this should probably be rejected before even reaching the point where the tools perform the merge by themselves. > > > Mike, > > I think github has better features now around things like auto complete > PR when "checks pass" and allow rebase merging and finally protections > to only allow linear history. Might be time to talk about changes to > mergify/github. I know you are busy so maybe opening up to more of the > edk2 community or actively looking for someone willing to provide best > practices for github usage (rust-lang and nodejs both do a lot with > github). > > > Thanks > Sean > > > > > > On 6/16/2021 8:58 AM, Ard Biesheuvel wrote: > > (+ Sean, Mike) > > > > On Sat, 12 Jun 2021 at 22:43, Rebecca Cran wrote: > >> > >> 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=3354 . > >> > >> Signed-off-by: Rebecca Cran > > > > Strangely enough, this patch gets rejected by PatchCheck for lack of a > > Signed-off-by line > > > > https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=24198&view=results > > > > The patch itself looks good to me > > > > Acked-by: Ard Biesheuvel > > > > so if anyone else manages to fix the CI issue, feel free to push the > > patch with my R-b (and Peter's, given in reply to this message) > > > > (I will go offline for 3 weeks after Friday) > > > >> --- > >> 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 = FALSE > >> DEFINE SMM_REQUIRE = FALSE > >> DEFINE SOURCE_DEBUG_ENABLE = FALSE > >> - DEFINE TPM_ENABLE = FALSE > >> - DEFINE TPM_CONFIG_ENABLE = FALSE > >> > >> # > >> # Network definition > >> @@ -221,16 +219,8 @@ > >> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf > >> XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf > >> > >> - > >> -!if $(TPM_ENABLE) == TRUE > >> - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf > >> - Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf > >> - Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf > >> - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf > >> -!else > >> Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf > >> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > >> -!endif > >> > >> [LibraryClasses.common] > >> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > >> @@ -292,11 +282,6 @@ > >> CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > >> PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > >> > >> -!if $(TPM_ENABLE) == TRUE > >> - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > >> - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf > >> -!endif > >> - > >> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf > >> > >> [LibraryClasses.common.DXE_CORE] > >> @@ -366,9 +351,6 @@ > >> !endif > >> PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > >> MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf > >> -!if $(TPM_ENABLE) == TRUE > >> - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf > >> -!endif > >> > >> [LibraryClasses.common.UEFI_APPLICATION] > >> PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > >> @@ -563,22 +545,12 @@ > >> > >> gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 > >> > >> -!if $(TPM_ENABLE) == 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 > >> > >> -[PcdsDynamicHii] > >> -!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE > >> - gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS > >> - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS > >> -!endif > >> - > >> ################################################################################ > >> # > >> # Components Section - list of all EDK II Modules needed by this Platform. > >> @@ -618,19 +590,6 @@ > >> > >> } > >> > >> -!if $(TPM_ENABLE) == TRUE > >> - OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf > >> - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { > >> - > >> - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.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) == TRUE > >> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > >> -!endif > >> -!if $(TPM_ENABLE) == TRUE > >> - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf > >> !endif > >> } > >> > >> @@ -841,23 +797,3 @@ > >> NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf > >> } > >> > >> - > >> - # > >> - # TPM support > >> - # > >> -!if $(TPM_ENABLE) == TRUE > >> - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { > >> - > >> - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf > >> - NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf > >> - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.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) == 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/S3Resume2Pei.inf > >> INF OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf > >> !endif > >> > >> -!if $(TPM_ENABLE) == TRUE > >> -INF OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf > >> -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > >> -!endif > >> - > >> ################################################################################ > >> > >> [FV.DXEFV] > >> @@ -333,16 +328,6 @@ INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > >> INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > >> !endif > >> > >> -# > >> -# TPM support > >> -# > >> -!if $(TPM_ENABLE) == TRUE > >> -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > >> -!if $(TPM_CONFIG_ENABLE) == TRUE > >> -INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > >> -!endif > >> -!endif > >> - > >> ################################################################################ > >> > >> [FV.FVMAIN_COMPACT] > >> -- > >> 2.32.0 > >> > >> > > > > > > > > > >