From nobody Fri May 17 07:47:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105861+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105861+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1686143856380614.3471915124427; Wed, 7 Jun 2023 06:17:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id J4rfYY1788612xGUTvBfUKyT; Wed, 07 Jun 2023 06:17:36 -0700 X-Received: from mx2.freebsd.org (mx2.freebsd.org [96.47.72.81]) by mx.groups.io with SMTP id smtpd.web11.8215.1686143855218880919 for ; Wed, 07 Jun 2023 06:17:35 -0700 X-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 4QbnvL0byWz4NTq; Wed, 7 Jun 2023 13:17:34 +0000 (UTC) (envelope-from corvink@FreeBSD.org) X-Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4QbnvK6VY5z4FMZ; Wed, 7 Jun 2023 13:17:33 +0000 (UTC) (envelope-from corvink@FreeBSD.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686143853; 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=KLXJ0eP5fJmJmyPXU9qWatxZ2sYtMa1lzZb4UY+41gw=; b=het6D0ZA8AlhQkt1aqsp5/JcQ2DMEbb4vOvBCtDGi3ejZq0hTHcvvcK12Lb1bjgb35NdeX A/5k5HLI0+h+yBk2hOrn2nJ9TuU+W3MVq3qQGBwIj2nceA75WKkId1+KcyUnG7h7tETOf+ VYQr0uMZzORJljmFiLuY5H5Mcf8hELFXcw+ysc6r450dlXUx/YCtijXlTv3szr5J14YL0u hue10hcOpaswfZHkGMQHe3LxucjZgd4G6OBY4n4RPpZ1TUCY2ntC+dNMK+R7QvuC6e1fek 7SYbjPP54iCU6MNi/dtf3XJjZwo8FdNu3mW/DA0Tk2aQUQrsautVVSXO8GwHhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686143853; a=rsa-sha256; cv=none; b=aEau0iG23l8lz2T/4e9GXH0rqoZBcrxu0A0t2pV89sdrqLmqryg4yaWNRgmQCsTVnf5n/P 0RPeAvGL8Spbe1KwzWyScR41X4gbQlAv7aYcS9eMBcseIYeEdudvqDlJrMWnbzfUQyUOp4 3afWbbDh4gwQX3akefA6yZYtICuAZoi10N3htNXmR+xvL73MX8CGwUnCIKtUUpWUm2UMVA NGtdKvfjeUW0RK6R/P4B38Fn4NpLQ6/ulM+VrEnU1MHe7iNj97crdfiwxG65kVMun7Pj5B v/s8mlOQUsUeAl2dJKAgANMIOyfGXTMfQcDLejAGTKq49NtieyMfh1qEymeqdw== X-Received: from corvink-nb.beckhoff.com (unknown [IPv6:2001:9e8:da40:ab00:522b:9c8e:1172:5252]) (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 4QbnvJ5zd4zG9M; Wed, 7 Jun 2023 13:17:32 +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?= , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Rebecca Cran , Peter Grehan Subject: [edk2-devel] [PATCH v2 1/1] OvmfPkg/Bhyve: include TPM driver Date: Wed, 7 Jun 2023 15:17:19 +0200 Message-Id: <20230607131719.514706-2-corvink@FreeBSD.org> In-Reply-To: <20230607131719.514706-1-corvink@FreeBSD.org> References: <20230607131719.514706-1-corvink@FreeBSD.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,corvink@FreeBSD.org X-Gm-Message-State: Iharo1JwdwMfcCtHAk0j8eNxx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1686143856; bh=/fqhha8XDb5PB2FS0carcOzzlXWF2TZgn2JouLF6xoA=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=AoyrynUKRPj62you9ifxqswXxCS5VNFyU4Z9eJPKfE+k7BDzEc1L9yHETlzUTs9Meih gaP+mQITe4Z+PmNJMpamFwWhQMUjtvn/hkATit7Lryk+BpFTyF1Ls/+2FTf6nIoAwj731 jC3gTvQt2n71YtTWlbcVQxns5Et2mAJh/gE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1686143857869100004 Content-Type: text/plain; charset="utf-8" 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 Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Rebecca Cran Cc: Peter Grehan Acked-by: Gerd Hoffmann Reviewed-by: Rebecca Cran --- 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/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf =20 - Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeT= cg2PhysicalPresenceLib.inf - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.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 Platform. @@ -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/DxeImageVerificatio= nLib.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.40.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105861): https://edk2.groups.io/g/devel/message/105861 Mute This Topic: https://groups.io/mt/99384218/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-