xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Cleanup hardware allocation memory pool related code for i686
All checks were successful
Builds / ExectOS (amd64) (push) Successful in 35s
Details
Builds / ExectOS (i686) (push) Successful in 35s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-06-02 17:32:39 +02:00
parent 6176ca38a8
commit c1ab5fe98d
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xtldr/modules/xtos_o/amd64/memory.c
View File

@ -21,7 +21,7 @@
*/ */
XTCDECL XTCDECL
EFI_STATUS EFI_STATUS
XtMapHalMemory(IN PXTBL_PAGE_MAPPING PageMap) XtMapHardwareMemoryPool(IN PXTBL_PAGE_MAPPING PageMap)
{ {
PHARDWARE_PTE PdeBase, PpeBase, PxeBase; PHARDWARE_PTE PdeBase, PpeBase, PxeBase;
EFI_PHYSICAL_ADDRESS Address; EFI_PHYSICAL_ADDRESS Address;
@ -147,7 +147,7 @@ XtEnablePaging(IN PXTBL_PAGE_MAPPING PageMap)
} }
/* Map memory for hardware layer */ /* Map memory for hardware layer */
Status = XtMapHalMemory(PageMap); Status = XtMapHardwareMemoryPool(PageMap);
if(Status != STATUS_EFI_SUCCESS) if(Status != STATUS_EFI_SUCCESS)
{ {
/* Failed to map memory for hardware layer */ /* Failed to map memory for hardware layer */

18
xtldr/modules/xtos_o/i686/memory.c
View File

@ -21,7 +21,7 @@
*/ */
XTCDECL XTCDECL
EFI_STATUS EFI_STATUS
XtMapHalMemory(IN PXTBL_PAGE_MAPPING PageMap) XtMapHardwareMemoryPool(IN PXTBL_PAGE_MAPPING PageMap)
{ {
EFI_PHYSICAL_ADDRESS Address; EFI_PHYSICAL_ADDRESS Address;
PHARDWARE_PTE PdeBase; PHARDWARE_PTE PdeBase;
@ -42,19 +42,19 @@ XtMapHalMemory(IN PXTBL_PAGE_MAPPING PageMap)
if(PageMap->PageMapLevel == 3) if(PageMap->PageMapLevel == 3)
{ {
/* Get PDE base address (PAE enabled) */ /* Get PDE base address (PAE enabled) */
PdeBase = (PHARDWARE_PTE)(((PHARDWARE_PTE)PageMap->PtePointer)[MM_HAL_VA_START >> MM_PPI_SHIFT].PageFrameNumber << MM_PAGE_SHIFT); PdeBase = (PHARDWARE_PTE)(((PHARDWARE_PTE)PageMap->PtePointer)[MM_HARDWARE_VA_START >> MM_PPI_SHIFT].PageFrameNumber << MM_PAGE_SHIFT);
/* Make PDE valid */ /* Make PDE valid */
PdeBase[(MM_HAL_VA_START >> MM_PDI_SHIFT) & 0x1FF].PageFrameNumber = Address >> MM_PAGE_SHIFT; PdeBase[(MM_HARDWARE_VA_START >> MM_PDI_SHIFT) & 0x1FF].PageFrameNumber = Address >> MM_PAGE_SHIFT;
PdeBase[(MM_HAL_VA_START >> MM_PDI_SHIFT) & 0x1FF].Valid = 1; PdeBase[(MM_HARDWARE_VA_START >> MM_PDI_SHIFT) & 0x1FF].Valid = 1;
PdeBase[(MM_HAL_VA_START >> MM_PDI_SHIFT) & 0x1FF].Writable = 1; PdeBase[(MM_HARDWARE_VA_START >> MM_PDI_SHIFT) & 0x1FF].Writable = 1;
} }
else else
{ {
/* Make PDE valid (PAE disabled) */ /* Make PDE valid (PAE disabled) */
((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HAL_VA_START >> MM_PDI_LEGACY_SHIFT].Valid = 1; ((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HARDWARE_VA_START >> MM_PDI_LEGACY_SHIFT].Valid = 1;
((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HAL_VA_START >> MM_PDI_LEGACY_SHIFT].PageFrameNumber = Address >> MM_PAGE_SHIFT; ((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HARDWARE_VA_START >> MM_PDI_LEGACY_SHIFT].PageFrameNumber = Address >> MM_PAGE_SHIFT;
((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HAL_VA_START >> MM_PDI_LEGACY_SHIFT].Writable = 1; ((PHARDWARE_LEGACY_PTE)PageMap->PtePointer)[MM_HARDWARE_VA_START >> MM_PDI_LEGACY_SHIFT].Writable = 1;
} }
/* Return success */ /* Return success */
@ -107,7 +107,7 @@ XtEnablePaging(IN PXTBL_PAGE_MAPPING PageMap)
} }
/* Map memory for hardware layer */ /* Map memory for hardware layer */
Status = XtMapHalMemory(PageMap); Status = XtMapHardwareMemoryPool(PageMap);
if(Status != STATUS_EFI_SUCCESS) if(Status != STATUS_EFI_SUCCESS)
{ {
/* Failed to map memory for hardware layer */ /* Failed to map memory for hardware layer */