summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr')
-rwxr-xr-xsrc/usr/diag/prdf/mnfgtools/prdfMfgSync.C78
-rwxr-xr-xsrc/usr/diag/prdf/mnfgtools/prdfMfgSync.H11
-rwxr-xr-xsrc/usr/diag/prdf/mnfgtools/prdfMfgThresholdFile.C22
-rwxr-xr-xsrc/usr/diag/prdf/test/prdfTest_MfgSync.H40
-rwxr-xr-xsrc/usr/diag/prdf/test/prdfsimFspSyncSvc.C60
-rwxr-xr-xsrc/usr/diag/prdf/test/prdfsimMfgSync.C29
-rwxr-xr-xsrc/usr/diag/prdf/test/prdfsimMfgSync.H11
7 files changed, 22 insertions, 229 deletions
diff --git a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C
index fe1761b28..e632c75cc 100755
--- a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C
+++ b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -34,80 +36,6 @@ MfgSync& getMfgSync()
return PRDF_GET_SINGLETON(theMfgSync);
}
-errlHndl_t MfgSync::syncMfgThresholdFromFsp()
-{
- #define FUNC "[MfgSync::syncMfgThresholdFromFsp]"
- PRDF_ENTER( FUNC );
-
- errlHndl_t l_err = NULL;
-
- // Only send message to FSP when mailbox is enabled
- if( isMailboxEnabled() )
- {
- msg_t * msg = msg_allocate();
-
- msg->type = MFG_THRES_SYNC_FROM_FSP;
- msg->data[0] = 0;
- msg->data[1] = 0;
- msg->extra_data = NULL;
-
- l_err = sendMboxMsg( msg );
-
- if( NULL != l_err )
- {
- PRDF_ERR( FUNC" failed to send mbox msg" );
- }
- else
- {
- uint32_t l_msgSize = msg->data[1];
- uint8_t* l_extraData = NULL;
- l_extraData = static_cast<uint8_t*>(msg->extra_data);
-
- if(0 == l_msgSize)
- {
- PRDF_TRAC( FUNC" No FSP MFG Thresholds to sync" );
- }
- else
- {
- PRDF_TRAC( "response message:" );
- PRDF_TRAC( "type: 0x%04x", msg->type );
- PRDF_TRAC( "data0: 0x%016llx", msg->data[0] );
- PRDF_TRAC( "data1: 0x%016llx", msg->data[1] );
- PRDF_TRAC( "extra_data: %p", msg->extra_data );
-
- // save override thresholds
- MfgThresholdFile * l_pMfgThresholdFile =
- MfgThresholdMgr::getInstance()->getMfgThresholdFile();
- l_pMfgThresholdFile->unpackThresholdDataFromBuffer(
- l_extraData, l_msgSize);
- }
- }
-
- // free extra data and msg
- if(NULL != msg)
- {
- if(NULL != msg->extra_data)
- {
- free( msg->extra_data );
- msg->extra_data = NULL;
- }
-
- msg_free( msg );
- msg = NULL;
- }
- }
- else
- {
- PRDF_TRAC( FUNC" mailbox is not enabled, "
- "skipping MFG threshold sync." );
- }
-
- PRDF_EXIT( FUNC );
-
- return l_err;
- #undef FUNC
-}
-
errlHndl_t MfgSync::syncMfgTraceToFsp( ErrorSignature *i_esig,
const PfaData &i_pfaData )
{
diff --git a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.H b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.H
index a6a14b7ac..9b465a01a 100755
--- a/src/usr/diag/prdf/mnfgtools/prdfMfgSync.H
+++ b/src/usr/diag/prdf/mnfgtools/prdfMfgSync.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -65,13 +67,6 @@ class MfgSync
virtual ~MfgSync(){};
/**
- * @brief sync from FSP mfg thresholds
- *
- * @return errlHndl_t
- */
- virtual errlHndl_t syncMfgThresholdFromFsp();
-
- /**
* @brief sync to FSP mfg trace data
*
* @param i_esig Error Signature
diff --git a/src/usr/diag/prdf/mnfgtools/prdfMfgThresholdFile.C b/src/usr/diag/prdf/mnfgtools/prdfMfgThresholdFile.C
index edbd3c31a..bff4152e7 100755
--- a/src/usr/diag/prdf/mnfgtools/prdfMfgThresholdFile.C
+++ b/src/usr/diag/prdf/mnfgtools/prdfMfgThresholdFile.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2009,2014 */
+/* Contributors Listed Below - COPYRIGHT 2013,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -42,23 +44,7 @@ void MfgThresholdFile::syncFromFsp()
#define FUNC "[MfgThresholdFile::syncFromFsp]"
PRDF_ENTER(FUNC);
- do
- {
- if ( !PlatServices::mfgMode() )
- {
- PRDF_TRAC(" no-op since not in MFG mode");
- break;
- }
-
- errlHndl_t l_err = getMfgSync().syncMfgThresholdFromFsp();
- if (l_err)
- {
- PRDF_ERR(FUNC" failed to sync from the FSP");
- PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT);
- break;
- }
-
- } while(0);
+ PRDF_TRAC(FUNC" Threshold sync no longer supported");
PRDF_EXIT(FUNC);
#undef FUNC
diff --git a/src/usr/diag/prdf/test/prdfTest_MfgSync.H b/src/usr/diag/prdf/test/prdfTest_MfgSync.H
index cc0de4ea7..2863bd822 100755
--- a/src/usr/diag/prdf/test/prdfTest_MfgSync.H
+++ b/src/usr/diag/prdf/test/prdfTest_MfgSync.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -53,42 +55,6 @@ using namespace PRDF;
class PrdfTest_MfgSync: public CxxTest::TestSuite
{
public:
- void TestMfgThresSync(void)
- {
- #define PRDF_FUNC "PrdfTest_MfgThresSync"
- PRDF_ENTER(PRDF_FUNC);
-
- // Test 1: Test with mailbox status disabled
- getSimMfgSync().setMailBoxStatus(false);
- errlHndl_t l_err = getSimMfgSync().syncMfgThresholdFromFsp();
- if (l_err)
- {
- PRDF_ERR(PRDF_FUNC" MfgThresSync test1 failed to sync from FSP");
- PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT);
- TS_FAIL(PRDF_FUNC" MfgThresSync test1 failed to sync from FSP");
- }
- else
- {
- PRDF_TRAC(PRDF_FUNC" MfgThresSync test1 is a success.");
- }
-
- // Test 2: Test with mailbox status enabled
- getSimMfgSync().setMailBoxStatus(true);
- l_err = getSimMfgSync().syncMfgThresholdFromFsp();
- if (l_err)
- {
- PRDF_ERR(PRDF_FUNC" MfgThresSync test2 failed to sync from FSP");
- PRDF_COMMIT_ERRL(l_err, ERRL_ACTION_REPORT);
- TS_FAIL(PRDF_FUNC" MfgThresSync test2 failed to sync from FSP");
- }
- else
- {
- PRDF_TRAC(PRDF_FUNC" MfgThresSync test2 is a success.");
- }
- PRDF_EXIT(PRDF_FUNC);
- #undef PRDF_FUNC
- }
-
void TestMfgTraceSync(void)
{
#define PRDF_FUNC "PrdfTest_MfgTraceSync"
diff --git a/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C b/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C
index 9cdb5620c..06b4d9d18 100755
--- a/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C
+++ b/src/usr/diag/prdf/test/prdfsimFspSyncSvc.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2009,2014 */
+/* Contributors Listed Below - COPYRIGHT 2013,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -52,15 +54,6 @@ void SimFspSyncSvc::processRequestMsg(msg_t * i_msg)
switch(i_msg->type)
{
- case MFG_THRES_SYNC_FROM_FSP:
- pError = sendMfgThresRespMsg(i_msg);
- if(NULL != pError)
- {
- PRDF_ERR(FUNC" sendMfgThresRespMsg returned error");
- PRDF_COMMIT_ERRL(pError, ERRL_ACTION_REPORT);
- }
- break;
-
case MFG_TRACE_SYNC_TO_FSP:
pError = processMfgTrace(i_msg);
if(NULL != pError)
@@ -79,53 +72,6 @@ void SimFspSyncSvc::processRequestMsg(msg_t * i_msg)
#undef FUNC
}
-errlHndl_t SimFspSyncSvc::sendMfgThresRespMsg(msg_t * i_msg) const
-{
- #define FUNC "[SimFspSyncSvc::sendMfgThresRespMsg]"
- PRDF_ENTER(FUNC);
- errlHndl_t l_errLog = NULL;
- uint8_t* l_extraData = NULL;
-
- do
- {
- SimFspMfgThresholdFile l_pMfgThresholdFile;
-
- // Override Mfg thresholds
- l_pMfgThresholdFile.overrideThreshold();
-
- uint32_t l_msgSize = l_pMfgThresholdFile.getThresholdSize();
-
- PRDF_TRAC("l_msgSize=%d", l_msgSize);
-
- i_msg->data[0] = 0;
- i_msg->data[1] = l_msgSize;
- i_msg->extra_data = NULL;
-
- if(0 == l_msgSize)
- {
- PRDF_TRAC(FUNC" no override MFG thresholds to send back");
- }
- else
- {
- i_msg->extra_data = malloc( l_msgSize );
- memset(i_msg->extra_data, 0, l_msgSize);
-
- l_extraData = static_cast<uint8_t*>(i_msg->extra_data);
-
- l_pMfgThresholdFile.packThresholdDataIntoBuffer(l_extraData,
- l_msgSize);
- }
-
-
- } while(0);
-
- PRDF_EXIT(FUNC);
-
- return l_errLog;
-
- #undef FUNC
-}
-
errlHndl_t SimFspSyncSvc::processMfgTrace(msg_t *i_msg) const
{
#define PRDF_FUNC "[SimFspSyncSvc::processMfgTrace]"
diff --git a/src/usr/diag/prdf/test/prdfsimMfgSync.C b/src/usr/diag/prdf/test/prdfsimMfgSync.C
index 1b4cbab78..b0ca814cc 100755
--- a/src/usr/diag/prdf/test/prdfsimMfgSync.C
+++ b/src/usr/diag/prdf/test/prdfsimMfgSync.C
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -49,31 +51,6 @@ SimMfgSync::~SimMfgSync()
#undef FUNC
}
-errlHndl_t SimMfgSync::syncMfgThresholdFromFsp()
-{
- #define FUNC "[SimMfgSync::syncMfgThresholdFromFsp]"
- PRDF_ENTER( FUNC );
-
- errlHndl_t l_err = NULL;
-
- do
- {
- l_err = MfgSync::syncMfgThresholdFromFsp();
-
- if(NULL != l_err)
- {
- PRDF_TRAC( FUNC" syncMfgThresholdFromFsp failed" );
- }
-
- } while(0);
-
-
- PRDF_EXIT( FUNC );
-
- return l_err;
- #undef FUNC
-}
-
errlHndl_t SimMfgSync::syncMfgTraceToFsp(ErrorSignature *i_esig,
const PfaData &i_pfaData)
{
diff --git a/src/usr/diag/prdf/test/prdfsimMfgSync.H b/src/usr/diag/prdf/test/prdfsimMfgSync.H
index 928225d38..9a342a844 100755
--- a/src/usr/diag/prdf/test/prdfsimMfgSync.H
+++ b/src/usr/diag/prdf/test/prdfsimMfgSync.H
@@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* COPYRIGHT International Business Machines Corp. 2013,2014 */
+/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* [+] International Business Machines Corp. */
+/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
@@ -62,13 +64,6 @@ class SimMfgSync : public MfgSync
virtual ~SimMfgSync();
/**
- * @brief sync from FSP mfg thresholds
- *
- * @return errlHndl_t
- */
- virtual errlHndl_t syncMfgThresholdFromFsp();
-
- /**
* @brief sync to FSP mfg trace data
*
* @param Error Signature
OpenPOWER on IntegriCloud