X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFsp2WrapperPkg%2FFspWrapperNotifyDxe%2FLoadBelow4G.c;h=ebfeb67ec77428828a13d5a78f32c41406b17d18;hp=c073703a1bcefd217b84407f27a7a8634387f7ee;hb=HEAD;hpb=cf1d454983fb4fd3b580a92bd242310467a5eaef

diff --git a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
index c073703a1b..97723aad65 100644
--- a/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
+++ b/IntelFsp2WrapperPkg/FspWrapperNotifyDxe/LoadBelow4G.c
@@ -1,15 +1,8 @@
 /** @file
 
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2017, 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 which accompanies this distribution.  The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -36,18 +29,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 EFI_STATUS
 RelocateImageUnder4GIfNeeded (
-  IN EFI_HANDLE           ImageHandle,
-  IN EFI_SYSTEM_TABLE     *SystemTable
+  IN EFI_HANDLE        ImageHandle,
+  IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
-  EFI_STATUS                                    Status;
-  UINT8                                         *Buffer;
-  UINTN                                         BufferSize;
-  EFI_HANDLE                                    NewImageHandle;
-  UINTN                                         Pages;
-  EFI_PHYSICAL_ADDRESS                          FfsBuffer;
-  PE_COFF_LOADER_IMAGE_CONTEXT                  ImageContext;
-  VOID                                          *Interface;
+  EFI_STATUS                    Status;
+  UINT8                         *Buffer;
+  UINTN                         BufferSize;
+  EFI_HANDLE                    NewImageHandle;
+  UINTN                         Pages;
+  EFI_PHYSICAL_ADDRESS          FfsBuffer;
+  PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;
+  VOID                          *Interface;
 
   //
   // If it is already <4G, no need do relocate
@@ -71,22 +64,22 @@ RelocateImageUnder4GIfNeeded (
   // Here we install a dummy handle
   //
   NewImageHandle = NULL;
-  Status = gBS->InstallProtocolInterface (
-                  &NewImageHandle,
-                  &gEfiCallerIdGuid,
-                  EFI_NATIVE_INTERFACE,
-                  NULL
-                  );
+  Status         = gBS->InstallProtocolInterface (
+                          &NewImageHandle,
+                          &gEfiCallerIdGuid,
+                          EFI_NATIVE_INTERFACE,
+                          NULL
+                          );
   ASSERT_EFI_ERROR (Status);
 
   //
   // Reload image itself to <4G mem
   //
-  Status = GetSectionFromAnyFv  (
+  Status = GetSectionFromAnyFv (
              &gEfiCallerIdGuid,
              EFI_SECTION_PE32,
              0,
-             (VOID **) &Buffer,
+             (VOID **)&Buffer,
              &BufferSize
              );
   ASSERT_EFI_ERROR (Status);
@@ -98,24 +91,25 @@ RelocateImageUnder4GIfNeeded (
   Status = PeCoffLoaderGetImageInfo (&ImageContext);
   ASSERT_EFI_ERROR (Status);
   if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) {
-    Pages = EFI_SIZE_TO_PAGES ((UINTN) (ImageContext.ImageSize + ImageContext.SectionAlignment));
+    Pages = EFI_SIZE_TO_PAGES ((UINTN)(ImageContext.ImageSize + ImageContext.SectionAlignment));
   } else {
-    Pages = EFI_SIZE_TO_PAGES ((UINTN) ImageContext.ImageSize);
+    Pages = EFI_SIZE_TO_PAGES ((UINTN)ImageContext.ImageSize);
   }
+
   FfsBuffer = 0xFFFFFFFF;
-  Status = gBS->AllocatePages (
-                  AllocateMaxAddress,
-                  EfiBootServicesCode,
-                  Pages,
-                  &FfsBuffer
-                  );
+  Status    = gBS->AllocatePages (
+                     AllocateMaxAddress,
+                     EfiBootServicesCode,
+                     Pages,
+                     &FfsBuffer
+                     );
   ASSERT_EFI_ERROR (Status);
   ImageContext.ImageAddress = (PHYSICAL_ADDRESS)(UINTN)FfsBuffer;
   //
-  // Align buffer on section boundry
+  // Align buffer on section boundary
   //
   ImageContext.ImageAddress += ImageContext.SectionAlignment - 1;
-  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)(ImageContext.SectionAlignment - 1));
+  ImageContext.ImageAddress &= ~((EFI_PHYSICAL_ADDRESS)ImageContext.SectionAlignment - 1);
   //
   // Load the image to our new buffer
   //
@@ -139,7 +133,7 @@ RelocateImageUnder4GIfNeeded (
   InvalidateInstructionCacheRange ((VOID *)(UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.ImageSize);
 
   DEBUG ((DEBUG_INFO, "Loading driver at 0x%08x EntryPoint=0x%08x\n", (UINTN)ImageContext.ImageAddress, (UINTN)ImageContext.EntryPoint));
-  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint)) (NewImageHandle, gST);
+  Status = ((EFI_IMAGE_ENTRY_POINT)(UINTN)(ImageContext.EntryPoint))(NewImageHandle, gST);
   if (EFI_ERROR (Status)) {
     DEBUG ((DEBUG_ERROR, "Error: Image at 0x%08x start failed: %r\n", ImageContext.ImageAddress, Status));
     gBS->FreePages (FfsBuffer, Pages);