summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/usr/cxxtest/cxxtestexec.C3
-rw-r--r--src/usr/fsi/fsidd.C31
-rw-r--r--src/usr/fsi/fsipres.C8
-rw-r--r--src/usr/fsiscom/fsiscom.C10
-rw-r--r--src/usr/scom/scom.C4
-rw-r--r--src/usr/xscom/piberror.C2
6 files changed, 32 insertions, 26 deletions
diff --git a/src/usr/cxxtest/cxxtestexec.C b/src/usr/cxxtest/cxxtestexec.C
index 5b956dc27..0999ddc2e 100644
--- a/src/usr/cxxtest/cxxtestexec.C
+++ b/src/usr/cxxtest/cxxtestexec.C
@@ -123,7 +123,8 @@ void cxxinit( errlHndl_t &io_taskRetErrl )
tasks.push_back(tidrc);
}
- TRACFCOMP( g_trac_cxxtest, "Waiting for all tasks to finish....");
+ TRACFCOMP( g_trac_cxxtest, "Waiting for all (%d) tasks to finish....",
+ CxxTest::g_ModulesStarted );
// wait for all the launched tasks to finish
for (std::vector<tid_t>::iterator t = tasks.begin();
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index 1b8a795ed..30a611d64 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -110,7 +110,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
FSI::MOD_FSIDD_DDOP,
FSI::RC_INVALID_LENGTH,
i_addr,
- TO_UINT64(io_buflen));
+ TO_UINT64(io_buflen),
+ true /*SW error*/);
l_err->collectTrace(FSI_COMP_NAME);
break;
}
@@ -134,7 +135,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
FSI::MOD_FSIDD_DDOP,
FSI::RC_NULL_TARGET,
i_addr,
- TO_UINT64(i_opType));
+ TO_UINT64(i_opType),
+ true /*SW error*/);
l_err->collectTrace(FSI_COMP_NAME);
break;
}
@@ -154,7 +156,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
FSI::MOD_FSIDD_DDOP,
FSI::RC_MASTER_TARGET,
i_addr,
- TO_UINT64(i_opType));
+ TO_UINT64(i_opType),
+ true /*SW error*/);
l_err->collectTrace(FSI_COMP_NAME);
break;
}
@@ -198,7 +201,8 @@ errlHndl_t ddOp(DeviceFW::OperationType i_opType,
FSI::MOD_FSIDD_DDOP,
FSI::RC_INVALID_OPERATION,
i_addr,
- TO_UINT64(i_opType));
+ TO_UINT64(i_opType),
+ true /*SW error*/);
l_err->collectTrace(FSI_COMP_NAME);
break;
}
@@ -1261,7 +1265,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
TRACFCOMP( g_trac_fsi, "Parity Error in MESRB0 = %.8X", mesrb0_data );
l_err->addHwCallout( i_addrInfo.accessInfo.master,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_Predictive );
}
// bit 16 is a Register Access Error
@@ -1282,7 +1286,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
// error is inside the OPB logic
l_err->addHwCallout( i_addrInfo.opbTarg,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
root_cause_found = true;
break;
@@ -1294,7 +1298,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
// could also be something weird in the chip
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_LOW,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
root_cause_found = true;
break;
@@ -1308,7 +1312,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
// problem is on the slave side of the bus
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_Predictive );
root_cause_found = true;
break;
@@ -1323,7 +1327,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
// callout the slave side explicitly to deconfig
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_LOW,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_Predictive );
root_cause_found = true;
break;
@@ -1346,7 +1350,7 @@ errlHndl_t FsiDD::handleOpbErrors(FsiAddrInfo_t& i_addrInfo,
HWAS::SRCI_PRIORITY_HIGH );
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_LOW,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
}
@@ -1467,7 +1471,7 @@ errlHndl_t FsiDD::pollForComplete(FsiAddrInfo_t& i_addrInfo,
//most likely this is an issue with the slave chip
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
//also could be a problem with the OPB logic
@@ -1526,7 +1530,7 @@ errlHndl_t FsiDD::pollForComplete(FsiAddrInfo_t& i_addrInfo,
//most likely this is an issue with the slave chip
l_err->addHwCallout( i_addrInfo.fsiTarg,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
//also could be a problem with the master
@@ -2506,7 +2510,8 @@ errlHndl_t FsiDD::verifyPresent( TARGETING::Target* i_target )
slaves),
TWO_UINT32_TO_UINT64(
TARGETING::get_huid(i_target),
- TARGETING::get_huid(chipinfo.master)));
+ TARGETING::get_huid(chipinfo.master)),
+ true /*SW error*/);
l_err->collectTrace(FSI_COMP_NAME);
// log the current MLEVP which contains the detected slave
diff --git a/src/usr/fsi/fsipres.C b/src/usr/fsi/fsipres.C
index 400f5aba0..8abb8e985 100644
--- a/src/usr/fsi/fsipres.C
+++ b/src/usr/fsi/fsipres.C
@@ -5,7 +5,7 @@
/* */
/* IBM CONFIDENTIAL */
/* */
-/* COPYRIGHT International Business Machines Corp. 2011,2013 */
+/* COPYRIGHT International Business Machines Corp. 2011,2014 */
/* */
/* p1 */
/* */
@@ -82,7 +82,8 @@ errlHndl_t procPresenceDetect(DeviceFW::OperationType i_opType,
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
FSI::MOD_FSIPRES_PROCPRESENCEDETECT,
FSI::RC_INVALID_LENGTH,
- TO_UINT64(io_buflen));
+ TO_UINT64(io_buflen),
+ true /*SW error*/);
io_buflen = 0;
return l_errl;
}
@@ -264,7 +265,8 @@ errlHndl_t membPresenceDetect(DeviceFW::OperationType i_opType,
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
FSI::MOD_FSIPRES_MEMBPRESENCEDETECT,
FSI::RC_INVALID_LENGTH,
- TO_UINT64(io_buflen));
+ TO_UINT64(io_buflen),
+ true /*SW error*/);
io_buflen = 0;
return l_errl;
}
diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C
index 4d390360a..dd17a6169 100644
--- a/src/usr/fsiscom/fsiscom.C
+++ b/src/usr/fsiscom/fsiscom.C
@@ -80,7 +80,7 @@ void pib_error_handler( TARGETING::Target* i_target,
// callout this chip as Medium and deconfigure it
i_errlog->addHwCallout( i_target,
HWAS::SRCI_PRIORITY_LOW,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
// grab all the FFDC we can think of
@@ -418,7 +418,7 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType,
}
else
{
- TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Read: PCB/PIB error received: l_status=0x%.8X)", l_status);
+ TRACFCOMP( g_trac_fsiscom, ERR_MRK"fsiScomPerformOp:Unsupported Operation Type: i_opType=%d)", i_opType);
/*@
* @errortype
@@ -434,14 +434,12 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType,
FSISCOM::RC_INVALID_OPTYPE,
TWO_UINT32_TO_UINT64(i_opType,
l_scomAddr),
- TARGETING::get_huid(i_target));
+ TARGETING::get_huid(i_target),
+ true /*SW error*/);
//Add this target to the FFDC
ERRORLOG::ErrlUserDetailsTarget(i_target,"SCOM Target").
addToLog(l_err);
- l_err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE,
- HWAS::SRCI_PRIORITY_HIGH);
-
break;
}
diff --git a/src/usr/scom/scom.C b/src/usr/scom/scom.C
index ae83f7769..38864cbe5 100644
--- a/src/usr/scom/scom.C
+++ b/src/usr/scom/scom.C
@@ -273,7 +273,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType,
//Best guess is the chip
l_err->addHwCallout( i_target,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_Predictive );
//Add this target to the FFDC
@@ -389,7 +389,7 @@ errlHndl_t checkIndirectAndDoScom(DeviceFW::OperationType i_opType,
//Best guess is the chip
l_err->addHwCallout( i_target,
HWAS::SRCI_PRIORITY_HIGH,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_Predictive );
//Add this target to the FFDC
diff --git a/src/usr/xscom/piberror.C b/src/usr/xscom/piberror.C
index 3b1a2e9f5..6b63c3162 100644
--- a/src/usr/xscom/piberror.C
+++ b/src/usr/xscom/piberror.C
@@ -59,7 +59,7 @@ void addFruCallouts(TARGETING::Target* i_target,
HWAS::SRCI_PRIORITY_HIGH);
io_errl->addHwCallout( i_target,
HWAS::SRCI_PRIORITY_LOW,
- HWAS::DECONFIG,
+ HWAS::DELAYED_DECONFIG,
HWAS::GARD_NULL );
break;
case PIB::PIB_PARTIAL_GOOD:
OpenPOWER on IntegriCloud