From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx2.freebsd.org (mx2.freebsd.org [96.47.72.81]) by mx.groups.io with SMTP id smtpd.web11.8738.1686057665725525044 for ; Tue, 06 Jun 2023 06:21:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@freebsd.org header.s=dkim header.b=kZS75I4k; spf=pass (domain: freebsd.org, ip: 96.47.72.81, mailfrom: corvink@freebsd.org) Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "mx1.freebsd.org", Issuer "R3" (verified OK)) by mx2.freebsd.org (Postfix) with ESMTPS id 4QbB1s09yzz3p67; Tue, 6 Jun 2023 13:21:05 +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 4QbB1r6NzXz3R2W; Tue, 6 Jun 2023 13:21:04 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686057664; 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=kZS75I4k+wjSs9Mn9S6daNXJuuhvOXcm03kxwMARuzrtTqJgCx79Ha1to8POWXrjXf5qPg tUjU43JX/Gwfor0fNm2F+WJGAwZiZIT9Pyr/qeNG3HGBWon6Yx8IXzv+X4jTwInNa2KiVV WjtqqvhMWYvkYb/hhJJLSxAfBmplJB2MPyht5LKL/3/ZGOsd8r1rzahA4LIhasAEPjJS5Q oUxxw651IaF6qjjbiFoonvpzG8QBJh5QoBPzQelTG2vZlyN1LDlhZTNASQ4i3dQPIJ/+ys IX5rGoSyllGAv72FpFq72+ExJHAsb/Tpt+r3TdlwagAzPwXnhGoUTk1sw51WxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686057664; 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=en8HkJ3hph9UHsan0WxIAsmq8FRD+1kRSHneFJXVwwlVcL4S4XfHIPQB9iqdxDMEiRSw3i DvspglxPDOE3zBVGZbvm78RZsq7y2bu3vK0hQyYEpdkLL/QZueg+CDUzgI6CYj3HiR1luZ yWsFPrZFgjB4g6IMCYQHyRbCPWFbgxWIJ3Jcost9QNQh8KYDkMq/0Il5RLNO3Q0ipw+JTD PJmz9r/oA05hX/o4xNSyGjEVCFIP1dA2IwK5NR9U1nVuor4JrtxzL5Izc+WI5/GnG3nLSn I3hK7hzGcWlkXKP5XM8OweoPvdQ149eoPPomSWRP5PD8mFaRYpzwfvU+qRX2GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686057664; a=rsa-sha256; cv=none; b=w8ik8waVoEVd3DERSxmSMoqJDP3j5s2wP8QxBACXlvj+pfManpMtOF2xKKkXbYYw33/PDB mNXQHgXW2MEe0QYjwQlyti62WKL9j2KUFj+K6agLqjhaQ9O8xJRm/vafaj8kBMLqgMAp1M mCQonvsIZpJITG6JEtHpLnzTIE903mp+r5Q5CNNPB85bPz1WI29maBmkDjI2BWv9BXgqE/ IZnpRspE+8a2btro4E8ErnACaVaRnzxZW4AHlnZofEedfVWT4pqJ2g/d0Ms4DFK853J6QM XbFxf2lBWAAJzKpVqa5Bp3b0dIcJcZtB0AUUZ/KdaaX0e1dcMrONwc/hgqhdkQ== 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 4QbB1r2m55zk47; Tue, 6 Jun 2023 13:21:04 +0000 (UTC) (envelope-from corvink@FreeBSD.org) From: =?UTF-8?B?Q29ydmluIEvDtmhuZQ==?= To: devel@edk2.groups.io Cc: =?UTF-8?q?Corvin=20K=C3=B6hne?= Subject: [PATCH 1/1] OvmfPkg/Bhyve: include TPM driver Date: Tue, 6 Jun 2023 15:20:39 +0200 Message-Id: <20230606132039.400192-2-corvink@FreeBSD.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606132039.400192-1-corvink@FreeBSD.org> References: <20230606132039.400192-1-corvink@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable From: Corvin K=C3=B6hne 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=C3=B6hne --- 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 =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 +!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc + # # Network definition # @@ -226,8 +228,7 @@ [LibraryClasses] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeL= ib/BaseOrderedCollectionRedBlackTreeLib.inf XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf =20 - Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/Dx= eTcg2PhysicalPresenceLib.inf - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasur= ementLibNull.inf +!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -563,12 +564,17 @@ [PcdsDynamicDefault] =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 +!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 =20 +[PcdsDynamicHii] +!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc + ########################################################################= ######## # # Components Section - list of all EDK II Modules needed by this Platfor= m. @@ -608,6 +614,8 @@ [Components] } =20 +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc + # # DXE Phase modules # @@ -631,6 +639,7 @@ [Components] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificat= ionLib.inf !endif +!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -825,3 +834,7 @@ [Components] NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf } =20 + # + # 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 =20 +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc + ########################################################################= ######## =20 [FV.DXEFV] @@ -335,6 +337,11 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif =20 +# +# TPM support +# +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc + ########################################################################= ######## =20 [FV.FVMAIN_COMPACT] --=20 2.40.1