[PATCH 0/2] OvmfPkg, SecurityPkg: small followup patches after the TPM2 addition to OVMF

[PATCH 0/2] OvmfPkg, SecurityPkg: small followup patches after the TPM2 addition to OVMF

[Laszlo Ersek]

Repo:   https://github.com/lersek/edk2.git
Branch: ovmf_tcg2_followup

The first patch brings small coding style improvements to
OvmfPkg/Tcg/Tcg2Config. The second patch trims a superfluous PPI from
SecurityPkg/Tcg/TcgPei's DEPEX.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>

Laszlo Ersek (2):
  OvmfPkg/Tcg2ConfigPei: trivial coding style updates
  SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex

 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 20 +++----
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 55 +++++++++++---------
 SecurityPkg/Tcg/TcgPei/TcgPei.inf        |  1 -
 3 files changed, 40 insertions(+), 36 deletions(-)

-- 
2.14.1.3.gb7cf6e02401b

[PATCH 1/2] OvmfPkg/Tcg2ConfigPei: trivial coding style updates

[Laszlo Ersek]

- the @file comment block should match between INF and main C file

- rewrap / refill columns to 79 characters

- insert space before opening paren

- prefix and suffix //-style comment block with empty // lines

- fix indentation of arguments in multi-line function call

- general tab spacing (indent step) is 2 in edk2, unlike QEMU's 4

No functional changes.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 20 +++----
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 55 +++++++++++---------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 234cdd6cb40c..8c2d5863ea6c 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -1,20 +1,20 @@
 ## @file
-#  Set TPM device type
+# Set TPM device type
 #
-#  In SecurityPkg, this module initializes the TPM device type based on
-#  a UEFI variable and/or hardware detection. In OvmfPkg, the module
-#  only performs TPM2 hardware detection.
+# In SecurityPkg, this module initializes the TPM device type based on a UEFI
+# variable and/or hardware detection. In OvmfPkg, the module only performs TPM2
+# hardware detection.
 #
 # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
 # Copyright (C) 2018, Red Hat, Inc.
 #
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ##
 
 [Defines]
@@ -40,7 +40,7 @@ [LibraryClasses]
   Tpm2DeviceLib
 
 [Guids]
