Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-15 17:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

acpi: acpi_table: Bump revisions

Browse source 
The FADT structure found in U-Boot represents FADT revision 6 and the
GICC and GICD structures defined in U-Boot are based on ACPI revision
6.3.

Bump the table revision to fix FWTS failures seen on aarch64.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Patrick Rudolph 2024-10-23 15:19:52 +02:00 • committed by Tom Rini
parent 763bad3e1c
commit 4b882f63d4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/cpu/tangier/acpi.c
View file

@ -28,8 +28,6 @@ void acpi_fill_fadt(struct acpi_fadt *fadt)
ACPI_FADT_POWER_BUTTON | ACPI_FADT_SLEEP_BUTTON |
ACPI_FADT_SEALED_CASE | ACPI_FADT_HEADLESS |
ACPI_FADT_HW_REDUCED_ACPI;
fadt->header.revision = 6;
fadt->minor_revision = 2;
}
void *acpi_fill_madt(struct acpi_madt *madt, struct acpi_ctx *ctx)

3
include/acpi/acpi_table.h
View file

@ -290,7 +290,8 @@ struct __packed acpi_fadt {
#define ACPI_MADT_REV_ACPI_3_0 2
#define ACPI_MADT_REV_ACPI_4_0 3
#define ACPI_MADT_REV_ACPI_5_0 3
#define ACPI_MADT_REV_ACPI_6_0 5
#define ACPI_MADT_REV_ACPI_6_2 4
#define ACPI_MADT_REV_ACPI_6_3 5
#define ACPI_MCFG_REV_ACPI_3_0 1

7
lib/acpi/acpi_table.c
View file

@ -63,9 +63,9 @@ int acpi_get_table_revision(enum acpi_tables table)
{
switch (table) {
case ACPITAB_FADT:
return ACPI_FADT_REV_ACPI_3_0;
return ACPI_FADT_REV_ACPI_6_0;
case ACPITAB_MADT:
return ACPI_MADT_REV_ACPI_3_0;
return ACPI_MADT_REV_ACPI_6_2;
case ACPITAB_MCFG:
return ACPI_MCFG_REV_ACPI_3_0;
case ACPITAB_TCPA:
@ -219,6 +219,7 @@ int acpi_write_fadt(struct acpi_ctx *ctx, const struct acpi_writer *entry)
memcpy(header->oem_table_id, OEM_TABLE_ID, 8);
memcpy(header->creator_id, ASLC_ID, 4);
header->creator_revision = 1;
fadt->minor_revision = 2;
fadt->x_firmware_ctrl = map_to_sysmem(ctx->facs);
fadt->x_dsdt = map_to_sysmem(ctx->dsdt);
@ -254,7 +255,7 @@ int acpi_write_madt(struct acpi_ctx *ctx, const struct acpi_writer *entry)
/* Fill out header fields */
acpi_fill_header(header, "APIC");
header->length = sizeof(struct acpi_madt);
header->revision = ACPI_MADT_REV_ACPI_3_0;
header->revision = acpi_get_table_revision(ACPITAB_MADT);
acpi_inc(ctx, sizeof(struct acpi_madt));
/* TODO: Get rid of acpi_fill_madt and use driver model */