diff options
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/hwpf/hwp/build_winkle_images/makefile | 2 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C | 12 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.C (renamed from src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.C) | 20 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.H (renamed from src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.H) | 20 | ||||
-rw-r--r--[-rwxr-xr-x] | src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml (renamed from src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils_errors.xml) | 12 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/proc_spless_sbe_startWA/proc_spless_sbe_startWA.C | 4 | ||||
-rw-r--r-- | src/usr/hwpf/makefile | 2 |
7 files changed, 36 insertions, 36 deletions
diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile index 2e0507306..4b4af00c7 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/makefile +++ b/src/usr/hwpf/hwp/build_winkle_images/makefile @@ -69,7 +69,7 @@ OBJS = build_winkle_images.o \ p8_pfet_init.o \ p8_pfet_control.o \ p8_block_wakeup_intr.o \ - proc_mailbox_utils.o + p8_mailbox_utils.o ## NOTE: add a new directory onto the vpaths when you add a new HWP ## EXAMPLE: diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C index 80ac9a9ce..0beb1b125 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C +++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: p8_xip_customize.C,v 1.55 2013/09/13 14:09:15 jeshua Exp $ +// $Id: p8_xip_customize.C,v 1.56 2013/09/18 17:28:34 dcrowell Exp $ /*------------------------------------------------------------------------------*/ /* *! TITLE : p8_xip_customize */ /* *! DESCRIPTION : Obtains repair rings from VPD and adds them to either */ @@ -52,7 +52,7 @@ #include <p8_ring_identification.H> #include <p8_pore_table_gen_api.H> #include <p8_scom_addresses.H> -#include <proc_mailbox_utils.H> +#include <p8_mailbox_utils.H> #define min(a,b) ((a<b)?a:b) @@ -740,7 +740,7 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, uint32_t mboxValue = 0; //MBOX 0 (Note: utils functions number them 1-4, not 0-3) - rc = proc_mailbox_utils_get_mbox1(i_target, mboxValue); + rc = p8_mailbox_utils_get_mbox1(i_target, mboxValue); if( rc ) { FAPI_ERR("Getting the MBOX 0 value failed, so returning the error"); return rc; @@ -753,7 +753,7 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, } //MBOX 1 (Note: utils functions number them 1-4, not 0-3) - rc = proc_mailbox_utils_get_mbox2(i_target, mboxValue); + rc = p8_mailbox_utils_get_mbox2(i_target, mboxValue); if( rc ) { FAPI_ERR("Getting the MBOX 1 value failed, so returning the error"); return rc; @@ -766,7 +766,7 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, } //MBOX 2 (Note: utils functions number them 1-4, not 0-3) - rc = proc_mailbox_utils_get_mbox3(i_target, mboxValue); + rc = p8_mailbox_utils_get_mbox3(i_target, mboxValue); if( rc ) { FAPI_ERR("Getting the MBOX 2 value failed, so returning the error"); return rc; @@ -780,7 +780,7 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, //MBOX 3 (Note: utils functions number them 1-4, not 0-3) //Don't want to include the node info in the SBE image, because that would cause Stradale problems - rc = proc_mailbox_utils_get_mbox4(i_target, mboxValue, false); + rc = p8_mailbox_utils_get_mbox4(i_target, mboxValue, false); if( rc ) { FAPI_ERR("Getting the MBOX 3 value failed, so returning the error"); return rc; diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.C b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.C index 249aad409..3a4c04816 100755..100644 --- a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.C +++ b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.C $ */ +/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.C $ */ /* */ /* IBM CONFIDENTIAL */ /* */ @@ -21,8 +21,8 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_mailbox_utils.C,v 1.1 2013/08/12 22:03:50 jeshua Exp $ -// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_mailbox_utils.C,v $ +// $Id: p8_mailbox_utils.C,v 1.1 2013/09/18 17:28:20 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_mailbox_utils.C,v $ //------------------------------------------------------------------------------ // *| // *! (C) Copyright International Business Machines Corp. 2012 @@ -43,7 +43,7 @@ //------------------------------------------------------------------------------ // Includes //------------------------------------------------------------------------------ -#include "proc_mailbox_utils.H" +#include "p8_mailbox_utils.H" //------------------------------------------------------------------------------ // Function definitions @@ -356,7 +356,7 @@ fapi::ReturnCode vid2mv(uint8_t i_vid_7_0, uint32_t &o_voltage) // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uint32_t & o_set_data ) +fapi::ReturnCode p8_mailbox_utils_get_mbox1( const fapi::Target &i_target, uint32_t & o_set_data ) { fapi::ReturnCode l_fapirc; @@ -398,7 +398,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uin { FAPI_ERR("Attribute ATTR_FREQ_PROC_REFCLOCK failed must be non-zero"); uint32_t & REF_FREQ = l_refclk_freq; - FAPI_SET_HWP_ERROR(l_fapirc, RC_PROC_MAILBOX_UTILS_PROC_REFCLK_ZERO_ERROR); + FAPI_SET_HWP_ERROR(l_fapirc, RC_P8_MAILBOX_UTILS_PROC_REFCLK_ZERO_ERROR); break; } @@ -448,7 +448,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uin uint32_t & DPLL_DIV = l_dpll_divider; uint64_t & FREQ_MULT = l_result; const uint32_t & MAX_BITS = BOOT_FREQ_BIT_LENGTH; - FAPI_SET_HWP_ERROR(l_fapirc, RC_PROC_MAILBOX_UTILS_FREQ_MULT_OOB_ERROR); + FAPI_SET_HWP_ERROR(l_fapirc, RC_P8_MAILBOX_UTILS_FREQ_MULT_OOB_ERROR); break; } uint32_t l_freq_mult = (uint32_t)l_result; @@ -538,7 +538,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uin // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox2( const fapi::Target &i_target, uint32_t & o_set_data ) +fapi::ReturnCode p8_mailbox_utils_get_mbox2( const fapi::Target &i_target, uint32_t & o_set_data ) { fapi::ReturnCode l_fapirc; @@ -645,7 +645,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox2( const fapi::Target &i_target, uin // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox3( const fapi::Target &i_target, uint32_t & o_set_data ) +fapi::ReturnCode p8_mailbox_utils_get_mbox3( const fapi::Target &i_target, uint32_t & o_set_data ) { fapi::ReturnCode l_fapirc; @@ -710,7 +710,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox3( const fapi::Target &i_target, uin // i_includeNode True if the value should include node information // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox4( const fapi::Target &i_target, uint32_t & o_set_data, +fapi::ReturnCode p8_mailbox_utils_get_mbox4( const fapi::Target &i_target, uint32_t & o_set_data, bool i_includeNode ) { fapi::ReturnCode l_fapirc; diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.H b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.H index 4fdc2dd0b..8e858b9b5 100755..100644 --- a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.H +++ b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils.H $ */ +/* $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils.H $ */ /* */ /* IBM CONFIDENTIAL */ /* */ @@ -21,8 +21,8 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: proc_mailbox_utils.H,v 1.1 2013/08/12 21:23:05 jeshua Exp $ -// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_mailbox_utils.H,v $ +// $Id: p8_mailbox_utils.H,v 1.1 2013/09/18 17:28:30 dcrowell Exp $ +// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_mailbox_utils.H,v $ //------------------------------------------------------------------------------ // *| // *! (C) Copyright International Business Machines Corp. 2012 @@ -39,8 +39,8 @@ // *! Utility functions to calculate each mailbox value //------------------------------------------------------------------------------ -#ifndef _PROC_MAILBOX_UTILS_H_ -#define _PROC_MAILBOX_UTILS_H_ +#ifndef _P8_MAILBOX_UTILS_H_ +#define _P8_MAILBOX_UTILS_H_ //------------------------------------------------------------------------------ // Includes @@ -102,7 +102,7 @@ fapi::ReturnCode vid2mv(uint8_t i_vid_7_0, uint32_t &o_voltage); // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uint32_t & o_set_data ); +fapi::ReturnCode p8_mailbox_utils_get_mbox1( const fapi::Target &i_target, uint32_t & o_set_data ); //------------------------------------------------------------------------------ // function: @@ -125,7 +125,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox1( const fapi::Target &i_target, uin // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox2( const fapi::Target &i_target, uint32_t & o_set_data ); +fapi::ReturnCode p8_mailbox_utils_get_mbox2( const fapi::Target &i_target, uint32_t & o_set_data ); //------------------------------------------------------------------------------ // function: @@ -140,7 +140,7 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox2( const fapi::Target &i_target, uin // o_set_data The 32-bit mailbox value // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox3( const fapi::Target &i_target, uint32_t & o_set_data ); +fapi::ReturnCode p8_mailbox_utils_get_mbox3( const fapi::Target &i_target, uint32_t & o_set_data ); //------------------------------------------------------------------------------ // function: @@ -171,11 +171,11 @@ fapi::ReturnCode proc_mailbox_utils_get_mbox3( const fapi::Target &i_target, uin // i_includeNode True if the value should include node information // returns: FAPI_RC_SUCCESS if operation was successful, else error //------------------------------------------------------------------------------ -fapi::ReturnCode proc_mailbox_utils_get_mbox4( const fapi::Target &i_target, uint32_t & o_set_data, +fapi::ReturnCode p8_mailbox_utils_get_mbox4( const fapi::Target &i_target, uint32_t & o_set_data, bool i_includeNode ); } // extern "C" -#endif // _PROC_MAILBOX_UTILS_H_ +#endif // _P8_MAILBOX_UTILS_H_ diff --git a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils_errors.xml b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml index 41e8f569a..0c0baf16c 100755..100644 --- a/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils_errors.xml +++ b/src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils_errors.xml $ --> +<!-- $Source: src/usr/hwpf/hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml $ --> <!-- --> <!-- IBM CONFIDENTIAL --> <!-- --> @@ -20,23 +20,23 @@ <!-- Origin: 30 --> <!-- --> <!-- IBM_PROLOG_END_TAG --> -<!-- $Id: proc_mailbox_utils_errors.xml,v 1.1 2013/08/12 22:04:34 jeshua Exp $ --> +<!-- $Id: p8_mailbox_utils_errors.xml,v 1.1 2013/09/18 19:54:48 dcrowell Exp $ --> <!-- Error definitions for proc_mailbox_utils procedure --> <hwpErrors> <!-- *********************************************************************** --> <hwpError> - <rc>RC_PROC_MAILBOX_UTILS_PROC_REFCLK_ZERO_ERROR</rc> + <rc>RC_P8_MAILBOX_UTILS_PROC_REFCLK_ZERO_ERROR</rc> <description> - Procedure: proc_mailbox_utils (proc_mailbox_utils_get_mbox1) + Procedure: p8_mailbox_utils (p8_mailbox_utils_get_mbox1) The ATTR_FREQ_PROC_REFCLOCK specified a zero for proc refclk, which is invalid </description> <ffdc>REF_FREQ</ffdc> </hwpError> <!-- *********************************************************************** --> <hwpError> - <rc>RC_PROC_MAILBOX_UTILS_FREQ_MULT_OOB_ERROR</rc> + <rc>RC_P8_MAILBOX_UTILS_FREQ_MULT_OOB_ERROR</rc> <description> - Procedure: proc_mailbox_utils (proc_mailbox_utils_get_mbox1) + Procedure: p8_mailbox_utils (p8_mailbox_utils_get_mbox1) The calculated DPLL frequency multiplier is too bit to fit in the bit field </description> <ffdc>BOOT_FREQ</ffdc> diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_spless_sbe_startWA/proc_spless_sbe_startWA.C b/src/usr/hwpf/hwp/slave_sbe/proc_spless_sbe_startWA/proc_spless_sbe_startWA.C index c00f82c19..ef9c4ef8f 100644 --- a/src/usr/hwpf/hwp/slave_sbe/proc_spless_sbe_startWA/proc_spless_sbe_startWA.C +++ b/src/usr/hwpf/hwp/slave_sbe/proc_spless_sbe_startWA/proc_spless_sbe_startWA.C @@ -43,7 +43,7 @@ //------------------------------------------------------------------------------ #include "proc_spless_sbe_startWA.H" #include "p8_scom_addresses.H" -#include "proc_mailbox_utils.H" +#include "p8_mailbox_utils.H" //------------------------------------------------------------------------------ @@ -91,7 +91,7 @@ fapi::ReturnCode proc_spless_sbe_startWA(const fapi::Target & i_target) // ----------------------------------------------------------- //Need to set the I2C speed based in the mailbox reg //Since not all 1.x part have the correctly programmed OTPROM - rc = proc_mailbox_utils_get_mbox2( i_target, l_set_data ); + rc = p8_mailbox_utils_get_mbox2( i_target, l_set_data ); if (rc) { FAPI_ERR("ERROR: get_mbox2 = 0x%08x", diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index 422262f1e..3694635fe 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -120,7 +120,7 @@ HWP_ERROR_XML_FILES = hwp/fapiHwpErrorInfo.xml \ hwp/mc_config/mss_eff_config/memory_mss_eff_config_rank_group.xml \ hwp/mc_config/mss_eff_config/memory_mss_eff_config_termination.xml \ hwp/build_winkle_images/p8_block_wakeup_intr/p8_block_wakeup_intr_errors.xml \ - hwp/build_winkle_images/proc_mailbox_utils/proc_mailbox_utils_errors.xml \ + hwp/build_winkle_images/proc_mailbox_utils/p8_mailbox_utils_errors.xml \ hwp/proc_otprom_registers.xml ## these get generated into obj/genfiles/AttributeIds.H |