CpuException: Remove InitializeCpuInterruptHandlers

InitializeCpuExceptionHandlers() expects caller allocates IDT while
InitializeCpuInterruptHandlers() allocates 256 IDT entries itself.

InitializeCpuExceptionHandlers() fills max 32 IDT entries allocated
by caller. If caller allocates 10 entries, the API just fills 10 IDT
entries.

The inconsistency between the two APIs makes code hard to
unerstand and hard to share.

Because there is only one caller (CpuDxe) for
InitializeCpuInterruptHandler(), this patch updates CpuDxe driver
to allocates 256 IDT entries then call
InitializeCpuExceptionHandlers().

This is also a backward compatible change.

With this change, InitializeCpuInterruptHandlers() is removed
completely.

And InitializeCpuExceptionHandlers() fills max 32 entries for PEI
and SMM instance, max 256 entries for DXE instance.
Such behavior matches to the original one.

Signed-off-by: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>

1 files changed, 28 insertions, 5 deletions

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c
index 00f3cb0957..a6a91507f6 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.c
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.c
@@ -1,7 +1,7 @@
 /** @file

   CPU DXE Module to produce CPU ARCH Protocol.

 

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

+  Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -10,6 +10,8 @@
 #include "CpuMp.h"

 #include "CpuPageTable.h"

 

+#define CPU_INTERRUPT_NUM  256

+

 //

 // Global Variables

 //

@@ -924,9 +926,12 @@ InitInterruptDescriptorTable (
   VOID

   )

 {

-  EFI_STATUS               Status;

-  EFI_VECTOR_HANDOFF_INFO  *VectorInfoList;

-  EFI_VECTOR_HANDOFF_INFO  *VectorInfo;

+  EFI_STATUS                Status;

+  EFI_VECTOR_HANDOFF_INFO   *VectorInfoList;

+  EFI_VECTOR_HANDOFF_INFO   *VectorInfo;

+  IA32_IDT_GATE_DESCRIPTOR  *IdtTable;

+  IA32_DESCRIPTOR           IdtDescriptor;

+  UINTN                     IdtEntryCount;

 

   VectorInfo = NULL;

   Status     = EfiGetSystemConfigurationTable (&gEfiVectorHandoffTableGuid, (VOID **)&VectorInfoList);

@@ -934,7 +939,25 @@ InitInterruptDescriptorTable (
     VectorInfo = VectorInfoList;

   }

 

-  Status = InitializeCpuInterruptHandlers (VectorInfo);

+  AsmReadIdtr (&IdtDescriptor);

+  IdtEntryCount = (IdtDescriptor.Limit + 1) / sizeof (IA32_IDT_GATE_DESCRIPTOR);

+  if (IdtEntryCount < CPU_INTERRUPT_NUM) {

+    //

+    // Increase Interrupt Descriptor Table and Copy the old IDT table in

+    //

+    IdtTable = AllocateZeroPool (sizeof (IA32_IDT_GATE_DESCRIPTOR) * CPU_INTERRUPT_NUM);

+    ASSERT (IdtTable != NULL);

+    CopyMem (IdtTable, (VOID *)IdtDescriptor.Base, sizeof (IA32_IDT_GATE_DESCRIPTOR) * IdtEntryCount);

+

+    //

+    // Load Interrupt Descriptor Table

+    //

+    IdtDescriptor.Base  = (UINTN)IdtTable;

+    IdtDescriptor.Limit = (UINT16)(sizeof (IA32_IDT_GATE_DESCRIPTOR) * CPU_INTERRUPT_NUM - 1);

+    AsmWriteIdtr (&IdtDescriptor);

+  }

+

+  Status = InitializeCpuExceptionHandlers (VectorInfo);

   ASSERT_EFI_ERROR (Status);

 }