GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vc/google/chromeos: Account for GNVS allocated early 

We have adjusted allocation order such that GNVS is available
before ME hash needs to be stored.

Change-Id: I8428dd85f44935938a118a682767f2f8d6d539ab
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50610
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Kyösti Mälkki 2021-02-12 18:46:57 +02:00
parent fca1797757
commit 9e74c42b1f
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/vendorcode/google/chromeos/gnvs.c
View File

@ -14,7 +14,6 @@
#include "gnvs.h" #include "gnvs.h"
static chromeos_acpi_t *chromeos_acpi; static chromeos_acpi_t *chromeos_acpi;
static u32 me_hash_saved[8];
static size_t chromeos_vpd_region(const char *region, uintptr_t *base) static size_t chromeos_vpd_region(const char *region, uintptr_t *base)
{ {
@ -35,9 +34,6 @@ void chromeos_init_chromeos_acpi(chromeos_acpi_t *init)
chromeos_acpi = init; chromeos_acpi = init;
/* Copy saved ME hash into NVS */
memcpy(chromeos_acpi->mehh, me_hash_saved, sizeof(chromeos_acpi->mehh));
vpd_size = chromeos_vpd_region("RO_VPD", &vpd_base); vpd_size = chromeos_vpd_region("RO_VPD", &vpd_base);
if (vpd_size && vpd_base) { if (vpd_size && vpd_base) {
chromeos_acpi->vpd_ro_base = vpd_base; chromeos_acpi->vpd_ro_base = vpd_base;
@ -56,12 +52,9 @@ void chromeos_set_me_hash(u32 *hash, int len)
if ((len*sizeof(u32)) > sizeof(chromeos_acpi->mehh)) if ((len*sizeof(u32)) > sizeof(chromeos_acpi->mehh))
return; return;
/* Copy to NVS or save until it is ready */ /* Copy to NVS. */
if (chromeos_acpi) if (chromeos_acpi)
/* This does never happen! */
memcpy(chromeos_acpi->mehh, hash, len*sizeof(u32)); memcpy(chromeos_acpi->mehh, hash, len*sizeof(u32));
else
memcpy(me_hash_saved, hash, len*sizeof(u32));
} }
chromeos_acpi_t *chromeos_get_chromeos_acpi(void) chromeos_acpi_t *chromeos_get_chromeos_acpi(void)