From d03b93be3df96fe99918a71b3f5b70f34fcce04c Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Tue, 21 May 2024 15:12:24 +0300 Subject: [PATCH] Ring3: Defined SysCallBootService() for AARCH64. --- ArmPkg/Include/Chipset/AArch64.h | 1 + .../Library/DefaultExceptionHandlerLib.h | 3 ++- .../AArch64/ExceptionSupport.S | 11 ++++++++++ .../Library/ArmExceptionLib/ArmExceptionLib.c | 6 +++--- .../AArch64/DefaultExceptionHandler.c | 13 +++++++++++- MdeModulePkg/Core/Dxe/DxeMain.h | 8 ++++++++ MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 3 ++- .../Core/Dxe/DxeRing3/AARCH64/SysCall.S | 2 +- .../Dxe/SysCall/AARCH64/CoreBootServices.S | 20 ------------------- MdeModulePkg/Core/Dxe/SysCall/BootServices.c | 15 ++++++++++++++ .../Core/Dxe/SysCall/SupportedProtocols.c | 4 ++-- MdePkg/Include/Uefi/UefiSpec.h | 9 +++++++++ 12 files changed, 66 insertions(+), 29 deletions(-) diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h index da4212f96b..cac6366679 100644 --- a/ArmPkg/Include/Chipset/AArch64.h +++ b/ArmPkg/Include/Chipset/AArch64.h @@ -71,6 +71,7 @@ #define AARCH64_ESR_ISS(Ecr) ((0x1FFFFFF) & (Ecr)) #define AARCH64_ESR_EC_SMC32 (0x13 << 26) +#define AARCH64_ESR_EC_SVC64 (0x15 << 26) #define AARCH64_ESR_EC_SMC64 (0x17 << 26) // AArch64 Exception Level diff --git a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h index 63d5dc78de..f5ddc256bd 100644 --- a/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h +++ b/ArmPkg/Include/Library/DefaultExceptionHandlerLib.h @@ -16,7 +16,8 @@ @param SystemContext Register state at the time of the Exception **/ -VOID +EFI_STATUS +EFIAPI DefaultExceptionHandler ( IN EFI_EXCEPTION_TYPE ExceptionType, IN OUT EFI_SYSTEM_CONTEXT SystemContext diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S index cd9437b6aa..aeb1475075 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S @@ -332,7 +332,18 @@ ASM_PFX(CommonExceptionEntry): ldp x22, x23, [sp, #0xb0] ldp x24, x25, [sp, #0xc0] ldp x26, x27, [sp, #0xd0] + // Preserve return value for SVC. + mrs x1, esr_el1 + lsr x1, x1, #26 + and x1, x1, #0x3F + cmp x1, #0x15 + b.eq is_SVC + ldp x0, x1, [sp], #0xe0 + b continue +is_SVC: + ldr x1, [sp, #0x8] +continue: // Pop FP regs from Stack. ldp q2, q3, [x28, #0x20] diff --git a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c index a521c33f32..fb413df348 100644 --- a/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c +++ b/ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.c @@ -266,7 +266,7 @@ RegisterExceptionHandler ( return RegisterCpuInterruptHandler (ExceptionType, InterruptHandler); } -VOID +EFI_STATUS EFIAPI CommonCExceptionHandler ( IN EFI_EXCEPTION_TYPE ExceptionType, @@ -276,14 +276,14 @@ CommonCExceptionHandler ( if (ExceptionType <= gMaxExceptionNumber) { if (gExceptionHandlers[ExceptionType]) { gExceptionHandlers[ExceptionType](ExceptionType, SystemContext); - return; + return EFI_SUCCESS; } } else { DEBUG ((DEBUG_ERROR, "Unknown exception type %d\n", ExceptionType)); ASSERT (FALSE); } - DefaultExceptionHandler (ExceptionType, SystemContext); + return DefaultExceptionHandler (ExceptionType, SystemContext); } /** diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c index 7e5460aa58..ccde4412f4 100644 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c @@ -186,7 +186,8 @@ BaseName ( @param SystemContext Register state at the time of the Exception **/ -VOID +EFI_STATUS +EFIAPI DefaultExceptionHandler ( IN EFI_EXCEPTION_TYPE ExceptionType, IN OUT EFI_SYSTEM_CONTEXT SystemContext @@ -197,6 +198,14 @@ DefaultExceptionHandler ( UINTN CharCount; INT32 Offset; + if (AARCH64_ESR_EC (SystemContext.SystemContextAArch64->ESR) == AARCH64_ESR_EC_SVC64) { + return gBS->SysCallBootService ( + SystemContext.SystemContextAArch64->X0, + &(SystemContext.SystemContextAArch64->X1), + &(SystemContext.SystemContextAArch64->X0) + ); + } + if (mRecursiveException) { STATIC CHAR8 CONST Message[] = "\nRecursive exception occurred while dumping the CPU state\n"; SerialPortWrite ((UINT8 *)Message, sizeof Message - 1); @@ -344,4 +353,6 @@ DefaultExceptionHandler ( ASSERT (FALSE); CpuDeadLoop (); + + return EFI_SUCCESS; } diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h index f50bf3de02..f02062774e 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.h +++ b/MdeModulePkg/Core/Dxe/DxeMain.h @@ -2722,6 +2722,14 @@ CoreBootServices ( ... ); +EFI_STATUS +EFIAPI +SysCallBootService ( + IN UINT8 Type, + IN VOID *CoreRbp, + IN VOID *UserRsp + ); + EFI_STATUS EFIAPI CallRing3 ( diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c index f3d44cceb1..6f48479d62 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c @@ -89,7 +89,8 @@ EFI_BOOT_SERVICES mBootServices = { (EFI_CALCULATE_CRC32)CoreEfiNotAvailableYetArg3, // CalculateCrc32 (EFI_COPY_MEM)CopyMem, // CopyMem (EFI_SET_MEM)SetMem, // SetMem - (EFI_CREATE_EVENT_EX)CoreCreateEventEx // CreateEventEx + (EFI_CREATE_EVENT_EX)CoreCreateEventEx, // CreateEventEx + (EFI_SYS_CALL_BOOT_SERVICE)SysCallBootService }; EFI_DXE_SERVICES mDxeServices = { diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S b/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S index 8678dacbfe..b3cc3d7c72 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S +++ b/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S @@ -16,7 +16,7 @@ // ); //------------------------------------------------------------------------------ ASM_FUNC(SysCall) - + svc #0 ret //------------------------------------------------------------------------------ diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S index 06d28f0c3e..b6eef51714 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S +++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S @@ -20,26 +20,6 @@ ASM_FUNC(CallInstallMultipleProtocolInterfaces) ret -//------------------------------------------------------------------------------ -// EFI_STATUS -// EFIAPI -// CoreBootServices ( -// IN UINT8 Type, -// ... -// ); -// -// (rcx) RIP of the next instruction saved by SYSCALL in SysCall(). -// (rdx) Argument 1 of the called function. -// (r8) Argument 2 of the called function. -// (r9) Argument 3 of the called function. -// (r10) Type. -// (r11) RFLAGS saved by SYSCALL in SysCall(). -// -// (On User Stack) Argument 4, 5, ... -//------------------------------------------------------------------------------ -ASM_FUNC(CoreBootServices) - ret - //------------------------------------------------------------------------------ // EFI_STATUS // EFIAPI diff --git a/MdeModulePkg/Core/Dxe/SysCall/BootServices.c b/MdeModulePkg/Core/Dxe/SysCall/BootServices.c index 8ae1175bdf..98d06a6229 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/BootServices.c +++ b/MdeModulePkg/Core/Dxe/SysCall/BootServices.c @@ -1391,3 +1391,18 @@ CallBootService ( return EFI_UNSUPPORTED; } + +EFI_STATUS +EFIAPI +SysCallBootService ( + IN UINT8 Type, + IN VOID *CoreRbp, + IN VOID *UserRsp + ) +{ + return CallBootService ( + Type, + (CORE_STACK *)CoreRbp, + (RING3_STACK *)UserRsp + ); +} diff --git a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c index 95f98b3ef8..b6fd7d7cc1 100644 --- a/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c +++ b/MdeModulePkg/Core/Dxe/SysCall/SupportedProtocols.c @@ -322,7 +322,7 @@ CoreFileSetPosition ( File = (RING3_EFI_FILE_PROTOCOL *)This; -#if defined (MDE_CPU_X64) +#if defined (MDE_CPU_X64) || defined (MDE_CPU_AARCH64) return GoToRing3 ( 2, (VOID *)mRing3FileProtocol.SetPosition, @@ -602,7 +602,7 @@ CoreFileOpen ( return Status; } -#if defined (MDE_CPU_X64) +#if defined (MDE_CPU_X64) || defined (MDE_CPU_AARCH64) Status = GoToRing3 ( 5, (VOID *)mRing3FileProtocol.Open, diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h index df3cf9ae4a..102dacea11 100644 --- a/MdePkg/Include/Uefi/UefiSpec.h +++ b/MdePkg/Include/Uefi/UefiSpec.h @@ -1831,6 +1831,14 @@ EFI_STATUS OUT UINT64 *MaximumVariableSize ); +typedef +EFI_STATUS +(EFIAPI *EFI_SYS_CALL_BOOT_SERVICE)( + IN UINT8 Type, + IN VOID *CoreRbp, + IN VOID *UserRsp + ); + // // Firmware should stop at a firmware user interface on next boot // @@ -2011,6 +2019,7 @@ typedef struct { EFI_COPY_MEM CopyMem; EFI_SET_MEM SetMem; EFI_CREATE_EVENT_EX CreateEventEx; + EFI_SYS_CALL_BOOT_SERVICE SysCallBootService; } EFI_BOOT_SERVICES; typedef enum {