Re: [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver

["Ard Biesheuvel" <ardb@kernel.org>]

On Mon, 19 Jun 2023 at 13:54, Corvin Köhne <corvink@freebsd.org> wrote:
>
> Bhyve will gain support for TPM emulation in the near future. Therefore,
> prepare OVMF by copying all TPM driver used by qemu's OVMF DSC into the
> bhyve OVMF DSC.
>
> Signed-off-by: Corvin Köhne <corvink@FreeBSD.org>
> Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Peter Grehan <grehan@freebsd.org>

Merged as #4568

Thanks.

> ---
>  OvmfPkg/Bhyve/BhyveX64.dsc | 17 +++++++++++++++--
>  OvmfPkg/Bhyve/BhyveX64.fdf |  7 +++++++
>  2 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
> index 7b974706f958..7fa40998ae80 100644
> --- a/OvmfPkg/Bhyve/BhyveX64.dsc
> +++ b/OvmfPkg/Bhyve/BhyveX64.dsc
> @@ -32,6 +32,8 @@ [Defines]
>    DEFINE SMM_REQUIRE             = FALSE
>    DEFINE SOURCE_DEBUG_ENABLE     = FALSE
>
> +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
> +
>    #
>    # Network definition
>    #
> @@ -226,8 +228,7 @@ [LibraryClasses]
>    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
>    XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf
>
> -  Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
> -  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
>
>  [LibraryClasses.common]
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
> @@ -564,12 +565,17 @@ [PcdsDynamicDefault]
>
>    gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
>
> +!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
> +
>    # MdeModulePkg resolution sets up the system display resolution
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
>    gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
>
> +[PcdsDynamicHii]
> +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
> +
>  ################################################################################
>  #
>  # Components Section - list of all EDK II Modules needed by this Platform.
> @@ -609,6 +615,8 @@ [Components]
>      <LibraryClasses>
>    }
>
> +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
> +
>    #
>    # DXE Phase modules
>    #
> @@ -632,6 +640,7 @@ [Components]
>  !if $(SECURE_BOOT_ENABLE) == TRUE
>        NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
>  !endif
> +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
>    }
>
>    MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> @@ -826,3 +835,7 @@ [Components]
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>    }
>
> +  #
> +  # TPM support
> +  #
> +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
> diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
> index 3f6270c048cc..c62d5757092e 100644
> --- a/OvmfPkg/Bhyve/BhyveX64.fdf
> +++ b/OvmfPkg/Bhyve/BhyveX64.fdf
> @@ -158,6 +158,8 @@ [FV.PEIFV]
>  INF  OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf
>  !endif
>
> +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
> +
>  ################################################################################
>
>  [FV.DXEFV]
> @@ -335,6 +337,11 @@ [FV.DXEFV]
>  INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>  !endif
>
> +#
> +# TPM support
> +#
> +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> +
>  ################################################################################
>
>  [FV.FVMAIN_COMPACT]
> --
> 2.41.0
>