Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5652
-gerrit
commit 9b704af1099e27a60e3b43527997efc65bd3d923 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri May 2 09:40:04 2014 +0300
AGESA fam16kb: Use common GetHeapBase()
Implementation of this function is common for all boards in family, and also across different families.
Change-Id: I6aab710e76af9a361f0c0006922019a52feb3f6f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/mainboard/amd/olivehill/agesawrapper.c | 19 ------------------- src/mainboard/amd/olivehill/agesawrapper.h | 2 -- src/mainboard/asrock/imb-a180/agesawrapper.c | 19 ------------------- src/mainboard/asrock/imb-a180/agesawrapper.h | 2 -- .../amd/agesa/family16kb/fam16kb_callouts.c | 17 +++++++++++++++++ .../amd/agesa/family16kb/fam16kb_callouts.h | 2 ++ 6 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/src/mainboard/amd/olivehill/agesawrapper.c b/src/mainboard/amd/olivehill/agesawrapper.c index a1cf7de..28fd7fb 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.c +++ b/src/mainboard/amd/olivehill/agesawrapper.c @@ -41,8 +41,6 @@ #include "FchPlatform.h" #include "Fch.h" #include <cpu/amd/agesa/s3_resume.h> -#include <cbmem.h> -#include <arch/acpi.h> #include <arch/io.h> #include <device/device.h> #include "hudson.h" @@ -248,23 +246,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; }
-UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_RESUME - /* Both romstage and ramstage has this S3 detect. */ - if (acpi_get_sleep_type() == 3) - heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/amd/olivehill/agesawrapper.h b/src/mainboard/amd/olivehill/agesawrapper.h index 5007510..579350f 100644 --- a/src/mainboard/amd/olivehill/agesawrapper.h +++ b/src/mainboard/amd/olivehill/agesawrapper.h @@ -92,6 +92,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID);
-UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.c b/src/mainboard/asrock/imb-a180/agesawrapper.c index 0f9212f..7fbe37e 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.c +++ b/src/mainboard/asrock/imb-a180/agesawrapper.c @@ -41,8 +41,6 @@ #include "FchPlatform.h" #include "Fch.h" #include <cpu/amd/agesa/s3_resume.h> -#include <cbmem.h> -#include <arch/acpi.h> #include <arch/io.h> #include <device/device.h> #include "hudson.h" @@ -248,23 +246,6 @@ agesawrapper_amdinitearly ( return (UINT32)status; }
-UINT32 GetHeapBase( - AMD_CONFIG_PARAMS *StdHeader - ) -{ - UINT32 heap; - -#if CONFIG_HAVE_ACPI_RESUME - /* Both romstage and ramstage has this S3 detect. */ - if (acpi_get_sleep_type() == 3) - heap = (UINT32)cbmem_find(CBMEM_ID_RESUME_SCRATCH) + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); /* base + high_stack_size */ - else -#endif - heap = BIOS_HEAP_START_ADDRESS; /* Low mem */ - - return heap; -} - UINT32 agesawrapper_amdinitpost ( VOID diff --git a/src/mainboard/asrock/imb-a180/agesawrapper.h b/src/mainboard/asrock/imb-a180/agesawrapper.h index db893cd..32b24cb 100644 --- a/src/mainboard/asrock/imb-a180/agesawrapper.h +++ b/src/mainboard/asrock/imb-a180/agesawrapper.h @@ -92,6 +92,4 @@ UINT32 agesawrapper_amds3laterestore (VOID); UINT32 agesawrapper_fchs3earlyrestore (VOID); UINT32 agesawrapper_fchs3laterestore (VOID);
-UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); - #endif diff --git a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c index b290931..8cc300c 100644 --- a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c +++ b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.c @@ -26,6 +26,23 @@ #include "cbfs.h" #include "dimmSpd.h" #include "fam16kb_callouts.h" +#include <cbmem.h> +#include <arch/acpi.h> + +UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader) +{ + UINT32 heap = BIOS_HEAP_START_ADDRESS; + +#if CONFIG_HAVE_ACPI_RESUME + /* Both romstage and ramstage has this S3 detect. */ + if (acpi_get_sleep_type() == 3) + heap = (UINT32) cbmem_find(CBMEM_ID_RESUME_SCRATCH) + + (CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE); + /* himem_heap_base + high_stack_size */ +#endif + + return heap; +}
AGESA_STATUS fam16kb_AllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr) { diff --git a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h index c17a20d..3d4e979 100644 --- a/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h +++ b/src/northbridge/amd/agesa/family16kb/fam16kb_callouts.h @@ -39,6 +39,8 @@ typedef struct _BIOS_BUFFER_NODE { UINT32 NextNodeOffset; } BIOS_BUFFER_NODE;
+UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader); + AGESA_STATUS fam16kb_AllocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS fam16kb_DeallocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr); AGESA_STATUS fam16kb_LocateBuffer (UINT32 Func, UINT32 Data, VOID *ConfigPtr);