[PATCHV2 1/2] IntelFsp2Pkg: Remove pragma usage to align with UEFI Spec

[PATCHV2 1/2] IntelFsp2Pkg: Remove pragma usage to align with UEFI Spec

[Giri P Mudusuru]

UEFI spec section 2.3.1 requires all data to be naturally aligned.
Remove the unnecessary pragma usage.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Satya Yarlagadda <satya.p.yarlagadda@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
---
 IntelFsp2Pkg/Include/FspDataTable.h       | 4 ----
 IntelFsp2Pkg/Include/FspEas/FspApi.h      | 3 ---
 IntelFsp2Pkg/Include/FspGlobalData.h      | 4 ----
 IntelFsp2Pkg/Include/Guid/FspHeaderFile.h | 4 ----
 4 files changed, 15 deletions(-)

diff --git a/IntelFsp2Pkg/Include/FspDataTable.h b/IntelFsp2Pkg/Include/FspDataTable.h
index 3c79f34..a137feb 100644
--- a/IntelFsp2Pkg/Include/FspDataTable.h
+++ b/IntelFsp2Pkg/Include/FspDataTable.h
@@ -15,8 +15,6 @@
 #ifndef _FSP_DATA_TABLE_H_
 #define _FSP_DATA_TABLE_H_
 
