mb/emulation: Drop cbmem_recovery(0) call in ramstage
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>
This commit is contained in:
		
				
					committed by
					
						
						Patrick Georgi
					
				
			
			
				
	
			
			
			
						parent
						
							70243cd801
						
					
				
				
					commit
					c79fc4737d
				
			@@ -2,7 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <console/console.h>
 | 
					#include <console/console.h>
 | 
				
			||||||
#include <device/device.h>
 | 
					#include <device/device.h>
 | 
				
			||||||
#include <cbmem.h>
 | 
					 | 
				
			||||||
#include <halt.h>
 | 
					#include <halt.h>
 | 
				
			||||||
#include <device/mmio.h>
 | 
					#include <device/mmio.h>
 | 
				
			||||||
#include <ramdetect.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);
 | 
						discovered = probe_ramsize((uintptr_t)_dram, CONFIG_DRAM_SIZE_MB);
 | 
				
			||||||
	printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
 | 
						printk(BIOS_DEBUG, "%d MiB of RAM discovered\n", discovered);
 | 
				
			||||||
	ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
 | 
						ram_resource(dev, 0, 0x60000000 >> 10, discovered << 10);
 | 
				
			||||||
	cbmem_recovery(0);
 | 
					 | 
				
			||||||
	init_gfx();
 | 
						init_gfx();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <console/console.h>
 | 
					#include <console/console.h>
 | 
				
			||||||
#include <device/device.h>
 | 
					#include <device/device.h>
 | 
				
			||||||
#include <cbmem.h>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(struct device *dev)
 | 
					static void mainboard_enable(struct device *dev)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -13,7 +12,6 @@ static void mainboard_enable(struct device *dev)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	/* Where does RAM live? */
 | 
						/* Where does RAM live? */
 | 
				
			||||||
	ram_resource(dev, 0, 2048, 32768);
 | 
						ram_resource(dev, 0, 2048, 32768);
 | 
				
			||||||
	cbmem_recovery(0);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct chip_operations mainboard_ops = {
 | 
					struct chip_operations mainboard_ops = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <console/console.h>
 | 
					#include <console/console.h>
 | 
				
			||||||
#include <device/device.h>
 | 
					#include <device/device.h>
 | 
				
			||||||
#include <cbmem.h>
 | 
					 | 
				
			||||||
#include <symbols.h>
 | 
					#include <symbols.h>
 | 
				
			||||||
#include <ramdetect.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);
 | 
						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);
 | 
						ram_resource(dev, 0, (uintptr_t)_dram / KiB, dram_mb_detected * MiB / KiB);
 | 
				
			||||||
 | 
					 | 
				
			||||||
	cbmem_recovery(0);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct chip_operations mainboard_ops = {
 | 
					struct chip_operations mainboard_ops = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <console/console.h>
 | 
					#include <console/console.h>
 | 
				
			||||||
#include <device/device.h>
 | 
					#include <device/device.h>
 | 
				
			||||||
#include <cbmem.h>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void mainboard_enable(struct device *dev)
 | 
					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);
 | 
						ram_resource(dev, 0, 0x80000000/KiB, ram_size/KiB);
 | 
				
			||||||
 | 
					 | 
				
			||||||
	cbmem_recovery(0);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct chip_operations mainboard_ops = {
 | 
					struct chip_operations mainboard_ops = {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user