Cleanup HOB DEBUG prints

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 6ca7eb515b379bba23898d86a6f9aa4ca40ae7ec..77c4227c30939f0da943a5ae4d8c8bc4c2e397d9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   DXE Core Main Entry Point\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2006 - 2010, Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -29,6 +29,11 @@ EFI_TIMER_ARCH_PROTOCOL           *gTimer         = NULL;
 EFI_BDS_ARCH_PROTOCOL             *gBds           = NULL;\r
 EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *gWatchdogTimer = NULL;\r
 \r
+//\r
+// DXE Core globals for optional protocol dependencies\r
+//\r
+EFI_SMM_BASE2_PROTOCOL            *gSmmBase2      = NULL;\r
+\r
 //\r
 // DXE Core Global used to update core loaded image protocol handle\r
 //\r
@@ -210,6 +215,11 @@ EFI_DECOMPRESS_PROTOCOL  gEfiDecompress = {
 };\r
 \r
 //\r
+// For Loading modules at fixed address feature, the configuration table is to cache the top address below which to load \r
+// Runtime code&boot time code \r
+//\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    gLoadModuleAtFixAddressConfigurationTable = {0, 0};\r
+\r
 // Main entry point to the DXE Core\r
 //\r
 \r
@@ -258,8 +268,8 @@ DxeMain (
   // Call constructor for all libraries\r
   //\r
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST);\r
-  PERF_END   (0,"PEI", NULL, 0) ;\r
-  PERF_START (0,"DXE", NULL, 0) ;\r
+  PERF_END   (NULL,"PEI", NULL, 0) ;\r
+  PERF_START (NULL,"DXE", NULL, 0) ;\r
 \r
   //\r
   // Initialize the Global Coherency Domain Services\r
@@ -284,13 +294,22 @@ DxeMain (
   //\r
   Status = CoreInstallConfigurationTable (&gEfiMemoryTypeInformationGuid, &gMemoryTypeInformation);\r
   ASSERT_EFI_ERROR (Status);\r
-\r
+  \r
+  //\r
+  // If Loading modules At fixed address feature is enabled, install Load moduels at fixed address \r
+  // Configuration Table so that user could easily to retrieve the top address to load Dxe and PEI\r
+  // Code and Tseg base to load SMM driver. \r
+  //\r
+  if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
+    Status = CoreInstallConfigurationTable (&gLoadFixedAddressConfigurationTableGuid, &gLoadModuleAtFixAddressConfigurationTable);\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
   //\r
   // Report Status Code here for DXE_ENTRY_POINT once it is available\r
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32(PcdStatusCodeValueDxeCoreEntry)\r
+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT)\r
     );\r
 \r
   //\r
@@ -307,6 +326,26 @@ DxeMain (
 \r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "HOBLIST address in DXE = 0x%p\n", HobStart));\r
 \r
+  DEBUG_CODE_BEGIN ();\r
+    EFI_PEI_HOB_POINTERS               Hob;\r
+\r
+    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Memory Allocation 0x%08x 0x%0lx - 0x%0lx\n", \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryType,                      \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress,               \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress + Hob.MemoryAllocation->AllocDescriptor.MemoryLength - 1));\r
+      }\r
+    }\r
+    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV2 Hob           0x%0lx - 0x%0lx\n", Hob.FirmwareVolume2->BaseAddress, Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1));\r
+      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV Hob            0x%0lx - 0x%0lx\n", Hob.FirmwareVolume->BaseAddress, Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume2->Length - 1));\r
+      }\r
+    }\r
+  DEBUG_CODE_END ();\r
+\r
   //\r
   // Initialize the Event Services\r
   //\r
@@ -339,8 +378,9 @@ DxeMain (
   //\r
   // Register for the GUIDs of the Architectural Protocols, so the rest of the\r
   // EFI Boot Services and EFI Runtime Services tables can be filled in.\r
+  // Also register for the GUIDs of optional protocols.\r
   //\r
-  CoreNotifyOnArchProtocolInstallation ();\r
+  CoreNotifyOnProtocolInstallation ();\r
 \r
   //\r
   // Produce Firmware Volume Protocols, one for each FV in the HOB list.\r
@@ -360,16 +400,16 @@ DxeMain (
   //\r
   // Initialize the DXE Dispatcher\r
   //\r
-  PERF_START (0,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
+  PERF_START (NULL,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
   CoreInitializeDispatcher ();\r
-  PERF_END (0,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
+  PERF_END (NULL,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
 \r
   //\r
   // Invoke the DXE Dispatcher\r
   //\r
-  PERF_START (0, "CoreDispatcher", "DxeMain", 0);\r
+  PERF_START (NULL, "CoreDispatcher", "DxeMain", 0);\r
   CoreDispatcher ();\r
-  PERF_END (0, "CoreDispatcher", "DxeMain", 0);\r
+  PERF_END (NULL, "CoreDispatcher", "DxeMain", 0);\r
 \r
   //\r
   // Display Architectural protocols that were not loaded if this is DEBUG build\r
@@ -396,7 +436,7 @@ DxeMain (
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueDxeCoreHandoffToBds)\r
+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)\r
     );\r
 \r
   //\r
@@ -631,14 +671,14 @@ CoreExitBootServices (
   }\r
 \r
   //\r
-  // Notify other drivers that we are exiting boot services.\r
+  // Disable Timer\r
   //\r
-  CoreNotifySignalList (&gEfiEventExitBootServicesGuid);\r
+  gTimer->SetTimerPeriod (gTimer, 0);\r
 \r
   //\r
-  // Disable Timer\r
+  // Notify other drivers that we are exiting boot services.\r
   //\r
-  gTimer->SetTimerPeriod (gTimer, 0);\r
+  CoreNotifySignalList (&gEfiEventExitBootServicesGuid);\r
 \r
   //\r
   // Disable CPU Interrupts\r
@@ -650,7 +690,7 @@ CoreExitBootServices (
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueBootServiceExit)\r
+    (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)\r
     );\r
 \r
   //\r