diff options
author | Thi Tran <thi@us.ibm.com> | 2013-05-14 20:42:27 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-05-15 09:50:17 -0500 |
commit | e6d69329d643edc044bcf312e0dfacbddc82bf10 (patch) | |
tree | 9f66c36b10645407e0e18d50f4a4864d27bba3f8 /src/usr/hwpf/hwp/slave_sbe | |
parent | 8e6862f784cd4ead69055a8a5de3d63172ee443c (diff) | |
download | talos-hostboot-e6d69329d643edc044bcf312e0dfacbddc82bf10.tar.gz talos-hostboot-e6d69329d643edc044bcf312e0dfacbddc82bf10.zip |
INITPROC: Hostboot - High Priority HW Init Procedures for week of 4/30
SW201168
Change-Id: I94c46f56d68bc9c0a6c0bfcd9c08465be337ba12
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4505
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp/slave_sbe')
-rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.C | 6 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.H | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.C b/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.C index a981d8c5a..36db42962 100644 --- a/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.C +++ b/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: proc_revert_sbe_mcs_setup.C,v 1.6 2013/01/20 15:55:42 jmcgill Exp $ +// $Id: proc_revert_sbe_mcs_setup.C,v 1.7 2013/04/27 17:23:41 jmcgill Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_revert_sbe_mcs_setup.C,v $ //------------------------------------------------------------------------------ // *| @@ -140,7 +140,7 @@ fapi::ReturnCode proc_revert_sbe_mcs_setup_reset_mcfgp( //------------------------------------------------------------------------------ -// function: set MCI FIR Mask channel timeout bit, to restore register flush +// function: set MCI FIR Mask channel timeout bits, to restore register flush // state // parameters: i_target => chip target // i_mcs_unit_num => chip unit number @@ -162,6 +162,8 @@ fapi::ReturnCode proc_revert_sbe_mcs_setup_reset_mcifirmask( { // set fields manipulated by SBE (to restore logic flush state) rc_ecmd |= mcifirmask_or_data.setBit( + MCIFIR_CL_TIMEOUT_BIT); + rc_ecmd |= mcifirmask_or_data.setBit( MCIFIR_CL_TIMEOUT_DUE_TO_CHANNEL_BIT); // check buffer manipulation return code diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.H b/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.H index 90719e5ba..0dca948db 100644 --- a/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.H +++ b/src/usr/hwpf/hwp/slave_sbe/proc_revert_sbe_mcs_setup/proc_revert_sbe_mcs_setup.H @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: proc_revert_sbe_mcs_setup.H,v 1.3 2013/01/20 15:55:45 jmcgill Exp $ +// $Id: proc_revert_sbe_mcs_setup.H,v 1.4 2013/04/27 17:23:43 jmcgill Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_revert_sbe_mcs_setup.H,v $ //------------------------------------------------------------------------------ // *| @@ -73,7 +73,8 @@ const uint32_t MCFGP_GROUP_BASE_ADDR_START_BIT = 26; const uint32_t MCFGP_GROUP_BASE_ADDR_END_BIT = 43; // MCIFIR register constants -const uint32_t MCIFIR_CL_TIMEOUT_DUE_TO_CHANNEL_BIT = 28; +const uint32_t MCIFIR_CL_TIMEOUT_BIT = 27; +const uint32_t MCIFIR_CL_TIMEOUT_DUE_TO_CHANNEL_BIT = 40; //------------------------------------------------------------------------------ |