Resolve testcase race conditions with SCAN.

    A number of test cases were writing to the SCAN select register
    and if the SCAN device driver unit tests were running at the same
    time they would clobber each other.  Moved the other test cases to
    utilize a core scratch register instead.

Change-Id: I243500ce40cdb75e1052541056f9460e50e0bbcd
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5977
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 4 insertions, 14 deletions

diff --git a/src/include/sys/mmio.h b/src/include/sys/mmio.h
index 9fd609cf9..d536b281b 100644
--- a/src/include/sys/mmio.h
+++ b/src/include/sys/mmio.h
@@ -90,8 +90,8 @@ enum MMIO_Scratch_Register
     MMIO_SCRATCH_RSVD_T3 = 0x18,
         /** Thread4 Scratch Register - Unused */
     MMIO_SCRATCH_RSVD_T4 = 0x20,
-        /** Thread5 Scratch Register - Unused */
-    MMIO_SCRATCH_RSVD_T5 = 0x28,
+        /** Thread5 Scratch Register - Unused (unit tests may modify) */
+    MMIO_SCRATCH_RSVD_T5_TESTCASES = 0x28,
         /** Thread6 Scratch Register - Identifies where hostboot currently
                                        resides and how large the space is */
     MMIO_SCRATCH_MEMORY_STATE = 0x30,
diff --git a/src/usr/hwpf/hwp/initfiles/sample.initfile b/src/usr/hwpf/hwp/initfiles/sample.initfile
index 7d68ad41e..124f3e16f 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.initfile
+++ b/src/usr/hwpf/hwp/initfiles/sample.initfile
@@ -75,15 +75,6 @@ scom 0x0000000015010002              {
 }
 
 #--******************************************************************************
-#-- Basic SCOM with Expression and Attribute
-#--******************************************************************************
-
-scom 0x0000000015030007              {
-  scom_data,            expr                 ;
-  0x00000CDE00000000,   SYS.ATTR_SCRATCH_UINT8_1 == SYS.ATTR_SCRATCH_UINT8_2    ;
-}
-
-#--******************************************************************************
 #-- SCOM with Address and Data of Array Type, Range of Index, Bit Support
 #-- The following Scom is equivalent to:
 #scom 0x000000000006002B           {
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index c5631f002..fc2f9e584 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -276,7 +276,6 @@ public:
                                     (0x0000000000000060ll << (64 - (24 + 8))) |
                                     0x0000000000003000},
             {0x0000000015010002, 0, 0xAABBC00000000000},
-            {0x0000000015030007, 0, 0x00000CDE00000000},
             {0x0000000015013283, 0, 0x3c90000000000000 |
                                     (0x8000000000000000 >> 0x0c) |
                                     (0x8000000000000000 >> 0x0d) |
@@ -625,7 +624,7 @@ public:
                 {0x000000000006800b, 0},
                 {0x000000000006800c, 0x8000000000000000 >> 0x17},
                 {0x0000000015010002, 0xAABBC00000000000},
-                {0x0000000015030007, 0x00000CDE00000000},
+                {0x0000000015013288, 0x00000CDE00000000},
             };
 
             // Get the master processor chip
diff --git a/src/usr/xscom/test/xscomtest.H b/src/usr/xscom/test/xscomtest.H
index 43acf8b9b..b350c4e41 100644
--- a/src/usr/xscom/test/xscomtest.H
+++ b/src/usr/xscom/test/xscomtest.H
@@ -51,7 +51,7 @@ const testXscomAddrData g_xscomAddrTable[] =
 {
         // Write data to be ORed with read value
         //@TODO via RTC: 60769 -- base addr on master core
-        {0x15030007, 0x0000040000000000},
+        {0x15013288, 0x0000040000000000},
         {0x15010002, 0xC000000000000000},
 };
 const uint32_t g_xscomAddrTableSz =