Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18295
-gerrit
commit fc09fe1ffc3c9c9f539ac7caf2a1f41478adb13c Author: Aaron Durbin adurbin@chromium.org Date: Mon Feb 6 10:08:45 2017 -0600
ec/google/chromeec: let platform prepare for reboot when resetting EC
This fixes an issue on systems where the S3 state in the pm1 control registers are not cleared when vboot determines recovery mode is required on an S3 resume. The EC code will reboot the system knowing that the EC was in RW. However, on subsequent entry into romstage the S3 path will be taken and fails to recover cbmem -- forcing another reboot. To work around that, signal to the platform a reboot is happening and let the platform perform the necessary fix ups to the register state.
BUG=chrome-os-partner:62627
Change-Id: Ic144b11b4968c92a1273b8d9eb9dc10f0056bf3d Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/ec/google/chromeec/ec.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index d0648f7..ad74059 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -230,6 +230,8 @@ void google_chromeec_check_ec_image(int expected_type) cec_cmd.cmd_dev_index = 0; printk(BIOS_DEBUG, "Rebooting with EC in RO mode:\n"); post_code(0); /* clear current post code */ + /* Let the platform prepare for the EC taking out the system power. */ + vboot_platform_prepare_reboot(); google_chromeec_command(&cec_cmd); udelay(1000); hard_reset();