[PATCH v2 04/19] i386/tpm: Rename tpm module to tpm_verifier

[Sergii Dmytruk]

From: Daniel Kiper <daniel.kiper@oracle.com>

This avoids naming collision with TPM TIS and CRB driver introduced
by subsequent patch and characterizes the functionality of the module
better.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
---
 docs/grub.texi                               | 21 ++++++++++----------
 grub-core/Makefile.core.def                  |  4 ++--
 grub-core/commands/{tpm.c => tpm_verifier.c} |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)
 rename grub-core/commands/{tpm.c => tpm_verifier.c} (97%)

diff --git a/docs/grub.texi b/docs/grub.texi
index 78d47f467..e6b6c2394 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -4136,7 +4136,7 @@ Modules can be loaded via the @command{insmod} 
(@pxref{insmod}) command.
 * tftp_module::
 * tga_module::
 * time_module::
-* tpm_module::
+* tpm_verifier_module::
 * tr_module::
 * trig_module::
 * true_module::
@@ -5703,8 +5703,8 @@ image files in GRUB.
 This module provides support for the @command{time} command to measure the
 time taken by a given command and output it to the terminal.
 
-@node tpm_module
-@section tpm
+@node tpm_verifier_module
+@section tpm_verifier
 This module provides support for interacting with a Trusted Platform Module
 (TPM) with GRUB to perform Measured Boot. @xref{Measured Boot} for more
 information.
@@ -8714,10 +8714,10 @@ grub-mkimage -O x86_64-efi -o grubx64.efi -p 
'(tftp)/grub' --sbat sbat.csv efine
 @node Measured Boot
 @section Measuring boot components
 
-If the tpm module is loaded and the platform has a Trusted Platform Module
-installed, GRUB will log each command executed and each file loaded into the
-TPM event log and extend the PCR values in the TPM correspondingly. All events
-will be logged into the PCR described below with a type of EV_IPL and an
+If the tpm_verifier module is loaded and the platform has a Trusted Platform
+Module installed, GRUB will log each command executed and each file loaded into
+the TPM event log and extend the PCR values in the TPM correspondingly. All
+events will be logged into the PCR described below with a type of EV_IPL and an
 event description as described below.
 
 @multitable @columnfractions 0.3 0.1 0.6
@@ -8742,9 +8742,10 @@ corresponding to the filename.
 
 GRUB will not measure its own @file{core.img} - it is expected that firmware
 will carry this out. GRUB will also not perform any measurements until the
-tpm module is loaded. As such it is recommended that the tpm module be built
-into @file{core.img} in order to avoid a potential gap in measurement between
-@file{core.img} being loaded and the tpm module being loaded.
+tpm_verifier module is loaded. As such it is recommended that the tpm_verifier
+module be built into @file{core.img} in order to avoid a potential gap in
+measurement between @file{core.img} being loaded and the tpm_verifier module
+being loaded.
 
 Measured boot is currently only supported on EFI and IBM IEEE1275 PowerPC
 platforms.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 063ef5dd7..29b64dfe9 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2556,8 +2556,8 @@ module = {
 };
 
 module = {
-  name = tpm;
-  common = commands/tpm.c;
+  name = tpm_verifier;
+  common = commands/tpm_verifier.c;
   efi = commands/efi/tpm.c;
   enable = efi;
 };
diff --git a/grub-core/commands/tpm.c b/grub-core/commands/tpm_verifier.c
similarity index 97%
rename from grub-core/commands/tpm.c
rename to grub-core/commands/tpm_verifier.c
index dde74ab83..e8efebc96 100644
--- a/grub-core/commands/tpm.c
+++ b/grub-core/commands/tpm_verifier.c
@@ -98,13 +98,13 @@ grub_tpm_verify_string (char *str, enum 
grub_verify_string_type type)
 }
 
 struct grub_file_verifier grub_tpm_verifier = {
-  .name = "tpm",
+  .name = "tpm_verifier",
   .init = grub_tpm_verify_init,
   .write = grub_tpm_verify_write,
   .verify_string = grub_tpm_verify_string,
 };
 
-GRUB_MOD_INIT (tpm)
+GRUB_MOD_INIT (tpm_verifier)
 {
   /*
    * Even though this now calls ibmvtpm's grub_tpm_present() from 
GRUB_MOD_INIT(),
@@ -117,7 +117,7 @@ GRUB_MOD_INIT (tpm)
   grub_verifier_register (&grub_tpm_verifier);
 }
 
-GRUB_MOD_FINI (tpm)
+GRUB_MOD_FINI (tpm_verifier)
 {
   if (!grub_tpm_present())
     return;
-- 
2.47.0