[PATCH 0/2] OvmfPkg/Tcg2ConfigPei: trivial cleanups

[PATCH 0/2] OvmfPkg/Tcg2ConfigPei: trivial cleanups

[Laszlo Ersek]

Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Repo:   https://pagure.io/lersek/edk2.git
Branch: tcg_config_pei_trivial

Two trivial cleanups after commit 89236992913f ("OvmfPkg: detect TPM 1.2
in Tcg2ConfigPei", 2020-03-04) and commit 74f90d38c446
("OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for
ARM/AARCH64", 2020-05-21), respectively.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>

Thanks
Laszlo

Laszlo Ersek (2):
  OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments
  OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and
    X64

 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 4 ++--
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/2] OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments

[Laszlo Ersek]

The leading comments in "Tcg2ConfigPei.inf" and "Tcg2ConfigPeim.c" say,
"In OvmfPkg, the module only performs TPM2 hardware detection".

The statement hasn't been correct since commit 89236992913f ("OvmfPkg:
detect TPM 1.2 in Tcg2ConfigPei", 2020-03-04). Replace "TPM2" with "TPM"
(without stating a version) in those file-top comments.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +-
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 194ebfba6409..55c20db963e8 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -2,7 +2,7 @@
 # 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
+# variable and/or hardware detection. In OvmfPkg, the module only performs TPM
 # hardware detection.
 #
 # Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index cc54d95cad19..b3b9035eea1b 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
@@ -2,7 +2,7 @@
   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
+  variable and/or hardware detection. In OvmfPkg, the module only performs TPM
   hardware detection.
 
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/2] OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and X64

[Laszlo Ersek]

BaseLib interfaces (namely, SwapBytesXx()) are only used in
"Tpm12Support.c", which is IA32/X64-only. Therefore the BaseLib class
dependency should also be restricted to IA32 & X64, in the INF file.

The "#include <Library/BaseLib.h>" directive is already present in
"Tpm12Support.c" only.

(The BaseLib dependency should have been restricted to IA32 and X64
together with the Tpm12DeviceLib dependency, as part of commit
74f90d38c446, "OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building
for ARM/AARCH64", 2020-05-21.)

This is a trivial cleanup; functionally a no-op.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Stefan Berger <stefanb@linux.ibm.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2752
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 55c20db963e8..6776ec931ce0 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -37,12 +37,12 @@ [Packages]
 
 [LibraryClasses]
   PeimEntryPoint
-  BaseLib
   DebugLib
   PeiServicesLib
   Tpm2DeviceLib
 
 [LibraryClasses.IA32, LibraryClasses.X64]
+  BaseLib
   Tpm12DeviceLib
 
 [Guids]
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 0/2] OvmfPkg/Tcg2ConfigPei: trivial cleanups

[Ard Biesheuvel]

On 6/3/20 7:04 PM, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2752
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: tcg_config_pei_trivial
> 
> Two trivial cleanups after commit 89236992913f ("OvmfPkg: detect TPM 1.2
> in Tcg2ConfigPei", 2020-03-04) and commit 74f90d38c446
> ("OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for
> ARM/AARCH64", 2020-05-21), respectively.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (2):
>    OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments
>    OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and
>      X64
> 

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

>   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 4 ++--
>   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 

Re: [PATCH 0/2] OvmfPkg/Tcg2ConfigPei: trivial cleanups

[Philippe Mathieu-Daudé]

On 6/3/20 7:04 PM, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2752
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: tcg_config_pei_trivial
> 
> Two trivial cleanups after commit 89236992913f ("OvmfPkg: detect TPM 1.2
> in Tcg2ConfigPei", 2020-03-04) and commit 74f90d38c446
> ("OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for
> ARM/AARCH64", 2020-05-21), respectively.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (2):
>   OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments
>   OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and
>     X64
> 
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 4 ++--
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Series:
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [edk2-devel] [PATCH 0/2] OvmfPkg/Tcg2ConfigPei: trivial cleanups

[Laszlo Ersek]

On 06/03/20 19:04, Laszlo Ersek wrote:
> Ref:    https://bugzilla.tianocore.org/show_bug.cgi?id=2752
> Repo:   https://pagure.io/lersek/edk2.git
> Branch: tcg_config_pei_trivial
> 
> Two trivial cleanups after commit 89236992913f ("OvmfPkg: detect TPM 1.2
> in Tcg2ConfigPei", 2020-03-04) and commit 74f90d38c446
> ("OvmfPkg/Tcg2ConfigPei: skip TPM-1.2 detection when building for
> ARM/AARCH64", 2020-05-21), respectively.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Stefan Berger <stefanb@linux.ibm.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (2):
>   OvmfPkg/Tcg2ConfigPei: generalize TPM2-only file-top comments
>   OvmfPkg/Tcg2ConfigPei: restrict BaseLib class dependency to IA32 and
>     X64
> 
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 4 ++--
>  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

Merged in commit range 6aa48ab791ec..82e0b2f043c1, via
<https://github.com/tianocore/edk2/pull/670>.

Thanks!
Laszlo