PutScomUnderMask and ModifyScom ChipOp Support

RTC:128974

RTC:128975

Change-Id: I07b38a6f2f98be839b867b0b085c78714944f845
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22388
Tested-by: Jenkins Server
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Amit J. Tendolkar <amit.tendolkar@in.ibm.com>

4 files changed, 159 insertions, 1 deletions

diff --git a/sbe/test/testGetCapabilities.py b/sbe/test/testGetCapabilities.py
index 270a1326..4b631270 100755
--- a/sbe/test/testGetCapabilities.py
+++ b/sbe/test/testGetCapabilities.py
@@ -10,7 +10,7 @@ EXPDATA1 = [0x0,0x0,0x0,0x0,
            0x0,0x0,0x0,0x0,
            0xa1,0x0,0x0,0x01, # istep
            0x0,0x0,0x0,0x0,
-           0xa2,0x0,0x0,0x03, #getscom/putscom
+           0xa2,0x0,0x0,0x0f, #getscom/putscom/modifyscom/putscomundermask
            0x0,0x0,0x0,0x0,
            0x0,0x0,0x0,0x0,
            0x00,0x0,0x0,0x0];
diff --git a/sbe/test/testModifyScom.py b/sbe/test/testModifyScom.py
new file mode 100755
index 00000000..cb1c3a1c
--- /dev/null
+++ b/sbe/test/testModifyScom.py
@@ -0,0 +1,74 @@
+import sys
+sys.path.append("targets/p9_nimbus/sbeTest" )
+import testUtil
+err = False
+#from testWrite import *
+
+
+PUTSCOM_TESTDATA = [0,0,0,6,
+                    0,0,0xA2,0x02,
+                    0,0,0x0,0x00,
+                    0,0x02,0x00,0x14,
+                    0x00,0xff,0x00,0xff,
+                    0x00,0xff,0x00,0xff ]
+
+PUTSCOM_EXPDATA = [0xc0,0xde,0xa2,0x02,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+
+MODIFYSCOM_TESTDATA = [0,0,0,7,
+            0,0,0xA2,0x03,
+            0,0,0x0,0x01,
+            0,0,0x0,0x00,
+            0,0x02,0x00,0x14,
+            0xde,0x00,0xff,0x00,
+            0xca,0x00,0xee,0x00]
+
+MODIFYSCOM_EXPDATA = [0xc0,0xde,0xa2,0x03,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+GETSCOM4MODIFYSCOM_TESTDATA = [0,0,0,4,
+                   0,0,0xA2,0x01,
+                   0,0,0x0,0x00,
+                   0,0x02,0x0,0x14]
+
+GETSCOM4MODIFYSCOM_EXPDATA = [0xde,0xff,0xff,0xff,
+                   0xca,0xff,0xee,0xff,
+                   0xc0,0xde,0xa2,0x01,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+# MAIN Test Run Starts Here...
+#-------------------------------------------------
+def main( ):
+    testUtil.runCycles( 10000000 )
+
+    testUtil.writeUsFifo( PUTSCOM_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( PUTSCOM_EXPDATA )
+    testUtil.readEot( )
+
+    testUtil.writeUsFifo( MODIFYSCOM_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( MODIFYSCOM_EXPDATA )
+    testUtil.readEot( )
+
+    testUtil.writeUsFifo( GETSCOM4MODIFYSCOM_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( GETSCOM4MODIFYSCOM_EXPDATA )
+    testUtil.readEot( )
+
+#-------------------------------------------------
+# Calling all test code
+#-------------------------------------------------
+main()
+
+if err:
+    print ("\nTest Suite completed with error(s)")
+    #sys.exit(1)
+else:
+    print ("\nTest Suite completed with no errors")
+    #sys.exit(0);
+
diff --git a/sbe/test/testPutScomUnderMask.py b/sbe/test/testPutScomUnderMask.py
new file mode 100755
index 00000000..7b88ef4e
--- /dev/null
+++ b/sbe/test/testPutScomUnderMask.py
@@ -0,0 +1,75 @@
+import sys
+sys.path.append("targets/p9_nimbus/sbeTest" )
+import testUtil
+err = False
+#from testWrite import *
+
+PUTSCOM_TESTDATA = [0,0,0,6,
+                    0,0,0xA2,0x02,
+                    0,0,0x0,0x00,
+                    0,0x02,0x00,0x14,
+                    0xff,0xff,0xff,0xff,
+                    0xff,0xff,0xff,0xff ]
+
+PUTSCOM_EXPDATA = [0xc0,0xde,0xa2,0x02,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+
+PUTSCOMUMASK_TESTDATA = [0,0,0,8,
+            0,0,0xA2,0x04,
+            0,0,0x0,0x00,
+            0,0x02,0x00,0x14,
+            0xde,0xca,0xff,0xee,
+            0xaa,0xca,0xff,0xee,
+            0xff,0x00,0xff,0x00,
+            0x00,0xff,0x00,0xff]
+
+
+PUTSCOMUMASK_EXPDATA = [0xc0,0xde,0xa2,0x04,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+GETSCOMUMASK_TESTDATA = [0,0,0,4,
+                   0,0,0xA2,0x01,
+                   0,0,0x0,0x00,
+                   0,0x02,0x0,0x14]
+
+GETSCOMUMASK_EXPDATA = [0xde, 0xff, 0xff, 0xff,
+                   0xff, 0xca, 0xff, 0xee,
+                   0xc0,0xde,0xa2,0x01,
+                   0x0,0x0,0x0,0x0,
+                   0x00,0x0,0x0,0x03];
+
+# MAIN Test Run Starts Here...
+#-------------------------------------------------
+def main( ):
+    testUtil.runCycles( 10000000 )
+
+    testUtil.writeUsFifo( PUTSCOM_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( PUTSCOM_EXPDATA )
+    testUtil.readEot( )
+
+    testUtil.writeUsFifo( PUTSCOMUMASK_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( PUTSCOMUMASK_EXPDATA )
+    testUtil.readEot( )
+
+    testUtil.writeUsFifo( GETSCOMUMASK_TESTDATA )
+    testUtil.writeEot( )
+    testUtil.readDsFifo( GETSCOMUMASK_EXPDATA )
+    testUtil.readEot( )
+
+#-------------------------------------------------
+# Calling all test code
+#-------------------------------------------------
+main()
+
+if err:
+    print ("\nTest Suite completed with error(s)")
+    #sys.exit(1)
+else:
+    print ("\nTest Suite completed with no errors")
+    #sys.exit(0);
+
diff --git a/sbe/test/testScom.xml b/sbe/test/testScom.xml
index 2e4bf051..133a2a14 100755
--- a/sbe/test/testScom.xml
+++ b/sbe/test/testScom.xml
@@ -4,3 +4,12 @@
           <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutGetScom.py</simcmd>
           <exitonerror>yes</exitonerror>
       </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testPutScomUnderMask.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+      <testcase>
+          <simcmd>run-python-file targets/p9_nimbus/sbeTest/testModifyScom.py</simcmd>
+          <exitonerror>yes</exitonerror>
+      </testcase>
+