From 9ea4a28823a5c17d8adc448635fdec1e18c5ce5d Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Thu, 6 Feb 2014 15:25:19 -0600 Subject: INITPROC: Hostboot SW244672 RAS Review updates Change-Id: I57642650e977d106a5078d5a8bc1ec4d9aec2f96 CQ:SW244672 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8633 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- .../mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml | 31 ++++++++++++++- .../mss_ddr_phy_reset/mss_ddr_phy_reset.C | 10 ++++- .../mss_ddr_phy_reset/mss_ddr_phy_reset.H | 45 +++++++++++----------- 3 files changed, 61 insertions(+), 25 deletions(-) (limited to 'src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset') diff --git a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml index 9fd61dc8b..df9156550 100644 --- a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml +++ b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/memory_mss_ddr_phy_reset.xml @@ -20,8 +20,9 @@ + - + @@ -39,6 +40,13 @@ MBA_IN_ERROR HIGH + + + MEM_REF_CLOCK + MEMBUF_CHIP_IN_ERROR + + MEDIUM + MBA_IN_ERROR @@ -60,6 +68,13 @@ MBA_IN_ERROR HIGH + + + MEM_REF_CLOCK + MEMBUF_CHIP_IN_ERROR + + MEDIUM + MBA_IN_ERROR @@ -81,6 +96,13 @@ MBA_IN_ERROR HIGH + + + MEM_REF_CLOCK + MEMBUF_CHIP_IN_ERROR + + MEDIUM + MBA_IN_ERROR @@ -102,6 +124,13 @@ MBA_IN_ERROR HIGH + + + MEM_REF_CLOCK + MEMBUF_CHIP_IN_ERROR + + MEDIUM + MBA_IN_ERROR diff --git a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.C b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.C index 30ef0fb7e..052c10ff9 100644 --- a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.C +++ b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.C @@ -20,7 +20,8 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: mss_ddr_phy_reset.C,v 1.27 2014/01/16 20:54:48 mfred Exp $ + +// $Id: mss_ddr_phy_reset.C,v 1.28 2014/01/31 15:09:03 mfred Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_ddr_phy_reset.C,v $ //------------------------------------------------------------------------------ // *! (C) Copyright International Business Machines Corp. 2011 @@ -430,6 +431,7 @@ fapi::ReturnCode mss_ddr_phy_reset_cloned(const fapi::Target & i_target) const uint16_t & EXPECTED_STATUS = DP18_PLL_EXP_LOCK_STATUS; const uint16_t ACTUAL_STATUS = dp_p0_lock_data.getHalfWord(3); const fapi::Target & MBA_IN_ERROR = i_target; + const fapi::Target & MEMBUF_CHIP_IN_ERROR = l_centaurTarget; FAPI_SET_HWP_ERROR(rc, RC_MSS_DP18_0_PLL_FAILED_TO_LOCK); break; } @@ -453,6 +455,7 @@ fapi::ReturnCode mss_ddr_phy_reset_cloned(const fapi::Target & i_target) const uint16_t & EXPECTED_STATUS = DP18_PLL_EXP_LOCK_STATUS; const uint16_t ACTUAL_STATUS = dp_p1_lock_data.getHalfWord(3); const fapi::Target & MBA_IN_ERROR = i_target; + const fapi::Target & MEMBUF_CHIP_IN_ERROR = l_centaurTarget; FAPI_SET_HWP_ERROR(rc, RC_MSS_DP18_1_PLL_FAILED_TO_LOCK); break; } @@ -468,6 +471,7 @@ fapi::ReturnCode mss_ddr_phy_reset_cloned(const fapi::Target & i_target) const uint16_t & EXPECTED_STATUS = AD32S_PLL_EXP_LOCK_STATUS; const uint16_t ACTUAL_STATUS = ad_p0_lock_data.getHalfWord(3); const fapi::Target & MBA_IN_ERROR = i_target; + const fapi::Target & MEMBUF_CHIP_IN_ERROR = l_centaurTarget; FAPI_SET_HWP_ERROR(rc, RC_MSS_AD32S_0_PLL_FAILED_TO_LOCK); break; } @@ -479,6 +483,7 @@ fapi::ReturnCode mss_ddr_phy_reset_cloned(const fapi::Target & i_target) const uint16_t & EXPECTED_STATUS = AD32S_PLL_EXP_LOCK_STATUS; const uint16_t ACTUAL_STATUS = ad_p1_lock_data.getHalfWord(3); const fapi::Target & MBA_IN_ERROR = i_target; + const fapi::Target & MEMBUF_CHIP_IN_ERROR = l_centaurTarget; FAPI_SET_HWP_ERROR(rc, RC_MSS_AD32S_1_PLL_FAILED_TO_LOCK); break; } @@ -1174,6 +1179,9 @@ This section is automatically updated by CVS when you check in this file. Be sure to create CVS comments when you commit so that they can be included here. $Log: mss_ddr_phy_reset.C,v $ +Revision 1.28 2014/01/31 15:09:03 mfred +Mike Jones added statements to pass target into XML for callouts. + Revision 1.27 2014/01/16 20:54:48 mfred Updates for passing more data to error handler. From Mike Jones. diff --git a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H index 9ef643a3c..4a96fa503 100644 --- a/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H +++ b/src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H $ - * - * IBM CONFIDENTIAL - * - * COPYRIGHT International Business Machines Corp. 2012 - * - * p1 - * - * Object Code Only (OCO) source materials - * Licensed Internal Code Source Materials - * IBM HostBoot Licensed Internal Code - * - * The source code for this program is not published or other- - * wise divested of its trade secrets, irrespective of what has - * been deposited with the U.S. Copyright Office. - * - * Origin: 30 - * - * IBM_PROLOG_END_TAG - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwpf/hwp/dram_training/mss_ddr_phy_reset/mss_ddr_phy_reset.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* */ +/* p1 */ +/* */ +/* Object Code Only (OCO) source materials */ +/* Licensed Internal Code Source Materials */ +/* IBM HostBoot Licensed Internal Code */ +/* */ +/* The source code for this program is not published or otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ // $Id: mss_ddr_phy_reset.H,v 1.2 2012/03/21 18:12:28 mfred Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_ddr_phy_reset.H,v $ //------------------------------------------------------------------------------ -- cgit v1.2.1