Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103777

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/CapsulePei/Capsule.h (modified) (3 diffs)
• MdeModulePkg/Universal/CapsulePei/CapsulePei.inf (modified) (2 diffs)
• MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c (modified) (12 diffs)
• MdeModulePkg/Universal/CapsulePei/UefiCapsule.c (modified) (28 diffs)
• MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei/Capsule.h

@@ -40 +40 @@
 #include "Common/CommonHeader.h"
 
-#ifdef MDE_CPU_IA32 
+#ifdef MDE_CPU_IA32
 
 #pragma pack(1)
@@ -79 +79 @@
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page
-    UINT64  MustBe1:1;                // Must be 1 
+    UINT64  MustBe1:1;                // Must be 1
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write
     UINT64  Available:3;              // Available for use by system software
@@ -103 +103 @@
     UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)
     UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page
-    UINT64  MustBe1:1;                // Must be 1 
+    UINT64  MustBe1:1;                // Must be 1
     UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write
     UINT64  Available:3;              // Available for use by system software

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf

@@ -39 +39 @@
   UefiCapsule.c
   Capsule.h
-  Common/CapsuleCoalesce.c  
+  Common/CapsuleCoalesce.c
 
 [Packages]
@@ -69 +69 @@
   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES
   gPeiCapsulePpiGuid                            ## PRODUCES
-  
-[Ppis.IA32]  
+
+[Ppis.IA32]
   gEfiPeiLoadFilePpiGuid                        ## SOMETIMES_CONSUMES
 

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c

@@ -45 +45 @@
   @param DataSize    How big a free block we want to find
 
-  @return A pointer to a memory block of at least DataSize that lies somewhere 
+  @return A pointer to a memory block of at least DataSize that lies somewhere
           between MemBase and (MemBase + MemSize). The memory pointed to does not
           contain any of the capsule block descriptors or capsule blocks pointed to
@@ -89 +89 @@
 
   @retval NULL    could not relocate the descriptors
-  @retval Pointer to the base of the successfully-relocated block descriptors. 
+  @retval Pointer to the base of the successfully-relocated block descriptors.
 
 **/
@@ -107 +107 @@
 
   @retval FALSE  Capsule is OK
-  @retval TRUE   Capsule is corrupted 
+  @retval TRUE   Capsule is corrupted
 
 **/
@@ -167 +167 @@
   @param DataSize    How big a free block we want to find
 
-  @return A pointer to a memory block of at least DataSize that lies somewhere 
+  @return A pointer to a memory block of at least DataSize that lies somewhere
           between MemBase and (MemBase + MemSize). The memory pointed to does not
           contain any of the capsule block descriptors or capsule blocks pointed to
@@ -411 +411 @@
 
   @retval NULL    could not relocate the descriptors
-  @retval Pointer to the base of the successfully-relocated block descriptors. 
+  @retval Pointer to the base of the successfully-relocated block descriptors.
 
 **/
@@ -698 +698 @@
 
   @retval FALSE  Capsule is OK
-  @retval TRUE   Capsule is corrupted 
+  @retval TRUE   Capsule is corrupted
 
 **/
@@ -730 +730 @@
   where capsule data corruption occurs.
 
-  The test pattern mode fills in memory with a counting UINT32 value. 
+  The test pattern mode fills in memory with a counting UINT32 value.
   If the capsule is not divided up in a multiple of 4-byte blocks, then
   things get messy doing the check. Therefore there are some cases
@@ -824 +824 @@
 BuildCapsuleDescriptors (
   IN  EFI_PHYSICAL_ADDRESS            *BlockListBuffer,
-  OUT EFI_CAPSULE_BLOCK_DESCRIPTOR    **BlockDescriptorList 
+  OUT EFI_CAPSULE_BLOCK_DESCRIPTOR    **BlockDescriptorList
   )
 {
@@ -867 +867 @@
     Index ++;
   }
