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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61619
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

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;