diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2018-01-10 11:07:59 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-01-15 22:36:51 -0500 |
| commit | 1e973575493db7b15d6cd36613034e3ea17ca900 (patch) | |
| tree | 7b05bb79e0352879f33da0cfbf08c97d51b46af3 /src/include/kernel | |
| parent | f7a5547478eae53e6623164b8faacfaf6e721cb1 (diff) | |
| download | talos-hostboot-1e973575493db7b15d6cd36613034e3ea17ca900.tar.gz talos-hostboot-1e973575493db7b15d6cd36613034e3ea17ca900.zip | |
Expand Hostboot to 64MB
We hit out-of-memory errors while trying to boot a Opal system
due to the large amount of memory used by the PM procedures
and the pinning of memory in secure mode.
Also did some other rearranging of the pinned memory sections
to get some space back.
Change-Id: I61f219d7f32871a39b236d963bae893a6ef0ce0e
CQ: SW413191
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51724
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/kernel')
| -rw-r--r-- | src/include/kernel/basesegment.H | 6 | ||||
| -rw-r--r-- | src/include/kernel/memstate.H | 8 | ||||
| -rw-r--r-- | src/include/kernel/vmmmgr.H | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/include/kernel/basesegment.H b/src/include/kernel/basesegment.H index 7629473f0..7902d0e9f 100644 --- a/src/include/kernel/basesegment.H +++ b/src/include/kernel/basesegment.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2017 */ +/* Contributors Listed Below - COPYRIGHT 2011,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -136,7 +136,7 @@ class BaseSegment : public Segment /** * @brief Allocates a block of virtual memory that extends the VMM - * space up to 48MEG of Mainstore. + * into Mainstore (up to VMM_MEMORY_SIZE). */ static int mmExtend(void); @@ -206,7 +206,7 @@ class BaseSegment : public Segment /** * @brief Allocates a block of virtual memory that extends the VMM - * space up to 48MEG of Mainstore. + * into Mainstore (up to VMM_MEMORY_SIZE). */ int _mmExtend(void); diff --git a/src/include/kernel/memstate.H b/src/include/kernel/memstate.H index a01fdcc32..fb42ed31f 100644 --- a/src/include/kernel/memstate.H +++ b/src/include/kernel/memstate.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2017 */ +/* Contributors Listed Below - COPYRIGHT 2013,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,6 +29,8 @@ #ifndef __KERNEL_MEMSTATE_H #define __KERNEL_MEMSTATE_H +#include <usr/vmmconst.h> + namespace KernelMemState { // hb_Mem_Location struct values are defined below. @@ -45,7 +47,7 @@ namespace KernelMemState - - 4 = Hostboot is using half a cache - - 8 = Hostboot is using reduced cache - - 10 = Hostboot is using the full cache - - - 48 = Hostboot is using 48 MB of mainstore*/ + - - XX = Hostboot is using XX MB of mainstore*/ enum MemLocation @@ -62,7 +64,7 @@ namespace KernelMemState HALF_CACHE = 0x00000004, REDUCED_CACHE = 0x00000008, FULL_CACHE = 0x0000000A, - MS_48MEG = 0x00000030, + FULL_MEM = (VMM_MEMORY_SIZE/MEGABYTE), }; struct mem_location diff --git a/src/include/kernel/vmmmgr.H b/src/include/kernel/vmmmgr.H index 11d8199e8..6f211a0eb 100644 --- a/src/include/kernel/vmmmgr.H +++ b/src/include/kernel/vmmmgr.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2010,2017 */ +/* Contributors Listed Below - COPYRIGHT 2010,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -192,7 +192,7 @@ class VmmManager /** * @brief Allocates a block of virtual memory that extends the VMM - * space up to 48MEG of Mainstore. + * snto Mainstore (up to VMM_MEMORY_SIZE). */ static int mmExtend( void); |
