diff options
author | Andrew Geissler <andrewg@us.ibm.com> | 2016-07-26 14:21:15 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-08-16 15:43:07 -0400 |
commit | 025298b52002867f1e3516ba9810fd4642262980 (patch) | |
tree | 70ef20aabd7e1bb0d727e7f94d72ac74e522e62d /src/build | |
parent | 5d57720970f8c8ffcefee7bfa5f9ec24f141501d (diff) | |
download | talos-hostboot-025298b52002867f1e3516ba9810fd4642262980.tar.gz talos-hostboot-025298b52002867f1e3516ba9810fd4642262980.zip |
Updates for new scratch registers in P9
P9 moves us from 8 scratch registers to 4. This commit handles
this change and also adds the base support for partial cache.
Change-Id: Ibe050c663744285dd3e77850649236a669dadbd6
RTC: 150923
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27462
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/build')
-rwxr-xr-x | src/build/debug/Hostboot/Dump.pm | 30 | ||||
-rwxr-xr-x | src/build/debug/fsp-memdump.sh | 11 |
2 files changed, 29 insertions, 12 deletions
diff --git a/src/build/debug/Hostboot/Dump.pm b/src/build/debug/Hostboot/Dump.pm index 7f9fda8ec..ac33fff47 100755 --- a/src/build/debug/Hostboot/Dump.pm +++ b/src/build/debug/Hostboot/Dump.pm @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2011,2014 +# Contributors Listed Below - COPYRIGHT 2012,2016 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +34,8 @@ use Fcntl qw(SEEK_SET); use constant MEMSTATE_NO_MEM => 0x0; use constant MEMSTATE_HALF_CACHE => 0x4; -use constant MEMSTATE_FULL_CACHE => 0x8; +use constant MEMSTATE_REDUCED_CACHE => 0x8; +use constant MEMSTATE_FULL_CACHE => 0xa; use constant MEMSTATE_MS_32MEG => 0x20; use constant MEMSTATE_PRE_SECURE_BOOT => 0xff; @@ -64,16 +67,21 @@ our %memory_maps = ( 2 * _MB + 512 * _KB, 512 * _KB, 3 * _MB + 512 * _KB, 512 * _KB ], - MEMSTATE_FULL_CACHE() => - # Add next full 4MB after we expand to the full cache. + MEMSTATE_REDUCED_CACHE() => + # Initial chips may have 2MB bad cache [ 4 * _MB, 1 * _MB, 5 * _MB, 1 * _MB, 6 * _MB, 1 * _MB, 7 * _MB, 1 * _MB ], + MEMSTATE_FULL_CACHE() => + # Full cache is 10MB + [ 8 * _MB, 1 * _MB, + 9 * _MB, 1 * _MB + ], MEMSTATE_MS_32MEG() => - # Add next 24MB after we expand to memory. - [ 8 * _MB, 24 * _MB + # Add next 22MB after we expand to memory. + [ 10 * _MB, 22 * _MB ] ); @@ -83,11 +91,15 @@ our %memory_states = ( MEMSTATE_PRE_SECURE_BOOT() => [ MEMSTATE_NO_MEM, MEMSTATE_PRE_SECURE_BOOT ], MEMSTATE_HALF_CACHE() => [ MEMSTATE_NO_MEM, MEMSTATE_PRE_SECURE_BOOT, MEMSTATE_HALF_CACHE ], + MEMSTATE_REDUCED_CACHE() => + [ MEMSTATE_NO_MEM, MEMSTATE_PRE_SECURE_BOOT, + MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE ], MEMSTATE_FULL_CACHE() => [ MEMSTATE_NO_MEM, MEMSTATE_PRE_SECURE_BOOT, - MEMSTATE_HALF_CACHE, MEMSTATE_FULL_CACHE ], + MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE, + MEMSTATE_FULL_CACHE ], MEMSTATE_MS_32MEG() => [ MEMSTATE_NO_MEM, MEMSTATE_PRE_SECURE_BOOT, - MEMSTATE_HALF_CACHE, MEMSTATE_FULL_CACHE, - MEMSTATE_MS_32MEG ] + MEMSTATE_HALF_CACHE, MEMSTATE_REDUCED_CACHE, + MEMSTATE_FULL_CACHE, MEMSTATE_MS_32MEG ] ); sub main diff --git a/src/build/debug/fsp-memdump.sh b/src/build/debug/fsp-memdump.sh index 974fa3aea..d02b11ff8 100755 --- a/src/build/debug/fsp-memdump.sh +++ b/src/build/debug/fsp-memdump.sh @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2013,2014 +# Contributors Listed Below - COPYRIGHT 2013,2016 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -146,9 +148,12 @@ do dump 7340032 1048576 STATE=04 ;; - 20) + 0A|A) dump 8388608 1048576 dump 9437184 1048576 + STATE=08 + ;; + 20) dump 10485760 1048576 dump 11534336 1048576 dump 12582912 1048576 @@ -171,7 +176,7 @@ do dump 30408704 1048576 dump 31457280 1048576 dump 32505856 1048576 - STATE=08 + STATE=0A ;; discover) # Call discover function to determine state. discover |