Skip to content

Commit

Permalink
acpi: support 64bit in acpi_find_table for DSDT and FACS
Browse files Browse the repository at this point in the history
Use X_DSDT and X_FIRMWARE_CTRL if available.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Rebased on -next to use nomap:
Signed-off-by: Simon Glass <sjg@chromium.org>
  • Loading branch information
xypron authored and sjg20 committed Jan 7, 2024
1 parent c95ade8 commit f47c86f
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions lib/acpi/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,30 @@ struct acpi_table_header *acpi_find_table(const char *sig)
if (!memcmp(hdr->signature, "FACP", ACPI_NAME_LEN)) {
struct acpi_fadt *fadt = (struct acpi_fadt *)hdr;

if (!memcmp(sig, "DSDT", ACPI_NAME_LEN) && fadt->dsdt)
return nomap_sysmem(fadt->dsdt, 0);
if (!memcmp(sig, "FACS", ACPI_NAME_LEN) &&
fadt->firmware_ctrl)
return nomap_sysmem(fadt->firmware_ctrl, 0);
if (!memcmp(sig, "DSDT", ACPI_NAME_LEN)) {
void *dsdt;

if (fadt->header.revision >= 3 && fadt->x_dsdt)
dsdt = nomap_sysmem(fadt->x_dsdt, 0);
else if (fadt->dsdt)
dsdt = nomap_sysmem(fadt->dsdt, 0);
else
dsdt = NULL;
return dsdt;
}

if (!memcmp(sig, "FACS", ACPI_NAME_LEN)) {
void *facs;

if (fadt->header.revision >= 3 &&
fadt->x_firmware_ctrl)
facs = nomap_sysmem(fadt->x_firmware_ctrl, 0);
else if (fadt->firmware_ctrl)
facs = nomap_sysmem(fadt->firmware_ctrl, 0);
else
facs = NULL;
return facs;
}
}
}

Expand Down

0 comments on commit f47c86f

Please sign in to comment.