Removed the DxeSalLibConstructor() from the EdkDxeSalLib and EdkDxeRuntimeSalLib...

[mirror_edk2.git] / EdkModulePkg / Library / EdkDxeSalLib / Ipf / EsalServiceLib.c

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 706dda2873e92a278ce3f5bb668f927e7068c7f9..199b14becc3896b55c34d567577b63dbd8b43606 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
 \r
@@ -19,25 +19,21 @@ Abstract:
 \r
 #include <Ipf/IpfDefines.h>\r
 \r
-BOOLEAN mLibraryInitialized = FALSE;\r
-STATIC EXTENDED_SAL_BOOT_SERVICE_PROTOCOL *mEsalBootService;\r
-STATIC EFI_PLABEL                         mPlabel;\r
+EXTENDED_SAL_BOOT_SERVICE_PROTOCOL  *mEsalBootService = NULL;\r
+EFI_PLABEL                          mPlabel;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
-DxeSalLibConstruct (\r
-//  IN EFI_HANDLE        ImageHandle,\r
-//  IN EFI_SYSTEM_TABLE  *SystemTable\r
+DxeSalLibInitialize (\r
   VOID\r
   )\r
 {\r
   EFI_PLABEL  *Plabel;\r
   EFI_STATUS  Status;\r
 \r
-  if (mLibraryInitialized == TRUE) {\r
+  if (mEsalBootService != NULL) {\r
     return EFI_SUCCESS;\r
   }\r
-  mLibraryInitialized = TRUE;\r
 \r
   //\r
   // The protocol contains a function pointer, which is an indirect procedure call.\r
@@ -47,8 +43,11 @@ DxeSalLibConstruct (
   // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it\r
   // away. We cache it in a module global, so we can register the vitrual version.\r
   //\r
-  Status              = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);\r
-  ASSERT_EFI_ERROR (Status);\r
+  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);\r
+  if (EFI_ERROR (Status)) {\r
+    mEsalBootService = NULL;\r
+    return EFI_SUCCESS;\r
+  }\r
 \r
   Plabel              = (EFI_PLABEL *) (UINTN) mEsalBootService->ExtendedSalProc;\r
 \r
@@ -56,7 +55,7 @@ DxeSalLibConstruct (
   mPlabel.GP          = Plabel->GP;\r
   SetEsalPhysicalEntryPoint (mPlabel.EntryPoint, mPlabel.GP);\r
 \r
-  return Status;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 VOID\r
@@ -74,10 +73,10 @@ Routine Description:
 Arguments:\r
 \r
   Event   - The Event that is being processed\r
-  \r
+\r
   Context - Event Context\r
 \r
-Returns: \r
+Returns:\r
 \r
   None\r
 \r
@@ -106,16 +105,16 @@ Routine Description:
 \r
 Arguments:\r
   FunctionId    - ID of function to register\r
-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r
   Function      - Function to register under ClassGuid/FunctionId pair\r
   ModuleGlobal  - Module global for Function.\r
 \r
-Returns: \r
+Returns:\r
   EFI_SUCCESS - If ClassGuid/FunctionId Function was registered.\r
 \r
 --*/\r
 {\r
-  DxeSalLibConstruct ();\r
+  DxeSalLibInitialize ();\r
   return mEsalBootService->AddExtendedSalProc (\r
                             mEsalBootService,\r
                             ClassGuid,\r
@@ -140,12 +139,12 @@ Routine Description:
   This function is boot service only!\r
 \r
 Arguments:\r
-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r
   ModuleGlobal  - Module global for Function.\r
-  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL \r
+  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL\r
                   indicates the end of the list.\r
 \r
-Returns: \r
+Returns:\r
   EFI_SUCCESS - All members of ClassGuid registered\r
 \r
 --*/\r
@@ -200,7 +199,7 @@ EfiCallEsalService (
 \r
 Routine Description:\r
 \r
-  Call module that is not linked direclty to this module. This code is IP \r
+  Call module that is not linked direclty to this module. This code is IP\r
   relative and hides the binding issues of virtual or physical calling. The\r
   function that gets dispatched has extra arguments that include the registered\r
   module global and a boolean flag to indicate if the system is in virutal mode.\r
@@ -216,7 +215,7 @@ Arguments:
   Arg7        - Argument 7 ClassGuid/FunctionId defined\r
   Arg8        - Argument 8 ClassGuid/FunctionId defined\r
 \r
-Returns: \r
+Returns:\r
   Status of ClassGuid/FuncitonId\r
 \r
 --*/\r
@@ -224,12 +223,32 @@ Returns:
   SAL_RETURN_REGS       ReturnReg;\r
   SAL_EXTENDED_SAL_PROC EsalProc;\r
 \r
-  DxeSalLibConstruct ();\r
   ReturnReg = GetEsalEntryPoint ();\r
   if (ReturnReg.Status != EFI_SAL_SUCCESS) {\r
     return ReturnReg;\r
   }\r
 \r
+  //\r
+  // Look at the physical mode ESAL entry point to determine of the ESAL entry point has been initialized\r
+  //\r
+  if (*(UINT64 *)ReturnReg.r9 == 0 && *(UINT64 *)(ReturnReg.r9 + 8) == 0) {\r
+    //\r
+    // Both the function ponter and the GP value are zero, so attempt to initialize the ESAL Entry Point\r
+    //\r
+    DxeSalLibInitialize ();\r
+    ReturnReg = GetEsalEntryPoint ();\r
+    if (ReturnReg.Status != EFI_SAL_SUCCESS) {\r
+      return ReturnReg;\r
+    }\r
+    if (*(UINT64 *)ReturnReg.r9 == 0 && *(UINT64 *)(ReturnReg.r9 + 8) == 0) {\r
+      //\r
+      // The ESAL Entry Point could not be initialized\r
+      //\r
+      ReturnReg.Status = EFI_SAL_ERROR;\r
+      return ReturnReg;\r
+    }\r
+  }\r
+\r
   if (ReturnReg.r11 & PSR_IT_MASK) {\r
     //\r
     // Virtual mode plabel to entry point\r