Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c (modified) (9 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsuleRuntimeDxe/X64/SaveLongModeContext.c

@@ -3 +3 @@
   for transferring into long mode in IA32 capsule PEI.
 
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -18 +18 @@
 #include <Protocol/Capsule.h>
 #include <Protocol/DxeSmmReadyToLock.h>
+#include <Protocol/VariableLock.h>
 
 #include <Guid/CapsuleVendor.h>
@@ -28 +29 @@
 #include <Library/UefiRuntimeLib.h>
 #include <Library/BaseLib.h>
-#include <Library/LockBoxLib.h>
 #include <Library/UefiLib.h>
 #include <Library/BaseMemoryLib.h>
@@ -34 +34 @@
 
 /**
-  Allocate EfiACPIMemoryNVS below 4G memory address.
-
-  This function allocates EfiACPIMemoryNVS below 4G memory address.
-
-  @param  Size         Size of memory to allocate.
-  
-  @return Allocated address for output.
+  Allocate EfiReservedMemoryType below 4G memory address.
+
+  This function allocates EfiReservedMemoryType below 4G memory address.
+
+  @param  Size      Size of memory to allocate.
+  
+  @return Allocated Address for output.
 
 **/
 VOID*
-AllocateAcpiNvsMemoryBelow4G (
+AllocateReservedMemoryBelow4G (
   IN   UINTN   Size
   )
@@ -58 +58 @@
   Status  = gBS->AllocatePages (
                    AllocateMaxAddress,
-                   EfiACPIMemoryNVS,
+                   EfiReservedMemoryType,
                    Pages,
                    &Address
@@ -71 +71 @@
 
 /**
-  DxeSmmReadyToLock Protocol notification event handler.
-  We reuse S3 ACPI NVS reserved memory to do capsule process
-  after reset.
+  Register callback function upon VariableLockProtocol
+  to lock EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to avoid malicious code to update it.
 
   @param[in] Event    Event whose notification function is being invoked.
@@ -80 +79 @@
 VOID
 EFIAPI
-DxeSmmReadyToLockNotification (
-  IN EFI_EVENT  Event,
-  IN VOID       *Context
+VariableLockCapsuleLongModeBufferVariable (
+  IN  EFI_EVENT                             Event,
+  IN  VOID                                  *Context
   )
 {
   EFI_STATUS                    Status;
-  VOID                          *DxeSmmReadyToLock;
-  UINTN                         VarSize;
-  EFI_PHYSICAL_ADDRESS          TempAcpiS3Context;
-  ACPI_S3_CONTEXT               *AcpiS3Context;
-  EFI_CAPSULE_LONG_MODE_BUFFER  LongModeBuffer;
-  UINTN                         TotalPagesNum;
-  UINT8                         PhysicalAddressBits;
-  VOID                          *Hob;
-  UINT32                        NumberOfPml4EntriesNeeded;
-  UINT32                        NumberOfPdpEntriesNeeded;
-  BOOLEAN                       LockBoxFound;
-
-  Status = gBS->LocateProtocol (
-                  &gEfiDxeSmmReadyToLockProtocolGuid,
-                  NULL,
-                  &DxeSmmReadyToLock
-                  );
-  if (EFI_ERROR (Status)) {
-    return ;
-  }
-
-  //
-  // Get the ACPI NVS pages reserved by AcpiS3Save
-  //
-  LockBoxFound = FALSE;
-  VarSize = sizeof (EFI_PHYSICAL_ADDRESS);
-  Status = RestoreLockBox (
-             &gEfiAcpiVariableGuid,
-             &TempAcpiS3Context,
-             &VarSize
-             );
+  EDKII_VARIABLE_LOCK_PROTOCOL  *VariableLock;
+  //
+  // Mark EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to read-only if the Variable Lock protocol exists
+  //
+  Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);
   if (!EFI_ERROR (Status)) {
-    AcpiS3Context = (ACPI_S3_CONTEXT *)(UINTN)TempAcpiS3Context;
-    ASSERT (AcpiS3Context != NULL);
-    
-    Status = RestoreLockBox (
-               &gEfiAcpiS3ContextGuid,
-               NULL,
-               NULL
-               );
-    if (!EFI_ERROR (Status)) {
-      LongModeBuffer.PageTableAddress = AcpiS3Context->S3NvsPageTableAddress;
-      LongModeBuffer.StackBaseAddress = AcpiS3Context->BootScriptStackBase;
-      LongModeBuffer.StackSize        = AcpiS3Context->BootScriptStackSize;
-      LockBoxFound                    = TRUE;
-    }
-  }
-  
-  if (!LockBoxFound) {
-    //
-    // Page table base address and stack base address can not be found in lock box,
-    // allocate both here. 
-    //
-
-    //
-    // Get physical address bits supported from CPU HOB.
-    //
-    PhysicalAddressBits = 36;
-    
+    Status = VariableLock->RequestToLock (VariableLock, EFI_CAPSULE_LONG_MODE_BUFFER_NAME, &gEfiCapsuleVendorGuid);
+    ASSERT_EFI_ERROR (Status);
+  }
+}
+
+/**
+  1. Allocate Reserved memory for capsule PEIM to establish a 1:1 Virtual to Physical mapping.
+  2. Allocate Reserved memroy as a stack for capsule PEIM to transfer from 32-bit mdoe to 64-bit mode.
+
+**/
+VOID
+EFIAPI
+PrepareContextForCapsulePei (
+  VOID
+  )
+{
+  UINT32                                        RegEax;
+  UINT32                                        RegEdx;
+  UINTN                                         TotalPagesNum;
+  UINT8                                         PhysicalAddressBits;
+  VOID                                          *Hob;
+  UINT32                                        NumberOfPml4EntriesNeeded;
+  UINT32                                        NumberOfPdpEntriesNeeded;
+  BOOLEAN                                       Page1GSupport;
+  EFI_CAPSULE_LONG_MODE_BUFFER                  LongModeBuffer;
+  EFI_STATUS                                    Status;
+  VOID                                          *Registration;
+  
+  LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS) PcdGet64 (PcdIdentifyMappingPageTablePtr);
+
+  if (LongModeBuffer.PageTableAddress == 0x0) {
+    //
+    // Calculate the size of page table, allocate the memory, and set PcdIdentifyMappingPageTablePtr.
+    //
+    Page1GSupport = FALSE;
+    if (PcdGetBool(PcdUse1GPageTable)) {
+      AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);
+      if (RegEax >= 0x80000001) {
+        AsmCpuid (0x80000001, NULL, NULL, NULL, &RegEdx);
+        if ((RegEdx & BIT26) != 0) {
+          Page1GSupport = TRUE;
+        }
+      }
+    }
+    
+    //
+    // Get physical address bits supported.
+    //
     Hob = GetFirstHob (EFI_HOB_TYPE_CPU);
     if (Hob != NULL) {
       PhysicalAddressBits = ((EFI_HOB_CPU *) Hob)->SizeOfMemorySpace;
+    } else {
+      AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL);
+      if (RegEax >= 0x80000008) {
+        AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);
+        PhysicalAddressBits = (UINT8) RegEax;
+      } else {
+        PhysicalAddressBits = 36;
+      }
     }
     
@@ -159 +161 @@
     
     //
-    // Calculate page table size and allocate memory for it.
+    // Calculate the table entries needed.
     //
     if (PhysicalAddressBits <= 39 ) {
       NumberOfPml4EntriesNeeded = 1;
-      NumberOfPdpEntriesNeeded =  1 << (PhysicalAddressBits - 30);
+      NumberOfPdpEntriesNeeded = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 30));
     } else {
-      NumberOfPml4EntriesNeeded = 1 << (PhysicalAddressBits - 39);
+      NumberOfPml4EntriesNeeded = (UINT32)LShiftU64 (1, (PhysicalAddressBits - 39));
       NumberOfPdpEntriesNeeded = 512;
     }
     
