berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

acpi: don't map more rsdt/xsdt bytes than actually exist. 

With tianocore sometimes rsdt/xsdt map right before available RAM and if
we attempt to map them we get a kernel panic
This commit is contained in:
Vladimir Serbinenko 2023-08-16 02:53:24 +02:00
parent dfac99781c
commit 8cdb2d8d17
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi.cpp
View File

@ -150,15 +150,21 @@ void ACPIParseTables() {
bool isXSDT = false;
if (acpi.rsdp) {
uint64_t sdt_address;
if (acpi.rsdp->revision == 2 && acpi.rsdp->xsdtAddress) {
isXSDT = true;
sdt = (ACPIDescriptorTable *) acpi.rsdp->xsdtAddress;
sdt_address = acpi.rsdp->xsdtAddress;
} else {
isXSDT = false;
sdt = (ACPIDescriptorTable *) (uintptr_t) acpi.rsdp->rsdtAddress;
sdt_address = acpi.rsdp->rsdtAddress;
}
sdt = (ACPIDescriptorTable *) MMMapPhysical(kernelMMSpace, (uintptr_t) sdt, 16384, ES_FLAGS_DEFAULT);
ACPIDescriptorTable *tmp_sdt = (ACPIDescriptorTable *) MMMapPhysical(kernelMMSpace, sdt_address, sizeof(ACPIDescriptorTable), ES_FLAGS_DEFAULT);
uint32_t len_sdt = tmp_sdt->length < 16384 ? tmp_sdt->length : 16384;
MMFree(kernelMMSpace, tmp_sdt);
sdt = (ACPIDescriptorTable *) MMMapPhysical(kernelMMSpace, sdt_address, len_sdt, ES_FLAGS_DEFAULT);
} else {
KernelPanic("ACPIInitialise - Could not find supported root system descriptor pointer.\nACPI support is required.\n");
}