-#pragma pack(1)
-
 #define FSP_DATA_SIGNATURE  SIGNATURE_32 ('F', 'S', 'P', 'D')
 
 typedef struct  {
@@ -27,6 +25,4 @@ typedef struct  {
   UINT32  FspsBase;
 } FSP_DATA_TABLE;
 
-#pragma pack()
-
 #endif
diff --git a/IntelFsp2Pkg/Include/FspEas/FspApi.h b/IntelFsp2Pkg/Include/FspEas/FspApi.h
index a2e4813..173b33f 100644
--- a/IntelFsp2Pkg/Include/FspEas/FspApi.h
+++ b/IntelFsp2Pkg/Include/FspEas/FspApi.h
@@ -30,7 +30,6 @@
 #define FSP_STATUS_RESET_REQUIRED_8            0x40000008
 /// @}
 
-#pragma pack(1)
 ///
 /// FSP_UPD_HEADER Configuration.
 ///
@@ -153,8 +152,6 @@ typedef struct {
   FSP_INIT_PHASE     Phase;
 } NOTIFY_PHASE_PARAMS;
 
-#pragma pack()
-
 /**
   This FSP API is called soon after coming out of reset and before memory and stack is
   available. This FSP API will load the microcode update, enable code caching for the
diff --git a/IntelFsp2Pkg/Include/FspGlobalData.h b/IntelFsp2Pkg/Include/FspGlobalData.h
index 8ac3199..605a264 100644
--- a/IntelFsp2Pkg/Include/FspGlobalData.h
+++ b/IntelFsp2Pkg/Include/FspGlobalData.h
@@ -16,8 +16,6 @@
 
 #include <FspEas.h>
 
-#pragma pack(1)
-
 typedef enum {
   TempRamInitApiIndex,
   FspInitApiIndex,
@@ -61,6 +59,4 @@ typedef struct  {
    UINT64             PerfData[32];
 } FSP_GLOBAL_DATA;
 
-#pragma pack()
-
 #endif
diff --git a/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h b/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
index 96cac00..d36d0a6 100644
--- a/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
+++ b/IntelFsp2Pkg/Include/Guid/FspHeaderFile.h
@@ -30,8 +30,6 @@
 
 #define FSP_INFO_HEADER_SIGNATURE  SIGNATURE_32 ('F', 'S', 'P', 'H')
 
-#pragma pack(1)
-
 ///
 /// FSP Information Header as described in FSP v2.0 Spec section 5.1.1.
 ///
@@ -197,8 +195,6 @@ typedef struct {
 //UINT32  PatchData[];
 } FSP_PATCH_TABLE;
 
-#pragma pack()
-
 extern EFI_GUID gFspHeaderFileGuid;
 
 #endif
-- 
2.9.0.windows.1

[PATCHV2 2/2] IntelFsp2Pkg: Fix typo and comments

[Giri P Mudusuru]

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Satya Yarlagadda <satya.p.yarlagadda@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>
---
 .../Library/BaseFspCommonLib/FspCommonLib.c        | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
index 660e9fc..a9c8da6 100644
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -58,7 +58,7 @@ typedef struct {
 /**
   This function sets the FSP global data pointer.
 
-  @param[in] FspData       Fsp global data pointer.
+  @param[in] FspData       FSP global data pointer.
 
 **/
 VOID
@@ -191,7 +191,7 @@ SetFspCoreStackPointer (
 /**
   This function sets the platform specific data pointer.
 
-  @param[in] PlatformData       Fsp platform specific data pointer.
+  @param[in] PlatformData       FSP platform specific data pointer.
 
 **/
 VOID
@@ -210,7 +210,7 @@ SetFspPlatformDataPointer (
 /**
   This function gets the platform specific data pointer.
 
-   @param[in] PlatformData       Fsp platform specific data pointer.
+   @param[in] PlatformData       FSP platform specific data pointer.
 
 **/
 VOID *
@@ -240,7 +240,7 @@ SetFspUpdDataPointer (
   FSP_GLOBAL_DATA  *FspData;
 
   //
-  // Get the Fsp Global Data Pointer
+  // Get the FSP Global Data Pointer
   //
   FspData  = GetFspGlobalDataPointer ();
 
@@ -269,9 +269,9 @@ GetFspUpdDataPointer (
 
 
 /**
-  This function sets the memory init UPD data pointer.
+  This function sets the FspMemoryInit UPD data pointer.
 
-  @param[in] MemoryInitUpdPtr   memory init UPD data pointer.
+  @param[in] MemoryInitUpdPtr   FspMemoryInit UPD data pointer.
 **/
 VOID
 EFIAPI
@@ -282,20 +282,20 @@ SetFspMemoryInitUpdDataPointer (
   FSP_GLOBAL_DATA  *FspData;
 
   //
-  // Get the Fsp Global Data Pointer
+  // Get the FSP Global Data Pointer
   //
   FspData  = GetFspGlobalDataPointer ();
 
   //
-  // Set the memory init UPD pointer.
+  // Set the FspMemoryInit UPD pointer.
   //
   FspData->MemoryInitUpdPtr = MemoryInitUpdPtr;
 }
 
 /**
-  This function gets the memory init UPD data pointer.
+  This function gets the FspMemoryInit UPD data pointer.
 
-  @return memory init UPD data pointer.
+  @return FspMemoryInit UPD data pointer.
 **/
 VOID *
 EFIAPI
@@ -311,9 +311,9 @@ GetFspMemoryInitUpdDataPointer (
 
 
 /**
-  This function sets the silicon init UPD data pointer.
+  This function sets the FspSiliconInit UPD data pointer.
 
-  @param[in] SiliconInitUpdPtr   silicon init UPD data pointer.
+  @param[in] SiliconInitUpdPtr   FspSiliconInit UPD data pointer.
 **/
 VOID
 EFIAPI
@@ -324,20 +324,20 @@ SetFspSiliconInitUpdDataPointer (
   FSP_GLOBAL_DATA  *FspData;
 
   //
-  // Get the Fsp Global Data Pointer
+  // Get the FSP Global Data Pointer
   //
   FspData  = GetFspGlobalDataPointer ();
 
   //
-  // Set the silicon init UPD data pointer.
+  // Set the FspSiliconInit UPD data pointer.
   //
   FspData->SiliconInitUpdPtr = SiliconInitUpdPtr;
 }
 
 /**
-  This function gets the silicon init UPD data pointer.
+  This function gets the FspSiliconInit UPD data pointer.
 
-  @return silicon init UPD data pointer.
+  @return FspSiliconInit UPD data pointer.
 **/
 VOID *
 EFIAPI
@@ -528,6 +528,6 @@ FspApiReturnStatusReset (
     SetFspApiReturnStatus ((EFI_STATUS)FspResetType);
     Pei2LoaderSwitchStack ();
     DEBUG ((DEBUG_ERROR, "!!!ERROR: FSP has requested BootLoader for reset. But BootLoader has not honored the reset\n"));
-    DEBUG ((DEBUG_ERROR, "!!!ERROR: Please add support in BootLoader to honour the reset request from FSP\n"));
+    DEBUG ((DEBUG_ERROR, "!!!ERROR: Please add support in BootLoader to honor the reset request from FSP\n"));
   } while (LoopUntilReset);
 }
-- 
2.9.0.windows.1