roll back IDT_ENTRY counter to 32

[mirror_edk2.git] / MdeModulePkg / Core / DxeIplPeim / Ia32 / DxeLoadFunc.c

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index 83ffc91ba0362bc90dc5c0527c5cb6aae53b3580..8c5b37ced8685e6505d1e4e39d5b185712f3b26c 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Ia32-specific functionality for DxeLoad.\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
@@ -15,12 +15,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "DxeIpl.h"\r
 #include "VirtualMemory.h"\r
 \r
+#define IDT_ENTRY_COUNT       32\r
+\r
 //\r
 // Global Descriptor Table (GDT)\r
 //\r
 GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT gGdtEntries[] = {\r
-/* selector { Global Segment Descriptor                              } */  \r
-/* 0x00 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //null descriptor \r
+/* selector { Global Segment Descriptor                              } */\r
+/* 0x00 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //null descriptor\r
 /* 0x08 */  {{0xffff, 0,  0,  0x2,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear data segment descriptor\r
 /* 0x10 */  {{0xffff, 0,  0,  0xf,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear code segment descriptor\r
 /* 0x18 */  {{0xffff, 0,  0,  0x3,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system data segment descriptor\r
@@ -40,7 +42,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST IA32_DESCRIPTOR gGdt = {
   };\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED  IA32_DESCRIPTOR gLidtDescriptor = {\r
-  sizeof (X64_IDT_GATE_DESCRIPTOR) * 32 - 1,\r
+  sizeof (X64_IDT_GATE_DESCRIPTOR) * IDT_ENTRY_COUNT - 1,\r
   0\r
 };\r
 \r
@@ -73,16 +75,16 @@ HandOffToDxeCore (
 \r
   Status = PeiServicesAllocatePages (EfiBootServicesData, EFI_SIZE_TO_PAGES (STACK_SIZE), &BaseOfStack);\r
   ASSERT_EFI_ERROR (Status);\r
-  \r
+\r
   if (FeaturePcdGet(PcdDxeIplSwitchToLongMode)) {\r
     //\r
-    // Compute the top of the stack we were allocated, which is used to load X64 dxe core. \r
+    // Compute the top of the stack we were allocated, which is used to load X64 dxe core.\r
     // Pre-allocate a 32 bytes which confroms to x64 calling convention.\r
     //\r
-    // The first four parameters to a function are passed in rcx, rdx, r8 and r9. \r
-    // Any further parameters are pushed on the stack. Furthermore, space (4 * 8bytes) for the \r
-    // register parameters is reserved on the stack, in case the called function \r
-    // wants to spill them; this is important if the function is variadic. \r
+    // The first four parameters to a function are passed in rcx, rdx, r8 and r9.\r
+    // Any further parameters are pushed on the stack. Furthermore, space (4 * 8bytes) for the\r
+    // register parameters is reserved on the stack, in case the called function\r
+    // wants to spill them; this is important if the function is variadic.\r
     //\r
     TopOfStack = BaseOfStack + EFI_SIZE_TO_PAGES (STACK_SIZE) * EFI_PAGE_SIZE - 32;\r
 \r
@@ -93,7 +95,7 @@ HandOffToDxeCore (
 \r
     //\r
     // Load the GDT of Go64. Since the GDT of 32-bit Tiano locates in the BS_DATA\r
-    // memory, it may be corrupted when copying FV to high-end memory \r
+    // memory, it may be corrupted when copying FV to high-end memory\r
     //\r
     AsmWriteGdtr (&gGdt);\r
     //\r
@@ -106,25 +108,25 @@ HandOffToDxeCore (
     //\r
     Status = PeiServicesInstallPpi (&gEndOfPeiSignalPpi);\r
     ASSERT_EFI_ERROR (Status);\r
-    \r
+\r
     AsmWriteCr3 (PageTables);\r
 \r
     //\r
     // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
-    //    \r
+    //\r
     UpdateStackHob (BaseOfStack, STACK_SIZE);\r
 \r
     SizeOfTemplate = AsmGetVectorTemplatInfo (&TemplateBase);\r
 \r
     Status = PeiServicesAllocatePages (\r
-               EfiBootServicesData, \r
-               EFI_SIZE_TO_PAGES((SizeOfTemplate + sizeof (X64_IDT_GATE_DESCRIPTOR)) * 32), \r
+               EfiBootServicesData,\r
+               EFI_SIZE_TO_PAGES((SizeOfTemplate + sizeof (X64_IDT_GATE_DESCRIPTOR)) * IDT_ENTRY_COUNT),\r
                &VectorAddress\r
                );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    IdtTable      = (X64_IDT_GATE_DESCRIPTOR *) (UINTN) (VectorAddress + SizeOfTemplate * 32);\r
-    for (Index = 0; Index < 32; Index++) {\r
+    IdtTable      = (X64_IDT_GATE_DESCRIPTOR *) (UINTN) (VectorAddress + SizeOfTemplate * IDT_ENTRY_COUNT);\r
+    for (Index = 0; Index < IDT_ENTRY_COUNT; Index++) {\r
       IdtTable[Index].Ia32IdtEntry.Bits.GateType    =  0x8e;\r
       IdtTable[Index].Ia32IdtEntry.Bits.Reserved_0  =  0;\r
       IdtTable[Index].Ia32IdtEntry.Bits.Selector    =  SYS_CODE64_SEL;\r
@@ -141,14 +143,19 @@ HandOffToDxeCore (
     }\r
 \r
     gLidtDescriptor.Base = (UINTN) IdtTable;\r
+\r
+    //\r
+    // Disable interrupt of Debug timer, since new IDT table cannot handle it.\r
+    //\r
+    SaveAndSetDebugTimerInterrupt (FALSE);\r
+\r
     AsmWriteIdtr (&gLidtDescriptor);\r
 \r
-      \r
     //\r
     // Go to Long Mode and transfer control to DxeCore.\r
     // Interrupts will not get turned on until the CPU AP is loaded.\r
     // Call x64 drivers passing in single argument, a pointer to the HOBs.\r
-    // \r
+    //\r
     AsmEnablePaging64 (\r
       SYS_CODE64_SEL,\r
       DxeCoreEntryPoint,\r
@@ -172,9 +179,9 @@ HandOffToDxeCore (
 \r
     //\r
     // Update the contents of BSP stack HOB to reflect the real stack info passed to DxeCore.\r
-    //    \r
+    //\r
     UpdateStackHob (BaseOfStack, STACK_SIZE);\r
-    \r
+\r
     //\r
     // Transfer the control to the entry point of DxeCore.\r
     //\r
@@ -184,6 +191,6 @@ HandOffToDxeCore (
       NULL,\r
       (VOID *) (UINTN) TopOfStack\r
       );\r
-  } \r
+  }\r
 }\r
 \r