diff options
| author | Caleb Palmer <cnpalmer@us.ibm.com> | 2019-07-01 09:36:46 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2019-07-10 08:50:41 -0500 |
| commit | 85475e45d89c8f5ced7dab167dc816aa6a63cef7 (patch) | |
| tree | 69f37bb5d94948cb20cfde4d8cbc343115cf7395 /src/import/chips/p9/common | |
| parent | 00826314dde63acf698861a677cf981d2b027653 (diff) | |
| download | talos-hostboot-85475e45d89c8f5ced7dab167dc816aa6a63cef7.tar.gz talos-hostboot-85475e45d89c8f5ced7dab167dc816aa6a63cef7.zip | |
NPU SCOM translation non-instance 0 fix
Change-Id: I5818fcc3f78f55d7c60281cb6f3e814eab05646b
RTC: 208523
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79822
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Benjamen G. Tyner <ben.tyner@ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79878
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/common')
| -rw-r--r-- | src/import/chips/p9/common/scominfo/p9_scominfo.C | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/import/chips/p9/common/scominfo/p9_scominfo.C b/src/import/chips/p9/common/scominfo/p9_scominfo.C index 025b11fd7..ff80a3161 100644 --- a/src/import/chips/p9/common/scominfo/p9_scominfo.C +++ b/src/import/chips/p9/common/scominfo/p9_scominfo.C @@ -656,7 +656,9 @@ extern "C" // NPU0: 05011000 to 050113FF // NPU1: 05011400 to 050117FF // NPU2: 03011C00 to 03011FFF - if ( N3_NPU_0_RING_ID == l_ring ) + if ( N3_NPU_0_RING_ID == l_ring || + N3_NPU_1_RING_ID == l_ring || + P9A_NPU_2_RING_ID == l_ring ) { // NPU0/NPU1 if ( N3_CHIPLET_ID == l_chiplet_id ) @@ -677,17 +679,20 @@ extern "C" // NPU0: 05013C00 to 05013C8F // NPU1: 05013CC0 to 05013D4F // NPU2: 03012000 to 0301208F - else if ( P9A_NPU_0_FIR_RING_ID == l_ring ) + else if ( P9A_NPU_0_FIR_RING_ID == l_ring || + P9A_NPU_2_FIR_RING_ID == l_ring ) { // NPU0/NPU1 if ( N3_CHIPLET_ID == l_chiplet_id ) { - l_scom.set_sat_id( l_sat_id + (3 * i_chipUnitNum) ); + l_scom.set_ring( P9A_NPU_0_FIR_RING_ID ); + l_scom.set_sat_id( (l_sat_id % 3) + (3 * i_chipUnitNum) ); } // NPU2 else if ( N1_CHIPLET_ID == l_chiplet_id ) { l_scom.set_ring( P9A_NPU_2_FIR_RING_ID ); + l_scom.set_sat_id( l_sat_id % 3 ); } else { |
