[coreboot-gerrit] Change in coreboot[master]: ChromeoS: Retain ACPI CNVS contents on S3 resume

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61619 )

Change subject: ChromeoS: Retain ACPI CNVS contents on S3 resume
......................................................................

ChromeoS: Retain ACPI CNVS contents on S3 resume

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 
---
M src/vendorcode/google/chromeos/gnvs.c
1 file changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/61619/1

diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index 7236662..7821786 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -40,6 +40,10 @@
    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;