From nobody Tue Jun 06 13:24:03 2023 X-Original-To: virtualization@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QbB5X3cy4z4bZTj for ; Tue, 6 Jun 2023 13:24:16 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QbB5X2p90z3hf3; Tue, 6 Jun 2023 13:24:16 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686057856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5agGj9rBUGq+eZqlZteDzIOwjk2PnbDgel8aRNFfcs=; b=Q/hBqy08Xv8p32w/xhqKOys3WsmNYNruOmy/u/gTTiNECWBDwjWqpKAw6TBpduDV12a3fA f+K/dEBYhwIM+IE5nEnwWvCgt8I1TLYCiap4ZjkglvcHNPLzLDTFjDMkcaZ9WAJkPabHA5 XhcfCe9tgwpy+bGh0DR37ur/HtqisS3QEytFoxQXythJUEq11nY6t4sU5mJyuPYAMN05iK fpXFwvwCbAcLTE1oWDdNeVxvhJZ/kppZ5Q3bR+hxDT+QXoI3NSKuQb4v9bYKn/bcQ5cG29 OFwUiLxi4k7ecCs4ZA2coAw3AmlbvDVoNAYwqPTrufMUEFR2lYu9I50fhU2Rig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686057856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A5agGj9rBUGq+eZqlZteDzIOwjk2PnbDgel8aRNFfcs=; b=MjLNMklpS7dWpH7xH//llau/LYlSZ72nxYxPQivi6Cn78KG9D2340V0ICk7FdzSg5MBla3 diPwGlXnD36KFYOWuOE9henHOQR6QPwOGMQiHPaem3bWd2NPlobClr+s3YSUl2QiumlyvJ eqk/bvN/4XAU+EGSKGFBeY18SJUp8M3iKpaivkpoRNFLS8JQPee8A2DUwdBOCnAUrU9h/Z kbBPGDu+oAIJStt3SrvEUEzvjKudIBtJgVQx8PkNPkptoZ+zxx8QmV+IUP4xxn/PuBN5OQ Ti83b3Hp6XBuZAWegQuWEd/j0x2peTdFydtTYi/3ZS7Xi606I9zBzMPeTDRfmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686057856; a=rsa-sha256; cv=none; b=uDvkNCMrxHZ8fvMZy+a9BIUVGvsEctyH7qsc1+Eh4v2JC0h07fSAViiR3vwodzxqTrI0ZH mqgUXaeNsXWSYeyCtz8/9U1+yQHEyeRHVSbtGCwArfX99mXu7HjiDfSezhGX1isJ09+Z2T 0eEBO8PRwf7ap24e2FZtYinq7U9FIdzPSZpIIPH/KvxG5EFsIo6rhEaLe3isJEgpIwAU9u qlMODc0QVhRKs0G/pT+vo0UFpc0n1IcGGT23qtQQgrvpMhBnbbnJTLWeQ5RkTHcf3iUaXt mM0/rBJqQdmIZglRTUVieej+qPFQHOz8YIMBU9sdNjz09+qXZTqq/dN4wI7m/A== Received: from corvink-nb.beckhoff.com (unknown [IPv6:2001:9e8:da59:8e00:1c7e:7163:67b2:a7d8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QbB5W6MwJzkvf; Tue, 6 Jun 2023 13:24:15 +0000 (UTC) (envelope-from corvink@FreeBSD.org) From: =?UTF-8?q?Corvin=20K=C3=B6hne?= To: virtualization@freebsd.org Cc: =?UTF-8?q?Corvin=20K=C3=B6hne?= Subject: [PATCH 1/1] OvmfPkg/Bhyve: include TPM driver Date: Tue, 6 Jun 2023 15:24:03 +0200 Message-Id: <20230606132403.403406-2-corvink@FreeBSD.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606132403.403406-1-corvink@FreeBSD.org> References: <20230606132403.403406-1-corvink@FreeBSD.org> List-Id: Discussion List-Archive: https://lists.freebsd.org/archives/freebsd-virtualization List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-virtualization@freebsd.org X-BeenThere: freebsd-virtualization@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N From: Corvin Köhne 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 --- 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] } +!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