diff --git a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h index bf8d9b7c..a37af14f 100644 --- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h +++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h @@ -202,15 +202,22 @@ enum PoolIds : lp_id_t { LATCHUP_RPT_TIME_MSEC, LATCHUP_RPT_IS_SET, - SUPERVISOR_REBOOTS, - LATCHUP_EVENTS, - ADC_TRIGGERS, - PS_HEARTBEATS_LOST, - PL_HEARTBEATS_LOST, - TC_RECEIVED, - TM_RECEIVED, - SOC_BOOTS, - SOC_BOOT_FAILS, + LATCHUP_HAPPENED_CNT_0, + LATCHUP_HAPPENED_CNT_1, + LATCHUP_HAPPENED_CNT_2, + LATCHUP_HAPPENED_CNT_3, + LATCHUP_HAPPENED_CNT_4, + LATCHUP_HAPPENED_CNT_5, + LATCHUP_HAPPENED_CNT_6, + ADC_DEVIATION_TRIGGERS_CNT, + TC_RECEIVED_CNT, + TM_AVAILABLE_CNT, + SUPERVISOR_BOOTS, + MPSOC_BOOTS, + MPSOC_BOOT_FAILED_ATTEMPTS, + MPSOC_POWER_UP, + MPSOC_UPDATES, + LAST_RECVD_TC, ADC_RAW_0, ADC_RAW_1, @@ -249,7 +256,7 @@ enum PoolIds : lp_id_t { static const uint8_t HK_SET_ENTRIES = 13; static const uint8_t BOOT_REPORT_SET_ENTRIES = 10; static const uint8_t LATCHUP_RPT_SET_ENTRIES = 16; -static const uint8_t LOGGING_RPT_SET_ENTRIES = 9; +static const uint8_t LOGGING_RPT_SET_ENTRIES = 16; static const uint8_t ADC_RPT_SET_ENTRIES = 32; static const uint32_t HK_SET_ID = HK_REPORT; @@ -1380,30 +1387,56 @@ class LoggingReport : public StaticLocalDataSet { LoggingReport(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, LOGGING_RPT_ID)) {} - lp_var_t supervisorReboots = - lp_var_t(sid.objectId, PoolIds::SUPERVISOR_REBOOTS, this); - lp_var_t latchupEvents = - lp_var_t(sid.objectId, PoolIds::LATCHUP_EVENTS, this); - lp_var_t adcTriggers = lp_var_t(sid.objectId, PoolIds::ADC_TRIGGERS, this); - lp_var_t psHeartbeatsLost = - lp_var_t(sid.objectId, PoolIds::PS_HEARTBEATS_LOST, this); - lp_var_t plHeartbeatsLost = - lp_var_t(sid.objectId, PoolIds::PL_HEARTBEATS_LOST, this); - lp_var_t tcReceived = lp_var_t(sid.objectId, PoolIds::TC_RECEIVED, this); - lp_var_t tmReceived = lp_var_t(sid.objectId, PoolIds::TM_RECEIVED, this); - lp_var_t socBoots = lp_var_t(sid.objectId, PoolIds::SOC_BOOTS, this); - lp_var_t socBootFails = lp_var_t(sid.objectId, PoolIds::SOC_BOOT_FAILS, this); + lp_var_t latchupHappenCnt0 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_0, this); + lp_var_t latchupHappenCnt1 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_1, this); + lp_var_t latchupHappenCnt2 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_2, this); + lp_var_t latchupHappenCnt3 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_3, this); + lp_var_t latchupHappenCnt4 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_4, this); + lp_var_t latchupHappenCnt5 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_5, this); + lp_var_t latchupHappenCnt6 = + lp_var_t(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_6, this); + lp_var_t adcDeviationTriggersCnt = + lp_var_t(sid.objectId, PoolIds::ADC_DEVIATION_TRIGGERS_CNT, this); + lp_var_t tcReceivedCnt = + lp_var_t(sid.objectId, PoolIds::TC_RECEIVED_CNT, this); + lp_var_t tmAvailableCnt = + lp_var_t(sid.objectId, PoolIds::TM_AVAILABLE_CNT, this); + lp_var_t supervisorBoots = + lp_var_t(sid.objectId, PoolIds::SUPERVISOR_BOOTS, this); + lp_var_t mpsocBoots = + lp_var_t(sid.objectId, PoolIds::MPSOC_BOOTS, this); + lp_var_t mpsocBootFailedAttempts = + lp_var_t(sid.objectId, PoolIds::MPSOC_BOOT_FAILED_ATTEMPTS, this); + lp_var_t mpsocPowerup = + lp_var_t(sid.objectId, PoolIds::MPSOC_POWER_UP, this); + lp_var_t mpsocUpdates = + lp_var_t(sid.objectId, PoolIds::MPSOC_UPDATES, this); + lp_var_t lastRecvdTc = + lp_var_t(sid.objectId, PoolIds::LAST_RECVD_TC, this); void printSet() { - sif::info << "LoggingReport: Supervisor reboots: " << this->supervisorReboots << std::endl; - sif::info << "LoggingReport: Latchup events: " << this->latchupEvents << std::endl; - sif::info << "LoggingReport: ADC triggers: " << this->adcTriggers << std::endl; - sif::info << "LoggingReport: PS heartbeats lost: " << this->psHeartbeatsLost << std::endl; - sif::info << "LoggingReport: PL heartbeats lost: " << this->plHeartbeatsLost << std::endl; - sif::info << "LoggingReport: TC received: " << this->tcReceived << std::endl; - sif::info << "LoggingReport: TM received: " << this->tmReceived << std::endl; - sif::info << "LoggingReport: SoC boots: " << this->socBoots << std::endl; - sif::info << "LoggingReport: SoC boot fails: " << this->socBootFails << std::endl; + sif::info << "LoggingReport: Latchup happened count 0: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 1: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 2: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 3: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 4: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 5: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: Latchup happened count 6: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: ADC deviation triggers count: " << this->latchupHappenCnt0 << std::endl; + sif::info << "LoggingReport: TC received count: " << this->tcReceivedCnt << std::endl; + sif::info << "LoggingReport: TM available count: " << this->tmAvailableCnt << std::endl; + sif::info << "LoggingReport: Supervisor boots: " << this->supervisorBoots << std::endl; + sif::info << "LoggingReport: MPSoC boots: " << this->mpsocBoots << std::endl; + sif::info << "LoggingReport: MPSoC boot failed attempts: " << this->mpsocBootFailedAttempts << std::endl; + sif::info << "LoggingReport: MPSoC power up: " << this->mpsocPowerup << std::endl; + sif::info << "LoggingReport: MPSoC updates: " << this->mpsocUpdates << std::endl; + sif::info << "LoggingReport: Last received TC: " << this->lastRecvdTc << std::endl; } }; diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp index c350ffda..f8b188a5 100644 --- a/linux/devices/ploc/PlocSupervisorHandler.cpp +++ b/linux/devices/ploc/PlocSupervisorHandler.cpp @@ -714,15 +714,22 @@ ReturnValue_t PlocSupervisorHandler::initializeLocalDataPool(localpool::DataPool localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_YEAR, new PoolEntry({0})); localDataPoolMap.emplace(supv::LATCHUP_RPT_IS_SET, new PoolEntry({0})); - localDataPoolMap.emplace(supv::SUPERVISOR_REBOOTS, new PoolEntry({0})); - localDataPoolMap.emplace(supv::LATCHUP_EVENTS, new PoolEntry({0})); - localDataPoolMap.emplace(supv::ADC_TRIGGERS, new PoolEntry({0})); - localDataPoolMap.emplace(supv::PS_HEARTBEATS_LOST, new PoolEntry({0})); - localDataPoolMap.emplace(supv::PL_HEARTBEATS_LOST, new PoolEntry({0})); - localDataPoolMap.emplace(supv::TC_RECEIVED, new PoolEntry({0})); - localDataPoolMap.emplace(supv::TM_RECEIVED, new PoolEntry({0})); - localDataPoolMap.emplace(supv::SOC_BOOTS, new PoolEntry({0})); - localDataPoolMap.emplace(supv::SOC_BOOT_FAILS, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_0, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_1, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_2, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_3, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_4, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_5, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_6, new PoolEntry({0})); + localDataPoolMap.emplace(supv::ADC_DEVIATION_TRIGGERS_CNT, new PoolEntry({0})); + localDataPoolMap.emplace(supv::TC_RECEIVED_CNT, new PoolEntry({0})); + localDataPoolMap.emplace(supv::TM_AVAILABLE_CNT, new PoolEntry({0})); + localDataPoolMap.emplace(supv::SUPERVISOR_BOOTS, new PoolEntry({0})); + localDataPoolMap.emplace(supv::MPSOC_BOOTS, new PoolEntry({0})); + localDataPoolMap.emplace(supv::MPSOC_BOOT_FAILED_ATTEMPTS, new PoolEntry({0})); + localDataPoolMap.emplace(supv::MPSOC_POWER_UP, new PoolEntry({0})); + localDataPoolMap.emplace(supv::MPSOC_UPDATES, new PoolEntry({0})); + localDataPoolMap.emplace(supv::LAST_RECVD_TC, new PoolEntry({0})); localDataPoolMap.emplace(supv::ADC_RAW_0, new PoolEntry({0})); localDataPoolMap.emplace(supv::ADC_RAW_1, new PoolEntry({0}));