From 26071aaadfc5926f7e01623d8fb2967456041dfc Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 15 Feb 2019 08:21:33 +0100 Subject: 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/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 ++- 10 files changed, 27 insertions(+), 10 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c index e8483a045c7d..8a3f19fe05e6 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 15e05c398e82..582381301172 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 c2d5d19ddb6c..21c093080a36 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 8dd0c01f4b89..d5c17576cb73 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 ce64036f6cc8..ce279814cb3c 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 96ddea5be674..0aebb20cd476 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 2a3a18a0f3a7..32ae9ffea83b 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 7f6a5ad3d223..8d4c4e6e84f7 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 fb4cbb6fccc0..ea937899d3dd 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 f1d6e9da1fa4..5b0086126484 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); -- cgit v1.2.3