X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FLibrary%2FEdkDxeSalLib%2FIpf%2FEsalServiceLib.c;fp=EdkModulePkg%2FLibrary%2FEdkDxeSalLib%2FIpf%2FEsalServiceLib.c;h=2e0daeb89e1260c711bca6515f9f6e0bdebb60d5;hp=83b6aa2c4cfb106e4659c386471069abafd1c603;hb=c25aaa00aa0e39ed1242a29576703cffedef850a;hpb=9710b9a67c7d949b339b5540b0eaa735d56e019b

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 83b6aa2c4c..2e0daeb89e 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/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_STATUS Status;
-
-  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);
+  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 (