summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/usr/fapi2/test/fapi2GetChildrenTest.H3
-rw-r--r--src/usr/fapi2/test/fapi2TestUtils.H2
-rw-r--r--src/usr/scom/runtime/test/testscom_rt.H59
-rw-r--r--src/usr/vpd/makefile2
4 files changed, 39 insertions, 27 deletions
diff --git a/src/usr/fapi2/test/fapi2GetChildrenTest.H b/src/usr/fapi2/test/fapi2GetChildrenTest.H
index ddcf1f9ae..569406de4 100644
--- a/src/usr/fapi2/test/fapi2GetChildrenTest.H
+++ b/src/usr/fapi2/test/fapi2GetChildrenTest.H
@@ -170,7 +170,8 @@ void test_fapi2GetChildren()
l_actualSize = l_childCores.size();
//Set expected size to be the number of cores per proc
- l_expectedSize = EQ_PER_PROC * EX_PER_EQ * CORE_PER_EX;
+ //Nimbus model has 4 functional cores
+ l_expectedSize = SIMULATED_GOOD_CORES;
numTests++;
if(l_actualSize != l_expectedSize)
{
diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H
index 8fb194c1e..5be8931d9 100644
--- a/src/usr/fapi2/test/fapi2TestUtils.H
+++ b/src/usr/fapi2/test/fapi2TestUtils.H
@@ -40,6 +40,8 @@
#define MCA_PER_MCS 2
#define MCBIST_PER_PROC 2
+#define SIMULATED_GOOD_CORES 4
+
#include <fapi2.H>
namespace fapi2
diff --git a/src/usr/scom/runtime/test/testscom_rt.H b/src/usr/scom/runtime/test/testscom_rt.H
index 1bc81884d..b51d93540 100644
--- a/src/usr/scom/runtime/test/testscom_rt.H
+++ b/src/usr/scom/runtime/test/testscom_rt.H
@@ -167,8 +167,8 @@ public:
}
else if(read_data[x] != test_data[x].data)
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_SCOMreadWrite_proc> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test_SCOMreadWrite_proc> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_SCOMreadWrite_proc> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test_SCOMreadWrite_proc> ERROR : Data mismatch between read and expected data" );
fails++;
}
}
@@ -341,8 +341,8 @@ public:
}
else if(read_data[x] != test_data[x].data)
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_FSISCOMreadWrite_centaur> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test_FSISCOMreadWrite_centaur> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_FSISCOMreadWrite_centaur> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test_FSISCOMreadWrite_centaur> ERROR : Data mismatch between read and expected data" );
fails++;
}
}
@@ -384,6 +384,8 @@ public:
scom_targets[x] = NULL;
}
+ TRACFCOMP( g_trac_scom, "ScomTest::test_opModes> num_targets: %d", NUM_TARGETS);
+
// Target Proc 0 - to make sure we have XSCOM and FSISCOM attributes
TARGETING::EntityPath epath(TARGETING::EntityPath::PATH_PHYSICAL);
epath.addLast(TARGETING::TYPE_SYS,0);
@@ -455,13 +457,13 @@ public:
}
if(test_data[x].expectErr)
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Writing 0x%X to the addr: 0x%X with opMode: 0x%X and an error is expected",
- test_data[x].data,test_data[x].addr,test_data[x].mode);
+ TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Writing 0x%X to the addr: 0x%X with opMode: 0x%X and an error is expected on target: %d",
+ test_data[x].data,test_data[x].addr,test_data[x].mode, x);
}
else
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Writing 0x%X to the addr: 0x%X with opMode: 0x%X and an error is NOT expected",
- test_data[x].data,test_data[x].addr,test_data[x].mode);
+ TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Writing 0x%X to the addr: 0x%X with opMode: 0x%X and an error is NOT expected on target: %d",
+ test_data[x].data,test_data[x].addr,test_data[x].mode, x);
}
op_size = sizeof(uint64_t);
@@ -476,7 +478,7 @@ public:
{
if( l_err )
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> [%d] Write: Error from device : addr=0x%X, RC=%X", x, test_data[x].addr, l_err->reasonCode() );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> [%d] Write: Error from device : addr=0x%X, RC=%X on target: %d", x, test_data[x].addr, l_err->reasonCode(), x );
TS_FAIL( "ScomTest::test_opModes> ERROR : Unexpected error log from deviceWrite" );
fails++;
errlCommit(l_err,SCOM_COMP_ID);
@@ -490,7 +492,7 @@ public:
}
else
{
- TRACFCOMP( g_trac_scom, "ScomTest::test_opModes.. Expected an error log and did not get one for addr 0x%X " ,test_data[x].addr );
+ TRACFCOMP( g_trac_scom, "ScomTest::test_opModes.. Expected an error log and did not get one for addr 0x%X on target: %d " ,test_data[x].addr, x );
TS_FAIL( "ScomTest::test_opModes> ERROR : Expected an Error log and did not get one" );
fails++;
}
@@ -510,7 +512,14 @@ public:
//only run if the target exists
if(test_data[x].target == NULL)
{
- TRACFCOMP( g_trac_scom, "ScomTest::test_opModes> test target is null, continueing" );
+ TRACFCOMP( g_trac_scom, "ScomTest::test_opModes> test target is null, continuing" );
+ continue;
+ }
+
+ if (test_data[x].target->
+ getAttr<TARGETING::ATTR_HWAS_STATE>().functional != true)
+ {
+ TRACFCOMP( g_trac_scom, "ScomTest::test_opModes> Target %d is not functional", x );
continue;
}
@@ -519,12 +528,12 @@ public:
if(test_data[x].expectErr)
{
TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Reading from the addr: 0x%X with opMode: 0x%X and an error is expected",
- test_data[x].data,test_data[x].addr, test_data[x].mode);
+ test_data[x].addr,test_data[x].data,test_data[x].mode);
}
else
{
TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> Reading from the addr: 0x%X with opMode: 0x%X and an error is not expected",
- test_data[x].data,test_data[x].addr, test_data[x].mode);
+ test_data[x].addr,test_data[x].data,test_data[x].mode);
}
total++;
@@ -543,8 +552,8 @@ public:
}
else if((read_data[x]) != (test_data[x].data))
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test_opModes> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_opModes> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test_opModes> ERROR : Data mismatch between read and expected data" );
fails++;
}
}
@@ -711,13 +720,13 @@ public:
}
else if((read_data[x]) != (test_data[x].data))
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_MCS> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_MCS> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
//temp workaround for MCSs that have been turned off
// (RTC Issue 84907)
if (read_data[x] != 0x0)
{
- TS_FAIL( "ScomTest::test_TranslateScom_MCS> ERROR : Data miss-match between read and expected data" );
+ TS_FAIL( "ScomTest::test_TranslateScom_MCS> ERROR : Data mismatch between read and expected data" );
fails++;
}
}
@@ -885,15 +894,15 @@ public:
if((read_data[x] & 0x000000000000FFFF) != (test_data[x].data & 0x000000000000FFFF))
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_ABUS> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test_TranslateScom_ABUS> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_ABUS> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test_TranslateScom_ABUS> ERROR : Data mismatch between read and expected data" );
fails++;
}
}
else if((read_data[x]) != (test_data[x].data))
{
- TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_MBA_MBS> [%d] Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test_TranslateScom_MBA_MBS> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test_TranslateScom_MBA_MBS> [%d] Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test_TranslateScom_MBA_MBS> ERROR : Data mismatch between read and expected data" );
fails++;
}
@@ -1027,8 +1036,8 @@ public:
}
else if(read_data[x] != test_data[x].data)
{
- TRACFCOMP(g_trac_scom, "ScomTest::test__MultiChipScomWrite_proc> [%d] XSCOM Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test__MultiChipScomWrite_proc> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test__MultiChipScomWrite_proc> [%d] XSCOM Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test__MultiChipScomWrite_proc> ERROR : Data mismatch between read and expected data" );
fails++;
}
@@ -1049,8 +1058,8 @@ public:
}
else if(read_data[x] != test_data[x].data)
{
- TRACFCOMP(g_trac_scom, "ScomTest::test__MultiChipScomWrite_proc> [%d] FSISCOM Read: Data miss-match : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
- TS_FAIL( "ScomTest::test__MultiChipScomWrite_proc> ERROR : Data miss-match between read and expected data" );
+ TRACFCOMP(g_trac_scom, "ScomTest::test__MultiChipScomWrite_proc> [%d] FSISCOM Read: Data mismatch : addr=0x%X, read_data=0x%llx, write_data=0x%llx", x, test_data[x].addr, read_data[x], test_data[x].data);
+ TS_FAIL( "ScomTest::test__MultiChipScomWrite_proc> ERROR : Data mismatch between read and expected data" );
fails++;
}
diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile
index c6088d001..3def4e4d6 100644
--- a/src/usr/vpd/makefile
+++ b/src/usr/vpd/makefile
@@ -41,7 +41,7 @@ BINARY_FILES = $(IMGDIR)/dimmspd.dat:3a9f53e3684e57401ed0aed75f25980fca99f40b
#found for procs CCIN 54E3
BINARY_FILES += $(IMGDIR)/procmvpd.dat:65759fa4aebd2e3b42b25309504a3007b3b51036
BINARY_FILES += $(IMGDIR)/procmvpd_ven.dat:dd8507bec946283260f82af212ed32feaeb3363a
-BINARY_FILES += $(IMGDIR)/procmvpd_p9n.dat:32b448c435d8fac5df05d96102c96d0debff0334
+BINARY_FILES += $(IMGDIR)/procmvpd_p9n.dat:eb8d6b178c16415da16c8edcd9b61bbd61129e3a
#Update to Centaur DD2.0 for CCIN 31E8
OpenPOWER on IntegriCloud