[PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[Shenglei Zhang]

Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
EFI_RETURNING_FROM_EFI_APPLICATION.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Shenglei Zhang (2):
  MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h
  SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c

 MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.18.0.windows.1

[PATCH 1/2] MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h

[Shenglei Zhang]

Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
EFI_RETURNING_FROM_EFI_APPLICATION.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index 2d223f4ea7..96784708ae 100644
--- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -56,7 +56,7 @@
 
 #define EFI_CALLING_EFI_APPLICATION         \
   "Calling EFI Application from Boot Option"
-#define EFI_RETURNING_FROM_EFI_APPLICATOIN  \
+#define EFI_RETURNING_FROM_EFI_APPLICATION  \
   "Returning from EFI Application from Boot Option"
 #define EFI_EXIT_BOOT_SERVICES_INVOCATION   \
   "Exit Boot Services Invocation"
-- 
2.18.0.windows.1

[PATCH 2/2] SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c

[Shenglei Zhang]

Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
EFI_RETURNING_FROM_EFI_APPLICATION.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 4 ++--
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index aa463b287e..662637f3e3 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -2314,10 +2314,10 @@ OnReadyToBoot (
     //
     Status = TcgMeasureAction (
                4,
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));
     }
 
     //
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 21837fe3d3..3889fb4a81 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -1180,10 +1180,10 @@ OnReadyToBoot (
     // 6. Not first attempt, meaning a return from last attempt
     //
     Status = TcgMeasureAction (
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));
     }
   }
 
-- 
2.18.0.windows.1

Re: [PATCH 2/2] SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c

[Zhang, Chao B]

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

-----Original Message-----
From: Zhang, Shenglei 
Sent: Tuesday, December 11, 2018 9:32 AM
To: 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/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c

Change EFI_RETURNING_FROM_EFI_APPLICATOIN to EFI_RETURNING_FROM_EFI_APPLICATION.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 4 ++--
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index aa463b287e..662637f3e3 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -2314,10 +2314,10 @@ OnReadyToBoot (
     //
     Status = TcgMeasureAction (
                4,
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", 
+ EFI_RETURNING_FROM_EFI_APPLICATION));
     }
 
     //
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c index 21837fe3d3..3889fb4a81 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -1180,10 +1180,10 @@ OnReadyToBoot (
     // 6. Not first attempt, meaning a return from last attempt
     //
     Status = TcgMeasureAction (
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", 
+ EFI_RETURNING_FROM_EFI_APPLICATION));
     }
   }
 
--
2.18.0.windows.1

Re: [PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[Philippe Mathieu-Daudé]

Hi,

On 12/11/18 2:31 AM, Shenglei Zhang wrote:
> Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
> EFI_RETURNING_FROM_EFI_APPLICATION.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Shenglei Zhang (2):
>   MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h
>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
> 
>  MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 

NACK, this change has to be in the same patch to be bisectable.

However, if you resend the same change squashed in a single patch, you
can directly add my:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Regards,

Phil.

Re: [PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[Laszlo Ersek]

On 12/17/18 11:08, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> On 12/11/18 2:31 AM, Shenglei Zhang wrote:
>> Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
>> EFI_RETURNING_FROM_EFI_APPLICATION.
>>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Cc: Liming Gao <liming.gao@intel.com>
>> Cc: Chao Zhang <chao.b.zhang@intel.com>
>> Cc: Jiewen Yao <jiewen.yao@intel.com>
>> Shenglei Zhang (2):
>>   MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h
>>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
>>
>>  MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
>>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
>>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
>>  3 files changed, 5 insertions(+), 5 deletions(-)
>>
> 
> NACK, this change has to be in the same patch to be bisectable.
> 
> However, if you resend the same change squashed in a single patch, you
> can directly add my:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Good catch! Bisectability is important!

An alternative approach to yours could be: first, introduce the
correctly spelled macro (with the same value); second, update the
references; third, remove the misspelled macro. This would be *slightly*
more idiomatic for edk2, where we tend to avoid cross-package patches,
if we can.

Personally I'd be fine with either approach in this case.

Thanks!
Laszlo

Re: [PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[Philippe Mathieu-Daudé]

On 12/17/18 11:27 AM, Laszlo Ersek wrote:
> On 12/17/18 11:08, Philippe Mathieu-Daudé wrote:
>> Hi,
>>
>> On 12/11/18 2:31 AM, Shenglei Zhang wrote:
>>> Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
>>> EFI_RETURNING_FROM_EFI_APPLICATION.
>>>
>>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>>> Cc: Liming Gao <liming.gao@intel.com>
>>> Cc: Chao Zhang <chao.b.zhang@intel.com>
>>> Cc: Jiewen Yao <jiewen.yao@intel.com>
>>> Shenglei Zhang (2):
>>>   MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h
>>>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
>>>
>>>  MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
>>>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
>>>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
>>>  3 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>
>> NACK, this change has to be in the same patch to be bisectable.
>>
>> However, if you resend the same change squashed in a single patch, you
>> can directly add my:
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Good catch! Bisectability is important!
> 
> An alternative approach to yours could be: first, introduce the
> correctly spelled macro (with the same value); second, update the
> references; third, remove the misspelled macro. This would be *slightly*
> more idiomatic for edk2, where we tend to avoid cross-package patches,
> if we can.

TIL "avoid cross-package patches" (for edk2).

While Laszlo's alternative looks overkill, it is also perfect =)

Re: [PATCH 0/2] Fix typos in MdePkg and SecurityPkg

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com


> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, December 10, 2018 5:32 PM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>; Yao,
> Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH 0/2] Fix typos in MdePkg and SecurityPkg
> 
> Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
> EFI_RETURNING_FROM_EFI_APPLICATION.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Shenglei Zhang (2):
>   MdePkg/IndustryStandard: Fix a typo in UefiTcgPlatform.h
>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
> 
>  MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> --
> 2.18.0.windows.1