public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64
@ 2022-07-12  9:30 Kuo, Ted
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct Kuo, Ted
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Kuo, Ted @ 2022-07-12  9:30 UTC (permalink / raw)
  To: devel

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
The reserved IDT table size in SecCore is too small for X64. Changed the type
of IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to have
sufficient size reserved in IdtTable for X64.

Ted Kuo (2):
  UefiCpuPkg: Update SEC_IDT_TABLE struct
  IntelFsp2Pkg: Update SEC_IDT_TABLE struct

 IntelFsp2Pkg/FspSecCore/SecFsp.c  |  9 +++++----
 IntelFsp2Pkg/FspSecCore/SecFsp.h  |  2 +-
 IntelFsp2Pkg/FspSecCore/SecMain.c | 16 ++++++++--------
 IntelFsp2Pkg/FspSecCore/SecMain.h |  4 ++--
 UefiCpuPkg/SecCore/SecMain.c      |  1 +
 UefiCpuPkg/SecCore/SecMain.h      |  4 ++--
 6 files changed, 19 insertions(+), 17 deletions(-)

-- 
2.35.3.windows.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct
  2022-07-12  9:30 [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Kuo, Ted
@ 2022-07-12  9:30 ` Kuo, Ted
  2022-07-13  1:39   ` Ni, Ray
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: " Kuo, Ted
  2022-07-14 18:38 ` [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Chiu, Chasel
  2 siblings, 1 reply; 6+ messages in thread
From: Kuo, Ted @ 2022-07-12  9:30 UTC (permalink / raw)
  To: devel
  Cc: Chasel Chiu, Nate DeSimone, Ray Ni, Ashraf Ali S, Debkumar De,
	Harry Han, Catharine West

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
The reserved IDT table size in SecCore is too small for X64. Changed the type
of IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to have
sufficient size reserved in IdtTable for X64. dff

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Signed-off-by: Ted Kuo <ted.kuo@intel.com>
---
 UefiCpuPkg/SecCore/SecMain.c | 1 +
 UefiCpuPkg/SecCore/SecMain.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/UefiCpuPkg/SecCore/SecMain.c b/UefiCpuPkg/SecCore/SecMain.c
index 4edf0ce972..fe03d8019a 100644
--- a/UefiCpuPkg/SecCore/SecMain.c
+++ b/UefiCpuPkg/SecCore/SecMain.c
@@ -211,6 +211,7 @@ SecStartup (
 
   IdtTableInStack.PeiService = 0;
   for (Index = 0; Index < SEC_IDT_ENTRY_COUNT; Index++) {
+    ZeroMem ((VOID *)&IdtTableInStack.IdtTable[Index], sizeof (IA32_IDT_GATE_DESCRIPTOR));
     CopyMem ((VOID *)&IdtTableInStack.IdtTable[Index], (VOID *)&mIdtEntryTemplate, sizeof (UINT64));
   }
 
diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h
index 189fcf9326..1be57c2248 100644
--- a/UefiCpuPkg/SecCore/SecMain.h
+++ b/UefiCpuPkg/SecCore/SecMain.h
@@ -43,8 +43,8 @@ typedef struct _SEC_IDT_TABLE {
   // Note: For IA32, only the 4 bytes immediately preceding IDT is used to store
   // EFI_PEI_SERVICES**
   //
-  UINT64    PeiService;
-  UINT64    IdtTable[SEC_IDT_ENTRY_COUNT];
+  UINT64                    PeiService;
+  IA32_IDT_GATE_DESCRIPTOR  IdtTable[SEC_IDT_ENTRY_COUNT];
 } SEC_IDT_TABLE;
 
 /**
-- 
2.35.3.windows.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: Update SEC_IDT_TABLE struct
  2022-07-12  9:30 [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Kuo, Ted
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct Kuo, Ted
@ 2022-07-12  9:30 ` Kuo, Ted
  2022-07-12 18:34   ` Chiu, Chasel
  2022-07-14 18:38 ` [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Chiu, Chasel
  2 siblings, 1 reply; 6+ messages in thread
From: Kuo, Ted @ 2022-07-12  9:30 UTC (permalink / raw)
  To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng, Ashraf Ali S

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
The reserved IDT table size in SecCore is too small for X64. Changed the type
of IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to have
sufficient size reserved in IdtTable for X64.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
Signed-off-by: Ted Kuo <ted.kuo@intel.com>
---
 IntelFsp2Pkg/FspSecCore/SecFsp.c  |  9 +++++----
 IntelFsp2Pkg/FspSecCore/SecFsp.h  |  2 +-
 IntelFsp2Pkg/FspSecCore/SecMain.c | 16 ++++++++--------
 IntelFsp2Pkg/FspSecCore/SecMain.h |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index 7fde6e7f41..e9b4091b20 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -16,19 +16,20 @@
   @return                     FSP specific IDT gate descriptor.
 
 **/
-UINT64
+IA32_IDT_GATE_DESCRIPTOR
 FspGetExceptionHandler (
   IN  UINT64  IdtEntryTemplate
   )
 {
   UINT32                    Entry;
-  UINT64                    ExceptionHandler;
+  IA32_IDT_GATE_DESCRIPTOR  ExceptionHandler;
   IA32_IDT_GATE_DESCRIPTOR  *IdtGateDescriptor;
   FSP_INFO_HEADER           *FspInfoHeader;
 
+  ZeroMem ((VOID *)&ExceptionHandler, sizeof (IA32_IDT_GATE_DESCRIPTOR));
   FspInfoHeader                      = (FSP_INFO_HEADER *)(UINTN)AsmGetFspInfoHeader ();
-  ExceptionHandler                   = IdtEntryTemplate;
-  IdtGateDescriptor                  = (IA32_IDT_GATE_DESCRIPTOR *)&ExceptionHandler;
+  *(UINT64 *)&ExceptionHandler       = IdtEntryTemplate;
+  IdtGateDescriptor                  = &ExceptionHandler;
   Entry                              = (IdtGateDescriptor->Bits.OffsetHigh << 16) | IdtGateDescriptor->Bits.OffsetLow;
   Entry                              = FspInfoHeader->ImageBase + FspInfoHeader->ImageSize - (~Entry + 1);
   IdtGateDescriptor->Bits.OffsetHigh = (UINT16)(Entry >> 16);
diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.h b/IntelFsp2Pkg/FspSecCore/SecFsp.h
index 41931a33dd..e84528b378 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
@@ -30,7 +30,7 @@
   @return                     FSP specific IDT gate descriptor.
 
 **/
-UINT64
+IA32_IDT_GATE_DESCRIPTOR
 FspGetExceptionHandler (
   IN  UINT64  IdtEntryTemplate
   );
diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.c b/IntelFsp2Pkg/FspSecCore/SecMain.c
index 8effe2225c..94ea3865b4 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.c
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.c
@@ -58,13 +58,13 @@ SecStartup (
   IN UINT32          ApiIdx
   )
 {
-  EFI_SEC_PEI_HAND_OFF  SecCoreData;
-  IA32_DESCRIPTOR       IdtDescriptor;
-  SEC_IDT_TABLE         IdtTableInStack;
-  UINT32                Index;
-  FSP_GLOBAL_DATA       PeiFspData;
-  UINT64                ExceptionHandler;
-  UINTN                 IdtSize;
+  EFI_SEC_PEI_HAND_OFF      SecCoreData;
+  IA32_DESCRIPTOR           IdtDescriptor;
+  SEC_IDT_TABLE             IdtTableInStack;
+  UINT32                    Index;
+  FSP_GLOBAL_DATA           PeiFspData;
+  IA32_IDT_GATE_DESCRIPTOR  ExceptionHandler;
+  UINTN                     IdtSize;
 
   //
   // Process all libraries constructor function linked to SecCore.
@@ -119,7 +119,7 @@ SecStartup (
   if (IdtDescriptor.Base == 0) {
     ExceptionHandler = FspGetExceptionHandler (mIdtEntryTemplate);
     for (Index = 0; Index < FixedPcdGet8 (PcdFspMaxInterruptSupported); Index++) {
-      CopyMem ((VOID *)&IdtTableInStack.IdtTable[Index], (VOID *)&ExceptionHandler, sizeof (UINT64));
+      CopyMem ((VOID *)&IdtTableInStack.IdtTable[Index], (VOID *)&ExceptionHandler, sizeof (IA32_IDT_GATE_DESCRIPTOR));
     }
 
     IdtSize = sizeof (IdtTableInStack.IdtTable);
diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h b/IntelFsp2Pkg/FspSecCore/SecMain.h
index 7c2642ad48..1fe7c15aeb 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.h
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
@@ -38,8 +38,8 @@ typedef struct _SEC_IDT_TABLE {
   // Note: For IA32, only the 4 bytes immediately preceding IDT is used to store
   // EFI_PEI_SERVICES**
   //
-  UINT64    PeiService;
-  UINT64    IdtTable[FixedPcdGet8 (PcdFspMaxInterruptSupported)];
+  UINT64                    PeiService;
+  IA32_IDT_GATE_DESCRIPTOR  IdtTable[FixedPcdGet8 (PcdFspMaxInterruptSupported)];
 } SEC_IDT_TABLE;
 
 /**
-- 
2.35.3.windows.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: Update SEC_IDT_TABLE struct
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: " Kuo, Ted
@ 2022-07-12 18:34   ` Chiu, Chasel
  0 siblings, 0 replies; 6+ messages in thread
From: Chiu, Chasel @ 2022-07-12 18:34 UTC (permalink / raw)
  To: Kuo, Ted, devel@edk2.groups.io
  Cc: Desimone, Nathaniel L, Zeng, Star, S, Ashraf Ali


Thanks for updating!
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>


> -----Original Message-----
> From: Kuo, Ted <ted.kuo@intel.com>
> Sent: Tuesday, July 12, 2022 2:31 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>; S, Ashraf
> Ali <ashraf.ali.s@intel.com>
> Subject: [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: Update SEC_IDT_TABLE
> struct
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
> The reserved IDT table size in SecCore is too small for X64. Changed the type of
> IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to
> have sufficient size reserved in IdtTable for X64.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
> Signed-off-by: Ted Kuo <ted.kuo@intel.com>
> ---
>  IntelFsp2Pkg/FspSecCore/SecFsp.c  |  9 +++++----
> IntelFsp2Pkg/FspSecCore/SecFsp.h  |  2 +-  IntelFsp2Pkg/FspSecCore/SecMain.c
> | 16 ++++++++--------  IntelFsp2Pkg/FspSecCore/SecMain.h |  4 ++--
>  4 files changed, 16 insertions(+), 15 deletions(-)
> 
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> index 7fde6e7f41..e9b4091b20 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> @@ -16,19 +16,20 @@
>    @return                     FSP specific IDT gate descriptor.  **/-
> UINT64+IA32_IDT_GATE_DESCRIPTOR FspGetExceptionHandler (   IN  UINT64
> IdtEntryTemplate   ) {   UINT32                    Entry;-  UINT64
> ExceptionHandler;+  IA32_IDT_GATE_DESCRIPTOR  ExceptionHandler;
> IA32_IDT_GATE_DESCRIPTOR  *IdtGateDescriptor;   FSP_INFO_HEADER
> *FspInfoHeader; +  ZeroMem ((VOID *)&ExceptionHandler, sizeof
> (IA32_IDT_GATE_DESCRIPTOR));   FspInfoHeader                      =
> (FSP_INFO_HEADER *)(UINTN)AsmGetFspInfoHeader ();-  ExceptionHandler
> = IdtEntryTemplate;-  IdtGateDescriptor                  =
> (IA32_IDT_GATE_DESCRIPTOR *)&ExceptionHandler;+  *(UINT64
> *)&ExceptionHandler       = IdtEntryTemplate;+  IdtGateDescriptor                  =
> &ExceptionHandler;   Entry                              = (IdtGateDescriptor-
> >Bits.OffsetHigh << 16) | IdtGateDescriptor->Bits.OffsetLow;   Entry
> = FspInfoHeader->ImageBase + FspInfoHeader->ImageSize - (~Entry + 1);
> IdtGateDescriptor->Bits.OffsetHigh = (UINT16)(Entry >> 16);diff --git
> a/IntelFsp2Pkg/FspSecCore/SecFsp.h b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> index 41931a33dd..e84528b378 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> @@ -30,7 +30,7 @@
>    @return                     FSP specific IDT gate descriptor.  **/-
> UINT64+IA32_IDT_GATE_DESCRIPTOR FspGetExceptionHandler (   IN  UINT64
> IdtEntryTemplate   );diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.c
> b/IntelFsp2Pkg/FspSecCore/SecMain.c
> index 8effe2225c..94ea3865b4 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecMain.c
> +++ b/IntelFsp2Pkg/FspSecCore/SecMain.c
> @@ -58,13 +58,13 @@ SecStartup (
>    IN UINT32          ApiIdx   ) {-  EFI_SEC_PEI_HAND_OFF  SecCoreData;-
> IA32_DESCRIPTOR       IdtDescriptor;-  SEC_IDT_TABLE         IdtTableInStack;-
> UINT32                Index;-  FSP_GLOBAL_DATA       PeiFspData;-  UINT64
> ExceptionHandler;-  UINTN                 IdtSize;+  EFI_SEC_PEI_HAND_OFF
> SecCoreData;+  IA32_DESCRIPTOR           IdtDescriptor;+  SEC_IDT_TABLE
> IdtTableInStack;+  UINT32                    Index;+  FSP_GLOBAL_DATA
> PeiFspData;+  IA32_IDT_GATE_DESCRIPTOR  ExceptionHandler;+  UINTN
> IdtSize;    //   // Process all libraries constructor function linked to SecCore.@@ -
> 119,7 +119,7 @@ SecStartup (
>    if (IdtDescriptor.Base == 0) {     ExceptionHandler = FspGetExceptionHandler
> (mIdtEntryTemplate);     for (Index = 0; Index < FixedPcdGet8
> (PcdFspMaxInterruptSupported); Index++) {-      CopyMem ((VOID
> *)&IdtTableInStack.IdtTable[Index], (VOID *)&ExceptionHandler, sizeof
> (UINT64));+      CopyMem ((VOID *)&IdtTableInStack.IdtTable[Index], (VOID
> *)&ExceptionHandler, sizeof (IA32_IDT_GATE_DESCRIPTOR));     }      IdtSize =
> sizeof (IdtTableInStack.IdtTable);diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.h
> b/IntelFsp2Pkg/FspSecCore/SecMain.h
> index 7c2642ad48..1fe7c15aeb 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecMain.h
> +++ b/IntelFsp2Pkg/FspSecCore/SecMain.h
> @@ -38,8 +38,8 @@ typedef struct _SEC_IDT_TABLE {
>    // Note: For IA32, only the 4 bytes immediately preceding IDT is used to store
> // EFI_PEI_SERVICES**   //-  UINT64    PeiService;-  UINT64
> IdtTable[FixedPcdGet8 (PcdFspMaxInterruptSupported)];+  UINT64
> PeiService;+  IA32_IDT_GATE_DESCRIPTOR  IdtTable[FixedPcdGet8
> (PcdFspMaxInterruptSupported)]; } SEC_IDT_TABLE;  /**--
> 2.35.3.windows.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct Kuo, Ted
@ 2022-07-13  1:39   ` Ni, Ray
  0 siblings, 0 replies; 6+ messages in thread
From: Ni, Ray @ 2022-07-13  1:39 UTC (permalink / raw)
  To: Kuo, Ted, devel@edk2.groups.io
  Cc: Chiu, Chasel, Desimone, Nathaniel L, S, Ashraf Ali, De, Debkumar,
	Han, Harry, West, Catharine

I don't see any change comparing this against v1.

Reviewed-by: Ray Ni <ray.ni@intel.com>


> -----Original Message-----
> From: Kuo, Ted <ted.kuo@intel.com>
> Sent: Tuesday, July 12, 2022 5:31 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Ni, Ray
> <ray.ni@intel.com>; S, Ashraf Ali <ashraf.ali.s@intel.com>; De, Debkumar <debkumar.de@intel.com>; Han, Harry
> <harry.han@intel.com>; West, Catharine <catharine.west@intel.com>
> Subject: [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
> The reserved IDT table size in SecCore is too small for X64. Changed the type
> of IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to have
> sufficient size reserved in IdtTable for X64. dff
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Ashraf Ali S <ashraf.ali.s@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Signed-off-by: Ted Kuo <ted.kuo@intel.com>
> ---
>  UefiCpuPkg/SecCore/SecMain.c | 1 +
>  UefiCpuPkg/SecCore/SecMain.h | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/UefiCpuPkg/SecCore/SecMain.c b/UefiCpuPkg/SecCore/SecMain.c
> index 4edf0ce972..fe03d8019a 100644
> --- a/UefiCpuPkg/SecCore/SecMain.c
> +++ b/UefiCpuPkg/SecCore/SecMain.c
> @@ -211,6 +211,7 @@ SecStartup (
> 
> 
>    IdtTableInStack.PeiService = 0;
> 
>    for (Index = 0; Index < SEC_IDT_ENTRY_COUNT; Index++) {
> 
> +    ZeroMem ((VOID *)&IdtTableInStack.IdtTable[Index], sizeof (IA32_IDT_GATE_DESCRIPTOR));
> 
>      CopyMem ((VOID *)&IdtTableInStack.IdtTable[Index], (VOID *)&mIdtEntryTemplate, sizeof (UINT64));
> 
>    }
> 
> 
> 
> diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h
> index 189fcf9326..1be57c2248 100644
> --- a/UefiCpuPkg/SecCore/SecMain.h
> +++ b/UefiCpuPkg/SecCore/SecMain.h
> @@ -43,8 +43,8 @@ typedef struct _SEC_IDT_TABLE {
>    // Note: For IA32, only the 4 bytes immediately preceding IDT is used to store
> 
>    // EFI_PEI_SERVICES**
> 
>    //
> 
> -  UINT64    PeiService;
> 
> -  UINT64    IdtTable[SEC_IDT_ENTRY_COUNT];
> 
> +  UINT64                    PeiService;
> 
> +  IA32_IDT_GATE_DESCRIPTOR  IdtTable[SEC_IDT_ENTRY_COUNT];
> 
>  } SEC_IDT_TABLE;
> 
> 
> 
>  /**
> 
> --
> 2.35.3.windows.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64
  2022-07-12  9:30 [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Kuo, Ted
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct Kuo, Ted
  2022-07-12  9:30 ` [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: " Kuo, Ted
@ 2022-07-14 18:38 ` Chiu, Chasel
  2 siblings, 0 replies; 6+ messages in thread
From: Chiu, Chasel @ 2022-07-14 18:38 UTC (permalink / raw)
  To: devel@edk2.groups.io, Kuo, Ted


This series has been merged:
https://github.com/tianocore/edk2/commit/9ab389c01b875869c6173557aa053d397aaf14f1
https://github.com/tianocore/edk2/commit/470206ba7f118aaa1153d66689cf3ee4d17051b7

Thanks,
Chasel


> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Kuo, Ted
> Sent: Tuesday, July 12, 2022 2:31 AM
> To: devel@edk2.groups.io
> Subject: [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve
> sufficient size in IdtTable for both IA32 and X64
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3957
> The reserved IDT table size in SecCore is too small for X64. Changed the type of
> IdtTable in SEC_IDT_TABLE from UINT64 to IA32_IDT_GATE_DESCRIPTOR to
> have sufficient size reserved in IdtTable for X64.
> 
> Ted Kuo (2):
>   UefiCpuPkg: Update SEC_IDT_TABLE struct
>   IntelFsp2Pkg: Update SEC_IDT_TABLE struct
> 
>  IntelFsp2Pkg/FspSecCore/SecFsp.c  |  9 +++++----
> IntelFsp2Pkg/FspSecCore/SecFsp.h  |  2 +-  IntelFsp2Pkg/FspSecCore/SecMain.c
> | 16 ++++++++--------  IntelFsp2Pkg/FspSecCore/SecMain.h |  4 ++--
>  UefiCpuPkg/SecCore/SecMain.c      |  1 +
>  UefiCpuPkg/SecCore/SecMain.h      |  4 ++--
>  6 files changed, 19 insertions(+), 17 deletions(-)
> 
> --
> 2.35.3.windows.1
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-07-14 18:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-12  9:30 [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Kuo, Ted
2022-07-12  9:30 ` [edk2-devel][PATCH v2 1/2] UefiCpuPkg: Update SEC_IDT_TABLE struct Kuo, Ted
2022-07-13  1:39   ` Ni, Ray
2022-07-12  9:30 ` [edk2-devel][PATCH v2 2/2] IntelFsp2Pkg: " Kuo, Ted
2022-07-12 18:34   ` Chiu, Chasel
2022-07-14 18:38 ` [edk2-devel][PATCH v2 0/2] Update SEC_IDT_TABLE struct to reserve sufficient size in IdtTable for both IA32 and X64 Chiu, Chasel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox