1. Introduced CPU Exception Handler Library to provide the CPU exception handlers and add one NULL library instance.

2. Updated DXE Core, BootScriptExecutorDxe and CapsuleX64Pei to consume CPU Exception Library to setup the default CPU Exception handlers.

Signed-off-by: vanjeff
Reviewed-by: jyao1


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13097 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 49 insertions, 7 deletions

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
index 0869c9d775..592d010517 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
@@ -4,7 +4,7 @@
 # This is a standalone Boot Script Executor. Standalone means it does not

 # depends on any PEI or DXE service.

 #

-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2012, 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

@@ -68,6 +68,7 @@
   UefiLib

   DebugAgentLib

   LockBoxLib

+  CpuExceptionHandlerLib

 

 [Guids]

   gEfiBootScriptExecutorVariableGuid

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
index 6a97b7790e..8e4b328db7 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h
@@ -4,7 +4,7 @@
   This driver is dispatched by Dxe core and the driver will reload itself to ACPI NVS memory 

   in the entry point. The functionality is to interpret and restore the S3 boot script 

   

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, 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

@@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiLib.h>

 #include <Library/DebugAgentLib.h>

 #include <Library/LockBoxLib.h>

+#include <Library/CpuExceptionHandlerLib.h>

 

 #include <Guid/AcpiS3Context.h>

 #include <Guid/BootScriptExecutorVariable.h>

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index f70f2f986f..975cf3a561 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
@@ -3,7 +3,7 @@
 

   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, 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

@@ -52,6 +52,16 @@ SetIdtEntry (
   // Restore IDT for debug

   //

   IdtDescriptor = (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProfile);

+  AsmWriteIdtr (IdtDescriptor);

+

+  //

+  // Setup the default CPU exception handlers

+  //

+  SetupCpuExceptionHandlers ();

+

+  //

+  // Update IDT entry INT3

+  //

   IdtEntry = (INTERRUPT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (3 * sizeof (INTERRUPT_GATE_DESCRIPTOR)));

   S3DebugBuffer = (UINTN) (AcpiS3Context->S3DebugBufferAddress);

 

@@ -62,6 +72,5 @@ SetIdtEntry (
   IdtEntry->Offset63To32    = (UINT32)(S3DebugBuffer >> 32);

   IdtEntry->Reserved        = 0;

 

-  AsmWriteIdtr (IdtDescriptor);

 }

 

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
index b12d3e57e4..6242cc69d0 100644
--- a/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
+++ b/MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
@@ -4,7 +4,7 @@
 # The X64 entrypoint to process capsule in long mode.

 # This module is built as X64.

 #

-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>

 #

 # This program and the accompanying materials

 # are licensed and made available under the terms and conditions

@@ -41,6 +41,7 @@
 [LibraryClasses]

   BaseLib

   DebugLib

+  CpuExceptionHandlerLib

 

 [Depex]

   FALSE

diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
index a4e44a4f5e..fa29e3dbfb 100644
--- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
+++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
@@ -1,7 +1,7 @@
 /** @file

   The X64 entrypoint is used to process capsule in long mode.

 

-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2011 - 2012, 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

@@ -13,8 +13,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/

 

 #include <Library/DebugLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/CpuExceptionHandlerLib.h>

 #include "CommonHeader.h"

 

+#define EXCEPTION_VECTOR_NUMBER     0x20

+

 /**

   The X64 entrypoint is used to process capsule in long mode then

   return to 32-bit protected mode.

@@ -32,7 +36,28 @@ _ModuleEntryPoint (
   SWITCH_64_TO_32_CONTEXT       *ReturnContext

 )

 {

-  EFI_STATUS    Status;

+  EFI_STATUS                    Status;

+  IA32_DESCRIPTOR               Ia32Idtr;

+  IA32_DESCRIPTOR               X64Idtr;

+  IA32_IDT_GATE_DESCRIPTOR      IdtEntryTable[EXCEPTION_VECTOR_NUMBER];

+

+  //

+  // Save the IA32 IDT Descriptor

+  //

+  AsmReadIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr); 

+

+  //

+  // Setup X64 IDT table

+  //

+  ZeroMem (IdtEntryTable, sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER);

+  X64Idtr.Base = (UINTN) IdtEntryTable;

+  X64Idtr.Limit = (UINT16) (sizeof (IA32_IDT_GATE_DESCRIPTOR) * EXCEPTION_VECTOR_NUMBER - 1);

+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &X64Idtr);  

+

+  //

+  // Setup the default CPU exception handlers

+  //

+  SetupCpuExceptionHandlers ();                

 

   //

   // Call CapsuleDataCoalesce to process capsule.

@@ -47,6 +72,11 @@ _ModuleEntryPoint (
   ReturnContext->ReturnStatus = Status;

 

   //

+  // Restore IA32 IDT table

+  //

+  AsmWriteIdtr ((IA32_DESCRIPTOR *) &Ia32Idtr);  

+  

+  //

   // Finish to coalesce capsule, and return to 32-bit mode.

   //

   AsmDisablePaging64 (