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

13 files changed, 157 insertions, 12 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index cf65c1526b..48a57df650 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -2,7 +2,7 @@
   The internal header file includes the common header files, defines

   internal structure and functions used by DxeCore module.

 

-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

 which accompanies this distribution.  The full text of the license may be found at

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

 #include <Library/DxeServicesLib.h>

 #include <Library/DebugAgentLib.h>

+#include <Library/CpuExceptionHandlerLib.h>

 

 

 //

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index 6bdab9058d..dda17aea04 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -2,7 +2,7 @@
 #  This is core module in DXE phase. It provides an implementation of DXE Core that is

 #  compliant with DXE CIS.  

 #  

-#  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

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -92,6 +92,7 @@
   TimerLib

   DxeServicesLib

   DebugAgentLib

+  CpuExceptionHandlerLib

 

 [Guids]

   gEfiEventMemoryMapChangeGuid                  ## CONSUMES ## Event

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 3d3c3ef6ff..84a3583a6b 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file

   DXE Core Main Entry Point

 

-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

 which accompanies this distribution.  The full text of the license may be found at

@@ -243,6 +243,11 @@ DxeMain (
   PE_COFF_LOADER_IMAGE_CONTEXT  ImageContext;

 

   //

+  // Setup the default exception handlers

+  //

+  SetupCpuExceptionHandlers ();

+  

+  //

   // Initialize Debug Agent to support source level debug in DXE phase

   //

   InitializeDebugAgent (DEBUG_AGENT_INIT_DXE_CORE, HobStart, NULL);

diff --git a/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
new file mode 100644
index 0000000000..6be32b2326
--- /dev/null
+++ b/MdeModulePkg/Include/Library/CpuExceptionHandlerLib.h
@@ -0,0 +1,28 @@
+/** @file

+  CPU Exception library provides the CPU exception handler.

+

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

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#ifndef __CPU_EXCEPTION_LIB_H__

+#define __CPU_EXCEPTION_LIB_H__

+

+/**

+  Setup CPU exception handlers.

+ 

+**/

+VOID

+EFIAPI

+SetupCpuExceptionHandlers (

+  VOID

+  );

+

+#endif

diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
new file mode 100644
index 0000000000..3dd9da8b85
--- /dev/null
+++ b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.c
@@ -0,0 +1,27 @@
+/** @file

+  CPU Exception Handler library implementition with empty functions.

+

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

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+

+/**

+  Setup CPU exception handlers.

+ 

+**/

+VOID

+EFIAPI

+SetupCpuExceptionHandlers (

+  VOID

+  )

+{  

+}

+

diff --git a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
new file mode 100644
index 0000000000..47e55feee3
--- /dev/null
+++ b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
@@ -0,0 +1,35 @@
+## @file

+# Null instance of CPU Exception Handler Library with empty functions.

+#

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

+#  http://opensource.org/licenses/bsd-license.php

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

+#

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = CpuExceptionHandlerLibNull

+  FILE_GUID                      = 3175E6B9-4B01-496a-9A2B-64AF02D87E34

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = CpuExceptionHandlerLib

+

+#

+# The following information is for reference only and not required by the build tools.

+#

+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

+#

+

+[Sources.common]

+  CpuExceptionHandlerLibNull.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

+

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index b65e98841c..7facc06379 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -4,7 +4,7 @@
 # It also provides the defintions(including PPIs/PROTOCOLs/GUIDs and library classes)

 # and libraries instances, which are used for those modules.

 #

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

+# Copyright (c) 2007 - 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 that accompanies this distribution.  

 # The full text of the license may be found at

@@ -94,6 +94,10 @@
   #

   LockBoxLib|Include/Library/LockBoxLib.h

   

+  ##  @libraryclass  Provide the CPU exception handler.

+  #

+  CpuExceptionHandlerLib|Include/Library/CpuExceptionHandlerLib.h

+  

 [Guids]

   ## MdeModule package token space guid

   # Include/Guid/MdeModulePkgTokenSpace.h

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 215600dab7..835f621b69 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -1,7 +1,7 @@
 ## @file

 # EFI/PI Reference Module Package for All Architectures

 #

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

+# Copyright (c) 2007 - 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

@@ -89,6 +89,7 @@
   ResetSystemLib|MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf

   SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf

   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

+  CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

 

 [LibraryClasses.EBC.PEIM]

   IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf

@@ -245,6 +246,7 @@
   MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf

   MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf

   MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf

+  MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

 

   MdeModulePkg/Universal/CapsulePei/CapsulePei.inf

   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

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 (