diff options
| -rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
| -rw-r--r-- | src/build/citest/etc/patches/s1.act_proc_a_x_pll_patch | 31 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 11 | ||||
| -rwxr-xr-x | src/build/tools/hb | 6 | ||||
| -rw-r--r-- | src/usr/scan/test/scantest.H | 11 |
5 files changed, 20 insertions, 41 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index eb5578789..5e709be5e 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips801/Builds/b0401a_1315.801 +/esw/fips810/Builds/b0521a_1321.810 diff --git a/src/build/citest/etc/patches/s1.act_proc_a_x_pll_patch b/src/build/citest/etc/patches/s1.act_proc_a_x_pll_patch deleted file mode 100644 index 0ebcd333c..000000000 --- a/src/build/citest/etc/patches/s1.act_proc_a_x_pll_patch +++ /dev/null @@ -1,31 +0,0 @@ ---- s1.act_orig_fips801 2013-04-23 13:34:42.371933060 -0500 -+++ s1.act_proc_a_x_pll_update_fips801 2013-04-23 13:35:53.594367657 -0500 -@@ -990,6 +990,9 @@ - WATCH=[REG(0x080F0013)] - CAUSE: TARGET=[REG(0x080F0013)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,F7FFFFFF FFFFFFFF)] - EFFECT: TARGET=[REG(0x080F0019)] OP=[BIT,ON] BIT=[0] # PLL Lock -+ EFFECT: TARGET=[REG(0x080F0019)] OP=[BIT,ON] BIT=[1] # PLL Lock -+ EFFECT: TARGET=[REG(0x080F0019)] OP=[BIT,ON] BIT=[2] # PLL Lock -+ EFFECT: TARGET=[REG(0x080F0019)] OP=[BIT,ON] BIT=[3] # PLL Lock - } - - CAUSE_EFFECT { -@@ -998,6 +1001,8 @@ - CAUSE: TARGET=[REG(0x020F0013)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,F7FFFFFF FFFFFFFF)] - EFFECT: TARGET=[REG(0x020F0019)] OP=[BIT,ON] BIT=[0] # PLL Lock - EFFECT: TARGET=[REG(0x020F0019)] OP=[BIT,ON] BIT=[1] # PLL Lock -+ EFFECT: TARGET=[REG(0x020F0019)] OP=[BIT,ON] BIT=[2] # PLL Lock -+ EFFECT: TARGET=[REG(0x020F0019)] OP=[BIT,ON] BIT=[3] # PLL Lock - } - - CAUSE_EFFECT { -@@ -1005,6 +1010,9 @@ - WATCH=[REG(0x090F0013)] - CAUSE: TARGET=[REG(0x090F0013)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,F7FFFFFF FFFFFFFF)] - EFFECT: TARGET=[REG(0x090F0019)] OP=[BIT,ON] BIT=[0] # PLL Lock -+ EFFECT: TARGET=[REG(0x090F0019)] OP=[BIT,ON] BIT=[1] # PLL Lock -+ EFFECT: TARGET=[REG(0x090F0019)] OP=[BIT,ON] BIT=[2] # PLL Lock -+ EFFECT: TARGET=[REG(0x090F0019)] OP=[BIT,ON] BIT=[3] # PLL Lock - } - - ### END PLL Lock actions ### diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 327c7d09f..d335f723b 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -26,8 +26,9 @@ ## to setup the sandbox ## -### Update s1.act for new proc_a_x_pll procedure -echo "+++ Updating s1.act for new proc_a_x_pll procedure" -mkdir -p $sb/simu/data/cec-chip/ -cp $BACKING_BUILD/src/simu/data/cec-chip/s1.act $sb/simu/data/cec-chip -patch -p0 $sb/simu/data/cec-chip/s1.act $HOSTBOOTROOT/src/build/citest/etc/patches/s1.act_proc_a_x_pll_patch +### Example applying a patch to cec-chip files +#echo "+++ Updating something wonderful in a simics file" +#mkdir -p $sb/simu/data/cec-chip/ +#cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip +#patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $HOSTBOOTROOT/src/build/citest/etc/patches/my_patch_File + diff --git a/src/build/tools/hb b/src/build/tools/hb index 076b09785..59ebf8fcf 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -331,6 +331,12 @@ hb_fipssetup() echo "Creating new sandbox." mksb -rc ${SANDBOXRC} -dir ${SANDBOXROOT} -back $DRIVER \ -sb ${SANDBOXNAME} -m ppc + + cp ${HOSTBOOTROOT}/src/build/citest/etc/workarounds.presimsetup \ + ${SANDBOXBASE}/src + execute_in_sandbox "export BACKING_BUILD=\$bb && \ + ./workarounds.presimsetup" "ppc" + rm ${SANDBOXBASE}/src/workarounds.presimsetup } hb_simsetup() diff --git a/src/usr/scan/test/scantest.H b/src/usr/scan/test/scantest.H index 041587d4a..7ac06bead 100644 --- a/src/usr/scan/test/scantest.H +++ b/src/usr/scan/test/scantest.H @@ -125,8 +125,12 @@ public: uint64_t length; uint64_t flag; // used for header check.. } test_data[] = { - { scan_targets[myPROC0], {0x12121212, 0x12341234, 0x12341234, 0x12341234, 0x12341234, 0x12341234, 0x10000000, 0x00000000}, 0x15030803, 197, 0x0}, - { scan_targets[memBuf0], {0x34343434, 0xaaaaaaaa, 0xbbbbbbbb, 0xb0000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000}, 0x01034001, 100, 0x2}, + { scan_targets[myPROC0], + {0x12121212, 0x12341234, 0x12341234, 0x12341234, 0x12341234, + 0x12341234,0x12341234, 0x00000000}, 0x15030082, 223, 0x0}, + { scan_targets[memBuf0], + {0x34343434, 0xaaaaaaaa, 0xbbbbbbbb, 0xb0000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000}, 0x01034001, 100, 0x2}, }; const uint64_t NUM_ADDRS = sizeof(test_data)/sizeof(test_data[0]); @@ -207,8 +211,7 @@ public: if(read_data[y] != test_data[x].data[y]) { - TRACFCOMP(g_trac_scandd, - "scanTest::test_SCANreadWrite_proc> [%d] Read: EXPECTED Data miss-match : ring=0x%X, read_data=0x%.8x, write_data=0x%llx", x, test_data[x].ring, read_data[y], test_data[x].data[y]); + TRACFCOMP(g_trac_scandd, "scanTest::test_SCANreadWrite_proc> [%d] Read: UNEXPECTED Data miss-match : ring=0x%X, read_data=0x%.8x, write_data=0x%llx", x, test_data[x].ring, read_data[y], test_data[x].data[y]); TS_FAIL("scanTest::test_SCANreadWrite_proc> ERROR : Data miss-match between read and expected data" ); fails++; } |
