IntelFrameworkPkg UefiLib: Make the event empty function public

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Dispatcher / Dispatcher.c

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 75d6267f6143d6f1c191ae9fcc7d13caac116a4a..69c3b11c6afce8343350471cef77e97c9de3585b 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -26,7 +26,7 @@
   Depex - Dependency Expresion.\r
   SOR   - Schedule On Request - Don't schedule if this bit is set.\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -736,6 +736,8 @@ FvIsBeingProcesssed (
   LIST_ENTRY                            *Link;\r
   KNOWN_HANDLE                          *KnownHandle;\r
 \r
+  FwVolHeader = NULL;\r
+\r
   //\r
   // Get the FirmwareVolumeBlock protocol on that handle\r
   //\r
@@ -1036,39 +1038,48 @@ CoreProcessFvImageFile (
     //\r
     FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) Buffer;\r
     //\r
-    // Get FvHeader alignment\r
-    //\r
-    FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);\r
-    //\r
-    // FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value. \r
-    //\r
-    if (FvAlignment < 8) {\r
-      FvAlignment = 8;\r
-    }\r
-    //\r
-    // Allocate the aligned buffer for the FvImage.\r
+    // If EFI_FVB2_WEAK_ALIGNMENT is set in the volume header then the first byte of the volume\r
+    // can be aligned on any power-of-two boundary. A weakly aligned volume can not be moved from\r
+    // its initial linked location and maintain its alignment.\r
     //\r
-    AlignedBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), (UINTN) FvAlignment);\r
-    if (AlignedBuffer == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-    } else {\r
+    if ((FvHeader->Attributes & EFI_FVB2_WEAK_ALIGNMENT) != EFI_FVB2_WEAK_ALIGNMENT) {\r
       //\r
-      // Move FvImage into the aligned buffer and release the original buffer.\r
+      // Get FvHeader alignment\r
       //\r
-      CopyMem (AlignedBuffer, Buffer, BufferSize);\r
-      CoreFreePool (Buffer);\r
-      Buffer = NULL;\r
+      FvAlignment = 1 << ((FvHeader->Attributes & EFI_FVB2_ALIGNMENT) >> 16);\r
       //\r
-      // Produce a FVB protocol for the file\r
+      // FvAlignment must be greater than or equal to 8 bytes of the minimum FFS alignment value.\r
       //\r
-      Status = ProduceFVBProtocolOnBuffer (\r
-                (EFI_PHYSICAL_ADDRESS) (UINTN) AlignedBuffer,\r
-                (UINT64)BufferSize,\r
-                FvHandle,\r
-                AuthenticationStatus,\r
-                NULL\r
-                );\r
+      if (FvAlignment < 8) {\r
+        FvAlignment = 8;\r
+      }\r
+      //\r
+      // Allocate the aligned buffer for the FvImage.\r
+      //\r
+      AlignedBuffer = AllocateAlignedPages (EFI_SIZE_TO_PAGES (BufferSize), (UINTN) FvAlignment);\r
+      if (AlignedBuffer == NULL) {\r
+        FreePool (Buffer);\r
+        return EFI_OUT_OF_RESOURCES;\r
+      } else {\r
+        //\r
+        // Move FvImage into the aligned buffer and release the original buffer.\r
+        //\r
+        CopyMem (AlignedBuffer, Buffer, BufferSize);\r
+        FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) AlignedBuffer;\r
+        CoreFreePool (Buffer);\r
+        Buffer = NULL;\r
+      }\r
     }\r
+    //\r
+    // Produce a FVB protocol for the file\r
+    //\r
+    Status = ProduceFVBProtocolOnBuffer (\r
+              (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,\r
+              (UINT64)BufferSize,\r
+              FvHandle,\r
+              AuthenticationStatus,\r
+              NULL\r
+              );\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1133,6 +1144,8 @@ CoreFwVolEventProtocolNotify (
   VOID                          *DepexBuffer;\r
   KNOWN_HANDLE                  *KnownHandle;\r
 \r
+  FvHandle = NULL;\r
+\r
   while (TRUE) {\r
     BufferSize = sizeof (EFI_HANDLE);\r
     Status = CoreLocateHandle (\r
@@ -1235,29 +1248,6 @@ CoreFwVolEventProtocolNotify (
               continue;\r
             }\r
 \r
-            //\r
-            // Check if this EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE file has PEI depex section.\r
-            //\r
-            DepexBuffer  = NULL;\r
-            SizeOfBuffer = 0;\r
-            Status = Fv->ReadSection (\r
-                           Fv,\r
-                           &NameGuid,\r
-                           EFI_SECTION_PEI_DEPEX,\r
-                           0,\r
-                           &DepexBuffer,\r
-                           &SizeOfBuffer,\r
-                           &AuthenticationStatus\r
-                           );\r
-            if (!EFI_ERROR (Status)) {\r
-              //\r
-              // If PEI depex section is found, this FV image will be ignored in DXE phase.\r
-              // Now, DxeCore doesn't support FV image with more one type DEPEX section.\r
-              //\r
-              FreePool (DepexBuffer);\r
-              continue;\r
-            }\r
-\r
             //\r
             // Check if this EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE file has SMM depex section.\r
             //\r
@@ -1274,11 +1264,11 @@ CoreFwVolEventProtocolNotify (
                            );\r
             if (!EFI_ERROR (Status)) {\r
               //\r
-              // If SMM depex section is found, this FV image will be ignored in DXE phase.\r
-              // Now, DxeCore doesn't support FV image with more one type DEPEX section.\r
+              // If SMM depex section is found, this FV image is invalid to be supported.\r
+              // ASSERT FALSE to report this FV image.  \r
               //\r
               FreePool (DepexBuffer);\r
-              continue;\r
+              ASSERT (FALSE);\r
             }\r
 \r
             //\r