Cc: Dandan Bi <dandan...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Jian J Wang <jian.j.w...@intel.com>
Cc: Hao A Wu <hao.a...@intel.com>
Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com>
---
 MdeModulePkg/Core/Pei/PeiMain.inf             | 10 ++--
 MdeModulePkg/Core/Pei/FwVol/FwVol.h           | 20 ++++----
 MdeModulePkg/Core/Pei/PeiMain.h               | 40 ++++++++--------
 MdeModulePkg/Core/Pei/Dependency/Dependency.c |  8 ++--
 MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 48 +++++++++----------
 MdeModulePkg/Core/Pei/FwVol/FwVol.c           | 50 ++++++++++----------
 MdeModulePkg/Core/Pei/Hob/Hob.c               |  4 +-
 MdeModulePkg/Core/Pei/Image/Image.c           | 10 ++--
 MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 16 +++----
 MdeModulePkg/Core/Pei/PeiMain/PeiMain.c       |  2 +-
 MdeModulePkg/Core/Pei/Ppi/Ppi.c               |  4 +-
 MdeModulePkg/Core/Pei/Security/Security.c     | 12 ++---
 12 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf 
b/MdeModulePkg/Core/Pei/PeiMain.inf
index 7c482dacfc..6e25cc4023 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -69,12 +69,12 @@
 
 [Guids]
   gPeiAprioriFileNameGuid       ## SOMETIMES_CONSUMES   ## File
-  ## PRODUCES   ## UNDEFINED # Install ppi
-  ## CONSUMES   ## UNDEFINED # Locate ppi
+  ## PRODUCES   ## UNDEFINED # Install PPI
+  ## CONSUMES   ## UNDEFINED # Locate PPI
   gEfiFirmwareFileSystem2Guid
-  ## PRODUCES   ## UNDEFINED # Install ppi
-  ## CONSUMES   ## UNDEFINED # Locate ppi
-  ## CONSUMES   ## GUID      # Used to compare with FV's file system guid and 
get the FV's file system format
+  ## PRODUCES   ## UNDEFINED # Install PPI
+  ## CONSUMES   ## UNDEFINED # Locate PPI
+  ## CONSUMES   ## GUID      # Used to compare with FV's file system GUID and 
get the FV's file system format
   gEfiFirmwareFileSystem3Guid
 
 [Ppis]
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.h 
b/MdeModulePkg/Core/Pei/FwVol/FwVol.h
index ca80e84e0f..263f0d7a56 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.h
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.h
@@ -1,7 +1,7 @@
 /** @file
   The internal header file for firmware volume related definitions.
 
-Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -303,12 +303,12 @@ FindFileEx (
   );
 
 /**
-  Report the information for a new discoveried FV in unknown format.
+  Report the information for a new discovered FV in unknown format.
 
-  If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for specifical FV 
format, but
-  the FV in this FV format has been discoveried, then the information of this 
FV
+  If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for specific FV 
format, but
+  the FV in this FV format has been discovered, then the information of this FV
   will be cached into PEI_CORE_INSTANCE's UnknownFvInfo array.
-  Also a notification would be installed for unknown FV format guid, if 
EFI_PEI_FIRMWARE_VOLUME_PPI
+  Also a notification would be installed for unknown FV format GUID, if 
EFI_PEI_FIRMWARE_VOLUME_PPI
   is installed later by platform's PEIM, the original unknown FV will be 
processed by
   using new installed EFI_PEI_FIRMWARE_VOLUME_PPI.
 
@@ -325,14 +325,14 @@ AddUnknownFormatFvInfo (
   );
 
 /**
-  Find the FV information according to FV format guid.
+  Find the FV information according to FV format GUID.
 
-  This routine also will remove the FV information found by given FV format 
guid from
+  This routine also will remove the FV information found by given FV format 
GUID from
   PrivateData->UnknownFvInfo[].
 
   @param PrivateData      Point to instance of PEI_CORE_INSTANCE
-  @param Format           Point to given FV format guid
-  @param FvInfo           On return, the pointer of FV information buffer in 
given FV format guid
+  @param Format           Point to given FV format GUID
+  @param FvInfo           On return, the pointer of FV information buffer in 
given FV format GUID
   @param FvInfoSize       On return, the size of FV information buffer.
   @param AuthenticationStatus On return, the authentication status of FV 
information buffer.
 
@@ -352,7 +352,7 @@ FindUnknownFormatFvInfo (
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.
 
   When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, 
this
-  routine is called to process all discoveried FVs in this format.
+  routine is called to process all discovered FVs in this format.
 
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation
   @param NotifyDescriptor  Address of the notification descriptor data 
structure.
diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index f2aa97c664..3f61247a0f 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -47,7 +47,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 ///
 /// It is an FFS type extension used for PeiFindFileEx. It indicates current
-/// Ffs searching is for all PEIMs can be dispatched by PeiCore.
+/// FFS searching is for all PEIMs can be dispatched by PeiCore.
 ///
 #define PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE   0xff
 
@@ -116,7 +116,7 @@ typedef struct {
 } PEI_PPI_DATABASE;
 
 //
-// PEI_CORE_FV_HANDE.PeimState
+// PEI_CORE_FV_HANDLE.PeimState
 // Do not change these values as there is code doing math to change states.
 // Look for Private->Fv[FvCount].PeimState[PeimCount]++;
 //
@@ -136,11 +136,11 @@ typedef struct {
   EFI_PEI_FV_HANDLE                   FvHandle;
   UINTN                               PeimCount;
   //
-  // Ponter to the buffer with the PeimCount number of Entries.
+  // Pointer to the buffer with the PeimCount number of Entries.
   //
   UINT8                               *PeimState;
   //
-  // Ponter to the buffer with the PeimCount number of Entries.
+  // Pointer to the buffer with the PeimCount number of Entries.
   //
   EFI_PEI_FILE_HANDLE                 *FvFileHandles;
   BOOLEAN                             ScanFv;
@@ -277,7 +277,7 @@ struct _PEI_CORE_INSTANCE {
   //
   // For Loading modules at fixed address feature to cache the top address 
below which the
   // Runtime code, boot time code and PEI memory will be placed. Please note 
that the offset between this field
-  // and  Ps should not be changed since maybe user could get this top address 
by using the offet to Ps.
+  // and Ps should not be changed since maybe user could get this top address 
by using the offset to Ps.
   //
   EFI_PHYSICAL_ADDRESS               LoadModuleAtFixAddressTopAddress;
   //
@@ -372,7 +372,7 @@ PeiCore (
 
   This is the POSTFIX version of the dependency evaluator.  When a
   PUSH [PPI GUID] is encountered, a pointer to the GUID is stored on
-  the evaluation stack.  When that entry is poped from the evaluation
+  the evaluation stack.  When that entry is popped from the evaluation
   stack, the PPI is checked if it is installed.  This method allows
   some time savings as not all PPIs must be checked for certain
   operation types (AND, OR).
@@ -412,7 +412,7 @@ PeiDispatcher (
 
   @param PrivateData     PeiCore's private data structure
   @param OldCoreData     Old data from SecCore
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
   @param SecCoreData     Points to a data structure containing SEC to PEI 
handoff data, such as the size
                          and location of temporary RAM, the stack location and 
the BFV location.
 
@@ -453,7 +453,7 @@ DepexSatisfied (
 
   @param PrivateData     Pointer to the PEI Core data.
   @param OldCoreData     Pointer to old PEI Core data.
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
 
 **/
 VOID
@@ -482,7 +482,7 @@ ConvertPpiPointers (
   Install PPI services. It is implementation of EFI_PEI_SERVICE.InstallPpi.
 
   @param PeiServices                An indirect pointer to the 
EFI_PEI_SERVICES table published by the PEI Foundation.
-  @param PpiList                    Pointer to ppi array that want to be 
installed.
+  @param PpiList                    Pointer to PPI array that want to be 
installed.
 
   @retval EFI_SUCCESS               if all PPIs in PpiList are successfully 
installed.
   @retval EFI_INVALID_PARAMETER     if PpiList is NULL pointer
@@ -659,7 +659,7 @@ PeiSetBootMode (
 
   @param PeiServices     An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation.
   @param OldCoreData     Pointer to the old core data.
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
 
 **/
 VOID
@@ -687,7 +687,7 @@ VerifyFv (
 
   @param PrivateData     PeiCore's private data structure
   @param VolumeHandle    Handle of FV
-  @param FileHandle      Handle of PEIM's ffs
+  @param FileHandle      Handle of PEIM's FFS
   @param AuthenticationStatus Authentication status
 
   @retval EFI_SUCCESS              Image is OK
@@ -730,7 +730,7 @@ PeiGetHobList (
   @param Length             Length of the new HOB to allocate.
   @param Hob                Pointer to the new HOB.
 
-  @return  EFI_SUCCESS           Success to create hob.
+  @return  EFI_SUCCESS           Success to create HOB.
   @retval  EFI_INVALID_PARAMETER if Hob is NULL
   @retval  EFI_NOT_AVAILABLE_YET if HobList is still not available.
   @retval  EFI_OUT_OF_RESOURCES  if there is no more memory to grow the 
Hoblist.
@@ -887,7 +887,7 @@ PeiFfsFindNextVolume (
   @param SecCoreData     Points to a data structure containing SEC to PEI 
handoff data, such as the size
                          and location of temporary RAM, the stack location and 
the BFV location.
   @param OldCoreData     Pointer to the PEI Core data.
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
 
 **/
 VOID
@@ -1111,7 +1111,7 @@ PeiResetSystem2 (
 
 /**
 
-  Initialize PeiCore Fv List.
+  Initialize PeiCore FV List.
 
 
   @param PrivateData     - Pointer to PEI_CORE_INSTANCE.
@@ -1125,7 +1125,7 @@ PeiInitializeFv (
   );
 
 /**
-  Process Firmware Volum Information once FvInfoPPI install.
+  Process Firmware Volume Information once FvInfoPPI install.
 
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation.
   @param NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -1136,7 +1136,7 @@ PeiInitializeFv (
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,
   IN VOID                          *Ppi
@@ -1293,11 +1293,11 @@ SecurityPpiNotifyCallback (
   );
 
 /**
-  Get Fv image(s) from the FV type file, then install FV INFO(2) ppi, Build 
FV(2, 3) hob.
+  Get FV image(s) from the FV type file, then install FV INFO(2) PPI, Build 
FV(2, 3) HOB.
 
   @param PrivateData          PeiCore's private data structure
-  @param ParentFvCoreHandle   Pointer of EFI_CORE_FV_HANDLE to parent Fv image 
that contain this Fv image.
-  @param ParentFvFileHandle   File handle of a Fv type file that contain this 
Fv image.
+  @param ParentFvCoreHandle   Pointer of EFI_CORE_FV_HANDLE to parent FV image 
that contain this FV image.
+  @param ParentFvFileHandle   File handle of a FV type file that contain this 
FV image.
 
   @retval EFI_NOT_FOUND         FV image can't be found.
   @retval EFI_SUCCESS           Successfully to process it.
@@ -1316,7 +1316,7 @@ ProcessFvFile (
 /**
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.
 
-  This routine also will install FvInfo ppi for FV hob in PI ways.
+  This routine also will install FvInfo PPI for FV HOB in PI ways.
 
   @param Private    Pointer of PEI_CORE_INSTANCE
   @param Instance   The index of FV want to be searched.
diff --git a/MdeModulePkg/Core/Pei/Dependency/Dependency.c 
b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
index 6ce610a028..9a8353aef2 100644
--- a/MdeModulePkg/Core/Pei/Dependency/Dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/Dependency.c
@@ -5,7 +5,7 @@
   if a driver can be scheduled for execution.  The criteria for
   schedulability is that the dependency expression is satisfied.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -45,7 +45,7 @@ IsPpiInstalled (
   }
 
   //
-  // Copy the Guid into a locale variable so that there are no
+  // Copy the GUID into a local variable so that there are no
   // possibilities of alignment faults for cross-compilation
   // environments such as Intel?Itanium(TM).
   //
@@ -72,7 +72,7 @@ IsPpiInstalled (
 
   This is the POSTFIX version of the dependency evaluator.  When a
   PUSH [PPI GUID] is encountered, a pointer to the GUID is stored on
-  the evaluation stack.  When that entry is poped from the evaluation
+  the evaluation stack.  When that entry is popped from the evaluation
   stack, the PPI is checked if it is installed.  This method allows
   some time savings as not all PPIs must be checked for certain
   operation types (AND, OR).
@@ -123,7 +123,7 @@ PeimDispatchReadiness (
 
         //
         // Push the pointer to the PUSH opcode operator (pointer to PPI GUID)
-        // We will evaluate if the PPI is insalled on the POP operation.
+        // We will evaluate if the PPI is installed on the POP operation.
         //
         StackPtr->Operator = (VOID *) Iterator;
         Iterator = Iterator + sizeof (EFI_GUID);
diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c 
b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index ba2fd0cae1..c9f2a91264 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -1,7 +1,7 @@
 /** @file
   EFI PEI Core dispatch services
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 /**
 
-  Discover all Peims and optional Apriori file in one FV. There is at most one
+  Discover all PEIMs and optional Apriori file in one FV. There is at most one
   Apriori file in one FV.
 
 
@@ -49,7 +49,7 @@ DiscoverPeimsAndOrderWithApriori (
   Guid = NULL;
 
   //
-  // If the current Fv has been scanned, directly get its cached records.
+  // If the current FV has been scanned, directly get its cached records.
   //
   if (CoreFileHandle->ScanFv) {
     Private->CurrentFvFileHandles = CoreFileHandle->FvFileHandles;
@@ -60,7 +60,7 @@ DiscoverPeimsAndOrderWithApriori (
   TempFileGuid    = Private->TempFileGuid;
 
   //
-  // Go ahead to scan this Fv, get PeimCount and cache FileHandles within it 
to TempFileHandles.
+  // Go ahead to scan this FV, get PeimCount and cache FileHandles within it 
to TempFileHandles.
   //
   PeimCount = 0;
   FileHandle = NULL;
@@ -147,7 +147,7 @@ DiscoverPeimsAndOrderWithApriori (
 
       for (Index = 0; Index < PeimCount; Index++) {
         //
-        // Make an array of file name guids that matches the FileHandle array 
so we can convert
+        // Make an array of file name GUIDs that matches the FileHandle array 
so we can convert
         // quickly from file name to file handle
         //
         Status = FvPpi->GetFileInfo (FvPpi, TempFileHandles[Index], &FileInfo);
@@ -156,7 +156,7 @@ DiscoverPeimsAndOrderWithApriori (
       }
 
       //
-      // Walk through TempFileGuid array to find out who is invalid PEIM guid 
in Apriori file.
+      // Walk through TempFileGuid array to find out who is invalid PEIM GUID 
in Apriori file.
       // Add available PEIMs in Apriori file into FvFileHandles array.
       //
       Index = 0;
@@ -194,8 +194,8 @@ DiscoverPeimsAndOrderWithApriori (
   }
 
   //
-  // The current Fv File Handles have been cached. So that we don't have to 
scan the Fv again.
-  // Instead, we can retrieve the file handles within this Fv from cached 
records.
+  // The current FV File Handles have been cached. So that we don't have to 
scan the FV again.
+  // Instead, we can retrieve the file handles within this FV from cached 
records.
   //
   CoreFileHandle->ScanFv = TRUE;
   Private->CurrentFvFileHandles = CoreFileHandle->FvFileHandles;
@@ -307,7 +307,7 @@ PeiLoadFixAddressHook(
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: 
PcdLoadFixAddressPeiCodePageNumber= 0x%x.\n", 
PcdGet32(PcdLoadFixAddressPeiCodePageNumber)));
   DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED INFO: Total Reserved Memory Size = 
0x%lx.\n", TotalReservedMemorySize));
   //
-  // Loop through the system memory typed hob to merge the adjacent memory 
range
+  // Loop through the system memory typed HOB to merge the adjacent memory 
range
   //
   for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw = 
GET_NEXT_HOB(Hob)) {
     //
@@ -317,7 +317,7 @@ PeiLoadFixAddressHook(
 
       ResourceHob = Hob.ResourceDescriptor;
       //
-      // If range described in this hob is not system memory or heigher than 
MAX_ADDRESS, ignored.
+      // If range described in this HOB is not system memory or higher than 
MAX_ADDRESS, ignored.
       //
       if (ResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY ||
           ResourceHob->PhysicalStart + ResourceHob->ResourceLength > 
MAX_ADDRESS)   {
@@ -387,18 +387,18 @@ PeiLoadFixAddressHook(
         if (GET_HOB_TYPE (NextHob) == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {
           NextResourceHob = NextHob.ResourceDescriptor;
           //
-          // If range described in this hob is not system memory or heigher 
than MAX_ADDRESS, ignored.
+          // If range described in this HOB is not system memory or higher 
than MAX_ADDRESS, ignored.
           //
           if (NextResourceHob->ResourceType != EFI_RESOURCE_SYSTEM_MEMORY || 
NextResourceHob->PhysicalStart + NextResourceHob->ResourceLength > MAX_ADDRESS) 
{
             continue;
           }
           //
-          // If the range describe in memory allocation HOB  belongs to the 
memroy range described by the resource hob
+          // If the range describe in memory allocation HOB belongs to the 
memory range described by the resource HOB
           //
           if (MemoryHob->AllocDescriptor.MemoryBaseAddress >= 
NextResourceHob->PhysicalStart &&
               MemoryHob->AllocDescriptor.MemoryBaseAddress + 
MemoryHob->AllocDescriptor.MemoryLength <= NextResourceHob->PhysicalStart + 
NextResourceHob->ResourceLength) {
              //
-             // Build seperate resource hob for this allocated range
+             // Build separate resource HOB for this allocated range
              //
              if (MemoryHob->AllocDescriptor.MemoryBaseAddress > 
NextResourceHob->PhysicalStart) {
                BuildResourceDescriptorHob (
@@ -452,7 +452,7 @@ PeiLoadFixAddressHook(
 
         ResourceHob = Hob.ResourceDescriptor;
         //
-        // See if this resource descrior HOB describes tested system memory 
below MAX_ADDRESS
+        // See if this resource descriptor HOB describes tested system memory 
below MAX_ADDRESS
         //
         if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&
             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= 
MAX_ADDRESS) {
@@ -476,7 +476,7 @@ PeiLoadFixAddressHook(
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:Top Address 0x%lx is 
invalid \n",  TopLoadingAddress));
       DEBUG ((EFI_D_INFO, "LOADING MODULE FIXED ERROR:The recommended Top 
Address for the platform is: \n"));
       //
-      // Print the recomended Top address range.
+      // Print the recommended Top address range.
       //
       for (Hob.Raw = PrivateData->HobList.Raw; !END_OF_HOB_LIST(Hob); Hob.Raw 
= GET_NEXT_HOB(Hob)) {
         //
@@ -486,7 +486,7 @@ PeiLoadFixAddressHook(
 
           ResourceHob = Hob.ResourceDescriptor;
           //
-          // See if this resource descrior HOB describes tested system memory 
below MAX_ADDRESS
+          // See if this resource descriptor HOB describes tested system 
memory below MAX_ADDRESS
           //
           if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&
               ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= 
MAX_ADDRESS) {
@@ -524,7 +524,7 @@ PeiLoadFixAddressHook(
 
         ResourceHob = Hob.ResourceDescriptor;
         //
-        // See if this resource descrior HOB describes tested system memory 
below MAX_ADDRESS
+        // See if this resource descriptor HOB describes tested system memory 
below MAX_ADDRESS
         //
         if (ResourceHob->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY &&
             ResourceHob->PhysicalStart + ResourceHob->ResourceLength <= 
MAX_ADDRESS &&
@@ -554,7 +554,7 @@ PeiLoadFixAddressHook(
 
   if (CurrentResourceHob != NULL) {
     //
-    // rebuild resource HOB for PEI memmory and reserved memory
+    // rebuild resource HOB for PEI memory and reserved memory
     //
     BuildResourceDescriptorHob (
       EFI_RESOURCE_SYSTEM_MEMORY,
@@ -750,7 +750,7 @@ PeiCheckAndSwitchStack (
     ASSERT (NewStackSize >= SecCoreData->StackSize);
 
     //
-    // Calculate stack offset and heap offset between temporary memory and new 
permement
+    // Calculate stack offset and heap offset between temporary memory and new 
permanent
     // memory seperately.
     //
     TopOfOldStack = (UINTN)SecCoreData->StackBase + SecCoreData->StackSize;
@@ -1042,10 +1042,10 @@ PeiDispatcher (
   //
   // This is the main dispatch loop.  It will search known FVs for PEIMs and
   // attempt to dispatch them.  If any PEIM gets dispatched through a single
-  // pass of the dispatcher, it will start over from the Bfv again to see
+  // pass of the dispatcher, it will start over from the BFV again to see
   // if any new PEIMs dependencies got satisfied.  With a well ordered
   // FV where PEIMs are found in the order their dependencies are also
-  // satisfied, this dipatcher should run only once.
+  // satisfied, this dispatcher should run only once.
   //
   do {
     //
@@ -1081,7 +1081,7 @@ PeiDispatcher (
       }
 
       //
-      // Start to dispatch all modules within the current Fv.
+      // Start to dispatch all modules within the current FV.
       //
       for (PeimCount = Private->CurrentPeimCount;
            PeimCount < Private->Fv[FvCount].PeimCount;
@@ -1097,7 +1097,7 @@ PeiDispatcher (
             ASSERT_EFI_ERROR (Status);
             if (FvFileInfo.FileType == EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE) {
               //
-              // For Fv type file, Produce new FvInfo PPI and FV hob
+              // For FV type file, Produce new FvInfo PPI and FV HOB
               //
               Status = ProcessFvFile (Private, &Private->Fv[FvCount], 
PeimFileHandle);
               if (Status == EFI_SUCCESS) {
@@ -1317,7 +1317,7 @@ DepexSatisfied (
 
   if (PeimCount < Private->AprioriCount) {
     //
-    // If it's in the Apriori file then we set Depex to TRUE
+    // If it's in the Apriori file then we set DEPEX to TRUE
     //
     DEBUG ((DEBUG_DISPATCH, "  RESULT = TRUE (Apriori)\n"));
     return TRUE;
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c 
b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index f4642c47c1..c21eb9c039 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -13,12 +13,12 @@ EFI_PEI_NOTIFY_DESCRIPTOR mNotifyOnFvInfoList[] = {
   {
     EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK,
     &gEfiPeiFirmwareVolumeInfoPpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   },
   {
     (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | 
EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
     &gEfiPeiFirmwareVolumeInfo2PpiGuid,
-    FirmwareVolmeInfoPpiNotifyCallback
+    FirmwareVolumeInfoPpiNotifyCallback
   }
 };
 
@@ -447,7 +447,7 @@ FindFileEx (
 }
 
 /**
-  Initialize PeiCore Fv List.
+  Initialize PeiCore FV List.
 
   @param PrivateData     - Pointer to PEI_CORE_INSTANCE.
   @param SecCoreData     - Pointer to EFI_SEC_PEI_HAND_OFF.
@@ -520,7 +520,7 @@ PeiInitializeFv (
 
   //
   // Post a call-back for the FvInfoPPI and FvInfo2PPI services to expose
-  // additional Fvs to PeiCore.
+  // additional FVs to PeiCore.
   //
   Status = PeiServicesNotifyPpi (mNotifyOnFvInfoList);
   ASSERT_EFI_ERROR (Status);
@@ -528,7 +528,7 @@ PeiInitializeFv (
 }
 
 /**
-  Process Firmware Volum Information once FvInfoPPI or FvInfo2PPI install.
+  Process Firmware Volume Information once FvInfoPPI or FvInfo2PPI install.
   The FV Info will be registered into PeiCore private data structure.
   And search the inside FV image, if found, the new FV INFO(2) PPI will be 
installed.
 
@@ -537,12 +537,12 @@ PeiInitializeFv (
   @param Ppi               Address of the PPI that was installed.
 
   @retval EFI_SUCCESS    The FV Info is registered into PeiCore private data 
structure.
-  @return if not EFI_SUCESS, fail to verify FV.
+  @return if not EFI_SUCCESS, fail to verify FV.
 
 **/
 EFI_STATUS
 EFIAPI
-FirmwareVolmeInfoPpiNotifyCallback (
+FirmwareVolumeInfoPpiNotifyCallback (
   IN EFI_PEI_SERVICES              **PeiServices,
   IN EFI_PEI_NOTIFY_DESCRIPTOR     *NotifyDescriptor,
   IN VOID                          *Ppi
@@ -593,7 +593,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
   }
 
   //
-  // Locate the corresponding FV_PPI according to founded FV's format guid
+  // Locate the corresponding FV_PPI according to founded FV's format GUID
   //
   Status = PeiServicesLocatePpi (
              &FvInfo2Ppi.FvFormat,
@@ -620,7 +620,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
           PrivateData->Fv[FvIndex].AuthenticationStatus = 
FvInfo2Ppi.AuthenticationStatus;
           DEBUG ((EFI_D_INFO, "Update AuthenticationStatus of the %dth FV to 
0x%x!\n", FvIndex, FvInfo2Ppi.AuthenticationStatus));
         }
-        DEBUG ((EFI_D_INFO, "The Fv %p has already been processed!\n", 
FvInfo2Ppi.FvInfo));
+        DEBUG ((DEBUG_INFO, "The FV %p has already been processed!\n", 
FvInfo2Ppi.FvInfo));
         return EFI_SUCCESS;
       }
     }
@@ -661,7 +661,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
     PrivateData->FvCount ++;
 
     //
-    // Scan and process the new discoveried FV for 
EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
+    // Scan and process the new discovered FV for 
EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
     //
     FileHandle = NULL;
     do {
@@ -1359,11 +1359,11 @@ GetFvUsedSize (
 }
 
 /**
-  Get Fv image(s) from the FV type file, then install FV INFO(2) ppi, Build 
FV(2, 3) hob.
+  Get FV image(s) from the FV type file, then install FV INFO(2) PPI, Build 
FV(2, 3) HOB.
 
   @param PrivateData          PeiCore's private data structure
-  @param ParentFvCoreHandle   Pointer of EFI_CORE_FV_HANDLE to parent Fv image 
that contain this Fv image.
-  @param ParentFvFileHandle   File handle of a Fv type file that contain this 
Fv image.
+  @param ParentFvCoreHandle   Pointer of EFI_CORE_FV_HANDLE to parent FV image 
that contain this FV image.
+  @param ParentFvFileHandle   File handle of a FV type file that contain this 
FV image.
 
   @retval EFI_NOT_FOUND         FV image can't be found.
   @retval EFI_SUCCESS           Successfully to process it.
@@ -1533,7 +1533,7 @@ ProcessFvFile (
       );
 
     //
-    // Inform the extracted FvImage to Fv HOB consumer phase, i.e. DXE phase
+    // Inform the extracted FvImage to FV HOB consumer phase, i.e. DXE phase
     //
     BuildFvHob (
       (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,
@@ -1619,7 +1619,7 @@ PeiFfsFvPpiProcessVolume (
 
   //
   // The build-in EFI_PEI_FIRMWARE_VOLUME_PPI for FFS2/FFS3 support 
memory-mapped
-  // FV image and the handle is pointed to Fv image's buffer.
+  // FV image and the handle is pointed to FV image's buffer.
   //
   *FvHandle = (EFI_PEI_FV_HANDLE) Buffer;
 
@@ -1915,7 +1915,7 @@ PeiFfsFvPpiGetVolumeInfo (
   CopyMem (&FwVolHeader, FvHandle, sizeof (EFI_FIRMWARE_VOLUME_HEADER));
 
   //
-  // Check Fv Image Signature
+  // Check FV Image Signature
   //
   if (FwVolHeader.Signature != EFI_FVH_SIGNATURE) {
     return EFI_INVALID_PARAMETER;
@@ -2089,7 +2089,7 @@ FvHandleToCoreHandle (
 /**
   Get instance of PEI_CORE_FV_HANDLE for next volume according to given index.
 
-  This routine also will install FvInfo ppi for FV hob in PI ways.
+  This routine also will install FvInfo PPI for FV HOB in PI ways.
 
   @param Private    Pointer of PEI_CORE_INSTANCE
   @param Instance   The index of FV want to be searched.
@@ -2185,10 +2185,10 @@ PeiReinitializeFv (
 }
 
 /**
-  Report the information for a new discoveried FV in unknown third-party 
format.
+  Report the information for a new discovered FV in unknown third-party format.
 
   If the EFI_PEI_FIRMWARE_VOLUME_PPI has not been installed for third-party FV 
format, but
-  the FV in this format has been discoveried, then this FV's information will 
be cached into
+  the FV in this format has been discovered, then this FV's information will 
be cached into
   PEI_CORE_INSTANCE's UnknownFvInfo array.
   Also a notification would be installed for unknown third-party FV format 
guid, if EFI_PEI_FIRMWARE_VOLUME_PPI
   is installed later by platform's PEIM, the original unknown third-party FV 
will be processed by
@@ -2242,13 +2242,13 @@ AddUnknownFormatFvInfo (
 }
 
 /**
-  Find the FV information according to third-party FV format guid.
+  Find the FV information according to third-party FV format GUID.
 
-  This routine also will remove the FV information found by given FV format 
guid from
+  This routine also will remove the FV information found by given FV format 
GUID from
   PrivateData->UnknownFvInfo[].
 
   @param PrivateData      Point to instance of PEI_CORE_INSTANCE
-  @param Format           Point to given FV format guid
+  @param Format           Point to given FV format GUID
   @param FvInfo           On return, the pointer of FV information buffer
   @param FvInfoSize       On return, the size of FV information buffer.
   @param AuthenticationStatus On return, the authentication status of FV 
information buffer.
@@ -2298,7 +2298,7 @@ FindUnknownFormatFvInfo (
   Notification callback function for EFI_PEI_FIRMWARE_VOLUME_PPI.
 
   When a EFI_PEI_FIRMWARE_VOLUME_PPI is installed to support new FV format, 
this
-  routine is called to process all discoveried FVs in this format.
+  routine is called to process all discovered FVs in this format.
 
   @param PeiServices       An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation
   @param NotifyDescriptor  Address of the notification descriptor data 
structure.
@@ -2352,7 +2352,7 @@ ThirdPartyFvPpiNotifyCallback (
     IsProcessed = FALSE;
     for (FvIndex = 0; FvIndex < PrivateData->FvCount; FvIndex ++) {
       if (PrivateData->Fv[FvIndex].FvHandle == FvHandle) {
-        DEBUG ((EFI_D_INFO, "The Fv %p has already been processed!\n", 
FvInfo));
+        DEBUG ((DEBUG_INFO, "The FV %p has already been processed!\n", 
FvInfo));
         IsProcessed = TRUE;
         break;
       }
@@ -2398,7 +2398,7 @@ ThirdPartyFvPpiNotifyCallback (
     PrivateData->FvCount ++;
 
     //
-    // Scan and process the new discoveried FV for 
EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
+    // Scan and process the new discovered FV for 
EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
     //
     FileHandle = NULL;
     do {
diff --git a/MdeModulePkg/Core/Pei/Hob/Hob.c b/MdeModulePkg/Core/Pei/Hob/Hob.c
index 5900f6042b..e0e47fad25 100644
--- a/MdeModulePkg/Core/Pei/Hob/Hob.c
+++ b/MdeModulePkg/Core/Pei/Hob/Hob.c
@@ -1,7 +1,7 @@
 /** @file
   This module provide Hand-Off Block manupulation.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -55,7 +55,7 @@ PeiGetHobList (
   @param Length           Length of the new HOB to allocate.
   @param Hob              Pointer to the new HOB.
 
-  @return  EFI_SUCCESS           Success to create hob.
+  @return  EFI_SUCCESS           Success to create HOB.
   @retval  EFI_INVALID_PARAMETER if Hob is NULL
   @retval  EFI_NOT_AVAILABLE_YET if HobList is still not available.
   @retval  EFI_OUT_OF_RESOURCES  if there is no more memory to grow the 
Hoblist.
diff --git a/MdeModulePkg/Core/Pei/Image/Image.c 
b/MdeModulePkg/Core/Pei/Image/Image.c
index d553d9128f..e3ee369933 100644
--- a/MdeModulePkg/Core/Pei/Image/Image.c
+++ b/MdeModulePkg/Core/Pei/Image/Image.c
@@ -1,7 +1,7 @@
 /** @file
   Pei Core Load Image Support
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -99,7 +99,7 @@ CheckAndMarkFixLoadingMemoryUsageBitMap (
    }
 
    //
-   // Test if the memory is avalaible or not.
+   // Test if the memory is available or not.
    //
    MemoryUsageBitMap    = Private->PeiCodeMemoryRangeUsageBitMap;
    BaseOffsetPageNumber = EFI_SIZE_TO_PAGES((UINT32)(ImageBase - PeiCodeBase));
@@ -290,7 +290,7 @@ LoadAndRelocatePeCoffImage (
   }
 
   //
-  // Initilize local IsS3Boot and IsRegisterForShadow variable
+  // Initialize local IsS3Boot and IsRegisterForShadow variable
   //
   IsS3Boot = FALSE;
   if (Private->HobList.HandoffInformationTable->BootMode == BOOT_ON_S3_RESUME) 
{
@@ -363,7 +363,7 @@ LoadAndRelocatePeCoffImage (
       if (EFI_ERROR (Status)){
         DEBUG ((EFI_D_INFO|EFI_D_LOAD, "LOADING MODULE FIXED ERROR: Failed to 
load module at fixed address. \n"));
         //
-        // The PEIM is not assiged valid address, try to allocate page to load 
it.
+        // The PEIM is not assigned valid address, try to allocate page to 
load it.
         //
         Status = PeiServicesAllocatePages (EfiBootServicesCode,
                                            EFI_SIZE_TO_PAGES ((UINT32) 
AlignImageSize),
@@ -602,7 +602,7 @@ PeiLoadImageLoadImage (
       //
       // Copy the PDB file name to our temporary string, and replace .pdb with 
.efi
       // The PDB file name is limited in the range of 0~511.
-      // If the length is bigger than 511, trim the redudant characters to 
avoid overflow in array boundary.
+      // If the length is bigger than 511, trim the redundant characters to 
avoid overflow in array boundary.
       //
       for (Index = 0; Index < sizeof (EfiFileName) - 4; Index++) {
         EfiFileName[Index] = AsciiString[Index + StartIndex];
diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c 
b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 706837890f..838a003baa 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -1,7 +1,7 @@
 /** @file
   EFI PEI Core memory services
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
                          environment, such as the size and location of 
temporary RAM, the stack location and
                          the BFV location.
   @param OldCoreData     Pointer to the PEI Core data.
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
 
 **/
 VOID
@@ -32,7 +32,7 @@ InitializeMemoryServices (
 
   //
   // First entering PeiCore, following code will initialized some field
-  // in PeiCore's private data according to hand off data from sec core.
+  // in PeiCore's private data according to hand off data from SEC core.
   //
   if (OldCoreData == NULL) {
 
@@ -61,7 +61,7 @@ InitializeMemoryServices (
   The usage model is that the PEIM that discovers the permanent memory shall 
invoke this service.
   This routine will hold discoveried memory information into PeiCore's private 
data,
   and set SwitchStackSignal flag. After PEIM who discovery memory is 
dispatched,
-  PeiDispatcher will migrate temporary memory to permenement memory.
+  PeiDispatcher will migrate temporary memory to permanent memory.
 
   @param PeiServices        An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation.
   @param MemoryBegin        Start of memory address.
@@ -86,7 +86,7 @@ PeiInstallPeiMemory (
   //
   // PEI_SERVICE.InstallPeiMemory should only be called one time during whole 
PEI phase.
   // If it is invoked more than one time, ASSERT information is given for 
developer debugging in debug tip and
-  // simply return EFI_SUCESS in release tip to ignore it.
+  // simply return EFI_SUCCESS in release tip to ignore it.
   //
   if (PrivateData->PeiMemoryInstalled) {
     DEBUG ((EFI_D_ERROR, "ERROR: PeiInstallPeiMemory is called more than 
once!\n"));
@@ -758,8 +758,8 @@ PeiFreePages (
 
 /**
 
-  Pool allocation service. Before permanent memory is discoveried, the pool 
will
-  be allocated the heap in the temporary memory. Genenrally, the size of heap 
in temporary
+  Pool allocation service. Before permanent memory is discovered, the pool will
+  be allocated the heap in the temporary memory. Generally, the size of heap 
in temporary
   memory does not exceed to 64K, so the biggest pool size could be allocated is
   64K.
 
@@ -790,7 +790,7 @@ PeiAllocatePool (
 
   //
   // Generally, the size of heap in temporary memory does not exceed to 64K,
-  // HobLength is multiples of 8 bytes, so the maxmium size of pool is 0xFFF8 
- sizeof (EFI_HOB_MEMORY_POOL)
+  // HobLength is multiples of 8 bytes, so the maximum size of pool is 0xFFF8 
- sizeof (EFI_HOB_MEMORY_POOL)
   //
   if (Size > (0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL))) {
     return EFI_OUT_OF_RESOURCES;
diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c 
b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 33f056ea8f..025d7f98ec 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -315,7 +315,7 @@ PeiCore (
       }
 
       //
-      // Shadow PEI Core. When permanent memory is avaiable, shadow
+      // Shadow PEI Core. When permanent memory is available, shadow
       // PEI Core and PEIMs to get high performance.
       //
       OldCoreData->ShadowedPeiCore = (PEICORE_FUNCTION_POINTER) (UINTN) 
PeiCore;
diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 964aee690e..1ffe718c47 100644
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -1,7 +1,7 @@
 /** @file
   EFI PEI Core PPI services
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -663,7 +663,7 @@ ProcessDispatchNotifyList (
     //
     // Check if the PEIM that was just dispatched resulted in any
     // Notifies getting installed.  If so, go process any dispatch
-    // level Notifies that match the previouly installed PPIs.
+    // level Notifies that match the previously installed PPIs.
     // Use "while" instead of "if" since ProcessNotify can modify
     // DispatchNotifyList.CurrentCount (with NotifyPpi) so we have
     // to iterate until the same.
diff --git a/MdeModulePkg/Core/Pei/Security/Security.c 
b/MdeModulePkg/Core/Pei/Security/Security.c
index 99da505538..8c18ed6cc8 100644
--- a/MdeModulePkg/Core/Pei/Security/Security.c
+++ b/MdeModulePkg/Core/Pei/Security/Security.c
@@ -1,7 +1,7 @@
 /** @file
   EFI PEI Core Security services
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -20,7 +20,7 @@ EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {
 
   @param PeiServices     An indirect pointer to the EFI_PEI_SERVICES table 
published by the PEI Foundation.
   @param OldCoreData     Pointer to the old core data.
-                         NULL if being run in non-permament memory mode.
+                         NULL if being run in non-permanent memory mode.
 
 **/
 VOID
@@ -76,7 +76,7 @@ SecurityPpiNotifyCallback (
 
   @param PrivateData     PeiCore's private data structure
   @param VolumeHandle    Handle of FV
-  @param FileHandle      Handle of PEIM's ffs
+  @param FileHandle      Handle of PEIM's FFS
   @param AuthenticationStatus Authentication status
 
   @retval EFI_SUCCESS              Image is OK
@@ -92,7 +92,7 @@ VerifyPeim (
   )
 {
   EFI_STATUS                      Status;
-  BOOLEAN                         DeferExection;
+  BOOLEAN                         DeferExecution;
 
   Status = EFI_NOT_FOUND;
   if (PrivateData->PrivateSecurityPpi == NULL) {
@@ -114,9 +114,9 @@ VerifyPeim (
                                                 AuthenticationStatus,
                                                 VolumeHandle,
                                                 FileHandle,
-                                                &DeferExection
+                                                &DeferExecution
                                                 );
-    if (DeferExection) {
+    if (DeferExecution) {
       Status = EFI_SECURITY_VIOLATION;
     }
   }
-- 
2.16.2.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#51374): https://edk2.groups.io/g/devel/message/51374
Mute This Topic: https://groups.io/mt/62875584/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to