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>
This commit is contained in:
Elyes HAOUAS 2019-02-15 08:21:33 +01:00 committed by Patrick Georgi
parent 94ad37619f
commit 26071aaadf
32 changed files with 72 additions and 30 deletions

View File

@ -47,6 +47,7 @@
#include <cpu/x86/lapic_def.h> #include <cpu/x86/lapic_def.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cbfs.h> #include <cbfs.h>
#include <version.h>
u8 acpi_checksum(u8 *table, u32 length) 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); memcpy(&ssdt->oem_table_id, oem_table_id, 8);
ssdt->oem_revision = 42; ssdt->oem_revision = 42;
memcpy(&ssdt->asl_compiler_id, ASLC, 4); memcpy(&ssdt->asl_compiler_id, ASLC, 4);
ssdt->asl_compiler_revision = 42; ssdt->asl_compiler_revision = asl_revision;
ssdt->length = sizeof(acpi_header_t); ssdt->length = sizeof(acpi_header_t);
acpigen_set_current((char *) current); 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -27,4 +27,7 @@ struct bcd_date {
extern const struct bcd_date coreboot_build_date; extern const struct bcd_date coreboot_build_date;
/* IASL version */
extern const unsigned int asl_revision;
#endif /* VERSION_H */ #endif /* VERSION_H */

View File

@ -43,3 +43,5 @@ const struct bcd_date coreboot_build_date = {
.day = COREBOOT_BUILD_DAY_BCD, .day = COREBOOT_BUILD_DAY_BCD,
.weekday = COREBOOT_BUILD_WEEKDAY_BCD, .weekday = COREBOOT_BUILD_WEEKDAY_BCD,
}; };
const unsigned int asl_revision = ASL_VERSION;

View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <console/console.h> #include <console/console.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <version.h>
extern u32 pm_base; /* pm_base should be set in sb ACPI */ 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_id,OEM_ID,6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id,ASLC,4); memcpy(header->asl_compiler_id,ASLC,4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl=(u32)facs; fadt->firmware_ctrl=(u32)facs;
fadt->dsdt= (u32)dsdt; fadt->dsdt= (u32)dsdt;

View File

@ -24,6 +24,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <southbridge/amd/cimx/sb900/SbPlatform.h> #include <southbridge/amd/cimx/sb900/SbPlatform.h>
#include <version.h>
/*extern*/ u16 pm_base = 0x800; /*extern*/ u16 pm_base = 0x800;
/* pm_base should be set in sb ACPI */ /* 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
if ((uintptr_t)facs > 0xffffffff) if ((uintptr_t)facs > 0xffffffff)
printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n");

View File

@ -16,6 +16,7 @@
#include <string.h> #include <string.h>
#include <device/pci.h> #include <device/pci.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <version.h>
/* FIXME: This needs to go into a separate .h file /* FIXME: This needs to go into a separate .h file
* to be included by the ich7 smi handler, ich7 smi init * 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -21,6 +21,7 @@
#include <arch/smp/mpspec.h> #include <arch/smp/mpspec.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <version.h>
#include "../qemu-i440fx/fw_cfg.h" #include "../qemu-i440fx/fw_cfg.h"
#include "../qemu-i440fx/acpi.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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -16,6 +16,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -16,6 +16,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <string.h> #include <string.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -16,6 +16,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -16,6 +16,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 1; header->asl_compiler_revision = asl_revision;
/* Fill in SoC specific values */ /* Fill in SoC specific values */
acpi_fill_in_fadt(fadt); acpi_fill_in_fadt(fadt);

View File

@ -16,6 +16,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <string.h> #include <string.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -18,6 +18,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -18,6 +18,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -15,6 +15,7 @@
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 1; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32)facs; fadt->firmware_ctrl = (u32)facs;
fadt->dsdt = (u32)dsdt; fadt->dsdt = (u32)dsdt;

View File

@ -18,6 +18,7 @@
#include <device/pci.h> #include <device/pci.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <version.h>
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt; fadt->dsdt = (unsigned long) dsdt;

View File

@ -34,6 +34,7 @@
#include <soc/northbridge.h> #include <soc/northbridge.h>
#include <soc/nvs.h> #include <soc/nvs.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include <version.h>
unsigned long acpi_fill_madt(unsigned long current) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32) facs; fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt; fadt->dsdt = (u32) dsdt;

View File

@ -41,6 +41,7 @@
#include <soc/msr.h> #include <soc/msr.h>
#include <soc/pattrs.h> #include <soc/pattrs.h>
#include <cbmem.h> #include <cbmem.h>
#include <version.h>
#include "chip.h" #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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 1; header->asl_compiler_revision = asl_revision;
/* ACPI Pointers */ /* ACPI Pointers */
fadt->firmware_ctrl = (unsigned long) facs; fadt->firmware_ctrl = (unsigned long) facs;

