diff options
Diffstat (limited to 'meta-facebook/meta-minerva/recipes-phosphor')
25 files changed, 629 insertions, 605 deletions
diff --git a/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json new file mode 100644 index 0000000000..8ece28787f --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager/blacklist.json @@ -0,0 +1,28 @@ +{ + "buses": [ + { + "bus": 16, + "addresses": [ "0x51"] + }, + { + "bus": 17, + "addresses": [ "0x51"] + }, + { + "bus": 18, + "addresses": [ "0x51"] + }, + { + "bus": 19, + "addresses": [ "0x51"] + }, + { + "bus": 20, + "addresses": [ "0x51"] + }, + { + "bus": 21, + "addresses": [ "0x51"] + } + ] +} diff --git a/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend new file mode 100644 index 0000000000..26e599094c --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd systemd + +SRC_URI += "\ + file://blacklist.json \ + " + +do_install:append() { + install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json +} diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules index 2b236f7be6..9f39f460c8 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/80-minerva-obmc-console-uart.rules @@ -1 +1,5 @@ SUBSYSTEM=="tty", ATTRS{iomem_base}=="0x1E790000", ENV{SYSTEMD_WANTS}="obmc-console@ttyS5", TAG+="systemd" +SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="03", SYMLINK+="ttyPOE" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="02", SYMLINK+="ttyRS485-1" +SUBSYSTEM=="tty", ATTRS{bInterfaceNumber}=="01", SYMLINK+="ttyRS485-0" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux deleted file mode 100644 index f2038364d1..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/select-uart-mux +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -e -# shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions -# Select UART Mux: UART Mux for switching between MTIA blade 0~15 -# Usage: select-uart-mux <0-15> -source /usr/libexec/minerva-common-functions - -convert_decimal_to_binary() { - decimal=$1 - - binary="" - for ((i = 3; i >= 0; i--)); do - bit=$(( (decimal >> i) & 1 )) - binary="${binary}${bit}" - done - - echo "$binary" -} - -uart_mux_select() -{ - local BLADE_INDEX=$1 - - if ((BLADE_INDEX >= 0)) && ((BLADE_INDEX < 16)); then - BINARY_INDEX=$(convert_decimal_to_binary "$BLADE_INDEX") - - set_gpio BLADE_UART_SEL0 "${BINARY_INDEX:3:1}" - set_gpio BLADE_UART_SEL1 "${BINARY_INDEX:2:1}" - set_gpio BLADE_UART_SEL2 "${BINARY_INDEX:1:1}" - set_gpio BLADE_UART_SEL3 "${BINARY_INDEX:0:1}" - else - logger -p user.info "uart_mux_select: unknow blade index ($BLADE_INDEX)" - return 1 - fi - - return 0 -} - -BLADE_INDEX=$1 -uart_mux_select "$BLADE_INDEX" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf index 85cb7a43e0..3971b24aab 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf @@ -1,4 +1,67 @@ -local-tty = ttyS5 +mux-gpios = BLADE_UART_SEL0,BLADE_UART_SEL1,BLADE_UART_SEL2,BLADE_UART_SEL3 baud = 57600 -console-id = compute-blade -logfile = /var/log/obmc-console-compute-blade.log +console-id = ttyS5 + +[compute_blade_1] +mux-index = 0 +logfile = /var/log/obmc-console-compute_blade_1.log + +[compute_blade_2] +mux-index = 1 +logfile = /var/log/obmc-console-compute_blade_2.log + +[compute_blade_3] +mux-index = 2 +logfile = /var/log/obmc-console-compute_blade_3.log + +[compute_blade_4] +mux-index = 3 +logfile = /var/log/obmc-console-compute_blade_4.log + +[compute_blade_5] +mux-index = 4 +logfile = /var/log/obmc-console-compute_blade_5.log + +[compute_blade_6] +mux-index = 5 +logfile = /var/log/obmc-console-compute_blade_6.log + +[compute_blade_7] +mux-index = 6 +logfile = /var/log/obmc-console-compute_blade_7.log + +[compute_blade_8] +mux-index = 7 +logfile = /var/log/obmc-console-compute_blade_8.log + +[compute_blade_9] +mux-index = 8 +logfile = /var/log/obmc-console-compute_blade_9.log + +[compute_blade_10] +mux-index = 9 +logfile = /var/log/obmc-console-compute_blade_10.log + +[compute_blade_11] +mux-index = 10 +logfile = /var/log/obmc-console-compute_blade_11.log + +[compute_blade_12] +mux-index = 11 +logfile = /var/log/obmc-console-compute_blade_12.log + +[compute_blade_13] +mux-index = 12 +logfile = /var/log/obmc-console-compute_blade_13.log + +[compute_blade_14] +mux-index = 13 +logfile = /var/log/obmc-console-compute_blade_14.log + +[compute_blade_15] +mux-index = 14 +logfile = /var/log/obmc-console-compute_blade_15.log + +[compute_blade_16] +mux-index = 15 +logfile = /var/log/obmc-console-compute_blade_16.log diff --git a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend index f60b2d646d..0d969220da 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console_%.bbappend @@ -6,7 +6,6 @@ OBMC_CONSOLE_TTYS:fb-nohost:append = " ttyS5" SRC_URI:append = " \ file://80-minerva-obmc-console-uart.rules \ - file://select-uart-mux \ " RDEPENDS:${PN}:append = " bash" @@ -17,7 +16,4 @@ do_install:append() { install -d ${D}/${nonarch_base_libdir}/udev/rules.d rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules install -m 0644 ${WORKDIR}/80-minerva-obmc-console-uart.rules ${D}/${nonarch_base_libdir}/udev/rules.d - - # Install script for selecting uart mux - install -m 0744 ${WORKDIR}/select-uart-mux ${D}${bindir} } 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..29d11ab7fe 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,338 +1,19 @@ [ { - "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_BLADE1_PWROK_N", "ChipId": "2", "GpioNum": 56, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@mtia-blade-0.service"], - "RISING": ["power-good-deassert@mtia-blade-0.service"] - }, - "Continue": true - }, - { - "Name": "PWRGD_MTIA_BLADE1_PWROK", - "ChipId": "2", - "GpioNum": 58, - "EventMon": "BOTH", - "Targets": { "FALLING": ["power-good-assert@mtia-blade-1.service"], "RISING": ["power-good-deassert@mtia-blade-1.service"] }, "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE2_PWROK", + "Name": "PWRGD_MTIA_BLADE2_PWROK_N", "ChipId": "2", - "GpioNum": 60, + "GpioNum": 58, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-2.service"], @@ -341,9 +22,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE3_PWROK", + "Name": "PWRGD_MTIA_BLADE3_PWROK_N", "ChipId": "2", - "GpioNum": 62, + "GpioNum": 60, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-3.service"], @@ -352,9 +33,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE4_PWROK", + "Name": "PWRGD_MTIA_BLADE4_PWROK_N", "ChipId": "2", - "GpioNum": 64, + "GpioNum": 62, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-4.service"], @@ -363,9 +44,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE5_PWROK", + "Name": "PWRGD_MTIA_BLADE5_PWROK_N", "ChipId": "2", - "GpioNum": 66, + "GpioNum": 64, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-5.service"], @@ -374,9 +55,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE6_PWROK", + "Name": "PWRGD_MTIA_BLADE6_PWROK_N", "ChipId": "2", - "GpioNum": 68, + "GpioNum": 66, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-6.service"], @@ -385,9 +66,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE7_PWROK", + "Name": "PWRGD_MTIA_BLADE7_PWROK_N", "ChipId": "2", - "GpioNum": 70, + "GpioNum": 68, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-7.service"], @@ -396,9 +77,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE8_PWROK", + "Name": "PWRGD_MTIA_BLADE8_PWROK_N", "ChipId": "2", - "GpioNum": 72, + "GpioNum": 70, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-8.service"], @@ -407,9 +88,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE9_PWROK", + "Name": "PWRGD_MTIA_BLADE9_PWROK_N", "ChipId": "2", - "GpioNum": 74, + "GpioNum": 72, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-9.service"], @@ -418,9 +99,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE10_PWROK", + "Name": "PWRGD_MTIA_BLADE10_PWROK_N", "ChipId": "2", - "GpioNum": 76, + "GpioNum": 74, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-10.service"], @@ -429,9 +110,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE11_PWROK", + "Name": "PWRGD_MTIA_BLADE11_PWROK_N", "ChipId": "2", - "GpioNum": 78, + "GpioNum": 76, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-11.service"], @@ -440,9 +121,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE12_PWROK", + "Name": "PWRGD_MTIA_BLADE12_PWROK_N", "ChipId": "2", - "GpioNum": 80, + "GpioNum": 78, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-12.service"], @@ -451,9 +132,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE13_PWROK", + "Name": "PWRGD_MTIA_BLADE13_PWROK_N", "ChipId": "2", - "GpioNum": 82, + "GpioNum": 80, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-13.service"], @@ -462,9 +143,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE14_PWROK", + "Name": "PWRGD_MTIA_BLADE14_PWROK_N", "ChipId": "2", - "GpioNum": 84, + "GpioNum": 82, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-14.service"], @@ -473,9 +154,9 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE15_PWROK", + "Name": "PWRGD_MTIA_BLADE15_PWROK_N", "ChipId": "2", - "GpioNum": 86, + "GpioNum": 84, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@mtia-blade-15.service"], @@ -484,20 +165,20 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE0_PWROK", + "Name": "PWRGD_MTIA_BLADE16_PWROK_N", "ChipId": "2", - "GpioNum": 88, + "GpioNum": 86, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@network-blade-0.service"], - "RISING": ["power-good-deassert@network-blade-0.service"] + "FALLING": ["power-good-assert@mtia-blade-16.service"], + "RISING": ["power-good-deassert@mtia-blade-16.service"] }, "Continue": true }, { - "Name": "PWRGD_NW_BLADE1_PWROK", + "Name": "PWRGD_NW_BLADE1_PWROK_N", "ChipId": "2", - "GpioNum": 90, + "GpioNum": 88, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-1.service"], @@ -506,9 +187,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE2_PWROK", + "Name": "PWRGD_NW_BLADE2_PWROK_N", "ChipId": "2", - "GpioNum": 92, + "GpioNum": 90, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-2.service"], @@ -517,9 +198,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE3_PWROK", + "Name": "PWRGD_NW_BLADE3_PWROK_N", "ChipId": "2", - "GpioNum": 94, + "GpioNum": 92, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-3.service"], @@ -528,9 +209,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE4_PWROK", + "Name": "PWRGD_NW_BLADE4_PWROK_N", "ChipId": "2", - "GpioNum": 96, + "GpioNum": 94, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-4.service"], @@ -539,9 +220,9 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE5_PWROK", + "Name": "PWRGD_NW_BLADE5_PWROK_N", "ChipId": "2", - "GpioNum": 98, + "GpioNum": 96, "EventMon": "BOTH", "Targets": { "FALLING": ["power-good-assert@network-blade-5.service"], @@ -550,86 +231,86 @@ "Continue": true }, { - "Name": "PWRGD_FCB_TOP_0_PWROK", + "Name": "PWRGD_NW_BLADE6_PWROK_N", "ChipId": "2", - "GpioNum": 100, + "GpioNum": 98, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-top-0.service"], - "RISING": ["power-good-deassert@fcb-top-0.service"] + "FALLING": ["power-good-assert@network-blade-6.service"], + "RISING": ["power-good-deassert@network-blade-6.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_TOP_1_PWROK", + "Name": "PWRGD_FCB_1_N", "ChipId": "2", - "GpioNum": 102, + "GpioNum": 100, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-top-1.service"], - "RISING": ["power-good-deassert@fcb-top-1.service"] + "FALLING": ["power-good-assert@fcb-1.service"], + "RISING": ["power-good-deassert@fcb-1.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_0_PWROK", + "Name": "PWRGD_FCB_2_N", "ChipId": "2", - "GpioNum": 104, + "GpioNum": 102, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-mid-0.service"], - "RISING": ["power-good-deassert@fcb-mid-0.service"] + "FALLING": ["power-good-assert@fcb-2.service"], + "RISING": ["power-good-deassert@fcb-2.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_MIDDLE_1_PWROK", + "Name": "PWRGD_FCB_3_N", "ChipId": "2", - "GpioNum": 106, + "GpioNum": 104, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-mid-1.service"], - "RISING": ["power-good-deassert@fcb-mid-1.service"] + "FALLING": ["power-good-assert@fcb-3.service"], + "RISING": ["power-good-deassert@fcb-3.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_0_PWROK", + "Name": "PWRGD_FCB_4_N", "ChipId": "2", - "GpioNum": 108, + "GpioNum": 106, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-bot-0.service"], - "RISING": ["power-good-deassert@fcb-bot-0.service"] + "FALLING": ["power-good-assert@fcb-4.service"], + "RISING": ["power-good-deassert@fcb-4.service"] }, "Continue": true }, { - "Name": "PWRGD_FCB_BOTTOM_1_PWROK", + "Name": "PWRGD_FCB_6_N", "ChipId": "2", - "GpioNum": 110, + "GpioNum": 108, "EventMon": "BOTH", "Targets": { - "FALLING": ["power-good-assert@fcb-bot-1.service"], - "RISING": ["power-good-deassert@fcb-bot-1.service"] + "FALLING": ["power-good-assert@fcb-6.service"], + "RISING": ["power-good-deassert@fcb-6.service"] }, "Continue": true }, { - "Name": "LEAK_DETECT_MTIA_BLADE0_N", + "Name": "PWRGD_FCB_5_N", "ChipId": "2", - "GpioNum": 112, + "GpioNum": 110, "EventMon": "BOTH", "Targets": { - "FALLING": ["leak-detect-assert@mtia-blade-0.service"], - "RISING": ["leak-detect-deassert@mtia-blade-0.service"] + "FALLING": ["power-good-assert@fcb-5.service"], + "RISING": ["power-good-deassert@fcb-5.service"] }, "Continue": true }, { "Name": "LEAK_DETECT_MTIA_BLADE1_N", "ChipId": "2", - "GpioNum": 114, + "GpioNum": 112, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-1.service"], @@ -640,7 +321,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE2_N", "ChipId": "2", - "GpioNum": 116, + "GpioNum": 114, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-2.service"], @@ -651,7 +332,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE3_N", "ChipId": "2", - "GpioNum": 118, + "GpioNum": 116, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-3.service"], @@ -662,7 +343,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE4_N", "ChipId": "2", - "GpioNum": 120, + "GpioNum": 118, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-4.service"], @@ -673,7 +354,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE5_N", "ChipId": "2", - "GpioNum": 122, + "GpioNum": 120, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-5.service"], @@ -684,7 +365,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE6_N", "ChipId": "2", - "GpioNum": 124, + "GpioNum": 122, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-6.service"], @@ -695,7 +376,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE7_N", "ChipId": "2", - "GpioNum": 126, + "GpioNum": 124, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-7.service"], @@ -706,7 +387,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE8_N", "ChipId": "2", - "GpioNum": 128, + "GpioNum": 126, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-8.service"], @@ -717,7 +398,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE9_N", "ChipId": "2", - "GpioNum": 130, + "GpioNum": 128, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-9.service"], @@ -728,7 +409,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE10_N", "ChipId": "2", - "GpioNum": 132, + "GpioNum": 130, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-10.service"], @@ -739,7 +420,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE11_N", "ChipId": "2", - "GpioNum": 134, + "GpioNum": 132, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-11.service"], @@ -750,7 +431,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE12_N", "ChipId": "2", - "GpioNum": 136, + "GpioNum": 134, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-12.service"], @@ -761,7 +442,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE13_N", "ChipId": "2", - "GpioNum": 138, + "GpioNum": 136, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-13.service"], @@ -772,7 +453,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE14_N", "ChipId": "2", - "GpioNum": 140, + "GpioNum": 138, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-14.service"], @@ -783,7 +464,7 @@ { "Name": "LEAK_DETECT_MTIA_BLADE15_N", "ChipId": "2", - "GpioNum": 142, + "GpioNum": 140, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@mtia-blade-15.service"], @@ -792,20 +473,20 @@ "Continue": true }, { - "Name": "LEAK_DETECT_NW_BLADE0_N", + "Name": "LEAK_DETECT_MTIA_BLADE16_N", "ChipId": "2", - "GpioNum": 144, + "GpioNum": 142, "EventMon": "BOTH", "Targets": { - "FALLING": ["leak-detect-assert@network-blade-0.service"], - "RISING": ["leak-detect-deassert@network-blade-0.service"] + "FALLING": ["leak-detect-assert@mtia-blade-16.service"], + "RISING": ["leak-detect-deassert@mtia-blade-16.service"] }, "Continue": true }, { "Name": "LEAK_DETECT_NW_BLADE1_N", "ChipId": "2", - "GpioNum": 146, + "GpioNum": 144, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-1.service"], @@ -816,7 +497,7 @@ { "Name": "LEAK_DETECT_NW_BLADE2_N", "ChipId": "2", - "GpioNum": 148, + "GpioNum": 146, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-2.service"], @@ -827,7 +508,7 @@ { "Name": "LEAK_DETECT_NW_BLADE3_N", "ChipId": "2", - "GpioNum": 150, + "GpioNum": 148, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-3.service"], @@ -838,7 +519,7 @@ { "Name": "LEAK_DETECT_NW_BLADE4_N", "ChipId": "2", - "GpioNum": 152, + "GpioNum": 150, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-4.service"], @@ -849,7 +530,7 @@ { "Name": "LEAK_DETECT_NW_BLADE5_N", "ChipId": "2", - "GpioNum": 154, + "GpioNum": 152, "EventMon": "BOTH", "Targets": { "FALLING": ["leak-detect-assert@network-blade-5.service"], @@ -858,20 +539,20 @@ "Continue": true }, { - "Name": "PWRGD_MTIA_BLADE0_HSC_PWROK_N", + "Name": "LEAK_DETECT_NW_BLADE6_N", "ChipId": "2", - "GpioNum": 156, + "GpioNum": 154, "EventMon": "BOTH", "Targets": { - "FALLING": ["ac-power-good-assert@mtia-blade-0.service"], - "RISING": ["ac-power-good-deassert@mtia-blade-0.service"] + "FALLING": ["leak-detect-assert@network-blade-6.service"], + "RISING": ["leak-detect-deassert@network-blade-6.service"] }, "Continue": true }, { "Name": "PWRGD_MTIA_BLADE1_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 158, + "GpioNum": 156, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-1.service"], @@ -882,7 +563,7 @@ { "Name": "PWRGD_MTIA_BLADE2_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 160, + "GpioNum": 158, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-2.service"], @@ -893,7 +574,7 @@ { "Name": "PWRGD_MTIA_BLADE3_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 162, + "GpioNum": 160, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-3.service"], @@ -904,7 +585,7 @@ { "Name": "PWRGD_MTIA_BLADE4_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 164, + "GpioNum": 162, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-4.service"], @@ -915,7 +596,7 @@ { "Name": "PWRGD_MTIA_BLADE5_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 166, + "GpioNum": 164, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-5.service"], @@ -926,7 +607,7 @@ { "Name": "PWRGD_MTIA_BLADE6_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 168, + "GpioNum": 166, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-6.service"], @@ -937,7 +618,7 @@ { "Name": "PWRGD_MTIA_BLADE7_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 170, + "GpioNum": 168, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-7.service"], @@ -948,7 +629,7 @@ { "Name": "PWRGD_MTIA_BLADE8_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 172, + "GpioNum": 170, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-8.service"], @@ -959,7 +640,7 @@ { "Name": "PWRGD_MTIA_BLADE9_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 174, + "GpioNum": 172, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-9.service"], @@ -970,7 +651,7 @@ { "Name": "PWRGD_MTIA_BLADE10_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 176, + "GpioNum": 174, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-10.service"], @@ -981,7 +662,7 @@ { "Name": "PWRGD_MTIA_BLADE11_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 178, + "GpioNum": 176, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-11.service"], @@ -992,7 +673,7 @@ { "Name": "PWRGD_MTIA_BLADE12_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 180, + "GpioNum": 178, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-12.service"], @@ -1003,7 +684,7 @@ { "Name": "PWRGD_MTIA_BLADE13_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 182, + "GpioNum": 180, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-13.service"], @@ -1014,7 +695,7 @@ { "Name": "PWRGD_MTIA_BLADE14_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 184, + "GpioNum": 182, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-14.service"], @@ -1025,7 +706,7 @@ { "Name": "PWRGD_MTIA_BLADE15_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 186, + "GpioNum": 184, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@mtia-blade-15.service"], @@ -1034,20 +715,20 @@ "Continue": true }, { - "Name": "PWRGD_NW_BLADE0_HSC_PWROK_N", + "Name": "PWRGD_MTIA_BLADE16_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 188, + "GpioNum": 186, "EventMon": "BOTH", "Targets": { - "FALLING": ["ac-power-good-assert@network-blade-0.service"], - "RISING": ["ac-power-good-deassert@network-blade-0.service"] + "FALLING": ["ac-power-good-assert@mtia-blade-16.service"], + "RISING": ["ac-power-good-deassert@mtia-blade-16.service"] }, "Continue": true }, { "Name": "PWRGD_NW_BLADE1_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 190, + "GpioNum": 188, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-1.service"], @@ -1058,7 +739,7 @@ { "Name": "PWRGD_NW_BLADE2_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 192, + "GpioNum": 190, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-2.service"], @@ -1069,7 +750,7 @@ { "Name": "PWRGD_NW_BLADE3_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 194, + "GpioNum": 192, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-3.service"], @@ -1080,7 +761,7 @@ { "Name": "PWRGD_NW_BLADE4_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 196, + "GpioNum": 194, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-4.service"], @@ -1091,7 +772,7 @@ { "Name": "PWRGD_NW_BLADE5_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 198, + "GpioNum": 196, "EventMon": "BOTH", "Targets": { "FALLING": ["ac-power-good-assert@network-blade-5.service"], @@ -1100,79 +781,79 @@ "Continue": true }, { - "Name": "RPU_READY", + "Name": "PWRGD_NW_BLADE6_HSC_PWROK_N", "ChipId": "2", - "GpioNum": 200, + "GpioNum": 198, "EventMon": "BOTH", "Targets": { - "FALLING": ["rpu-ready-deassert.service"], - "RISING": ["rpu-ready-assert.service"] + "FALLING": ["ac-power-good-assert@network-blade-6.service"], + "RISING": ["ac-power-good-deassert@network-blade-6.service"] }, "Continue": true }, { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_TOP_N", + "Name": "RPU_READY", "ChipId": "2", - "GpioNum": 224, + "GpioNum": 200, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-top.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-top.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready.service"], + "RISING": ["rpu-ready-assert@rpu_ready.service"] }, "Continue": true }, { - "Name": "CMM_CABLE_CARTRIDGE_PRSNT_BOT_N", + "Name": "RPU_READY_SPARE", "ChipId": "2", - "GpioNum": 222, + "GpioNum": 246, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@cmm-cartridge-bot.service"], - "RISING": ["cable-present-deassert@cmm-cartridge-bot.service"] + "FALLING": ["rpu-ready-deassert@rpu_ready_spare.service"], + "RISING": ["rpu-ready-assert@rpu_ready_spare.service"] }, "Continue": true }, { - "Name": "BOT_BCB_CABLE_PRSNT_N", + "Name": "CHASSIS_LEAK0_DETECT_N", "ChipId": "2", - "GpioNum": 226, + "GpioNum": 234, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@bcb-bot.service"], - "RISING": ["cable-present-deassert@bcb-bot.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-0.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-0.service"] }, "Continue": true }, { - "Name": "TOP_BCB_CABLE_PRSNT_N", + "Name": "CHASSIS_LEAK1_DETECT_N", "ChipId": "2", - "GpioNum": 228, + "GpioNum": 236, "EventMon": "BOTH", "Targets": { - "FALLING": ["cable-present-assert@bcb-top.service"], - "RISING": ["cable-present-deassert@bcb-top.service"] + "FALLING": ["leak-detect-assert@chassis-leak-sensor-1.service"], + "RISING": ["leak-detect-deassert@chassis-leak-sensor-1.service"] }, "Continue": true }, { - "Name": "CR_TOGGLE_BOOT_N", + "Name": "IT_GEAR_LEAK", "ChipId": "2", - "GpioNum": 216, + "GpioNum": 204, "EventMon": "BOTH", "Targets": { - "FALLING": ["present-assert@cmm-blade-toggle-switch.service"], - "RISING": ["present-deassert@cmm-blade-toggle-switch.service"] + "FALLING": ["leak-detect-deassert@it-gear-leak.service"], + "RISING": ["leak-detect-assert@it-gear-leak.service"] }, "Continue": true }, { - "Name": "MGMT_SFP_PRSNT_N", + "Name": "IT_GEAR_LEAK_SPARE", "ChipId": "2", - "GpioNum": 238, + "GpioNum": 248, "EventMon": "BOTH", "Targets": { - "FALLING": ["sfp-present-assert.service"], - "RISING": ["sfp-present-deassert.service"] + "FALLING": ["leak-detect-deassert@it-gear-leak-spare.service"], + "RISING": ["leak-detect-assert@it-gear-leak-spare.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..507fb43b26 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/minerva-phosphor-multi-gpio-presence.json @@ -0,0 +1,247 @@ +[ + { + "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_MTIA_BLADE16", + "LineName": "PRSNT_MTIA_BLADE16_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_MTIA_BLADE16" + }, + { + "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_NW_BLADE6", + "LineName": "PRSNT_NW_BLADE6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_NW_BLADE6" + }, + { + "Name": "PRSNT_FCB_1", + "LineName": "PRSNT_FCB_1_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_1" + }, + { + "Name": "PRSNT_FCB_2", + "LineName": "PRSNT_FCB_2_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_2" + }, + { + "Name": "PRSNT_FCB_3", + "LineName": "PRSNT_FCB_3_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_3" + }, + { + "Name": "PRSNT_FCB_4", + "LineName": "PRSNT_FCB_4_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_4" + }, + { + "Name": "PRSNT_FCB_5", + "LineName": "PRSNT_FCB_5_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_5" + }, + { + "Name": "PRSNT_FCB_6", + "LineName": "PRSNT_FCB_6_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/PRSNT_FCB_6" + }, + { + "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" + }, + { + "Name": "IT_GEAR_RPU_LINK", + "LineName": "IT_GEAR_RPU_LINK_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/IT_GEAR_RPU_LINK" + }, + { + "Name": "IT_GEAR_RPU_LINK_SPARE", + "LineName": "IT_GEAR_RPU_LINK_SPARE_N", + "ActiveLow": true, + "Bias": "DISABLE", + "Inventory": "/system/board/Minerva_CMM/IT_GEAR_RPU_LINK_SPARE" + } +] 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 deleted file mode 100644 index 19d8811fbb..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPU ready Assert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready assert" "AALC" "RPU" -SyslogIdentifier=rpu-ready-assert 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 new file mode 100644 index 0000000000..ef953dcfe6 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-assert@.service @@ -0,0 +1,7 @@ +[Unit] +Description=%i Assert + +[Service] +Type=oneshot +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 deleted file mode 100644 index b028e03340..0000000000 --- a/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPU ready Deassert - -[Service] -Type=oneshot -ExecStart=/usr/libexec/phosphor-gpio-monitor/logging "RPU ready deassert" "AALC" "RPU" -SyslogIdentifier=rpu-ready-deassert 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 new file mode 100644 index 0000000000..d15562570a --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-phosphor/gpio/phosphor-gpio-monitor/rpu-ready-deassert@.service @@ -0,0 +1,7 @@ +[Unit] +Description=%i Deassert + +[Service] +Type=oneshot +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..b8a12fc43e 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 \ + rpu-ready-assert@.service \ + rpu-ready-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 fa5266988d..d6efc962ec 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 \ @@ -31,3 +36,18 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-state-manager \ " + +# Enable mdio-tools for communication with the PHY chip +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + mdio-tools \ +" + +# Monitor the chassis power status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-power-control \ +" + +# Enable mbpoll for communication with the smart valve by modbus command +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + mbpoll \ +" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init b/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init index d9def86a2a..c40e6475bd 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init +++ b/meta-facebook/meta-minerva/recipes-phosphor/initrdscripts/phosphor-static-norootfs-init/99-platform-init @@ -20,4 +20,39 @@ else echo "0" > "$SLOT_FILE" fi +# Below is the diagram of the smart valve implemtation on the CMM. +# There are two end-device for smart valve and two communication interfaces. +# One is Modbus (RS485) interface connected to FT4232H channel 1, 2. +# Anorther is by ethernet interface which is connected to Marvell 88E6369X switch. +# The PoE interface is connected to STM32F + BCM59011 PoE controller (Broadcom solution) for PoE power supply. +# BMC can control the PoE power supply by sending command to STM32F via RS232. +# +# Diagram: +# D_485_x = End device for smart valve x via RS485 +# D_POE_x = End device for smart valve x via PoE +# +# +----------+ +-------------+ +# | FT4232H | <----- USB ----> | BMC | +# +----------+ +-------------+ +# / | \ \ | +# ch0 ch1 ch2 ch3 RMII +# | | | \ | +# X (RS485) RS232 +-------------+ +# / \ \ | Marvell | +# / \ \ | 88E6369X | +#|D_485_0| |D_485_1| |STM32F| +-------------+ +# | | | +# i2c | | +# | | | +# |BCM59011| 1000 Base-T +# | | | +# |(power |(data |(data +# | | | +# P54 POE----->|D_POE_0| |D_POE_1| +POE_DEV="/dev/ttyPOE" +# Set baud rate to 19200 and raw mode +stty -F $POE_DEV 19200 raw +# Send Power Source Configuration Command (0x18) to STM32F for enable PoE +echo -e '\x18\x00\x00\x2c\x01\x00\x00\xff\xff\xff\xff\x41' > $POE_DEV + exit 0 diff --git a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json index 53f6cba7bd..d6e385f5a4 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json +++ b/meta-facebook/meta-minerva/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json @@ -6,6 +6,7 @@ { "Name" : "bmc_heartbeat_amber", "Action" : "Blink", + "Priority" : "Blink", "DutyOn" : 50, "Period" : 1000 } @@ -27,6 +28,7 @@ { "Name": "fp_id_amber", "Action": "Blink", + "Priority" : "Blink", "DutyOn": 50, "Period": 250 } @@ -37,11 +39,13 @@ "members": [ { "Name": "fan_status_led", - "Action": "On" + "Action": "On", + "Priority" : "Blink" }, { "Name": "fan_fault_led_n", - "Action": "On" + "Action": "On", + "Priority" : "Blink" } ] } diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle index deaa7afe5a..ce6e6833d0 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle +++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle @@ -6,8 +6,6 @@ source /usr/libexec/minerva-common-functions # Minerva CMM Sled Power Cycle and Chassis Power Cycle cmm-hsc-power-cycle() { - #TBD: Since there has a 2nd HSC, it is necessary to determine which HSC it is now. - # LTC4287 MFR_REBOOT_CONTROL (FDh) Read/Write # [3]: # REBOOT 0 Write a 1 to reboot. @@ -22,21 +20,49 @@ cmm-hsc-power-cycle() { # 101 18.6 s # 110 37.1 s # 111 74.2 s - i2cset -y -f 0 0x44 0xfd 0x00 - i2cset -y -f 0 0x44 0xfd 0x0b + ret1=$(i2cset -y -f 0 0x44 0xfd 0x00) + ret2=$(i2cset -y -f 0 0x44 0xfd 0x0b) + + # XDP710 RESTART command (0xEC) + ret3=$(i2cset -f -y 0 0x43 0xec) + + if [ "$ret3" -ne 0 ] && { [ "$ret1" -ne 0 ] || [ "$ret2" -ne 0 ]; }; then + return 1 + else + return 0 + fi + } -compute-blade-hsc-power-off() { +compute-blade-hsc-power-control() { + + if [ "$1" == "on" ];then + val=0 + elif [ "$1" == "off" ]; then + val=1 + else + return 1 + fi + for i in {0..15} do - set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" 1 + set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" $val done } -network-blade-hsc-power-off() { - for i in {0..15} +network-blade-hsc-power-control() { + + if [ "$1" == "on" ];then + val=0 + elif [ "$1" == "off" ]; then + val=1 + else + return 1 + fi + + for i in {0..5} do - set_gpio "PWREN_MTIA_BLADE${i}_HSC_EN_N" 1 + set_gpio "PWREN_NW_BLADE${i}_HSC_EN_N" $val done } @@ -50,8 +76,11 @@ elif [ "$1" == 1 ] then echo "Staring CMM Chassis Power Cycle" - compute-blade-hsc-power-off - network-blade-hsc-power-off + compute-blade-hsc-power-control "off" + network-blade-hsc-power-control "off" + sleep 0.2 # 200ms + compute-blade-hsc-power-control "on" + network-blade-hsc-power-control "on" cmm-hsc-power-cycle else echo "Invalid CMM Cycle" diff --git a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 4f8d258055..4ef3a959ed 100644 --- a/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-facebook/meta-minerva/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:append = " host-gpio" CHASSIS_DEFAULT_TARGETS:remove = " \ obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \ |