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.7899.1578574098085824074 for ; Thu, 09 Jan 2020 04:48:18 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YJH9S53i; 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=1578574097; 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=3qzn5IfmSRRK9/U/9m+tbhjxF9wyMWtZoZ6521EZkoQ=; b=YJH9S53i3x/GLlKEok0geGg48syDJA+UkHkJN2YSg8zFHRwSWrgIqocELxezLxJRrfZ62r 0mX6JjxmvVhURdv2XQuUBhAEqoY7c+8IqhQPtIS9o4w+I3Dx28fpHiXzfLw80njustAkqO cakMHeWT+8aEeCIUyi6lxJb18yIaZaQ= 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-113-956RAEgHOEGaZ5EomUVb6A-1; Thu, 09 Jan 2020 07:48:15 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A240A800D50; Thu, 9 Jan 2020 12:48:14 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (unknown [10.36.118.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3C1A10001AE; Thu, 9 Jan 2020 12:48:10 +0000 (UTC) Subject: Re: [PATCH 1/2] OvmfPkg: reorganize TPM2 support in DSC/FDF files From: "Laszlo Ersek" To: Ard Biesheuvel , devel@edk2.groups.io Cc: philmd@redhat.com References: <20200108143843.4198-1-ard.biesheuvel@linaro.org> <20200108143843.4198-2-ard.biesheuvel@linaro.org> <31baf73e-3d53-e66e-d1b5-6f16a40f5973@redhat.com> Message-ID: <09d531fe-437c-c58d-4671-fe92b8daf35a@redhat.com> Date: Thu, 9 Jan 2020 13:48:10 +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: <31baf73e-3d53-e66e-d1b5-6f16a40f5973@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 956RAEgHOEGaZ5EomUVb6A-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 01/09/20 13:38, Laszlo Ersek wrote: > Hi Ard, > > On 01/08/20 15:38, Ard Biesheuvel wrote: >> Put the TPM2 related DXE modules together in the DSC, and add a >> TPM2 support header comment while at it. >> >> Signed-off-by: Ard Biesheuvel >> --- >> OvmfPkg/OvmfPkgIa32.dsc | 9 ++++++--- >> OvmfPkg/OvmfPkgIa32X64.dsc | 9 ++++++--- >> OvmfPkg/OvmfPkgX64.dsc | 3 +++ > > I think you forgot to stage some of the changes for "OvmfPkgX64.dsc" > before committing the patch: > >> OvmfPkg/OvmfPkgIa32.fdf | 3 +++ >> OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++ >> OvmfPkg/OvmfPkgX64.fdf | 3 +++ >> 6 files changed, 24 insertions(+), 6 deletions(-) > > >> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc >> index 9a60eb8fe2b0..f9e0b4b5bc54 100644 >> --- a/OvmfPkg/OvmfPkgIa32.dsc >> +++ b/OvmfPkg/OvmfPkgIa32.dsc >> @@ -632,9 +632,6 @@ [Components] >> NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf >> NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf >> } >> -!if $(TPM2_CONFIG_ENABLE) == TRUE >> - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf >> -!endif >> !endif >> >> # >> @@ -902,6 +899,9 @@ [Components] >> } >> !endif >> >> + # >> + # TPM2 support >> + # >> !if $(TPM2_ENABLE) == TRUE >> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { >> >> @@ -914,4 +914,7 @@ [Components] >> 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/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc >> index 1d1480b50b02..ee83bbaa5379 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.dsc >> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc >> @@ -644,9 +644,6 @@ [Components.IA32] >> NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf >> NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf >> } >> -!if $(TPM2_CONFIG_ENABLE) == TRUE >> - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf >> -!endif >> !endif >> >> [Components.X64] >> @@ -916,6 +913,9 @@ [Components.X64] >> } >> !endif >> >> + # >> + # TPM2 support >> + # >> !if $(TPM2_ENABLE) == TRUE >> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { >> >> @@ -928,4 +928,7 @@ [Components.X64] >> 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/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc >> index c287a436f8ec..2b6106ff313f 100644 >> --- a/OvmfPkg/OvmfPkgX64.dsc >> +++ b/OvmfPkg/OvmfPkgX64.dsc >> @@ -914,6 +914,9 @@ [Components] >> } >> !endif >> >> + # >> + # TPM2 support >> + # >> !if $(TPM2_ENABLE) == TRUE >> SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { >> > > The new comment is identical to the new comments in the other two DSC > files, but the moving around of > "SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf" (in two hunks) is missing > from "OvmfPkgX64.dsc". With that fixed, you can add: Reviewed-by: Laszlo Ersek Thanks! Laszlo