meta-facebook: phosphor-gpio-monitor: generalize power-rail-event Consolidate platform-specific power-rail-event-logger scripts and systemd services from anacapa, minerva, santabarbara, and yosemite5 into a single common implementation in the meta-facebook layer. Change-Id: I3243a5ef0ba8dd3ccaedf830b6d4d0838cd781f1 Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json index e9f2759..6e8da0b 100644 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json
@@ -19,9 +19,9 @@ "LineName": "BRIDGE_L_STBY_PG_R", "EventMon": "BOTH", "Targets": { - "INIT_LOW": ["power-rail-logger@BRIDGE_L_STBY_PG_R:assert.service"], - "FALLING": ["power-rail-logger@BRIDGE_L_STBY_PG_R:assert.service"], - "RISING": ["power-rail-logger@BRIDGE_L_STBY_PG_R:deassert.service"] + "INIT_LOW": ["power-rail-assert-log@Anacapa_MB-BRIDGE_L_STBY_PG_R.service"], + "FALLING": ["power-rail-assert-log@Anacapa_MB-BRIDGE_L_STBY_PG_R.service"], + "RISING": ["power-rail-deassert-log@Anacapa_MB-BRIDGE_L_STBY_PG_R.service"] }, "Continue": true }, @@ -30,9 +30,9 @@ "LineName": "BRIDGE_R_STBY_PG_R", "EventMon": "BOTH", "Targets": { - "INIT_LOW": ["power-rail-logger@BRIDGE_R_STBY_PG_R:assert.service"], - "FALLING": ["power-rail-logger@BRIDGE_R_STBY_PG_R:assert.service"], - "RISING": ["power-rail-logger@BRIDGE_R_STBY_PG_R:deassert.service"] + "INIT_LOW": ["power-rail-assert-log@Anacapa_MB-BRIDGE_R_STBY_PG_R.service"], + "FALLING": ["power-rail-assert-log@Anacapa_MB-BRIDGE_R_STBY_PG_R.service"], + "RISING": ["power-rail-deassert-log@Anacapa_MB-BRIDGE_R_STBY_PG_R.service"] }, "Continue": true }, @@ -41,9 +41,9 @@ "LineName": "AMC_STBY_PGOOD_R", "EventMon": "BOTH", "Targets": { - "INIT_LOW": ["power-rail-logger@AMC_STBY_PGOOD_R:assert.service"], - "FALLING": ["power-rail-logger@AMC_STBY_PGOOD_R:assert.service"], - "RISING": ["power-rail-logger@AMC_STBY_PGOOD_R:deassert.service"] + "INIT_LOW": ["power-rail-assert-log@Anacapa_MB-AMC_STBY_PGOOD_R.service"], + "FALLING": ["power-rail-assert-log@Anacapa_MB-AMC_STBY_PGOOD_R.service"], + "RISING": ["power-rail-deassert-log@Anacapa_MB-AMC_STBY_PGOOD_R.service"] }, "Continue": true }, @@ -62,9 +62,9 @@ "LineName": "R_RTM_SW_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@R_RTM_SW_FLT:assert.service"], - "FALLING": ["power-rail-logger@R_RTM_SW_FLT:deassert.service"], - "RISING": ["power-rail-logger@R_RTM_SW_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-R_RTM_SW_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-R_RTM_SW_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-R_RTM_SW_FLT.service"] }, "Continue": true }, @@ -73,9 +73,9 @@ "LineName": "L_RTM_SW_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_RTM_SW_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_RTM_SW_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_RTM_SW_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_RTM_SW_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_RTM_SW_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_RTM_SW_FLT.service"] }, "Continue": true }, @@ -84,9 +84,9 @@ "LineName": "L_BNIC0_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_BNIC0_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_BNIC0_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_BNIC0_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_BNIC0_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_BNIC0_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_BNIC0_FLT.service"] }, "Continue": true }, @@ -95,9 +95,9 @@ "LineName": "L_BNIC1_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_BNIC1_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_BNIC1_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_BNIC1_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_BNIC1_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_BNIC1_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_BNIC1_FLT.service"] }, "Continue": true }, @@ -106,9 +106,9 @@ "LineName": "L_BNIC2_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_BNIC2_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_BNIC2_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_BNIC2_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_BNIC2_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_BNIC2_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_BNIC2_FLT.service"] }, "Continue": true }, @@ -117,9 +117,9 @@ "LineName": "L_BNIC3_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_BNIC3_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_BNIC3_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_BNIC3_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_BNIC3_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_BNIC3_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_BNIC3_FLT.service"] }, "Continue": true }, @@ -128,9 +128,9 @@ "LineName": "R_BNIC0_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@R_BNIC0_FLT:assert.service"], - "FALLING": ["power-rail-logger@R_BNIC0_FLT:deassert.service"], - "RISING": ["power-rail-logger@R_BNIC0_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-R_BNIC0_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-R_BNIC0_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-R_BNIC0_FLT.service"] }, "Continue": true }, @@ -139,9 +139,9 @@ "LineName": "R_BNIC1_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@R_BNIC1_FLT:assert.service"], - "FALLING": ["power-rail-logger@R_BNIC1_FLT:deassert.service"], - "RISING": ["power-rail-logger@R_BNIC1_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-R_BNIC1_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-R_BNIC1_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-R_BNIC1_FLT.service"] }, "Continue": true }, @@ -150,9 +150,9 @@ "LineName": "R_BNIC2_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@R_BNIC2_FLT:assert.service"], - "FALLING": ["power-rail-logger@R_BNIC2_FLT:deassert.service"], - "RISING": ["power-rail-logger@R_BNIC2_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-R_BNIC2_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-R_BNIC2_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-R_BNIC2_FLT.service"] }, "Continue": true }, @@ -161,9 +161,9 @@ "LineName": "R_BNIC3_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@R_BNIC3_FLT:assert.service"], - "FALLING": ["power-rail-logger@R_BNIC3_FLT:deassert.service"], - "RISING": ["power-rail-logger@R_BNIC3_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-R_BNIC3_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-R_BNIC3_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-R_BNIC3_FLT.service"] }, "Continue": true }, @@ -172,9 +172,9 @@ "LineName": "L_FNIC_FLT", "EventMon": "BOTH", "Targets": { - "INIT_HIGH": ["power-rail-logger@L_FNIC_FLT:assert.service"], - "FALLING": ["power-rail-logger@L_FNIC_FLT:deassert.service"], - "RISING": ["power-rail-logger@L_FNIC_FLT:assert.service"] + "INIT_HIGH": ["power-rail-assert-log@Anacapa_MB-L_FNIC_FLT.service"], + "FALLING": ["power-rail-deassert-log@Anacapa_MB-L_FNIC_FLT.service"], + "RISING": ["power-rail-assert-log@Anacapa_MB-L_FNIC_FLT.service"] }, "Continue": true }, @@ -183,9 +183,9 @@ "LineName": "FM_MAIN_PWREN_RMC_EN_ISO", "EventMon": "BOTH", "Targets": { - "INIT_LOW": ["power-rail-logger@FM_MAIN_PWREN_RMC_EN_ISO:assert.service"], - "FALLING": ["power-rail-logger@FM_MAIN_PWREN_RMC_EN_ISO:assert.service"], - "RISING": ["power-rail-logger@FM_MAIN_PWREN_RMC_EN_ISO:deassert.service"] + "INIT_LOW": ["power-rail-assert-log@Anacapa_MB-FM_MAIN_PWREN_RMC_EN_ISO.service"], + "FALLING": ["power-rail-assert-log@Anacapa_MB-FM_MAIN_PWREN_RMC_EN_ISO.service"], + "RISING": ["power-rail-deassert-log@Anacapa_MB-FM_MAIN_PWREN_RMC_EN_ISO.service"] }, "Continue": true },
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger deleted file mode 100644 index c255fab..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger +++ /dev/null
@@ -1,39 +0,0 @@ -#!/bin/bash -set -euo pipefail - -inst="${1:-}" -IFS=":" read -r line action <<< "${inst}" - -if [[ -z "${action}" || -z "${line}" ]]; then - echo "Usage: gpio-power-rail-event-logger <GPIO_LINE_NAME>:<assert|deassert>" >&2 - exit 1 -fi - -MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" -DEVICE_PATH="/xyz/openbmc_project/inventory/system/board/Anacapa_MB/${line}" -RECOVER_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" -STASH_FILE="/run/${line}.log_entry" - -case "${action}" in - "assert") - if [ ! -s "$STASH_FILE" ]; then - /usr/bin/log-create "$MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${DEVICE_PATH}\", \"FAILURE_DATA\": \"${line}\"}" \ - > "${STASH_FILE}" - fi - ;; - - "deassert") - if [ -s "${STASH_FILE}" ]; then - log-resolve -p "$(< "${STASH_FILE}")" && rm "${STASH_FILE}" - fi - /usr/bin/log-create "$RECOVER_ID" --json \ - "{ \"POWER_RAIL\": \"${DEVICE_PATH}\"}" - ;; - *) - echo "Invalid action: ${action}" >&2 - exit 1 - ;; -esac - -exit 0 \ No newline at end of file
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-logger@.service b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-logger@.service deleted file mode 100644 index 4ce0042..0000000 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-logger@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=Power Rail Event Log - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "%i" -SyslogIdentifier=power-rail-event-logger
diff --git a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 1fb8c89..a7a3ab4 100644 --- a/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-anacapa/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -9,7 +9,8 @@ deassert-post-end.service \ deassert-power-good-drop.service \ multi-gpios-sys-init.service \ - power-rail-logger@.service \ + power-rail-assert-log@.service \ + power-rail-deassert-log@.service \ dimm-power-fault-logger@.service \ hpm-power-fault@.service \ thermal-event-logger@.service \
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json index d8b4dd4..91ea380 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-monitor.json
@@ -5,8 +5,8 @@ "GpioNum": 56, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-1_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-1_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_1-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_1-pwrgd.service"] }, "Continue": true }, @@ -16,8 +16,8 @@ "GpioNum": 58, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-2_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-2_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_2-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_2-pwrgd.service"] }, "Continue": true }, @@ -27,8 +27,8 @@ "GpioNum": 60, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-3_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-3_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_3-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_3-pwrgd.service"] }, "Continue": true }, @@ -38,8 +38,8 @@ "GpioNum": 62, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-4_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-4_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_4-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_4-pwrgd.service"] }, "Continue": true }, @@ -49,8 +49,8 @@ "GpioNum": 64, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-5_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-5_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_5-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_5-pwrgd.service"] }, "Continue": true }, @@ -60,8 +60,8 @@ "GpioNum": 66, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-6_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-6_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_6-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_6-pwrgd.service"] }, "Continue": true }, @@ -71,8 +71,8 @@ "GpioNum": 68, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-7_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-7_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_7-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_7-pwrgd.service"] }, "Continue": true }, @@ -82,8 +82,8 @@ "GpioNum": 70, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-8_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-8_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_8-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_8-pwrgd.service"] }, "Continue": true }, @@ -93,8 +93,8 @@ "GpioNum": 72, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-9_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-9_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_9-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_9-pwrgd.service"] }, "Continue": true }, @@ -104,8 +104,8 @@ "GpioNum": 74, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-10_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-10_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_10-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_10-pwrgd.service"] }, "Continue": true }, @@ -115,8 +115,8 @@ "GpioNum": 76, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-11_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-11_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_11-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_11-pwrgd.service"] }, "Continue": true }, @@ -126,8 +126,8 @@ "GpioNum": 78, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-12_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-12_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_12-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_12-pwrgd.service"] }, "Continue": true }, @@ -137,8 +137,8 @@ "GpioNum": 80, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-13_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-13_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_13-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_13-pwrgd.service"] }, "Continue": true }, @@ -148,8 +148,8 @@ "GpioNum": 82, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-14_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-14_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_14-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_14-pwrgd.service"] }, "Continue": true }, @@ -159,8 +159,8 @@ "GpioNum": 84, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-15_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-15_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_15-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_15-pwrgd.service"] }, "Continue": true }, @@ -170,8 +170,8 @@ "GpioNum": 86, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@mtia-blade-16_pwrgd.service"], - "RISING": ["power-rail-assert-log@mtia-blade-16_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_MTIA_Blade_16-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_MTIA_Blade_16-pwrgd.service"] }, "Continue": true }, @@ -181,8 +181,8 @@ "GpioNum": 88, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-1_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-1_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_1-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_1-pwrgd.service"] }, "Continue": true }, @@ -192,8 +192,8 @@ "GpioNum": 90, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-2_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-2_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_2-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_2-pwrgd.service"] }, "Continue": true }, @@ -203,8 +203,8 @@ "GpioNum": 92, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-3_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-3_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_3-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_3-pwrgd.service"] }, "Continue": true }, @@ -214,8 +214,8 @@ "GpioNum": 94, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-4_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-4_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_4-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_4-pwrgd.service"] }, "Continue": true }, @@ -225,8 +225,8 @@ "GpioNum": 96, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-5_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-5_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_5-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_5-pwrgd.service"] }, "Continue": true }, @@ -236,8 +236,8 @@ "GpioNum": 98, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-rail-deassert-log@network-blade-6_pwrgd.service"], - "RISING": ["power-rail-assert-log@network-blade-6_pwrgd.service"] + "FALLING": ["power-rail-deassert-log@Minerva_Network_Blade_6-pwrgd.service"], + "RISING": ["power-rail-assert-log@Minerva_Network_Blade_6-pwrgd.service"] }, "Continue": true }, @@ -248,12 +248,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-1.service", + "power-rail-deassert-log@Minerva_Fan_Board_1-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-1.service", + "power-rail-assert-log@Minerva_Fan_Board_1-pwrgd.service", "rescan-fru.service" ] }, @@ -266,12 +266,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-2.service", + "power-rail-deassert-log@Minerva_Fan_Board_2-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-2.service", + "power-rail-assert-log@Minerva_Fan_Board_2-pwrgd.service", "rescan-fru.service" ] }, @@ -284,12 +284,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-3.service", + "power-rail-deassert-log@Minerva_Fan_Board_3-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-3.service", + "power-rail-assert-log@Minerva_Fan_Board_3-pwrgd.service", "rescan-fru.service" ] }, @@ -302,12 +302,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-4.service", + "power-rail-deassert-log@Minerva_Fan_Board_4-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-4.service", + "power-rail-assert-log@Minerva_Fan_Board_4-pwrgd.service", "rescan-fru.service" ] }, @@ -320,12 +320,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-6.service", + "power-rail-deassert-log@Minerva_Fan_Board_6-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-6.service", + "power-rail-assert-log@Minerva_Fan_Board_6-pwrgd.service", "rescan-fru.service" ] }, @@ -338,12 +338,12 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@fcb-5.service", + "power-rail-deassert-log@Minerva_Fan_Board_5-pwrgd.service", "rescan-fru.service", "fan-reload.service" ], "RISING": [ - "power-rail-assert-log@fcb-5.service", + "power-rail-assert-log@Minerva_Fan_Board_5-pwrgd.service", "rescan-fru.service" ] }, @@ -356,11 +356,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-1_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_1-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-1_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_1-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -373,11 +373,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-2_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_2-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-2_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_2-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -390,11 +390,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-3_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_3-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-3_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_3-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -407,11 +407,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-4_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_4-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-4_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_4-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -424,11 +424,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-5_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_5-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-5_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_5-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -441,11 +441,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-6_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_6-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-6_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_6-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -458,11 +458,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-7_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_7-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-7_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_7-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -475,11 +475,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-8_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_8-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-8_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_8-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -492,11 +492,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-9_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_9-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-9_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_9-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -509,11 +509,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-10_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_10-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-10_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_10-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -526,11 +526,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-11_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_11-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-11_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_11-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -543,11 +543,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-12_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_12-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-12_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_12-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -560,11 +560,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-13_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_13-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-13_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_13-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -577,11 +577,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-14_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_14-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-14_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_14-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -594,11 +594,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-15_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_15-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-15_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_15-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -611,11 +611,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@mtia-blade-16_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_MTIA_Blade_16-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@mtia-blade-16_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_MTIA_Blade_16-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -628,11 +628,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-1_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_1-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-1_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_1-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -645,11 +645,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-2_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_2-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-2_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_2-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -662,11 +662,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-3_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_3-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-3_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_3-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -679,11 +679,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-4_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_4-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-4_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_4-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -696,11 +696,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-5_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_5-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-5_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_5-hsc-pwrgd.service", "rescan-fru.service" ] }, @@ -713,11 +713,11 @@ "EventMon": "BOTH", "Targets": { "FALLING": [ - "power-rail-deassert-log@network-blade-6_hsc-pwrgd.service", + "power-rail-deassert-log@Minerva_Network_Blade_6-hsc-pwrgd.service", "rescan-fru.service" ], "RISING": [ - "power-rail-assert-log@network-blade-6_hsc-pwrgd.service", + "power-rail-assert-log@Minerva_Network_Blade_6-hsc-pwrgd.service", "rescan-fru.service" ] },
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger deleted file mode 100644 index b3dc0f4..0000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger +++ /dev/null
@@ -1,78 +0,0 @@ -#!/bin/bash - -HELP_MSG=" -Usage: power-rail-event-logger <event> <gpio_name> -<event> is the power rail event to log, -e.g. assert / deassert. - -<board>_<gpio_name> is defined in json file, -e.g. mtia-blade-1_pwrgd -" - -if [ "$#" -ne 2 ]; then - echo "$HELP_MSG" - exit 1 -fi - -message="$2" -ASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" -DEASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" - -# Extract board name and gpio name from the message -# message format: -# <board_name>-<board_number>_<gpio_name> -if [[ $message == fcb* ]]; then - board_name_with_num=${message} - # FCB only has one power rail gpio for AC signal - gpio_name="pwrgd" -elif [[ $message == mtia-blade* || $message == network-blade* ]]; then - board_name_with_num="${message%%_*}" - gpio_name="${message#*_}" -else - echo "Unknown message format: $message" - exit 1 -fi - -board_name="${board_name_with_num%%-*}" -board_number="${board_name_with_num##*-}" - -if [[ $board_name == "mtia" ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Minerva_MTIA_Blade_${board_number}/${gpio_name}" -elif [[ $board_name == "network" ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Minerva_Network_Blade_${board_number}/${gpio_name}" -elif [[ $board_name == "fcb" ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Minerva_Fan_Board_${board_number}/${gpio_name}" -else - echo "Unknown board name: $board_name" - exit 1 -fi - -stash_file="/run/${message}.log_entry" - -case "$1" in - "assert") - if [ ! -s "$stash_file" ]; then - /usr/bin/log-create "$ASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\", \"FAILURE_DATA\": \"${gpio_name}\"}" \ - > "${stash_file}" - fi - ;; - - "deassert") - # If the stash file exists, resolve the log entry and remove the stash file - if [ -s "${stash_file}" ]; then - log-resolve -p "$(< "${stash_file}")" && rm "${stash_file}" - fi - # Always create a deassert log entry - /usr/bin/log-create "$DEASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\"}" - ;; - - *) - echo "Not supported event: $1" - echo "$HELP_MSG" - exit 1 - ;; -esac - -exit 0
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service deleted file mode 100644 index 9274b52..0000000 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Fault Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "assert" "%i" -SyslogIdentifier=%i-power-rail-fault-assert
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service deleted file mode 100644 index 05810f0..0000000 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Fault Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "deassert" "%i" -SyslogIdentifier=%i-power-rail-fault-deassert
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger deleted file mode 100644 index 5a83b69..0000000 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger +++ /dev/null
@@ -1,67 +0,0 @@ -#!/bin/bash - -HELP_MSG=" -Usage: power-rail-event-logger <event> <id_gpio-name> -<event> is the power rail event to log, -e.g. assert / deassert. - -<id_gpio-name> is defined in json file, -e.g. 2_power-host-good -" - -if [ "$#" -ne 2 ]; then - echo "$HELP_MSG" - exit 1 -fi - -message="$2" -ASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" -DEASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" - -# Extract board name and gpio name from the message amd build device path -# Supported message formats: -# 1. <board_name>_<gpio_name> -# Example: pdb_ABC -# Device path: /xyz/openbmc_project/inventory/system/board/Yosemite5_Medusa_Board/ABC -board="${message%%_*}" -gpio_name="${message#*_}" - -if [[ $board == pdb* ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Yosemite5_Medusa_Board/${gpio_name}" -elif [[ $board == mb* ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Yosemite5_MB/${gpio_name}" -else - echo "Unknown message format: $message" - exit 1 -fi - -stash_file="/run/${gpio_name}.log_entry" - - -case "$1" in - "assert") - if [ ! -s "$stash_file" ]; then - /usr/bin/log-create "$ASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\", \"FAILURE_DATA\": \"${gpio_name}\"}" \ - > "${stash_file}" - fi - ;; - - "deassert") - # If the stash file exists, resolve the log entry and remove the stash file - if [ -s "${stash_file}" ]; then - log-resolve -p "$(< "${stash_file}")" && rm "${stash_file}" - fi - # Always create a deassert log entry - /usr/bin/log-create "$DEASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\"}" - ;; - - *) - echo "Not supported event: $1" - echo "$HELP_MSG" - exit 1 - ;; -esac - -exit 0
diff --git a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index ee7d863..076b1df 100644 --- a/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-rainiera7/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -16,9 +16,6 @@ file://smc-assert-log@.service \ file://smc-deassert-log@.service \ file://smc-event-logger \ - file://power-rail-assert-log@.service \ - file://power-rail-deassert-log@.service \ - file://power-rail-event-logger \ file://uart-select-led@.service \ file://set-uart-select-led \ file://rainier-gpio-handler \ @@ -37,8 +34,6 @@ thermal-deassert-log@.service \ smc-assert-log@.service \ smc-deassert-log@.service \ - power-rail-assert-log@.service \ - power-rail-deassert-log@.service \ uart-select-led@.service \ rainier-gpio-handler@.service \ " @@ -57,7 +52,6 @@ install -m 0755 ${UNPACKDIR}/deassert-power-good-drop ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/thermal-event-logger ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/smc-event-logger ${D}${libexecdir}/${PN}/ - install -m 0755 ${UNPACKDIR}/power-rail-event-logger ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/set-uart-select-led ${D}${libexecdir}/${PN}/ install -m 0755 ${UNPACKDIR}/rainier-gpio-handler ${D}${libexecdir}/${PN}/
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json index a59c5d1..b0346fd 100644 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json
@@ -6,12 +6,12 @@ "Targets": { "RISING": [ "deassert-power-good-drop.service", - "power-rail-deassert-log@FM_PWRGD_CPU0_PWROK.service" + "power-rail-deassert-log@Santabarbara_MB-FM_PWRGD_CPU0_PWROK.service" ], "FALLING": [ "assert-power-good-drop.service", "mctp_remove.service", - "power-rail-assert-log@FM_PWRGD_CPU0_PWROK.service" + "power-rail-assert-log@Santabarbara_MB-FM_PWRGD_CPU0_PWROK.service" ] }, "Continue": true @@ -22,10 +22,10 @@ "EventMon": "BOTH", "Targets": { "RISING": [ - "power-rail-deassert-log@FM_RST_CPU0_RESETL_N.service" + "power-rail-deassert-log@Santabarbara_MB-FM_RST_CPU0_RESETL_N.service" ], "FALLING": [ - "power-rail-assert-log@FM_RST_CPU0_RESETL_N.service" + "power-rail-assert-log@Santabarbara_MB-FM_RST_CPU0_RESETL_N.service" ] }, "Continue": true @@ -483,10 +483,10 @@ "EventMon": "BOTH", "Targets": { "RISING": [ - "power-rail-assert-log@PEX_SYS_ERR_FPGA.service" + "power-rail-assert-log@Santabarbara_MB-PEX_SYS_ERR_FPGA.service" ], "FALLING": [ - "power-rail-deassert-log@PEX_SYS_ERR_FPGA.service" + "power-rail-deassert-log@Santabarbara_MB-PEX_SYS_ERR_FPGA.service" ] }, "Continue": true
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service deleted file mode 100644 index b6bc91e..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "assert" "%i" -SyslogIdentifier=%i-power-rail-assert
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service deleted file mode 100644 index 705b5de..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "deassert" "%i" -SyslogIdentifier=%i-power-rail-deassert
diff --git a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger deleted file mode 100644 index 4d95c65..0000000 --- a/meta-facebook/meta-santabarbara/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger +++ /dev/null
@@ -1,45 +0,0 @@ -#!/bin/bash - -HELP=" -Usage: power-rail-event-logger <event> <gpio-name> -<event> is the power rail event to log, -e.g. assert / deassert. - -<gpio-name> is defined in json file, -e.g. FM_PWRGD_CPU0_PWROK. -" - -# get assert or deassert message -action=$1 - -GPIO_NAME=$2 - -MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" -DEVICE_PATH="/xyz/openbmc_project/inventory/system/board/Santabarbara_MB/$GPIO_NAME" -STASH_FILE="/run/${GPIO_NAME}.log_entry" - -case $action in - "-h") - echo "$HELP" - ;; - - "assert") - if [ ! -s "$STASH_FILE" ]; then - /usr/bin/log-create "$MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${DEVICE_PATH}\", \"FAILURE_DATA\": \"${GPIO_NAME}\"}" \ - > "${STASH_FILE}" - fi - ;; - - "deassert") - MSG_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" - if [ -s "${STASH_FILE}" ]; then - log-resolve -p "$(< "${STASH_FILE}")" - rm "${STASH_FILE}" - fi - /usr/bin/log-create "$MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${DEVICE_PATH}\"}" - ;; -esac - -exit 0
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json index 46dcb63..35f8760 100644 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json +++ b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor-evt.json
@@ -448,8 +448,8 @@ "LineName": "Fault", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-assert-log@mb_Fault.service"], - "FALLING": ["power-rail-deassert-log@mb_Fault.service"] + "RISING": ["power-rail-assert-log@Yosemite5_MB-Fault.service"], + "FALLING": ["power-rail-deassert-log@Yosemite5_MB-Fault.service"] }, "Continue": true }, @@ -524,8 +524,8 @@ "LineName": "FM_SLOT1_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT1_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT1_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT1_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT1_HSC_FAULT.service"] }, "Continue": true }, @@ -534,8 +534,8 @@ "LineName": "FM_SLOT2_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT2_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT2_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT2_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT2_HSC_FAULT.service"] }, "Continue": true }, @@ -544,8 +544,8 @@ "LineName": "FM_SLOT3_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT3_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT3_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT3_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT3_HSC_FAULT.service"] }, "Continue": true }, @@ -554,8 +554,8 @@ "LineName": "FM_SLOT4_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT4_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT4_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT4_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT4_HSC_FAULT.service"] }, "Continue": true }, @@ -564,8 +564,8 @@ "LineName": "FM_SLOT5_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT5_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT5_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT5_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT5_HSC_FAULT.service"] }, "Continue": true }, @@ -574,8 +574,8 @@ "LineName": "FM_SLOT6_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT6_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT6_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT6_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT6_HSC_FAULT.service"] }, "Continue": true },
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json index 6635fa0..3bc4eb2 100644 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json
@@ -418,8 +418,8 @@ "LineName": "Fault", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-assert-log@mb_Fault.service", "fault-led-assert@Fault.service"], - "FALLING": ["power-rail-deassert-log@mb_Fault.service", "fault-led-deassert@Fault.service"] + "RISING": ["power-rail-assert-log@Yosemite5_MB-Fault.service", "fault-led-assert@Fault.service"], + "FALLING": ["power-rail-deassert-log@Yosemite5_MB-Fault.service", "fault-led-deassert@Fault.service"] }, "Continue": true }, @@ -484,8 +484,8 @@ "LineName": "FM_SLOT1_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT1_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT1_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT1_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT1_HSC_FAULT.service"] }, "Continue": true }, @@ -494,8 +494,8 @@ "LineName": "FM_SLOT2_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT2_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT2_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT2_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT2_HSC_FAULT.service"] }, "Continue": true }, @@ -504,8 +504,8 @@ "LineName": "FM_SLOT3_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT3_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT3_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT3_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT3_HSC_FAULT.service"] }, "Continue": true }, @@ -514,8 +514,8 @@ "LineName": "FM_SLOT4_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT4_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT4_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT4_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT4_HSC_FAULT.service"] }, "Continue": true }, @@ -524,8 +524,8 @@ "LineName": "FM_SLOT5_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT5_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT5_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT5_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT5_HSC_FAULT.service"] }, "Continue": true }, @@ -534,8 +534,8 @@ "LineName": "FM_SLOT6_HSC_FAULT", "EventMon": "BOTH", "Targets": { - "RISING": ["power-rail-deassert-log@pdb_FM_SLOT6_HSC_FAULT.service"], - "FALLING": ["power-rail-assert-log@pdb_FM_SLOT6_HSC_FAULT.service"] + "RISING": ["power-rail-deassert-log@Yosemite5_Medusa_Board-FM_SLOT6_HSC_FAULT.service"], + "FALLING": ["power-rail-assert-log@Yosemite5_Medusa_Board-FM_SLOT6_HSC_FAULT.service"] }, "Continue": true },
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service deleted file mode 100644 index 9274b52..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Fault Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "assert" "%i" -SyslogIdentifier=%i-power-rail-fault-assert
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service deleted file mode 100644 index 05810f0..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service +++ /dev/null
@@ -1,7 +0,0 @@ -[Unit] -Description=%i Power Rail Fault Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "deassert" "%i" -SyslogIdentifier=%i-power-rail-fault-deassert
diff --git a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger deleted file mode 100644 index 5a83b69..0000000 --- a/meta-facebook/meta-yosemite5/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger +++ /dev/null
@@ -1,67 +0,0 @@ -#!/bin/bash - -HELP_MSG=" -Usage: power-rail-event-logger <event> <id_gpio-name> -<event> is the power rail event to log, -e.g. assert / deassert. - -<id_gpio-name> is defined in json file, -e.g. 2_power-host-good -" - -if [ "$#" -ne 2 ]; then - echo "$HELP_MSG" - exit 1 -fi - -message="$2" -ASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" -DEASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" - -# Extract board name and gpio name from the message amd build device path -# Supported message formats: -# 1. <board_name>_<gpio_name> -# Example: pdb_ABC -# Device path: /xyz/openbmc_project/inventory/system/board/Yosemite5_Medusa_Board/ABC -board="${message%%_*}" -gpio_name="${message#*_}" - -if [[ $board == pdb* ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Yosemite5_Medusa_Board/${gpio_name}" -elif [[ $board == mb* ]]; then - device_path="/xyz/openbmc_project/inventory/system/board/Yosemite5_MB/${gpio_name}" -else - echo "Unknown message format: $message" - exit 1 -fi - -stash_file="/run/${gpio_name}.log_entry" - - -case "$1" in - "assert") - if [ ! -s "$stash_file" ]; then - /usr/bin/log-create "$ASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\", \"FAILURE_DATA\": \"${gpio_name}\"}" \ - > "${stash_file}" - fi - ;; - - "deassert") - # If the stash file exists, resolve the log entry and remove the stash file - if [ -s "${stash_file}" ]; then - log-resolve -p "$(< "${stash_file}")" && rm "${stash_file}" - fi - # Always create a deassert log entry - /usr/bin/log-create "$DEASSERT_MSG_ID" --json \ - "{ \"POWER_RAIL\": \"${device_path}\"}" - ;; - - *) - echo "Not supported event: $1" - echo "$HELP_MSG" - exit 1 - ;; -esac - -exit 0
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service similarity index 89% rename from meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service index b6bc91e..a14b1ab 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-assert-log@.service
@@ -3,5 +3,6 @@ [Service] Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "assert" "%i" +ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger assert "%i" + SyslogIdentifier=%i-power-rail-assert
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service similarity index 88% rename from meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service rename to meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service index 705b5de..b683edd 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-deassert-log@.service
@@ -3,5 +3,6 @@ [Service] Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger "deassert" "%i" +ExecStart=/usr/libexec/phosphor-gpio-monitor/power-rail-event-logger deassert "%i" + SyslogIdentifier=%i-power-rail-deassert
diff --git a/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger new file mode 100755 index 0000000..055b50e --- /dev/null +++ b/meta-facebook/recipes-phosphor/gpio/phosphor-gpio-monitor/power-rail-event-logger
@@ -0,0 +1,52 @@ +#!/bin/bash +set -eu + +HELP_MSG=" +Usage: power-rail-event-logger <event> <board>-<gpio_name> +<event> is the power rail event to log, +e.g. assert / deassert. + +<board>-<gpio_name> is defined in json file, +e.g. Yosemite5_MB-ALERT_INA230_DIMM_0_N +" + +if [ "$#" -ne 2 ]; then + echo "$HELP_MSG" + exit 1 +fi + +message="$2" +ASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFault" +DEASSERT_MSG_ID="xyz.openbmc_project.State.Power.PowerRailFaultRecovered" + +board="${message%%-*}" +gpio_name="${message#*-}" +device_path="/xyz/openbmc_project/inventory/system/board/${board}/${gpio_name}" + +stash_file="/run/${message}.log_entry" + +case "$1" in + assert) + if [ ! -s "$stash_file" ]; then + /usr/bin/log-create "$ASSERT_MSG_ID" --json \ + "{ \"POWER_RAIL\": \"${device_path}\", \"FAILURE_DATA\": \"${gpio_name}\"}" \ + > "${stash_file}" + fi + ;; + + deassert) + if [ -s "${stash_file}" ]; then + log-resolve -p "$(< "${stash_file}")" || true + rm -f "${stash_file}" + fi + /usr/bin/log-create "$DEASSERT_MSG_ID" --json \ + "{ \"POWER_RAIL\": \"${device_path}\"}" + ;; + + *) + echo "Not supported event: $1" >&2 + exit 1 + ;; +esac + +exit 0