3 files changed, 18 insertions, 3 deletions

diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 7dc46c98dc..edfdb7b647 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -34,6 +34,7 @@ config DRIVER_TPM_I2C_IRQ
 
 config CHROMEOS
 	select LID_SWITCH if BASEBOARD_REEF_LAPTOP
+	select HAS_RECOVERY_MRC_CACHE
 
 config DRIVERS_I2C_DA7219
 	default y
diff --git a/src/mainboard/google/reef/chromeos.c b/src/mainboard/google/reef/chromeos.c
index 58c2cd8e27..506f9de94b 100644
--- a/src/mainboard/google/reef/chromeos.c
+++ b/src/mainboard/google/reef/chromeos.c
@@ -55,11 +55,22 @@ int get_recovery_mode_switch(void)
 		  EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
 }
 
+int get_recovery_mode_retrain_switch(void)
+{
+	/*
+	 * Check if the EC has posted the keyboard recovery event with memory
+	 * retrain.
+	 */
+	return !!(google_chromeec_get_events_b() &
+		EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT));
+}
+
 int clear_recovery_mode_switch(void)
 {
-	/* Clear keyboard recovery event. */
+	/* Clear all host event bits requesting recovery mode. */
 	return google_chromeec_clear_events_b(
-		EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
+		EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY) |
+		EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT));
 }
 
 int get_write_protect_state(void)
diff --git a/src/mainboard/google/reef/chromeos.fmd b/src/mainboard/google/reef/chromeos.fmd
index d25a9b28df..1fea91029d 100644
--- a/src/mainboard/google/reef/chromeos.fmd
+++ b/src/mainboard/google/reef/chromeos.fmd
@@ -13,7 +13,10 @@ FLASH 16M {
 		}
 	}
 	MISC_RW@0x400000 0x4a000 {
-		RW_MRC_CACHE@0x0 0x40000
+		UNIFIED_MRC_CACHE@0x0 0x40000 {
+			RECOVERY_MRC_CACHE@0x0 0x10000
+			RW_MRC_CACHE@0x10000 0x30000
+		}
 		RW_ELOG@0x40000 0x4000
 		RW_SHARED@0x44000 0x4000 {
 			SHARED_DATA@0x0 0x2000