-  gEfiTpmDeviceSelectedGuid           ## PRODUCES             ## GUID    # Used as a PPI GUID
+  gEfiTpmDeviceSelectedGuid           ## PRODUCES ## GUID # Used as a PPI GUID
   gEfiTpmDeviceInstanceTpm20DtpmGuid  ## SOMETIMES_CONSUMES
 
 [Ppis]
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index 8bee1926b3c4..0befc6c54c87 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -1,17 +1,20 @@
 /** @file
-  The module entry point for Tcg2 configuration module.
+  Set TPM device type
 
-Copyright (c) 2018, Red Hat, Inc.
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+  In SecurityPkg, this module initializes the TPM device type based on a UEFI
+  variable and/or hardware detection. In OvmfPkg, the module only performs TPM2
+  hardware detection.
 
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
+  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (C) 2018, Red Hat, Inc.
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License which accompanies this
+  distribution. The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php
 
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 
@@ -55,23 +58,25 @@ Tcg2ConfigPeimEntryPoint (
 
   Status = Tpm2RequestUseTpm ();
   if (!EFI_ERROR (Status)) {
-      DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));
-      Size = sizeof(gEfiTpmDeviceInstanceTpm20DtpmGuid);
-      Status = PcdSetPtrS (
-          PcdTpmInstanceGuid,
-          &Size,
-          &gEfiTpmDeviceInstanceTpm20DtpmGuid
-          );
-      ASSERT_EFI_ERROR (Status);
+    DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));
+    Size = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);
+    Status = PcdSetPtrS (
+               PcdTpmInstanceGuid,
+               &Size,
+               &gEfiTpmDeviceInstanceTpm20DtpmGuid
+               );
+    ASSERT_EFI_ERROR (Status);
   } else {
-      DEBUG ((DEBUG_INFO, "%a: no TPM2 detected\n", __FUNCTION__));
-      // If no TPM2 was detected, we still need to install
-      // TpmInitializationDonePpi. Namely, Tcg2Pei will exit early upon
-      // seeing the default (all-bits-zero) contents of
-      // PcdTpmInstanceGuid, thus we have to install the PPI in its place,
-      // in order to unblock any dependent PEIMs.
-      Status = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);
-      ASSERT_EFI_ERROR (Status);
+    DEBUG ((DEBUG_INFO, "%a: no TPM2 detected\n", __FUNCTION__));
+    //
+    // If no TPM2 was detected, we still need to install
+    // TpmInitializationDonePpi. Namely, Tcg2Pei will exit early upon seeing
+    // the default (all-bits-zero) contents of PcdTpmInstanceGuid, thus we have
+    // to install the PPI in its place, in order to unblock any dependent
+    // PEIMs.
+    //
+    Status = PeiServicesInstallPpi (&mTpmInitializationDonePpiList);
+    ASSERT_EFI_ERROR (Status);
   }
 
   //
-- 
2.14.1.3.gb7cf6e02401b

[PATCH 2/2] SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex

[Laszlo Ersek]

TcgPei doesn't actually use the PEI-phase read-only variable service, so
drop that from the Depex.

This patch was inspired by commit ab9e11da6651 ("SecurityPkg/Tcg2Pei: drop
PeiReadOnlyVariable from Depex", 2018-03-09).

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Suggested-by: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 SecurityPkg/Tcg/TcgPei/TcgPei.inf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 9a44d8fbda51..57ce7263e909 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -85,7 +85,6 @@ [Pcd]
 
 [Depex]
   gEfiPeiMasterBootModePpiGuid AND
-  gEfiPeiReadOnlyVariable2PpiGuid AND
   gEfiTpmDeviceSelectedGuid
 
 [UserExtensions.TianoCore."ExtraFiles"]
-- 
2.14.1.3.gb7cf6e02401b

Re: [PATCH 2/2] SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex

[Yao, Jiewen]

reviewed by: jiewen.yao@intel.com

thank you!
Yao, Jiewen


> 在 2018年3月10日，上午4:05，Laszlo Ersek <lersek@redhat.com> 写道：
> 
> TcgPei doesn't actually use the PEI-phase read-only variable service, so
> drop that from the Depex.
> 
> This patch was inspired by commit ab9e11da6651 ("SecurityPkg/Tcg2Pei: drop
> PeiReadOnlyVariable from Depex", 2018-03-09).
> 
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Suggested-by: Chao Zhang <chao.b.zhang@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> SecurityPkg/Tcg/TcgPei/TcgPei.inf | 1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
> index 9a44d8fbda51..57ce7263e909 100644
> --- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
> +++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
> @@ -85,7 +85,6 @@ [Pcd]
> 
> [Depex]
>   gEfiPeiMasterBootModePpiGuid AND
> -  gEfiPeiReadOnlyVariable2PpiGuid AND
>   gEfiTpmDeviceSelectedGuid
> 
> [UserExtensions.TianoCore."ExtraFiles"]
> -- 
> 2.14.1.3.gb7cf6e02401b
> 

Re: [PATCH 0/2] OvmfPkg, SecurityPkg: small followup patches after the TPM2 addition to OVMF

[Jordan Justen]

Series Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

On 2018-03-09 12:05:23, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: ovmf_tcg2_followup
> 
> The first patch brings small coding style improvements to
> OvmfPkg/Tcg/Tcg2Config. The second patch trims a superfluous PPI from
> SecurityPkg/Tcg/TcgPei's DEPEX.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Laszlo Ersek (2):
>   OvmfPkg/Tcg2ConfigPei: trivial coding style updates
>   SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex
> 
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 20 +++----
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 55 +++++++++++---------
>  SecurityPkg/Tcg/TcgPei/TcgPei.inf        |  1 -
>  3 files changed, 40 insertions(+), 36 deletions(-)
> 
> -- 
> 2.14.1.3.gb7cf6e02401b
> 

Re: [PATCH 0/2] OvmfPkg, SecurityPkg: small followup patches after the TPM2 addition to OVMF

[Laszlo Ersek]

On 03/10/18 00:50, Jordan Justen wrote:
> Series Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

Thanks! :)

Commit range e4a1d5a7c4e4..7548947d040e.

Thank you Jiewen as well,
Laszlo

> On 2018-03-09 12:05:23, Laszlo Ersek wrote:
>> Repo:   https://github.com/lersek/edk2.git
>> Branch: ovmf_tcg2_followup
>>
>> The first patch brings small coding style improvements to
>> OvmfPkg/Tcg/Tcg2Config. The second patch trims a superfluous PPI from
>> SecurityPkg/Tcg/TcgPei's DEPEX.
>>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Chao Zhang <chao.b.zhang@intel.com>
>> Cc: Jiewen Yao <jiewen.yao@intel.com>
>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Laszlo Ersek (2):
>>   OvmfPkg/Tcg2ConfigPei: trivial coding style updates
>>   SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex
>>
>>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 20 +++----
>>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 55 +++++++++++---------
>>  SecurityPkg/Tcg/TcgPei/TcgPei.inf        |  1 -
>>  3 files changed, 40 insertions(+), 36 deletions(-)
>>
>> -- 
>> 2.14.1.3.gb7cf6e02401b
>>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
> 

Re: [PATCH 2/2] SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex

[Zhang, Chao B]

Reviewed-by: Chao Zhang <chao.b.zhang@intel.com>

-----Original Message-----
From: Laszlo Ersek [mailto:lersek@redhat.com] 
Sent: Saturday, March 10, 2018 4:05 AM
To: edk2-devel-01 <edk2-devel@lists.01.org>
Cc: Zhang, Chao B <chao.b.zhang@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
Subject: [PATCH 2/2] SecurityPkg/TcgPei: drop PeiReadOnlyVariable from Depex

TcgPei doesn't actually use the PEI-phase read-only variable service, so drop that from the Depex.

This patch was inspired by commit ab9e11da6651 ("SecurityPkg/Tcg2Pei: drop PeiReadOnlyVariable from Depex", 2018-03-09).

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Suggested-by: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 SecurityPkg/Tcg/TcgPei/TcgPei.inf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 9a44d8fbda51..57ce7263e909 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -85,7 +85,6 @@ [Pcd]
 
 [Depex]
   gEfiPeiMasterBootModePpiGuid AND
-  gEfiPeiReadOnlyVariable2PpiGuid AND
   gEfiTpmDeviceSelectedGuid
 
 [UserExtensions.TianoCore."ExtraFiles"]
--
2.14.1.3.gb7cf6e02401b