diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 8fda77e058..750dfd19da 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -470,7 +470,7 @@ DebugLib|ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLibFdtPL011UartUser.inf !endif } - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf !if $(TARGET) != RELEASE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 7b1492070b..71525f7768 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -40,9 +40,9 @@ READ_LOCK_STATUS = TRUE APRIORI DXE { INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf - # The driver responsible for UserSpace initialization (DxeRing3.inf) + # The driver responsible for UserSpace initialization (DxeUserSpace.inf) # must be the first USER driver in APRIORI list. - INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf } INF MdeModulePkg/Core/Dxe/DxeMain.inf @@ -89,7 +89,7 @@ APRIORI DXE { INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf - INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf INF USER MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf index ca533c5406..0bf78e9c1a 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -227,10 +227,10 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugRaisePropertyMask ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdImageProtectionPolicy ## CONSUMES -[Pcd.IA32, Pcd.X64] - gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES +[Pcd.IA32, Pcd.X64] + gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase ## CONSUMES gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize ## CONSUMES diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S b/MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S similarity index 100% rename from MdeModulePkg/Core/Dxe/DxeRing3/AARCH64/SysCall.S rename to MdeModulePkg/Core/Dxe/DxeUserSpace/AARCH64/SysCall.S diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S b/MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S similarity index 100% rename from MdeModulePkg/Core/Dxe/DxeRing3/ARM/SysCall.S rename to MdeModulePkg/Core/Dxe/DxeUserSpace/ARM/SysCall.S diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c b/MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.c similarity index 97% rename from MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c rename to MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.c index 04dfef8d76..457fffb669 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.c +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.c @@ -13,7 +13,7 @@ #include #include -#include "Ring3.h" +#include "UserSpace.h" EFI_BOOT_SERVICES mBootServices = { { diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf b/MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf similarity index 85% rename from MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf rename to MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf index fd01cf0795..f008d37436 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf @@ -9,7 +9,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = DxeRing3 + BASE_NAME = DxeUserSpace FILE_GUID = 88EA50C2-0DEA-4F13-B691-B506554E632B MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 @@ -22,11 +22,11 @@ # [Sources] - Ring3.h - DxeRing3.c - Ring3UefiBootServices.c - Ring3UefiRuntimeServices.c - Ring3Protocols.c + UserSpace.h + DxeUserSpace.c + UserSpaceUefiBootServices.c + UserSpaceUefiRuntimeServices.c + UserSpaceProtocols.c [Sources.IA32] IA32/SysCall.nasm diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm b/MdeModulePkg/Core/Dxe/DxeUserSpace/IA32/SysCall.nasm similarity index 100% rename from MdeModulePkg/Core/Dxe/DxeRing3/IA32/SysCall.nasm rename to MdeModulePkg/Core/Dxe/DxeUserSpace/IA32/SysCall.nasm diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpace.h similarity index 100% rename from MdeModulePkg/Core/Dxe/DxeRing3/Ring3.h rename to MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpace.h diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceProtocols.c similarity index 94% rename from MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c rename to MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceProtocols.c index 6408ee1df1..2f450761ee 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3Protocols.c +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceProtocols.c @@ -6,7 +6,7 @@ **/ -#include "Ring3.h" +#include "UserSpace.h" EFI_STATUS EFIAPI diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiBootServices.c similarity index 95% rename from MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c rename to MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiBootServices.c index 76d74da393..570fcc76eb 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiBootServices.c +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiBootServices.c @@ -14,7 +14,7 @@ #include #include -#include "Ring3.h" +#include "UserSpace.h" BOOLEAN mOnGuarding = FALSE; diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiRuntimeServices.c similarity index 94% rename from MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c rename to MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiRuntimeServices.c index 8e86c8511b..e1e5cebc04 100644 --- a/MdeModulePkg/Core/Dxe/DxeRing3/Ring3UefiRuntimeServices.c +++ b/MdeModulePkg/Core/Dxe/DxeUserSpace/UserSpaceUefiRuntimeServices.c @@ -1,17 +1,17 @@ -/** @file - This driver constructs User space wrappers for the EFI_RUNTIME_SERVICES. - - Copyright (c) 2024 - 2025, Mikhail Krichanov. All rights reserved. - SPDX-License-Identifier: BSD-3-Clause - -**/ +/** @file + This driver constructs User space wrappers for the EFI_RUNTIME_SERVICES. + + Copyright (c) 2024 - 2025, Mikhail Krichanov. All rights reserved. + SPDX-License-Identifier: BSD-3-Clause + +**/ #include #include #include -#include "Ring3.h" +#include "UserSpace.h" EFI_STATUS EFIAPI diff --git a/MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm b/MdeModulePkg/Core/Dxe/DxeUserSpace/X64/SysCall.nasm similarity index 100% rename from MdeModulePkg/Core/Dxe/DxeRing3/X64/SysCall.nasm rename to MdeModulePkg/Core/Dxe/DxeUserSpace/X64/SysCall.nasm diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 34dda48a02..31c5096eab 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -1156,8 +1156,8 @@ # @Prompt Delay access XHCI register after it issues HCRST (us) gEfiMdeModulePkgTokenSpaceGuid.PcdDelayXhciHCReset|2000|UINT16|0x30001060 - ## Indicates whether DXE drivers marked in .fdf file as USER will be loaded in user memory. - # TRUE - USER DXE drivers will be loaded in user memory.
+ ## Indicates whether DXE drivers marked in .fdf file as USER will be loaded in separate User address spaces. + # TRUE - USER DXE drivers will be loaded in separate User address spaces.
# FALSE - All DXE drivers will be loaded in supervisor memory.
# @Prompt Enable User Space. gEfiMdeModulePkgTokenSpaceGuid.PcdEnableUserSpace|FALSE|BOOLEAN|0x30001061 diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index eec2b9639e..0663a0ab68 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -316,7 +316,7 @@ MdeModulePkg/Bus/Spi/SpiHc/SpiHcDxe.inf MdeModulePkg/Bus/Spi/SpiHc/SpiHcSmm.inf - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf } diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index aedf1b8e94..96842e1387 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -832,7 +832,7 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf } diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index a5894582ca..b28eb675cd 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -203,9 +203,9 @@ APRIORI DXE { !if $(SMM_REQUIRE) == FALSE INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf !endif - # The driver responsible for UserSpace initialization (DxeRing3.inf) - # must be the first USER driver in APRIORI list. - INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + # The driver responsible for UserSpace initialization (DxeUserSpace.inf) + # must be the first USER driver in APRIORI list. + INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf } # @@ -292,7 +292,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf -INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf +INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 9d1c45648c..c731c524dd 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -844,7 +844,7 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf } diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 7da62a294a..9c9d22a186 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -204,9 +204,9 @@ APRIORI DXE { !if $(SMM_REQUIRE) == FALSE INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf !endif - # The driver responsible for UserSpace initialization (DxeRing3.inf) - # must be the first USER driver in APRIORI list. - INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + # The driver responsible for UserSpace initialization (DxeUserSpace.inf) + # must be the first USER driver in APRIORI list. + INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf } # @@ -293,7 +293,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf -INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf +INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 40c5612650..f6667f992f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -888,7 +888,7 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf } diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 9e1e66e68f..30251b5d16 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -232,9 +232,9 @@ APRIORI DXE { !if $(SMM_REQUIRE) == FALSE INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf !endif - # The driver responsible for UserSpace initialization (DxeRing3.inf) + # The driver responsible for UserSpace initialization (DxeUserSpace.inf) # must be the first USER driver in APRIORI list. - INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf } # @@ -322,7 +322,7 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF USER FatPkg/EnhancedFatDxe/Fat.inf -INF USER MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf +INF USER MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 6db17a356d..84738cfcec 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -781,7 +781,7 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf - MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf { + MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf { MemoryPoolLib|MdeModulePkg/Library/MemoryPoolLib/MemoryPoolLib.inf } diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 4f211e675c..cf2b6830a4 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -143,7 +143,7 @@ APRIORI DXE { INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf INF UefiPayloadPkg/BlSupportDxe/BlSupportDxe.inf - INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf + INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf } # @@ -280,7 +280,7 @@ INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf !endif INF FatPkg/EnhancedFatDxe/Fat.inf -INF MdeModulePkg/Core/Dxe/DxeRing3/DxeRing3.inf +INF MdeModulePkg/Core/Dxe/DxeUserSpace/DxeUserSpace.inf # # SD/eMMC Support