From: "Stefan Berger" <stefanb@linux.ibm.com>
To: Gerd Hoffmann <kraxel@redhat.com>, devel@edk2.groups.io
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Jordan Justen" <jordan.l.justen@intel.com>,
"Min Xu" <min.m.xu@intel.com>,
"Brijesh Singh" <brijesh.singh@amd.com>,
"Jiewen Yao" <jiewen.yao@intel.com>,
"James Bottomley" <jejb@linux.ibm.com>,
"Erdem Aktas" <erdemaktas@google.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"Ard Biesheuvel" <ardb+tianocore@kernel.org>
Subject: Re: [PATCH v2 2/5] OvmfPkg: drop TPM_CONFIG_ENABLE
Date: Mon, 25 Oct 2021 08:40:07 -0400 [thread overview]
Message-ID: <30196100-5291-e337-0277-e9c9fc12262c@linux.ibm.com> (raw)
In-Reply-To: <20211025121512.120926-3-kraxel@redhat.com>
On 10/25/21 8:15 AM, Gerd Hoffmann wrote:
> Drop TPM_CONFIG_ENABLE config option. Including TPM support in the
> build without also including the TPM configuration menu is not useful.
>
> Suggested-by: Stefan Berger <stefanb@linux.ibm.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
2 more files would need this change:
./OvmfPkg/Microvm/MicrovmX64.dsc: DEFINE TPM_CONFIG_ENABLE = FALSE
./OvmfPkg/PlatformCI/ReadMe.md:| IA32 X64 Full | PEI-IA32
DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1
TPM_ENABLE=1 TPM_CONFIG_ENABLE=1 NETWORK_TLS_ENABLE=1
NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
I tested it:
Tested-by: Stefan Berger <stefanb@linux.ibm.com>
> ---
> OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 2 --
> OvmfPkg/OvmfTpmDefines.dsc.inc | 1 -
> OvmfPkg/OvmfTpmPcdsHii.dsc.inc | 2 +-
> OvmfPkg/OvmfTpmDxe.fdf.inc | 2 --
> OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 +++---
> OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 6 +++---
> 6 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> index d5c2586118f1..e025d85a5878 100644
> --- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> +++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> @@ -14,9 +14,7 @@
> NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
> }
> -!if $(TPM_CONFIG_ENABLE) == TRUE
> SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
> -!endif
> SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
> <LibraryClasses>
> Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
> diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc
> index 51da7508b307..5df4a331fb99 100644
> --- a/OvmfPkg/OvmfTpmDefines.dsc.inc
> +++ b/OvmfPkg/OvmfTpmDefines.dsc.inc
> @@ -3,4 +3,3 @@
> ##
>
> DEFINE TPM_ENABLE = FALSE
> - DEFINE TPM_CONFIG_ENABLE = FALSE
> diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
> index 164bc9c7fca0..2e02a5b4cb90 100644
> --- a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
> +++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
> @@ -2,7 +2,7 @@
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> -!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE
> +!if $(TPM_ENABLE) == TRUE
> gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS
> gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
> !endif
> diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc
> index 9dcdaaf01c39..32eef246387a 100644
> --- a/OvmfPkg/OvmfTpmDxe.fdf.inc
> +++ b/OvmfPkg/OvmfTpmDxe.fdf.inc
> @@ -6,7 +6,5 @@
> INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
> INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> -!if $(TPM_CONFIG_ENABLE) == TRUE
> INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
> !endif
> -!endif
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index 7117b86b8177..1774423580b9 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -95,21 +95,21 @@ jobs:
> OVMF_IA32X64_FULL_DEBUG:
> Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> Build.Arch: "IA32,X64"
> - Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> Build.Target: "DEBUG"
> Run.Flags: $(run_flags)
> Run: $(should_run)
> OVMF_IA32X64_FULL_RELEASE:
> Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> Build.Arch: "IA32,X64"
> - Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> Build.Target: "RELEASE"
> Run.Flags: $(run_flags)
> Run: $(should_run)
> OVMF_IA32X64_FULL_NOOPT:
> Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> Build.Arch: "IA32,X64"
> - Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> Build.Target: "NOOPT"
> Run.Flags: $(run_flags)
> Run: $(should_run)
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index 2e07a3d8893a..09f9851312a2 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -94,14 +94,14 @@ jobs:
> OVMF_IA32X64_FULL_DEBUG:
> Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> Build.Arch: "IA32,X64"
> - Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> Build.Target: "DEBUG"
> Run.Flags: $(run_flags)
> Run: $(should_run)
> OVMF_IA32X64_FULL_RELEASE:
> Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> Build.Arch: "IA32,X64"
> - Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> Build.Target: "RELEASE"
> Run.Flags: $(run_flags)
> Run: $(should_run)
> @@ -112,7 +112,7 @@ jobs:
> # OVMF_IA32X64_FULL_NOOPT:
> # Build.File: "$(package)/PlatformCI/PlatformBuild.py"
> # Build.Arch: "IA32,X64"
> - # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> + # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1"
> # Build.Target: "NOOPT"
> # Run.Flags: $(run_flags)
> # Run: $(should_run)
next prev parent reply other threads:[~2021-10-25 12:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 12:15 [PATCH v2 0/5] OvmfPkg: rework TPM configuration Gerd Hoffmann
2021-10-25 12:15 ` [PATCH v2 1/5] OvmfPkg: move tcg configuration to dsc and fdf include files Gerd Hoffmann
2021-10-25 13:21 ` Stefan Berger
2021-10-25 12:15 ` [PATCH v2 2/5] OvmfPkg: drop TPM_CONFIG_ENABLE Gerd Hoffmann
2021-10-25 12:40 ` Stefan Berger [this message]
2021-10-25 12:15 ` [PATCH v2 3/5] OvmfPkg: create Tcg12ConfigPei.inf Gerd Hoffmann
2021-10-25 12:54 ` Stefan Berger
2021-10-25 12:15 ` [PATCH v2 4/5] OvmfPkg: rework TPM configuration Gerd Hoffmann
2021-10-25 13:06 ` Stefan Berger
2021-10-25 12:15 ` [PATCH v2 5/5] OvmfPkg: add TPM 1.2 config menu Gerd Hoffmann
2021-10-25 13:12 ` Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30196100-5291-e337-0277-e9c9fc12262c@linux.ibm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox