archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

DxeIpl: Fix ACPI reset register detection

Browse Source
This commit is contained in:
Goldfish64 2020-07-09 20:27:20 -05:00
parent 748b0ea20e
commit f6ceca9c72
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Legacy/BootPlatform/DxeIpl/LegacyTable.c
View File

@ -307,12 +307,28 @@ PrepareFadtTable (
);
}
if (Fadt->Header.Length >= OFFSET_OF (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE, ResetValue) + sizeof (Fadt->ResetValue)) {
CopyMem (
&AcpiDescription->RESET_REG,
&Fadt->ResetReg,
sizeof(EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE)
);
AcpiDescription->RESET_VALUE = Fadt->ResetValue;
//
// Ensure FADT register information is valid and can be trusted before using.
// If not, use universal register settings. See AcpiFadtEnableReset() in OcAcpiLib.
//
if (Fadt->ResetReg.Address != 0 && Fadt->ResetReg.RegisterBitWidth == 8) {
CopyMem (
&AcpiDescription->RESET_REG,
&Fadt->ResetReg,
sizeof(EFI_ACPI_3_0_GENERIC_ADDRESS_STRUCTURE)
);
AcpiDescription->RESET_VALUE = Fadt->ResetValue;
} else {
//
// Use mostly universal default of 0xCF9.
//
AcpiDescription->RESET_REG.Address = 0xCF9;
AcpiDescription->RESET_REG.AddressSpaceId = EFI_ACPI_3_0_SYSTEM_IO;
AcpiDescription->RESET_REG.RegisterBitWidth = 8;
AcpiDescription->RESET_REG.RegisterBitOffset = 0;
AcpiDescription->RESET_REG.AccessSize = EFI_ACPI_3_0_BYTE;
AcpiDescription->RESET_VALUE = 6;
}
} else {
//
// ** CHANGE START **
@ -322,7 +338,7 @@ PrepareFadtTable (
AcpiDescription->RESET_REG.AddressSpaceId = EFI_ACPI_3_0_SYSTEM_IO;
AcpiDescription->RESET_REG.RegisterBitWidth = 8;
AcpiDescription->RESET_REG.RegisterBitOffset = 0;
AcpiDescription->RESET_REG.AccessSize = 1;
AcpiDescription->RESET_REG.AccessSize = EFI_ACPI_3_0_BYTE;
AcpiDescription->RESET_VALUE = 0xFE;
//
// ** CHANGE END **