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.web10.5675.1687175689780751094 for ; Mon, 19 Jun 2023 04:54:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@freebsd.org header.s=dkim header.b=AYjZ1Lqs; spf=pass (domain: freebsd.org, ip: 96.47.72.81, mailfrom: corvink@freebsd.org) Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (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 4Ql7VK0xbVz3sm8; Mon, 19 Jun 2023 11:54:49 +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 4Ql7VK0CBFz4749; Mon, 19 Jun 2023 11:54:49 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687175689; 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=ZKMFXyT953qAEwGpJ9e/oiKrFKkCFOnTLOnQetsu6YM=; b=AYjZ1LqseQg8yK5FkPHt6QJiY/l6ORZwqaR2K/SKAZUEPyx+l10a9sWPa+nuDq+BIj2Obu ctq7zEHhvDShnyl5R/HK2KP5CEnOFiAfexN9hAj0WJE2rIl6joMaTcaehZU6qGw33yAZZl 6Tngd8KRGs7DilLkcQRnATtTJtLPlQSt6R31KdZ6HQ1DUsNpv7/LrL6Gwq0kH8sviREG// rUPPlsuWgkJFbyZCikTyMTGKFSt1g6o0Ueda1qpyoni2XuWBbu6t2FrckxmTKrsvkrea+3 0MfGXjhjy/3uBO+his05B1LBwrEpV/x4klB/4NvkQjMT/pCV6Q0XuLhqrfqqtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687175689; 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=ZKMFXyT953qAEwGpJ9e/oiKrFKkCFOnTLOnQetsu6YM=; b=c6PczikKGyIaD/AT0iTfJW3xVlrGKgXIr1xgRA6w9GJspR9RQvqMr7o4hK72neVOylRBbJ gbA86BSzCKqvds3GK1/eZBE5PBbSynFK0aA5a/xkgtK4sCelFIObnLZuKFZ5rFSAqKruha 8AsyXF536BZMhXiBaSucRUWlrk51AbaYIAd2aSHshs/s8BKpghFJM2sIvb3ooykd7aCELy +Nz2aXXmaOziF/MzVtby22i8AnVLRJ1zoOXrg+f3ZLGnir9wRhL9moaoqNQxsFZuooRM1C Dv1uIIPsiwLFZ+bE/lWtqYoer1jqxBH8gYHGZGnG8MbbQVpL356Pievp8h4mtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687175689; a=rsa-sha256; cv=none; b=AOCNSqUigBAIRzDLEc8f279g5++AfaInYtIkecZHENDZU8p5QPS2AokAYqP0+edQJ7YW8o p7U5Y5m043CxDv4J1UYCbWRw3te1ttT9gK+RM5EFc5MBoHiRy56kpW0nuJD040MsSmBtW5 LPCytzcPs0oCicK5U0nGfB3WmwV1QOkiEU/QdvblpNYf8xclxdBCbK200QfKGckm79Ynll ZrJpwlyyeHfloLmQl+kmATqxISEnHcyVlBxEL6tx6vswscQUTQ2ZKKc61XrSOob9DoRcp5 pAh3rPCw+1NW0jqf+nQ1F/Ws8wSIwakVniJZmuBWICR9+3LK/My8YIEAIiXUhg== Received: from corvink-nb.fritz.box (unknown [IPv6:2001:9e8:da5e:c500:c216:138:c907:f83b]) (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 4Ql7VJ0Jw4zT71; Mon, 19 Jun 2023 11:54:47 +0000 (UTC) (envelope-from corvink@FreeBSD.org) From: =?UTF-8?B?Q29ydmluIEvDtmhuZQ==?= To: devel@edk2.groups.io Cc: Rebecca Cran , Gerd Hoffmann , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Peter Grehan Subject: [PATCH v3 1/1] OvmfPkg/Bhyve: include TPM driver Date: Mon, 19 Jun 2023 13:54:12 +0200 Message-ID: <20230619115440.307678-2-corvink@FreeBSD.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230619115440.307678-1-corvink@FreeBSD.org> References: <20230619115440.307678-1-corvink@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 Reviewed-by: Rebecca Cran Acked-by: Gerd Hoffmann Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Peter Grehan --- 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 =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 @@ -564,12 +565,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. @@ -609,6 +615,8 @@ [Components] } =20 +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc + # # DXE Phase modules # @@ -632,6 +640,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 @@ -826,3 +835,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.41.0