From 00b819b7f744f32ebcefce9cfc31a558d1526341 Mon Sep 17 00:00:00 2001
From: Jacob Harvey <jlharvey@us.ibm.com>
Date: Thu, 17 Aug 2017 12:10:31 -0500
Subject: Add in last addr register to memdiags error xml

Change-Id: Ic964e1156444e3ea08e6a9825a498ca3a37eff02
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44740
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44745
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
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: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C    | 7 +++++--
 .../chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml  | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/import/chips/p9')

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
index ae057621e..8e6be913d 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
@@ -99,8 +99,11 @@ fapi2::ReturnCode stop( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target )
 
     // So we've either stopped or we timed out
     FAPI_ASSERT( l_poll_result == true,
-                 fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP().set_MCBIST_TARGET(i_target),
-                 "The MCBIST engine failed to stop its program" );
+                 fapi2::MSS_MEMDIAGS_MCBIST_FAILED_TO_STOP()
+                 .set_MCBIST_TARGET(i_target)
+                 .set_POLL_COUNT(l_poll_parameters.iv_poll_count),
+                 "%s The MCBIST engine failed to stop its program",
+                 mss::c_str(i_target) );
 
 fapi_try_exit:
     return fapi2::current_err;
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml
index f587c4067..5b3dc2cf7 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_memdiags.xml
@@ -32,6 +32,7 @@
     <scomRegister>MCBIST_MCB_CNTLQ</scomRegister>
     <scomRegister>MCBIST_MCB_CNTLSTATQ</scomRegister>
     <scomRegister>MCBIST_MCBSTATQ</scomRegister>
+    <scomRegister>MCBIST_MCBMCATQ</scomRegister>
     <scomRegister>MCBIST_MCBPARMQ</scomRegister>
     <scomRegister>MCBIST_MCBAGRAQ</scomRegister>
     <scomRegister>MCBIST_MBSEC1Q</scomRegister>
@@ -234,6 +235,7 @@
       <target>MCBIST_TARGET</target>
       <targetType>TARGET_TYPE_MCBIST</targetType>
     </collectRegisterFfdc>
+    <ffdc>POLL_COUNT</ffdc>
     <callout>
       <target>MCBIST_TARGET</target>
       <priority>HIGH</priority>
-- 
cgit v1.2.1