SW304615: INITPROC: Update SMP settings for Naples PHBs

Change-Id: Iea2a89c3452db07be926699a471589e907cd2ab7
CQ:SW304615
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/#/c/18111/
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18112
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

7 files changed, 24 insertions, 17 deletions

diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_fbc_ab.C b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_fbc_ab.C
index 96f41b88f..7fbdaa9fb 100644
--- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_fbc_ab.C
+++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_fbc_ab.C
@@ -22,13 +22,13 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_build_smp_fbc_ab.C,v 1.13 2014/11/18 17:41:03 jmcgill Exp $
+// $Id: proc_build_smp_fbc_ab.C,v 1.14 2015/04/21 22:29:53 jhuynh1 Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_build_smp_fbc_ab.C,v $
+
 //------------------------------------------------------------------------------
 // *|
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
-// *! ***  ***
 // *|
 // *! TITLE       : proc_build_smp_fbc_ab.C
 // *! DESCRIPTION : Fabric configuration (hotplug, AB) functions (FAPI)
@@ -75,7 +75,8 @@ const uint32_t PB_HP_MODE_A_CMD_RATE_MAX_VALUE = 0x7F;
 const uint32_t PB_HP_MODE_A_GATHER_ENABLE_BIT = 32;
 const uint32_t PB_HP_MODE_A_GATHER_DLY_CNT_START_BIT = 33;
 const uint32_t PB_HP_MODE_A_GATHER_DLY_CNT_END_BIT = 37;
-const uint32_t PB_HP_MODE_PCIE3_NOT_DSMP_BIT = 40;
+const uint32_t PB_HP_MODE_CFG_P2_X8TOK = 39;
+const uint32_t PB_HP_MODE_CFG_P3_X8TOK = 40;
 const uint32_t PB_HP_MODE_GATHER_ENABLE_BIT_PCIE3_PRESENT = 41;
 const uint32_t PB_HP_MODE_GATHER_ENABLE_BIT_PCIE3_NOT_PRESENT = 40;
 const uint32_t PB_HP_MODE_F_AGGREGATE_BIT = 55;
@@ -1471,8 +1472,11 @@ fapi::ReturnCode proc_build_smp_set_pb_hp_mode(
 
         if (i_smp_chip.num_phb > 3)
         {
+            // pb_cfg_p2_x8tok
+            rc_ecmd |= data.clearBit(PB_HP_MODE_CFG_P2_X8TOK);
+
             // pb_cfg_p3_x8tok
-            rc_ecmd |= data.setBit(PB_HP_MODE_PCIE3_NOT_DSMP_BIT);
+            rc_ecmd |= data.clearBit(PB_HP_MODE_CFG_P3_X8TOK);
 
             // pb_cfg_gather_enable
             rc_ecmd |= data.writeBit(PB_HP_MODE_GATHER_ENABLE_BIT_PCIE3_PRESENT,
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_control.C b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_control.C
index 29067e408..7ebdb394b 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_control.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar/p8_pfet_control.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pfet_control.C,v 1.14 2014/03/13 20:48:21 stillgs Exp $
+// $Id: p8_pfet_control.C,v 1.16 2015/05/13 03:47:51 stillgs Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pfet_control.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
diff --git a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
index 682779c69..c20bc97e3 100644
--- a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
+++ b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_setup_bars.C,v 1.27 2015/02/02 18:58:18 jmcgill Exp $
+// $Id: proc_setup_bars.C,v 1.28 2015/04/14 22:19:55 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_setup_bars.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -2392,7 +2392,7 @@ proc_setup_bars_write_local_chip_region_bars(
                     i_smp_chip.chip->this_chip,
                     PROC_SETUP_BARS_NPU_CHIP_NON_MIRRORED_BAR[u],
                     common_nf_scope_bar_reg_def,
-                    i_smp_chip.mirrored_range);
+                    i_smp_chip.non_mirrored_range);
                 if (!rc.ok())
                 {
                     FAPI_ERR("proc_setup_bars_write_local_chip_region_bars: Error from proc_setup_bars_common_write_bar_reg");
@@ -2403,7 +2403,6 @@ proc_setup_bars_write_local_chip_region_bars(
             {
                 break;
             }
-
         }
 
         // NPU (mirrored)
@@ -2766,7 +2765,7 @@ proc_setup_bars_write_local_node_region_bars(
                     i_smp_chip.chip->this_chip,
                     PROC_SETUP_BARS_NPU_NODE_NON_MIRRORED_BAR[u],
                     common_nf_scope_bar_reg_def,
-                    i_smp_node.mirrored_range);
+                    i_smp_node.non_mirrored_range);
                 if (!rc.ok())
                 {
                     FAPI_ERR("proc_setup_bars_write_local_node_region_bars: Error from proc_setup_bars_common_write_bar_reg");
diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pcbs_init.C b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pcbs_init.C
index a7ccaabb3..47b1ebbbd 100644
--- a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pcbs_init.C
+++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pcbs_init.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pcbs_init.C,v 1.29 2014/10/10 02:01:32 cmolsen Exp $
+// $Id: p8_pcbs_init.C,v 1.31 2015/05/13 03:47:51 stillgs Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pcbs_init.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
@@ -1574,6 +1574,9 @@ This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 
 $Log: p8_pcbs_init.C,v $
+Revision 1.31  2015/05/13 03:47:51  stillgs
+Revert to previous version due to erroneous commit
+
 Revision 1.29  2014/10/10 02:01:32  cmolsen
 SW280752: Updated to capture more FFDC data on RC_PROC_PCBS_CODE_SAFE_FSM_TIMEOUT
 
diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C
index 3c4fbaca3..0bbac895f 100644
--- a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C
+++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pm_utils.C,v 1.3 2014/02/17 02:53:07 stillgs Exp $
+// $Id: p8_pm_utils.C,v 1.5 2015/05/20 19:26:23 stillgs Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pm_utils.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
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 2d1e943f4..9bc604b39 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
@@ -22,12 +22,13 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_extract_sbe_rc.C,v 830.1 2015-04-20 13:55:16 dcrowell Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/fw830/procedures/ipl/fapi/proc_extract_sbe_rc.C,v $
+// $Id: proc_extract_sbe_rc.C,v 1.24 2015/05/14 22:27:29 jmcgill Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_extract_sbe_rc.C,v $
 //------------------------------------------------------------------------------
 // *|
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
+// *! ***  ***
 // *|
 // *! TITLE       : proc_extract_sbe_rc.C
 // *! DESCRIPTION : Create return code for PORE (SBE/SLW) error
diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
index 0223774b6..bd114067f 100644
--- a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
+++ b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
@@ -22,7 +22,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_extract_sbe_rc_errors.xml,v 830.1 2015-04-20 13:55:22 dcrowell Exp $ -->
+<!-- $Id: proc_extract_sbe_rc_errors.xml,v 1.19 2015/04/15 18:40:56 dcrowell Exp $ -->
 <!-- Error definitions for proc_extract_sbe_rc procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->