Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h (modified) (18 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/UefiCpuPkg/Library/CpuExceptionHandlerLib/CpuExceptionCommon.h ¶

@@ -2 +2 @@
   Common header file for CPU Exception Handler Library.
 
-  Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2012 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -21 +21 @@
 #include <Library/CpuExceptionHandlerLib.h>
 
-#define  CPU_EXCEPTION_NUM          32
-#define  CPU_INTERRUPT_NUM         256
-#define  HOOKAFTER_STUB_SIZE        16
+#define  CPU_EXCEPTION_NUM    32
+#define  CPU_INTERRUPT_NUM    256
+#define  HOOKAFTER_STUB_SIZE  18
 
 //
 // Exception Error Code of Page-Fault Exception
 //
-#define IA32_PF_EC_P                BIT0
-#define IA32_PF_EC_WR               BIT1
-#define IA32_PF_EC_US               BIT2
-#define IA32_PF_EC_RSVD             BIT3
-#define IA32_PF_EC_ID               BIT4
-#define IA32_PF_EC_PK               BIT5
-#define IA32_PF_EC_SS               BIT6
-#define IA32_PF_EC_SGX              BIT15
+#define IA32_PF_EC_P     BIT0
+#define IA32_PF_EC_WR    BIT1
+#define IA32_PF_EC_US    BIT2
+#define IA32_PF_EC_RSVD  BIT3
+#define IA32_PF_EC_ID    BIT4
+#define IA32_PF_EC_PK    BIT5
+#define IA32_PF_EC_SS    BIT6
+#define IA32_PF_EC_SGX   BIT15
 
 #include "ArchInterruptDefs.h"
@@ -48 +48 @@
   FixedPcdGet32 (PcdCpuKnownGoodStackSize)
 
-#define CPU_TSS_GDT_SIZE (SIZE_2KB + CPU_TSS_DESC_SIZE + CPU_TSS_SIZE)
+#define CPU_TSS_GDT_SIZE  (SIZE_2KB + CPU_TSS_DESC_SIZE + CPU_TSS_SIZE)
 
 //
@@ -54 +54 @@
 //
 typedef struct {
-  UINTN ExceptionStart;
-  UINTN ExceptionStubHeaderSize;
-  UINTN HookAfterStubHeaderStart;
+  UINTN    ExceptionStart;
+  UINTN    ExceptionStubHeaderSize;
+  UINTN    HookAfterStubHeaderStart;
 } EXCEPTION_HANDLER_TEMPLATE_MAP;
 
 typedef struct {
-  UINTN                       IdtEntryCount;
-  SPIN_LOCK                   DisplayMessageSpinLock;
-  RESERVED_VECTORS_DATA       *ReservedVectors;
-  EFI_CPU_INTERRUPT_HANDLER   *ExternalInterruptHandler;
+  UINTN                        IdtEntryCount;
+  SPIN_LOCK                    DisplayMessageSpinLock;
+  RESERVED_VECTORS_DATA        *ReservedVectors;
+  EFI_CPU_INTERRUPT_HANDLER    *ExternalInterruptHandler;
 } EXCEPTION_HANDLER_DATA;
 
-extern CONST UINT32                mErrorCodeFlag;
-extern CONST UINTN                 mDoFarReturnFlag;
+extern CONST UINT32  mErrorCodeFlag;
+extern CONST UINTN   mDoFarReturnFlag;
 
 /**
@@ -78 +78 @@
 EFIAPI
 AsmGetTemplateAddressMap (
-  OUT EXCEPTION_HANDLER_TEMPLATE_MAP *AddressMap
+  OUT EXCEPTION_HANDLER_TEMPLATE_MAP  *AddressMap
   );
 
@@ -91 +91 @@
 VOID
 ArchUpdateIdtEntry (
-  OUT IA32_IDT_GATE_DESCRIPTOR       *IdtEntry,
-  IN  UINTN                          InterruptHandler
+  OUT IA32_IDT_GATE_DESCRIPTOR  *IdtEntry,
+  IN  UINTN                     InterruptHandler
   );
 
@@ -103 +103 @@
 UINTN
 ArchGetIdtHandler (
-  IN IA32_IDT_GATE_DESCRIPTOR        *IdtEntry
+  IN IA32_IDT_GATE_DESCRIPTOR  *IdtEntry
   );
 
@@ -129 +129 @@
 VOID
 DumpModuleImageInfo (
-  IN  UINTN              CurrentEip
+  IN  UINTN  CurrentEip
   );
 
@@ -140 +140 @@
 VOID
 DumpImageAndCpuContent (
-  IN EFI_EXCEPTION_TYPE   ExceptionType,
-  IN EFI_SYSTEM_CONTEXT   SystemContext
+  IN EFI_EXCEPTION_TYPE  ExceptionType,
+  IN EFI_SYSTEM_CONTEXT  SystemContext
   );
 
@@ -158 +158 @@
 EFI_STATUS
 InitializeCpuExceptionHandlersWorker (
-  IN EFI_VECTOR_HANDOFF_INFO       *VectorInfo OPTIONAL,
-  IN OUT EXCEPTION_HANDLER_DATA    *ExceptionHandlerData
+  IN EFI_VECTOR_HANDOFF_INFO     *VectorInfo OPTIONAL,
+  IN OUT EXCEPTION_HANDLER_DATA  *ExceptionHandlerData
   );
 
@@ -181 +181 @@
 EFI_STATUS
 RegisterCpuInterruptHandlerWorker (
-  IN EFI_EXCEPTION_TYPE            InterruptType,
-  IN EFI_CPU_INTERRUPT_HANDLER     InterruptHandler,
-  IN EXCEPTION_HANDLER_DATA        *ExceptionHandlerData
+  IN EFI_EXCEPTION_TYPE         InterruptType,
+  IN EFI_CPU_INTERRUPT_HANDLER  InterruptHandler,
+  IN EXCEPTION_HANDLER_DATA     *ExceptionHandlerData
   );
 
@@ -211 +211 @@
 VOID
 ArchSaveExceptionContext (
-  IN UINTN                        ExceptionType,
-  IN EFI_SYSTEM_CONTEXT           SystemContext,
-  IN EXCEPTION_HANDLER_DATA       *ExceptionHandlerData
+  IN UINTN                   ExceptionType,
+  IN EFI_SYSTEM_CONTEXT      SystemContext,
+  IN EXCEPTION_HANDLER_DATA  *ExceptionHandlerData
   );
 
@@ -225 +225 @@
 VOID
 ArchRestoreExceptionContext (
-  IN UINTN                        ExceptionType,
-  IN EFI_SYSTEM_CONTEXT           SystemContext,
-  IN EXCEPTION_HANDLER_DATA       *ExceptionHandlerData
+  IN UINTN                   ExceptionType,
+  IN EFI_SYSTEM_CONTEXT      SystemContext,
+  IN EXCEPTION_HANDLER_DATA  *ExceptionHandlerData
   );
 
@@ -241 +241 @@
 EFIAPI
 AsmVectorNumFixup (
-  IN VOID    *NewVectorAddr,
-  IN UINT8   VectorNum,
-  IN VOID    *OldVectorAddr
+  IN VOID   *NewVectorAddr,
+  IN UINT8  VectorNum,
+  IN VOID   *OldVectorAddr
   );
 
@@ -259 +259 @@
 EFI_STATUS
 ReadAndVerifyVectorInfo (
-  IN  EFI_VECTOR_HANDOFF_INFO       *VectorInfo,
-  OUT RESERVED_VECTORS_DATA         *ReservedVector,
-  IN  UINTN                         VectorCount
+  IN  EFI_VECTOR_HANDOFF_INFO  *VectorInfo,
+  OUT RESERVED_VECTORS_DATA    *ReservedVector,
+  IN  UINTN                    VectorCount
   );
 
@@ -273 +273 @@
 CONST CHAR8 *
 GetExceptionNameStr (
-  IN EFI_EXCEPTION_TYPE          ExceptionType
+  IN EFI_EXCEPTION_TYPE  ExceptionType
   );
 
@@ -285 +285 @@
 VOID
 CommonExceptionHandlerWorker (
-  IN EFI_EXCEPTION_TYPE          ExceptionType,
-  IN EFI_SYSTEM_CONTEXT          SystemContext,
-  IN EXCEPTION_HANDLER_DATA      *ExceptionHandlerData
-  );
-
-/**
-  Setup separate stack for specific exceptions.
-
-  @param[in] StackSwitchData      Pointer to data required for setuping up
-                                  stack switch.
-
-  @retval EFI_SUCCESS             The exceptions have been successfully
-                                  initialized with new stack.
-  @retval EFI_INVALID_PARAMETER   StackSwitchData contains invalid content.
+  IN EFI_EXCEPTION_TYPE      ExceptionType,
+  IN EFI_SYSTEM_CONTEXT      SystemContext,
+  IN EXCEPTION_HANDLER_DATA  *ExceptionHandlerData
+  );
+
+/**
+  Setup separate stacks for certain exception handlers.
+
+  @param[in]       Buffer        Point to buffer used to separate exception stack.
+  @param[in, out]  BufferSize    On input, it indicates the byte size of Buffer.
+                                 If the size is not enough, the return status will
+                                 be EFI_BUFFER_TOO_SMALL, and output BufferSize
+                                 will be the size it needs.
+
+  @retval EFI_SUCCESS             The stacks are assigned successfully.
+  @retval EFI_BUFFER_TOO_SMALL    This BufferSize is too small.
+  @retval EFI_UNSUPPORTED         This function is not supported.
 **/
 EFI_STATUS
 ArchSetupExceptionStack (
-  IN CPU_EXCEPTION_INIT_DATA        *StackSwitchData
+  IN     VOID   *Buffer,
+  IN OUT UINTN  *BufferSize
   );
 
@@ -319 +323 @@
 
 #endif
-