Change in coreboot[master]: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"

[Julius Werner (Code Review)]

Hello Furquan Shaikh, Patrick Georgi, Angel Pons, Arthur Heymans,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/48481

to review the following change.

Change subject: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"
......................................................................

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 
---
M src/lib/cbfs.c
1 file changed, 1 insertion(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/48481/1

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 5e6fce4..d275505 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -27,8 +27,7 @@

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) {

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48481 )

Change subject: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"
......................................................................

Patch Set 1: Code-Review+2

[Christian Walter (Code Review)]

Christian Walter has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48481 )

Change subject: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48481 )

Change subject: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"
......................................................................

Patch Set 1: Code-Review+2

[Julius Werner (Code Review)]

Julius Werner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48481 )

Change subject: Revert "cbfs: Skip mcache in post-RAM stages before CBMEM is online"
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48481
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
Reviewed-by: Christian Walter 
Reviewed-by: Angel Pons 
---
M src/lib/cbfs.c
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Christian Walter: Looks good to me, approved

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 5e6fce4..d275505 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -27,8 +27,7 @@

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) {