-  
+
   if (HeadBlock != NULL) {
     *BlockDescriptorList = HeadBlock;
@@ -889 +889 @@
                    | |  Capsule [0]          | |            |
                    | ------------------------- |            |
-                   |    Capsule Image          |            |   
+                   |    Capsule Image          |            |
 CapsuleImageBase-->+---------------------------+
                    | ------------------------- |            |
@@ -962 +962 @@
   UINT8                          *RelocPtr;
   UINT64                         *AddDataPtr;
-  UINTN                          CapsuleTimes; 
-  UINT64                         SizeLeft; 
-  UINT64                         CapsuleImageSize; 
+  UINTN                          CapsuleTimes;
+  UINT64                         SizeLeft;
+  UINT64                         CapsuleImageSize;
   UINTN                          CapsuleSize;
   UINTN                          CapsuleNumber;
@@ -1224 +1224 @@
         //Here is the end of the current capsule image.
         //
-        CapsuleBeginFlag = TRUE; 
+        CapsuleBeginFlag = TRUE;
       }
     } else {

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c

@@ -44 +44 @@
 /**
   Calculate the total size of page table.
-  
+
   @return The size of page table.
-  
-  
+
+
 **/
 UINTN
@@ -129 +129 @@
   IN  EFI_PHYSICAL_ADDRESS  PageTablesAddress
   )
-{  
+{
   UINT32                                        RegEax;
   UINT32                                        RegEdx;
@@ -193 +193 @@
 
   //
-  // Pre-allocate big pages to avoid later allocations. 
+  // Pre-allocate big pages to avoid later allocations.
   //
   BigPageAddress = (UINTN) PageTablesAddress;
@@ -222 +222 @@
     if (Page1GSupport) {
       PageDirectory1GEntry = (VOID *) PageDirectoryPointerEntry;
-    
+
       for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {
         //
@@ -237 +237 @@
         // Each Directory Pointer entries points to a page of Page Directory entires.
         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.
-        //       
+        //
         PageDirectoryEntry = (VOID *) BigPageAddress;
         BigPageAddress += SIZE_4KB;
@@ -291 +291 @@
   SWITCH_64_TO_32_CONTEXT  *ReturnContext
   )
-{ 
+{
   //
   // Restore original GDT
   //
   AsmWriteGdtr (&ReturnContext->Gdtr);
-  
+
   //
   // return to original caller
   //
   LongJump ((BASE_LIBRARY_JUMP_BUFFER  *)(UINTN)EntrypointContext->JumpBuffer, 1);
- 
+
   //
   // never be here
-  // 
+  //
   ASSERT (FALSE);
 }
@@ -339 +339 @@
     //
     CreateIdentityMappingPageTables (PageTableAddress);
-    
+
     //
     // Create 64-bit GDT
@@ -365 +365 @@
       );
   }
-  
+
   //
   // Convert to 32-bit Status and return
@@ -373 +373 @@
     Status = ENCODE_ERROR ((UINTN) ReturnContext->ReturnStatus);
   }
-  
+
   return Status;
 }
@@ -411 +411 @@
   ZeroMem (&Context, sizeof (SWITCH_32_TO_64_CONTEXT));
   ZeroMem (&ReturnContext, sizeof (SWITCH_64_TO_32_CONTEXT));
-  
+
   MemoryBase64  = (UINT64) (UINTN) *MemoryBase;
   MemorySize64  = (UINT64) (UINTN) *MemorySize;
@@ -417 +417 @@
 
   //
-  // Merge memory range reserved for stack and page table  
+  // Merge memory range reserved for stack and page table
   //
   if (LongModeBuffer->StackBaseAddress < LongModeBuffer->PageTableAddress) {
@@ -426 +426 @@
     ReservedRangeEnd  = LongModeBuffer->StackBaseAddress + LongModeBuffer->StackSize;
   }
-  
+
   //
   // Check if memory range reserved is overlap with MemoryBase ~ MemoryBase + MemorySize.
@@ -445 +445 @@
       MemorySize64 = (UINT64)(UINTN)(ReservedRangeBase - MemoryBase64);
     }
-  }  
-  
+  }
+
   //
   // Initialize context jumping to 64-bit enviroment
@@ -467 +467 @@
   //
   ReturnContext.ReturnStatus       = 0;
-  
+
   //
   // Save original GDT
   //
   AsmReadGdtr ((IA32_DESCRIPTOR *)&ReturnContext.Gdtr);
-  
+
   Status = Thunk32To64 (LongModeBuffer->PageTableAddress, &Context, &ReturnContext);
-  
+
   if (!EFI_ERROR (Status)) {
     *MemoryBase = (VOID *) (UINTN) MemoryBase64;
@@ -576 +576 @@
   ValidIndex        = 0;
   CapsuleDataPtr64  = 0;
-  
+
   Status = PeiServicesLocatePpi (
               &gEfiPeiReadOnlyVariable2PpiGuid,
@@ -627 +627 @@
           break;
         }
-        
+
         //
         // If this BlockList has been linked before, skip this variable
@@ -643 +643 @@
         }
       }
-      
+
       //
       // Cache BlockList which has been processed
