From 1d8c7da5b4bd8eac56c78529d9fdfa52658d6862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 4 Feb 2022 06:49:59 +0200 Subject: ChromeoS: Retain ACPI CNVS contents on S3 resume MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For platforms without EC_GOOGLE_CHROMEEC S3 resume path always reported ACTIVE_ECFW_RO because acpi_fill_cnvs() and mainboard_chromeos_acpi_generate() were not called. Change-Id: Iea71a51aba7ab1b6966389c17a1e06ccc96ae0e9 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/61619 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/vendorcode/google/chromeos/gnvs.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 7236662df70a..7821786979b6 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -40,6 +40,10 @@ void chromeos_init_chromeos_acpi(void) if (!chromeos_acpi) return; + /* Retain CNVS contents on S3 resume path. */ + if (acpi_is_wakeup_s3()) + return; + vpd_size = chromeos_vpd_region("RO_VPD", &vpd_base); if (vpd_size && vpd_base) { chromeos_acpi->vpd_ro_base = vpd_base; -- cgit v1.2.3