UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

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

diff --git a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
index 7d6ef11fe783f40119273403fcdde0c581f8b8c6..5f599385185ca480f1446ab005ddb14d889d1634 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2016 - 2020, 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
@@ -31,7 +31,7 @@ FspApiCallingCheck (
     //\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
@@ -42,8 +42,10 @@ 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 (ApiParam == NULL) {\r
+      Status = EFI_SUCCESS;\r
     } else if (EFI_ERROR (FspUpdSignatureCheck (ApiIdx, ApiParam))) {\r
       Status = EFI_INVALID_PARAMETER;\r
     }\r
@@ -51,7 +53,7 @@ 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
@@ -62,12 +64,40 @@ FspApiCallingCheck (
     //\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
+      } else if (ApiIdx == FspSiliconInitApiIndex) {\r
+        if (ApiParam == NULL) {\r
+          Status = EFI_SUCCESS;\r
+        } else if (EFI_ERROR (FspUpdSignatureCheck (FspSiliconInitApiIndex, ApiParam))) {\r
+          Status = EFI_INVALID_PARAMETER;\r
+        }\r
+\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 (ApiParam == NULL) {\r
+        Status = EFI_SUCCESS;\r
+      } else if (EFI_ERROR (FspUpdSignatureCheck (FspSmmInitApiIndex, ApiParam))) {\r
         Status = EFI_INVALID_PARAMETER;\r
       }\r
     }\r