From 7f888bf4d6ba420c5c5aa0f0a66741a4f57275a8 Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Wed, 4 Dec 2013 14:51:10 -0600 Subject: INITPROC: Hostboot - SW236290 - HWP Week 11/19 Change-Id: If83a0b4ae1380d246ab817a50aa4cd3dd7e8d0f8 CQ:SW236290 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7536 Tested-by: Jenkins Server Reviewed-by: Thi N. Tran Reviewed-by: A. Patrick Williams III --- .../proc_prep_master_winkle.C | 14 +++---- .../proc_prep_master_winkle.H | 4 +- .../proc_stop_deadman_timer.C | 14 +++---- .../proc_exit_cache_contained.C | 49 +++++++++++----------- .../proc_check_slave_sbe_seeprom_complete.C | 14 +++---- .../proc_extract_sbe_rc.C | 6 +-- 6 files changed, 50 insertions(+), 51 deletions(-) (limited to 'src/usr/hwpf/hwp') diff --git a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C index 45a474897..9156963ca 100644 --- a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C +++ b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.C @@ -21,7 +21,7 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_prep_master_winkle.C,v 1.13 2013/07/30 15:23:25 jeshua Exp $ +// $Id: proc_prep_master_winkle.C,v 1.14 2013/11/08 22:48:47 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.C,v $ //------------------------------------------------------------------------------ // *| @@ -55,10 +55,10 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_prep_master_winkle.H" -#include "p8_scom_addresses.H" -#include "p8_istep_num.H" -#include "proc_sbe_trigger_winkle.H" +#include +#include +#include +#include //------------------------------------------------------------------------------ // Function definitions @@ -77,13 +77,13 @@ extern "C" // // parameters: i_ex_target => Reference to master chiplet target // i_useRealSBE => True if proc_sbe_trigger_winkle is supposed to be -// running on the real SBE (default is true), else +// running on the real SBE (usually true), else // false if proc_sbe_trigger_winkle is running on // the FSP (via poreve). // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ fapi::ReturnCode proc_prep_master_winkle(const fapi::Target & i_ex_target, - const bool & i_useRealSBE = true) + const bool & i_useRealSBE) { // data buffer to hold register values ecmdDataBufferBase data(64); diff --git a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H index ae37dcf63..fa488de8e 100644 --- a/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H +++ b/src/usr/hwpf/hwp/core_activate/proc_prep_master_winkle/proc_prep_master_winkle.H @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: proc_prep_master_winkle.H,v 1.7 2013/07/01 18:41:37 stillgs Exp $ +// $Id: proc_prep_master_winkle.H,v 1.8 2013/11/08 22:47:42 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_prep_master_winkle.H,v $ //------------------------------------------------------------------------------ // *| @@ -69,7 +69,7 @@ extern "C" * * @param[in] i_ex_target Reference to master chiplet target * @param[in] i_useRealSBE True if proc_sbe_trigger_winkle is supposed to be - * running on the real SBE (default is true), else + * running on the real SBE (usually true), else * false if proc_sbe_trigger_winkle is running on * the FSP (via poreve). * diff --git a/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C b/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C index 6708a8a07..d5240c7b0 100644 --- a/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C +++ b/src/usr/hwpf/hwp/core_activate/proc_stop_deadman_timer/proc_stop_deadman_timer.C @@ -21,7 +21,7 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_stop_deadman_timer.C,v 1.8 2013/06/05 14:40:54 jeshua Exp $ +// $Id: proc_stop_deadman_timer.C,v 1.9 2013/11/08 22:10:44 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_stop_deadman_timer.C,v $ //------------------------------------------------------------------------------ // *| @@ -52,10 +52,10 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_stop_deadman_timer.H" -#include "p8_scom_addresses.H" -#include "p8_istep_num.H" -#include "proc_sbe_trigger_winkle.H" +#include +#include +#include +#include //------------------------------------------------------------------------------ // Function definitions @@ -119,7 +119,7 @@ extern "C" const fapi::Target & CHIP_IN_ERROR = i_target; ecmdDataBufferBase & SBE_VITAL = data; FAPI_SET_HWP_ERROR(rc, RC_PROC_STOP_DEADMAN_TIMER_BAD_ISTEP_NUM); - break; + fapiLogError(rc); } if( substep_num != SUBSTEP_DEADMAN_WAITING_FOR_HOSTBOOT ) @@ -130,7 +130,7 @@ extern "C" const fapi::Target & CHIP_IN_ERROR = i_target; ecmdDataBufferBase & SBE_VITAL = data; FAPI_SET_HWP_ERROR(rc, RC_PROC_STOP_DEADMAN_TIMER_BAD_SUBSTEP_NUM); - break; + fapiLogError(rc); } //Notify SBE that HB is alive again diff --git a/src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C b/src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C index 907a154a0..44d7123ae 100644 --- a/src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C +++ b/src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C @@ -1,27 +1,26 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ -// $Id: proc_exit_cache_contained.C,v 1.1 2012/03/14 06:03:08 venton Exp $ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwpf/hwp/dram_initialization/proc_exit_cache_contained/proc_exit_cache_contained.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ +// $Id: proc_exit_cache_contained.C,v 1.2 2013/11/05 22:12:13 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_exit_cache_contained.C,v $ //------------------------------------------------------------------------------ // *| @@ -40,7 +39,7 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_exit_cache_contained.H" +#include extern "C" { diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete.C b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete.C index 1a1c7b780..5f5515264 100644 --- a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete.C +++ b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_check_slave_sbe_seeprom_complete.C @@ -21,7 +21,7 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_check_slave_sbe_seeprom_complete.C,v 1.10 2013/10/28 16:46:40 jeshua Exp $ +// $Id: proc_check_slave_sbe_seeprom_complete.C,v 1.11 2013/11/05 22:08:23 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_check_slave_sbe_seeprom_complete.C,v $ //------------------------------------------------------------------------------ // *| @@ -43,12 +43,12 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_check_slave_sbe_seeprom_complete.H" -#include "p8_scom_addresses.H" -#include "p8_istep_num.H" -#include "proc_sbe_check_master.H" -#include "proc_sbe_enable_pnor.H" -#include "proc_extract_sbe_rc.H" +#include +#include +#include +#include +#include +#include //------------------------------------------------------------------------------ // Constant definitions diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc.C b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc.C index fc1ed2b2c..bbf2b87ca 100644 --- a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc.C +++ b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc.C @@ -21,7 +21,7 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_extract_sbe_rc.C,v 1.8 2013/09/20 15:26:29 jeshua Exp $ +// $Id: proc_extract_sbe_rc.C,v 1.9 2013/11/05 22:16:08 jeshua Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_extract_sbe_rc.C,v $ //------------------------------------------------------------------------------ // *| @@ -50,8 +50,8 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_extract_sbe_rc.H" -#include "p8_scom_addresses.H" +#include +#include //------------------------------------------------------------------------------ -- cgit v1.2.1