From d2777b84850cb1889e5e8c36d1ddc68430d36296 Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Tue, 8 Dec 2020 14:13:03 -0800
Subject: [PATCH] Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is
 online"

This reverts commit b652aaef990cc3eb481dea7f8d4cc3eecd92ffa1. It was
dumb and didn't actually fix anything.

Change-Id: I074135dd12face1226105e0706c78ae8ecba18e0
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48481
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/lib/cbfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 5e6fce49a8..d27550576a 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -27,8 +27,7 @@ cb_err_t cbfs_boot_lookup(const char *name, bool force_ro,
 
 	size_t data_offset;
 	cb_err_t err = CB_CBFS_CACHE_FULL;
-	if (!CONFIG(NO_CBFS_MCACHE) && !ENV_SMM &&
-	    (ENV_ROMSTAGE_OR_BEFORE || cbmem_online()))
+	if (!CONFIG(NO_CBFS_MCACHE) && !ENV_SMM)
 		err = cbfs_mcache_lookup(cbd->mcache, cbd->mcache_size,
 					  name, mdata, &data_offset);
 	if (err == CB_CBFS_CACHE_FULL) {