-    TotalPagesNum = (NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1;
-    LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum));
+    if (!Page1GSupport) {
+      TotalPagesNum = (NumberOfPdpEntriesNeeded + 1) * NumberOfPml4EntriesNeeded + 1;
+    } else {
+      TotalPagesNum = NumberOfPml4EntriesNeeded + 1;
+    }
+    
+    LongModeBuffer.PageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (EFI_PAGES_TO_SIZE (TotalPagesNum));
     ASSERT (LongModeBuffer.PageTableAddress != 0);
-    
-    //
-    // Allocate stack
-    //
-    LongModeBuffer.StackSize        = PcdGet32 (PcdCapsulePeiLongModeStackSize);
-    LongModeBuffer.StackBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize));
-    ASSERT (LongModeBuffer.StackBaseAddress != 0);
-  }
-
+    PcdSet64 (PcdIdentifyMappingPageTablePtr, LongModeBuffer.PageTableAddress); 
+  }
+  
+  //
+  // Allocate stack
+  //
+  LongModeBuffer.StackSize        = PcdGet32 (PcdCapsulePeiLongModeStackSize);
+  LongModeBuffer.StackBaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateReservedMemoryBelow4G (PcdGet32 (PcdCapsulePeiLongModeStackSize));
+  ASSERT (LongModeBuffer.StackBaseAddress != 0);  
+  
   Status = gRT->SetVariable (
                   EFI_CAPSULE_LONG_MODE_BUFFER_NAME,
                   &gEfiCapsuleVendorGuid,
-                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
+                  EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
                   sizeof (EFI_CAPSULE_LONG_MODE_BUFFER),
                   &LongModeBuffer
                   );
-  ASSERT_EFI_ERROR (Status);
-
-  //
-  // Close event, so it will not be invoked again.
-  //
-  gBS->CloseEvent (Event);
-
-  return ;
+  if (!EFI_ERROR (Status)) {
+      //
+      // Register callback function upon VariableLockProtocol
+      // to lock EFI_CAPSULE_LONG_MODE_BUFFER_NAME variable to avoid malicious code to update it.
+      //
+      EfiCreateProtocolNotifyEvent (
+        &gEdkiiVariableLockProtocolGuid,
+        TPL_CALLBACK,
+        VariableLockCapsuleLongModeBufferVariable,
+        NULL,
+        &Registration
+        );    
+  } else {
+      DEBUG ((EFI_D_ERROR, "FATAL ERROR: CapsuleLongModeBuffer cannot be saved: %r. Capsule in PEI may fail!\n", Status));
+      gBS->FreePages (LongModeBuffer.StackBaseAddress, EFI_SIZE_TO_PAGES (LongModeBuffer.StackSize));
+  }
 }
 
@@ -207 +223 @@
   )
 {
-  VOID        *Registration;
-  
   if ((FeaturePcdGet(PcdSupportUpdateCapsuleReset)) && (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {
     //
-    // Register event to get ACPI NVS pages reserved from lock box, these pages will be used by
-    // Capsule IA32 PEI to transfer to long mode to access capsule above 4GB.
-    //
-    EfiCreateProtocolNotifyEvent (
-      &gEfiDxeSmmReadyToLockProtocolGuid,
-      TPL_CALLBACK,
-      DxeSmmReadyToLockNotification,
-      NULL,
-      &Registration
-      );
-  }
-}
+    // Allocate memory for Capsule IA32 PEIM, it will create page table to transfer to long mode to access capsule above 4GB.
+    //
+    PrepareContextForCapsulePei ();
+  }
+}