* [PATCH 1/1] OvmfPkg/Bhyve: include TPM driver
2023-06-06 13:20 [PATCH 0/1] bhyve: TPM support for OVMF Corvin Köhne
@ 2023-06-06 13:20 ` Corvin Köhne
2023-06-06 13:23 ` [PATCH 0/1] bhyve: TPM support for OVMF Corvin Köhne
1 sibling, 0 replies; 3+ messages in thread
From: Corvin Köhne @ 2023-06-06 13:20 UTC (permalink / raw)
To: devel; +Cc: Corvin Köhne
From: Corvin Köhne <c.koehne@beckhoff.com>
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 <c.koehne@beckhoff.com>
---
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 bb317a50e6af..5ff0b1a22438 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
@@ -563,12 +564,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.
@@ -608,6 +614,8 @@ [Components]
<LibraryClasses>
}
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
+
#
# DXE Phase modules
#
@@ -631,6 +639,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
@@ -825,3 +834,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.40.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] bhyve: TPM support for OVMF
2023-06-06 13:20 [PATCH 0/1] bhyve: TPM support for OVMF Corvin Köhne
2023-06-06 13:20 ` [PATCH 1/1] OvmfPkg/Bhyve: include TPM driver Corvin Köhne
@ 2023-06-06 13:23 ` Corvin Köhne
1 sibling, 0 replies; 3+ messages in thread
From: Corvin Köhne @ 2023-06-06 13:23 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
On Tue, 2023-06-06 at 15:20 +0200, Corvin Köhne wrote:
> Hi,
>
> I'm currently working on TPM emulation for bhyve. Therefore, the
> guest
> firmware has to set up the TPM device properly for the guest OS. I'd
> like to send the attached patch to the EDKII project.
>
> Any comments are appreciated.
>
> Thanks,
> Corvin
>
> Corvin Köhne (1):
> OvmfPkg/Bhyve: include TPM driver
>
> OvmfPkg/Bhyve/BhyveX64.dsc | 17 +++++++++++++++--
> OvmfPkg/Bhyve/BhyveX64.fdf | 7 +++++++
> 2 files changed, 22 insertions(+), 2 deletions(-)
>
Sry, wrong mailing list at the moment. I'd like to send this to the
FreeBSD virtualization list for discussion before sending it to EDKII.
So, please ignore it yet.
--
Kind regards,
Corvin
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread