IntelFsp2Pkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the IntelFsp2Pkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

9 files changed, 363 insertions, 352 deletions

diff --git a/IntelFsp2Pkg/Library/BaseCacheAsRamLibNull/DisableCacheAsRamNull.c b/IntelFsp2Pkg/Library/BaseCacheAsRamLibNull/DisableCacheAsRamNull.c
index 78abb6d5d0..bf1422c5d0 100644
--- a/IntelFsp2Pkg/Library/BaseCacheAsRamLibNull/DisableCacheAsRamNull.c
+++ b/IntelFsp2Pkg/Library/BaseCacheAsRamLibNull/DisableCacheAsRamNull.c
@@ -18,7 +18,7 @@
 VOID

 EFIAPI

 DisableCacheAsRam (

-  IN BOOLEAN                   DisableCar

+  IN BOOLEAN  DisableCar

   )

 {

   //

@@ -28,8 +28,8 @@ DisableCacheAsRam (
   if (DisableCar) {

     AsmInvd ();

   } else {

-    AsmWbinvd();

+    AsmWbinvd ();

   }

 

-  return ;

+  return;

 }

diff --git a/IntelFsp2Pkg/Library/BaseCacheLib/CacheLib.c b/IntelFsp2Pkg/Library/BaseCacheLib/CacheLib.c
index 2365f7514e..f879c268e7 100644
--- a/IntelFsp2Pkg/Library/BaseCacheLib/CacheLib.c
+++ b/IntelFsp2Pkg/Library/BaseCacheLib/CacheLib.c
@@ -26,11 +26,11 @@
 **/

 EFI_STATUS

 SearchForExactMtrr (

-  IN  EFI_PHYSICAL_ADDRESS      MemoryAddress,

-  IN  UINT64                    MemoryLength,

-  IN  UINT64                    ValidMtrrAddressMask,

-  OUT UINT32                    *UsedMsrNum,

-  OUT EFI_MEMORY_CACHE_TYPE     *MemoryCacheType

+  IN  EFI_PHYSICAL_ADDRESS   MemoryAddress,

+  IN  UINT64                 MemoryLength,

+  IN  UINT64                 ValidMtrrAddressMask,

+  OUT UINT32                 *UsedMsrNum,

+  OUT EFI_MEMORY_CACHE_TYPE  *MemoryCacheType

   );

 

 /**

@@ -43,7 +43,7 @@ SearchForExactMtrr (
 **/

 BOOLEAN

 IsDefaultType (

-  IN  EFI_MEMORY_CACHE_TYPE     MemoryCacheType

+  IN  EFI_MEMORY_CACHE_TYPE  MemoryCacheType

   );

 

 /**

@@ -58,8 +58,8 @@ IsDefaultType (
 **/

 UINT32

 CheckMtrrAlignment (

-  IN  UINT64                    BaseAddress,

-  IN  UINT64                    Size

+  IN  UINT64  BaseAddress,

+  IN  UINT64  Size

   );

 

 typedef struct {

@@ -68,18 +68,18 @@ typedef struct {
   UINT32    Length;

 } EFI_FIXED_MTRR;

 

-EFI_FIXED_MTRR mFixedMtrrTable[] = {

-  { EFI_MSR_IA32_MTRR_FIX64K_00000, 0,       0x10000},

-  { EFI_MSR_IA32_MTRR_FIX16K_80000, 0x80000, 0x4000},

-  { EFI_MSR_IA32_MTRR_FIX16K_A0000, 0xA0000, 0x4000},

-  { EFI_MSR_IA32_MTRR_FIX4K_C0000,  0xC0000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_C8000,  0xC8000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_D0000,  0xD0000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_D8000,  0xD8000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_E0000,  0xE0000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_E8000,  0xE8000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_F0000,  0xF0000, 0x1000},

-  { EFI_MSR_IA32_MTRR_FIX4K_F8000,  0xF8000, 0x1000}

+EFI_FIXED_MTRR  mFixedMtrrTable[] = {

+  { EFI_MSR_IA32_MTRR_FIX64K_00000, 0,       0x10000 },

+  { EFI_MSR_IA32_MTRR_FIX16K_80000, 0x80000, 0x4000  },

+  { EFI_MSR_IA32_MTRR_FIX16K_A0000, 0xA0000, 0x4000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_C0000,  0xC0000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_C8000,  0xC8000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_D0000,  0xD0000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_D8000,  0xD8000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_E0000,  0xE0000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_E8000,  0xE8000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_F0000,  0xF0000, 0x1000  },

+  { EFI_MSR_IA32_MTRR_FIX4K_F8000,  0xF8000, 0x1000  }

 };

 

 /**

@@ -94,7 +94,7 @@ EFI_FIXED_MTRR mFixedMtrrTable[] = {
 **/

 INT8

 CheckDirection (

-  IN  UINT64                    Input

+  IN  UINT64  Input

   )

 {

   return 0;

@@ -108,7 +108,7 @@ CheckDirection (
 **/

 VOID

 EfiDisableCacheMtrr (

-  OUT UINT64                   *OldMtrr

+  OUT UINT64  *OldMtrr

   )

 {

   UINT64  TempQword;

@@ -116,9 +116,9 @@ EfiDisableCacheMtrr (
   //

   // Disable Cache MTRR

   //

-  *OldMtrr = AsmReadMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE);

+  *OldMtrr  = AsmReadMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE);

   TempQword = (*OldMtrr) & ~B_EFI_MSR_GLOBAL_MTRR_ENABLE & ~B_EFI_MSR_FIXED_MTRR_ENABLE;

-  AsmWriteMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE, TempQword);

+  AsmWriteMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE, TempQword);

   AsmDisableCache ();

 }

 

@@ -131,8 +131,8 @@ EfiDisableCacheMtrr (
 **/

 VOID

 EfiRecoverCacheMtrr (

-  IN BOOLEAN                  EnableMtrr,

-  IN UINT64                   OldMtrr

+  IN BOOLEAN  EnableMtrr,

+  IN UINT64   OldMtrr

   )

 {

   UINT64  TempQword;

@@ -141,7 +141,7 @@ EfiRecoverCacheMtrr (
   // Enable Cache MTRR

   //

   if (EnableMtrr) {

-    TempQword = AsmReadMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE);

+    TempQword  = AsmReadMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE);

     TempQword |= (UINT64)(B_EFI_MSR_GLOBAL_MTRR_ENABLE | B_EFI_MSR_FIXED_MTRR_ENABLE);

   } else {

     TempQword = OldMtrr;

@@ -164,15 +164,15 @@ EfiRecoverCacheMtrr (
 **/

 VOID

 EfiProgramMtrr (

-  IN  UINT32                    MtrrNumber,

-  IN  EFI_PHYSICAL_ADDRESS      MemoryAddress,

-  IN  UINT64                    MemoryLength,

-  IN  EFI_MEMORY_CACHE_TYPE     MemoryCacheType,

-  IN  UINT64                    ValidMtrrAddressMask

+  IN  UINT32                 MtrrNumber,

+  IN  EFI_PHYSICAL_ADDRESS   MemoryAddress,

+  IN  UINT64                 MemoryLength,

+  IN  EFI_MEMORY_CACHE_TYPE  MemoryCacheType,

+  IN  UINT64                 ValidMtrrAddressMask

   )

 {

-  UINT64                        TempQword;

-  UINT64                        OldMtrr;

+  UINT64  TempQword;

+  UINT64  OldMtrr;

 

   if (MemoryLength == 0) {

     return;

@@ -206,11 +206,11 @@ EfiProgramMtrr (
 **/

 UINT64

 Power2MaxMemory (

-  IN UINT64                 MemoryAddress,

-  IN UINT64                 MemoryLength

+  IN UINT64  MemoryAddress,

+  IN UINT64  MemoryLength

   )

 {

-  UINT64                    Result;

+  UINT64  Result;

 

   if (MemoryLength == 0) {

     return EFI_INVALID_PARAMETER;

@@ -219,7 +219,7 @@ Power2MaxMemory (
   //

   // Compute initial power of 2 size to return

   //

-  Result = GetPowerOfTwo64(MemoryLength);

+  Result = GetPowerOfTwo64 (MemoryLength);

 

   //

   // Special case base of 0 as all ranges are valid

@@ -253,20 +253,20 @@ Power2MaxMemory (
 **/

 UINT32

 CheckMtrrAlignment (

-  IN  UINT64    BaseAddress,

-  IN  UINT64    Size

+  IN  UINT64  BaseAddress,

+  IN  UINT64  Size

   )

 {

-  UINT32      ShiftedBase;

-  UINT32      ShiftedSize;

+  UINT32  ShiftedBase;

+  UINT32  ShiftedSize;

 

   //

   // Shift base and size right 12 bits to allow for larger memory sizes.  The

   // MTRRs do not use the first 12 bits so this is safe for now.  Only supports

   // up to 52 bits of physical address space.

   //

-  ShiftedBase = (UINT32) RShiftU64 (BaseAddress, 12);

-  ShiftedSize = (UINT32) RShiftU64 (Size, 12);

+  ShiftedBase = (UINT32)RShiftU64 (BaseAddress, 12);

+  ShiftedSize = (UINT32)RShiftU64 (Size, 12);

 

   //

   // Return the results to the caller of the MOD

@@ -288,47 +288,53 @@ CheckMtrrAlignment (
 **/

 EFI_STATUS

 ProgramFixedMtrr (

-  IN  EFI_MEMORY_CACHE_TYPE     MemoryCacheType,

-  IN  UINT64                    *Base,

-  IN  UINT64                    *Len

+  IN  EFI_MEMORY_CACHE_TYPE  MemoryCacheType,

+  IN  UINT64                 *Base,

+  IN  UINT64                 *Len

   )

 {

-  UINT32                      MsrNum;

-  UINT32                      ByteShift;

-  UINT64                      TempQword;

-  UINT64                      OrMask;

-  UINT64                      ClearMask;

+  UINT32  MsrNum;

+  UINT32  ByteShift;

+  UINT64  TempQword;

+  UINT64  OrMask;

+  UINT64  ClearMask;

 

   TempQword = 0;

-  OrMask =  0;

+  OrMask    =  0;

   ClearMask = 0;

 

   for (MsrNum = 0; MsrNum < V_EFI_FIXED_MTRR_NUMBER; MsrNum++) {

     if ((*Base >= mFixedMtrrTable[MsrNum].BaseAddress) &&

-        (*Base < (mFixedMtrrTable[MsrNum].BaseAddress + 8 * mFixedMtrrTable[MsrNum].Length))) {

+        (*Base < (mFixedMtrrTable[MsrNum].BaseAddress + 8 * mFixedMtrrTable[MsrNum].Length)))

+    {

       break;

     }

   }

+

   if (MsrNum == V_EFI_FIXED_MTRR_NUMBER ) {

     return EFI_DEVICE_ERROR;

   }

+

   //

   // We found the fixed MTRR to be programmed

   //

-  for (ByteShift=0; ByteShift < 8; ByteShift++) {

+  for (ByteShift = 0; ByteShift < 8; ByteShift++) {

     if ( *Base == (mFixedMtrrTable[MsrNum].BaseAddress + ByteShift * mFixedMtrrTable[MsrNum].Length)) {

       break;

     }

   }

+

   if (ByteShift == 8 ) {

     return EFI_DEVICE_ERROR;

   }

-  for (; ((ByteShift<8) && (*Len >= mFixedMtrrTable[MsrNum].Length));ByteShift++) {

-    OrMask |= LShiftU64((UINT64) MemoryCacheType, (UINT32) (ByteShift* 8));

-    ClearMask |= LShiftU64((UINT64) 0xFF, (UINT32) (ByteShift * 8));

-    *Len -= mFixedMtrrTable[MsrNum].Length;

-    *Base += mFixedMtrrTable[MsrNum].Length;

+

+  for ( ; ((ByteShift < 8) && (*Len >= mFixedMtrrTable[MsrNum].Length)); ByteShift++) {

+    OrMask    |= LShiftU64 ((UINT64)MemoryCacheType, (UINT32)(ByteShift* 8));

+    ClearMask |= LShiftU64 ((UINT64)0xFF, (UINT32)(ByteShift * 8));

+    *Len      -= mFixedMtrrTable[MsrNum].Length;

+    *Base     += mFixedMtrrTable[MsrNum].Length;

   }

+

   TempQword = (AsmReadMsr64 (mFixedMtrrTable[MsrNum].Msr) & (~ClearMask)) | OrMask;

   AsmWriteMsr64 (mFixedMtrrTable[MsrNum].Msr, TempQword);

 

@@ -346,8 +352,8 @@ ProgramFixedMtrr (
 **/

 BOOLEAN

 CheckMtrrOverlap (

-  IN  EFI_PHYSICAL_ADDRESS      Start,

-  IN  EFI_PHYSICAL_ADDRESS      End

+  IN  EFI_PHYSICAL_ADDRESS  Start,

+  IN  EFI_PHYSICAL_ADDRESS  End

   )

 {

   return FALSE;

@@ -369,33 +375,33 @@ CheckMtrrOverlap (
 EFI_STATUS

 EFIAPI

 SetCacheAttributes (

-  IN  EFI_PHYSICAL_ADDRESS      MemoryAddress,

-  IN  UINT64                    MemoryLength,

-  IN  EFI_MEMORY_CACHE_TYPE     MemoryCacheType

+  IN  EFI_PHYSICAL_ADDRESS   MemoryAddress,

+  IN  UINT64                 MemoryLength,

+  IN  EFI_MEMORY_CACHE_TYPE  MemoryCacheType

   )

 {

-  EFI_STATUS            Status;

-  UINT32                MsrNum, MsrNumEnd;

-  UINT64                TempQword;

-  UINT32                LastVariableMtrrForBios;

-  UINT64                OldMtrr;

-  UINT32                UsedMsrNum;

-  EFI_MEMORY_CACHE_TYPE UsedMemoryCacheType;

-  UINT64                ValidMtrrAddressMask;

-  UINT32                Cpuid_RegEax;

+  EFI_STATUS             Status;

+  UINT32                 MsrNum, MsrNumEnd;

+  UINT64                 TempQword;

+  UINT32                 LastVariableMtrrForBios;

+  UINT64                 OldMtrr;

+  UINT32                 UsedMsrNum;

+  EFI_MEMORY_CACHE_TYPE  UsedMemoryCacheType;

+  UINT64                 ValidMtrrAddressMask;

+  UINT32                 Cpuid_RegEax;

 

   AsmCpuid (CPUID_EXTENDED_FUNCTION, &Cpuid_RegEax, NULL, NULL, NULL);

   if (Cpuid_RegEax >= CPUID_VIR_PHY_ADDRESS_SIZE) {

     AsmCpuid (CPUID_VIR_PHY_ADDRESS_SIZE, &Cpuid_RegEax, NULL, NULL, NULL);

-    ValidMtrrAddressMask = (LShiftU64((UINT64) 1, (Cpuid_RegEax & 0xFF)) - 1) & (~(UINT64)0x0FFF);

+    ValidMtrrAddressMask = (LShiftU64 ((UINT64)1, (Cpuid_RegEax & 0xFF)) - 1) & (~(UINT64)0x0FFF);

   } else {

-    ValidMtrrAddressMask = (LShiftU64((UINT64) 1, 36) - 1) & (~(UINT64)0x0FFF);

+    ValidMtrrAddressMask = (LShiftU64 ((UINT64)1, 36) - 1) & (~(UINT64)0x0FFF);

   }

 

   //

   // Check for invalid parameter

   //

-  if ((MemoryAddress & ~ValidMtrrAddressMask) != 0 || (MemoryLength & ~ValidMtrrAddressMask) != 0) {

+  if (((MemoryAddress & ~ValidMtrrAddressMask) != 0) || ((MemoryLength & ~ValidMtrrAddressMask) != 0)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -424,6 +430,7 @@ SetCacheAttributes (
     while ((MemoryLength > 0) && (Status == EFI_SUCCESS)) {

       Status = ProgramFixedMtrr (MemoryCacheType, &MemoryAddress, &MemoryLength);

     }

+

     EfiRecoverCacheMtrr (TRUE, OldMtrr);

     return Status;

   }

@@ -431,15 +438,15 @@ SetCacheAttributes (
   //

   // Search if the range attribute has been set before

   //

-  Status = SearchForExactMtrr(

-                              MemoryAddress,

-                              MemoryLength,

-                              ValidMtrrAddressMask,

-                              &UsedMsrNum,

-                              &UsedMemoryCacheType

-                              );

+  Status = SearchForExactMtrr (

+             MemoryAddress,

+             MemoryLength,

+             ValidMtrrAddressMask,

+             &UsedMsrNum,

+             &UsedMemoryCacheType

+             );

 

-  if (!EFI_ERROR(Status)) {

+  if (!EFI_ERROR (Status)) {

     //

     // Compare if it has the same type as current setting

     //

@@ -453,49 +460,51 @@ SetCacheAttributes (
       //

       // Check if the set type is the same as Default Type

       //

-      if (IsDefaultType(MemoryCacheType)) {

+      if (IsDefaultType (MemoryCacheType)) {

         //

         // Clear the MTRR

         //

-        AsmWriteMsr64(UsedMsrNum, 0);

-        AsmWriteMsr64(UsedMsrNum + 1, 0);

+        AsmWriteMsr64 (UsedMsrNum, 0);

+        AsmWriteMsr64 (UsedMsrNum + 1, 0);

 

         return EFI_SUCCESS;

       } else {

         //

         // Modify the MTRR type

         //

-        EfiProgramMtrr(UsedMsrNum,

-                       MemoryAddress,

-                       MemoryLength,

-                       MemoryCacheType,

-                       ValidMtrrAddressMask

-                       );

+        EfiProgramMtrr (

+          UsedMsrNum,

+          MemoryAddress,

+          MemoryLength,

+          MemoryCacheType,

+          ValidMtrrAddressMask

+          );

         return EFI_SUCCESS;

       }

     }

   }

 

-#if 0

+ #if 0

   //

   // @bug - Need to create memory map so that when checking for overlap we

   //        can determine if an overlap exists based on all caching requests.

   //

   // Don't waste a variable MTRR if the caching attrib is same as default in MTRR_DEF_TYPE

   //

-  if (MemoryCacheType == (AsmReadMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE) & B_EFI_MSR_CACHE_MEMORY_TYPE))  {

+  if (MemoryCacheType == (AsmReadMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE) & B_EFI_MSR_CACHE_MEMORY_TYPE)) {

     if (!CheckMtrrOverlap (MemoryAddress, MemoryAddress+MemoryLength-1)) {

       return EFI_SUCCESS;

     }

   }

-#endif

+

+ #endif

 

   //

   // Find first unused MTRR

   //

-  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64(EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

-  for (MsrNum = EFI_MSR_CACHE_VARIABLE_MTRR_BASE; MsrNum < MsrNumEnd; MsrNum +=2) {

-    if ((AsmReadMsr64(MsrNum+1) & B_EFI_MSR_CACHE_MTRR_VALID) == 0 ) {

+  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64 (EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

+  for (MsrNum = EFI_MSR_CACHE_VARIABLE_MTRR_BASE; MsrNum < MsrNumEnd; MsrNum += 2) {

+    if ((AsmReadMsr64 (MsrNum+1) & B_EFI_MSR_CACHE_MTRR_VALID) == 0 ) {

       break;

     }

   }

@@ -520,14 +529,14 @@ SetCacheAttributes (
   //

   TempQword = MemoryLength;

 

-  if (TempQword == Power2MaxMemory(MemoryAddress, TempQword)) {

-    EfiProgramMtrr(MsrNum,

-                   MemoryAddress,

-                   MemoryLength,

-                   MemoryCacheType,

-                   ValidMtrrAddressMask

-                   );

-

+  if (TempQword == Power2MaxMemory (MemoryAddress, TempQword)) {

+    EfiProgramMtrr (

+      MsrNum,

+      MemoryAddress,

+      MemoryLength,

+      MemoryCacheType,

+      ValidMtrrAddressMask

+      );

   } else {

     //

     // Fill in MTRRs with values.  Direction can not be checked for this method

@@ -545,16 +554,17 @@ SetCacheAttributes (
       //

       // Set next power of 2 region

       //

-      MemoryLength = Power2MaxMemory(MemoryAddress, TempQword);

-      EfiProgramMtrr(MsrNum,

-                     MemoryAddress,

-                     MemoryLength,

-                     MemoryCacheType,

-                     ValidMtrrAddressMask

-                     );

+      MemoryLength = Power2MaxMemory (MemoryAddress, TempQword);

+      EfiProgramMtrr (

+        MsrNum,

+        MemoryAddress,

+        MemoryLength,

+        MemoryCacheType,

+        ValidMtrrAddressMask

+        );

       MemoryAddress += MemoryLength;

-      TempQword -= MemoryLength;

-      MsrNum += 2;

+      TempQword     -= MemoryLength;

+      MsrNum        += 2;

     } while (TempQword != 0);

   }

 

@@ -573,12 +583,13 @@ ResetCacheAttributes (
   VOID

   )

 {

-  UINT32                      MsrNum, MsrNumEnd;

-  UINT16                      Index;

-  UINT64                      OldMtrr;

-  UINT64                      CacheType;

-  BOOLEAN                     DisableCar;

-  Index = 0;

+  UINT32   MsrNum, MsrNumEnd;

+  UINT16   Index;

+  UINT64   OldMtrr;

+  UINT64   CacheType;

+  BOOLEAN  DisableCar;

+

+  Index      = 0;

   DisableCar = TRUE;

 

   //

@@ -589,7 +600,7 @@ ResetCacheAttributes (
   //

   // Set default cache type

   //

-  AsmWriteMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE, CacheType);

+  AsmWriteMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE, CacheType);

 

   //

   // Disable CAR

@@ -608,7 +619,7 @@ ResetCacheAttributes (
   //

   // Reset Variable MTRRs

   //

-  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64(EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

+  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64 (EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

   for (MsrNum = EFI_MSR_CACHE_VARIABLE_MTRR_BASE; MsrNum < MsrNumEnd; MsrNum++) {

     AsmWriteMsr64 (MsrNum, 0);

   }

@@ -636,23 +647,23 @@ ResetCacheAttributes (
 **/

 EFI_STATUS

 SearchForExactMtrr (

-  IN  EFI_PHYSICAL_ADDRESS      MemoryAddress,

-  IN  UINT64                    MemoryLength,

-  IN  UINT64                    ValidMtrrAddressMask,

-  OUT UINT32                    *UsedMsrNum,

-  OUT EFI_MEMORY_CACHE_TYPE     *UsedMemoryCacheType

+  IN  EFI_PHYSICAL_ADDRESS   MemoryAddress,

+  IN  UINT64                 MemoryLength,

+  IN  UINT64                 ValidMtrrAddressMask,

+  OUT UINT32                 *UsedMsrNum,

+  OUT EFI_MEMORY_CACHE_TYPE  *UsedMemoryCacheType

   )

 {

-  UINT32                      MsrNum, MsrNumEnd;

-  UINT64                      TempQword;

+  UINT32  MsrNum, MsrNumEnd;

+  UINT64  TempQword;

 

   if (MemoryLength == 0) {

     return EFI_INVALID_PARAMETER;

   }

 

-  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64(EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

-  for (MsrNum = EFI_MSR_CACHE_VARIABLE_MTRR_BASE; MsrNum < MsrNumEnd; MsrNum +=2) {

-    TempQword = AsmReadMsr64(MsrNum+1);

+  MsrNumEnd = EFI_MSR_CACHE_VARIABLE_MTRR_BASE + (2 * (UINT32)(AsmReadMsr64 (EFI_MSR_IA32_MTRR_CAP) & B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT));

+  for (MsrNum = EFI_MSR_CACHE_VARIABLE_MTRR_BASE; MsrNum < MsrNumEnd; MsrNum += 2) {

+    TempQword = AsmReadMsr64 (MsrNum+1);

     if ((TempQword & B_EFI_MSR_CACHE_MTRR_VALID) == 0) {

       continue;

     }

@@ -667,7 +678,7 @@ SearchForExactMtrr (
     }

 

     *UsedMemoryCacheType = (EFI_MEMORY_CACHE_TYPE)(TempQword & B_EFI_MSR_CACHE_MEMORY_TYPE);

-    *UsedMsrNum = MsrNum;

+    *UsedMsrNum          = MsrNum;

 

     return EFI_SUCCESS;

   }

@@ -685,13 +696,12 @@ SearchForExactMtrr (
 **/

 BOOLEAN

 IsDefaultType (

-  IN  EFI_MEMORY_CACHE_TYPE     MemoryCacheType

+  IN  EFI_MEMORY_CACHE_TYPE  MemoryCacheType

   )

 {

-  if ((AsmReadMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE) & B_EFI_MSR_CACHE_MEMORY_TYPE) != MemoryCacheType) {

+  if ((AsmReadMsr64 (EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE) & B_EFI_MSR_CACHE_MEMORY_TYPE) != MemoryCacheType) {

     return FALSE;

   }

 

   return TRUE;

 }

-

diff --git a/IntelFsp2Pkg/Library/BaseCacheLib/CacheLibInternal.h b/IntelFsp2Pkg/Library/BaseCacheLib/CacheLibInternal.h
index 56d3727111..7dcf7fef24 100644
--- a/IntelFsp2Pkg/Library/BaseCacheLib/CacheLibInternal.h
+++ b/IntelFsp2Pkg/Library/BaseCacheLib/CacheLibInternal.h
@@ -8,46 +8,45 @@
 #ifndef _CACHE_LIB_INTERNAL_H_

 #define _CACHE_LIB_INTERNAL_H_

 

-#define EFI_MSR_CACHE_VARIABLE_MTRR_BASE       0x00000200

-#define EFI_MSR_CACHE_VARIABLE_MTRR_END        0x0000020F

-#define   V_EFI_FIXED_MTRR_NUMBER                                      11

-

-#define EFI_MSR_IA32_MTRR_FIX64K_00000         0x00000250

-#define EFI_MSR_IA32_MTRR_FIX16K_80000         0x00000258

-#define EFI_MSR_IA32_MTRR_FIX16K_A0000         0x00000259

-#define EFI_MSR_IA32_MTRR_FIX4K_C0000          0x00000268

-#define EFI_MSR_IA32_MTRR_FIX4K_C8000          0x00000269

-#define EFI_MSR_IA32_MTRR_FIX4K_D0000          0x0000026A

-#define EFI_MSR_IA32_MTRR_FIX4K_D8000          0x0000026B

-#define EFI_MSR_IA32_MTRR_FIX4K_E0000          0x0000026C

-#define EFI_MSR_IA32_MTRR_FIX4K_E8000          0x0000026D

-#define EFI_MSR_IA32_MTRR_FIX4K_F0000          0x0000026E

-#define EFI_MSR_IA32_MTRR_FIX4K_F8000          0x0000026F

-#define EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE       0x000002FF

-#define   B_EFI_MSR_CACHE_MTRR_VALID                                   BIT11

-#define   B_EFI_MSR_GLOBAL_MTRR_ENABLE                                 BIT11

-#define   B_EFI_MSR_FIXED_MTRR_ENABLE                                  BIT10

-#define   B_EFI_MSR_CACHE_MEMORY_TYPE                                  (BIT2 | BIT1 | BIT0)

-

-#define EFI_MSR_VALID_MASK                     0xFFFFFFFFF

-#define EFI_CACHE_VALID_ADDRESS                0xFFFFFF000

-#define EFI_SMRR_CACHE_VALID_ADDRESS           0xFFFFF000

-#define EFI_CACHE_VALID_EXTENDED_ADDRESS       0xFFFFFFFFFF000

+#define EFI_MSR_CACHE_VARIABLE_MTRR_BASE  0x00000200

+#define EFI_MSR_CACHE_VARIABLE_MTRR_END   0x0000020F

+#define   V_EFI_FIXED_MTRR_NUMBER         11

+

+#define EFI_MSR_IA32_MTRR_FIX64K_00000    0x00000250

+#define EFI_MSR_IA32_MTRR_FIX16K_80000    0x00000258

+#define EFI_MSR_IA32_MTRR_FIX16K_A0000    0x00000259

+#define EFI_MSR_IA32_MTRR_FIX4K_C0000     0x00000268

+#define EFI_MSR_IA32_MTRR_FIX4K_C8000     0x00000269

+#define EFI_MSR_IA32_MTRR_FIX4K_D0000     0x0000026A

+#define EFI_MSR_IA32_MTRR_FIX4K_D8000     0x0000026B

+#define EFI_MSR_IA32_MTRR_FIX4K_E0000     0x0000026C

+#define EFI_MSR_IA32_MTRR_FIX4K_E8000     0x0000026D

+#define EFI_MSR_IA32_MTRR_FIX4K_F0000     0x0000026E

+#define EFI_MSR_IA32_MTRR_FIX4K_F8000     0x0000026F

+#define EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE  0x000002FF

+#define   B_EFI_MSR_CACHE_MTRR_VALID      BIT11

+#define   B_EFI_MSR_GLOBAL_MTRR_ENABLE    BIT11

+#define   B_EFI_MSR_FIXED_MTRR_ENABLE     BIT10

+#define   B_EFI_MSR_CACHE_MEMORY_TYPE     (BIT2 | BIT1 | BIT0)

+

+#define EFI_MSR_VALID_MASK                0xFFFFFFFFF

+#define EFI_CACHE_VALID_ADDRESS           0xFFFFFF000

+#define EFI_SMRR_CACHE_VALID_ADDRESS      0xFFFFF000

+#define EFI_CACHE_VALID_EXTENDED_ADDRESS  0xFFFFFFFFFF000

 

 // Leave one MTRR pairs for OS use

-#define EFI_CACHE_NUM_VAR_MTRR_PAIRS_FOR_OS   1

-#define EFI_CACHE_LAST_VARIABLE_MTRR_FOR_BIOS (EFI_MSR_CACHE_VARIABLE_MTRR_END) - \

+#define EFI_CACHE_NUM_VAR_MTRR_PAIRS_FOR_OS    1

+#define EFI_CACHE_LAST_VARIABLE_MTRR_FOR_BIOS  (EFI_MSR_CACHE_VARIABLE_MTRR_END) -\

         (EFI_CACHE_NUM_VAR_MTRR_PAIRS_FOR_OS * 2)

 

-#define EFI_MSR_IA32_MTRR_CAP                  0x000000FE

-#define   B_EFI_MSR_IA32_MTRR_CAP_EMRR_SUPPORT                         BIT12

-#define   B_EFI_MSR_IA32_MTRR_CAP_SMRR_SUPPORT                         BIT11

-#define   B_EFI_MSR_IA32_MTRR_CAP_WC_SUPPORT                           BIT10

-#define   B_EFI_MSR_IA32_MTRR_CAP_FIXED_SUPPORT                        BIT8

-#define   B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT                     (BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0)

+#define EFI_MSR_IA32_MTRR_CAP                       0x000000FE

+#define   B_EFI_MSR_IA32_MTRR_CAP_EMRR_SUPPORT      BIT12

+#define   B_EFI_MSR_IA32_MTRR_CAP_SMRR_SUPPORT      BIT11

+#define   B_EFI_MSR_IA32_MTRR_CAP_WC_SUPPORT        BIT10

+#define   B_EFI_MSR_IA32_MTRR_CAP_FIXED_SUPPORT     BIT8

+#define   B_EFI_MSR_IA32_MTRR_CAP_VARIABLE_SUPPORT  (BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0)

 

-#define CPUID_VIR_PHY_ADDRESS_SIZE                                    0x80000008

-#define CPUID_EXTENDED_FUNCTION                                       0x80000000

+#define CPUID_VIR_PHY_ADDRESS_SIZE  0x80000008

+#define CPUID_EXTENDED_FUNCTION     0x80000000

 

 #endif

-

diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
index 0a5bc76aa7..8f8453915e 100644
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -57,11 +57,11 @@ typedef struct {
 VOID

 EFIAPI

 SetFspGlobalDataPointer (

-  IN FSP_GLOBAL_DATA   *FspData

+  IN FSP_GLOBAL_DATA  *FspData

   )

 {

   ASSERT (FspData != NULL);

-  *((volatile UINT32 *)(UINTN)PcdGet32(PcdGlobalDataPointerAddress)) = (UINT32)(UINTN)FspData;

+  *((volatile UINT32 *)(UINTN)PcdGet32 (PcdGlobalDataPointerAddress)) = (UINT32)(UINTN)FspData;

 }

 

 /**

@@ -74,9 +74,9 @@ GetFspGlobalDataPointer (
   VOID

   )

 {

-  FSP_GLOBAL_DATA   *FspData;

+  FSP_GLOBAL_DATA  *FspData;

 

-  FspData = *(FSP_GLOBAL_DATA  **)(UINTN)PcdGet32(PcdGlobalDataPointerAddress);

+  FspData = *(FSP_GLOBAL_DATA  **)(UINTN)PcdGet32 (PcdGlobalDataPointerAddress);

   return FspData;

 }

 

@@ -93,8 +93,8 @@ GetFspApiParameter (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  return *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(ApiParam[0]));

+  FspData = GetFspGlobalDataPointer ();

+  return *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET (ApiParam[0]));

 }

 

 /**

@@ -102,7 +102,7 @@ GetFspApiParameter (
 

   @retval FSP entry stack pointer.

 **/

-VOID*

+VOID *

 EFIAPI

 GetFspEntryStack (

   VOID

@@ -110,8 +110,8 @@ GetFspEntryStack (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  return (VOID*)(FspData->CoreStack + CONTEXT_STACK_OFFSET(ApiParam[0]));

+  FspData = GetFspGlobalDataPointer ();

+  return (VOID *)(FspData->CoreStack + CONTEXT_STACK_OFFSET (ApiParam[0]));

 }

 

 /**

@@ -127,8 +127,8 @@ GetFspApiParameter2 (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  return *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(ApiParam[1]));

+  FspData = GetFspGlobalDataPointer ();

+  return *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET (ApiParam[1]));

 }

 

 /**

@@ -140,13 +140,13 @@ GetFspApiParameter2 (
 VOID

 EFIAPI

 SetFspApiParameter (

-  IN UINT32      Value

+  IN UINT32  Value

   )

 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(ApiParam)) = Value;

+  FspData                                                                  = GetFspGlobalDataPointer ();

+  *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET (ApiParam)) = Value;

 }

 

 /**

@@ -163,8 +163,8 @@ SetFspApiReturnStatus (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(Eax)) = ReturnStatus;

+  FspData                                                             = GetFspGlobalDataPointer ();

+  *(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET (Eax)) = ReturnStatus;

 }

 

 /**

@@ -176,7 +176,7 @@ SetFspApiReturnStatus (
 VOID

 EFIAPI

 SetFspCoreStackPointer (

-  IN VOID   *NewStackTop

+  IN VOID  *NewStackTop

   )

 {

   FSP_GLOBAL_DATA  *FspData;

@@ -184,14 +184,14 @@ SetFspCoreStackPointer (
   UINT32           *NewStack;

   UINT32           StackContextLen;

 

-  FspData  = GetFspGlobalDataPointer ();

-  StackContextLen = sizeof(CONTEXT_STACK) / sizeof(UINT32);

+  FspData         = GetFspGlobalDataPointer ();

+  StackContextLen = sizeof (CONTEXT_STACK) / sizeof (UINT32);

 

   //

   // Reserve space for the ContinuationFunc two parameters

   //

-  OldStack = (UINT32 *)FspData->CoreStack;

-  NewStack = (UINT32 *)NewStackTop - StackContextLen - 2;

+  OldStack           = (UINT32 *)FspData->CoreStack;

+  NewStack           = (UINT32 *)NewStackTop - StackContextLen - 2;

   FspData->CoreStack = (UINT32)NewStack;

   while (StackContextLen-- != 0) {

     *NewStack++ = *OldStack++;

@@ -207,16 +207,15 @@ SetFspCoreStackPointer (
 VOID

 EFIAPI

 SetFspPlatformDataPointer (

-  IN VOID   *PlatformData

+  IN VOID  *PlatformData

   )

 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData                       = GetFspGlobalDataPointer ();

   FspData->PlatformData.DataPtr = PlatformData;

 }

 

-

 /**

   This function gets the platform specific data pointer.

 

@@ -231,11 +230,10 @@ GetFspPlatformDataPointer (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

   return FspData->PlatformData.DataPtr;

 }

 

-

 /**

   This function sets the UPD data pointer.

 

@@ -244,7 +242,7 @@ GetFspPlatformDataPointer (
 VOID

 EFIAPI

 SetFspUpdDataPointer (

-  IN VOID    *UpdDataPtr

+  IN VOID  *UpdDataPtr

   )

 {

   FSP_GLOBAL_DATA  *FspData;

@@ -252,7 +250,7 @@ SetFspUpdDataPointer (
   //

   // Get the FSP Global Data Pointer

   //

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

 

   //

   // Set the UPD pointer.

@@ -273,11 +271,10 @@ GetFspUpdDataPointer (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

   return FspData->UpdDataPtr;

 }

 

-

 /**

   This function sets the FspMemoryInit UPD data pointer.

 

@@ -286,7 +283,7 @@ GetFspUpdDataPointer (
 VOID

 EFIAPI

 SetFspMemoryInitUpdDataPointer (

-  IN VOID    *MemoryInitUpdPtr

+  IN VOID  *MemoryInitUpdPtr

   )

 {

   FSP_GLOBAL_DATA  *FspData;

@@ -294,7 +291,7 @@ SetFspMemoryInitUpdDataPointer (
   //

   // Get the FSP Global Data Pointer

   //

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

 

   //

   // Set the FspMemoryInit UPD pointer.

@@ -315,11 +312,10 @@ GetFspMemoryInitUpdDataPointer (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

   return FspData->MemoryInitUpdPtr;

 }

 

-

 /**

   This function sets the FspSiliconInit UPD data pointer.

 

@@ -328,7 +324,7 @@ GetFspMemoryInitUpdDataPointer (
 VOID

 EFIAPI

 SetFspSiliconInitUpdDataPointer (

-  IN VOID    *SiliconInitUpdPtr

+  IN VOID  *SiliconInitUpdPtr

   )

 {

   FSP_GLOBAL_DATA  *FspData;

@@ -336,7 +332,7 @@ SetFspSiliconInitUpdDataPointer (
   //

   // Get the FSP Global Data Pointer

   //

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

 

   //

   // Set the FspSiliconInit UPD data pointer.

@@ -357,11 +353,10 @@ GetFspSiliconInitUpdDataPointer (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData = GetFspGlobalDataPointer ();

   return FspData->SiliconInitUpdPtr;

 }

 

-

 /**

   Set FSP measurement point timestamp.

 

@@ -381,9 +376,9 @@ SetFspMeasurePoint (
   // Bit [55: 0]  will be the timestamp

   // Bit [63:56]  will be the ID

   //

-  FspData  = GetFspGlobalDataPointer ();

-  if (FspData->PerfIdx < sizeof(FspData->PerfData) / sizeof(FspData->PerfData[0])) {

-    FspData->PerfData[FspData->PerfIdx] = AsmReadTsc ();

+  FspData = GetFspGlobalDataPointer ();

+  if (FspData->PerfIdx < sizeof (FspData->PerfData) / sizeof (FspData->PerfData[0])) {

+    FspData->PerfData[FspData->PerfIdx]                  = AsmReadTsc ();

     ((UINT8 *)(&FspData->PerfData[FspData->PerfIdx]))[7] = Id;

   }

 

@@ -401,7 +396,7 @@ GetFspInfoHeader (
   VOID

   )

 {

-  return  GetFspGlobalDataPointer()->FspInfoHeader;

+  return GetFspGlobalDataPointer ()->FspInfoHeader;

 }

 

 /**

@@ -412,10 +407,10 @@ GetFspInfoHeader (
 VOID

 EFIAPI

 SetFspInfoHeader (

-  FSP_INFO_HEADER *FspInfoHeader

+  FSP_INFO_HEADER  *FspInfoHeader

   )

 {

-  GetFspGlobalDataPointer()->FspInfoHeader = FspInfoHeader;

+  GetFspGlobalDataPointer ()->FspInfoHeader = FspInfoHeader;

 }

 

 /**

@@ -431,8 +426,8 @@ GetFspInfoHeaderFromApiContext (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

-  return  (FSP_INFO_HEADER *)(*(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET(FspInfoHeader)));

+  FspData = GetFspGlobalDataPointer ();

+  return (FSP_INFO_HEADER *)(*(UINT32 *)(UINTN)(FspData->CoreStack + CONTEXT_STACK_OFFSET (FspInfoHeader)));

 }

 

 /**

@@ -446,7 +441,7 @@ GetFspCfgRegionDataPointer (
   VOID

   )

 {

-  FSP_INFO_HEADER   *FspInfoHeader;

+  FSP_INFO_HEADER  *FspInfoHeader;

 

   FspInfoHeader = GetFspInfoHeader ();

   return (VOID *)(FspInfoHeader->ImageBase + FspInfoHeader->CfgRegionOffset);

@@ -463,7 +458,7 @@ GetFspApiCallingIndex (
   VOID

   )

 {

-  return  GetFspGlobalDataPointer()->ApiIdx;

+  return GetFspGlobalDataPointer ()->ApiIdx;

 }

 

 /**

@@ -479,7 +474,7 @@ SetFspApiCallingIndex (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData         = GetFspGlobalDataPointer ();

   FspData->ApiIdx = Index;

 }

 

@@ -494,7 +489,7 @@ GetPhaseStatusCode (
   VOID

   )

 {

-  return  GetFspGlobalDataPointer()->StatusCode;

+  return GetFspGlobalDataPointer ()->StatusCode;

 }

 

 /**

@@ -510,7 +505,7 @@ SetPhaseStatusCode (
 {

   FSP_GLOBAL_DATA  *FspData;

 

-  FspData  = GetFspGlobalDataPointer ();

+  FspData             = GetFspGlobalDataPointer ();

   FspData->StatusCode = StatusCode;

 }

 

@@ -523,13 +518,13 @@ SetPhaseStatusCode (
 VOID

 EFIAPI

 FspApiReturnStatusReset (

-  IN UINT32   FspResetType

+  IN UINT32  FspResetType

   )

 {

   volatile BOOLEAN  LoopUntilReset;

 

   LoopUntilReset = TRUE;

-  DEBUG ((DEBUG_INFO, "FSP returning control to Bootloader with reset required return status %x\n",FspResetType));

+  DEBUG ((DEBUG_INFO, "FSP returning control to Bootloader with reset required return status %x\n", FspResetType));

   if (GetFspGlobalDataPointer ()->FspMode == FSP_IN_API_MODE) {

     ///

     /// Below code is not an infinite loop.The control will go back to API calling function in BootLoader each time BootLoader

diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
index b34905365d..c8824cde7f 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
@@ -26,7 +26,7 @@ CONST CHAR8  *mHexTable = "0123456789ABCDEF";
 // VA_LIST can not initialize to NULL for all compiler, so we use this to

 // indicate a null VA_LIST

 //

-VA_LIST     mVaListNull;

+VA_LIST  mVaListNull;

 

 /**

   Get stack frame pointer of function call.

@@ -39,7 +39,6 @@ GetStackFramePointer (
   VOID

   );

 

-

 /**

   Prints a debug message to the debug output device if the specified error level is enabled.

 

@@ -63,7 +62,7 @@ DebugPrint (
   ...

   )

 {

-  VA_LIST         Marker;

+  VA_LIST  Marker;

 

   VA_START (Marker, Format);

   DebugVPrint (ErrorLevel, Format, Marker);

@@ -89,13 +88,13 @@ DebugPrint (
 **/

 VOID

 DebugPrintMarker (

-  IN  UINTN         ErrorLevel,

-  IN  CONST CHAR8   *Format,

-  IN  VA_LIST       VaListMarker,

-  IN  BASE_LIST     BaseListMarker

+  IN  UINTN        ErrorLevel,

+  IN  CONST CHAR8  *Format,

+  IN  VA_LIST      VaListMarker,

+  IN  BASE_LIST    BaseListMarker

   )

 {

-  CHAR8    Buffer[MAX_DEBUG_MESSAGE_LENGTH];

+  CHAR8  Buffer[MAX_DEBUG_MESSAGE_LENGTH];

 

   //

   // If Format is NULL, then ASSERT().

@@ -149,9 +148,9 @@ DebugPrintMarker (
 VOID

 EFIAPI

 DebugVPrint (

-  IN  UINTN         ErrorLevel,

-  IN  CONST CHAR8   *Format,

-  IN  VA_LIST       VaListMarker

+  IN  UINTN        ErrorLevel,

+  IN  CONST CHAR8  *Format,

+  IN  VA_LIST      VaListMarker

   )

 {

   DebugPrintMarker (ErrorLevel, Format, VaListMarker, NULL);

@@ -177,9 +176,9 @@ DebugVPrint (
 VOID

 EFIAPI

 DebugBPrint (

-  IN  UINTN         ErrorLevel,

-  IN  CONST CHAR8   *Format,

-  IN  BASE_LIST     BaseListMarker

+  IN  UINTN        ErrorLevel,

+  IN  CONST CHAR8  *Format,

+  IN  BASE_LIST    BaseListMarker

   )

 {

   DebugPrintMarker (ErrorLevel, Format, mVaListNull, BaseListMarker);

@@ -194,14 +193,15 @@ DebugBPrint (
 **/

 VOID

 FillHex (

-  UINT32   Value,

+  UINT32  Value,

   CHAR8   *Buffer

   )

 {

   INTN  Idx;

+

   for (Idx = 7; Idx >= 0; Idx--) {

     Buffer[Idx] = mHexTable[Value & 0x0F];

-    Value >>= 4;

+    Value     >>= 4;

   }

 }

 

@@ -227,8 +227,8 @@ DebugAssertInternal (
   VOID

   )

 {

-  CHAR8     Buffer[MAX_DEBUG_MESSAGE_LENGTH];

-  UINT32   *Frame;

+  CHAR8   Buffer[MAX_DEBUG_MESSAGE_LENGTH];

+  UINT32  *Frame;

 

   Frame = (UINT32 *)GetStackFramePointer ();

 

@@ -237,9 +237,9 @@ DebugAssertInternal (
   //

   AsciiStrnCpyS (

     Buffer,

-    sizeof(Buffer) / sizeof(CHAR8),

+    sizeof (Buffer) / sizeof (CHAR8),

     "-> EBP:0x00000000  EIP:0x00000000\n",

-    sizeof(Buffer) / sizeof(CHAR8) - 1

+    sizeof (Buffer) / sizeof (CHAR8) - 1

     );

   SerialPortWrite ((UINT8 *)"ASSERT DUMP:\n", 13);

   while (Frame != NULL) {

@@ -291,7 +291,6 @@ DebugAssert (
   DebugAssertInternal ();

 }

 

-

 /**

   Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.

 

@@ -317,7 +316,6 @@ DebugClearMemory (
   return Buffer;

 }

 

-

 /**

   Returns TRUE if ASSERT() macros are enabled.

 

@@ -334,10 +332,9 @@ DebugAssertEnabled (
   VOID

   )

 {

-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);

+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);

 }

 

-

 /**

   Returns TRUE if DEBUG() macros are enabled.

 

@@ -354,7 +351,7 @@ DebugPrintEnabled (
   VOID

   )

 {

-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);

+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);

 }

 

 /**

@@ -373,10 +370,9 @@ DebugCodeEnabled (
   VOID

   )

 {

-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);

+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);

 }

 

-

 /**

   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.

 

@@ -393,7 +389,7 @@ DebugClearMemoryEnabled (
   VOID

   )

 {

-  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);

+  return (BOOLEAN)((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);

 }

 

 /**

@@ -408,8 +404,8 @@ DebugClearMemoryEnabled (
 BOOLEAN

 EFIAPI

 DebugPrintLevelEnabled (

-  IN  CONST UINTN        ErrorLevel

+  IN  CONST UINTN  ErrorLevel

   )

 {

-  return (BOOLEAN) ((ErrorLevel & PcdGet32(PcdFixedDebugPrintErrorLevel)) != 0);

+  return (BOOLEAN)((ErrorLevel & PcdGet32 (PcdFixedDebugPrintErrorLevel)) != 0);

 }

diff --git a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
index a8d94cb417..2573e4e421 100644
--- a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
+++ b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
@@ -25,10 +25,10 @@
 EFI_HOB_RESOURCE_DESCRIPTOR *

 EFIAPI

 FspGetResourceDescriptorByOwner (

-  IN EFI_GUID   *OwnerGuid

+  IN EFI_GUID  *OwnerGuid

   )

 {

-  EFI_PEI_HOB_POINTERS    Hob;

+  EFI_PEI_HOB_POINTERS  Hob;

 

   //

   // Get the HOB list for processing

@@ -41,10 +41,12 @@ FspGetResourceDescriptorByOwner (
   while (!END_OF_HOB_LIST (Hob)) {

     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {

       if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) && \

-          (CompareGuid (&Hob.ResourceDescriptor->Owner, OwnerGuid))) {

-        return  Hob.ResourceDescriptor;

+          (CompareGuid (&Hob.ResourceDescriptor->Owner, OwnerGuid)))

+      {

+        return Hob.ResourceDescriptor;

       }

     }

+

     Hob.Raw = GET_NEXT_HOB (Hob);

   }

 

@@ -60,14 +62,14 @@ FspGetResourceDescriptorByOwner (
 VOID

 EFIAPI

 FspGetSystemMemorySize (

-  IN OUT UINT64              *LowMemoryLength,

-  IN OUT UINT64              *HighMemoryLength

+  IN OUT UINT64  *LowMemoryLength,

+  IN OUT UINT64  *HighMemoryLength

   )

 {

-  EFI_STATUS                  Status;

-  EFI_BOOT_MODE               BootMode;

-  EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute;

-  EFI_PEI_HOB_POINTERS        Hob;

+  EFI_STATUS                   Status;

+  EFI_BOOT_MODE                BootMode;

+  EFI_RESOURCE_ATTRIBUTE_TYPE  ResourceAttribute;

+  EFI_PEI_HOB_POINTERS         Hob;

 

   ResourceAttribute = (

                        EFI_RESOURCE_ATTRIBUTE_PRESENT |

@@ -99,18 +101,21 @@ FspGetSystemMemorySize (
     if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {

       if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) ||

           ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_MEMORY_RESERVED) &&

-           (Hob.ResourceDescriptor->ResourceAttribute == ResourceAttribute))) {

+           (Hob.ResourceDescriptor->ResourceAttribute == ResourceAttribute)))

+      {

         //

         // Need memory above 1MB to be collected here

         //

-        if (Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB &&

-            Hob.ResourceDescriptor->PhysicalStart < (EFI_PHYSICAL_ADDRESS) BASE_4GB) {

-          *LowMemoryLength += (UINT64) (Hob.ResourceDescriptor->ResourceLength);

-        } else if (Hob.ResourceDescriptor->PhysicalStart >= (EFI_PHYSICAL_ADDRESS) BASE_4GB) {

-          *HighMemoryLength += (UINT64) (Hob.ResourceDescriptor->ResourceLength);

+        if ((Hob.ResourceDescriptor->PhysicalStart >= BASE_1MB) &&

+            (Hob.ResourceDescriptor->PhysicalStart < (EFI_PHYSICAL_ADDRESS)BASE_4GB))

+        {

+          *LowMemoryLength += (UINT64)(Hob.ResourceDescriptor->ResourceLength);

+        } else if (Hob.ResourceDescriptor->PhysicalStart >= (EFI_PHYSICAL_ADDRESS)BASE_4GB) {

+          *HighMemoryLength += (UINT64)(Hob.ResourceDescriptor->ResourceLength);

         }

       }

     }

+

     Hob.Raw = GET_NEXT_HOB (Hob);

   }

 }

diff --git a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformNotify.c b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformNotify.c
index 9274771155..795bb28c0f 100644
--- a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformNotify.c
+++ b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformNotify.c
@@ -21,21 +21,21 @@
 #include <Protocol/PciEnumerationComplete.h>

 #include <Library/ReportStatusCodeLib.h>

 #include <Library/PerformanceLib.h>

-extern EFI_GUID gFspPerformanceDataGuid;

+extern EFI_GUID  gFspPerformanceDataGuid;

 

-EFI_PEI_PPI_DESCRIPTOR      mPeiPostPciEnumerationPpi = {

+EFI_PEI_PPI_DESCRIPTOR  mPeiPostPciEnumerationPpi = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gEfiPciEnumerationCompleteProtocolGuid,

   NULL

 };

 

-EFI_PEI_PPI_DESCRIPTOR      mPeiReadyToBootPpi = {

+EFI_PEI_PPI_DESCRIPTOR  mPeiReadyToBootPpi = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gEfiEventReadyToBootGuid,

   NULL

 };

 

-EFI_PEI_PPI_DESCRIPTOR      mPeiEndOfFirmwarePpi = {

+EFI_PEI_PPI_DESCRIPTOR  mPeiEndOfFirmwarePpi = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gFspEventEndOfFirmwareGuid,

   NULL

@@ -59,41 +59,41 @@ UINT32  mFspNotifySequence[] = {
 EFI_STATUS

 EFIAPI

 FspNotificationHandler (

-  IN  UINT32     NotificationCode

+  IN  UINT32  NotificationCode

   )

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

 

-  Status   = EFI_SUCCESS;

+  Status = EFI_SUCCESS;

 

   switch (NotificationCode) {

-  case EnumInitPhaseAfterPciEnumeration:

-    //

-    // Do POST PCI initialization if needed

-    //

-    DEBUG ((DEBUG_INFO | DEBUG_INIT, "FSP Post PCI Enumeration ...\n"));

-    PeiServicesInstallPpi (&mPeiPostPciEnumerationPpi);

-    break;

-

-  case EnumInitPhaseReadyToBoot:

-    //

-    // Ready To Boot

-    //

-    DEBUG ((DEBUG_INFO| DEBUG_INIT, "FSP Ready To Boot ...\n"));

-    PeiServicesInstallPpi (&mPeiReadyToBootPpi);

-    break;

-

-  case EnumInitPhaseEndOfFirmware:

-    //

-    // End of Firmware

-    //

-    DEBUG ((DEBUG_INFO| DEBUG_INIT, "FSP End of Firmware ...\n"));

-    PeiServicesInstallPpi (&mPeiEndOfFirmwarePpi);

-    break;

-

-  default:

-    Status = EFI_INVALID_PARAMETER;

-    break;

+    case EnumInitPhaseAfterPciEnumeration:

+      //

+      // Do POST PCI initialization if needed

+      //

+      DEBUG ((DEBUG_INFO | DEBUG_INIT, "FSP Post PCI Enumeration ...\n"));

+      PeiServicesInstallPpi (&mPeiPostPciEnumerationPpi);

+      break;

+

+    case EnumInitPhaseReadyToBoot:

+      //

+      // Ready To Boot

+      //

+      DEBUG ((DEBUG_INFO| DEBUG_INIT, "FSP Ready To Boot ...\n"));

+      PeiServicesInstallPpi (&mPeiReadyToBootPpi);

+      break;

+

+    case EnumInitPhaseEndOfFirmware:

+      //

+      // End of Firmware

+      //

+      DEBUG ((DEBUG_INFO| DEBUG_INIT, "FSP End of Firmware ...\n"));

+      PeiServicesInstallPpi (&mPeiEndOfFirmwarePpi);

+      break;

+

+    default:

+      Status = EFI_INVALID_PARAMETER;

+      break;

   }

 

   return Status;

@@ -108,10 +108,10 @@ FspNotificationHandler (
 VOID

 EFIAPI

 FspSiliconInitDone2 (

-  IN EFI_STATUS Status

+  IN EFI_STATUS  Status

   )

 {

-  volatile EFI_STATUS FspStatus;

+  volatile EFI_STATUS  FspStatus;

 

   FspStatus = Status;

   //

@@ -128,6 +128,7 @@ FspSiliconInitDone2 (
       Status = EFI_DEVICE_ERROR;  // Force to known error.

       break;

   }

+

   //

   // This is the end of the FspSiliconInit API

   // Give control back to the boot loader

@@ -156,12 +157,12 @@ FspSiliconInitDone2 (
 VOID

 EFIAPI

 FspMemoryInitDone2 (

-  IN EFI_STATUS Status,

-  IN OUT VOID   **HobListPtr

+  IN EFI_STATUS  Status,

+  IN OUT VOID    **HobListPtr

   )

 {

-  FSP_GLOBAL_DATA   *FspData;

-  volatile EFI_STATUS FspStatus;

+  FSP_GLOBAL_DATA      *FspData;

+  volatile EFI_STATUS  FspStatus;

 

   FspStatus = Status;

   //

@@ -171,9 +172,11 @@ FspMemoryInitDone2 (
   if (HobListPtr == NULL) {

     HobListPtr = (VOID **)GetFspApiParameter2 ();

   }

+

   if (HobListPtr != NULL) {

-    *HobListPtr = (VOID *) GetHobList ();

+    *HobListPtr = (VOID *)GetHobList ();

   }

+

   //

   // Convert to FSP EAS defined API return codes

   //

@@ -189,6 +192,7 @@ FspMemoryInitDone2 (
       Status = EFI_DEVICE_ERROR;  // Force to known error.

       break;

   }

+

   //

   // This is the end of the FspMemoryInit API

   // Give control back to the boot loader

@@ -196,10 +200,10 @@ FspMemoryInitDone2 (
   DEBUG ((DEBUG_INFO | DEBUG_INIT, "FspMemoryInitApi() - [Status: 0x%08X] - End\n", Status));

   SetFspMeasurePoint (FSP_PERF_ID_API_FSP_MEMORY_INIT_EXIT);

   FspData = GetFspGlobalDataPointer ();

-  PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[0] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_TEMP_RAM_INIT | FSP_STATUS_CODE_COMMON_CODE| FSP_STATUS_CODE_API_ENTRY);

-  PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[1] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_TEMP_RAM_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

-  PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[2] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

-  PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[0] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_TEMP_RAM_INIT | FSP_STATUS_CODE_COMMON_CODE| FSP_STATUS_CODE_API_ENTRY);

+  PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[1] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_TEMP_RAM_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, (FspData->PerfData[2] & FSP_PERFORMANCE_DATA_TIMER_MASK), FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+  PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

   REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_MEMORY_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

   if (GetFspGlobalDataPointer ()->FspMode == FSP_IN_API_MODE) {

     do {

@@ -217,13 +221,13 @@ FspMemoryInitDone2 (
   if (GetFspApiCallingIndex () == TempRamExitApiIndex) {

     SetPhaseStatusCode (FSP_STATUS_CODE_TEMP_RAM_EXIT);

     SetFspMeasurePoint (FSP_PERF_ID_API_TEMP_RAM_EXIT_ENTRY);

-    PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+    PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     DEBUG ((DEBUG_INFO | DEBUG_INIT, "TempRamExitApi() - Begin\n"));

   } else {

     SetPhaseStatusCode (FSP_STATUS_CODE_SILICON_INIT);

     SetFspMeasurePoint (FSP_PERF_ID_API_FSP_SILICON_INIT_ENTRY);

-    PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+    PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     DEBUG ((DEBUG_INFO | DEBUG_INIT, "FspSiliconInitApi() - Begin\n"));

   }

@@ -238,11 +242,11 @@ FspMemoryInitDone2 (
 VOID

 EFIAPI

 FspTempRamExitDone2 (

-  IN EFI_STATUS Status

+  IN EFI_STATUS  Status

   )

 {

   //

-  volatile EFI_STATUS FspStatus;

+  volatile EFI_STATUS  FspStatus;

 

   FspStatus = Status;

   // Convert to FSP EAS defined API return codes

@@ -258,13 +262,14 @@ FspTempRamExitDone2 (
       Status = EFI_DEVICE_ERROR;  // Force to known error.

       break;

   }

+

   //

   // This is the end of the TempRamExit API

   // Give control back to the boot loader

   //

   DEBUG ((DEBUG_INFO | DEBUG_INIT, "TempRamExitApi() - [Status: 0x%08X] - End\n", Status));

   SetFspMeasurePoint (FSP_PERF_ID_API_TEMP_RAM_EXIT_EXIT);

-  PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+  PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

   REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_TEMP_RAM_EXIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

   if (GetFspGlobalDataPointer ()->FspMode == FSP_IN_API_MODE) {

     do {

@@ -275,9 +280,10 @@ FspTempRamExitDone2 (
       }

     } while (FspStatus != EFI_SUCCESS);

   }

+

   SetPhaseStatusCode (FSP_STATUS_CODE_SILICON_INIT);

   SetFspMeasurePoint (FSP_PERF_ID_API_FSP_SILICON_INIT_ENTRY);

-  PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+  PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

   REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_SILICON_INIT | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

   DEBUG ((DEBUG_INFO | DEBUG_INIT, "SiliconInitApi() - Begin\n"));

 }

@@ -294,15 +300,14 @@ FspWaitForNotify (
   VOID

   )

 {

-  EFI_STATUS                 Status;

-  UINT32                     NotificationValue;

-  UINT32                     NotificationCount;

-  UINT8                      Count;

-  volatile EFI_STATUS        FspStatus;

+  EFI_STATUS           Status;

+  UINT32               NotificationValue;

+  UINT32               NotificationCount;

+  UINT8                Count;

+  volatile EFI_STATUS  FspStatus;

 

   NotificationCount = 0;

-  while (NotificationCount < sizeof(mFspNotifySequence) / sizeof(UINT32)) {

-

+  while (NotificationCount < sizeof (mFspNotifySequence) / sizeof (UINT32)) {

     Count = (UINT8)((NotificationCount << 1) & 0x07);

     SetFspMeasurePoint (FSP_PERF_ID_API_NOTIFY_POST_PCI_ENTRY + Count);

 

@@ -312,7 +317,7 @@ FspWaitForNotify (
       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     } else if (NotificationCount == 1) {

       SetPhaseStatusCode (FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION);

-      PERF_START_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

+      PERF_START_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_ENTRY);

     } else if (NotificationCount == 2) {

       SetPhaseStatusCode (FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION);

@@ -333,7 +338,7 @@ FspWaitForNotify (
       // Process Notification and Give control back to the boot loader framework caller

       //

       Status = FspNotificationHandler (NotificationValue);

-      if (!EFI_ERROR(Status)) {

+      if (!EFI_ERROR (Status)) {

         NotificationCount++;

       }

     }

@@ -342,26 +347,28 @@ FspWaitForNotify (
     SetFspMeasurePoint (FSP_PERF_ID_API_NOTIFY_POST_PCI_EXIT + Count);

 

     if ((NotificationCount - 1) == 0) {

-      PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+      PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_POST_PCIE_ENUM_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

     } else if ((NotificationCount - 1) == 1) {

-      PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+      PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_READY_TO_BOOT_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

     } else if ((NotificationCount - 1) == 2) {

-      PERF_END_EX(&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

+      PERF_END_EX (&gFspPerformanceDataGuid, "EventRec", NULL, 0, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FSP_STATUS_CODE_END_OF_FIRMWARE_NOTIFICATION | FSP_STATUS_CODE_COMMON_CODE | FSP_STATUS_CODE_API_EXIT);

     }

+

     if (GetFspGlobalDataPointer ()->FspMode == FSP_IN_API_MODE) {

       FspStatus = Status;

       do {

-        SetFspApiReturnStatus(Status);

-        Pei2LoaderSwitchStack();

+        SetFspApiReturnStatus (Status);

+        Pei2LoaderSwitchStack ();

         if (Status != EFI_SUCCESS) {

           DEBUG ((DEBUG_ERROR, "!!!ERROR: NotifyPhaseApi() [Phase: %08X] - Failed - [Status: 0x%08X]\n", NotificationValue, Status));

         }

       } while (FspStatus != EFI_SUCCESS);

     }

   }

+

   //

   // Control goes back to the PEI Core and it dispatches further PEIMs.

   // DXEIPL is the final one to transfer control back to the boot loader.

@@ -389,7 +396,7 @@ FspSiliconInitDone (
 VOID

 EFIAPI

 FspMemoryInitDone (

-  IN OUT VOID   **HobListPtr

+  IN OUT VOID  **HobListPtr

   )

 {

   FspMemoryInitDone2 (EFI_SUCCESS, HobListPtr);

diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
index fd553db629..618c25c3b0 100644
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
@@ -22,15 +22,14 @@
 **/

 UINT32

 SwapStack (

-  IN  UINT32 NewStack

+  IN  UINT32  NewStack

   )

 {

   FSP_GLOBAL_DATA  *FspData;

-  UINT32         OldStack;

+  UINT32           OldStack;

 

-  FspData  = GetFspGlobalDataPointer ();

-  OldStack = FspData->CoreStack;

+  FspData            = GetFspGlobalDataPointer ();

+  OldStack           = FspData->CoreStack;

   FspData->CoreStack = NewStack;

   return OldStack;

 }

-

diff --git a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/PlatformSecLibNull.c b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/PlatformSecLibNull.c
index df8c5d121f..a6f3892ed8 100644
--- a/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/PlatformSecLibNull.c
+++ b/IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/PlatformSecLibNull.c
@@ -19,8 +19,8 @@
 EFI_STATUS

 EFIAPI

 FspUpdSignatureCheck (

-  IN UINT32   ApiIdx,

-  IN VOID     *ApiParam

+  IN UINT32  ApiIdx,

+  IN VOID    *ApiParam

   )

 {

   return EFI_SUCCESS;

@@ -36,8 +36,8 @@ FspUpdSignatureCheck (
 EFI_STATUS

 EFIAPI

 FspMultiPhaseSiInitApiHandler (

-  IN UINT32   ApiIdx,

-  IN VOID     *ApiParam

+  IN UINT32  ApiIdx,

+  IN VOID    *ApiParam

   )

 {

   return EFI_SUCCESS;