HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31431
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
ACPI: Correct asl_compiler_revision value
Change-Id: I91b54b43c8bb5cb17ff86a6d9afa95f265ee49df Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/arch/x86/acpi.c M src/arch/x86/include/arch/acpi.h M src/mainboard/amd/serengeti_cheetah_fam10/fadt.c M src/mainboard/amd/torpedo/fadt.c M src/mainboard/aopen/dxplplusu/fadt.c M src/mainboard/emulation/qemu-q35/acpi_tables.c M src/mainboard/google/auron/fadt.c M src/mainboard/google/cyan/fadt.c M src/mainboard/google/jecht/fadt.c M src/mainboard/google/rambi/fadt.c M src/mainboard/intel/galileo/acpi_tables.c M src/mainboard/intel/strago/fadt.c M src/mainboard/intel/wtm2/fadt.c M src/mainboard/lenovo/t400/fadt.c M src/mainboard/lenovo/x200/fadt.c M src/mainboard/purism/librem_bdw/fadt.c M src/mainboard/roda/rk9/fadt.c M src/soc/amd/stoneyridge/acpi.c M src/soc/intel/fsp_baytrail/acpi.c M src/soc/intel/fsp_broadwell_de/acpi.c M src/southbridge/amd/agesa/hudson/fadt.c M src/southbridge/amd/cimx/sb800/fadt.c M src/southbridge/amd/pi/hudson/fadt.c M src/southbridge/amd/sb700/fadt.c M src/southbridge/amd/sb800/fadt.c M src/southbridge/intel/fsp_rangeley/acpi.c M src/southbridge/intel/i82371eb/fadt.c M src/southbridge/intel/lynxpoint/acpi.c M src/southbridge/nvidia/ck804/fadt.c M src/southbridge/nvidia/mcp55/fadt.c 30 files changed, 32 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/31431/1
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 0c85d3a..2e6014e 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -409,7 +409,7 @@ 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 +1056,7 @@ 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/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index a061a27..a83302d 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -71,6 +71,8 @@ */ #define COREBOOT_ACPI_ID "BOOT" /* ACPI ID for coreboot HIDs */
+#define ASL_REVISION 20190108 + /* List of ACPI HID that use the coreboot ACPI ID */ enum coreboot_acpi_ids { COREBOOT_ACPI_ID_CBTABLE = 0x0000, /* BOOT0000 */ diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c index b6bcf81..ad33d75 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c @@ -39,7 +39,7 @@ 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 4de149d8..abad8e06 100644 --- a/src/mainboard/amd/torpedo/fadt.c +++ b/src/mainboard/amd/torpedo/fadt.c @@ -53,7 +53,7 @@ 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 1d35982..eb3023c 100644 --- a/src/mainboard/aopen/dxplplusu/fadt.c +++ b/src/mainboard/aopen/dxplplusu/fadt.c @@ -41,7 +41,7 @@ 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 99184ca..b8eb918 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -52,7 +52,7 @@ 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 9ee5c95..14edd03 100644 --- a/src/mainboard/google/auron/fadt.c +++ b/src/mainboard/google/auron/fadt.c @@ -28,7 +28,7 @@ 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 7455d4b..2a0f4d2 100644 --- a/src/mainboard/google/cyan/fadt.c +++ b/src/mainboard/google/cyan/fadt.c @@ -28,7 +28,7 @@ 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 9ee5c95..14edd03 100644 --- a/src/mainboard/google/jecht/fadt.c +++ b/src/mainboard/google/jecht/fadt.c @@ -28,7 +28,7 @@ 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 d02609b..154820a 100644 --- a/src/mainboard/google/rambi/fadt.c +++ b/src/mainboard/google/rambi/fadt.c @@ -27,7 +27,7 @@ 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 543d265..02973d9 100644 --- a/src/mainboard/intel/galileo/acpi_tables.c +++ b/src/mainboard/intel/galileo/acpi_tables.c @@ -29,7 +29,7 @@ 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 e0e7d44..94279e2 100644 --- a/src/mainboard/intel/strago/fadt.c +++ b/src/mainboard/intel/strago/fadt.c @@ -28,7 +28,7 @@ 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 6f1553c..03636f4 100644 --- a/src/mainboard/intel/wtm2/fadt.c +++ b/src/mainboard/intel/wtm2/fadt.c @@ -27,7 +27,7 @@ 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 ab257f8..af474ed 100644 --- a/src/mainboard/lenovo/t400/fadt.c +++ b/src/mainboard/lenovo/t400/fadt.c @@ -31,7 +31,7 @@ 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 ab257f8..af474ed 100644 --- a/src/mainboard/lenovo/x200/fadt.c +++ b/src/mainboard/lenovo/x200/fadt.c @@ -31,7 +31,7 @@ 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 fbce9d7..8a6e8e0 100644 --- a/src/mainboard/purism/librem_bdw/fadt.c +++ b/src/mainboard/purism/librem_bdw/fadt.c @@ -27,7 +27,7 @@ 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 ab257f8..af474ed 100644 --- a/src/mainboard/roda/rk9/fadt.c +++ b/src/mainboard/roda/rk9/fadt.c @@ -31,7 +31,7 @@ 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 e09812b..f119326 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -82,7 +82,7 @@ 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 55e4a86..f5fc6b2 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -191,7 +191,7 @@ 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 71aa0a3..c663e8f 100644 --- a/src/soc/intel/fsp_broadwell_de/acpi.c +++ b/src/soc/intel/fsp_broadwell_de/acpi.c @@ -170,7 +170,7 @@ 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 e8483a0..dc12161 100644 --- a/src/southbridge/amd/agesa/hudson/fadt.c +++ b/src/southbridge/amd/agesa/hudson/fadt.c @@ -53,7 +53,7 @@ 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 15e05c3..a66815c 100644 --- a/src/southbridge/amd/cimx/sb800/fadt.c +++ b/src/southbridge/amd/cimx/sb800/fadt.c @@ -57,7 +57,7 @@ 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 c2d5d19..1adbf1f 100644 --- a/src/southbridge/amd/pi/hudson/fadt.c +++ b/src/southbridge/amd/pi/hudson/fadt.c @@ -53,7 +53,7 @@ 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 8dd0c01..56eba19 100644 --- a/src/southbridge/amd/sb700/fadt.c +++ b/src/southbridge/amd/sb700/fadt.c @@ -40,7 +40,7 @@ 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 ce64036..ddf80aa 100644 --- a/src/southbridge/amd/sb800/fadt.c +++ b/src/southbridge/amd/sb800/fadt.c @@ -40,7 +40,7 @@ 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 96ddea5..2246051 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi.c +++ b/src/southbridge/intel/fsp_rangeley/acpi.c @@ -52,7 +52,7 @@ 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 41ad31c..c67b93c 100644 --- a/src/southbridge/intel/i82371eb/fadt.c +++ b/src/southbridge/intel/i82371eb/fadt.c @@ -44,7 +44,7 @@ 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 = (u32)facs; fadt->dsdt = (u32)dsdt; diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c index 7f6a5ad..f044ca0 100644 --- a/src/southbridge/intel/lynxpoint/acpi.c +++ b/src/southbridge/intel/lynxpoint/acpi.c @@ -77,7 +77,7 @@ 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 ee9db2f..19283dd 100644 --- a/src/southbridge/nvidia/ck804/fadt.c +++ b/src/southbridge/nvidia/ck804/fadt.c @@ -42,7 +42,7 @@ 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 8064b12..fe24ecc 100644 --- a/src/southbridge/nvidia/mcp55/fadt.c +++ b/src/southbridge/nvidia/mcp55/fadt.c @@ -43,7 +43,7 @@ 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);
HAOUAS Elyes has removed Patrick Rudolph from this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Removed reviewer Patrick Rudolph.
David Guckian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Patch Set 1: Code-Review+1
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Patch Set 2:
(1 comment)
I like the idea overall. I think we should get the version directly from the compiler, then encode it as BCD.
We can add the code to get the compiler version into genbuild_h: iasl -v | grep version | sed 's/.*version //'
This is a good first step to that though. Thanks!
https://review.coreboot.org/#/c/31431/2/src/arch/x86/include/arch/acpi.h File src/arch/x86/include/arch/acpi.h:
https://review.coreboot.org/#/c/31431/2/src/arch/x86/include/arch/acpi.h@74 PS2, Line 74: 20190108 maybe use BCD - 0x20190108 ?
Hello Alexander Couzens, Patrick Rudolph, David Guckian, Huang Jin, York Yang, Patrick Rudolph, Philipp Deppenwiese, build bot (Jenkins), David Guckian,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31431
to look at the new patch set (#3).
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
ACPI: Correct asl_compiler_revision value
Change-Id: I91b54b43c8bb5cb17ff86a6d9afa95f265ee49df Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/arch/x86/acpi.c M src/include/version.h M src/lib/version.c M src/mainboard/amd/serengeti_cheetah_fam10/fadt.c M src/mainboard/amd/torpedo/fadt.c M src/mainboard/aopen/dxplplusu/fadt.c M src/mainboard/emulation/qemu-q35/acpi_tables.c M src/mainboard/google/auron/fadt.c M src/mainboard/google/cyan/fadt.c M src/mainboard/google/jecht/fadt.c M src/mainboard/google/rambi/fadt.c M src/mainboard/intel/galileo/acpi_tables.c M src/mainboard/intel/strago/fadt.c M src/mainboard/intel/wtm2/fadt.c M src/mainboard/lenovo/t400/fadt.c M src/mainboard/lenovo/x200/fadt.c M src/mainboard/purism/librem_bdw/fadt.c M src/mainboard/roda/rk9/fadt.c M src/soc/amd/stoneyridge/acpi.c M src/soc/intel/fsp_baytrail/acpi.c M src/soc/intel/fsp_broadwell_de/acpi.c M src/southbridge/amd/agesa/hudson/fadt.c M src/southbridge/amd/cimx/sb800/fadt.c M src/southbridge/amd/pi/hudson/fadt.c M src/southbridge/amd/sb700/fadt.c M src/southbridge/amd/sb800/fadt.c M src/southbridge/intel/fsp_rangeley/acpi.c M src/southbridge/intel/i82371eb/fadt.c M src/southbridge/intel/lynxpoint/acpi.c M src/southbridge/nvidia/ck804/fadt.c M src/southbridge/nvidia/mcp55/fadt.c M util/genbuild_h/genbuild_h.sh 32 files changed, 72 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/31431/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/31431/3/util/genbuild_h/genbuild_h.sh File util/genbuild_h/genbuild_h.sh:
https://review.coreboot.org/#/c/31431/3/util/genbuild_h/genbuild_h.sh@70 PS3, Line 70: printf "#define ASL_VERSION %d\n" `./util/crossgcc/xgcc/bin/iasl -v | grep version | sed 's/.*version //'` line over 80 characters
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
ACPI: Correct asl_compiler_revision value
Change-Id: I91b54b43c8bb5cb17ff86a6d9afa95f265ee49df Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/31431 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M src/arch/x86/acpi.c M src/include/version.h M src/lib/version.c M src/mainboard/amd/serengeti_cheetah_fam10/fadt.c M src/mainboard/amd/torpedo/fadt.c M src/mainboard/aopen/dxplplusu/fadt.c M src/mainboard/emulation/qemu-q35/acpi_tables.c M src/mainboard/google/auron/fadt.c M src/mainboard/google/cyan/fadt.c M src/mainboard/google/jecht/fadt.c M src/mainboard/google/rambi/fadt.c M src/mainboard/intel/galileo/acpi_tables.c M src/mainboard/intel/strago/fadt.c M src/mainboard/intel/wtm2/fadt.c M src/mainboard/lenovo/t400/fadt.c M src/mainboard/lenovo/x200/fadt.c M src/mainboard/purism/librem_bdw/fadt.c M src/mainboard/roda/rk9/fadt.c M src/soc/amd/stoneyridge/acpi.c M src/soc/intel/fsp_baytrail/acpi.c M src/soc/intel/fsp_broadwell_de/acpi.c M src/southbridge/amd/agesa/hudson/fadt.c M src/southbridge/amd/cimx/sb800/fadt.c M src/southbridge/amd/pi/hudson/fadt.c M src/southbridge/amd/sb700/fadt.c M src/southbridge/amd/sb800/fadt.c M src/southbridge/intel/fsp_rangeley/acpi.c M src/southbridge/intel/i82371eb/fadt.c M src/southbridge/intel/lynxpoint/acpi.c M src/southbridge/nvidia/ck804/fadt.c M src/southbridge/nvidia/mcp55/fadt.c M util/genbuild_h/genbuild_h.sh 32 files changed, 72 insertions(+), 30 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c index 0c85d3a..f4c7d86 100644 --- a/src/arch/x86/acpi.c +++ b/src/arch/x86/acpi.c @@ -47,6 +47,7 @@ #include <cpu/x86/lapic_def.h> #include <cpu/cpu.h> #include <cbfs.h> +#include <version.h>
u8 acpi_checksum(u8 *table, u32 length) { @@ -409,7 +410,7 @@ 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 @@ 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 d8cf725..6b0d53d 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -27,4 +27,7 @@
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 c84a727..5b24c5c 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -43,3 +43,5 @@ .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 b6bcf81..bbb3104 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c +++ b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c @@ -22,6 +22,7 @@ #include <string.h> #include <console/console.h> #include <arch/acpi.h> +#include <version.h>
extern u32 pm_base; /* pm_base should be set in sb ACPI */
@@ -39,7 +40,7 @@ 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 4de149d8..37f7cec 100644 --- a/src/mainboard/amd/torpedo/fadt.c +++ b/src/mainboard/amd/torpedo/fadt.c @@ -24,6 +24,7 @@ #include <arch/io.h> #include <device/device.h> #include <southbridge/amd/cimx/sb900/SbPlatform.h> +#include <version.h>
/*extern*/ u16 pm_base = 0x800; /* pm_base should be set in sb ACPI */ @@ -53,7 +54,7 @@ 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 1d35982..299cac6 100644 --- a/src/mainboard/aopen/dxplplusu/fadt.c +++ b/src/mainboard/aopen/dxplplusu/fadt.c @@ -16,6 +16,7 @@ #include <string.h> #include <device/pci.h> #include <arch/acpi.h> +#include <version.h>
/* 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 @@ 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 6fdc77f..b291936 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -21,6 +21,7 @@ #include <arch/smp/mpspec.h> #include <device/device.h> #include <device/pci.h> +#include <version.h>
#include "../qemu-i440fx/fw_cfg.h" #include "../qemu-i440fx/acpi.h" @@ -52,7 +53,7 @@ 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 9ee5c95..038b79e 100644 --- a/src/mainboard/google/auron/fadt.c +++ b/src/mainboard/google/auron/fadt.c @@ -16,6 +16,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -28,7 +29,7 @@ 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 7455d4b..42568a4 100644 --- a/src/mainboard/google/cyan/fadt.c +++ b/src/mainboard/google/cyan/fadt.c @@ -16,6 +16,7 @@
#include <soc/acpi.h> #include <string.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -28,7 +29,7 @@ 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 9ee5c95..038b79e 100644 --- a/src/mainboard/google/jecht/fadt.c +++ b/src/mainboard/google/jecht/fadt.c @@ -16,6 +16,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -28,7 +29,7 @@ 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 d02609b..7799c1e 100644 --- a/src/mainboard/google/rambi/fadt.c +++ b/src/mainboard/google/rambi/fadt.c @@ -15,6 +15,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -27,7 +28,7 @@ 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 543d265..78b05ab 100644 --- a/src/mainboard/intel/galileo/acpi_tables.c +++ b/src/mainboard/intel/galileo/acpi_tables.c @@ -16,6 +16,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -29,7 +30,7 @@ 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 e0e7d44..6de2cfc 100644 --- a/src/mainboard/intel/strago/fadt.c +++ b/src/mainboard/intel/strago/fadt.c @@ -16,6 +16,7 @@
#include <soc/acpi.h> #include <string.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -28,7 +29,7 @@ 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 6f1553c..2dec7c7 100644 --- a/src/mainboard/intel/wtm2/fadt.c +++ b/src/mainboard/intel/wtm2/fadt.c @@ -15,6 +15,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -27,7 +28,7 @@ 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 31336db..e361e8d 100644 --- a/src/mainboard/lenovo/t400/fadt.c +++ b/src/mainboard/lenovo/t400/fadt.c @@ -18,6 +18,7 @@ #include <device/pci.h> #include <arch/acpi.h> #include <cpu/x86/smm.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ 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 31336db..e361e8d 100644 --- a/src/mainboard/lenovo/x200/fadt.c +++ b/src/mainboard/lenovo/x200/fadt.c @@ -18,6 +18,7 @@ #include <device/pci.h> #include <arch/acpi.h> #include <cpu/x86/smm.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ 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 fbce9d7..d4cf02e 100644 --- a/src/mainboard/purism/librem_bdw/fadt.c +++ b/src/mainboard/purism/librem_bdw/fadt.c @@ -15,6 +15,7 @@
#include <string.h> #include <soc/acpi.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) { @@ -27,7 +28,7 @@ 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 31336db..e361e8d 100644 --- a/src/mainboard/roda/rk9/fadt.c +++ b/src/mainboard/roda/rk9/fadt.c @@ -18,6 +18,7 @@ #include <device/pci.h> #include <arch/acpi.h> #include <cpu/x86/smm.h> +#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) { @@ -31,7 +32,7 @@ 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 e09812b..d6f9bb6 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -34,6 +34,7 @@ #include <soc/northbridge.h> #include <soc/nvs.h> #include <soc/gpio.h> +#include <version.h>
unsigned long acpi_fill_madt(unsigned long current) { @@ -82,7 +83,7 @@ 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 55e4a86..ad32452 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/src/soc/intel/fsp_baytrail/acpi.c @@ -41,6 +41,7 @@ #include <soc/msr.h> #include <soc/pattrs.h> #include <cbmem.h> +#include <version.h>
#include "chip.h"
@@ -191,7 +192,7 @@ 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 fa45ea7..f7c572d 100644 --- a/src/soc/intel/fsp_broadwell_de/acpi.c +++ b/src/soc/intel/fsp_broadwell_de/acpi.c @@ -38,6 +38,7 @@ #include <soc/pci_devs.h> #include <soc/broadwell_de.h> #include <chip.h> +#include <version.h>
uint16_t get_pmbase(void) { @@ -171,7 +172,7 @@ 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 e8483a0..8a3f19f 100644 --- a/src/southbridge/amd/agesa/hudson/fadt.c +++ b/src/southbridge/amd/agesa/hudson/fadt.c @@ -22,6 +22,8 @@ #include <arch/acpi.h> #include <arch/io.h> #include <device/device.h> +#include <version.h> + #include "hudson.h" #include "smi.h"
@@ -53,7 +55,7 @@ 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 15e05c3..5823813 100644 --- a/src/southbridge/amd/cimx/sb800/fadt.c +++ b/src/southbridge/amd/cimx/sb800/fadt.c @@ -24,6 +24,8 @@ #include <arch/acpi.h> #include <arch/io.h> #include <device/device.h> +#include <version.h> + #include "SBPLATFORM.h"
#ifndef FADT_BOOT_ARCH @@ -57,7 +59,7 @@ 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 c2d5d19..21c0930 100644 --- a/src/southbridge/amd/pi/hudson/fadt.c +++ b/src/southbridge/amd/pi/hudson/fadt.c @@ -22,6 +22,8 @@ #include <arch/acpi.h> #include <arch/io.h> #include <device/device.h> +#include <version.h> + #include "hudson.h" #include "smi.h"
@@ -53,7 +55,7 @@ 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 8dd0c01..d5c1757 100644 --- a/src/southbridge/amd/sb700/fadt.c +++ b/src/southbridge/amd/sb700/fadt.c @@ -24,6 +24,8 @@ #include <arch/io.h> #include <device/device.h> #include <cpu/amd/powernow.h> +#include <version.h> + #include "sb700.h"
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) @@ -40,7 +42,7 @@ 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 ce64036..ce27981 100644 --- a/src/southbridge/amd/sb800/fadt.c +++ b/src/southbridge/amd/sb800/fadt.c @@ -24,6 +24,8 @@ #include <arch/io.h> #include <device/device.h> #include <cpu/amd/powernow.h> +#include <version.h> + #include "sb800.h"
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) @@ -40,7 +42,7 @@ 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 96ddea5..0aebb20 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi.c +++ b/src/southbridge/intel/fsp_rangeley/acpi.c @@ -20,6 +20,7 @@ #include <arch/acpi.h> #include <southbridge/intel/fsp_rangeley/soc.h> #include <arch/io.h> +#include <version.h>
#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) #include <cpu/x86/smm.h> @@ -52,7 +53,7 @@ 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 2a3a18a..32ae9ff 100644 --- a/src/southbridge/intel/i82371eb/fadt.c +++ b/src/southbridge/intel/i82371eb/fadt.c @@ -22,6 +22,8 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> +#include <version.h> + #include "i82371eb.h"
/** @@ -44,7 +46,7 @@ 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 7f6a5ad..8d4c4e6 100644 --- a/src/southbridge/intel/lynxpoint/acpi.c +++ b/src/southbridge/intel/lynxpoint/acpi.c @@ -19,6 +19,8 @@ #include <cbmem.h> #include <types.h> #include <string.h> +#include <version.h> + #include "pch.h" #include "nvs.h"
@@ -77,7 +79,7 @@ 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 fb4cbb6..ea93789 100644 --- a/src/southbridge/nvidia/ck804/fadt.c +++ b/src/southbridge/nvidia/ck804/fadt.c @@ -20,6 +20,7 @@ #include <string.h> #include <console/console.h> #include <arch/acpi.h> +#include <version.h>
extern unsigned pm_base; /* pm_base should be set in sb acpi */
@@ -42,7 +43,7 @@ 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 f1d6e9d..5b00861 100644 --- a/src/southbridge/nvidia/mcp55/fadt.c +++ b/src/southbridge/nvidia/mcp55/fadt.c @@ -22,6 +22,7 @@ #include <arch/io.h> #include <device/device.h> #include <device/pci_ids.h> +#include <version.h>
extern unsigned pm_base;
@@ -43,7 +44,7 @@ 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 c7b06d9..3c02b56 100755 --- a/util/genbuild_h/genbuild_h.sh +++ b/util/genbuild_h/genbuild_h.sh @@ -67,4 +67,5 @@ 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"
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31431 )
Change subject: ACPI: Correct asl_compiler_revision value ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/#/c/31431/4/util/genbuild_h/genbuild_h.sh File util/genbuild_h/genbuild_h.sh:
https://review.coreboot.org/#/c/31431/4/util/genbuild_h/genbuild_h.sh@70 PS4, Line 70: "#define ASL_VERSION %d\n" missing "0x" it should be : "#define ASL_VERSION 0x%d\n" .....
-
build bot (Jenkins) (Code Review) -
David Guckian (Code Review)
-
HAOUAS Elyes (Code Review)
-
Martin Roth (Code Review)
-
Patrick Georgi (Code Review)