Bill XIE has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/78287?usp=email )
Change subject: drivers/pc80/rtc/option.c: Stop resetting CMOS during s3 resume ......................................................................
drivers/pc80/rtc/option.c: Stop resetting CMOS during s3 resume
After commit e12b313844d (...: Add Kconfig for RTC CMOS base addresses), Thinkpad X200 with CONFIG(STATIC_OPTION_TABLE) can no longer resume from s3 (detected via bisect), but resetting CMOS seems unnecessary during s3 resume.
Now, cmos_need_reset will be negated by acpi_is_wakeup_s3() returning true.
Tested: Thinkpad X200 with CONFIG(STATIC_OPTION_TABLE) can resume from s3 again with these changes. Change-Id: I533e83f3b95f327b0e24f4d750f8812325b7770b --- M src/drivers/pc80/rtc/option.c 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/78287/1
diff --git a/src/drivers/pc80/rtc/option.c b/src/drivers/pc80/rtc/option.c index bb295cc..0954335 100644 --- a/src/drivers/pc80/rtc/option.c +++ b/src/drivers/pc80/rtc/option.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+#include <acpi/acpi.h> #include <console/console.h> #include <string.h> #include <cbfs.h> @@ -200,7 +201,8 @@ { const unsigned char *cmos_default; const bool cmos_need_reset = - CONFIG(STATIC_OPTION_TABLE) || cmos_error() || !cmos_lb_cks_valid(); + (CONFIG(STATIC_OPTION_TABLE) || cmos_error() || !cmos_lb_cks_valid()) + && !acpi_is_wakeup_s3(); size_t length = 128; size_t i;