Skip to content

Commit 9ee125f

Browse files
jjmcgillsgupta2m
jjmcgill
authored and
sgupta2m
committed
L3 update -- p9_sbe_fabricinit
 remove stale TODO comments replace local defined bit field constants with SCOM address header constants add FFDC, HW callouts for all errors Change-Id: I8440323904cf1c76e0f056b2ecc71de357d522e0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40361 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Thi N. Tran <thi@us.ibm.com> Reviewed-by: DHRUVARAJ SUBHASH CHANDRAN <dhruvaraj@in.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40362 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
1 parent 99910d4 commit 9ee125f

File tree

3 files changed

+67
-22
lines changed

3 files changed

+67
-22
lines changed

‎src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.C

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@
2727
/// @brief Initialize island-mode fabric configuration (FAPI2)
2828
///
2929
/// @author Joe McGill <jmcgill@us.ibm.com>
30-
/// @author Christy Graves <clgraves@us.ibm.com>
3130
///
3231

3332
//
3433
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
3534
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
3635
// *HWP Team: Nest
37-
// *HWP Level: 2
36+
// *HWP Level: 3
3837
// *HWP Consumed by: SBE
3938
//
4039

@@ -54,12 +53,12 @@
5453
const uint64_t FABRICINIT_DELAY_HW_NS = 1000; // 1us
5554
const uint64_t FABRICINIT_DELAY_SIM_CYCLES = 200;
5655

57-
// ADU Command Register field/bit definitions
56+
// ADU Command Register field definitions
5857
const uint32_t ALTD_CMD_TTYPE_PBOP_EN_ALL = 0x3F;
5958
const uint32_t ALTD_CMD_TSIZE_PBOP_EN_ALL = 0x0B;
6059
const uint32_t ALTD_CMD_SCOPE_GROUP = 0x3;
6160

62-
// ADU Status Register field/bit definitions
61+
// ADU Status Register field definitions
6362
const uint32_t ALTD_STATUS_CRESP_ACK_DONE = 0x04;
6463

6564

