diff options
| author | Ben Gass <bgass@us.ibm.com> | 2016-02-23 12:11:34 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-02-26 16:00:35 -0600 |
| commit | 9243a34e7e752c020869bc25d2cdf85aa5d185da (patch) | |
| tree | 1dffc803fae15d348f10e5da97a2266fbdde2ddd /src | |
| parent | 871d3226ff359d9ffa02f5e571fb0824cd76de1f (diff) | |
| download | blackbird-hostboot-9243a34e7e752c020869bc25d2cdf85aa5d185da.tar.gz blackbird-hostboot-9243a34e7e752c020869bc25d2cdf85aa5d185da.zip | |
Changing PU_NVBUS_CHIPUNIT to PU_NV_CHIPUNIT
Change-Id: I7f287325516b885daeb7a26ec608afd01d79a175
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24645
Tested-by: Jenkins Server
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Dev-Ready: Benjamin Gass <bgass@us.ibm.com>
Tested-by: Auto Mirror
Reviewed-by: Brent Wieman <bwieman@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24647
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/chips/p9/common/scominfo/p9_cu.H | 5 | ||||
| -rw-r--r-- | src/import/chips/p9/common/scominfo/p9_scominfo.C | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/import/chips/p9/common/scominfo/p9_cu.H b/src/import/chips/p9/common/scominfo/p9_cu.H index b3aef6118..f9d8458df 100644 --- a/src/import/chips/p9/common/scominfo/p9_cu.H +++ b/src/import/chips/p9/common/scominfo/p9_cu.H @@ -7,7 +7,7 @@ /* */ /* EKB Project */ /* */ -/* COPYRIGHT 2015 */ +/* COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -45,7 +45,8 @@ extern "C" PU_EX_CHIPUNIT, ///< EX PU_XBUS_CHIPUNIT, ///< XBUS PU_OBUS_CHIPUNIT, ///< OBUS - PU_NVBUS_CHIPUNIT, ///< NV Link Brick + PU_NV_CHIPUNIT, ///< NV Link Brick + PU_NVBUS_CHIPUNIT, ///< DO NOT USE! TEMPORARY FOR CI ONLY PU_PEC_CHIPUNIT, ///< PCIe (PEC) PU_PHB_CHIPUNIT, ///< PCIe (PHB) PU_MI_CHIPUNIT, ///< MI (Cumulus only) diff --git a/src/import/chips/p9/common/scominfo/p9_scominfo.C b/src/import/chips/p9/common/scominfo/p9_scominfo.C index 0bcfe874b..727849239 100644 --- a/src/import/chips/p9/common/scominfo/p9_scominfo.C +++ b/src/import/chips/p9/common/scominfo/p9_scominfo.C @@ -97,7 +97,7 @@ extern "C" break; - case PU_NVBUS_CHIPUNIT: + case PU_NV_CHIPUNIT: l_scom.set_ring(4 + (i_chipUnitNum / 4)); l_scom.set_sat_id(((i_chipUnitNum == 2) || (i_chipUnitNum == 3)) ? 7 : 3); l_scom.set_sat_offset(l_scom.get_sat_offset() + (32 * (i_chipUnitNum % 2))); @@ -300,14 +300,14 @@ extern "C" (l_ring - MC_IOM01_0_RING_ID))); } - // PU_NVBUS_CHIPUNIT + // PU_NV_CHIPUNIT if ((l_chiplet_id == N3_CHIPLET_ID) && (l_port == UNIT_PORT_ID) && (((l_ring == N3_NPU_0_RING_ID) && ((l_sat_id == 3) || (l_sat_id == 7))) || ((l_ring == N3_NPU_1_RING_ID) && (l_sat_id == 3)))) { o_chipUnitRelated = true; - o_chipUnitPairing.push_back(p9_chipUnitPairing_t(PU_NVBUS_CHIPUNIT, + o_chipUnitPairing.push_back(p9_chipUnitPairing_t(PU_NV_CHIPUNIT, (4 * (l_ring - N3_NPU_0_RING_ID)) + (2 * (l_sat_id / 7)) + (l_sat_offset / 32))); |
