Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 18:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Update ACPI Extended Attributes support to 6.3 (#1782)

Browse source 
Update BIOS_MEMORY_MAP and PcMemGetBiosMemoryMap() from ACPI 6.2-A to ACPI 6.3.

Co-Authored-By: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
This commit is contained in:
Serge Gautherie 2019-08-02 17:39:50 +02:00 committed by Hermès Bélusca-Maïto
parent 60fbf459c3
commit fa2e4e9537
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
boot/freeldr/freeldr/arch/i386/pcmem.c
View file

@ -302,7 +302,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi
if (Regs.x.ecx == 0) if (Regs.x.ecx == 0)
{ {
TRACE("Discard empty entry. (would-be-PcBiosMapCount = %lu)\n", TRACE("Discarding empty entry. (would-be-PcBiosMapCount = %lu)\n",
PcBiosMapCount); PcBiosMapCount);
goto nextRange; goto nextRange;
} }
@ -332,7 +332,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi
if (((PBIOS_MEMORY_MAP)BIOSCALLBUFFER)->ExtendedAttributes.Enabled_Reserved == 0) if (((PBIOS_MEMORY_MAP)BIOSCALLBUFFER)->ExtendedAttributes.Enabled_Reserved == 0)
{ {
WARN("Discard disabled/invalid entry. (would-be-PcBiosMapCount = %lu)\n", WARN("Discarding disabled/invalid entry. (would-be-PcBiosMapCount = %lu)\n",
PcBiosMapCount); PcBiosMapCount);
/* This unlikely case was correct between ACPI 3.0 and 4.0, so assume all is fine. /* This unlikely case was correct between ACPI 3.0 and 4.0, so assume all is fine.
* Unless we would be ready to drop ACPI 3.0 compatibility. * Unless we would be ready to drop ACPI 3.0 compatibility.
@ -340,6 +340,11 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi
goto nextRange; goto nextRange;
} }
/*
* Other deprecated ExtendedAttributes flags such as NonVolatile_Deprecated_Reserved
* or SlowAccess_Deprecated_Reserved are simply ignored.
*/
/* Copy data to global buffer */ /* Copy data to global buffer */
RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, sizeof(BIOS_MEMORY_MAP)); RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, sizeof(BIOS_MEMORY_MAP));
@ -362,7 +367,7 @@ PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSi
if (PcBiosMemoryMap[PcBiosMapCount].Length == 0) if (PcBiosMemoryMap[PcBiosMapCount].Length == 0)
{ {
TRACE("Discard empty range. (would-be-PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0)\n", TRACE("Discarding empty range. (would-be-PcBiosMapCount = %lu, BaseAddress = 0x%llx, Length = 0)\n",
PcBiosMapCount, PcBiosMemoryMap[PcBiosMapCount].BaseAddress); PcBiosMapCount, PcBiosMemoryMap[PcBiosMapCount].BaseAddress);
goto nextRange; goto nextRange;
} }

18
boot/freeldr/freeldr/include/arch/pc/pcbios.h
View file

@ -46,13 +46,19 @@ typedef struct
struct struct
{ {
// Bit 0. ACPI 3.0. As of ACPI 4.0, became "Reserved -> must be 1". // Bit 0. ACPI 3.0.
// As of ACPI 4.0, became "Reserved -> must be 1".
ULONG Enabled_Reserved : 1; ULONG Enabled_Reserved : 1;
// Bit 1. ACPI 3.0. As of ACPI 6.1, became "Unimplemented -> Deprecated". // Bit 1. ACPI 3.0.
ULONG NonVolatile_Deprecated : 1; // As of ACPI 6.1, became "Unimplemented -> Deprecated".
// Bit 2. ACPI 4.0. As of ACPI 6.1, became "Unimplemented -> Deprecated". // As of ACPI 6.3, became "Reserved -> must be 0".
ULONG SlowAccess_Deprecated : 1; ULONG NonVolatile_Deprecated_Reserved : 1;
// Bit 3. ACPI 4.0. ACPI 5.0-A added "Used only on PC-AT BIOS" (not UEFI). // Bit 2. ACPI 4.0.
// As of ACPI 6.1, became "Unimplemented -> Deprecated".
// As of ACPI 6.3, became "Reserved -> must be 0".
ULONG SlowAccess_Deprecated_Reserved : 1;
// Bit 3. ACPI 4.0.
// ACPI 5.0-A added "Used only on PC-AT BIOS" (not UEFI).
ULONG ErrorLog : 1; ULONG ErrorLog : 1;
// Bits 4-31. ACPI 3.0. // Bits 4-31. ACPI 3.0.
ULONG Reserved : 28; ULONG Reserved : 28;