From 3105d5a9227b30f24dc22c2c9d218840fefa0129 Mon Sep 17 00:00:00 2001
From: Sachin Gupta <sgupta2m@in.ibm.com>
Date: Sun, 17 Jun 2018 07:05:56 -0500
Subject: Use Greylist in PutScomUnderMask

RTC: 195177
Change-Id: I1728d78b2019b5a3d5da24c18baf676d07b93de2
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60765
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
(cherry picked from commit 33f754c5c94daa873ca40e0a8accd43f3087ec5d)
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60943
---
 src/test/testcases/test.xml        |  2 +-
 src/test/testcases/testSecurity.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/test/testcases')

diff --git a/src/test/testcases/test.xml b/src/test/testcases/test.xml
index 27b8af07..1283a565 100755
--- a/src/test/testcases/test.xml
+++ b/src/test/testcases/test.xml
@@ -36,7 +36,6 @@
           <include>../simics/targets/p9_nimbus/sbeTest/testPSUSetStashPair.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testIstep.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testSuspendIO.xml</include>
-          <include>../simics/targets/p9_nimbus/sbeTest/testSecurity.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testGeneric.xml</include>
           <!-- Memory access testcases -->
           <include>../simics/targets/p9_nimbus/sbeTest/testUnsecureMemRegions.xml</include>
@@ -59,6 +58,7 @@
           <include>../simics/targets/p9_nimbus/sbeTest/testSystemFabricMap.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testExecutorCntrlTimer.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testArrayAccess.xml</include>
+          <include>../simics/targets/p9_nimbus/sbeTest/testSecurity.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testStopClocks.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testGetRing.xml</include>
           <include>../simics/targets/p9_nimbus/sbeTest/testExecutorPutRing.xml</include>
diff --git a/src/test/testcases/testSecurity.py b/src/test/testcases/testSecurity.py
index 1efda516..5da28790 100644
--- a/src/test/testcases/testSecurity.py
+++ b/src/test/testcases/testSecurity.py
@@ -121,6 +121,19 @@ def main():
         if(dataRead != dataWritten):
             raise Exception('PutScom under mask failed %x != %x' % (dataRead, dataWritten))
         print "putscom under mask success testcase - passed"
+
+        # Greylist test cases
+        dataWritten = testScomUtil.getscom(0x0901080B)
+        # Do putScomUnderMask with wrong mask
+        testScomUtil.putScomUnderMask(0x0901080B, dataWritten, 0xF0FFFFFFFFFFFFFF, [0x00, 0x05, 0x00, 0x23])
+        # Do putScom on grey list register
+        testScomUtil.putscom(0x0901080B, 0, [0x00, 0x05, 0x00, 0x23])
+        # Do putScomUnderMask with exact mask
+        testScomUtil.putScomUnderMask(0x0901080B, dataWritten, 0xFF0FFFFFFFFFFFFF)
+        # Do putScomUnderMask with superset mask
+        testScomUtil.putScomUnderMask(0x0901080B, dataWritten, 0xFF00FFFFFFFFFFFF)
+        print "Greylist testcases - passed"
+
         # indirect scom test
         dataWritten = testScomUtil.getscom(0x8000000D06010C3F)
         dataiActWritten = (dataWritten & 0x00000000FFFFFFFF) | (0xDECAFFEE00000000)
-- 
cgit v1.2.1