* [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver
@ 2023-06-12 5:58 Corvin Köhne
0 siblings, 0 replies; 4+ messages in thread
From: Corvin Köhne @ 2023-06-12 5:58 UTC (permalink / raw)
To: devel
Cc: Corvin Köhne, Rebecca Cran, Ard Biesheuvel, Jiewen Yao,
Jordan Justen, Gerd Hoffmann, Peter Grehan
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>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Peter Grehan <grehan@freebsd.org>
---
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.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 0/1] OvmfPkg/Bhyve: add support for TPM
@ 2023-06-19 11:54 Corvin Köhne
2023-06-19 11:54 ` [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver Corvin Köhne
0 siblings, 1 reply; 4+ messages in thread
From: Corvin Köhne @ 2023-06-19 11:54 UTC (permalink / raw)
To: devel
CI: https://github.com/tianocore/edk2/pull/4531
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(-)
--
2.41.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver
2023-06-19 11:54 [PATCH v3 0/1] OvmfPkg/Bhyve: add support for TPM Corvin Köhne
@ 2023-06-19 11:54 ` Corvin Köhne
2023-06-23 17:38 ` Ard Biesheuvel
0 siblings, 1 reply; 4+ messages in thread
From: Corvin Köhne @ 2023-06-19 11:54 UTC (permalink / raw)
To: devel
Cc: Rebecca Cran, Gerd Hoffmann, Ard Biesheuvel, Jiewen Yao,
Jordan Justen, Peter Grehan
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver
2023-06-19 11:54 ` [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver Corvin Köhne
@ 2023-06-23 17:38 ` Ard Biesheuvel
0 siblings, 0 replies; 4+ messages in thread
From: Ard Biesheuvel @ 2023-06-23 17:38 UTC (permalink / raw)
To: Corvin Köhne
Cc: devel, Rebecca Cran, Gerd Hoffmann, Ard Biesheuvel, Jiewen Yao,
Jordan Justen, Peter Grehan
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-23 17:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-19 11:54 [PATCH v3 0/1] OvmfPkg/Bhyve: add support for TPM Corvin Köhne
2023-06-19 11:54 ` [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver Corvin Köhne
2023-06-23 17:38 ` Ard Biesheuvel
-- strict thread matches above, loose matches on Subject: below --
2023-06-12 5:58 Corvin Köhne
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox