From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web10.1727.1582796401962659316 for ; Thu, 27 Feb 2020 01:40:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YP48rWlb; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582796401; 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=w+mOqHqaYEHzCPWYDEA1K2HqShl62K/TJf4pzNGqG3g=; b=YP48rWlbRV199PyRkVTtqElysE7diQZ4cZX81PX6HeesACvAniAYYOpF21NwWjobcaDWcd DUZvEZ22mp5IfEcO9090AkcSxEFa0osZJyOOPAP3ZccyNT0TCSyd4UDzKUd6bzUqp3ys7B XjQyT+G7uifQmIRI50P4l3zkRf6Kbpk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-BV4tN95nPxa7F71k9u7q5A-1; Thu, 27 Feb 2020 04:39:59 -0500 X-MC-Unique: BV4tN95nPxa7F71k9u7q5A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E48D800D50; Thu, 27 Feb 2020 09:39:56 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CB4E9079D; Thu, 27 Feb 2020 09:39:49 +0000 (UTC) Subject: Re: [PATCH v3 8/9] ArmVirtPkg/ArmVirtQemu: enable the TPM2 configuration module To: Ard Biesheuvel , devel@edk2.groups.io Cc: eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com References: <20200226190514.31395-1-ard.biesheuvel@linaro.org> <20200226190514.31395-9-ard.biesheuvel@linaro.org> From: "Laszlo Ersek" Message-ID: <40335029-30a3-0938-71bf-c3e1f4bfb4ac@redhat.com> Date: Thu, 27 Feb 2020 10:39:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200226190514.31395-9-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 02/26/20 20:05, Ard Biesheuvel wrote: > 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. > > Signed-off-by: Ard Biesheuvel > --- > 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 9fe5ab37611c..7cb2d1b42fb8 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -30,6 +30,7 @@ [Defines] > DEFINE TTY_TERMINAL = FALSE > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE TPM2_ENABLE = FALSE > + DEFINE TPM2_CONFIG_ENABLE = FALSE > > # > # Network definition > @@ -268,6 +269,11 @@ [PcdsDynamicDefault.common] > [PcdsDynamicHii] > gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS > > +!if $(TPM2_CONFIG_ENABLE) == TRUE > + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS > + gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS > +!endif > + > ################################################################################ > # > # Components Section - list of all EDK II Modules needed by this Platform > @@ -490,6 +496,9 @@ [Components.common] > NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf > NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf > } > +!if $(TPM2_CONFIG_ENABLE) == TRUE > + SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > +!endif > !endif > > # > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index 63247fd10058..d481e4b2b8fb 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -188,4 +188,7 @@ [FV.FvMain] > # > !if $(TPM2_ENABLE) == TRUE > INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > +!if $(TPM2_CONFIG_ENABLE) == TRUE > + INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > +!endif > !endif > (1) Please mention the following in the commit message: ------- 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) ------- With that: Reviewed-by: Laszlo Ersek Thanks! Laszlo