diff options
author | Yang Chen <yang.chen@quantatw.com> | 2024-06-28 18:15:10 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2024-06-28 20:13:26 +0300 |
commit | 77c94fa9ba38f7e1f827766e734587a239520cd6 (patch) | |
tree | 7f0d2ecad269ae161e3162ea870d7dc542c36b5a | |
parent | 815ecb1b558de2c7303654fc6d9cb0807671165e (diff) | |
download | openbmc-77c94fa9ba38f7e1f827766e734587a239520cd6.tar.xz |
meta-facebook: minerva: revise phosphor-multi-gpio-monitor
- Enable phosphor-gpio-monitor-presence.
- Move presence related pins from monitor to presence.
- Add pins as below in gpio monitor to record event log
- CHASSIS_LEAK0_DETECT_N
- CHASSIS_LEAK1_DETECT_N
- RPU_READY_SPARE
- Remove unused service and script.
Change-Id: I8116c0a485f6cf2d65282c065c76d4d9132e6787
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
13 files changed, 288 insertions, 447 deletions
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service deleted file mode 100644 index 76b3b893d8..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-assert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Cable Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i cable present assert" "CABLE" "%i" -SyslogIdentifier=%i-cable-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service deleted file mode 100644 index 2d655ad340..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/cable-present-deassert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Cable Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i cable present deassert" "CABLE" "%i" -SyslogIdentifier=%i-cable-present-deassert 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 8f25dcb11d..5318fc14ce 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 @@ -1,314 +1,6 @@ [ { - "Name": "PRSNT_MTIA_BLADE0_N", - "ChipId": "2", - "GpioNum": 0, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-0.service"], - "RISING": ["present-deassert@mtia-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE1_N", - "ChipId": "2", - "GpioNum": 2, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-1.service"], - "RISING": ["present-deassert@mtia-blade-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE2_N", - "ChipId": "2", - "GpioNum": 4, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-2.service"], - "RISING": ["present-deassert@mtia-blade-2.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE3_N", - "ChipId": "2", - "GpioNum": 6, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-3.service"], - "RISING": ["present-deassert@mtia-blade-3.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE4_N", - "ChipId": "2", - "GpioNum": 8, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-4.service"], - "RISING": ["present-deassert@mtia-blade-4.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE5_N", - "ChipId": "2", - "GpioNum": 10, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-5.service"], - "RISING": ["present-deassert@mtia-blade-5.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE6_N", - "ChipId": "2", - "GpioNum": 12, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-6.service"], - "RISING": ["present-deassert@mtia-blade-6.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE7_N", - "ChipId": "2", - "GpioNum": 14, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-7.service"], - "RISING": ["present-deassert@mtia-blade-7.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE8_N", - "ChipId": "2", - "GpioNum": 16, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-8.service"], - "RISING": ["present-deassert@mtia-blade-8.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE9_N", - "ChipId": "2", - "GpioNum": 18, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-9.service"], - "RISING": ["present-deassert@mtia-blade-9.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE10_N", - "ChipId": "2", - "GpioNum": 20, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-10.service"], - "RISING": ["present-deassert@mtia-blade-10.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE11_N", - "ChipId": "2", - "GpioNum": 22, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-11.service"], - "RISING": ["present-deassert@mtia-blade-11.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE12_N", - "ChipId": "2", - "GpioNum": 24, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-12.service"], - "RISING": ["present-deassert@mtia-blade-12.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE13_N", - "ChipId": "2", - "GpioNum": 26, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-13.service"], - "RISING": ["present-deassert@mtia-blade-13.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE14_N", - "ChipId": "2", - "GpioNum": 28, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-14.service"], - "RISING": ["present-deassert@mtia-blade-14.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_MTIA_BLADE15_N", - "ChipId": "2", - "GpioNum": 30, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@mtia-blade-15.service"], - "RISING": ["present-deassert@mtia-blade-15.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE0_N", - "ChipId": "2", - "GpioNum": 32, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-0.service"], - "RISING": ["present-deassert@network-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE1_N", - "ChipId": "2", - "GpioNum": 34, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-1.service"], - "RISING": ["present-deassert@network-blade-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE2_N", - "ChipId": "2", - "GpioNum": 36, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-2.service"], - "RISING": ["present-deassert@network-blade-2.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE3_N", - "ChipId": "2", - "GpioNum": 38, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-3.service"], - "RISING": ["present-deassert@network-blade-3.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE4_N", - "ChipId": "2", - "GpioNum": 40, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-4.service"], - "RISING": ["present-deassert@network-blade-4.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_NW_BLADE5_N", - "ChipId": "2", - "GpioNum": 42, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@network-blade-5.service"], - "RISING": ["present-deassert@network-blade-5.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_TOP_0_N", - "ChipId": "2", - "GpioNum": 44, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-top-0.service"], - "RISING": ["present-deassert@fcb-top-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_TOP_1_N", - "ChipId": "2", - "GpioNum": 46, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-top-1.service"], - "RISING": ["present-deassert@fcb-top-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_MIDDLE_0_N", - "ChipId": "2", - "GpioNum": 48, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-mid-0.service"], - "RISING": ["present-deassert@fcb-mid-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_MIDDLE_1_N", - "ChipId": "2", - "GpioNum": 50, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-mid-1.service"], - "RISING": ["present-deassert@fcb-mid-1.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_BOTTOM_0_N", - "ChipId": "2", - "GpioNum": 52, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-bot-0.service"], - "RISING": ["present-deassert@fcb-bot-0.service"] - }, - "Continue": true - }, - { - "Name": "PRSNT_FCB_BOTTOM_1_N", - "ChipId": "2", - "GpioNum": 54, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["present-assert@fcb-bot-1.service"], - "RISING": ["present-deassert@fcb-bot-1.service"] - }, - "Continue": true - }, - { - "Name": "PWRGD_MTIA_BLADE0_PWROK", + "Name": "PWRGD_MTIA_BLADE0_PWROK_N", "ChipId": "2", "GpioNum": 56, "EventMon": "BOTH", @@ -319,7 +11,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE1_PWROK", + "Name": "PWRGD_MTIA_BLADE1_PWROK_N", "ChipId": "2", "GpioNum": 58, "EventMon": "BOTH", @@ -330,7 +22,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE2_PWROK", + "Name": "PWRGD_MTIA_BLADE2_PWROK_N", "ChipId": "2", "GpioNum": 60, "EventMon": "BOTH", @@ -341,7 +33,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE3_PWROK", + "Name": "PWRGD_MTIA_BLADE3_PWROK_N", "ChipId": "2", "GpioNum": 62, "EventMon": "BOTH", @@ -352,7 +44,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE4_PWROK", + "Name": "PWRGD_MTIA_BLADE4_PWROK_N", "ChipId": "2", "GpioNum": 64, "EventMon": "BOTH", @@ -363,7 +55,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE5_PWROK", + "Name": "PWRGD_MTIA_BLADE5_PWROK_N", "ChipId": "2", "GpioNum": 66, "EventMon": "BOTH", @@ -374,7 +66,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE6_PWROK", + "Name": "PWRGD_MTIA_BLADE6_PWROK_N", "ChipId": "2", "GpioNum": 68, "EventMon": "BOTH", @@ -385,7 +77,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE7_PWROK", + "Name": "PWRGD_MTIA_BLADE7_PWROK_N", "ChipId": "2", "GpioNum": 70, "EventMon": "BOTH", @@ -396,7 +88,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE8_PWROK", + "Name": "PWRGD_MTIA_BLADE8_PWROK_N", "ChipId": "2", "GpioNum": 72, "EventMon": "BOTH", @@ -407,7 +99,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE9_PWROK", + "Name": "PWRGD_MTIA_BLADE9_PWROK_N", "ChipId": "2", "GpioNum": 74, "EventMon": "BOTH", @@ -418,7 +110,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE10_PWROK", + "Name": "PWRGD_MTIA_BLADE10_PWROK_N", "ChipId": "2", "GpioNum": 76, "EventMon": "BOTH", @@ -429,7 +121,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE11_PWROK", + "Name": "PWRGD_MTIA_BLADE11_PWROK_N", "ChipId": "2", "GpioNum": 78, "EventMon": "BOTH", @@ -440,7 +132,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE12_PWROK", + "Name": "PWRGD_MTIA_BLADE12_PWROK_N", "ChipId": "2", "GpioNum": 80, "EventMon": "BOTH", @@ -451,7 +143,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE13_PWROK", + "Name": "PWRGD_MTIA_BLADE13_PWROK_N", "ChipId": "2", "GpioNum": 82, "EventMon": "BOTH", @@ -462,7 +154,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE14_PWROK", + "Name": "PWRGD_MTIA_BLADE14_PWROK_N", "ChipId": "2", "GpioNum": 84, "EventMon": "BOTH", @@ -473,7 +165,7 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE15_PWROK", + "Name": "PWRGD_MTIA_BLADE15_PWROK_N", "ChipId": "2", "GpioNum": 86, "EventMon": "BOTH", @@ -484,7 +176,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE0_PWROK", + "Name": "PWRGD_NW_BLADE0_PWROK_N", "ChipId": "2", "GpioNum": 88, "EventMon": "BOTH", @@ -495,7 +187,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE1_PWROK", + "Name": "PWRGD_NW_BLADE1_PWROK_N", "ChipId": "2", "GpioNum": 90, "EventMon": "BOTH", @@ -506,7 +198,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE2_PWROK", + "Name": "PWRGD_NW_BLADE2_PWROK_N", "ChipId": "2", "GpioNum": 92, "EventMon": "BOTH", @@ -517,7 +209,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE3_PWROK", + "Name": "PWRGD_NW_BLADE3_PWROK_N", "ChipId": "2", "GpioNum": 94, "EventMon": "BOTH", @@ -528,7 +220,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE4_PWROK", + "Name": "PWRGD_NW_BLADE4_PWROK_N", "ChipId": "2", "GpioNum": 96, "EventMon": "BOTH", @@ -539,7 +231,7 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE5_PWROK", + "Name": "PWRGD_NW_BLADE5_PWROK_N", "ChipId": "2", "GpioNum": 98, "EventMon": "BOTH", @@ -550,7 +242,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_TOP_0_PWROK", + "Name": "PWRGD_FCB_TOP_0_PWROK_N", "ChipId": "2", "GpioNum": 100, "EventMon": "BOTH", @@ -561,7 +253,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_TOP_1_PWROK", + "Name": "PWRGD_FCB_TOP_1_PWROK_N", "ChipId": "2", "GpioNum": 102, "EventMon": "BOTH", @@ -572,7 +264,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_0_PWROK", + "Name": "PWRGD_FCB_MIDDLE_0_PWROK_N", "ChipId": "2", "GpioNum": 104, "EventMon": "BOTH", @@ -583,7 +275,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_1_PWROK", + "Name": "PWRGD_FCB_MIDDLE_1_PWROK_N", "ChipId": "2", "GpioNum": 106, "EventMon": "BOTH", @@ -594,7 +286,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_0_PWROK", + "Name": "PWRGD_FCB_BOTTOM_0_PWROK_N", "ChipId": "2", "GpioNum": 108, "EventMon": "BOTH", @@ -605,7 +297,7 @@ "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_1_PWROK", + "Name": "PWRGD_FCB_BOTTOM_1_PWROK_N", "ChipId": "2", "GpioNum": 110, "EventMon": "BOTH", @@ -1105,74 +797,41 @@ "GpioNum": 200, "EventMon": "BOTH", "Targets": { - "FALLING": ["rpu-ready-deassert.service"], - "RISING": ["rpu-ready-assert.service"] - }, - "Continue": true - }, - { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N", - "ChipId": "2", - "GpioNum": 224, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-top.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-top.service"] - }, - "Continue": true - }, - { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N", - "ChipId": "2", - "GpioNum": 222, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-bot.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-bot.service"] - }, - "Continue": true - }, - { - "Name": "BOT_BCB_CABLE_PRSNT_N", - "ChipId": "2", - "GpioNum": 226, - "EventMon": "BOTH", - "Targets": { - "FALLING": ["cable-present-assert@bcb-bot.service"], - "RISING": ["cable-present-deassert@bcb-bot.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready.service"], + "RISING": ["rpu-ready-assert@rpu_ready.service"] }, "Continue": true }, { - "Name": "TOP_BCB_CABLE_PRSNT_N", + "Name": "RPU_READY_SPARE", "ChipId": "2", - "GpioNum": 228, + "GpioNum": 246, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@bcb-top.service"], - "RISING": ["cable-present-deassert@bcb-top.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready_spare.service"], + "RISING": ["rpu-ready-assert@rpu_ready_spare.service"] }, "Continue": true }, { - "Name": "CR_TOGGLE_BOOT_N", + "Name": "CHASSIS_LEAK0_DETECT_N", "ChipId": "2", - "GpioNum": 216, + "GpioNum": 234, "EventMon": "BOTH", "Targets": { - "FALLING": ["present-assert@cmm-blade-toggle-switch.service"], - "RISING": ["present-deassert@cmm-blade-toggle-switch.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-0.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-0.service"] }, "Continue": true }, { - "Name": "MGMT_SFP_PRSNT_N", + "Name": "CHASSIS_LEAK1_DETECT_N", "ChipId": "2", - "GpioNum": 238, + "GpioNum": 236, "EventMon": "BOTH", "Targets": { - "FALLING": ["sfp-present-assert.service"], - "RISING": ["sfp-present-deassert.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-1.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-1.service"] }, "Continue": true } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json new file mode 100644 index 0000000000..a977392cf0 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json @@ -0,0 +1,233 @@ +[ + { + "Name": "PRSNT_MTIA_BLADE0", + "LineName": "PRSNT_MTIA_BLADE0_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE0" + }, + { + "Name": "PRSNT_MTIA_BLADE1", + "LineName": "PRSNT_MTIA_BLADE1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE1" + }, + { + "Name": "PRSNT_MTIA_BLADE2", + "LineName": "PRSNT_MTIA_BLADE2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE2" + }, + { + "Name": "PRSNT_MTIA_BLADE3", + "LineName": "PRSNT_MTIA_BLADE3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE3" + }, + { + "Name": "PRSNT_MTIA_BLADE4", + "LineName": "PRSNT_MTIA_BLADE4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE4" + }, + { + "Name": "PRSNT_MTIA_BLADE5", + "LineName": "PRSNT_MTIA_BLADE5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE5" + }, + { + "Name": "PRSNT_MTIA_BLADE6", + "LineName": "PRSNT_MTIA_BLADE6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE6" + }, + { + "Name": "PRSNT_MTIA_BLADE7", + "LineName": "PRSNT_MTIA_BLADE7_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE7" + }, + { + "Name": "PRSNT_MTIA_BLADE8", + "LineName": "PRSNT_MTIA_BLADE8_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE8" + }, + { + "Name": "PRSNT_MTIA_BLADE9", + "LineName": "PRSNT_MTIA_BLADE9_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE9" + }, + { + "Name": "PRSNT_MTIA_BLADE10", + "LineName": "PRSNT_MTIA_BLADE10_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE10" + }, + { + "Name": "PRSNT_MTIA_BLADE11", + "LineName": "PRSNT_MTIA_BLADE11_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE11" + }, + { + "Name": "PRSNT_MTIA_BLADE12", + "LineName": "PRSNT_MTIA_BLADE12_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE12" + }, + { + "Name": "PRSNT_MTIA_BLADE13", + "LineName": "PRSNT_MTIA_BLADE13_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE13" + }, + { + "Name": "PRSNT_MTIA_BLADE14", + "LineName": "PRSNT_MTIA_BLADE14_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE14" + }, + { + "Name": "PRSNT_MTIA_BLADE15", + "LineName": "PRSNT_MTIA_BLADE15_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE15" + }, + { + "Name": "PRSNT_NW_BLADE0", + "LineName": "PRSNT_NW_BLADE0_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE0" + }, + { + "Name": "PRSNT_NW_BLADE1", + "LineName": "PRSNT_NW_BLADE1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE1" + }, + { + "Name": "PRSNT_NW_BLADE2", + "LineName": "PRSNT_NW_BLADE2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE2" + }, + { + "Name": "PRSNT_NW_BLADE3", + "LineName": "PRSNT_NW_BLADE3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE3" + }, + { + "Name": "PRSNT_NW_BLADE4", + "LineName": "PRSNT_NW_BLADE4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE4" + }, + { + "Name": "PRSNT_NW_BLADE5", + "LineName": "PRSNT_NW_BLADE5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE5" + }, + { + "Name": "PRSNT_FCB_TOP_0", + "LineName": "PRSNT_FCB_TOP_0_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_TOP_0" + }, + { + "Name": "PRSNT_FCB_TOP_1", + "LineName": "PRSNT_FCB_TOP_1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_TOP_1" + }, + { + "Name": "PRSNT_FCB_MIDDLE_0", + "LineName": "PRSNT_FCB_MIDDLE_0_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_MIDDLE_0" + }, + { + "Name": "PRSNT_FCB_MIDDLE_1", + "LineName": "PRSNT_FCB_MIDDLE_1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_MIDDLE_1" + }, + { + "Name": "PRSNT_FCB_BOTTOM_0", + "LineName": "PRSNT_FCB_BOTTOM_0_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_BOTTOM_0" + }, + { + "Name": "PRSNT_FCB_BOTTOM_1", + "LineName": "PRSNT_FCB_BOTTOM_1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_BOTTOM_1" + }, + { + "Name": "PRSNT_CABLE_CARTRIDGE_TOP", + "LineName": "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_CABLE_CARTRIDGE_TOP" + }, + { + "Name": "PRSNT_CABLE_CARTRIDGE_BOT", + "LineName": "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_CABLE_CARTRIDGE_BOT" + }, + { + "Name": "PRSNT_BCB_CABLE_BOT", + "LineName": "BOT_BCB_CABLE_PRSNT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_BCB_CABLE_BOT" + }, + { + "Name": "PRSNT_BCB_CABLE_TOP", + "LineName": "TOP_BCB_CABLE_PRSNT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_BCB_CABLE_TOP" + }, + { + "Name": "CR_TOGGLE_BOOT", + "LineName": "CR_TOGGLE_BOOT_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/CR_TOGGLE_BOOT" + } +] diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service deleted file mode 100644 index 3f35e55e8d..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-assert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i present assert" "BLADE" "%i" -SyslogIdentifier=%i-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service deleted file mode 100644 index f9b8d3e2dc..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/present-deassert@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=%i Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i present deassert" "BLADE" "%i" -SyslogIdentifier=%i-present-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service index 19d8811fbb..ef953dcfe6 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service @@ -1,7 +1,7 @@ [Unit] -Description=RPU ready Assert +Description=%i Assert [Service] Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready assert" "AALC" "RPU" +ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i assert" "AALC" "%i" SyslogIdentifier=rpu-ready-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service index b028e03340..d15562570a 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service @@ -1,7 +1,7 @@ [Unit] -Description=RPU ready Deassert +Description=%i Deassert [Service] Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready deassert" "AALC" "RPU" +ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "%i deassert" "AALC" "%i" SyslogIdentifier=rpu-ready-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service deleted file mode 100644 index 5388faa566..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-assert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=MGMT SFP Present Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/sfp-present-check 0 -SyslogIdentifier=sfp-present-assert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check deleted file mode 100644 index 980ee43248..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-check +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions -source /usr/libexec/minerva-common-functions - -if [ "$1" == "0" ]; then - set_gpio MGMT_SFP_TX_DIS 0 -else - set_gpio MGMT_SFP_TX_DIS 1 -fi diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service deleted file mode 100644 index 875c0a99c4..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/sfp-present-deassert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=MGMT SFP Present Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/sfp-present-check 1 -SyslogIdentifier=sfp-present-deassert diff --git a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index cc6c54c42d..13cb35980a 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,18 +2,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd systemd -SERVICE_LIST = "present-assert@.service \ - present-deassert@.service \ - power-good-assert@.service \ +SERVICE_LIST = "power-good-assert@.service \ power-good-deassert@.service \ leak-detect-assert@.service \ leak-detect-deassert@.service \ rpu-ready-assert.service \ rpu-ready-deassert.service \ - cable-present-assert@.service \ - cable-present-deassert@.service \ - sfp-present-assert.service \ - sfp-present-deassert.service \ ac-power-good-assert@.service \ ac-power-good-deassert@.service \ " @@ -21,8 +15,8 @@ SERVICE_LIST = "present-assert@.service \ SERVICE_FILE_FMT = "file://{0}" SRC_URI += "file://minerva-phosphor-multi-gpio-monitor.json \ + file://minerva-phosphor-multi-gpio-presence.json \ file://logging \ - file://sfp-present-check \ ${@compose_list(d, 'SERVICE_FILE_FMT', 'SERVICE_LIST')} \ " @@ -38,6 +32,8 @@ do_install:append:() { install -d ${D}${datadir}/phosphor-gpio-monitor install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-monitor.json \ ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json + install -m 0644 ${WORKDIR}/minerva-phosphor-multi-gpio-presence.json \ + ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-presence.json for s in ${SERVICE_LIST} do @@ -46,5 +42,4 @@ do_install:append:() { install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/logging ${D}${libexecdir}/${PN}/ - install -m 0755 ${WORKDIR}/sfp-present-check ${D}${libexecdir}/${PN}/ } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc index 58c3a46db6..fa5d83d45d 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc +++ b/meta-facebook/meta-minerva/recipes-phosphor/images/fb-minerva-phosphor-image.inc @@ -5,6 +5,11 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-gpio-monitor \ " +# Monitor gpio presence status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-gpio-monitor-presence \ +" + # Temporarily add plat-svc for gpio initialization OBMC_IMAGE_EXTRA_INSTALL:append = " \ plat-svc \ |