From 987752d8494c4ac2f0dac41b72c21b5cbb0d0488 Mon Sep 17 00:00:00 2001
From: Jacob Harvey <jlharvey@us.ibm.com>
Date: Wed, 31 May 2017 17:34:17 -0500
Subject: L3 RAS for draminit_training, eff_config, lib

Change-Id: I1981cd809b109f32869e4ec98c5cdfd7fb375af9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41204
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41277
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
---
 .../p9/procedures/hwp/memory/lib/phy/ddr_phy.C     | 52 +++++++++----------
 .../chips/p9/procedures/hwp/memory/lib/phy/dp16.C  | 58 +++++++++++++---------
 2 files changed, 61 insertions(+), 49 deletions(-)

(limited to 'src/import/chips/p9/procedures/hwp/memory/lib/phy')

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
index f4591f18c..b275692e8 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/ddr_phy.C
@@ -586,8 +586,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                 .set_FAILED_STEPS(uint64_t(l_err_data))
                 .set_PORT_POSITION(mss::fapi_pos(i_target))
                 .set_RANKGROUP_POSITION(l_rank_pairs)
-                .set_TARGET_IN_ERROR(l_failed_dimm)
-                .set_TARGET_WITH_REGISTERS(i_target),
+                .set_DIMM_TARGET(l_failed_dimm)
+                .set_MCA_TARGET(i_target),
                 "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                 "multiple training steps", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -596,8 +596,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_WR_LVL_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "write leveling", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -606,8 +606,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_INITIAL_PAT_WRITE_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "initial pattern write", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -616,8 +616,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_DQS_ALIGNMENT_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "DQS alignment", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -626,8 +626,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_RD_CLK_SYS_CLK_ALIGNMENT_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "read clk alignment", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -636,8 +636,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_RD_CENTERING_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "read centering", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -646,8 +646,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_WR_CENTERING_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "write centering", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -656,8 +656,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_INITIAL_COARSE_WR_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "initial coarse write", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -666,8 +666,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_COARSE_RD_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "coarse read", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -676,8 +676,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_CUSTOM_PATTERN_RD_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "custom read", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -686,8 +686,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_CUSTOM_PATTERN_WR_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "custom write", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -696,8 +696,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_DIGITAL_EYE_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "digital eye", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
@@ -706,8 +706,8 @@ fapi2::ReturnCode process_initial_cal_errors( const fapi2::Target<TARGET_TYPE_MC
                  fapi2::MSS_DRAMINIT_TRAINING_VREF_ERROR()
                  .set_PORT_POSITION(mss::fapi_pos(i_target))
                  .set_RANKGROUP_POSITION(l_rank_pairs)
-                 .set_TARGET_IN_ERROR(l_failed_dimm)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_DIMM_TARGET(l_failed_dimm)
+                 .set_MCA_TARGET(i_target),
                  "Initial CAL failed %s. dimm: %s, cal err: 0x%016llx",
                  "VREF calibration", mss::c_str(l_failed_dimm), uint64_t(l_err_data)
                );
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
index 0f6102caa..cfa8f6257 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/dp16.C
@@ -1011,7 +1011,7 @@ static fapi2::ReturnCode clock_enable_helper( const fapi2::Target<TARGET_TYPE_MC
                 FAPI_ASSERT( false,
                              fapi2::MSS_INVALID_DRAM_WIDTH().
                              set_DRAM_WIDTH(l_sdram_width).
-                             set_TARGET(d),
+                             set_DIMM_TARGET(d),
                              "Received in valid DRAM width: x%d for %s. "
                              "Expected x8 or x4 configuration.",
                              l_sdram_width, mss::c_str(d) );
@@ -2387,8 +2387,10 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
             l_dq_bad_bit_count = mss::bit_count(uint64_t(v.first));
             FAPI_INF("bad DQ count for port %d DP%d %d", l_which_port, l_which_dp, l_dq_bad_bit_count);
             FAPI_ASSERT(l_dq_bad_bit_count < MIN_BAD_BITS,
-                        fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                        "port %d DP%d too many bad DQ bits 0x%016lx", l_which_port, l_which_dp, v.first);
+                        fapi2::MSS_DISABLED_BITS()
+                        .set_MCA_TARGET(i_target)
+                        .set_DIMM_TARGET(i_dimm),
+                        "%s port %d DP%d too many bad DQ bits 0x%016lx", mss::c_str(i_dimm), l_which_port, l_which_dp, v.first);
 
             //
             // Find the DQS mask for this DP.
