From c79fc4737d6970f06467258e02e5690cfce4385e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 17 Feb 2021 11:18:50 +0200
Subject: [PATCH] mb/emulation: Drop cbmem_recovery(0) call in ramstage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Calling cbmem_recovery(0) late in ramstage would appear
to remove all CBMEM entries created so far.

Change-Id: I2abb079844c4b41be09354d603ad36e4a56ea2e1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50841
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/emulation/qemu-armv7/mainboard.c  | 2 --
 src/mainboard/emulation/qemu-power8/mainboard.c | 2 --
 src/mainboard/emulation/qemu-riscv/mainboard.c  | 3 ---
 src/mainboard/emulation/spike-riscv/mainboard.c | 3 ---
 4 files changed, 10 deletions(-)

diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index c3d974c429..439f243d69 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 #include <halt.h>
 #include <device/mmio.h>
 #include <ramdetect.h>
@@ -41,7 +40,6 @@ static void mainboard_enable(struct device *dev)
 	discovered = probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB);
 	printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
 	ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
-	cbmem_recovery(0);
 	init_gfx();
 }
 
diff --git a/src/mainboard/emulation/qemu-power8/mainboard.c b/src/mainboard/emulation/qemu-power8/mainboard.c
index 54ae445b5f..cfee99f7d0 100644
--- a/src/mainboard/emulation/qemu-power8/mainboard.c
+++ b/src/mainboard/emulation/qemu-power8/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 
 static void mainboard_enable(struct device *dev)
 {
@@ -13,7 +12,6 @@ static void mainboard_enable(struct device *dev)
 
 	/* Where does RAM live? */
 	ram_resource(dev, 0, 2048, 32768);
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/emulation/qemu-riscv/mainboard.c b/src/mainboard/emulation/qemu-riscv/mainboard.c
index 4596e121d5..78cbfe2d59 100644
--- a/src/mainboard/emulation/qemu-riscv/mainboard.c
+++ b/src/mainboard/emulation/qemu-riscv/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 #include <symbols.h>
 #include <ramdetect.h>
 
@@ -16,8 +15,6 @@ static void mainboard_enable(struct device *dev)
 
 	dram_mb_detected = probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB);
 	ram_resource(dev, 0, (uintptr_t)_dram / KiB, dram_mb_detected * MiB / KiB);
-
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {
diff --git a/src/mainboard/emulation/spike-riscv/mainboard.c b/src/mainboard/emulation/spike-riscv/mainboard.c
index 693e91e35b..84a11555df 100644
--- a/src/mainboard/emulation/spike-riscv/mainboard.c
+++ b/src/mainboard/emulation/spike-riscv/mainboard.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <cbmem.h>
 
 static void mainboard_enable(struct device *dev)
 {
@@ -19,8 +18,6 @@ static void mainboard_enable(struct device *dev)
 	}
 
 	ram_resource(dev, 0, 0x80000000/KiB, ram_size/KiB);
-
-	cbmem_recovery(0);
 }
 
 struct chip_operations mainboard_ops = {