3 files changed, 41 insertions, 0 deletions
diff --git a/IntelFsp2Pkg/Include/Library/FspCommonLib.h b/IntelFsp2Pkg/Include/Library/FspCommonLib.h
index e13d0c3346..231f1e44b3 100644
--- a/IntelFsp2Pkg/Include/Library/FspCommonLib.h
+++ b/IntelFsp2Pkg/Include/Library/FspCommonLib.h
@@ -309,4 +309,15 @@ GetFspCarSize (
   VOID
   );
 
+/**
+  This function updates the return status of the FSP API with requested reset type and returns to Boot Loader.
+
+  @param[in] FspResetType     Reset type that needs to returned as API return status
+
+**/
+VOID
+EFIAPI
+FspApiReturnStatusReset (
+  IN UINT32   FspResetType
+  );
 #endif
diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf b/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
index 0b0741b1c6..df8803a036 100644
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/BaseFspCommonLib.inf
@@ -28,6 +28,7 @@
 
 [LibraryClasses]
   BaseMemoryLib
+  FspSwitchStackLib
 
 [Pcd]
   gIntelFsp2PkgTokenSpaceGuid.PcdGlobalDataPointerAddress      ## CONSUMES
diff --git a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
index 151b189343..0c5f0b306e 100644
--- a/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspCommonLib/FspCommonLib.c
@@ -18,6 +18,7 @@
 #include <FspGlobalData.h>
 #include <FspEas.h>
 #include <FspDataTable.h>
+#include <Library/FspSwitchStackLib.h>
 
 #pragma pack(1)
 
@@ -544,3 +545,31 @@ GetFspCarSize (
   }
   return CarSize;
 }
+
+/**
+  This function updates the return status of the FSP API with requested reset type and returns to Boot Loader.
+
+  @param[in] FspResetType     Reset type that needs to returned as API return status
+
+**/
+VOID
+EFIAPI
+FspApiReturnStatusReset (
+  IN UINT32   FspResetType
+  )
+{
+  volatile BOOLEAN  LoopUntilReset;
+  
+  LoopUntilReset = TRUE;
+  DEBUG ((DEBUG_INFO, "FSP returning control to Bootloader with reset required return status %x\n",FspResetType));
+  ///
+  /// Below code is not an infinite loop.The control will go back to API calling function in BootLoader each time BootLoader
+  /// calls the FSP API without honoring the reset request by FSP
+  ///
+  do {
+    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"));
+  } while (LoopUntilReset);
+}