@@ -651 +651 @@
     }
   }
-  
+
   return EFI_SUCCESS;
 }
@@ -732 +732 @@
   CHAR16                               CapsuleVarName[30];
   CHAR16                               *TempVarName;
-  EFI_PHYSICAL_ADDRESS                 CapsuleDataPtr64;  
+  EFI_PHYSICAL_ADDRESS                 CapsuleDataPtr64;
   EFI_STATUS                           Status;
   EFI_BOOT_MODE                        BootMode;
@@ -755 +755 @@
   Status = PeiServicesGetBootMode (&BootMode);
   if (EFI_ERROR (Status) || (BootMode != BOOT_ON_FLASH_UPDATE)) {
-    DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));    
+    DEBUG ((EFI_D_ERROR, "Boot mode is not correct for capsule update path.\n"));
     Status = EFI_NOT_FOUND;
     goto Done;
   }
-  
+
   //
   // User may set the same ScatterGatherList with several different variables,
@@ -798 +798 @@
     Index++;
   }
-  
+
   DEBUG ((EFI_D_INFO,"Capsule variable count = %d\n", VariableCount));
-  
+
   //
   // The last entry is the end flag.
@@ -813 +813 @@
     goto Done;
   }
-  
+
   ZeroMem (VariableArrayAddress, (VariableCount + 1) * sizeof (EFI_PHYSICAL_ADDRESS));
-  
+
   //
   // Find out if we actually have a capsule.
@@ -842 +842 @@
       goto Done;
     }
-    
+
     Status = FindCapsuleCoalesceImage (&CoalesceImageEntryPoint, &CoalesceImageMachineType);
     if ((EFI_ERROR (Status)) || (CoalesceImageMachineType != EFI_IMAGE_MACHINE_X64)) {
@@ -864 +864 @@
   Status = CapsuleDataCoalesce (PeiServices, (EFI_PHYSICAL_ADDRESS *)(UINTN)VariableArrayAddress, MemoryBase, MemorySize);
 #endif
-  
+
   DEBUG ((EFI_D_INFO, "Capsule Coalesce Status = %r!\n", Status));
 
@@ -870 +870 @@
     DEBUG ((EFI_D_ERROR, "There is not enough memory to process capsule!\n"));
   }
-  
+
   if (Status == EFI_NOT_FOUND) {
     DEBUG ((EFI_D_ERROR, "Fail to parse capsule descriptor in memory!\n"));
@@ -903 +903 @@
 }
 /**
-  This function will look at a capsule and determine if it's a test pattern. 
+  This function will look at a capsule and determine if it's a test pattern.
   If it is, then it will verify it and emit an error message if corruption is detected.
-  
+
   @param PeiServices   Standard pei services pointer
   @param CapsuleBase   Base address of coalesced capsule, which is preceeded
@@ -994 +994 @@
   EFI_PHYSICAL_ADDRESS          BaseAddress;
   UINT64                        Length;
- 
+
   PrivateData    = (EFI_CAPSULE_PEIM_PRIVATE_DATA *) CapsuleBase;
   if (PrivateData->Signature != EFI_CAPSULE_PEIM_PRIVATE_DATA_SIGNATURE) {
@@ -1050 +1050 @@
     BuildCvHob (BaseAddress, Length);
   }
-  
+
   return EFI_SUCCESS;
 }

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c

@@ -46 +46 @@
   // Save the IA32 IDT Descriptor
   //
-  AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr); 
+  AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
 
   //
@@ -54 +54 @@
   X64Idtr.Base = (UINTN) IdtEntryTable;
   X64Idtr.Limit = (UINT16) (sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER - 1);
-  AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);  
+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);
 
   //
@@ -61 +61 @@
   Status = InitializeCpuExceptionHandlers (NULL);
   ASSERT_EFI_ERROR (Status);
-  
+
   //
   // Initialize Debug Agent to support source level debug
@@ -76 +76 @@
              (UINTN *) (UINTN) EntrypointContext->MemorySize64Ptr
              );
-  
+
   ReturnContext->ReturnStatus = Status;
 
@@ -86 +86 @@
   // Restore IA32 IDT table
   //
-  AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);  
-  
+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);
+
   //
   // Finish to coalesce capsule, and return to 32-bit mode.
@@ -97 +97 @@
     (UINT32) (UINTN) ReturnContext,
     (UINT32) (EntrypointContext->StackBufferBase + EntrypointContext->StackBufferLength)
-    );  
-  
+    );
+
   //
   // Should never be here.