IntelFsp2Pkg: Adopt FSP 2.4 MultiPhase functions.

[mirror_edk2.git] / IntelFsp2Pkg / FspSecCore / SecFspApiChk.c

diff --git a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
index 8e0595fe9a24d2363d71561d44535a045baf2b48..a44fbf2a50b56c07f24064d4663044e2b868212a 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
@@ -1,13 +1,12 @@
 /** @file\r
 \r
-  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include "SecFsp.h"\r
 \r
-\r
 /**\r
   This function check the FSP API calling condition.\r
 \r
@@ -18,21 +17,21 @@
 EFI_STATUS\r
 EFIAPI\r
 FspApiCallingCheck (\r
-  IN UINT8     ApiIdx,\r
-  IN VOID     *ApiParam\r
+  IN UINT8  ApiIdx,\r
+  IN VOID   *ApiParam\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  FSP_GLOBAL_DATA           *FspData;\r
+  EFI_STATUS       Status;\r
+  FSP_GLOBAL_DATA  *FspData;\r
 \r
-  Status = EFI_SUCCESS;\r
+  Status  = EFI_SUCCESS;\r
   FspData = GetFspGlobalDataPointer ();\r
 \r
   if (ApiIdx == NotifyPhaseApiIndex) {\r
     //\r
     // NotifyPhase check\r
     //\r
-    if ((FspData == NULL) || ((UINT32)FspData == 0xFFFFFFFF)) {\r
+    if ((FspData == NULL) || ((UINTN)FspData == MAX_ADDRESS) || ((UINTN)FspData == MAX_UINT32)) {\r
       Status = EFI_UNSUPPORTED;\r
     } else {\r
       if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {\r
@@ -43,7 +42,7 @@ FspApiCallingCheck (
     //\r
     // FspMemoryInit check\r
     //\r
-    if ((UINT32)FspData != 0xFFFFFFFF) {\r
+    if (((UINTN)FspData != MAX_ADDRESS) && ((UINTN)FspData != MAX_UINT32)) {\r
       Status = EFI_UNSUPPORTED;\r
     } else if (EFI_ERROR (FspUpdSignatureCheck (ApiIdx, ApiParam))) {\r
       Status = EFI_INVALID_PARAMETER;\r
@@ -52,23 +51,45 @@ FspApiCallingCheck (
     //\r
     // TempRamExit check\r
     //\r
-    if ((FspData == NULL) || ((UINT32)FspData == 0xFFFFFFFF)) {\r
+    if ((FspData == NULL) || ((UINTN)FspData == MAX_ADDRESS) || ((UINTN)FspData == MAX_UINT32)) {\r
       Status = EFI_UNSUPPORTED;\r
     } else {\r
       if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {\r
         Status = EFI_UNSUPPORTED;\r
       }\r
     }\r
-  } else if (ApiIdx == FspSiliconInitApiIndex) {\r
+  } else if ((ApiIdx == FspSiliconInitApiIndex) || (ApiIdx == FspMultiPhaseSiInitApiIndex)) {\r
     //\r
     // FspSiliconInit check\r
     //\r
-    if ((FspData == NULL) || ((UINT32)FspData == 0xFFFFFFFF)) {\r
+    if ((FspData == NULL) || ((UINTN)FspData == MAX_ADDRESS) || ((UINTN)FspData == MAX_UINT32)) {\r
+      Status = EFI_UNSUPPORTED;\r
+    } else {\r
+      if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {\r
+        Status = EFI_UNSUPPORTED;\r
+      } else if (EFI_ERROR (FspUpdSignatureCheck (FspSiliconInitApiIndex, ApiParam))) {\r
+        Status = EFI_INVALID_PARAMETER;\r
+      } else if (ApiIdx == FspSiliconInitApiIndex) {\r
+        //\r
+        // Reset MultiPhase NumberOfPhases to zero\r
+        //\r
+        FspData->NumberOfPhases = 0;\r
+      }\r
+    }\r
+  } else if (ApiIdx == FspMultiPhaseMemInitApiIndex) {\r
+    if ((FspData == NULL) || ((UINTN)FspData == MAX_ADDRESS) || ((UINTN)FspData == MAX_UINT32)) {\r
+      Status = EFI_UNSUPPORTED;\r
+    }\r
+  } else if (ApiIdx == FspSmmInitApiIndex) {\r
+    //\r
+    // FspSmmInitApiIndex check\r
+    //\r
+    if ((FspData == NULL) || ((UINTN)FspData == MAX_ADDRESS) || ((UINTN)FspData == MAX_UINT32)) {\r
       Status = EFI_UNSUPPORTED;\r
     } else {\r
       if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {\r
         Status = EFI_UNSUPPORTED;\r
-      } else if (EFI_ERROR (FspUpdSignatureCheck (ApiIdx, ApiParam))) {\r
+      } else if (EFI_ERROR (FspUpdSignatureCheck (FspSmmInitApiIndex, ApiParam))) {\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
     }\r