View File

@ -38,6 +38,7 @@
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/broadwell_de.h> #include <soc/broadwell_de.h>
#include <chip.h> #include <chip.h>
#include <version.h>
uint16_t get_pmbase(void) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 1; header->asl_compiler_revision = asl_revision;
/* ACPI Pointers */ /* ACPI Pointers */
fadt->firmware_ctrl = (unsigned long) facs; fadt->firmware_ctrl = (unsigned long) facs;

View File

@ -22,6 +22,8 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <version.h>
#include "hudson.h" #include "hudson.h"
#include "smi.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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
if ((uintptr_t)facs > 0xffffffff) if ((uintptr_t)facs > 0xffffffff)
printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n");

View File

@ -24,6 +24,8 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <version.h>
#include "SBPLATFORM.h" #include "SBPLATFORM.h"
#ifndef FADT_BOOT_ARCH #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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
if ((uintptr_t)facs > 0xffffffff) if ((uintptr_t)facs > 0xffffffff)
printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n"); printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n");

View File

@ -22,6 +22,8 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <version.h>
#include "hudson.h" #include "hudson.h"
#include "smi.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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32) facs; fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt; fadt->dsdt = (u32) dsdt;

View File

@ -24,6 +24,8 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <cpu/amd/powernow.h> #include <cpu/amd/powernow.h>
#include <version.h>
#include "sb700.h" #include "sb700.h"
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32) facs; fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt; fadt->dsdt = (u32) dsdt;

View File

@ -24,6 +24,8 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <cpu/amd/powernow.h> #include <cpu/amd/powernow.h>
#include <version.h>
#include "sb800.h" #include "sb800.h"
void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt) 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32) facs; fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt; fadt->dsdt = (u32) dsdt;

View File

@ -20,6 +20,7 @@
#include <arch/acpi.h> #include <arch/acpi.h>
#include <southbridge/intel/fsp_rangeley/soc.h> #include <southbridge/intel/fsp_rangeley/soc.h>
#include <arch/io.h> #include <arch/io.h>
#include <version.h>
#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) #if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
@ -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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 1; header->asl_compiler_revision = asl_revision;
/* ACPI Pointers */ /* ACPI Pointers */
fadt->firmware_ctrl = (unsigned long) facs; fadt->firmware_ctrl = (unsigned long) facs;

View File

@ -22,6 +22,8 @@
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <version.h>
#include "i82371eb.h" #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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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->firmware_ctrl = (uintptr_t)facs;
fadt->dsdt = (uintptr_t)dsdt; fadt->dsdt = (uintptr_t)dsdt;

View File

@ -19,6 +19,8 @@
#include <cbmem.h> #include <cbmem.h>
#include <types.h> #include <types.h>
#include <string.h> #include <string.h>
#include <version.h>
#include "pch.h" #include "pch.h"
#include "nvs.h" #include "nvs.h"
@ -77,7 +79,7 @@ void acpi_create_serialio_ssdt(acpi_header_t *ssdt)
memcpy(&ssdt->oem_table_id, "SERIALIO", 8); memcpy(&ssdt->oem_table_id, "SERIALIO", 8);
ssdt->oem_revision = 43; ssdt->oem_revision = 43;
memcpy(&ssdt->asl_compiler_id, ASLC, 4); memcpy(&ssdt->asl_compiler_id, ASLC, 4);
ssdt->asl_compiler_revision = 42; ssdt->asl_compiler_revision = asl_revision;
ssdt->length = sizeof(acpi_header_t); ssdt->length = sizeof(acpi_header_t);
acpigen_set_current((char *) current); acpigen_set_current((char *) current);

View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <console/console.h> #include <console/console.h>
#include <arch/acpi.h> #include <arch/acpi.h>
#include <version.h>
extern unsigned pm_base; /* pm_base should be set in sb acpi */ 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); memcpy(header->asl_compiler_id, ASLC, 4);
header->asl_compiler_revision = 0; header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (u32)facs; fadt->firmware_ctrl = (u32)facs;
fadt->dsdt = (u32)dsdt; fadt->dsdt = (u32)dsdt;

View File

@ -22,6 +22,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <version.h>
extern unsigned pm_base; 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_id, OEM_ID, 6);
memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8); memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
memcpy(header->asl_compiler_id, ASLC, 4); 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); printk(BIOS_INFO, "ACPI: pm_base: %u...\n", pm_base);

View File

@ -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 "#define COREBOOT_DMI_DATE \"$(our_date "$DATE" +%m/%d/%Y)\"\n"
printf "\n" printf "\n"
printf "#define COREBOOT_COMPILE_TIME \"$(our_date "$DATE" +%T)\"\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" printf "#endif\n"