From nobody Tue Feb 10 07:22:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+55014+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55014+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582814476; cv=none; d=zohomail.com; s=zohoarc; b=KkyXu3X68u4rPDH68SlDqsgv2aOYD/brwhQHGlWMXqa3+D5hdTANWZVtTnvNQOPk3lAJvPr+vQ4VjpEC3ofhGz7DZmXD5YJz08VtJkzDXySOgE0Vx094F4gxtzCQziw6qVENpji8KsR4AUN6XHdgZDE9GmH23rNPcb7fnrkuB4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582814476; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=SwesYDe333ztkV1OEbRgCsn932flhWUDI6kzCv3FhwM=; b=TGaGDmsy4jELzFUIdtOwTmJf5OOKgqt+PZ6aVRrxfSX/kRcWH8s4xrPL6mmnxcjHdOKlBrCTN9Q8xlwUPnBxUNEPIme5Ye+0ioOLP/gn3w543FedMKmANaBI0OJ+r+eQkLIXIdLHv+CKV67QVILVLqWIdEq1DEdcUwa8rnXqfp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+55014+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1582814476243936.2184698672961; Thu, 27 Feb 2020 06:41:16 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tBiUYY1788612xkOsdY0deQZ; Thu, 27 Feb 2020 06:41:15 -0800 X-Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web10.5085.1582814474337228013 for ; Thu, 27 Feb 2020 06:41:14 -0800 X-Received: by mail-wr1-f49.google.com with SMTP id z15so3694775wrl.1 for ; Thu, 27 Feb 2020 06:41:14 -0800 (PST) X-Gm-Message-State: uKVABywgUQGAKCwM9rgECvw1x1787277AA= X-Google-Smtp-Source: APXvYqyEROhYPl241SmpOZtiWRR6eUluNU6VH2E20TEVI6V7V+twlyPTBmMhZ6kIi5st5PjWNz7Gww== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr5122377wrx.62.1582814472667; Thu, 27 Feb 2020 06:41:12 -0800 (PST) X-Received: from localhost.localdomain (aaubervilliers-682-1-29-142.w90-88.abo.wanadoo.fr. [90.88.192.142]) by smtp.gmail.com with ESMTPSA id k7sm8273575wrq.12.2020.02.27.06.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 06:41:11 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [edk2-devel] [PATCH v4 10/11] ArmVirtPkg/ArmVirtQemu: enable the TPM2 configuration module Date: Thu, 27 Feb 2020 15:40:55 +0100 Message-Id: <20200227144056.56988-11-ard.biesheuvel@linaro.org> In-Reply-To: <20200227144056.56988-1-ard.biesheuvel@linaro.org> References: <20200227144056.56988-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ard.biesheuvel@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1582814475; bh=yvr/wCRYLViVat72Ag2rVoMPVkDSCiTwwAKEXcrfu2A=; h=Cc:Date:From:Reply-To:Subject:To; b=OwbXIYvT6rKKwzPL93MNCv3ZVvNd8lNofTEE7xFFFBVfTvhYgp9CAPQ0ghSYXJk1RJL nABumRdiBLtl3wfw4BTxf46jPm88ppl4AqtmmoJIBchdveoatygU8zP738kuzqEiaTxfO Ffa9fdj4cVCVXGy4d/2FKEcSjB0JLTlq11E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Enable the DXE phase component that publishes the HII pages and associated logic to enable TPM2 parameters to be configured by the user via the setup menu. This patch ports (parts of) the following commits to ArmVirtQemu: - 3103389043bd ("OvmfPkg: Add TCG2 Configuration menu to the Device Manager menu", 2019-02-11) - cf3ad972a210 ("OvmfPkg: reorganize TPM2 support in DSC/FDF files", 2020-01-09) - f55477fe2d62 ("OvmfPkg: use HII type PCDs for TPM2 config related variables", 2020-01-09) Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirtQemu.dsc | 9 +++++++++ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 3 +++ 2 files changed, 12 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 598ac49b3c40..f93e13987db4 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -30,6 +30,7 @@ [Defines] DEFINE TTY_TERMINAL =3D FALSE DEFINE SECURE_BOOT_ENABLE =3D FALSE DEFINE TPM2_ENABLE =3D FALSE + DEFINE TPM2_CONFIG_ENABLE =3D FALSE =20 # # Network definition @@ -270,6 +271,11 @@ [PcdsDynamicDefault.common] [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGui= d|0x0|FALSE|NV,BS =20 +!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|3|NV,BS +!endif + ##########################################################################= ###### # # Components Section - list of all EDK II Modules needed by this Platform @@ -492,6 +498,9 @@ [Components.common] NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } +!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif =20 # diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.fdf.inc index a93a9970c8d2..211f7aeb6f62 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -178,6 +178,9 @@ [FV.FvMain] # !if $(TPM2_ENABLE) =3D=3D TRUE INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE + INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf +!endif !endif =20 # --=20 2.20.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 (#55014): https://edk2.groups.io/g/devel/message/55014 Mute This Topic: https://groups.io/mt/71587897/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-