diff options
| author | Ben Gass <bgass@us.ibm.com> | 2016-01-12 17:16:42 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-02-22 09:46:18 -0600 |
| commit | 1e624e38caefbadbf8e5efc7d205b99599e32d6d (patch) | |
| tree | 8611da35defc121d61fa8c370bde177d6cd5a6de | |
| parent | b19347d04338fbf802d7381b8faf1b9e589f683b (diff) | |
| download | blackbird-hostboot-1e624e38caefbadbf8e5efc7d205b99599e32d6d.tar.gz blackbird-hostboot-1e624e38caefbadbf8e5efc7d205b99599e32d6d.zip | |
Update for MCBIST region
The MCBIST scom satellite only uses
2 bits for its satellite id.
Change-Id: Iedf7e80b821d80e1bdd476afa87dcdbcf2236189
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23250
Tested-by: Jenkins Server
Reviewed-by: Brent Wieman <bwieman@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24521
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/import/chips/p9/common/scominfo/p9_scom_addr.H | 7 | ||||
| -rw-r--r-- | src/import/chips/p9/common/scominfo/p9_scominfo.C | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/import/chips/p9/common/scominfo/p9_scom_addr.H b/src/import/chips/p9/common/scominfo/p9_scom_addr.H index 7c2e06ce5..cd0b16050 100644 --- a/src/import/chips/p9/common/scominfo/p9_scom_addr.H +++ b/src/import/chips/p9/common/scominfo/p9_scom_addr.H @@ -7,7 +7,7 @@ /* */ /* EKB Project */ /* */ -/* COPYRIGHT 2015 */ +/* COPYRIGHT 2015,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -257,10 +257,7 @@ extern "C" typedef enum { - MC_DIR_SAT_ID_MCBIST_0 = 0x3, - MC_DIR_SAT_ID_MCBIST_1 = 0x4, - MC_DIR_SAT_ID_MCBIST_2 = 0x5, - MC_DIR_SAT_ID_MCBIST_3 = 0x6 + MC_DIR_SAT_ID_MCBIST = 0xC } p9_mc_dir1_sat_id_t; typedef enum diff --git a/src/import/chips/p9/common/scominfo/p9_scominfo.C b/src/import/chips/p9/common/scominfo/p9_scominfo.C index bfabaac9d..0bcfe874b 100644 --- a/src/import/chips/p9/common/scominfo/p9_scominfo.C +++ b/src/import/chips/p9/common/scominfo/p9_scominfo.C @@ -269,7 +269,7 @@ extern "C" if (((l_chiplet_id == MC01_CHIPLET_ID) || (l_chiplet_id == MC23_CHIPLET_ID)) && (l_port == UNIT_PORT_ID) && (l_ring == MC_MC01_1_RING_ID) && - ((l_sat_id >= MC_DIR_SAT_ID_MCBIST_0) && (l_sat_id <= MC_DIR_SAT_ID_MCBIST_3))) + ((l_sat_id & 0xC) == MC_DIR_SAT_ID_MCBIST)) //MCBIST has 2 bit sat_id { o_chipUnitRelated = true; o_chipUnitPairing.push_back(p9_chipUnitPairing_t(PU_MCBIST_CHIPUNIT, |
