diff --git a/IntelFspPkg/FspSecCore/SecMain.c b/IntelFspPkg/FspSecCore/SecMain.c
index 15afc0b76a..12c9526d83 100644
--- a/IntelFspPkg/FspSecCore/SecMain.c
+++ b/IntelFspPkg/FspSecCore/SecMain.c
@@ -43,7 +43,7 @@ UINT64  mIdtEntryTemplate = 0xffff8e000008ffe4ULL;
   @param[in] BootFirmwareVolume Base address of the Boot Firmware Volume.
   @param[in] PeiCore            PeiCore entry point.
   @param[in] BootloaderStack    Bootloader stack.
-  @param[in] ApiIdx             the index of API
+  @param[in] ApiIdx             the index of API.
 
   @return This function never returns.
 
diff --git a/IntelFspPkg/FspSecCore/SecMain.h b/IntelFspPkg/FspSecCore/SecMain.h
index 6fdf7b5b9a..7efd2f0983 100644
--- a/IntelFspPkg/FspSecCore/SecMain.h
+++ b/IntelFspPkg/FspSecCore/SecMain.h
@@ -109,6 +109,7 @@ InitializeFloatingPointUnits (
   @param[in] BootFirmwareVolume Base address of the Boot Firmware Volume.
   @param[in] PeiCore            PeiCore entry point.
   @param[in] BootloaderStack    Bootloader stack.
+  @param[in] ApiIdx             the index of API.
 
   @return This function never returns.
 
diff --git a/IntelFspPkg/Include/FspApi.h b/IntelFspPkg/Include/FspApi.h
index bf073033f4..b3616d69e8 100644
--- a/IntelFspPkg/Include/FspApi.h
+++ b/IntelFspPkg/Include/FspApi.h
@@ -213,7 +213,7 @@ EFI_STATUS
   each FSP release.
   After FspMemInit completes its execution, it passes the pointer to the HobList and
   returns to the boot loader from where it was called. Bootloader is responsible to 
-  migrate it’s stack and data to Memory.
+  migrate it's stack and data to Memory.
   FspMemoryInit, TempRamExit and FspSiliconInit APIs provide an alternate method to
   complete the silicon initialization and provides bootloader an opportunity to get
   control after system memory is available and before the temporary RAM is torn down.
diff --git a/IntelFspPkg/Include/Library/FspCommonLib.h b/IntelFspPkg/Include/Library/FspCommonLib.h
index c97ee51de3..e7d7b0271a 100644
--- a/IntelFspPkg/Include/Library/FspCommonLib.h
+++ b/IntelFspPkg/Include/Library/FspCommonLib.h
@@ -182,7 +182,7 @@ GetFspInfoHeader (
   );
 
 /**
-  This function gets FSP API calling mode
+  This function gets FSP API calling mode.
 
   @retval API calling mode
 **/
@@ -193,7 +193,7 @@ GetFspApiCallingMode (
   );
 
 /**
-  This function sets FSP API calling mode
+  This function sets FSP API calling mode.
 
   @param[in] Mode     API calling mode
 **/
diff --git a/IntelFspPkg/Include/Library/FspPlatformLib.h b/IntelFspPkg/Include/Library/FspPlatformLib.h
index 1132320dd2..51d296835e 100644
--- a/IntelFspPkg/Include/Library/FspPlatformLib.h
+++ b/IntelFspPkg/Include/Library/FspPlatformLib.h
@@ -38,7 +38,7 @@ FspMigrateTemporaryMemory (
   );
 
 /**
-  Set a new stack frame for the continuation function
+  Set a new stack frame for the continuation function.
 
 **/
 VOID
diff --git a/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
index 3b40a2b9a9..2c0c3ad9bb 100644
--- a/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFspPkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -332,7 +332,7 @@ GetFspInfoHeader (
 }
 
 /**
-  This function gets FSP API calling mode
+  This function gets FSP API calling mode.
 
   @retval API calling mode
 **/
@@ -346,7 +346,7 @@ GetFspApiCallingMode (
 }
 
 /**
-  This function sets FSP API calling mode
+  This function sets FSP API calling mode.
 
   @param[in] Mode     API calling mode
 **/
diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPei.h b/IntelFspWrapperPkg/FspInitPei/FspInitPei.h
index fd4b707684..6d70f0c2ab 100644
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPei.h
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPei.h
@@ -37,11 +37,25 @@
 
 extern EFI_PEI_NOTIFY_DESCRIPTOR mS3EndOfPeiNotifyDesc;
 
+/**
+  Do FSP initialization based on FspApi version 1.
+
+  @param[in] FspHeader FSP header pointer.
+
+  @return FSP initialization status.
+**/
 EFI_STATUS
 PeiFspInitV1 (
   IN FSP_INFO_HEADER *FspHeader
   );
 
+/**
+  Do FSP initialization based on FspApi version 2.
+
+  @param[in] FspHeader FSP header pointer.
+
+  @return FSP initialization status.
+**/
 EFI_STATUS
 PeiFspInitV2 (
   IN FSP_INFO_HEADER *FspHeader