@@ -2409,8 +2411,8 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
                 FAPI_INF("bad DQS count for port %d DP%d %d", l_which_port, l_which_dp, l_dqs_bad_bit_count);
                 FAPI_ASSERT(l_dqs_bad_bit_count <
                             ((l_width == fapi2::ENUM_ATTR_EFF_DRAM_WIDTH_X8) ? MIN_BAD_X8_DQS : MIN_BAD_X4_DQS),
-                            fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                            "port %d DP%d too many bad DQS bits 0x%016lx", l_which_port, l_which_dp, v.second);
+                            fapi2::MSS_DISABLED_BITS().set_MCA_TARGET(i_target).set_DIMM_TARGET(i_dimm),
+                            "%s port %d DP%d too many bad DQS bits 0x%016lx", mss::c_str(i_dimm), l_which_port, l_which_dp, v.second);
 
                 // So there's no way to get here if we have a x8 config. Either we had no bad DQS, in which case
                 // we didn't come down here at all, or we have at least one bad DQS. And for x8 that means we have
@@ -2427,8 +2429,14 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
                     // We shift it over to mask off the nibble we're checking
                     const uint16_t l_dqs_nibble_mask = 0b1100000000000000 >> (n * BITS_PER_DQS);
 
-                    FAPI_INF("port %d DP%d nibble %d (%d) mask: 0x%x dqs: 0x%x",
-                             l_which_port, l_which_dp, n, n + l_which_nibble, l_dqs_nibble_mask, v.second);
+                    FAPI_INF("%s port %d DP%d nibble %d (%d) mask: 0x%x dqs: 0x%x",
+                             mss::c_str(i_dimm),
+                             l_which_port,
+                             l_which_dp,
+                             n,
+                             n + l_which_nibble,
+                             l_dqs_nibble_mask,
+                             v.second);
 
                     if ((l_dqs_nibble_mask & v.second) != 0)
                     {
@@ -2441,8 +2449,12 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
                 // Check to see if the DQ nibble processing found more than one bad nibble. If it did,
                 // we're done.
                 FAPI_ASSERT(l_bad_nibbles.size() <= MAX_BAD_NIBBLES,
-                            fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                            "port %d DP%d too many bad nibbles %d", l_which_port, l_which_nibble, l_bad_nibbles.size());
+                            fapi2::MSS_DISABLED_BITS().set_MCA_TARGET(i_target).set_DIMM_TARGET(i_dimm),
+                            "%s port %d DP%d too many bad nibbles %d",
+                            mss::c_str(i_dimm),
+                            l_which_port,
+                            l_which_nibble,
+                            l_bad_nibbles.size());
             }
 
             //
@@ -2463,8 +2475,8 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
                     // we add this bit to the total of bad singleton bits.
                     const uint64_t l_bit_count = mss::bit_count(l_dq_nibble_mask & v.first);
 
-                    FAPI_INF("port %d DP%d nibble %d (%d) mask: 0x%x dq: 0x%x c: %d",
-                             l_which_port, l_which_dp, n, n + l_which_nibble, l_dq_nibble_mask, v.first, l_bit_count);
+                    FAPI_INF("%s port %d DP%d nibble %d (%d) mask: 0x%x dq: 0x%x c: %d",
+                             mss::c_str(i_dimm), l_which_port, l_which_dp, n, n + l_which_nibble, l_dq_nibble_mask, v.first, l_bit_count);
 
 
                     // If we don't have any set bits, we're good to go. If we have more than the max bad bits,