@@ -109,8 +108,8 @@ p9_sbe_fabricinit(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
109108
PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_XLATE_ADDR_TO_ID_LEN>(l_fbc_xlate_addr_to_id);
110109

111110
l_hp_mode_data.clearBit<PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_PHYP_IS_GROUP>() // PHYP is group
112-
.clearBit<PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_ADDR_BAR>() // large system map
113-
.clearBit<PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_DCACHE_CAPP>(); // disable Dcache CAPP mode
111+
.clearBit<PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_ADDR_BAR>() // large system map
112+
.clearBit<PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR_CFG_DCACHE_CAPP>(); // disable Dcache CAPP mode
114113

115114
if (l_pump_mode == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_NODE) // pump mode
116115
{
@@ -144,8 +143,7 @@ p9_sbe_fabricinit(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
144143
"Error from p9_fbc_utils_get_fbc_state");
145144
FAPI_ASSERT(l_fbc_is_running,
146145
fapi2::P9_SBE_FABRICINIT_FBC_STOPPED_ERR().
147-
set_TARGET(i_target).
148-
set_FBC_RUNNING(l_fbc_is_running),
146+
set_TARGET(i_target),
149147
"Pervasive stop control is asserted, so fabricinit will not run!");
150148

151149
// write ADU Command Register to attempt lock acquisition
@@ -189,8 +187,8 @@ p9_sbe_fabricinit(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
189187
(ALTD_STATUS_CRESP_ACK_DONE);
190188

191189
FAPI_ASSERT(l_status_data_exp == l_status_data_act,
192-
fapi2::P9_SBE_FABRICINIT_FAILED_ERR().set_TARGET(i_target).
193-
set_ADU_STATUS_EXP(l_status_data_act).
190+
fapi2::P9_SBE_FABRICINIT_FAILED_ERR().
191+
set_TARGET(i_target).
194192
set_ADU_STATUS_ACT(l_status_data_act),
195193
"Fabric init failed, or mismatch in expected ADU status!");
196194

@@ -206,9 +204,7 @@ p9_sbe_fabricinit(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
206204
"Error from p9_fbc_utils_get_fbc_state");
207205
FAPI_ASSERT(l_fbc_is_initialized && l_fbc_is_running,
208206
fapi2::P9_SBE_FABRICINIT_NO_INIT_ERR().
209-
set_TARGET(i_target).
210-
set_FBC_INITIALIZED(l_fbc_is_initialized).
211-
set_FBC_RUNNING(l_fbc_is_running),
207+
set_TARGET(i_target),
212208
"ADU command succeded, but fabric was not cleanly initialized!");
213209

214210
fapi_try_exit:

‎src/import/chips/p9/procedures/hwp/nest/p9_sbe_fabricinit.H

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER sbe Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -60,14 +60,13 @@
6060
/// - Confirm state of fabric init control
6161
///
6262
/// @author Joe McGill <jmcgill@us.ibm.com>
63-
/// @author Christy Graves <clgraves@us.ibm.com>
6463
///
6564

6665
//
6766
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
6867
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
6968
// *HWP Team: Nest
70-
// *HWP Level: 2
69+
// *HWP Level: 3
7170
// *HWP Consumed by: SBE
7271
//
7372

‎src/import/chips/p9/procedures/xml/error_info/p9_sbe_fabricinit_errors.xml

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- -->
66
<!-- OpenPOWER sbe Project -->
77
<!-- -->
8-
<!-- Contributors Listed Below - COPYRIGHT 2015,2016 -->
8+
<!-- Contributors Listed Below - COPYRIGHT 2015,2017 -->
99
<!-- [+] International Business Machines Corp. -->
1010
<!-- -->
1111
<!-- -->
@@ -22,8 +22,17 @@
2222
<!-- permissions and limitations under the License. -->
2323
<!-- -->
2424
<!-- IBM_PROLOG_END_TAG -->
25-
<!-- Halt codes for p9_sbe_fabricinit -->
2625
<hwpErrors>
26+
<!-- ******************************************************************** -->
27+
<registerFfdc>
28+
<id>REG_FFDC_SBE_FABRICINIT</id>
29+
<scomRegister>PU_PB_CENT_SM0_PB_CENT_MODE</scomRegister>
30+
<scomRegister>PU_PB_CENT_SM0_PB_CENT_HP_MODE_NEXT</scomRegister>
31+
<scomRegister>PU_PB_CENT_SM0_PB_CENT_HP_MODE_CURR</scomRegister>
32+
<scomRegister>PU_PB_CENT_SM0_PB_CENT_HPX_MODE_NEXT</scomRegister>
33+
<scomRegister>PU_PB_CENT_SM0_PB_CENT_HPX_MODE_CURR</scomRegister>
34+
<scomRegister>PU_SND_MODE_REG</scomRegister>
35+
</registerFfdc>
2736
<!-- ******************************************************************** -->
2837
<hwpError>
2938
<sbeError/>
@@ -33,7 +42,21 @@
3342
Fabric init sequence not attempted, fabric arbitration is stopped.
3443
</description>
3544
<ffdc>TARGET</ffdc>
36-
<ffdc>FBC_RUNNING</ffdc>
45+
<collectRegisterFfdc>
46+
<id>REG_FFDC_SBE_FABRICINIT</id>
47+
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
48+
<target>TARGET</target>
49+
</collectRegisterFfdc>
50+
<callout>
51+
<target>TARGET</target>
52+
<priority>HIGH</priority>
53+
</callout>
54+
<deconfigure>
55+
<target>TARGET</target>
56+
</deconfigure>
57+
<gard>
58+
<target>TARGET</target>
59+
</gard>
3760
</hwpError>
3861
<!-- ******************************************************************** -->
3962
<hwpError>
@@ -44,8 +67,22 @@
4467
Fabric init failed, or mismatch in expected ADU status.
4568
</description>
4669
<ffdc>TARGET</ffdc>
47-
<ffdc>ADU_STATUS_EXP</ffdc>
4870
<ffdc>ADU_STATUS_ACT</ffdc>
71+
<collectRegisterFfdc>
72+
<id>REG_FFDC_SBE_FABRICINIT</id>
73+
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
74+
<target>TARGET</target>
75+
</collectRegisterFfdc>
76+
<callout>
77+
<target>TARGET</target>
78+
<priority>HIGH</priority>
79+
</callout>
80+
<deconfigure>
81+
<target>TARGET</target>
82+
</deconfigure>
83+
<gard>
84+
<target>TARGET</target>
85+
</gard>
4986
</hwpError>
5087
<!-- ******************************************************************** -->
5188
<hwpError>
@@ -56,8 +93,21 @@
5693
ADU operation completed successfully, but fabric was not initialized.
5794
</description>
5895
<ffdc>TARGET</ffdc>
59-
<ffdc>FBC_INITIALIZED</ffdc>
60-
<ffdc>FBC_RUNNING</ffdc>
96+
<collectRegisterFfdc>
97+
<id>REG_FFDC_SBE_FABRICINIT</id>
98+
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
99+
<target>TARGET</target>
100+
</collectRegisterFfdc>
101+
<callout>
102+
<target>TARGET</target>
103+
<priority>HIGH</priority>
104+
</callout>
105+
<deconfigure>
106+
<target>TARGET</target>
107+
</deconfigure>
108+
<gard>
109+
<target>TARGET</target>
110+
</gard>
61111
</hwpError>
62112
<!-- ******************************************************************** -->
63113
</hwpErrors>

0 commit comments

Comments
 (0)