[XS] Change in coreboot[main]: pc80/rtc: Clear CMOS on errors on S3 resume too

[Nico Huber (Code Review)]

Attention is currently required from: Bill XIE, Jonathon Hall, Kyösti Mälkki.

Hello Bill XIE, Jonathon Hall, Kyösti Mälkki,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/78881?usp=email

to review the following change.

Change subject: pc80/rtc: Clear CMOS on errors on S3 resume too
......................................................................

pc80/rtc: Clear CMOS on errors on S3 resume too

Commit 29030d0f3dad (drivers/pc80/rtc/option.c: Stop resetting CMOS
during s3 resume) meant to fix an issue with the static option table.
However, it also disabled CMOS clearing on errors for the S3 resume
path. As we'd still want to clear CMOS when its contents are corrupted,
reduce the S3 exception to the static-option-table case.

Change-Id: I1533875466f6eb7b409bb19ef98f6dcaf2d115c4
Signed-off-by: Nico Huber 
---
M src/drivers/pc80/rtc/option.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/78881/1

diff --git a/src/drivers/pc80/rtc/option.c b/src/drivers/pc80/rtc/option.c
index 0954335..d2b3de2 100644
--- a/src/drivers/pc80/rtc/option.c
+++ b/src/drivers/pc80/rtc/option.c
@@ -201,8 +201,8 @@
 {
    const unsigned char *cmos_default;
    const bool cmos_need_reset =
-		(CONFIG(STATIC_OPTION_TABLE) || cmos_error() || !cmos_lb_cks_valid())
-		&& !acpi_is_wakeup_s3();
+		(CONFIG(STATIC_OPTION_TABLE) && !acpi_is_wakeup_s3())
+		|| cmos_error() || !cmos_lb_cks_valid();
    size_t length = 128;
    size_t i;