@@ -2494,17 +2506,17 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
         // counts as a bad nibble.
         //
         FAPI_ASSERT(l_bad_nibbles.size() <= MAX_BAD_NIBBLES,
-                    fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                    "port %d DP%d too many bad nibbles %d",
-                    l_which_port, l_which_dp, l_bad_nibbles.size());
+                    fapi2::MSS_DISABLED_BITS().set_MCA_TARGET(i_target).set_DIMM_TARGET(i_dimm),
+                    "%s port %d DP%d too many bad nibbles %d",
+                    mss::c_str(i_dimm), l_which_port, l_which_dp, l_bad_nibbles.size());
 
         // If we have one bad nibble, assert that we have one or fewer bad bits
         if (l_bad_nibbles.size() == MAX_BAD_NIBBLES)
         {
             FAPI_ASSERT(l_bad_bits <= MAX_BAD_BITS,
-                        fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                        "port %d DP%d bad nibbles %d + %d bad bits",
-                        l_which_port, l_which_dp, l_bad_nibbles.size(), l_bad_bits);
+                        fapi2::MSS_DISABLED_BITS().set_MCA_TARGET(i_target).set_DIMM_TARGET(i_dimm),
+                        "%s port %d DP%d bad nibbles %d + %d bad bits",
+                        mss::c_str(i_dimm), l_which_port, l_which_dp, l_bad_nibbles.size(), l_bad_bits);
         }
 
         // If we have no bad nibbles, assert we have 2 or fewer bad bits. This is a sly bad nibble
@@ -2512,9 +2524,9 @@ fapi2::ReturnCode process_bad_bits( const fapi2::Target<TARGET_TYPE_MCA>& i_targ
         if (l_bad_nibbles.size() == 0)
         {
             FAPI_ASSERT(l_bad_bits <= SLY_BAD_BITS,
-                        fapi2::MSS_DISABLED_BITS().set_TARGET_IN_ERROR(i_target),
-                        "port %d DP%d %d bad bits",
-                        l_which_port, l_which_dp, l_bad_bits);
+                        fapi2::MSS_DISABLED_BITS().set_MCA_TARGET(i_target).set_DIMM_TARGET(i_dimm),
+                        "%s port %d DP%d %d bad bits",
+                        mss::c_str(i_dimm), l_which_port, l_which_dp, l_bad_bits);
         }
 
         // We're all done. Clear the bit
@@ -2727,7 +2739,7 @@ fapi2::ReturnCode process_rdvref_cal_errors( const fapi2::Target<fapi2::TARGET_T
         // the errors and the disables there.
         FAPI_ASSERT_NOEXIT(v == 0,
                            fapi2::MSS_FAILED_RDVREF_CAL()
-                           .set_TARGET_IN_ERROR(i_target)
+                           .set_DIMM_TARGET(i_target)
                            .set_REGISTER(TT::RD_VREF_CAL_ERROR_REG[l_index])
                            .set_VALUE(v),
                            "DP16 failed read vref calibration on %s. register 0x%016lx value 0x%016lx",
@@ -2789,7 +2801,7 @@ fapi2::ReturnCode process_wrvref_cal_errors( const fapi2::Target<fapi2::TARGET_T
             // Now does bitwise anding to determine what's an actual error w/ the masking
             FAPI_ASSERT_NOEXIT(0 == (l_mask_compare & l_data_it->first),
                                fapi2::MSS_FAILED_WRVREF_CAL()
-                               .set_TARGET_IN_ERROR(i_target)
+                               .set_DIMM_TARGET(i_target)
                                .set_REGISTER(TT::WR_VREF_ERROR_REG[l_index].first)
                                .set_VALUE(l_data_it->first)
                                .set_MASK(l_mask_it->first),
@@ -2802,7 +2814,7 @@ fapi2::ReturnCode process_wrvref_cal_errors( const fapi2::Target<fapi2::TARGET_T
 
             FAPI_ASSERT_NOEXIT(0 == (l_mask_compare & l_data_it->second),
                                fapi2::MSS_FAILED_WRVREF_CAL()
-                               .set_TARGET_IN_ERROR(i_target)
+                               .set_DIMM_TARGET(i_target)
                                .set_REGISTER(TT::WR_VREF_ERROR_REG[l_index].second)
                                .set_VALUE(l_data_it->second)
                                .set_MASK(l_mask_it->second),
-- 
cgit v1.2.1