From 9e74c42b1f76604da0c904b4e9e860e31330da0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 12 Feb 2021 18:46:57 +0200 Subject: [PATCH] vc/google/chromeos: Account for GNVS allocated early MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50610 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/vendorcode/google/chromeos/gnvs.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 62d19d6d51..024dbe3bfa 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -14,7 +14,6 @@ #include "gnvs.h" static chromeos_acpi_t *chromeos_acpi; -static u32 me_hash_saved[8]; 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; - /* 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); if (vpd_size && 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)) return; - /* Copy to NVS or save until it is ready */ + /* Copy to NVS. */ if (chromeos_acpi) - /* This does never happen! */ 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)