Move SAL "initialization/virtual address change notification" from EdkUefiRuntimeLib to EdkDxeSalLib.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2009 6f19259b-4bc3-4df7-8a09-765794883524

EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa

@@ -25,12 +25,18 @@
     <LibraryClass Usage="ALWAYS_PRODUCED">
       <Keyword>EdkDxeSalLib</Keyword>
     </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>BaseLib</Keyword>
+    </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>DebugLib</Keyword>
     </LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">
       <Keyword>UefiBootServicesTableLib</Keyword>
     </LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">
+      <Keyword>UefiRuntimeLib</Keyword>
+    </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename SupArchList="IPF">Ipf/EsalServiceLib.c</Filename>
@@ -51,5 +57,8 @@
     <Extern>
       <Constructor>DxeSalLibConstruct</Constructor>
     </Extern>
+    <Extern>
+      <SetVirtualAddressMapCallBack>DxeSalVirtualNotifyEvent</SetVirtualAddressMapCallBack>
+    </Extern>
   </Externs>
 </ModuleSurfaceArea>

EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c

@@ -21,6 +21,7 @@ Abstract:
 
 
 STATIC EXTENDED_SAL_BOOT_SERVICE_PROTOCOL *mEsalBootService;
+STATIC EFI_PLABEL                         mPlabel;
 
 EFI_STATUS
 EFIAPI
@@ -29,14 +30,59 @@ DxeSalLibConstruct (
   IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
+  EFI_PLABEL  *Plabel;
   EFI_STATUS  Status;
 
+  //
+  // The protocol contains a function pointer, which is an indirect procedure call.
+  // An indirect procedure call goes through a plabel, and pointer to a function is
+  // a pointer to a plabel. To implement indirect procedure calls that can work in
+  // both physical and virtual mode, two plabels are required (one physical and one
+  // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it
+  // away. We cache it in a module global, so we can register the vitrual version.
+  //
   Status              = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);
   ASSERT_EFI_ERROR (Status);
 
+  Plabel              = (EFI_PLABEL *) (UINTN) mEsalBootService->ExtendedSalProc;
+
+  mPlabel.EntryPoint  = Plabel->EntryPoint;
+  mPlabel.GP          = Plabel->GP;
+  SetEsalPhysicalEntryPoint (mPlabel.EntryPoint, mPlabel.GP);
+
   return Status;
 }
 
+VOID
+EFIAPI
+DxeSalVirtualNotifyEvent (
+  IN EFI_EVENT        Event,
+  IN VOID             *Context
+  )
+/*++
+
+Routine Description:
+
+  Fixup virtual address pointer of label.
+
+Arguments:
+
+  Event   - The Event that is being processed
+  
+  Context - Event Context
+
+Returns: 
+
+  None
+
+--*/
+{
+  EfiConvertPointer (0x0, (VOID **) &mPlabel.EntryPoint);
+  EfiConvertPointer (EFI_IPF_GP_POINTER, (VOID **) &mPlabel.GP);
+
+  SetEsalVirtualEntryPoint (mPlabel.EntryPoint, mPlabel.GP);
+}
+
 EFI_STATUS
 EFIAPI
 RegisterEsalFunction (

EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c

@@ -24,8 +24,6 @@ Module Name:
 
 STATIC EFI_EVENT                          mRuntimeNotifyEvent;
 STATIC EFI_EVENT                          mEfiVirtualNotifyEvent;
-STATIC EFI_PLABEL                         mPlabel;
-STATIC EXTENDED_SAL_BOOT_SERVICE_PROTOCOL *mEsalBootService;
 
 EFI_RUNTIME_SERVICES                      *mRT;
 
@@ -103,10 +101,10 @@ Returns:
     ChildNotifyEventHandler (Event, NULL);
   }
 
-  mRT->ConvertPointer (0x0, (VOID **) &mPlabel.EntryPoint);
+  //
-  mRT->ConvertPointer (EFI_IPF_GP_POINTER, (VOID **) &mPlabel.GP);
+  // Update global for Runtime Services Table
-
+  //
-  SetEsalVirtualEntryPoint (mPlabel.EntryPoint, mPlabel.GP);
+  EfiConvertPointer (0, (VOID **) &mRT);
 }
 
 EFI_STATUS
@@ -135,29 +133,10 @@ Returns:
 
 --*/
 {
-  EFI_PLABEL  *Plabel;
   EFI_STATUS  Status;
 
   mRT = SystemTable->RuntimeServices;
 
-  //
-  // The protocol contains a function pointer, which is an indirect procedure call.
-  // An indirect procedure call goes through a plabel, and pointer to a function is
-  // a pointer to a plabel. To implement indirect procedure calls that can work in
-  // both physical and virtual mode, two plabels are required (one physical and one
-  // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it
-  // away. We cache it in a module global, so we can register the vitrual version.
-  //
-  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);
-  ASSERT_EFI_ERROR (Status);
-
-  Plabel              = (EFI_PLABEL *) (UINTN) mEsalBootService->ExtendedSalProc;
-
-  mPlabel.EntryPoint  = Plabel->EntryPoint;
-  mPlabel.GP          = Plabel->GP;
-
-  SetEsalPhysicalEntryPoint (mPlabel.EntryPoint, mPlabel.GP);
-
   //
   // Register our ExitBootServices () notify function
   //

EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeService.c

@@ -119,7 +119,6 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-
   EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
 
   ReturnReg = EfiCallEsalService (&Guid, SetTime, (UINT64) Time, 0, 0, 0, 0, 0, 0);
@@ -152,7 +151,6 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-
   EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
 
   ReturnReg = EfiCallEsalService (&Guid, GetWakeupTime, (UINT64) Enabled, (UINT64) Pending, (UINT64) Time, 0, 0, 0, 0);
@@ -184,7 +182,6 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-
   EFI_GUID        Guid = EFI_EXTENDED_SAL_RTC_SERVICES_PROTOCOL_GUID;
 
   ReturnReg = EfiCallEsalService (&Guid, SetWakeupTime, (UINT64) Enable, (UINT64) Time, 0, 0, 0, 0, 0);
@@ -356,7 +353,6 @@ Returns:
 --*/
 {
   SAL_RETURN_REGS ReturnReg;
-
   EFI_GUID        Guid = EFI_EXTENDED_SAL_MTC_SERVICES_PROTOCOL_GUID;
 
   ReturnReg = EfiCallEsalService (&Guid, GetNextHighMonotonicCount, (UINT64) HighCount, 0, 0, 0, 0, 0, 0);