Simplified supported pattern tests in MDIA

Change-Id: I67189279914fd883131509051bc2bbd7750d3e12
RTC: 92181
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7431
Tested-by: Jenkins Server
Reviewed-by: Bilicon Patil <bilpatil@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 9 insertions, 15 deletions

diff --git a/src/usr/diag/mdia/mdiafwd.H b/src/usr/diag/mdia/mdiafwd.H
index 6548298a8..c6364b470 100644
--- a/src/usr/diag/mdia/mdiafwd.H
+++ b/src/usr/diag/mdia/mdiafwd.H
@@ -62,7 +62,6 @@ struct WorkFlowProperties;
  */
 enum DiagMode
 {
-    INIT_ONLY,
     SCRUB_ONLY,
     ONE_PATTERN,
     FOUR_PATTERNS,
diff --git a/src/usr/diag/mdia/mdiamba.C b/src/usr/diag/mdia/mdiamba.C
index 4cef1168a..43e727e68 100644
--- a/src/usr/diag/mdia/mdiamba.C
+++ b/src/usr/diag/mdia/mdiamba.C
@@ -41,7 +41,7 @@ errlHndl_t getMbaDiagnosticMode(
         TargetHandle_t i_mba,
         DiagMode & o_mode)
 {
-    o_mode = INIT_ONLY;
+    o_mode = ONE_PATTERN;
 
     do
     {
@@ -72,13 +72,12 @@ errlHndl_t getMbaDiagnosticMode(
         }
 
         // Only need to check hw changed state attributes
-        // when not already set to standard or exhaustive
-        if(!((FOUR_PATTERNS == o_mode) ||
-             (NINE_PATTERNS == o_mode)))
+        // when not already set to exhaustive
+        if( NINE_PATTERNS != o_mode )
         {
             if(isHWStateChanged(i_mba))
             {
-                o_mode = FOUR_PATTERNS;
+                o_mode = NINE_PATTERNS;
             }
         }
 
@@ -141,11 +140,6 @@ errlHndl_t getMbaWorkFlow(
             o_wf.push_back(START_SCRUB);
             break;
 
-        case INIT_ONLY:
-
-            o_wf.push_back(START_PATTERN_0);
-            break;
-
         default:
             break;
     }
diff --git a/src/usr/diag/mdia/test/mdiatestmba.H b/src/usr/diag/mdia/test/mdiatestmba.H
index f877072e2..d726b23c5 100644
--- a/src/usr/diag/mdia/test/mdiatestmba.H
+++ b/src/usr/diag/mdia/test/mdiatestmba.H
@@ -65,9 +65,9 @@ class MdiaMbaTest : public CxxTest::TestSuite
                             "unexpectedly");
                 }
 
-                if(mode != INIT_ONLY)
+                if(mode != ONE_PATTERN)
                 {
-                    TS_FAIL("mode != INIT_ONLY");
+                    TS_FAIL("mode != ONE_PATTERN");
                 }
             }
 
@@ -100,9 +100,9 @@ class MdiaMbaTest : public CxxTest::TestSuite
                             "failed unexpectedly");
                 }
 
-                if(mode != INIT_ONLY)
+                if(mode != ONE_PATTERN)
                 {
-                    TS_FAIL("mode != INIT_ONLY");
+                    TS_FAIL("mode != ONE_PATTERN");
                 }
             }
 
@@ -110,6 +110,7 @@ class MdiaMbaTest : public CxxTest::TestSuite
 
             expected.push_back(RESTORE_DRAM_REPAIRS);
             expected.push_back(START_PATTERN_0);
+            expected.push_back(START_SCRUB);
             expected.push_back(CLEAR_HW_CHANGED_STATE);
 
             err = getMbaWorkFlow(mode, wf, globals);