summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Sanner <dsanner@us.ibm.com>2016-12-05 15:51:03 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-12-12 14:16:03 -0500
commit57318749826f74fe3c571beaa1be3a2b71b461a3 (patch)
tree066e4150524710c933ab42f73be6fd1c7ed59b6b
parentcb6f76dba03a0a42b57100d1c89fa91b42457157 (diff)
downloadtalos-hostboot-57318749826f74fe3c571beaa1be3a2b71b461a3.tar.gz
talos-hostboot-57318749826f74fe3c571beaa1be3a2b71b461a3.zip
Minor updates to get istep 15/16 working with latest HCODE image
Bump SBE deadman timer to 1 sec Increase max seeprom buffer Change-Id: Id413830f3e6f6145ef4e36b947543e0b67b3e8e9 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33431 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/isteps/istep15/host_build_stop_image.C6
-rw-r--r--src/usr/isteps/istep16/call_host_activate_master.C2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/isteps/istep15/host_build_stop_image.C b/src/usr/isteps/istep15/host_build_stop_image.C
index 6b572c467..b5cc39fa7 100644
--- a/src/usr/isteps/istep15/host_build_stop_image.C
+++ b/src/usr/isteps/istep15/host_build_stop_image.C
@@ -327,8 +327,8 @@ void* host_build_stop_image (void *io_pArgs)
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_build_stop_image entry" );
- // allocate two temporary work buffer
- void* l_temp_buffer0 = malloc(MAX_RING_BUF_SIZE);
+ // allocate three temporary work buffers
+ void* l_temp_buffer0 = malloc(MAX_SEEPROM_IMAGE_SIZE);
void* l_temp_buffer1 = malloc(MAX_RING_BUF_SIZE);
void* l_temp_buffer2 = malloc(MAX_RING_BUF_SIZE);
@@ -440,7 +440,7 @@ void* host_build_stop_image (void *io_pArgs)
PHASE_IPL,
img_type,
l_temp_buffer0,
- MAX_RING_BUF_SIZE,
+ MAX_SEEPROM_IMAGE_SIZE,
l_temp_buffer1,
MAX_RING_BUF_SIZE,
l_temp_buffer2,
diff --git a/src/usr/isteps/istep16/call_host_activate_master.C b/src/usr/isteps/istep16/call_host_activate_master.C
index fa70c5da0..655bc08ad 100644
--- a/src/usr/isteps/istep16/call_host_activate_master.C
+++ b/src/usr/isteps/istep16/call_host_activate_master.C
@@ -102,7 +102,7 @@ void* call_host_activate_master (void *io_pArgs)
TARGETING::get_huid(l_proc_target));
//In the future possibly move default "waitTime" value to SBEIO code
- uint64_t waitTime = 10000;
+ uint64_t waitTime = 1000000; // bump the wait time to 1 sec
l_errl = SBEIO::startDeadmanLoop(waitTime);
if ( l_errl )
{
OpenPOWER on IntegriCloud