GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

amd/soc/common: Remove cbmem subregions in heap

Browse source 
Revert most of 4f3f47b "amd/common: Define regions in cbmem".  This
puts the management of the heap space back to its traditional
methodology.  Subsequent patches that were to have used these
subregions have been reworked.

BUG=b:69614064

Change-Id: Ib3d40bcf61c50dbc481b60e7b5286f65a529b912
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/23516
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Marshall Dawson 2018-01-30 15:23:48 -07:00 committed by Martin Roth
parent 1f27357829
commit 8cc5fdec90
3 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/soc/amd/common/block/include/amdblocks/BiosCallOuts.h
View file

@ -18,18 +18,10 @@
#define __CALLOUTS_AMD_AGESA_H__ #define __CALLOUTS_AMD_AGESA_H__
#include <amdblocks/agesawrapper.h> #include <amdblocks/agesawrapper.h>
#include <amdblocks/s3_resume.h>
#define BIOS_HEAP_SIZE 0x30000 #define BIOS_HEAP_SIZE 0x30000
#define BSP_STACK_BASE_ADDR 0x30000 #define BSP_STACK_BASE_ADDR 0x30000
struct cbmem_usage {
uint8_t heap_base[BIOS_HEAP_SIZE];
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
uint8_t s3_vol_data[S3_VOLATILE_SIZE];
#endif
};
typedef struct _BIOS_HEAP_MANAGER { typedef struct _BIOS_HEAP_MANAGER {
UINT32 StartOfAllocatedNodes; UINT32 StartOfAllocatedNodes;
UINT32 StartOfFreedNodes; UINT32 StartOfFreedNodes;

21
src/soc/amd/common/block/include/amdblocks/s3_resume.h
View file

@ -1,21 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2017 Advanced Micro Devices, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef __AMD_S3_RESUME_H__
#define __AMD_S3_RESUME_H__
#define S3_VOLATILE_SIZE 0x6000
#endif /* __AMD_S3_RESUME_H__ */

5
src/soc/amd/common/block/pi/heapmanager.c
View file

@ -21,10 +21,7 @@
void *agesa_heap_base(void) void *agesa_heap_base(void)
{ {
struct cbmem_usage *heap; return cbmem_add(CBMEM_ID_RESUME_SCRATCH, BIOS_HEAP_SIZE);
heap = (struct cbmem_usage *)cbmem_add(CBMEM_ID_RESUME_SCRATCH,
sizeof(struct cbmem_usage));
return &heap->heap_base;
} }
static void EmptyHeap(int unused) static void EmptyHeap(int unused)