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>

3 files changed, 33 insertions, 6 deletions

diff --git a/src/build/debug/Hostboot/Dump.pm b/src/build/debug/Hostboot/Dump.pm
index cf1b684a7..bc3dca7b8 100755
--- a/src/build/debug/Hostboot/Dump.pm
+++ b/src/build/debug/Hostboot/Dump.pm
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2017
+# Contributors Listed Below - COPYRIGHT 2012,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -37,6 +37,7 @@ use constant    MEMSTATE_HALF_CACHE => 0x4;
 use constant    MEMSTATE_REDUCED_CACHE => 0x8;
 use constant    MEMSTATE_FULL_CACHE => 0xa;
 use constant    MEMSTATE_MS_48MEG => 0x30;
+use constant    MEMSTATE_MS_64MEG => 0x40;
 
 use constant    _KB => 1024;
 use constant    _MB => 1024 * 1024;
@@ -75,6 +76,10 @@ our %memory_maps = (
         # Add next 38MB after we expand to memory.
         [ 10 * _MB,                      38 * _MB
         ]
+    MEMSTATE_MS_64MEG() =>
+        # Add next 54MB after we expand to memory.
+        [ 10 * _MB,                      54 * _MB
+        ]
 );
 
 # Map the current state to the combined states available.
@@ -91,6 +96,9 @@ our %memory_states = (
     MEMSTATE_MS_48MEG() => [ MEMSTATE_NO_MEM,
                              MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE,
                              MEMSTATE_FULL_CACHE, MEMSTATE_MS_48MEG ]
+    MEMSTATE_MS_64MEG() => [ MEMSTATE_NO_MEM,
+                             MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE,
+                             MEMSTATE_FULL_CACHE, MEMSTATE_MS_64MEG ]
 );
 
 sub main
diff --git a/src/build/debug/fsp-memdump.sh b/src/build/debug/fsp-memdump.sh
index e4418a286..ef1b096ed 100755
--- a/src/build/debug/fsp-memdump.sh
+++ b/src/build/debug/fsp-memdump.sh
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2013,2017
+# Contributors Listed Below - COPYRIGHT 2013,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -85,7 +85,7 @@ discover()
 limit_memory()
 {
     case ${STATE} in
-        30)
+        40)
             STATE=08
             ;;
         *)
@@ -188,6 +188,25 @@ do
             dump 49283072 1048576
             STATE=0A
             ;;
+        40)
+            dump 50331648 1048576
+            dump 51380224 1048576
+            dump 52428800 1048576
+            dump 53477376 1048576
+            dump 54525952 1048576
+            dump 55574528 1048576
+            dump 56623104 1048576
+            dump 57671680 1048576
+            dump 58720256 1048576
+            dump 59768832 1048576
+            dump 60817408 1048576
+            dump 61865984 1048576
+            dump 62914560 1048576
+            dump 63963136 1048576
+            dump 65011712 1048576
+            dump 66060288 1048576
+            STATE=30
+            ;;
         discover)  # Call discover function to determine state.
             discover
             ;;
diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py
index 081ab4dc9..93a84ad89 100644
--- a/src/build/debug/simics-debug-framework.py
+++ b/src/build/debug/simics-debug-framework.py
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2017
+# Contributors Listed Below - COPYRIGHT 2011,2018
 # [+] Google Inc.
 # [+] International Business Machines Corp.
 #
@@ -632,10 +632,10 @@ def magic_instruction_callback(user_arg, cpu, arg):
             # 0=base, 1=name, 4=size 5=mirrored target, 6=priority
             #print ">> %d:%s" % (entry[0], entry[1])
             #check if base == hrmor, or if memory space encompasses the
-            #entire base memory which is:  hrmor + 0x3000000 (48 MB)
+            #entire base memory which is:  hrmor + 0x4000000 (64 MB)
             if ((entry[0] == hb_hrmor) or
                 ((entry[0] < hb_hrmor) and
-                 (entry[0] + entry[4] >= hb_hrmor + 0x3000000) or
+                 (entry[0] + entry[4] >= hb_hrmor + 0x4000000) or
                  (entry[0] == 134217728) or
                  (entry[0] == 136314880))): #0x8000000 or 0x8200000
                 target = entry[5]