Revert "MDIA: Bumped MDIA timeout value becasue of Nimbus DD1.0 workaround"

This reverts commit 7839e4d093507f8b35679183e6678324272e2fb3.

Change-Id: Ic45b6e24b89871a287e9c191bd3603bade805901
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35618
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Zane C. Shelley <zshelle@us.ibm.com>

2 files changed, 15 insertions, 17 deletions

diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index ef5835123..f91224552 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -403,8 +403,8 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
                     // Committing an info log to help debug SW timeout
                     if((*wit)->timeoutCnt >= MAINT_CMD_TIMEOUT_LOG)
                     {
-                        MDIA_FAST("sm: committing a SW timeout info log "
-                                  "for HUID:0x%08X", get_huid(target));
+                        MDIA_FAST("sm: committing a SW timed out info log "
+                                  "for %x", get_huid(target));
 
                         /*@
                          * @errortype
@@ -435,10 +435,9 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
                         (*wit)->timeoutCnt++;
                     }
 
-                    MDIA_FAST("sm: work item %d reset SW timed out on "
-                              "HUID:0x%08X, timeoutCnt: %d",
-                              *((*wit)->workItem), get_huid(target),
-                              (*wit)->timeoutCnt);
+                    MDIA_FAST("sm: work item %d reset SW timed out on: %x, "
+                              "timeoutCnt: %d", *((*wit)->workItem),
+                              get_huid(target), (*wit)->timeoutCnt);
                     // register a new timeout monitor
                     uint64_t monitorId =
                         getMonitor().addMonitor(MAINT_CMD_TIMEOUT);
@@ -473,7 +472,7 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
                         HWAS::GARD_NULL);
 
                 // If maint cmd complete bit is not on, time out
-                MDIA_FAST("sm: stopping command HUID:0x%08X", get_huid(target));
+                MDIA_FAST("sm: stopping command: %p", target);
                 //target type is MBA
                 if ( TYPE_MBA == trgtType )
                 {
@@ -536,8 +535,10 @@ void StateMachine::processCommandTimeout(const MonitorIDs & i_monitorIDs)
                 wkflprop = *wit;
 
                 // log a timeout event
-                MDIA_ERR("sm: workItem %d HW timeout on HUID:0x%08X",
-                         *((*wit)->workItem), get_huid(target));
+                MDIA_ERR("sm: command %p: %d HW timed out on: %x",
+                        target,
+                        *((*wit)->workItem),
+                        get_huid(target));
 
                 errlCommit(timeoutErrl, MDIA_COMP_ID);
 
@@ -745,7 +746,7 @@ bool StateMachine::scheduleWorkItem(WorkFlowProperties & i_wfp)
 
         TargetHandle_t target = getTarget(i_wfp);
 
-        MDIA_FAST("sm: dispatching work item %d for: 0x%08x, priority: %d, "
+        MDIA_FAST("sm: dispatching work item %d for: %p, priority: %d, "
                 "unit: %d", *i_wfp.workItem,
                 get_huid(target),
                 priority,
@@ -801,7 +802,7 @@ bool StateMachine::executeWorkItem(WorkFlowProperties * i_wfp)
 
         uint64_t workItem = *i_wfp->workItem;
 
-        MDIA_FAST("sm: executing work item %d for: 0x%08x",
+        MDIA_FAST("sm: executing work item %d for: %x",
                 workItem, get_huid(getTarget(*i_wfp)));
 
         mutex_unlock(&iv_mutex);
diff --git a/src/usr/diag/mdia/mdiasm.H b/src/usr/diag/mdia/mdiasm.H
index 5a304c1aa..4c6a7b49b 100644
--- a/src/usr/diag/mdia/mdiasm.H
+++ b/src/usr/diag/mdia/mdiasm.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -41,11 +41,8 @@
 namespace MDIA
 {
 
-// HW timeout value - 30 secs
-// Nimbus DD1.0 has a workaround that will go over 30 seconds. Will need to bump
-// it up for now. May consider lowering it later, but only if there is a
-// problem.
-static const uint64_t MAINT_CMD_TIMEOUT = 30000000000 * 10;
+//MBA timeout value - 30 secs
+static const uint64_t MAINT_CMD_TIMEOUT = 30000000000;
 
 //Longer MBA timeout to be used when continuous tracing is enabled - 30 min
 static const uint64_t MAINT_CMD_TIMEOUT_LONG = 1800000000000;