intel/apollolake: Add CBMEM console to GNVS
CBMEM console stores all the console logs in CBMEM. Address of this location in CBMEM where console logs are stored needs to be passed up to OS using GNVS. 1. Add CBMC to GNVS fields in globalnvs.asl 2. Add cbmc member to global_nvs_t structure in nvs.h 3. Initialize gnvs->cbmc to address of cbmem console BUG=chrome-os-partner:54342 Change-Id: Idcd4573e626fa433c1623bdcbe29921de64539b2 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/15177 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
This commit is contained in:
parent
eb8b7d6ef4
commit
d01f5a01e6
|
@ -144,6 +144,9 @@ unsigned long southbridge_write_acpi_tables(device_t device,
|
||||||
|
|
||||||
static void acpi_create_gnvs(struct global_nvs_t *gnvs)
|
static void acpi_create_gnvs(struct global_nvs_t *gnvs)
|
||||||
{
|
{
|
||||||
|
if (IS_ENABLED(CONFIG_CONSOLE_CBMEM))
|
||||||
|
gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_CHROMEOS)) {
|
if (IS_ENABLED(CONFIG_CHROMEOS)) {
|
||||||
/* Initialize Verified Boot data */
|
/* Initialize Verified Boot data */
|
||||||
chromeos_init_vboot(&gnvs->chromeos);
|
chromeos_init_vboot(&gnvs->chromeos);
|
||||||
|
|
|
@ -33,6 +33,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
|
||||||
LIDS, 8, // 0x03 - LID State
|
LIDS, 8, // 0x03 - LID State
|
||||||
PWRS, 8, // 0x04 - AC Power State
|
PWRS, 8, // 0x04 - AC Power State
|
||||||
DPTE, 8, // 0x05 - Enable DPTF
|
DPTE, 8, // 0x05 - Enable DPTF
|
||||||
|
CBMC, 32, // 0x06 - 0x09 - Coreboot Memory Console
|
||||||
|
|
||||||
/* ChromeOS stuff (0x100 -> 0xfff, size 0xeff) */
|
/* ChromeOS stuff (0x100 -> 0xfff, size 0xeff) */
|
||||||
Offset (0x100),
|
Offset (0x100),
|
||||||
|
|
|
@ -33,7 +33,8 @@ struct global_nvs_t {
|
||||||
uint8_t lids; /* 0x03 - LID State */
|
uint8_t lids; /* 0x03 - LID State */
|
||||||
uint8_t pwrs; /* 0x04 - AC Power State */
|
uint8_t pwrs; /* 0x04 - AC Power State */
|
||||||
uint8_t dpte; /* 0x05 - Enable DPTF */
|
uint8_t dpte; /* 0x05 - Enable DPTF */
|
||||||
uint8_t unused[251];
|
uint32_t cbmc; /* 0x06 - 0x09 - Coreboot Memory Console */
|
||||||
|
uint8_t unused[247];
|
||||||
|
|
||||||
/* ChromeOS specific (0x100 - 0xfff) */
|
/* ChromeOS specific (0x100 - 0xfff) */
|
||||||
chromeos_acpi_t chromeos;
|
chromeos_acpi_t chromeos;
|
||||||
|
|
Loading…
Reference in New Issue