From 42a34c0435029b0cce0947eda710362e83338293 Mon Sep 17 00:00:00 2001 From: Raja Das Date: Fri, 10 Feb 2017 06:50:25 -0600 Subject: [PATCH] Workaround to fix issue where Powerbus loses track of EQs in DD1 Change-Id: Ia7ffcfdead79e859f21b95be183af05949e68579 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36276 Tested-by: Jenkins Server Reviewed-by: YUE DU Tested-by: PPE CI Reviewed-by: Sachin Gupta Reviewed-by: Thi N. Tran Tested-by: Thi N. Tran Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36278 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../p9/procedures/hwp/pm/p9_quad_power_off.C | 103 ++++++++++++++++++ .../p9/procedures/hwp/pm/p9_quad_power_off.H | 7 +- .../xml/attribute_info/chip_ec_attributes.xml | 16 +++ .../error_info/p9_quad_power_off_errors.xml | 10 +- 4 files changed, 133 insertions(+), 3 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C index da0e4e337db..5fe22ade9d9 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.C @@ -52,6 +52,26 @@ // Function definitions // ---------------------------------------------------------------------- +#ifdef __PPE__ +uint64_t G_ring_save[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + +// {0, 0}, +// {5039, 0xE000000000000000}, //3 +// {5100, 0xC1E061FFED5F0000}, //29 +// {5664, 0xE000000000000000}, //3 +// {5725, 0xC1E061FFED5F0000}, //29 +// {5973, 0xE000000000000000}, //3 +// {6034, 0xC1E061FFED5F0000}, //29 +// {6282, 0xE000000000000000}, //3 +// {6343, 0xC1E061FFED5F0000}, //29 +// {17871, 0} //128 +const uint64_t G_ring_index[10] = +{ + 0, 5039, 5100, 5664, 5725, 5973, 6034, 6282, 6343, 17871, +}; +#endif + + // Procedure p9_quad_power_off entry point, comments in header fapi2::ReturnCode p9_quad_power_off( const fapi2::Target& i_target) @@ -61,12 +81,95 @@ fapi2::ReturnCode p9_quad_power_off( constexpr uint32_t MAX_CORE_PER_QUAD = 4; fapi2::ReturnCode rc = fapi2::FAPI2_RC_SUCCESS; uint32_t l_cnt = 0; +#ifdef __PPE__ + uint8_t l_isMpipl = 0; + uint8_t l_isRingSaveMpipl = 0; + const fapi2::Target FAPI_SYSTEM; + fapi2::Target l_chip = + i_target.getParent(); + + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_IS_MPIPL, FAPI_SYSTEM, l_isMpipl), "fapiGetAttribute of ATTR_IS_MPIPL failed!"); + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_RING_SAVE_MPIPL, l_chip, l_isRingSaveMpipl), + "fapiGetAttribute of ATTR_CHIP_EC_FEATURE_RING_SAVE_MPIPL failed"); +#endif FAPI_INF("p9_quad_power_off: Entering..."); // Print chiplet position FAPI_INF("Quad power off chiplet no.%d", i_target.getChipletNumber()); +#ifdef __PPE__ + + if (l_isMpipl && l_isRingSaveMpipl) + { + l_data64.setBit<4>(); //SCAN_REGION_PERV - scan clock region perv + l_data64.setBit<5>(); //SCAN_REGION_UNIT1 - scan clock region eqpb - pb + l_data64.setBit<11>(); //SCAN_REGION_UNIT7 - scan clock region pbieq - pb + l_data64.setBit<59>(); //SCAN_TYPE_INEX - scan chain idex (c14 asic) + + FAPI_TRY(fapi2::putScom(i_target, + EQ_SCAN_REGION_TYPE, + l_data64)); + + l_data64.flush<0>().set(0xa5a5a5a5a5a5a5a5); + + FAPI_TRY(fapi2::putScom(i_target, + EQ_SCAN64, + l_data64)); + + for(uint32_t l_spin = 1; l_spin < 10; l_spin++) + { + uint64_t l_scandata = ((l_spin == 0) || (l_spin == 9)) ? 0x0 : (l_spin & 0x1) ? + 0xE000000000000000 : 0xC1E061FFED5F0000; + l_data64.flush<0>().set((G_ring_index[l_spin] - G_ring_index[l_spin - 1]) << 32); + + FAPI_TRY(fapi2::putScom(i_target, + EQ_SCAN_LONG_ROTATE, + l_data64)); + l_data64.flush<0>(); + + do + { + FAPI_TRY(fapi2::getScom(i_target, + EQ_CPLT_STAT0, + l_data64)); + } + while (l_data64.getBit<8>() == 0); + + l_data64.flush<0>(); + + if (l_spin == 9) + { + FAPI_TRY(fapi2::getScom(i_target, + EQ_SCAN64, + l_data64)); + + if(l_data64 != 0xa5a5a5a5a5a5a5a5) + { + FAPI_ASSERT(false, + fapi2::P9_PM_QUAD_POWEROFF_INCORRECT_EQ_SCAN64_VAL() + .set_EQ_SCAN64_VAL(l_data64), + "Incorrect Value from EQ_SCAN64, Expected Value [0xa5a5a5a5a5a5a5a5]"); + } + } + else + { + l_data64.flush<0>(); + FAPI_TRY(fapi2::getScom(i_target, + EQ_SCAN64, + l_data64)); + G_ring_save[l_spin - 1] = l_scandata & l_data64; + } + } + + l_data64.flush<0>(); + FAPI_TRY(fapi2::putScom(i_target, + EQ_SCAN_REGION_TYPE, + l_data64)); + } + +#endif + FAPI_DBG("Disabling bits 20/22/24/26 in EQ_QPPM_QPMMR_CLEAR, to gain access" " to PFET controller, otherwise Quad Power off scom will fail"); l_data64.setBit<20>(); diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.H b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.H index f6a66a877e5..f7f9f6d89fb 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_quad_power_off.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -48,6 +48,11 @@ // Constant definitions //------------------------------------------------------------------------------ +#ifdef __PPE__ + extern uint64_t G_ring_save[8]; + extern const uint64_t G_ring_index[10]; +#endif + // function pointer typedef definition for HWP call support typedef fapi2::ReturnCode (*p9_quad_power_off_FP_t) ( const fapi2::Target& i_target); diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml index 5fb500fa8f9..15b2ea91b8b 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml @@ -2338,6 +2338,22 @@ + + ATTR_CHIP_EC_FEATURE_RING_SAVE_MPIPL + TARGET_TYPE_PROC_CHIP + + For Nimbus DD2 we no longer need a workaround for Ring Save in MPIPL + + + + ENUM_ATTR_NAME_NIMBUS + + 0x20 + LESS_THAN + + + + diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_quad_power_off_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_quad_power_off_errors.xml index 4da24d45159..688ae350e5f 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_quad_power_off_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_quad_power_off_errors.xml @@ -5,7 +5,7 @@ - + @@ -25,6 +25,12 @@ - + + RC_P9_PM_QUAD_POWEROFF_INCORRECT_EQ_SCAN64_VAL + + Data mis-match on EQ_SCAN64 + + EQ_SCAN64_VAL +