diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/BiosCallOuts.h | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/agesawrapper.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/heapmanager.c | 14 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/soc/amd/common/BiosCallOuts.h b/src/soc/amd/common/BiosCallOuts.h index 9cad16df96..c6ad585c65 100644 --- a/src/soc/amd/common/BiosCallOuts.h +++ b/src/soc/amd/common/BiosCallOuts.h @@ -35,8 +35,6 @@ typedef struct _BIOS_BUFFER_NODE { UINT32 NextNodeOffset; } BIOS_BUFFER_NODE; -void EmptyHeap(void); - AGESA_STATUS agesa_AllocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr); AGESA_STATUS agesa_DeallocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr); AGESA_STATUS agesa_LocateBuffer(UINT32 Func, UINTN Data, VOID *ConfigPtr); diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/agesawrapper.c index b95d61ab6a..a269130de3 100644 --- a/src/soc/amd/common/agesawrapper.c +++ b/src/soc/amd/common/agesawrapper.c @@ -173,8 +173,6 @@ AGESA_STATUS agesawrapper_amdinitpost(void) if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog(PostParams->StdHeader.HeapStatus); AmdReleaseStruct (&AmdParamStruct); - /* Initialize heap space */ - EmptyHeap(); return status; } diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/heapmanager.c index 0accd09cd0..fdf7f65880 100644 --- a/src/soc/amd/common/heapmanager.c +++ b/src/soc/amd/common/heapmanager.c @@ -22,20 +22,20 @@ static void *GetHeapBase(void) { - void *heap = (void *)BIOS_HEAP_START_ADDRESS; - - if (acpi_is_wakeup_s3()) - heap = cbmem_find(CBMEM_ID_RESUME_SCRATCH); - - return heap; + return cbmem_add(CBMEM_ID_RESUME_SCRATCH, BIOS_HEAP_SIZE); } -void EmptyHeap(void) +static void EmptyHeap(int unused) { void *BiosManagerPtr = GetHeapBase(); memset(BiosManagerPtr, 0, BIOS_HEAP_SIZE); } +#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) +#error "Only EARLY_CBMEM_INIT is supported." +#endif +ROMSTAGE_CBMEM_INIT_HOOK(EmptyHeap) + AGESA_STATUS agesa_AllocateBuffer (UINT32 Func, UINTN Data, VOID *ConfigPtr) { UINT32 AvailableHeapSize; |