From nobody Thu May 16 12:16:17 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+106170+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+106170+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 1687175690788812.0131403339412; Mon, 19 Jun 2023 04:54:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JZlyYY1788612xT4QfXQ4TR4; Mon, 19 Jun 2023 04:54:50 -0700 X-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 X-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) X-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) 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== X-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: [edk2-devel] [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> In-Reply-To: <20230619115440.307678-1-corvink@FreeBSD.org> References: <20230619115440.307678-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: Gq9vKe68Y5YclGcPutGJHkLMx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1687175690; bh=5ZrDejIlIqJTqriq7gef0YMv87KqryiBfzgb1SNvFp4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Bw1bjuKerkxQByy/l6I+FSy1sy4+g0mH9J3Lq3I0WXqS0eeA6SECUQpIcViQ+6hQTGS c3ANejI8W6lTK6kyv97NizvupvdBhNYeKouRyoSBpKGNYblHART3zThgi6xv2QTQ3U7Rb TEDa4FeEd7fw2BWPooZbcnGCP46VmtcukpA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1687175692187100004 Content-Type: text/plain; charset="utf-8" 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/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.41.0 -=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 (#106170): https://edk2.groups.io/g/devel/message/106170 Mute This Topic: https://groups.io/mt/99621595/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-