Duncan Laurie (dlaurie@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16724
-gerrit
commit ab58af1ee1b434b9910148644c7440644b0cb56e Author: Duncan Laurie dlaurie@chromium.org Date: Thu Sep 22 14:08:33 2016 -0700
x86: acpi: Use GOOG ID for coreboot table
Use the GOOG ACPI ID until there is an official ID allocation for coreboot. Since I administer this range I allocated 0xCB00-0xCBFF for coreboot use.
Change-Id: I38ac0a0267e21f7282c89ef19e8bb72339f13846 Signed-off-by: Duncan Laurie dlaurie@chromium.org --- src/arch/x86/acpigen.c | 2 +- src/arch/x86/include/arch/acpi.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c index c55611b..2d626ab 100644 --- a/src/arch/x86/acpigen.c +++ b/src/arch/x86/acpigen.c @@ -224,7 +224,7 @@ void acpigen_write_coreboot_hid(enum coreboot_acpi_ids id) { char hid[9]; /* CORExxxx */
- snprintf(hid, sizeof(hid), "%.4s%04u", COREBOOT_ACPI_ID, id); + snprintf(hid, sizeof(hid), "%.4s%04X", COREBOOT_ACPI_ID, id); acpigen_write_name_string("_HID", hid); }
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 7d29931..6a548ba 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -57,11 +57,14 @@ #define ACPI_TABLE_CREATOR "COREBOOT" /* Must be exactly 8 bytes long! */ #define OEM_ID "CORE " /* Must be exactly 6 bytes long! */ #define ASLC "CORE" /* Must be exactly 4 bytes long! */ -#define COREBOOT_ACPI_ID "CORE" /* ACPI ID for coreboot HIDs */ + +/* Use GOOGCGxx range until coreboot ID is official */ +#define COREBOOT_ACPI_ID "GOOG" /* ACPI ID for coreboot HIDs */
/* List of ACPI HID that use the coreboot ACPI ID */ enum coreboot_acpi_ids { - COREBOOT_ACPI_ID_CBTABLE, /* CORE0000 */ + COREBOOT_ACPI_ID_CBTABLE = 0xCB00, /* GOOGCB00 */ + COREBOOT_ACPI_ID_MAX = 0xCBFF, /* GOOGCBFF */ };
/* RSDP (Root System Description Pointer) */