[coreboot-gerrit] Change in coreboot[master]: mainboard/google/poppy: Enable separate MRC cache for recove...

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded a new change for review. ( https://review.coreboot.org/19457 )

Change subject: mainboard/google/poppy: Enable separate MRC cache for recovery mode
......................................................................

mainboard/google/poppy: Enable separate MRC cache for recovery mode

Enable separate MRC cache for recovery mode. This requires change in
flash layout to accomodate another region for RECOVERY_MRC_CACHE.

BUG=b:37682566
TEST=Verified following scenarios:
1. Boot into recovery does not destroy normal mode MRC cache.
2. Once recovery MRC cache is populated, all future boots in recovery
mode re-use data from the cache.
3. Forcing recovery mode to retrain memory causes normal mode to retrain
memory as well.

Change-Id: I4c748a316436001c5a33754084ab4a74243e21df
Signed-off-by: Furquan Shaikh <furquan at chromium.org>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/chromeos.fmd
2 files changed, 20 insertions(+), 13 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/19457/1

diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index fa0c6b6..ce32081 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -72,6 +72,8 @@
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
+	select HAS_RECOVERY_MRC_CACHE
+	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
 	select VBOOT_LID_SWITCH
 
 config DRIVER_TPM_SPI_BUS
diff --git a/src/mainboard/google/poppy/chromeos.fmd b/src/mainboard/google/poppy/chromeos.fmd
index 58b6127..bdadcf7 100644
--- a/src/mainboard/google/poppy/chromeos.fmd
+++ b/src/mainboard/google/poppy/chromeos.fmd
@@ -4,24 +4,29 @@
 		SI_ME at 0x1000 0x1ff000
 	}
 	SI_BIOS at 0x200000 0xe00000 {
-		RW_SECTION_A at 0x0 0x3f0000 {
+		RW_SECTION_A at 0x0 0x3e8000 {
 			VBLOCK_A at 0x0 0x10000
-			FW_MAIN_A(CBFS)@0x10000 0x3dffc0
-			RW_FWID_A at 0x3effc0 0x40
+			FW_MAIN_A(CBFS)@0x10000 0x3d7fc0
+			RW_FWID_A at 0x3e7fc0 0x40
 		}
-		RW_SECTION_B at 0x3f0000 0x3f0000 {
+		RW_SECTION_B at 0x3e8000 0x3e8000 {
 			VBLOCK_B at 0x0 0x10000
-			FW_MAIN_B(CBFS)@0x10000 0x3dffc0
-			RW_FWID_B at 0x3effc0 0x40
+			FW_MAIN_B(CBFS)@0x10000 0x3d7fc0
+			RW_FWID_B at 0x3e7fc0 0x40
 		}
-		RW_MRC_CACHE at 0x7e0000 0x10000
-		RW_ELOG at 0x7f0000 0x4000
-		RW_SHARED at 0x7f4000 0x4000 {
-			SHARED_DATA at 0x0 0x2000
-			VBLOCK_DEV at 0x2000 0x2000
+		RW_MISC at 0x7d0000 0x30000 {
+			UNIFIED_MRC_CACHE at 0x0 0x20000 {
+				RECOVERY_MRC_CACHE at 0x0 0x10000
+				RW_MRC_CACHE at 0x10000 0x10000
+			}
+			RW_ELOG at 0x20000 0x4000
+			RW_SHARED at 0x24000 0x4000 {
+				SHARED_DATA at 0x0 0x2000
+				VBLOCK_DEV at 0x2000 0x2000
+			}
+			RW_VPD at 0x28000 0x2000
+			RW_NVRAM at 0x2a000 0x6000
 		}
-		RW_VPD at 0x7f8000 0x2000
-		RW_NVRAM at 0x7fa000 0x6000
 		RW_LEGACY(CBFS)@0x800000 0x200000
 		WP_RO at 0xa00000 0x400000 {
 			RO_VPD at 0x0 0x4000

-- 
To view, visit https://review.coreboot.org/19457
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c748a316436001c5a33754084ab4a74243e21df
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: Furquan Shaikh <furquan at google.com>