From 26071aaadfc5926f7e01623d8fb2967456041dfc Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 15 Feb 2019 08:21:33 +0100 Subject: [PATCH] ACPI: Correct asl_compiler_revision value Change-Id: I91b54b43c8bb5cb17ff86a6d9afa95f265ee49df Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/31431 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/arch/x86/acpi.c | 5 +++-- src/include/version.h | 3 +++ src/lib/version.c | 2 ++ src/mainboard/amd/serengeti_cheetah_fam10/fadt.c | 3 ++- src/mainboard/amd/torpedo/fadt.c | 3 ++- src/mainboard/aopen/dxplplusu/fadt.c | 3 ++- src/mainboard/emulation/qemu-q35/acpi_tables.c | 3 ++- src/mainboard/google/auron/fadt.c | 3 ++- src/mainboard/google/cyan/fadt.c | 3 ++- src/mainboard/google/jecht/fadt.c | 3 ++- src/mainboard/google/rambi/fadt.c | 3 ++- src/mainboard/intel/galileo/acpi_tables.c | 3 ++- src/mainboard/intel/strago/fadt.c | 3 ++- src/mainboard/intel/wtm2/fadt.c | 3 ++- src/mainboard/lenovo/t400/fadt.c | 3 ++- src/mainboard/lenovo/x200/fadt.c | 3 ++- src/mainboard/purism/librem_bdw/fadt.c | 3 ++- src/mainboard/roda/rk9/fadt.c | 3 ++- src/soc/amd/stoneyridge/acpi.c | 3 ++- src/soc/intel/fsp_baytrail/acpi.c | 3 ++- src/soc/intel/fsp_broadwell_de/acpi.c | 3 ++- src/southbridge/amd/agesa/hudson/fadt.c | 4 +++- src/southbridge/amd/cimx/sb800/fadt.c | 4 +++- src/southbridge/amd/pi/hudson/fadt.c | 4 +++- src/southbridge/amd/sb700/fadt.c | 4 +++- src/southbridge/amd/sb800/fadt.c | 4 +++- src/southbridge/intel/fsp_rangeley/acpi.c | 3 ++- src/southbridge/intel/i82371eb/fadt.c | 4 +++- src/southbridge/intel/lynxpoint/acpi.c | 4 +++- src/southbridge/nvidia/ck804/fadt.c | 3 ++- src/southbridge/nvidia/mcp55/fadt.c | 3 ++- util/genbuild_h/genbuild_h.sh | 1 + 32 files changed, 72 insertions(+), 30 deletions(-) diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 0c85d3a2a5..f4c7d86dc0 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -47,6 +47,7 @@ #include #include #include +#include u8 acpi_checksum(u8 *table, u32 length) { @@ -409,7 +410,7 @@ void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id) memcpy(&ssdt->oem_table_id, oem_table_id, 8); ssdt->oem_revision = 42; memcpy(&ssdt->asl_compiler_id, ASLC, 4); - ssdt->asl_compiler_revision = 42; + ssdt->asl_compiler_revision = asl_revision; ssdt->length = sizeof(acpi_header_t); acpigen_set_current((char *) current); @@ -1056,7 +1057,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/include/version.h b/src/include/version.h index d8cf725166..6b0d53df0f 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -27,4 +27,7 @@ struct bcd_date { extern const struct bcd_date coreboot_build_date; +/* IASL version */ +extern const unsigned int asl_revision; + #endif /* VERSION_H */ diff --git a/src/lib/version.c b/src/lib/version.c index c84a7275e6..5b24c5cae1 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -43,3 +43,5 @@ const struct bcd_date coreboot_build_date = { .day = COREBOOT_BUILD_DAY_BCD, .weekday = COREBOOT_BUILD_WEEKDAY_BCD, }; + +const unsigned int asl_revision = ASL_VERSION; diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c index b6bcf8174d..bbb31042b0 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c @@ -22,6 +22,7 @@ #include #include #include +#include extern u32 pm_base; /* pm_base should be set in sb ACPI */ @@ -39,7 +40,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt){ memcpy(header->oem_id,OEM_ID,6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id,ASLC,4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl=(u32)facs; fadt->dsdt= (u32)dsdt; diff --git a/src/mainboard/amd/torpedo/fadt.c b/src/mainboard/amd/torpedo/fadt.c index 4de149d82e..37f7cec4b6 100644 --- a/src/mainboard/amd/torpedo/fadt.c +++ b/src/mainboard/amd/torpedo/fadt.c @@ -24,6 +24,7 @@ #include #include #include +#include /*extern*/ u16 pm_base = 0x800; /* pm_base should be set in sb ACPI */ @@ -53,7 +54,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; if ((uintptr_t)facs > 0xffffffff) printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); diff --git a/src/mainboard/aopen/dxplplusu/fadt.c b/src/mainboard/aopen/dxplplusu/fadt.c index 1d3598215c..299cac6333 100644 --- a/src/mainboard/aopen/dxplplusu/fadt.c +++ b/src/mainboard/aopen/dxplplusu/fadt.c @@ -16,6 +16,7 @@ #include #include #include +#include /* FIXME: This needs to go into a separate .h file * to be included by the ich7 smi handler, ich7 smi init @@ -41,7 +42,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c index 6fdc77f94f..b291936b34 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "../qemu-i440fx/fw_cfg.h" #include "../qemu-i440fx/acpi.h" @@ -52,7 +53,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/google/auron/fadt.c b/src/mainboard/google/auron/fadt.c index 9ee5c952e1..038b79e05d 100644 --- a/src/mainboard/google/auron/fadt.c +++ b/src/mainboard/google/auron/fadt.c @@ -16,6 +16,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -28,7 +29,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/google/cyan/fadt.c b/src/mainboard/google/cyan/fadt.c index 7455d4b87d..42568a4f98 100644 --- a/src/mainboard/google/cyan/fadt.c +++ b/src/mainboard/google/cyan/fadt.c @@ -16,6 +16,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -28,7 +29,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/google/jecht/fadt.c b/src/mainboard/google/jecht/fadt.c index 9ee5c952e1..038b79e05d 100644 --- a/src/mainboard/google/jecht/fadt.c +++ b/src/mainboard/google/jecht/fadt.c @@ -16,6 +16,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -28,7 +29,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/google/rambi/fadt.c b/src/mainboard/google/rambi/fadt.c index d02609bb84..7799c1e630 100644 --- a/src/mainboard/google/rambi/fadt.c +++ b/src/mainboard/google/rambi/fadt.c @@ -15,6 +15,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -27,7 +28,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/intel/galileo/acpi_tables.c b/src/mainboard/intel/galileo/acpi_tables.c index 543d2658d9..78b05abb89 100644 --- a/src/mainboard/intel/galileo/acpi_tables.c +++ b/src/mainboard/intel/galileo/acpi_tables.c @@ -16,6 +16,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -29,7 +30,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; /* Fill in SoC specific values */ acpi_fill_in_fadt(fadt); diff --git a/src/mainboard/intel/strago/fadt.c b/src/mainboard/intel/strago/fadt.c index e0e7d4473e..6de2cfc19a 100644 --- a/src/mainboard/intel/strago/fadt.c +++ b/src/mainboard/intel/strago/fadt.c @@ -16,6 +16,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -28,7 +29,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/intel/wtm2/fadt.c b/src/mainboard/intel/wtm2/fadt.c index 6f1553c004..2dec7c7284 100644 --- a/src/mainboard/intel/wtm2/fadt.c +++ b/src/mainboard/intel/wtm2/fadt.c @@ -15,6 +15,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -27,7 +28,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/lenovo/t400/fadt.c b/src/mainboard/lenovo/t400/fadt.c index 31336db914..e361e8dcca 100644 --- a/src/mainboard/lenovo/t400/fadt.c +++ b/src/mainboard/lenovo/t400/fadt.c @@ -18,6 +18,7 @@ #include #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/lenovo/x200/fadt.c b/src/mainboard/lenovo/x200/fadt.c index 31336db914..e361e8dcca 100644 --- a/src/mainboard/lenovo/x200/fadt.c +++ b/src/mainboard/lenovo/x200/fadt.c @@ -18,6 +18,7 @@ #include #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/mainboard/purism/librem_bdw/fadt.c b/src/mainboard/purism/librem_bdw/fadt.c index fbce9d7d33..d4cf02e9f8 100644 --- a/src/mainboard/purism/librem_bdw/fadt.c +++ b/src/mainboard/purism/librem_bdw/fadt.c @@ -15,6 +15,7 @@ #include #include +#include void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -27,7 +28,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32)facs; fadt->dsdt = (u32)dsdt; diff --git a/src/mainboard/roda/rk9/fadt.c b/src/mainboard/roda/rk9/fadt.c index 31336db914..e361e8dcca 100644 --- a/src/mainboard/roda/rk9/fadt.c +++ b/src/mainboard/roda/rk9/fadt.c @@ -18,6 +18,7 @@ #include #include #include +#include void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (unsigned long) facs; fadt->dsdt = (unsigned long) dsdt; diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index e09812b6da..d6f9bb605e 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -34,6 +34,7 @@ #include #include #include +#include unsigned long acpi_fill_madt(unsigned long current) { @@ -82,7 +83,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32) facs; fadt->dsdt = (u32) dsdt; diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index 55e4a86f9b..ad324520a0 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "chip.h" @@ -191,7 +192,7 @@ void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; /* ACPI Pointers */ fadt->firmware_ctrl = (unsigned long) facs; diff --git a/src/soc/intel/fsp_broadwell_de/acpi.c b/src/soc/intel/fsp_broadwell_de/acpi.c index fa45ea775c..f7c572d079 100644 --- a/src/soc/intel/fsp_broadwell_de/acpi.c +++ b/src/soc/intel/fsp_broadwell_de/acpi.c @@ -38,6 +38,7 @@ #include #include #include +#include uint16_t get_pmbase(void) { @@ -171,7 +172,7 @@ void acpi_fill_in_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; /* ACPI Pointers */ fadt->firmware_ctrl = (unsigned long) facs; diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c index e8483a045c..8a3f19fe05 100644 --- a/src/southbridge/amd/agesa/hudson/fadt.c +++ b/src/southbridge/amd/agesa/hudson/fadt.c @@ -22,6 +22,8 @@ #include #include #include +#include + #include "hudson.h" #include "smi.h" @@ -53,7 +55,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; if ((uintptr_t)facs > 0xffffffff) printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); diff --git a/src/southbridge/amd/cimx/sb800/fadt.c b/src/southbridge/amd/cimx/sb800/fadt.c index 15e05c398e..5823813011 100644 --- a/src/southbridge/amd/cimx/sb800/fadt.c +++ b/src/southbridge/amd/cimx/sb800/fadt.c @@ -24,6 +24,8 @@ #include #include #include +#include + #include "SBPLATFORM.h" #ifndef FADT_BOOT_ARCH @@ -57,7 +59,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; if ((uintptr_t)facs > 0xffffffff) printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c index c2d5d19ddb..21c093080a 100644 --- a/src/southbridge/amd/pi/hudson/fadt.c +++ b/src/southbridge/amd/pi/hudson/fadt.c @@ -22,6 +22,8 @@ #include #include #include +#include + #include "hudson.h" #include "smi.h" @@ -53,7 +55,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32) facs; fadt->dsdt = (u32) dsdt; diff --git a/src/southbridge/amd/sb700/fadt.c b/src/southbridge/amd/sb700/fadt.c index 8dd0c01f4b..d5c17576cb 100644 --- a/src/southbridge/amd/sb700/fadt.c +++ b/src/southbridge/amd/sb700/fadt.c @@ -24,6 +24,8 @@ #include #include #include +#include + #include "sb700.h" void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) @@ -40,7 +42,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32) facs; fadt->dsdt = (u32) dsdt; diff --git a/src/southbridge/amd/sb800/fadt.c b/src/southbridge/amd/sb800/fadt.c index ce64036f6c..ce279814cb 100644 --- a/src/southbridge/amd/sb800/fadt.c +++ b/src/southbridge/amd/sb800/fadt.c @@ -24,6 +24,8 @@ #include #include #include +#include + #include "sb800.h" void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) @@ -40,7 +42,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32) facs; fadt->dsdt = (u32) dsdt; diff --git a/src/southbridge/intel/fsp_rangeley/acpi.c b/src/southbridge/intel/fsp_rangeley/acpi.c index 96ddea5be6..0aebb20cd4 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi.c +++ b/src/southbridge/intel/fsp_rangeley/acpi.c @@ -20,6 +20,7 @@ #include #include #include +#include #if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) #include @@ -52,7 +53,7 @@ void acpi_fill_in_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 1; + header->asl_compiler_revision = asl_revision; /* ACPI Pointers */ fadt->firmware_ctrl = (unsigned long) facs; diff --git a/src/southbridge/intel/i82371eb/fadt.c b/src/southbridge/intel/i82371eb/fadt.c index 2a3a18a0f3..32ae9ffea8 100644 --- a/src/southbridge/intel/i82371eb/fadt.c +++ b/src/southbridge/intel/i82371eb/fadt.c @@ -22,6 +22,8 @@ #include #include #include +#include + #include "i82371eb.h" /** @@ -44,7 +46,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 42; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (uintptr_t)facs; fadt->dsdt = (uintptr_t)dsdt; diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c index 7f6a5ad3d2..8d4c4e6e84 100644 --- a/src/southbridge/intel/lynxpoint/acpi.c +++ b/src/southbridge/intel/lynxpoint/acpi.c @@ -19,6 +19,8 @@ #include #include #include +#include + #include "pch.h" #include "nvs.h" @@ -77,7 +79,7 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt) memcpy(&ssdt->oem_table_id, "SERIALIO", 8); ssdt->oem_revision = 43; memcpy(&ssdt->asl_compiler_id, ASLC, 4); - ssdt->asl_compiler_revision = 42; + ssdt->asl_compiler_revision = asl_revision; ssdt->length = sizeof(acpi_header_t); acpigen_set_current((char *) current); diff --git a/src/southbridge/nvidia/ck804/fadt.c b/src/southbridge/nvidia/ck804/fadt.c index fb4cbb6fcc..ea937899d3 100644 --- a/src/southbridge/nvidia/ck804/fadt.c +++ b/src/southbridge/nvidia/ck804/fadt.c @@ -20,6 +20,7 @@ #include #include #include +#include extern unsigned pm_base; /* pm_base should be set in sb acpi */ @@ -42,7 +43,7 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 0; + header->asl_compiler_revision = asl_revision; fadt->firmware_ctrl = (u32)facs; fadt->dsdt = (u32)dsdt; diff --git a/src/southbridge/nvidia/mcp55/fadt.c b/src/southbridge/nvidia/mcp55/fadt.c index f1d6e9da1f..5b00861264 100644 --- a/src/southbridge/nvidia/mcp55/fadt.c +++ b/src/southbridge/nvidia/mcp55/fadt.c @@ -22,6 +22,7 @@ #include #include #include +#include extern unsigned pm_base; @@ -43,7 +44,7 @@ void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) memcpy(header->oem_id, OEM_ID, 6); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->asl_compiler_id, ASLC, 4); - header->asl_compiler_revision = 42; + header->asl_compiler_revision = asl_revision; printk(BIOS_INFO, "ACPI: pm_base: %u...\n", pm_base); diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh index c7b06d91df..3c02b569d6 100755 --- a/util/genbuild_h/genbuild_h.sh +++ b/util/genbuild_h/genbuild_h.sh @@ -67,4 +67,5 @@ printf "#define COREBOOT_BUILD_WEEKDAY_BCD 0x$(our_date "$DATE" +%w)\n" printf "#define COREBOOT_DMI_DATE \"$(our_date "$DATE" +%m/%d/%Y)\"\n" printf "\n" printf "#define COREBOOT_COMPILE_TIME \"$(our_date "$DATE" +%T)\"\n" +printf "#define ASL_VERSION %d\n" `./util/crossgcc/xgcc/bin/iasl -v | grep version | sed 's/.*version //'` printf "#endif\n"