[coreboot-gerrit] New patch to review for coreboot: 2bce7a2 AMD: Drop no-op cbmem_reinit() in romstage

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3903

-gerrit

commit 2bce7a2155d0f1c390981bcafedb54dbae9fcc80
Author: Kyösti Mälkki 
Date:   Mon Jun 24 17:42:59 2013 +0300

AMD: Drop no-op cbmem_reinit() in romstage

Change-Id: I40d151bd7bc91058243be4562ba12505aa81496b
    Signed-off-by: Kyösti Mälkki 
---
 src/cpu/amd/agesa/s3_resume.c       | 11 -----------
 src/cpu/amd/car/post_cache_as_ram.c |  9 ---------
 2 files changed, 20 deletions(-)

diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c
index 6ba9212..115275e 100644
--- a/src/cpu/amd/agesa/s3_resume.c
+++ b/src/cpu/amd/agesa/s3_resume.c
@@ -109,19 +109,8 @@ void restore_mtrr(void)

inline void *backup_resume(void)
 {
-	unsigned long high_ram_base;
    void *resume_backup_memory;

-	/* Start address of high memory tables */
-	high_ram_base = (u32) get_cbmem_toc();
-
-	/*
-	 * printk(BIOS_DEBUG, "CBMEM TOC is at: %x\n", (u32_t)high_ram_base);
-	 * printk(BIOS_DEBUG, "CBMEM TOC 0-size:%x\n ",(u32_t)(high_ram_base + HIGH_MEMORY_SIZE + 4096));
-	 */
-
-	cbmem_reinit((u64) high_ram_base);
-
    resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
    if (((u32) resume_backup_memory == 0)
        || ((u32) resume_backup_memory == -1)) {
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 18c278e..49eb3a6 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -32,21 +32,12 @@ static void inline __attribute__((always_inline))  memcopy(void *dest, const voi
 #if CONFIG_HAVE_ACPI_RESUME

static inline void *backup_resume(void) {
-	unsigned long high_ram_base;
    void *resume_backup_memory;
    int suspend = acpi_is_wakeup_early();

if (!suspend)
    	return NULL;

-	/* Start address of high memory tables */
-	high_ram_base = (u32) get_cbmem_toc();
-
-	print_debug_pcar("CBMEM TOC is at: ", (uint32_t)high_ram_base);
-	print_debug_pcar("CBMEM TOC 0-size: ",(uint32_t)(high_ram_base + HIGH_MEMORY_SIZE + 4096));
-
-	cbmem_reinit((u64)high_ram_base);
-
    resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);

/* copy 1MB - 64K to high tables ram_base to prevent memory corruption