From 8ce14a794825a09557e69d759049e03d7724f09e Mon Sep 17 00:00:00 2001 From: Varadarajan Narayanan Date: Tue, 29 Mar 2016 12:30:38 +0530 Subject: soc/qualcomm/ipq40xx: Return NULL for cbmem_top if DRAM is not initialized DRAM initialization on gale requires ipq blobs to be loaded from cbfs. vboot_locator first checks cbmem_find to see if cbmem is initialized and contains selected region info, else it falls back to vboot work buffer. Since cbmem_find calls into cbmem_top to identify the location of cbmem area, board/chipset is expected to return NULL until the backing store is ready, which in this case until DRAM is initialized in romstage, return NULL for cbmem_top. BUG=chrome-os-partner:49249 TEST=Able to compile and boot to depthcharge. Doesn't crash in imd_handle_init_partial_recovery BRANCH=none Change-Id: Iaac24252ee4fb9f59d767730bf9dd68baa42a68f Signed-off-by: Patrick Georgi Original-Commit-Id: 4849c15dee2d3782ede4ee4157e432bd4d5602f0 Original-Change-Id: I3722b7ab5a6585a250138c828eb3d7919b0c1178 Original-Signed-off-by: Varadarajan Narayanan Original-Reviewed-on: https://chromium-review.googlesource.com/335425 Original-Commit-Ready: David Hendricks Original-Reviewed-by: David Hendricks Reviewed-on: https://review.coreboot.org/14660 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/google/gale/mmu.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/gale/mmu.c b/src/mainboard/google/gale/mmu.c index 65797e7463..6c096a5bf4 100644 --- a/src/mainboard/google/gale/mmu.c +++ b/src/mainboard/google/gale/mmu.c @@ -12,6 +12,7 @@ #include #include +#include #include "mmu.h" #define WIFI_IMEM_0_START ((uintptr_t)_wifi_imem_0 / KiB) @@ -33,6 +34,8 @@ void setup_dram_mappings(enum dram_state dram) mmu_config_range(DRAM_START, DRAM_SIZE, DCACHE_WRITEBACK); /* Map DMA memory */ mmu_config_range(DMA_START, DMA_SIZE, DCACHE_OFF); + /* Mark cbmem backing store as ready. */ + ipq_cbmem_backing_store_ready(); } else { mmu_disable_range(DRAM_START, DRAM_SIZE); /* Map DMA memory */ -- cgit v1.2.3