/** @file\r
CPU DXE Module.\r
\r
- Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2008 - 2011, 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
//\r
UINT32 mErrorCodeFlag = 0x00027d00;\r
\r
+//\r
+// Local function prototypes\r
+//\r
+\r
+/**\r
+ Set Interrupt Descriptor Table Handler Address.\r
+\r
+ @param Index The Index of the interrupt descriptor table handle.\r
+ @param Handler Handler address.\r
+\r
+**/\r
+VOID\r
+SetInterruptDescriptorTableHandlerAddress (\r
+ IN UINTN Index,\r
+ IN VOID *Handler OPTIONAL\r
+ );\r
+\r
//\r
// CPU Arch Protocol Functions\r
//\r
"!!!! IA32 Exception Type - %08x !!!!\n",\r
InterruptType\r
));\r
- if (mErrorCodeFlag & (1 << InterruptType)) {\r
+ if ((mErrorCodeFlag & (1 << InterruptType)) != 0) {\r
DEBUG ((\r
EFI_D_ERROR,\r
"ExceptionData - %08x\n",\r
"!!!! X64 Exception Type - %016lx !!!!\n",\r
(UINT64)InterruptType\r
));\r
- if (mErrorCodeFlag & (1 << InterruptType)) {\r
+ if ((mErrorCodeFlag & (1 << InterruptType)) != 0) {\r
DEBUG ((\r
EFI_D_ERROR,\r
"ExceptionData - %016lx\n",\r
return EFI_ALREADY_STARTED;\r
}\r
\r
+ SetInterruptDescriptorTableHandlerAddress ((UINTN)InterruptType, NULL);\r
ExternalVectorTable[InterruptType] = InterruptHandler;\r
return EFI_SUCCESS;\r
}\r
return EFI_UNSUPPORTED;\r
}\r
\r
- DEBUG((EFI_D_ERROR, "CpuAp: SetMemorySpaceAttributes(BA=%08x, Len=%08x, Attr=%08x)\n", BaseAddress, Length, Attributes));\r
-\r
//\r
// If this function is called because GCD SetMemorySpaceAttributes () is called\r
// by RefreshGcdMemoryAttributes (), then we are just synchronzing GCD memory\r
//\r
// call MTRR libary function\r
//\r
- DEBUG((EFI_D_ERROR, " MtrrSetMemoryAttribute()\n"));\r
- Status = MtrrSetMemoryAttribute(\r
+ Status = MtrrSetMemoryAttribute (\r
BaseAddress,\r
Length,\r
CacheType\r
);\r
\r
- MtrrDebugPrintAllMtrrs ();\r
-\r
return (EFI_STATUS) Status;\r
}\r
\r
}\r
\r
/**\r
- Gets GCD Mem Space type from MTRR Type\r
+ Gets GCD Mem Space type from MTRR Type.\r
\r
- This function gets GCD Mem Space type from MTRR Type\r
+ This function gets GCD Mem Space type from MTRR Type.\r
\r
- @param MtrrAttribute MTRR memory type\r
+ @param MtrrAttributes MTRR memory type\r
\r
@return GCD Mem Space type\r
\r
mIsFlushingGCD = FALSE;\r
}\r
\r
+/**\r
+ Set Interrupt Descriptor Table Handler Address.\r
+\r
+ @param Index The Index of the interrupt descriptor table handle.\r
+ @param Handler Handler address.\r
+\r
+**/\r
+VOID\r
+SetInterruptDescriptorTableHandlerAddress (\r
+ IN UINTN Index,\r
+ IN VOID *Handler OPTIONAL\r
+ )\r
+{\r
+ UINTN UintnHandler;\r
+\r
+ if (Handler != NULL) {\r
+ UintnHandler = (UINTN) Handler;\r
+ } else {\r
+ UintnHandler = ((UINTN) AsmIdtVector00) + (8 * Index);\r
+ }\r
+\r
+ gIdtTable[Index].Bits.OffsetLow = (UINT16)UintnHandler;\r
+ gIdtTable[Index].Bits.Reserved_0 = 0;\r
+ gIdtTable[Index].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r
+ gIdtTable[Index].Bits.OffsetHigh = (UINT16)(UintnHandler >> 16);\r
+#if defined (MDE_CPU_X64)\r
+ gIdtTable[Index].Bits.OffsetUpper = (UINT32)(UintnHandler >> 32);\r
+ gIdtTable[Index].Bits.Reserved_1 = 0;\r
+#endif\r
+}\r
+\r
\r
/**\r
Initialize Interrupt Descriptor Table for interrupt handling.\r
\r
**/\r
-STATIC\r
VOID\r
InitInterruptDescriptorTable (\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- VOID *IdtPtrAlignmentBuffer;\r
- IA32_DESCRIPTOR *IdtPtr;\r
- UINTN Index;\r
- UINTN CurrentHandler;\r
+ EFI_STATUS Status;\r
+ IA32_DESCRIPTOR OldIdtPtr;\r
+ IA32_IDT_GATE_DESCRIPTOR *OldIdt;\r
+ UINTN OldIdtSize;\r
+ VOID *IdtPtrAlignmentBuffer;\r
+ IA32_DESCRIPTOR *IdtPtr;\r
+ UINTN Index;\r
+ UINT16 CurrentCs;\r
+ VOID *IntHandler;\r
\r
SetMem (ExternalVectorTable, sizeof(ExternalVectorTable), 0);\r
\r
+ //\r
+ // Get original IDT address and size.\r
+ //\r
+ AsmReadIdtr ((IA32_DESCRIPTOR *) &OldIdtPtr);\r
+\r
+ if ((OldIdtPtr.Base != 0) && ((OldIdtPtr.Limit & 7) == 7)) {\r
+ OldIdt = (IA32_IDT_GATE_DESCRIPTOR*) OldIdtPtr.Base;\r
+ OldIdtSize = (OldIdtPtr.Limit + 1) / sizeof (IA32_IDT_GATE_DESCRIPTOR);\r
+ } else {\r
+ OldIdt = NULL;\r
+ OldIdtSize = 0;\r
+ }\r
+\r
//\r
// Intialize IDT\r
//\r
- CurrentHandler = (UINTN)AsmIdtVector00;\r
- for (Index = 0; Index < INTERRUPT_VECTOR_NUMBER; Index ++, CurrentHandler += 0x08) {\r
- gIdtTable[Index].Bits.OffsetLow = (UINT16)CurrentHandler;\r
- gIdtTable[Index].Bits.Selector = AsmReadCs();\r
- gIdtTable[Index].Bits.Reserved_0 = 0;\r
- gIdtTable[Index].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r
- gIdtTable[Index].Bits.OffsetHigh = (UINT16)(CurrentHandler >> 16);\r
+ CurrentCs = AsmReadCs();\r
+ for (Index = 0; Index < INTERRUPT_VECTOR_NUMBER; Index ++) {\r
+ //\r
+ // If the old IDT had a handler for this interrupt, then\r
+ // preserve it.\r
+ //\r
+ if (Index < OldIdtSize) {\r
+ IntHandler = \r
+ (VOID*) (\r
+ OldIdt[Index].Bits.OffsetLow +\r
+ (OldIdt[Index].Bits.OffsetHigh << 16)\r
#if defined (MDE_CPU_X64)\r
- gIdtTable[Index].Bits.OffsetUpper = (UINT32)(CurrentHandler >> 32);\r
- gIdtTable[Index].Bits.Reserved_1 = 0;\r
+ + (((UINTN) OldIdt[Index].Bits.OffsetUpper) << 32)\r
#endif\r
+ );\r
+ } else {\r
+ IntHandler = NULL;\r
+ }\r
+\r
+ gIdtTable[Index].Bits.Selector = CurrentCs;\r
+ gIdtTable[Index].Bits.Reserved_0 = 0;\r
+ gIdtTable[Index].Bits.GateType = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r
+ SetInterruptDescriptorTableHandlerAddress (Index, IntHandler);\r
}\r
\r
//\r
IdtPtrAlignmentBuffer = AllocatePool (sizeof (*IdtPtr) + 16);\r
IdtPtr = ALIGN_POINTER (IdtPtrAlignmentBuffer, 16);\r
IdtPtr->Base = (UINT32)(((UINTN)(VOID*) gIdtTable) & (BASE_4GB-1));\r
- IdtPtr->Limit = sizeof (gIdtTable) - 1;\r
+ IdtPtr->Limit = (UINT16) (sizeof (gIdtTable) - 1);\r
\r
AsmWriteIdtr (IdtPtr);\r
\r
projects / mirror_edk2.git / blobdiff