diff options
194 files changed, 2819 insertions, 4569 deletions
diff --git a/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb index a6291376e0..833c15ec7a 100644 --- a/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/meta-common/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -53,4 +53,5 @@ RDEPENDS_PN_SYSTEM_EXTRAS = "" RDEPENDS_PN_SYSTEM_EXTRAS:amd-withhost = " \ amd-fpga \ phosphor-hostlogger \ + phosphor-watchdog \ " diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service new file mode 100644 index 0000000000..92c0395014 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -0,0 +1,12 @@ +[Unit] +Description=Power Cycle Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=sleep 6 +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service new file mode 100644 index 0000000000..3c87131716 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -0,0 +1,9 @@ +[Unit] +Description=Shutdown Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service new file mode 100644 index 0000000000..671fde6ff7 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -0,0 +1,10 @@ +[Unit] +Description=Reset Host Server +Requires=xyz.openbmc_project.Chassis.Control.Power.service +After=xyz.openbmc_project.Chassis.Control.Power.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +SyslogIdentifier=phosphor-watchdog diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service new file mode 100644 index 0000000000..f7e93b82f2 --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -0,0 +1,16 @@ +[Unit] +Description=Phosphor Watchdog + +[Service] +ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ + --path=/xyz/openbmc_project/watchdog/host0 \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=phosphor-watchdog-host-reset.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=host-phosphor-watchdog-host-poweroff.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=phosphor-watchdog-host-cycle.service \ + +SyslogIdentifier=phosphor-watchdog +BusName =xyz.openbmc_project.Watchdog +Type=dbus + +[Install] +WantedBy=basic.target diff --git a/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 0000000000..7cada9029d --- /dev/null +++ b/meta-amd/meta-common/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" + +# Remove the override to keep service running after DC cycle +SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh index 7c5edbf68c..c24cc4a0be 100755 --- a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh +++ b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/ampere_boot_progress.sh @@ -122,7 +122,7 @@ function set_boot_progress() function log_redfish_biosboot_ok_event() { - logger-systemd --journald << EOF + logger --journald << EOF MESSAGE= PRIORITY=2 SEVERITY= @@ -135,7 +135,7 @@ function log_redfish_bios_panic_event() { boot_state_str=$(get_boot_stage_string "$1" "$2") - logger-systemd --journald << EOF + logger --journald << EOF MESSAGE= PRIORITY=2 SEVERITY= diff --git a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh index f1f64c1155..1a65647120 100644 --- a/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh +++ b/meta-ampere/meta-common/recipes-ampere/host/ac01-boot-progress/dimm_train_fail_log.sh @@ -16,7 +16,7 @@ function log_ampere_oem_redfish_event() msgArgs1=$5 msgArgs2=$6 -logger-systemd --journald << EOF +logger --journald << EOF MESSAGE=${msg} PRIORITY=${priority} SEVERITY=${severity} diff --git a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh index 1170c6a7ca..ddbf8d7f84 100644 --- a/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh +++ b/meta-ampere/meta-common/recipes-ampere/platform/ampere-utils/ampere_add_redfishevent.sh @@ -9,15 +9,15 @@ if [ -z "$registry" ]; then exit fi -# Check if logger-systemd exist. Do nothing if not exists -if ! command -v logger-systemd; +# Check if logger exist. Do nothing if not exists +if ! logger --help | grep journald then - echo "logger-systemd does not exist. Skip log events for $registry $msgarg" + echo "logger does not support the journald option. Skip log events for $registry $msgarg" exit fi # Log events -logger-systemd --journald << EOF +logger --journald << EOF MESSAGE= PRIORITY= SEVERITY= diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh index c23f2502aa..96094bb054 100755 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager/firmware_update.sh @@ -99,6 +99,6 @@ fi if ! eval "$CMD"; then - echo "ERROR: The firmware update not successfull" + echo "ERROR: The firmware update not successful" exit 1 fi diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh index 5a641e9990..6f53163d09 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-utils/ampere_power_util.sh @@ -45,7 +45,7 @@ soft_off() { sleep 1 cnt=$((cnt - 1)) done - # Softpoweroff is successed + # Softpoweroff is successful sleep 2 rm -rf /run/openbmc/host@0-softpoweroff if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend index 77cd4b9606..d5953ada86 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" RDEPENDS:${PN} += "bash" -# Declare port spcific config files +# Declare port specific config files OBMC_CONSOLE_TTYS = "ttyS0 ttyS1 ttyS2 ttyS3" CONSOLE_CLIENT = "2200 2201 2202 2203" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_psu_reset_hotswap.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_psu_reset_hotswap.sh index 3ff3e1fc6a..d2afada5b5 100755 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_psu_reset_hotswap.sh +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/ampere_psu_reset_hotswap.sh @@ -1,7 +1,7 @@ #!/bin/sh # When system only use single PSU ( ex : PSU1 ) to power ON normal 12V, -# HSC2 will be trigged Fault event (FET health). +# HSC2 will be triggered Fault event (FET health). # At this time, to plug-in PSU2 in system, PSU2 won't deliver power to # +12V_MB because HSC2 is protected by Fault event. # Due to HSC2 protected, the PSU redundancy mechanism can't be created. @@ -10,8 +10,8 @@ # BMC SW work-around solution: # - When BMC detect event PSU is plugged in system, BMC will reset HSC -# by disbale HOT SWAP and then enable HOT SWAP through pmbus command to clear -# Fault event. +# by disabling HOT SWAP and then enabling HOT SWAP through pmbus command +# to clear Fault event. # Note: # In case hot swap occurs during BMC reset, BMC still not in operation state, diff --git a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_power_util.sh b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_power_util.sh index 78f54bc2fe..c3db126379 100644 --- a/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_power_util.sh +++ b/meta-ampere/meta-mitchell/recipes-ampere/platform/ampere-utils/ampere_power_util.sh @@ -46,7 +46,7 @@ soft_off() { cnt=$((cnt - 1)) done - # Softpoweroff is successed + # Softpoweroff is successful sleep 2 rm -rf /run/openbmc/host@0-softpoweroff if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend index 993b753ac2..afed058af1 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" RDEPENDS:${PN} += "bash" -# Declare port spcific config files +# Declare port specific config files OBMC_CONSOLE_TTYS = "ttyS0 ttyS1 ttyS2 ttyS3 ttyS7 ttyS8" CONSOLE_CLIENT = "2200 2201 2202 2203 2204 2205" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 094b34e8bf..c5a0f7d7b6 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -10,7 +10,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "e728f4e380fbbad0c96299ab32ed5c2b69544a7f" +SRCREV = "7ce62637441bc08745eebf0b629be8f58fb4ffa3" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" SRC_URI:append:uboot-flash-32768 = " file://u-boot_flash_32M.cfg" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 137969eccf..f931fd3876 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-6.6" -LINUX_VERSION ?= "6.6.30" +LINUX_VERSION ?= "6.6.34" -SRCREV="f013890407d8911c210e91bd9404c25c89d57021" +SRCREV="ba2929159000dc7015cc01cdf7bb72542e19952a" require linux-aspeed.inc diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc index 45f2428032..2f0cf7c069 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc @@ -3,7 +3,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ plat-svc \ motor-ctrl \ phosphor-virtual-sensor \ - usbutils \ idevicerestore \ fw-update \ phosphor-sel-logger \ diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg index 8b06613daf..c49f3f855e 100644 --- a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg +++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/harma.cfg @@ -67,6 +67,7 @@ CONFIG_SENSORS_MP2856=y CONFIG_SENSORS_MP5990=y CONFIG_SENSORS_PT5161L=y CONFIG_SENSORS_XDPE152=y +CONFIG_SENSORS_XDP710=y # IIO Sensors CONFIG_AD5272=y diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe new file mode 100644 index 0000000000..6eb9643fc1 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/device-driver-probe @@ -0,0 +1,22 @@ +#!/bin/bash + +read_mux_dev() { + for _ in {1..3}; do + if /usr/sbin/i2cget -f -y "$1" "$2" 2>/dev/null; then + return 0 + fi + done + return 1 +} + +probe_sitv_pttv_mux() { + if read_mux_dev 9 0x71; then + echo pca9546 0x71 > /sys/bus/i2c/devices/i2c-9/new_device + else + echo pca9546 0x71 > /sys/bus/i2c/devices/i2c-11/new_device + fi +} + +probe_sitv_pttv_mux + +exit 0 diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.EntityManager.conf b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.EntityManager.conf new file mode 100644 index 0000000000..e3f79cee63 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.EntityManager.conf @@ -0,0 +1,3 @@ +[Service] +ExecStartPre=/usr/libexec/entity-manager/device-driver-probe + diff --git a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend index 6e89557dec..23e7ed4c3b 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,9 +1,19 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append = " \ +inherit obmc-phosphor-systemd systemd + +SRC_URI += "\ file://blacklist.json \ + file://device-driver-probe \ " +RDEPENDS:${PN}:append = " bash" + +SYSTEMD_OVERRIDE:${PN} += "xyz.openbmc_project.EntityManager.conf:xyz.openbmc_project.EntityManager.service.d/xyz.openbmc_project.EntityManager.conf" + do_install:append() { install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json + + install -d ${D}${libexecdir}/${PN} + install -m 0755 ${WORKDIR}/device-driver-probe ${D}${libexecdir}/${PN}/ } diff --git a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf index cedd5c4c99..9e4070df6a 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf +++ b/meta-facebook/meta-harma/recipes-phosphor/console/obmc-console/server.ttyUSB1.conf @@ -1,4 +1,3 @@ -local-tty = ttyUSB1 baud = 57600 console-id = usb1 logfile = /var/log/obmc-console-usb1.log diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off new file mode 100644 index 0000000000..121db3f34e --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off @@ -0,0 +1,7 @@ +#!/bin/bash + +#To avoid AC cycle trigger this script. +sleep 5 + +# Set Host Power Off +obmcutil poweroff diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off.service new file mode 100644 index 0000000000..ad9dfaa21d --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-off.service @@ -0,0 +1,8 @@ +[Unit] +Description=Host power off assertion + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/host-power-off + +SyslogIdentifier=host-power-off diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on new file mode 100644 index 0000000000..d556137d9d --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on @@ -0,0 +1,6 @@ +#!/bin/bash + +sleep 1 + +# Set Host Power On +obmcutil poweron diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on.service b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on.service new file mode 100644 index 0000000000..c4bc3f1b57 --- /dev/null +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/host-power-on.service @@ -0,0 +1,8 @@ +[Unit] +Description=Host power on assertion + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/host-power-on + +SyslogIdentifier=host-power-on diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init index 05bc10393d..4e7dd65a67 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/multi-gpios-sys-init @@ -3,18 +3,16 @@ # shellcheck source=meta-facebook/recipes-fb/obmc_functions/files/fb-common-functions source /usr/libexec/fb-common-functions -power_good_init() { +host_led_init() { if [ "$(get_gpio power-host-good)" -eq 1 ]; then - busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ - xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Running; + systemctl start obmc-led-group-start@power_on.service else - busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ - xyz.openbmc_project.State.Host CurrentHostState s xyz.openbmc_project.State.Host.HostState.Off; + systemctl start obmc-led-group-stop@power_on.service fi } post_end_init() { - if [ "$(get_gpio host-ready-n)" -eq 0 ]; then + if [ "$(get_gpio post-end-n)" -eq 0 ]; then busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 \ xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s \ xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Standby; @@ -147,5 +145,5 @@ fi devmem 0x1e6e251c 32 0 # Initial Power status. -power_good_init +host_led_init post_end_init diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json index 18593a0b1c..7402df4325 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor/plat-phosphor-multi-gpio-monitor.json @@ -86,16 +86,6 @@ "Continue": true }, { - "Name": "cpu0-err-alert", - "ChipId": "0", - "GpioNum": 21, - "EventMon": "FALLING", - "Targets": { - "FALLING": ["assert-gpio-log@cpu0-err-alert.service"] - }, - "Continue": true - }, - { "Name": "reset-cause-platrst", "ChipId": "0", "GpioNum": 16, @@ -141,13 +131,13 @@ "Continue": true }, { - "Name": "host-ready-n", + "Name": "post-end-n", "ChipId": "2", "GpioNum": 66, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-post-end.service","deassert-gpio-log@host-ready-n.service"], - "FALLING": ["assert-post-end.service","assert-gpio-log@host-ready-n.service"] + "RISING": ["deassert-post-end.service"], + "FALLING": ["assert-post-end.service"] }, "Continue": true @@ -158,9 +148,20 @@ "GpioNum": 92, "EventMon": "BOTH", "Targets": { - "RISING": ["deassert-gpio-log@leakage-detect-alert.service"], - "FALLING": ["assert-gpio-log@leakage-detect-alert.service"] + "RISING": ["deassert-gpio-log@leakage-detect-alert.service", "host-power-on.service"], + "FALLING": ["assert-gpio-log@leakage-detect-alert.service", "host-power-off.service"] + }, + "Continue": true + }, + { + "Name": "power-hsc-good", + "ChipId": "0", + "GpioNum": 21, + "EventMon": "BOTH", + "Targets": { + "RISING": ["host-power-on.service"], + "FALLING": ["host-power-off.service"] }, "Continue": true } -]
\ No newline at end of file +] diff --git a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 46b9d2d4c7..791fe265ff 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-harma/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -2,25 +2,29 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd systemd -SRC_URI += "file://plat-phosphor-multi-gpio-monitor.json \ - file://plat-phosphor-multi-gpio-presence.json \ - file://assert-reset-button.service \ - file://assert-power-good.service \ +SRC_URI += "file://assert-gpio-log@.service \ + file://assert-post-end \ file://assert-post-end.service \ - file://deassert-reset-button.service \ - file://deassert-power-good.service \ - file://deassert-post-end.service \ - file://multi-gpios-sys-init.service \ - file://multi-gpios-sys-init \ file://assert-power-good \ - file://deassert-power-good \ - file://assert-post-end \ - file://deassert-post-end \ + file://assert-power-good.service \ file://assert-reset-button \ - file://deassert-reset-button \ - file://assert-gpio-log@.service \ + file://assert-reset-button.service \ file://deassert-gpio-log@.service \ + file://deassert-post-end \ + file://deassert-post-end.service \ + file://deassert-power-good \ + file://deassert-power-good.service \ + file://deassert-reset-button \ + file://deassert-reset-button.service \ + file://host-power-off \ + file://host-power-off.service \ + file://host-power-on \ + file://host-power-on.service \ file://logging \ + file://multi-gpios-sys-init \ + file://multi-gpios-sys-init.service \ + file://plat-phosphor-multi-gpio-monitor.json \ + file://plat-phosphor-multi-gpio-presence.json \ " RDEPENDS:${PN}:append = " bash" @@ -28,12 +32,12 @@ RDEPENDS:${PN}:append = " bash" FILES:${PN} += "${systemd_system_unitdir}/*" SYSTEMD_SERVICE:${PN} += " \ - assert-reset-button.service \ assert-power-good.service \ assert-post-end.service \ - deassert-reset-button.service \ + assert-reset-button.service \ deassert-power-good.service \ deassert-post-end.service \ + deassert-reset-button.service \ multi-gpios-sys-init.service \ " @@ -41,6 +45,9 @@ SYSTEMD_AUTO_ENABLE = "enable" do_install:append:() { install -d ${D}${datadir}/phosphor-gpio-monitor + install -d ${D}${systemd_system_unitdir}/ + install -d ${D}${libexecdir}/${PN} + install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-monitor.json \ ${D}${datadir}/phosphor-gpio-monitor/phosphor-multi-gpio-monitor.json install -m 0644 ${WORKDIR}/plat-phosphor-multi-gpio-presence.json \ @@ -61,6 +68,9 @@ do_install:append:() { install -m 0755 ${WORKDIR}/assert-power-good ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/deassert-power-good ${D}${libexecdir}/${PN}/ + + install -m 0755 ${WORKDIR}/host-power-off ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/host-power-on ${D}${libexecdir}/${PN}/ } SYSTEMD_OVERRIDE:${PN}-monitor += "phosphor-multi-gpio-monitor.conf:phosphor-multi-gpio-monitor.service.d/phosphor-multi-gpio-monitor.conf" diff --git a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc index 2f63dba18c..d59fb76c25 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc +++ b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc @@ -5,9 +5,14 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-gpio-monitor \ " -# It is for lsusb app. +# Monitor gpio presence status OBMC_IMAGE_EXTRA_INSTALL:append = " \ - usbutils \ + phosphor-gpio-monitor-presence \ +" + +# Monitor Chassis power status +OBMC_IMAGE_EXTRA_INSTALL:append = " \ + phosphor-power-control \ " # Allow scripted access to SITV BMC @@ -20,8 +25,3 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ obmc-phosphor-buttons-signals \ obmc-phosphor-buttons-handler \ " - -# Monitor gpio status -OBMC_IMAGE_EXTRA_INSTALL:append = " \ - phosphor-gpio-monitor-presence \ -"
\ No newline at end of file diff --git a/meta-facebook/meta-minerva/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-minerva/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..cbeb3e7582 --- /dev/null +++ b/meta-facebook/meta-minerva/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" +SRC_URI +="file://minerva.cfg" diff --git a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg index 7672eb67af..02ce902d34 100644 --- a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg +++ b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/minerva.cfg @@ -33,3 +33,8 @@ CONFIG_SPI_GPIO=y # RTC CONFIG_RTC_DRV_PCF8563=y + +# USB UART +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y diff --git a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init index 411cff19bf..de609ee56b 100644 --- a/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init +++ b/meta-facebook/meta-minerva/recipes-minerva/plat-svc/files/minerva-early-sys-init @@ -2,6 +2,10 @@ # shellcheck source=meta-facebook/meta-minerva/recipes-minerva/plat-tool/files/minerva-common-functions source /usr/libexec/minerva-common-functions +power_on_led_init() { + systemctl start obmc-led-group-start@power_on.service +} + # set initial value for GPIO output pins set_gpio PWREN_MTIA_BLADE0_EN_N 0 set_gpio PWREN_MTIA_BLADE1_EN_N 0 @@ -91,4 +95,7 @@ set_gpio RST_I2CRST_FCB_T_R_N 1 set_gpio wFM_88E6393X_BIN_UPDATE_EN_N 1 set_gpio WATER_VALVE_CLOSED_N 0 set_gpio BMC_READY 1 + +power_on_led_init + exit 0 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/server.ttyS5.conf b/meta-facebook/meta-minerva/recipes-phosphor/console/obmc-console/server.ttyS5.conf index 85cb7a43e0..6622dd6367 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,3 @@ -local-tty = ttyS5 baud = 57600 console-id = compute-blade logfile = /var/log/obmc-console-compute-blade.log 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..58c3a46db6 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 @@ -31,3 +31,13 @@ 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 \ +" 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/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-yosemite4/conf/machine/yosemite4.conf b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf index 635c27843f..802a164249 100644 --- a/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf +++ b/meta-facebook/meta-yosemite4/conf/machine/yosemite4.conf @@ -26,3 +26,5 @@ NCSI_ETH_INTF = "eth0 eth1" VIRTUAL-RUNTIME_obmc-host-state-manager = "phosphor-state-manager-host" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "phosphor-state-manager-chassis" + +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "yosemite4-led-manager-config-native"
\ No newline at end of file diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..bf843a530d --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-aspeed-sdk:" +SRC_URI +="file://yosemite4.cfg" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb new file mode 100644 index 0000000000..0758813aae --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led.bb @@ -0,0 +1,55 @@ +SUMMARY = "Fan fault led configurations for meta-yosemite4 machines" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-dbus-monitor + +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" + +SRC_URI:append = " \ + file://board-0-fan-0.yaml \ + file://board-0-fan-1.yaml \ + file://board-0-fan-4.yaml \ + file://board-0-fan-5.yaml \ + file://board-0-fan-8.yaml \ + file://board-0-fan-9.yaml \ + file://board-1-fan-10.yaml \ + file://board-1-fan-11.yaml \ + file://board-1-fan-2.yaml \ + file://board-1-fan-3.yaml \ + file://board-1-fan-6.yaml \ + file://board-1-fan-7.yaml \ +" + +do_install() { + install -D ${WORKDIR}/board-0-fan-0.yaml ${D}${config_dir}/board-0-fan-0.yaml + install -D ${WORKDIR}/board-0-fan-1.yaml ${D}${config_dir}/board-0-fan-1.yaml + install -D ${WORKDIR}/board-0-fan-4.yaml ${D}${config_dir}/board-0-fan-4.yaml + install -D ${WORKDIR}/board-0-fan-5.yaml ${D}${config_dir}/board-0-fan-5.yaml + install -D ${WORKDIR}/board-0-fan-8.yaml ${D}${config_dir}/board-0-fan-8.yaml + install -D ${WORKDIR}/board-0-fan-9.yaml ${D}${config_dir}/board-0-fan-9.yaml + install -D ${WORKDIR}/board-1-fan-10.yaml ${D}${config_dir}/board-1-fan-10.yaml + install -D ${WORKDIR}/board-1-fan-11.yaml ${D}${config_dir}/board-1-fan-11.yaml + install -D ${WORKDIR}/board-1-fan-2.yaml ${D}${config_dir}/board-1-fan-2.yaml + install -D ${WORKDIR}/board-1-fan-3.yaml ${D}${config_dir}/board-1-fan-3.yaml + install -D ${WORKDIR}/board-1-fan-6.yaml ${D}${config_dir}/board-1-fan-6.yaml + install -D ${WORKDIR}/board-1-fan-7.yaml ${D}${config_dir}/board-1-fan-7.yaml +} + +FILES:${PN}:append = " \ + ${config_dir}/board-0-fan-0.yaml \ + ${config_dir}/board-0-fan-1.yaml \ + ${config_dir}/board-0-fan-4.yaml \ + ${config_dir}/board-0-fan-5.yaml \ + ${config_dir}/board-0-fan-8.yaml \ + ${config_dir}/board-0-fan-9.yaml \ + ${config_dir}/board-1-fan-10.yaml \ + ${config_dir}/board-1-fan-11.yaml \ + ${config_dir}/board-1-fan-2.yaml \ + ${config_dir}/board-1-fan-3.yaml \ + ${config_dir}/board-1-fan-6.yaml \ + ${config_dir}/board-1-fan-7.yaml \ +" + diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-0.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-0.yaml new file mode 100644 index 0000000000..f961fbe965 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-0.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 0 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN0_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN0_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 0 critical alarm assert + class: watch + watch: property + paths: board 0 fan 0 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 0 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 0 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 0 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 0 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan0_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan0_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan0_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan0_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-1.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-1.yaml new file mode 100644 index 0000000000..7e2fbf6316 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-1.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 1 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN1_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN1_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 1 critical alarm assert + class: watch + watch: property + paths: board 0 fan 1 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 1 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 1 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 1 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 1 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan1_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan1_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan1_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan1_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-4.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-4.yaml new file mode 100644 index 0000000000..f6f226426e --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-4.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 4 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN4_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN4_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 4 critical alarm assert + class: watch + watch: property + paths: board 0 fan 4 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 4 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 4 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 4 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 4 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan4_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan4_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan4_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan4_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-5.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-5.yaml new file mode 100644 index 0000000000..db21ec858c --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-5.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 5 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN5_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN5_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 5 critical alarm assert + class: watch + watch: property + paths: board 0 fan 5 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 5 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 5 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 5 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 5 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan5_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan5_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan5_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan5_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-8.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-8.yaml new file mode 100644 index 0000000000..92df2dee2c --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-8.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 8 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN8_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN8_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 8 critical alarm assert + class: watch + watch: property + paths: board 0 fan 8 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 8 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 8 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 8 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 8 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan8_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan8_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan8_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan8_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-9.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-9.yaml new file mode 100644 index 0000000000..cdf6e69e76 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-0-fan-9.yaml @@ -0,0 +1,122 @@ +- name: board 0 fan 9 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN9_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN9_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 0 fan 9 critical alarm assert + class: watch + watch: property + paths: board 0 fan 9 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 0 fan 9 critical alarm deassert + class: watch + watch: property + paths: board 0 fan 9 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 0 fan 9 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 0 fan 9 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan9_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan9_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan9_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan9_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-10.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-10.yaml new file mode 100644 index 0000000000..4658559d4e --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-10.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 10 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN10_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN10_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 10 critical alarm assert + class: watch + watch: property + paths: board 1 fan 10 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 10 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 10 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 10 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 10 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan10_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan10_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan10_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan10_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-11.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-11.yaml new file mode 100644 index 0000000000..1503292bb0 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-11.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 11 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN11_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN11_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 11 critical alarm assert + class: watch + watch: property + paths: board 1 fan 11 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 11 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 11 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 11 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 11 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan11_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan11_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan11_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan11_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-2.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-2.yaml new file mode 100644 index 0000000000..639583c5df --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-2.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 2 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN2_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN2_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 2 critical alarm assert + class: watch + watch: property + paths: board 1 fan 2 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 2 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 2 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 2 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 2 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan2_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan2_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan2_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan2_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-3.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-3.yaml new file mode 100644 index 0000000000..15263b8975 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-3.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 3 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN3_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN3_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 3 critical alarm assert + class: watch + watch: property + paths: board 1 fan 3 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 3 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 3 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 3 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 3 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan3_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan3_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan3_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan3_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-6.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-6.yaml new file mode 100644 index 0000000000..7e849a8b0a --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-6.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 6 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN6_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN6_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 6 critical alarm assert + class: watch + watch: property + paths: board 1 fan 6 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 6 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 6 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 6 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 6 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan6_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan6_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan6_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan6_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-7.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-7.yaml new file mode 100644 index 0000000000..01ea532a75 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/fan-fault-led/board-1-fan-7.yaml @@ -0,0 +1,122 @@ +- name: board 1 fan 7 current critical alarm path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN7_TACH_IL + - meta: PATH + path: /xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN7_TACH_OL + +- name: current fan critical alarm property + class: group + group: property + type: boolean + members: + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmHigh + - interface: xyz.openbmc_project.Sensor.Threshold.Critical + meta: PROPERTY + property: CriticalAlarmLow + +- name: board 1 fan 7 critical alarm assert + class: watch + watch: property + paths: board 1 fan 7 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold assert + +- name: board 1 fan 7 critical alarm deassert + class: watch + watch: property + paths: board 1 fan 7 current critical alarm path group + properties: current fan critical alarm property + callback: check if fan critical threshold deassert + +- name: check if fan critical threshold assert + class: condition + condition: count + paths: board 1 fan 7 current critical alarm path group + properties: current fan critical alarm property + callback: set fan fail + countop: ">=" + countbound: 1 + op: "==" + bound: true + +- name: check if fan critical threshold deassert + class: condition + condition: count + paths: board 1 fan 7 current critical alarm path group + properties: current fan critical alarm property + callback: set fan ok + countop: "<" + countbound: 1 + op: "==" + bound: true + +- name: set fan ok group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan7_ok.service + type: string + - value: replace + type: string + +- name: set fan ok group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan7_ok.service + type: string + - value: replace + type: string + +- name: set fan fail group assert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-start@fan7_fail.service + type: string + - value: replace + type: string + +- name: set fan fail group deassert + class: callback + callback: method + service: org.freedesktop.systemd1 + path: /org/freedesktop/systemd1 + interface: org.freedesktop.systemd1.Manager + method: StartUnit + args: + - value: obmc-led-group-stop@fan7_fail.service + type: string + - value: replace + type: string + +- name: set fan ok + class: callback + callback: group + members: + - set fan ok group assert + - set fan fail group deassert + +- name: set fan fail + class: callback + callback: group + members: + - set fan fail group assert + - set fan ok group deassert diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 860e605e9c..4b93a9f40c 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -1 +1,2 @@ PHOSPHOR_DBUS_MONITOR_CONFIGS:append = " power-saving-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append = " fan-fault-led" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend deleted file mode 100644 index 4da9e510bd..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -inherit obmc-phosphor-systemd - -SRC_URI:append = " \ - file://switch-nic-main-or-aux-mode \ -" - -SYSTEMD_SERVICE:${PN}:append = " \ - switch-nic-to-aux-mode@.service \ - switch-nic-to-main-mode@.service \ -" - -do_install:append() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/switch-nic-main-or-aux-mode ${D}${bindir}/switch-nic-main-or-aux-mode -} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control/config.json deleted file mode 100644 index e0c2586e50..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control/config.json +++ /dev/null @@ -1,4217 +0,0 @@ -{ - "sensors": [ - { - "name": "MB_CPU_TEMP_C_4_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_10", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_10", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_12", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_12", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_20", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_20", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_22", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_22", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_30", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_30", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_32", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_32", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_40", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_40", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_42", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_42", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_50", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_50", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_52", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_52", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_60", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_60", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_62", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_62", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_70", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_70", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_72", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_72", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_CPU_TEMP_C_4_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_CPU_TEMP_C_4_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_A_TEMP_C_5_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_A_TEMP_C_5_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_B_TEMP_C_6_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_B_TEMP_C_6_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_C_TEMP_C_7_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_C_TEMP_C_7_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_D_TEMP_C_8_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_D_TEMP_C_8_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_E_TEMP_C_9_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_E_TEMP_C_9_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_F_TEMP_C_10_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_F_TEMP_C_10_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_G_TEMP_C_11_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_G_TEMP_C_11_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_H_TEMP_C_12_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_H_TEMP_C_12_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_I_TEMP_C_13_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_I_TEMP_C_13_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_J_TEMP_C_14_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_J_TEMP_C_14_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_K_TEMP_C_15_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_K_TEMP_C_15_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_DIMM_L_TEMP_C_16_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_DIMM_L_TEMP_C_16_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_FIO_TEMP_C_3_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_FIO_TEMP_C_3_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_INLET_TEMP_C_1_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_INLET_TEMP_C_1_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_OUTLET_TEMP_C_2_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_OUTLET_TEMP_C_2_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_BOOT_TEMP_C_17_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_BOOT_TEMP_C_17_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_SSD_DATA_TEMP_C_18_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_SSD_DATA_TEMP_C_18_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU0_TEMP_C_19_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU0_TEMP_C_19_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_CPU1_TEMP_C_21_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_CPU1_TEMP_C_21_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDD11_TEMP_C_23_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDD11_TEMP_C_23_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_PVDDIO_TEMP_C_22_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_PVDDIO_TEMP_C_22_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_VR_SOC_TEMP_C_20_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_VR_SOC_TEMP_C_20_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X16_RETIMER_TEMP_C_25_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X16_RETIMER_TEMP_C_25_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MB_X8_RETIMER_TEMP_C_24_80", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MB_X8_RETIMER_TEMP_C_24_80", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_1OU_BOARD_INLET_TEMP_C_1_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_1OU_BOARD_INLET_TEMP_C_1_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_A_TEMP_C_12_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_A_TEMP_C_12_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_B_TEMP_C_13_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_B_TEMP_C_13_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_C_TEMP_C_14_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_C_TEMP_C_14_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC1_DIMM_D_TEMP_C_15_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC1_DIMM_D_TEMP_C_15_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_A_TEMP_C_16_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_A_TEMP_C_16_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_B_TEMP_C_17_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_B_TEMP_C_17_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_C_TEMP_C_18_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_C_TEMP_C_18_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_ASIC2_DIMM_D_TEMP_C_19_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_ASIC2_DIMM_D_TEMP_C_19_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL1_CNTR_TEMP_C_2_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL1_CNTR_TEMP_C_2_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_CXL2_CNTR_TEMP_C_3_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_CXL2_CNTR_TEMP_C_3_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_E1S_TEMP_C_20_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_E1S_TEMP_C_20_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC1_TEMP_C_6_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC1_TEMP_C_6_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V85_ASIC2_TEMP_C_10_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V85_ASIC2_TEMP_C_10_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC1_TEMP_C_4_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC1_TEMP_C_4_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_P0V8_ASIC2_TEMP_C_8_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_P0V8_ASIC2_TEMP_C_8_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_82", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_82", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_12VDELTA0_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_12VDELTA0_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_12VDELTA1_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_12VDELTA1_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_12VDELTA2_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_12VDELTA2_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_12VDELTA3_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_12VDELTA3_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_48VHSC0_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_48VHSC0_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_48VHSC1_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_48VHSC1_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB1_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB1_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB2_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB2_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB3_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB3_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB4_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB4_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB5_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB5_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB6_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB6_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB7_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB7_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_MB8_12VHSC_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_MB8_12VHSC_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_TEMP0_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_TEMP0_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "MEDUSA_TEMP1_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/MEDUSA_TEMP1_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "NIC0_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/NIC0_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "NIC1_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/NIC1_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "NIC2_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/NIC2_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "NIC3_TEMP_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/NIC3_TEMP_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "SPIDER_TEMP0_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/SPIDER_TEMP0_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - { - "name": "SPIDER_TEMP1_C", - "type": "temp", - "readPath": "/xyz/openbmc_project/sensors/temperature/SPIDER_TEMP1_C", - "timeout": 0, - "ignoreDbusMinMax": true - }, - - { - "name": "FANBOARD0_FAN0_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN0_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN0_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN0_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN0_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN0_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN1_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN1_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN1_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN1_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN1_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN1_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN2_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN2_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN2_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN2_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN2_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN2_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN3_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN3_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN3_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN3_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN3_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN3_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN4_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN4_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN4_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN4_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN4_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN4_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN5_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN5_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN5_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN5_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN5_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN5_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN6_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN6_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN6_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN6_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN6_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN6_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN7_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD7_FAN1_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD7_FAN1_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN7_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN7_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN7_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN8_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN8_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN8_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN8_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN8_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN8_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN9_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN9_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN9_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD0_FAN9_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD0_FAN9_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD0_FAN9_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN10_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN10_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN10_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN10_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN10_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN10_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN11_TACH_IL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN11_TACH_IL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN11_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - }, - { - "name": "FANBOARD1_FAN11_TACH_OL", - "type": "fan", - "readPath": "/xyz/openbmc_project/sensors/fan_tach/FANBOARD1_FAN11_TACH_OL", - "writePath": "/xyz/openbmc_project/control/fanpwm/FANBOARD1_FAN11_PWM", - "min": 0, - "max": 255, - "ignoreDbusMinMax": true - } - ], - - "zones": [ - { - "id": 1, - "failsafePercent": 100.0, - "minThermalOutput": 0.0, - "cycleTimeBaseMS": 1000, - "updateThermalsTimeMS": 1000, - "accumulateSetPoint": true, - "pids": [ - { - "name": "All Fan", - "type": "fan", - "inputs": [ - "FANBOARD0_FAN0_TACH_IL", - "FANBOARD0_FAN0_TACH_OL", - "FANBOARD0_FAN1_TACH_IL", - "FANBOARD0_FAN1_TACH_OL", - "FANBOARD1_FAN2_TACH_IL", - "FANBOARD1_FAN2_TACH_OL", - "FANBOARD1_FAN3_TACH_IL", - "FANBOARD1_FAN3_TACH_OL", - "FANBOARD0_FAN4_TACH_IL", - "FANBOARD0_FAN4_TACH_OL", - "FANBOARD0_FAN5_TACH_IL", - "FANBOARD0_FAN5_TACH_OL", - "FANBOARD1_FAN6_TACH_IL", - "FANBOARD1_FAN6_TACH_OL", - "FANBOARD1_FAN7_TACH_IL", - "FANBOARD1_FAN7_TACH_OL", - "FANBOARD0_FAN8_TACH_IL", - "FANBOARD0_FAN8_TACH_OL", - "FANBOARD0_FAN9_TACH_IL", - "FANBOARD0_FAN9_TACH_OL", - "FANBOARD1_FAN10_TACH_IL", - "FANBOARD1_FAN10_TACH_OL", - "FANBOARD1_FAN11_TACH_IL", - "FANBOARD1_FAN11_TACH_OL" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": 0.0, - "integralCoeff": 0.0, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 1.0, - "integralLimit_min": 0.0, - "integralLimit_max": 0.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 0 - } - }, - { - "name": "Stepwise_Non_Critical_Sensors", - "type": "stepwise", - "inputs": [ - "MB_INLET_TEMP_C_1_10", - "MB_INLET_TEMP_C_1_20", - "MB_INLET_TEMP_C_1_30", - "MB_INLET_TEMP_C_1_40", - "MB_INLET_TEMP_C_1_50", - "MB_INLET_TEMP_C_1_60", - "MB_INLET_TEMP_C_1_70", - "MB_INLET_TEMP_C_1_80", - "MB_OUTLET_TEMP_C_2_10", - "MB_OUTLET_TEMP_C_2_20", - "MB_OUTLET_TEMP_C_2_30", - "MB_OUTLET_TEMP_C_2_40", - "MB_OUTLET_TEMP_C_2_50", - "MB_OUTLET_TEMP_C_2_60", - "MB_OUTLET_TEMP_C_2_70", - "MB_OUTLET_TEMP_C_2_80", - "MB_X16_RETIMER_TEMP_C_25_10", - "MB_X16_RETIMER_TEMP_C_25_20", - "MB_X16_RETIMER_TEMP_C_25_30", - "MB_X16_RETIMER_TEMP_C_25_40", - "MB_X16_RETIMER_TEMP_C_25_50", - "MB_X16_RETIMER_TEMP_C_25_60", - "MB_X16_RETIMER_TEMP_C_25_70", - "MB_X16_RETIMER_TEMP_C_25_80", - "MB_X8_RETIMER_TEMP_C_24_10", - "MB_X8_RETIMER_TEMP_C_24_20", - "MB_X8_RETIMER_TEMP_C_24_30", - "MB_X8_RETIMER_TEMP_C_24_40", - "MB_X8_RETIMER_TEMP_C_24_50", - "MB_X8_RETIMER_TEMP_C_24_60", - "MB_X8_RETIMER_TEMP_C_24_70", - "MB_X8_RETIMER_TEMP_C_24_80", - "MEDUSA_48VHSC0_TEMP_C", - "MEDUSA_48VHSC1_TEMP_C", - "MEDUSA_MB1_12VHSC_TEMP_C", - "MEDUSA_MB2_12VHSC_TEMP_C", - "MEDUSA_MB3_12VHSC_TEMP_C", - "MEDUSA_MB4_12VHSC_TEMP_C", - "MEDUSA_MB5_12VHSC_TEMP_C", - "MEDUSA_MB6_12VHSC_TEMP_C", - "MEDUSA_MB7_12VHSC_TEMP_C", - "MEDUSA_MB8_12VHSC_TEMP_C", - "MEDUSA_TEMP0_C", - "MEDUSA_TEMP1_C", - "SPIDER_TEMP0_C", - "SPIDER_TEMP1_C", - "WF_1OU_BOARD_INLET_TEMP_C_1_12", - "WF_1OU_BOARD_INLET_TEMP_C_1_22", - "WF_1OU_BOARD_INLET_TEMP_C_1_32", - "WF_1OU_BOARD_INLET_TEMP_C_1_42", - "WF_1OU_BOARD_INLET_TEMP_C_1_52", - "WF_1OU_BOARD_INLET_TEMP_C_1_62", - "WF_1OU_BOARD_INLET_TEMP_C_1_72", - "WF_1OU_BOARD_INLET_TEMP_C_1_82", - "WF_VR_P0V8_ASIC1_TEMP_C_4_12", - "WF_VR_P0V8_ASIC1_TEMP_C_4_22", - "WF_VR_P0V8_ASIC1_TEMP_C_4_32", - "WF_VR_P0V8_ASIC1_TEMP_C_4_42", - "WF_VR_P0V8_ASIC1_TEMP_C_4_52", - "WF_VR_P0V8_ASIC1_TEMP_C_4_62", - "WF_VR_P0V8_ASIC1_TEMP_C_4_72", - "WF_VR_P0V8_ASIC1_TEMP_C_4_82", - "WF_VR_P0V8_ASIC2_TEMP_C_8_12", - "WF_VR_P0V8_ASIC2_TEMP_C_8_22", - "WF_VR_P0V8_ASIC2_TEMP_C_8_32", - "WF_VR_P0V8_ASIC2_TEMP_C_8_42", - "WF_VR_P0V8_ASIC2_TEMP_C_8_52", - "WF_VR_P0V8_ASIC2_TEMP_C_8_62", - "WF_VR_P0V8_ASIC2_TEMP_C_8_72", - "WF_VR_P0V8_ASIC2_TEMP_C_8_82", - "WF_VR_P0V85_ASIC1_TEMP_C_6_12", - "WF_VR_P0V85_ASIC1_TEMP_C_6_22", - "WF_VR_P0V85_ASIC1_TEMP_C_6_32", - "WF_VR_P0V85_ASIC1_TEMP_C_6_42", - "WF_VR_P0V85_ASIC1_TEMP_C_6_52", - "WF_VR_P0V85_ASIC1_TEMP_C_6_62", - "WF_VR_P0V85_ASIC1_TEMP_C_6_72", - "WF_VR_P0V85_ASIC1_TEMP_C_6_82", - "WF_VR_P0V85_ASIC2_TEMP_C_10_12", - "WF_VR_P0V85_ASIC2_TEMP_C_10_22", - "WF_VR_P0V85_ASIC2_TEMP_C_10_32", - "WF_VR_P0V85_ASIC2_TEMP_C_10_42", - "WF_VR_P0V85_ASIC2_TEMP_C_10_52", - "WF_VR_P0V85_ASIC2_TEMP_C_10_62", - "WF_VR_P0V85_ASIC2_TEMP_C_10_72", - "WF_VR_P0V85_ASIC2_TEMP_C_10_82", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_12", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_22", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_32", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_42", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_52", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_62", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_72", - "WF_VR_PVDDQ_AB_ASIC1_TEMP_C_7_82", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_12", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_22", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_32", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_42", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_52", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_62", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_72", - "WF_VR_PVDDQ_AB_ASIC2_TEMP_C_11_82", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_12", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_22", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_32", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_42", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_52", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_62", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_72", - "WF_VR_PVDDQ_CD_ASIC1_TEMP_C_5_82", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_12", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_22", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_32", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_42", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_52", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_62", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_72", - "WF_VR_PVDDQ_CD_ASIC2_TEMP_C_9_82" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 20 - }, - "output": { - "0": 20 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 0 - } - }, - { - "name": "Stepwise_MB_FIO", - "type": "stepwise", - "inputs": [ - "MB_FIO_TEMP_C_3_10", - "MB_FIO_TEMP_C_3_20", - "MB_FIO_TEMP_C_3_30", - "MB_FIO_TEMP_C_3_40", - "MB_FIO_TEMP_C_3_50", - "MB_FIO_TEMP_C_3_60", - "MB_FIO_TEMP_C_3_70", - "MB_FIO_TEMP_C_3_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 20, - "1": 21, - "2": 22, - "3": 23, - "4": 24, - "5": 25, - "6": 26, - "7": 27, - "8": 28, - "9": 29, - "10": 30, - "11": 31, - "12": 32, - "13": 33, - "14": 34, - "15": 35, - "16": 36, - "17": 37, - "18": 38, - "19": 39, - "20": 40, - "21": 41, - "22": 42, - "23": 43, - "24": 44, - "25": 45 - }, - "output": { - "0": 20, - "1": 21, - "2": 22, - "3": 23, - "4": 24, - "5": 25, - "6": 26, - "7": 27, - "8": 28, - "9": 29, - "10": 30, - "11": 31, - "12": 31, - "13": 33, - "14": 35, - "15": 37, - "16": 38, - "17": 39, - "18": 40, - "19": 41, - "20": 42, - "21": 43, - "22": 44, - "23": 45, - "24": 46, - "25": 47 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "Stepwise_MB_DIMM", - "type": "stepwise", - "inputs": [ - "MB_DIMM_A_TEMP_C_5_10", - "MB_DIMM_B_TEMP_C_6_10", - "MB_DIMM_C_TEMP_C_7_10", - "MB_DIMM_D_TEMP_C_8_10", - "MB_DIMM_E_TEMP_C_9_10", - "MB_DIMM_F_TEMP_C_10_10", - "MB_DIMM_G_TEMP_C_11_10", - "MB_DIMM_H_TEMP_C_12_10", - "MB_DIMM_I_TEMP_C_13_10", - "MB_DIMM_J_TEMP_C_14_10", - "MB_DIMM_K_TEMP_C_15_10", - "MB_DIMM_L_TEMP_C_16_10", - "MB_DIMM_A_TEMP_C_5_20", - "MB_DIMM_B_TEMP_C_6_20", - "MB_DIMM_C_TEMP_C_7_20", - "MB_DIMM_D_TEMP_C_8_20", - "MB_DIMM_E_TEMP_C_9_20", - "MB_DIMM_F_TEMP_C_10_20", - "MB_DIMM_G_TEMP_C_11_20", - "MB_DIMM_H_TEMP_C_12_20", - "MB_DIMM_I_TEMP_C_13_20", - "MB_DIMM_J_TEMP_C_14_20", - "MB_DIMM_K_TEMP_C_15_20", - "MB_DIMM_L_TEMP_C_16_20", - "MB_DIMM_A_TEMP_C_5_30", - "MB_DIMM_B_TEMP_C_6_30", - "MB_DIMM_C_TEMP_C_7_30", - "MB_DIMM_D_TEMP_C_8_30", - "MB_DIMM_E_TEMP_C_9_30", - "MB_DIMM_F_TEMP_C_10_30", - "MB_DIMM_G_TEMP_C_11_30", - "MB_DIMM_H_TEMP_C_12_30", - "MB_DIMM_I_TEMP_C_13_30", - "MB_DIMM_J_TEMP_C_14_30", - "MB_DIMM_K_TEMP_C_15_30", - "MB_DIMM_L_TEMP_C_16_30", - "MB_DIMM_A_TEMP_C_5_40", - "MB_DIMM_B_TEMP_C_6_40", - "MB_DIMM_C_TEMP_C_7_40", - "MB_DIMM_D_TEMP_C_8_40", - "MB_DIMM_E_TEMP_C_9_40", - "MB_DIMM_F_TEMP_C_10_40", - "MB_DIMM_G_TEMP_C_11_40", - "MB_DIMM_H_TEMP_C_12_40", - "MB_DIMM_I_TEMP_C_13_40", - "MB_DIMM_J_TEMP_C_14_40", - "MB_DIMM_K_TEMP_C_15_40", - "MB_DIMM_L_TEMP_C_16_40", - "MB_DIMM_A_TEMP_C_5_50", - "MB_DIMM_B_TEMP_C_6_50", - "MB_DIMM_C_TEMP_C_7_50", - "MB_DIMM_D_TEMP_C_8_50", - "MB_DIMM_E_TEMP_C_9_50", - "MB_DIMM_F_TEMP_C_10_50", - "MB_DIMM_G_TEMP_C_11_50", - "MB_DIMM_H_TEMP_C_12_50", - "MB_DIMM_I_TEMP_C_13_50", - "MB_DIMM_J_TEMP_C_14_50", - "MB_DIMM_K_TEMP_C_15_50", - "MB_DIMM_L_TEMP_C_16_50", - "MB_DIMM_A_TEMP_C_5_60", - "MB_DIMM_B_TEMP_C_6_60", - "MB_DIMM_C_TEMP_C_7_60", - "MB_DIMM_D_TEMP_C_8_60", - "MB_DIMM_E_TEMP_C_9_60", - "MB_DIMM_F_TEMP_C_10_60", - "MB_DIMM_G_TEMP_C_11_60", - "MB_DIMM_H_TEMP_C_12_60", - "MB_DIMM_I_TEMP_C_13_60", - "MB_DIMM_J_TEMP_C_14_60", - "MB_DIMM_K_TEMP_C_15_60", - "MB_DIMM_L_TEMP_C_16_60", - "MB_DIMM_A_TEMP_C_5_70", - "MB_DIMM_B_TEMP_C_6_70", - "MB_DIMM_C_TEMP_C_7_70", - "MB_DIMM_D_TEMP_C_8_70", - "MB_DIMM_E_TEMP_C_9_70", - "MB_DIMM_F_TEMP_C_10_70", - "MB_DIMM_G_TEMP_C_11_70", - "MB_DIMM_H_TEMP_C_12_70", - "MB_DIMM_I_TEMP_C_13_70", - "MB_DIMM_J_TEMP_C_14_70", - "MB_DIMM_K_TEMP_C_15_70", - "MB_DIMM_L_TEMP_C_16_70", - "MB_DIMM_A_TEMP_C_5_80", - "MB_DIMM_B_TEMP_C_6_80", - "MB_DIMM_C_TEMP_C_7_80", - "MB_DIMM_D_TEMP_C_8_80", - "MB_DIMM_E_TEMP_C_9_80", - "MB_DIMM_F_TEMP_C_10_80", - "MB_DIMM_G_TEMP_C_11_80", - "MB_DIMM_H_TEMP_C_12_80", - "MB_DIMM_I_TEMP_C_13_80", - "MB_DIMM_J_TEMP_C_14_80", - "MB_DIMM_K_TEMP_C_15_80", - "MB_DIMM_L_TEMP_C_16_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 65, - "1": 66, - "2": 67, - "3": 68, - "4": 69, - "5": 70 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_MB_DIMM", - "type": "temp", - "inputs": [ - "MB_DIMM_A_TEMP_C_5_10", - "MB_DIMM_B_TEMP_C_6_10", - "MB_DIMM_C_TEMP_C_7_10", - "MB_DIMM_D_TEMP_C_8_10", - "MB_DIMM_E_TEMP_C_9_10", - "MB_DIMM_F_TEMP_C_10_10", - "MB_DIMM_G_TEMP_C_11_10", - "MB_DIMM_H_TEMP_C_12_10", - "MB_DIMM_I_TEMP_C_13_10", - "MB_DIMM_J_TEMP_C_14_10", - "MB_DIMM_K_TEMP_C_15_10", - "MB_DIMM_L_TEMP_C_16_10", - "MB_DIMM_A_TEMP_C_5_20", - "MB_DIMM_B_TEMP_C_6_20", - "MB_DIMM_C_TEMP_C_7_20", - "MB_DIMM_D_TEMP_C_8_20", - "MB_DIMM_E_TEMP_C_9_20", - "MB_DIMM_F_TEMP_C_10_20", - "MB_DIMM_G_TEMP_C_11_20", - "MB_DIMM_H_TEMP_C_12_20", - "MB_DIMM_I_TEMP_C_13_20", - "MB_DIMM_J_TEMP_C_14_20", - "MB_DIMM_K_TEMP_C_15_20", - "MB_DIMM_L_TEMP_C_16_20", - "MB_DIMM_A_TEMP_C_5_30", - "MB_DIMM_B_TEMP_C_6_30", - "MB_DIMM_C_TEMP_C_7_30", - "MB_DIMM_D_TEMP_C_8_30", - "MB_DIMM_E_TEMP_C_9_30", - "MB_DIMM_F_TEMP_C_10_30", - "MB_DIMM_G_TEMP_C_11_30", - "MB_DIMM_H_TEMP_C_12_30", - "MB_DIMM_I_TEMP_C_13_30", - "MB_DIMM_J_TEMP_C_14_30", - "MB_DIMM_K_TEMP_C_15_30", - "MB_DIMM_L_TEMP_C_16_30", - "MB_DIMM_A_TEMP_C_5_40", - "MB_DIMM_B_TEMP_C_6_40", - "MB_DIMM_C_TEMP_C_7_40", - "MB_DIMM_D_TEMP_C_8_40", - "MB_DIMM_E_TEMP_C_9_40", - "MB_DIMM_F_TEMP_C_10_40", - "MB_DIMM_G_TEMP_C_11_40", - "MB_DIMM_H_TEMP_C_12_40", - "MB_DIMM_I_TEMP_C_13_40", - "MB_DIMM_J_TEMP_C_14_40", - "MB_DIMM_K_TEMP_C_15_40", - "MB_DIMM_L_TEMP_C_16_40", - "MB_DIMM_A_TEMP_C_5_50", - "MB_DIMM_B_TEMP_C_6_50", - "MB_DIMM_C_TEMP_C_7_50", - "MB_DIMM_D_TEMP_C_8_50", - "MB_DIMM_E_TEMP_C_9_50", - "MB_DIMM_F_TEMP_C_10_50", - "MB_DIMM_G_TEMP_C_11_50", - "MB_DIMM_H_TEMP_C_12_50", - "MB_DIMM_I_TEMP_C_13_50", - "MB_DIMM_J_TEMP_C_14_50", - "MB_DIMM_K_TEMP_C_15_50", - "MB_DIMM_L_TEMP_C_16_50", - "MB_DIMM_A_TEMP_C_5_60", - "MB_DIMM_B_TEMP_C_6_60", - "MB_DIMM_C_TEMP_C_7_60", - "MB_DIMM_D_TEMP_C_8_60", - "MB_DIMM_E_TEMP_C_9_60", - "MB_DIMM_F_TEMP_C_10_60", - "MB_DIMM_G_TEMP_C_11_60", - "MB_DIMM_H_TEMP_C_12_60", - "MB_DIMM_I_TEMP_C_13_60", - "MB_DIMM_J_TEMP_C_14_60", - "MB_DIMM_K_TEMP_C_15_60", - "MB_DIMM_L_TEMP_C_16_60", - "MB_DIMM_A_TEMP_C_5_70", - "MB_DIMM_B_TEMP_C_6_70", - "MB_DIMM_C_TEMP_C_7_70", - "MB_DIMM_D_TEMP_C_8_70", - "MB_DIMM_E_TEMP_C_9_70", - "MB_DIMM_F_TEMP_C_10_70", - "MB_DIMM_G_TEMP_C_11_70", - "MB_DIMM_H_TEMP_C_12_70", - "MB_DIMM_I_TEMP_C_13_70", - "MB_DIMM_J_TEMP_C_14_70", - "MB_DIMM_K_TEMP_C_15_70", - "MB_DIMM_L_TEMP_C_16_70", - "MB_DIMM_A_TEMP_C_5_80", - "MB_DIMM_B_TEMP_C_6_80", - "MB_DIMM_C_TEMP_C_7_80", - "MB_DIMM_D_TEMP_C_8_80", - "MB_DIMM_E_TEMP_C_9_80", - "MB_DIMM_F_TEMP_C_10_80", - "MB_DIMM_G_TEMP_C_11_80", - "MB_DIMM_H_TEMP_C_12_80", - "MB_DIMM_I_TEMP_C_13_80", - "MB_DIMM_J_TEMP_C_14_80", - "MB_DIMM_K_TEMP_C_15_80", - "MB_DIMM_L_TEMP_C_16_80" - ], - "setpoint": 75.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.035, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 2, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_MB_CPU", - "type": "stepwise", - "inputs": [ - "MB_CPU_TEMP_C_4_10", - "MB_CPU_TEMP_C_4_20", - "MB_CPU_TEMP_C_4_30", - "MB_CPU_TEMP_C_4_40", - "MB_CPU_TEMP_C_4_50", - "MB_CPU_TEMP_C_4_60", - "MB_CPU_TEMP_C_4_70", - "MB_CPU_TEMP_C_4_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 66, - "1": 67, - "2": 68, - "3": 69, - "4": 70, - "5": 71, - "6": 72, - "7": 73, - "8": 74 - }, - "output": { - "0": 20, - "1": 25, - "2": 30, - "3": 35, - "4": 40, - "5": 45, - "6": 50, - "7": 55, - "8": 60 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 3 - } - }, - { - "name": "PID_MB_CPU", - "type": "temp", - "inputs": [ - "MB_CPU_TEMP_C_4_10", - "MB_CPU_TEMP_C_4_20", - "MB_CPU_TEMP_C_4_30", - "MB_CPU_TEMP_C_4_40", - "MB_CPU_TEMP_C_4_50", - "MB_CPU_TEMP_C_4_60", - "MB_CPU_TEMP_C_4_70", - "MB_CPU_TEMP_C_4_80" - ], - "setpoint": 74.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -5.5, - "integralCoeff": -0.035, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 3, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_WF_DIMM", - "type": "stepwise", - "inputs": [ - "WF_ASIC1_DIMM_A_TEMP_C_12_12", - "WF_ASIC1_DIMM_B_TEMP_C_13_12", - "WF_ASIC1_DIMM_C_TEMP_C_14_12", - "WF_ASIC1_DIMM_D_TEMP_C_15_12", - "WF_ASIC2_DIMM_A_TEMP_C_16_12", - "WF_ASIC2_DIMM_B_TEMP_C_17_12", - "WF_ASIC2_DIMM_C_TEMP_C_18_12", - "WF_ASIC2_DIMM_D_TEMP_C_19_12", - "WF_ASIC1_DIMM_A_TEMP_C_12_22", - "WF_ASIC1_DIMM_B_TEMP_C_13_22", - "WF_ASIC1_DIMM_C_TEMP_C_14_22", - "WF_ASIC1_DIMM_D_TEMP_C_15_22", - "WF_ASIC2_DIMM_A_TEMP_C_16_22", - "WF_ASIC2_DIMM_B_TEMP_C_17_22", - "WF_ASIC2_DIMM_C_TEMP_C_18_22", - "WF_ASIC2_DIMM_D_TEMP_C_19_22", - "WF_ASIC1_DIMM_A_TEMP_C_12_32", - "WF_ASIC1_DIMM_B_TEMP_C_13_32", - "WF_ASIC1_DIMM_C_TEMP_C_14_32", - "WF_ASIC1_DIMM_D_TEMP_C_15_32", - "WF_ASIC2_DIMM_A_TEMP_C_16_32", - "WF_ASIC2_DIMM_B_TEMP_C_17_32", - "WF_ASIC2_DIMM_C_TEMP_C_18_32", - "WF_ASIC2_DIMM_D_TEMP_C_19_32", - "WF_ASIC1_DIMM_A_TEMP_C_12_42", - "WF_ASIC1_DIMM_B_TEMP_C_13_42", - "WF_ASIC1_DIMM_C_TEMP_C_14_42", - "WF_ASIC1_DIMM_D_TEMP_C_15_42", - "WF_ASIC2_DIMM_A_TEMP_C_16_42", - "WF_ASIC2_DIMM_B_TEMP_C_17_42", - "WF_ASIC2_DIMM_C_TEMP_C_18_42", - "WF_ASIC2_DIMM_D_TEMP_C_19_42", - "WF_ASIC1_DIMM_A_TEMP_C_12_52", - "WF_ASIC1_DIMM_B_TEMP_C_13_52", - "WF_ASIC1_DIMM_C_TEMP_C_14_52", - "WF_ASIC1_DIMM_D_TEMP_C_15_52", - "WF_ASIC2_DIMM_A_TEMP_C_16_52", - "WF_ASIC2_DIMM_B_TEMP_C_17_52", - "WF_ASIC2_DIMM_C_TEMP_C_18_52", - "WF_ASIC2_DIMM_D_TEMP_C_19_52", - "WF_ASIC1_DIMM_A_TEMP_C_12_62", - "WF_ASIC1_DIMM_B_TEMP_C_13_62", - "WF_ASIC1_DIMM_C_TEMP_C_14_62", - "WF_ASIC1_DIMM_D_TEMP_C_15_62", - "WF_ASIC2_DIMM_A_TEMP_C_16_62", - "WF_ASIC2_DIMM_B_TEMP_C_17_62", - "WF_ASIC2_DIMM_C_TEMP_C_18_62", - "WF_ASIC2_DIMM_D_TEMP_C_19_62", - "WF_ASIC1_DIMM_A_TEMP_C_12_72", - "WF_ASIC1_DIMM_B_TEMP_C_13_72", - "WF_ASIC1_DIMM_C_TEMP_C_14_72", - "WF_ASIC1_DIMM_D_TEMP_C_15_72", - "WF_ASIC2_DIMM_A_TEMP_C_16_72", - "WF_ASIC2_DIMM_B_TEMP_C_17_72", - "WF_ASIC2_DIMM_C_TEMP_C_18_72", - "WF_ASIC2_DIMM_D_TEMP_C_19_72", - "WF_ASIC1_DIMM_A_TEMP_C_12_82", - "WF_ASIC1_DIMM_B_TEMP_C_13_82", - "WF_ASIC1_DIMM_C_TEMP_C_14_82", - "WF_ASIC1_DIMM_D_TEMP_C_15_82", - "WF_ASIC2_DIMM_A_TEMP_C_16_82", - "WF_ASIC2_DIMM_B_TEMP_C_17_82", - "WF_ASIC2_DIMM_C_TEMP_C_18_82", - "WF_ASIC2_DIMM_D_TEMP_C_19_82" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 65, - "1": 66, - "2": 67, - "3": 68, - "4": 69, - "5": 70 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_WF_DIMM", - "type": "temp", - "inputs": [ - "WF_ASIC1_DIMM_A_TEMP_C_12_12", - "WF_ASIC1_DIMM_B_TEMP_C_13_12", - "WF_ASIC1_DIMM_C_TEMP_C_14_12", - "WF_ASIC1_DIMM_D_TEMP_C_15_12", - "WF_ASIC2_DIMM_A_TEMP_C_16_12", - "WF_ASIC2_DIMM_B_TEMP_C_17_12", - "WF_ASIC2_DIMM_C_TEMP_C_18_12", - "WF_ASIC2_DIMM_D_TEMP_C_19_12", - "WF_ASIC1_DIMM_A_TEMP_C_12_22", - "WF_ASIC1_DIMM_B_TEMP_C_13_22", - "WF_ASIC1_DIMM_C_TEMP_C_14_22", - "WF_ASIC1_DIMM_D_TEMP_C_15_22", - "WF_ASIC2_DIMM_A_TEMP_C_16_22", - "WF_ASIC2_DIMM_B_TEMP_C_17_22", - "WF_ASIC2_DIMM_C_TEMP_C_18_22", - "WF_ASIC2_DIMM_D_TEMP_C_19_22", - "WF_ASIC1_DIMM_A_TEMP_C_12_32", - "WF_ASIC1_DIMM_B_TEMP_C_13_32", - "WF_ASIC1_DIMM_C_TEMP_C_14_32", - "WF_ASIC1_DIMM_D_TEMP_C_15_32", - "WF_ASIC2_DIMM_A_TEMP_C_16_32", - "WF_ASIC2_DIMM_B_TEMP_C_17_32", - "WF_ASIC2_DIMM_C_TEMP_C_18_32", - "WF_ASIC2_DIMM_D_TEMP_C_19_32", - "WF_ASIC1_DIMM_A_TEMP_C_12_42", - "WF_ASIC1_DIMM_B_TEMP_C_13_42", - "WF_ASIC1_DIMM_C_TEMP_C_14_42", - "WF_ASIC1_DIMM_D_TEMP_C_15_42", - "WF_ASIC2_DIMM_A_TEMP_C_16_42", - "WF_ASIC2_DIMM_B_TEMP_C_17_42", - "WF_ASIC2_DIMM_C_TEMP_C_18_42", - "WF_ASIC2_DIMM_D_TEMP_C_19_42", - "WF_ASIC1_DIMM_A_TEMP_C_12_52", - "WF_ASIC1_DIMM_B_TEMP_C_13_52", - "WF_ASIC1_DIMM_C_TEMP_C_14_52", - "WF_ASIC1_DIMM_D_TEMP_C_15_52", - "WF_ASIC2_DIMM_A_TEMP_C_16_52", - "WF_ASIC2_DIMM_B_TEMP_C_17_52", - "WF_ASIC2_DIMM_C_TEMP_C_18_52", - "WF_ASIC2_DIMM_D_TEMP_C_19_52", - "WF_ASIC1_DIMM_A_TEMP_C_12_62", - "WF_ASIC1_DIMM_B_TEMP_C_13_62", - "WF_ASIC1_DIMM_C_TEMP_C_14_62", - "WF_ASIC1_DIMM_D_TEMP_C_15_62", - "WF_ASIC2_DIMM_A_TEMP_C_16_62", - "WF_ASIC2_DIMM_B_TEMP_C_17_62", - "WF_ASIC2_DIMM_C_TEMP_C_18_62", - "WF_ASIC2_DIMM_D_TEMP_C_19_62", - "WF_ASIC1_DIMM_A_TEMP_C_12_72", - "WF_ASIC1_DIMM_B_TEMP_C_13_72", - "WF_ASIC1_DIMM_C_TEMP_C_14_72", - "WF_ASIC1_DIMM_D_TEMP_C_15_72", - "WF_ASIC2_DIMM_A_TEMP_C_16_72", - "WF_ASIC2_DIMM_B_TEMP_C_17_72", - "WF_ASIC2_DIMM_C_TEMP_C_18_72", - "WF_ASIC2_DIMM_D_TEMP_C_19_72", - "WF_ASIC1_DIMM_A_TEMP_C_12_82", - "WF_ASIC1_DIMM_B_TEMP_C_13_82", - "WF_ASIC1_DIMM_C_TEMP_C_14_82", - "WF_ASIC1_DIMM_D_TEMP_C_15_82", - "WF_ASIC2_DIMM_A_TEMP_C_16_82", - "WF_ASIC2_DIMM_B_TEMP_C_17_82", - "WF_ASIC2_DIMM_C_TEMP_C_18_82", - "WF_ASIC2_DIMM_D_TEMP_C_19_82" - ], - "setpoint": 75.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.035, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 2, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_NIC", - "type": "stepwise", - "inputs": [ - "NIC0_TEMP_C", - "NIC1_TEMP_C", - "NIC2_TEMP_C", - "NIC3_TEMP_C" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 80, - "1": 81, - "2": 82, - "3": 83, - "4": 84, - "5": 85 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_NIC", - "type": "temp", - "inputs": [ - "NIC0_TEMP_C", - "NIC1_TEMP_C", - "NIC2_TEMP_C", - "NIC3_TEMP_C" - ], - "setpoint": 90.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.035, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 3, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_MB_SSD_BOOT", - "type": "stepwise", - "inputs": [ - "MB_SSD_BOOT_TEMP_C_17_10", - "MB_SSD_BOOT_TEMP_C_17_20", - "MB_SSD_BOOT_TEMP_C_17_30", - "MB_SSD_BOOT_TEMP_C_17_40", - "MB_SSD_BOOT_TEMP_C_17_50", - "MB_SSD_BOOT_TEMP_C_17_60", - "MB_SSD_BOOT_TEMP_C_17_70", - "MB_SSD_BOOT_TEMP_C_17_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 58, - "1": 59, - "2": 60, - "3": 61, - "4": 62, - "5": 63 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_MB_SSD_BOOT", - "type": "temp", - "inputs": [ - "MB_SSD_BOOT_TEMP_C_17_10", - "MB_SSD_BOOT_TEMP_C_17_20", - "MB_SSD_BOOT_TEMP_C_17_30", - "MB_SSD_BOOT_TEMP_C_17_40", - "MB_SSD_BOOT_TEMP_C_17_50", - "MB_SSD_BOOT_TEMP_C_17_60", - "MB_SSD_BOOT_TEMP_C_17_70", - "MB_SSD_BOOT_TEMP_C_17_80" - ], - "setpoint": 68.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -1.5, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 2, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_MB_SSD_DATA", - "type": "stepwise", - "inputs": [ - "MB_SSD_DATA_TEMP_C_18_10", - "MB_SSD_DATA_TEMP_C_18_20", - "MB_SSD_DATA_TEMP_C_18_30", - "MB_SSD_DATA_TEMP_C_18_40", - "MB_SSD_DATA_TEMP_C_18_50", - "MB_SSD_DATA_TEMP_C_18_60", - "MB_SSD_DATA_TEMP_C_18_70", - "MB_SSD_DATA_TEMP_C_18_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 58, - "1": 59, - "2": 60, - "3": 61, - "4": 62, - "5": 63 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_MB_SSD_DATA", - "type": "temp", - "inputs": [ - "MB_SSD_DATA_TEMP_C_18_10", - "MB_SSD_DATA_TEMP_C_18_20", - "MB_SSD_DATA_TEMP_C_18_30", - "MB_SSD_DATA_TEMP_C_18_40", - "MB_SSD_DATA_TEMP_C_18_50", - "MB_SSD_DATA_TEMP_C_18_60", - "MB_SSD_DATA_TEMP_C_18_70", - "MB_SSD_DATA_TEMP_C_18_80" - ], - "setpoint": 68.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -1.5, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 2, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_WF_E1S", - "type": "stepwise", - "inputs": [ - "WF_E1S_TEMP_C_20_12", - "WF_E1S_TEMP_C_20_22", - "WF_E1S_TEMP_C_20_32", - "WF_E1S_TEMP_C_20_42", - "WF_E1S_TEMP_C_20_52", - "WF_E1S_TEMP_C_20_62", - "WF_E1S_TEMP_C_20_72", - "WF_E1S_TEMP_C_20_82" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 58, - "1": 59, - "2": 60, - "3": 61, - "4": 62, - "5": 63 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_WF_E1S", - "type": "temp", - "inputs": [ - "WF_E1S_TEMP_C_20_12", - "WF_E1S_TEMP_C_20_22", - "WF_E1S_TEMP_C_20_32", - "WF_E1S_TEMP_C_20_42", - "WF_E1S_TEMP_C_20_52", - "WF_E1S_TEMP_C_20_62", - "WF_E1S_TEMP_C_20_72", - "WF_E1S_TEMP_C_20_82" - ], - "setpoint": 68.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -1.5, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 2, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_WF_CXL", - "type": "stepwise", - "inputs": [ - "WF_CXL1_CNTR_TEMP_C_2_12", - "WF_CXL2_CNTR_TEMP_C_3_12", - "WF_CXL1_CNTR_TEMP_C_2_22", - "WF_CXL2_CNTR_TEMP_C_3_22", - "WF_CXL1_CNTR_TEMP_C_2_32", - "WF_CXL2_CNTR_TEMP_C_3_32", - "WF_CXL1_CNTR_TEMP_C_2_42", - "WF_CXL2_CNTR_TEMP_C_3_42", - "WF_CXL1_CNTR_TEMP_C_2_52", - "WF_CXL2_CNTR_TEMP_C_3_52", - "WF_CXL1_CNTR_TEMP_C_2_62", - "WF_CXL2_CNTR_TEMP_C_3_62", - "WF_CXL1_CNTR_TEMP_C_2_72", - "WF_CXL2_CNTR_TEMP_C_3_72", - "WF_CXL1_CNTR_TEMP_C_2_82", - "WF_CXL2_CNTR_TEMP_C_3_82" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 60, - "1": 61, - "2": 62, - "3": 63, - "4": 64, - "5": 65 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 2 - } - }, - { - "name": "PID_WF_CXL", - "type": "temp", - "inputs": [ - "WF_CXL1_CNTR_TEMP_C_2_12", - "WF_CXL2_CNTR_TEMP_C_3_12", - "WF_CXL1_CNTR_TEMP_C_2_22", - "WF_CXL2_CNTR_TEMP_C_3_22", - "WF_CXL1_CNTR_TEMP_C_2_32", - "WF_CXL2_CNTR_TEMP_C_3_32", - "WF_CXL1_CNTR_TEMP_C_2_42", - "WF_CXL2_CNTR_TEMP_C_3_42", - "WF_CXL1_CNTR_TEMP_C_2_52", - "WF_CXL2_CNTR_TEMP_C_3_52", - "WF_CXL1_CNTR_TEMP_C_2_62", - "WF_CXL2_CNTR_TEMP_C_3_62", - "WF_CXL1_CNTR_TEMP_C_2_72", - "WF_CXL2_CNTR_TEMP_C_3_72", - "WF_CXL1_CNTR_TEMP_C_2_82", - "WF_CXL2_CNTR_TEMP_C_3_82" - ], - "setpoint": 70.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 3, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_SD_VR", - "type": "stepwise", - "inputs": [ - "MB_VR_CPU0_TEMP_C_19_10", - "MB_VR_CPU1_TEMP_C_21_10", - "MB_VR_PVDD11_TEMP_C_23_10", - "MB_VR_PVDDIO_TEMP_C_22_10", - "MB_VR_SOC_TEMP_C_20_10", - "MB_VR_CPU0_TEMP_C_19_20", - "MB_VR_CPU1_TEMP_C_21_20", - "MB_VR_PVDD11_TEMP_C_23_20", - "MB_VR_PVDDIO_TEMP_C_22_20", - "MB_VR_SOC_TEMP_C_20_20", - "MB_VR_CPU0_TEMP_C_19_30", - "MB_VR_CPU1_TEMP_C_21_30", - "MB_VR_PVDD11_TEMP_C_23_30", - "MB_VR_PVDDIO_TEMP_C_22_30", - "MB_VR_SOC_TEMP_C_20_30", - "MB_VR_CPU0_TEMP_C_19_40", - "MB_VR_CPU1_TEMP_C_21_40", - "MB_VR_PVDD11_TEMP_C_23_40", - "MB_VR_PVDDIO_TEMP_C_22_40", - "MB_VR_SOC_TEMP_C_20_40", - "MB_VR_CPU0_TEMP_C_19_50", - "MB_VR_CPU1_TEMP_C_21_50", - "MB_VR_PVDD11_TEMP_C_23_50", - "MB_VR_PVDDIO_TEMP_C_22_50", - "MB_VR_SOC_TEMP_C_20_50", - "MB_VR_CPU0_TEMP_C_19_60", - "MB_VR_CPU1_TEMP_C_21_60", - "MB_VR_PVDD11_TEMP_C_23_60", - "MB_VR_PVDDIO_TEMP_C_22_60", - "MB_VR_SOC_TEMP_C_20_60", - "MB_VR_CPU0_TEMP_C_19_70", - "MB_VR_CPU1_TEMP_C_21_70", - "MB_VR_PVDD11_TEMP_C_23_70", - "MB_VR_PVDDIO_TEMP_C_22_70", - "MB_VR_SOC_TEMP_C_20_70", - "MB_VR_CPU0_TEMP_C_19_80", - "MB_VR_CPU1_TEMP_C_21_80", - "MB_VR_PVDD11_TEMP_C_23_80", - "MB_VR_PVDDIO_TEMP_C_22_80", - "MB_VR_SOC_TEMP_C_20_80" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 80, - "1": 81, - "2": 82, - "3": 83, - "4": 84, - "5": 85 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 3 - } - }, - { - "name": "PID_SD_VR", - "type": "temp", - "inputs": [ - "MB_VR_CPU0_TEMP_C_19_10", - "MB_VR_CPU1_TEMP_C_21_10", - "MB_VR_PVDD11_TEMP_C_23_10", - "MB_VR_PVDDIO_TEMP_C_22_10", - "MB_VR_SOC_TEMP_C_20_10", - "MB_VR_CPU0_TEMP_C_19_20", - "MB_VR_CPU1_TEMP_C_21_20", - "MB_VR_PVDD11_TEMP_C_23_20", - "MB_VR_PVDDIO_TEMP_C_22_20", - "MB_VR_SOC_TEMP_C_20_20", - "MB_VR_CPU0_TEMP_C_19_30", - "MB_VR_CPU1_TEMP_C_21_30", - "MB_VR_PVDD11_TEMP_C_23_30", - "MB_VR_PVDDIO_TEMP_C_22_30", - "MB_VR_SOC_TEMP_C_20_30", - "MB_VR_CPU0_TEMP_C_19_40", - "MB_VR_CPU1_TEMP_C_21_40", - "MB_VR_PVDD11_TEMP_C_23_40", - "MB_VR_PVDDIO_TEMP_C_22_40", - "MB_VR_SOC_TEMP_C_20_40", - "MB_VR_CPU0_TEMP_C_19_50", - "MB_VR_CPU1_TEMP_C_21_50", - "MB_VR_PVDD11_TEMP_C_23_50", - "MB_VR_PVDDIO_TEMP_C_22_50", - "MB_VR_SOC_TEMP_C_20_50", - "MB_VR_CPU0_TEMP_C_19_60", - "MB_VR_CPU1_TEMP_C_21_60", - "MB_VR_PVDD11_TEMP_C_23_60", - "MB_VR_PVDDIO_TEMP_C_22_60", - "MB_VR_SOC_TEMP_C_20_60", - "MB_VR_CPU0_TEMP_C_19_70", - "MB_VR_CPU1_TEMP_C_21_70", - "MB_VR_PVDD11_TEMP_C_23_70", - "MB_VR_PVDDIO_TEMP_C_22_70", - "MB_VR_SOC_TEMP_C_20_70", - "MB_VR_CPU0_TEMP_C_19_80", - "MB_VR_CPU1_TEMP_C_21_80", - "MB_VR_PVDD11_TEMP_C_23_80", - "MB_VR_PVDDIO_TEMP_C_22_80", - "MB_VR_SOC_TEMP_C_20_80" - ], - "setpoint": 90.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 3, - "checkHysterWithSetpt": true - } - }, - { - "name": "Stepwise_MEDUSA_12VDELTA", - "type": "stepwise", - "inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" - ], - "setpoint": 0.0, - "pid": { - "samplePeriod": 1, - "isCeiling": false, - "reading": { - "0": 80, - "1": 81, - "2": 82, - "3": 83, - "4": 84, - "5": 85 - }, - "output": { - "0": 20, - "1": 22, - "2": 24, - "3": 26, - "4": 28, - "5": 30 - }, - "positiveHysteresis": 0, - "negativeHysteresis": 3 - } - }, - { - "name": "PID_MEDUSA_12VDELTA", - "type": "temp", - "inputs": [ - "MEDUSA_12VDELTA0_TEMP_C", - "MEDUSA_12VDELTA1_TEMP_C", - "MEDUSA_12VDELTA2_TEMP_C", - "MEDUSA_12VDELTA3_TEMP_C" - ], - "setpoint": 90.0, - "pid": { - "samplePeriod": 1, - "proportionalCoeff": -3, - "integralCoeff": -0.02, - "derivativeCoeff": 0.0, - "feedFwdOffsetCoeff": 0.0, - "feedFwdGainCoeff": 0.0, - "integralLimit_min": -50.0, - "integralLimit_max": 100.0, - "outLim_min": 0.0, - "outLim_max": 100.0, - "slewNeg": 0.0, - "slewPos": 0.0, - "positiveHysteresis": 0, - "negativeHysteresis": 3, - "checkHysterWithSetpt": true - } - } - ] - } - ] -} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend deleted file mode 100644 index 56632d8fd8..0000000000 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:prepend:= "${THISDIR}/${PN}:" -SRC_URI:append = " file://config.json \ - " - -FILES:${PN}:append = " ${datadir}/swampd/config.json" - -do_install:append() { - install -d ${D}${datadir}/swampd - install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/config.json -} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface new file mode 100644 index 0000000000..b3582301ec --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface @@ -0,0 +1,23 @@ +#!/bin/bash + +to_local_admin_mac() { + # Set sencond bit of first byte + modified_byte=$((16#${1:0:2} | 0x02)) + modified_mac="$(printf "%02X" "$modified_byte")${1:2}" + echo "$modified_mac" +} + +INTF=$1 + +networkctl down "$INTF" + +# Set interface to local Admin MAC +local_mac=$(to_local_admin_mac "$(cat /sys/class/net/"$INTF"/address)") +ip link set dev "$INTF" address "$local_mac" + +networkctl up "$INTF" + +# wait getting address from NC-SI +systemctl restart network-wait-ipv6-ll@"$INTF".service + +networkctl reconfigure "$INTF" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service new file mode 100644 index 0000000000..2ddf62bbe7 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/reconfig-net-interface@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Reconfigure network interface %i + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-gpio-monitor/reconfig-net-interface %i +SyslogIdentifier=reconfig-net-interface-%i
\ No newline at end of file diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json index bfa7ea758e..ab898a9028 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor/yosemite4-phosphor-multi-gpio-monitor.json @@ -122,7 +122,8 @@ "FALLING": [ "obmc-chassis-powercycle@3.target", "obmc-chassis-powercycle@4.target", - "setup-nic-endpoint-slot@1.service" + "setup-nic-endpoint-slot@1.service", + "reconfig-net-interface@eth0.service" ] }, "Continue": true @@ -137,7 +138,8 @@ "FALLING": [ "obmc-chassis-powercycle@5.target", "obmc-chassis-powercycle@6.target", - "setup-nic-endpoint-slot@2.service" + "setup-nic-endpoint-slot@2.service", + "reconfig-net-interface@eth1.service" ] }, "Continue": true diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 14057f6b95..112b3424ac 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -9,6 +9,8 @@ SRC_URI += "file://yosemite4-phosphor-multi-gpio-monitor.json \ file://set-button-sled.service \ file://probe-slot-device@.service \ file://probe-slot-device \ + file://reconfig-net-interface@.service \ + file://reconfig-net-interface \ file://rescan-fru-device@.service \ file://rescan-fru-device \ file://slot-hot-plug@.service \ @@ -28,6 +30,7 @@ SYSTEMD_SERVICE:${PN} += " \ setup-nic-endpoint-slot@.service \ remove-nic-endpoint-slot@.service \ rescan-wf-bic@.service \ + reconfig-net-interface@.service \ " SYSTEMD_AUTO_ENABLE = "enable" @@ -41,10 +44,12 @@ do_install:append:() { install -m 0644 ${WORKDIR}/rescan-fru-device@.service ${D}${systemd_system_unitdir}/rescan-fru-device@.service install -m 0644 ${WORKDIR}/slot-hot-plug@.service ${D}${systemd_system_unitdir}/slot-hot-plug@.service install -m 0644 ${WORKDIR}/setup-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${WORKDIR}/reconfig-net-interface@.service ${D}${systemd_system_unitdir}/reconfig-net-interface@.service install -m 0644 ${WORKDIR}/remove-nic-endpoint-slot@.service ${D}${systemd_system_unitdir}/ install -m 0644 ${WORKDIR}/rescan-wf-bic@.service ${D}${systemd_system_unitdir}/ install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/probe-slot-device ${D}${libexecdir}/${PN}/ + install -m 0755 ${WORKDIR}/reconfig-net-interface ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/rescan-fru-device ${D}${libexecdir}/${PN}/ install -m 0755 ${WORKDIR}/rescan-wf-bic ${D}${libexecdir}/${PN}/ install -d ${D}/${bindir} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem new file mode 100644 index 0000000000..0a145eddf1 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem @@ -0,0 +1,6 @@ +#!/bin/bash + +# clean up /var/log/redfish and files in /home/root/ which are not necessary +rm -rf /var/log/redfish* +rm -rf /home/root/* +rm -rf /run/mnt-persist/var-data/lib/phosphor-debug-collector/dumps/* diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service new file mode 100644 index 0000000000..4ae3779d76 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor/clean-up-filesystem.service @@ -0,0 +1,7 @@ +[Unit] +Description=Clean up files that might full up filesystem + +[Service] +Type=oneshot +ExecStart=/usr/libexec/phosphor-health-monitor/clean-up-filesystem +SyslogIdentifier=clean-up-filesystem diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend index f99f1b8db9..74b3b6ed61 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/health/phosphor-health-monitor_%.bbappend @@ -1,2 +1,26 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd systemd + +SRC_URI += "file://clean-up-filesystem \ + file://clean-up-filesystem.service \ + " CPU_CRIT_TGT = "" -MEM_CRIT_TGT = ""
\ No newline at end of file +MEM_CRIT_TGT = "" +STORAGE_CRIT_TGT = "clean-up-filesystem.service" + +RDEPENDS:${PN}:append = " bash" + +FILES:${PN} += "${systemd_system_unitdir}/*" + +SYSTEMD_SERVICE:${PN} += " \ + clean-up-filesystem.service \ + " +SYSTEMD_AUTO_ENABLE = "enable" + +do_install:append:() { + install -d ${D}${datadir}/phosphor-health-monitor + install -m 0644 ${WORKDIR}/clean-up-filesystem.service ${D}${systemd_system_unitdir}/clean-up-filesystem.service + install -d ${D}${libexecdir}/${PN} + install -m 0755 ${WORKDIR}/clean-up-filesystem ${D}${libexecdir}/${PN}/ +} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc index fe7a36754d..2b5727e7ce 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc @@ -3,9 +3,6 @@ # If multi-user.target doesn't complete, # the obmc-host-startmin@.target couldn't start. # In that case, BMC couldn't set current host state to "Running". -IMAGE_FEATURES:remove = " \ - obmc-leds \ -" # Temporarily add libusb1 to allow side-loading of a BIOS/BIC update # application which need libusb1. Should be removed when BIOS and BIC update @@ -25,4 +22,3 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ # This enables the feature of dbus-monitor which defined in # `meta-phosphor/classes/obmc-phosphor-images.bbclass` IMAGE_FEATURES:append = " obmc-dbus-monitor" - diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/phosphor-led-manager_%.bbappend new file mode 100644 index 0000000000..c12b056f14 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -0,0 +1,18 @@ +SYSTEMD_SERVICE:${PN}-faultmonitor:remove:yosemite4 = "obmc-fru-fault-monitor.service" +SYSTEMD_LINK:${PN}:remove:yosemite4 = "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN}:remove:yosemite4 = "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" +SYSTEMD_LINK:${PN}:remove:yosemite4 = "${@compose_list(d, 'CHASSIS_LED_BLACKOUT_FMT', 'OBMC_CHASSIS_INSTANCES' )}" +SYSTEMD_OVERRIDE:${PN}:remove:yosemite4 = "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" + +FAN_INSTANCES="0 1 2 3 4 5 6 7 8 9 10 11" +FAN_OK_START_INSTFMT="obmc-led-group-start@.service:obmc-led-group-start@fan{0}_ok.service" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FAN_OK_START_INSTFMT', 'FAN_INSTANCES')}" + +FAN_FAIL_START_INSTFMT="obmc-led-group-start@.service:obmc-led-group-start@fan{0}_fail.service" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FAN_FAIL_START_INSTFMT', 'FAN_INSTANCES')}" + +FAN_OK_STOP_INSTFMT="obmc-led-group-stop@.service:obmc-led-group-stop@fan{0}_ok.service" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FAN_OK_STOP_INSTFMT', 'FAN_INSTANCES')}" + +FAN_FAIL_STOP_INSTFMT="obmc-led-group-stop@.service:obmc-led-group-stop@fan{0}_fail.service" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FAN_FAIL_STOP_INSTFMT', 'FAN_INSTANCES')}" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb new file mode 100644 index 0000000000..895d7ee8de --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config-native.bb @@ -0,0 +1,17 @@ +SUMMARY = "Phosphor LED Group Management for Yosemite4" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit native + +PROVIDES += "virtual/phosphor-led-manager-config-native" + +SRC_URI += "file://led.yaml" +S = "${WORKDIR}" + +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml new file mode 100644 index 0000000000..7f894927d6 --- /dev/null +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/leds/yosemite4-led-manager-config/led.yaml @@ -0,0 +1,143 @@ +fan0_ok: + fan0_blue: + Action: "On" + fan0_amber: + Action: "Off" + +fan0_fail: + fan0_blue: + Action: "Off" + fan0_amber: + Action: "On" + +fan1_ok: + fan1_blue: + Action: "On" + fan1_amber: + Action: "Off" + +fan1_fail: + fan1_blue: + Action: "Off" + fan1_amber: + Action: "On" + +fan2_ok: + fan2_blue: + Action: "On" + fan2_amber: + Action: "Off" + +fan2_fail: + fan2_blue: + Action: "Off" + fan2_amber: + Action: "On" + +fan3_ok: + fan3_blue: + Action: "On" + fan3_amber: + Action: "Off" + +fan3_fail: + fan3_blue: + Action: "Off" + fan3_amber: + Action: "On" + +fan4_ok: + fan4_blue: + Action: "On" + fan4_amber: + Action: "Off" + +fan4_fail: + fan4_blue: + Action: "Off" + fan4_amber: + Action: "On" + +fan5_ok: + fan5_blue: + Action: "On" + fan5_amber: + Action: "Off" + +fan5_fail: + fan5_blue: + Action: "Off" + fan5_amber: + Action: "On" + +fan6_ok: + fan6_blue: + Action: "On" + fan6_amber: + Action: "Off" + +fan6_fail: + fan6_blue: + Action: "Off" + fan6_amber: + Action: "On" + +fan7_ok: + fan7_blue: + Action: "On" + fan7_amber: + Action: "Off" + +fan7_fail: + fan7_blue: + Action: "Off" + fan7_amber: + Action: "On" + +fan8_ok: + fan8_blue: + Action: "On" + fan8_amber: + Action: "Off" + +fan8_fail: + fan8_blue: + Action: "Off" + fan8_amber: + Action: "On" + +fan9_ok: + fan9_blue: + Action: "On" + fan9_amber: + Action: "Off" + +fan9_fail: + fan9_blue: + Action: "Off" + fan9_amber: + Action: "On" + +fan10_ok: + fan10_blue: + Action: "On" + fan10_amber: + Action: "Off" + +fan10_fail: + fan10_blue: + Action: "Off" + fan10_amber: + Action: "On" + +fan11_ok: + fan11_blue: + Action: "On" + fan11_amber: + Action: "Off" + +fan11_fail: + fan11_blue: + Action: "Off" + fan11_amber: + Action: "On" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle index 3bd56521f7..c13138f0a2 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-powercycle @@ -3,7 +3,7 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd #IO 0:7 input port for showing slot 1:8 power status #IO 8:16 output port for controlling slot 1:8 power status @@ -11,11 +11,11 @@ CHASSIS_ID=$1 IO_EXP_SLOT_PWR_STATUS=$((CHASSIS_ID - 1)) IO_EXP_SLOT_PWR_CTRL=$((IO_EXP_SLOT_PWR_STATUS + 8)) IO_EXP_SLED_CYCLE=12 -IO_EXP_BIC_PWR_CTRL=32 +#IO_EXP_BIC_PWR_CTRL=32 GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) GPIOCHIP_IO_EXP_SLED_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$MANAGEMENT_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLED_PWR_CTRL_ADDR/"*gpiochip*) -GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) +#GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) chassis-power-cycle() { @@ -26,10 +26,8 @@ chassis-power-cycle() chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") if [ "$chassis_status" == "$STATE_ON" ] then - if ! gpioset "$GPIOCHIP_IO_EXP_BIC_PWR_CTRL" "$IO_EXP_BIC_PWR_CTRL"=0 - then - echo "Failed to set slot$1 sentinel dome bic off" - fi + busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}0" au.com.CodeConstruct.MCTP.Endpoint Remove + busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}2" au.com.CodeConstruct.MCTP.Endpoint Remove sleep 1 if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 then @@ -49,6 +47,7 @@ chassis-power-cycle() then busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_ON_PROPERTY" /usr/libexec/phosphor-state-manager/wait-until-mctp-connection-done "$CHASSIS_ID" && systemctl restart "phosphor-discover-system-state@$CHASSIS_ID.service" + echo "Chassis$CHASSIS_ID cycle success" exit 0; else busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_OFF_PROPERTY" diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff index d6971eafd9..2f9b550d1e 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweroff @@ -3,25 +3,23 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd #IO 0:7 input port for showing slot 1:8 power status #IO 8:16 output port for controlling slot 1:8 power status CHASSIS_ID=$1 IO_EXP_SLOT_PWR_STATUS=$((CHASSIS_ID - 1)) IO_EXP_SLOT_PWR_CTRL=$((IO_EXP_SLOT_PWR_STATUS + 8)) -IO_EXP_BIC_PWR_CTRL=32 +#IO_EXP_BIC_PWR_CTRL=32 GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) -GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) +#GPIOCHIP_IO_EXP_BIC_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$IO_EXP_SLOT_PWR_STATUS-00$IO_EXP_BIC_PWR_CTRL_ADDR/"*gpiochip*) # Server 12v power off chassis-power-off() { - if ! gpioset "$GPIOCHIP_IO_EXP_BIC_PWR_CTRL" "$IO_EXP_BIC_PWR_CTRL"=0 - then - echo "Failed to set slot$1 sentinel dome bic off" - fi + busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}0" au.com.CodeConstruct.MCTP.Endpoint Remove + busctl call xyz.openbmc_project.MCTP "/xyz/openbmc_project/mctp/1/${CHASSIS_ID}2" au.com.CodeConstruct.MCTP.Endpoint Remove sleep 1 if ! gpioset "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_CTRL"=1 then @@ -34,20 +32,24 @@ chassis-power-off() if [ "$chassis_status" == "$STATE_OFF" ] then busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_OFF_PROPERTY" - echo "Chassis is power off" + echo "Chassis$CHASSIS_ID is power off" else busctl set-property "$CHASSIS_BUS_NAME""$CHASSIS_ID" "$CHASSIS_OBJ_PATH""$CHASSIS_ID" "$CHASSIS_INTF_NAME" "$CHASSIS_PROPERTY_NAME" s "$CHASSIS_ON_PROPERTY" - echo "Chassis is power on" + echo "Chassis$CHASSIS_ID is power on" exit 0; fi } -chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") +if ! chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then + echo "Failed to get chassis status" + exit 1 +fi + if [ "$chassis_status" == "$STATE_ON" ] then chassis-power-off exit 0; else - echo "Chassis is already off" + echo "Chassis$CHASSIS_ID is already off" exit 0; fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron index 511b3f147d..3a1584f99d 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/chassis-poweron @@ -3,7 +3,7 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd GPIOCHIP_IO_EXP_SLOT_PWR_CTRL=$(basename "/sys/bus/i2c/devices/$SPIDER_BOARD_IO_EXP_BUS_NUM-00$IO_EXP_SLOT_PWR_CTRL_ADDR/"*gpiochip*) @@ -36,7 +36,11 @@ chassis-power-on() fi } -chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS") +if ! chassis_status=$(gpioget "$GPIOCHIP_IO_EXP_SLOT_PWR_CTRL" "$IO_EXP_SLOT_PWR_STATUS"); then + echo "Failed to get chassis status" + exit 1 +fi + if [ "$chassis_status" == "$STATE_OFF" ] then chassis-power-on diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle index bc28548f18..29067327c2 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powercycle @@ -3,15 +3,55 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd +CHASSIS_ID=$1 -# TODO: check power status before do power cycle -# Set state effecter state: Entity ID 0x0000 for host power control, 0x3 for power cycle -EID=$(($1*10)) -if ! pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x03 -m "$EID" -then - echo "Failed to set host$1 power cycle" -else - echo "Host is power cycle" +CHASSIS_BUS=$((CHASSIS_ID - 1)) +IO_EXP_P0_PWRGD_R_OUT=18 +GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS-0023/"*gpiochip*) + +EID=$((CHASSIS_ID * 10)) + +get_host_status() { + if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + echo "Failed to get host status" + exit 1 + fi +} + +# Get initial host status +get_host_status + +# Current power is ON, cycle do OFF to ON. If current power is OFF then do ON +if [ "$host_status" == "$STATE_ON" ]; then + # Set state effecter state: Entity ID 0x0000 for host power control, 0x2 for power off + pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x02 -m "$EID" + # Wait for the host to power off + sleep 10s + + # Get host status again after attempting to power off + get_host_status + + if [ "$host_status" != "$STATE_OFF" ]; then + echo "Do power cycle fail, fail to set host$CHASSIS_ID power off" + exit 1 + fi fi + +if [ "$host_status" != "$STATE_ON" ]; then + # Set state effecter state: Entity ID 0x0000 for host power control, 0x1 for power on + pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x01 -m "$EID" + sleep 2s + + # Get host status again after attempting to power on + get_host_status + + if [ "$host_status" != "$STATE_ON" ]; then + echo "Do power cycle, failed to set host$CHASSIS_ID power on" + exit 1 + fi +fi + +echo "Host power cycle success" +exit 0;
\ No newline at end of file diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff index 214c6beee6..7592f20958 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweroff @@ -3,15 +3,49 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd -# TODO: check power status before do power off +CHASSIS_BUS=$(($1 - 1)) +IO_EXP_P0_PWRGD_R_OUT=18 +GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS-0023/"*gpiochip*) + +get_host_status() { + if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + echo "Failed to get host status" + exit 1 + fi +} + +get_host_status + +if [ "$host_status" == "$STATE_OFF" ] +then + echo "Already host power off." + exit 0; +fi + # Set state effecter state: Entity ID 0x0000 for host power control, 0x2 for power off EID=$(($1*10)) -if ! pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x02 -m "$EID" +pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x02 -m "$EID" + +# Host power off will trigger the BIC to configure the server board CPLD register and set the power sequence. +# Power Sequence: +# - Set PLAT_PLDM_HOST_PWR_CTRL_DEFAULT to 0xFF +# - Set PLAT_PLDM_HOST_PWR_BTN_LOW to 0xFE +# - Sleep for 6 seconds +# - Set PLAT_PLDM_HOST_PWR_CTRL_DEFAULT back to 0xFF + +# Wait for the host to power off +sleep 10s + +get_host_status + +if [ "$host_status" == "$STATE_OFF" ] then - echo "Failed to set host$1 power off" + echo "Host power off success" + exit 0; else - echo "Host is power off" + echo "Failed to set host$1 power off" + exit 1 fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron index 82019a841a..bdaa0ebfd8 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-poweron @@ -1,18 +1,53 @@ #!/bin/bash # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd -CHASSIS_ID=$1 +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd +CHASSIS_ID=$1 -# TODO: check power status before do power on -# Set state effecter state: Entity ID 0x0000 for host power control, 0x1 for power on +CHASSIS_BUS=$(($1 - 1)) +IO_EXP_P0_PWRGD_R_OUT=18 +GPIOCHIP_IO_EXP_HOST_POWER_STATUS=$(basename "/sys/bus/i2c/devices/$CHASSIS_BUS-0023/"*gpiochip*) + +get_host_status() { + if ! host_status=$(gpioget "$GPIOCHIP_IO_EXP_HOST_POWER_STATUS" "$IO_EXP_P0_PWRGD_R_OUT"); then + echo "Failed to get host status" + exit 1 + fi +} + +get_host_status + +if [ "$host_status" == "$STATE_ON" ] +then + echo "Already host power on." + exit 0; +fi + +# Need to ensure that the mctp connection is complete so that pldmtool can set up successfully. /usr/libexec/phosphor-state-manager/wait-until-mctp-connection-done "$CHASSIS_ID" +# Set state effecter state: Entity ID 0x0000 for host power control, 0x1 for power on EID=$(($1*10)) -if ! pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x01 -m "$EID" +pldmtool raw -d 0x80 0x02 0x39 0x00 0x00 0x01 0x00 0x01 -m "$EID" + +# Host power ON will trigger the BIC to configure the server board CPLD register and set the power sequence. +# Power Sequence: +# - Set PLAT_PLDM_HOST_PWR_CTRL_DEFAULT to 0xFF +# - Set PLAT_PLDM_HOST_PWR_BTN_LOW to 0xFE +# - Sleep for 1 second +# - Set PLAT_PLDM_HOST_PWR_CTRL_DEFAULT back to 0xFF + +# Wait for the host to power on +sleep 2s + +get_host_status + +if [ "$host_status" == "$STATE_ON" ] then - echo "Failed to set host$1 power on" + echo "Host power on success" + exit 0; else - echo "Host is power on" + echo "Failed to set host$1 power on" + exit 1 fi diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset index 700edd73d7..8829f366d2 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/host-powerreset @@ -3,7 +3,7 @@ # shellcheck disable=SC2120 # Provide source directive to shellcheck. -# shellcheck source=meta-facebook/meta-greatlakes/recipes-phosphor/state/phosphor-state-manager/power-cmd +# shellcheck source=meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager/power-cmd source /usr/libexec/phosphor-state-manager/power-cmd # TODO: check power status before do power reset diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 9eddafa137..b564c3812e 100644 --- a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -7,6 +7,17 @@ size 64k missingok postrotate - systemctl reload rsyslog 2> /dev/null || true + systemctl restart rsyslog 2> /dev/null || true + endscript +} + +# Keep up to four 64k files for redfish (256k total) +/var/log/redfish +{ + rotate 3 + size 64k + missingok + postrotate + systemctl restart rsyslog 2> /dev/null || true endscript } diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 1142117ff1..42b07a7697 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem;branch=master;protocol=https" -SRCREV = "29985cb620e9779266d7d79a97cff63590432a7b" +SRCREV = "519530beae4e7d368f5fc31fa252d51fd7caa601" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf index 80227cd2ab..596a35f98f 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS0.conf @@ -1,4 +1,3 @@ -local-tty = ttyS0 baud = 57600 console-id = host1 logfile = /var/log/obmc-console-host1.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf index 12380f9497..80cfea2e25 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS1.conf @@ -1,4 +1,3 @@ -local-tty = ttyS1 baud = 57600 console-id = host2 logfile = /var/log/obmc-console-host2.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf index 0e93cab8c6..827fe7999a 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host3 logfile = /var/log/obmc-console-host3.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf index 4eb9e8f6f6..36af7face5 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS3.conf @@ -1,4 +1,3 @@ -local-tty = ttyS3 baud = 57600 console-id = host4 logfile = /var/log/obmc-console-host4.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf index 9b838e8308..65885079bf 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS5.conf @@ -1,4 +1,3 @@ -local-tty = ttyS5 baud = 57600 console-id = host5 logfile = /var/log/obmc-console-host5.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf index 162bf7825d..122f66ba24 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS6.conf @@ -1,4 +1,3 @@ -local-tty = ttyS6 baud = 57600 console-id = host6 logfile = /var/log/obmc-console-host6.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf index 2b6474baf7..6dcf970550 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS7.conf @@ -1,4 +1,3 @@ -local-tty = ttyS7 baud = 57600 console-id = host7 logfile = /var/log/obmc-console-host7.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf index ea820710c9..bd6404d050 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-multihost/server.ttyS8.conf @@ -1,4 +1,3 @@ -local-tty = ttyS8 baud = 57600 console-id = host8 logfile = /var/log/obmc-console-host8.log diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf index 90891d45ab..f9326c8507 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf @@ -1,4 +1,3 @@ -local-tty = ttyS2 baud = 57600 console-id = host0 logfile = /var/log/obmc-console-host0.log diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend index 819903adb1..ace7331fed 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -15,7 +15,6 @@ SRC_URI:append:fb-withhost = " file://obmc-chassis-hard-poweroff@.target \ PACKAGECONFIG:append = " json sensor-monitor" -EXTRA_OEMESON = "-Duse-host-power-state=enabled" RDEPENDS:${PN}-sensor-monitor = " bash" diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc index 84e4e40b40..375e36a765 100644 --- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -18,8 +18,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ dbus-top \ jq \ strace \ - tmux \ tcpdump \ + tmux \ + usbutils \ wget \ " OBMC_IMAGE_EXTRA_INSTALL:append:mf-fb-secondary-emmc = " \ diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service index 3a22e56b9c..9a1a9050d2 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -1,12 +1,12 @@ [Unit] Description=Power Cycle Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.Off" +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer ExecStart=sleep 6 -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.On" + SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service index ddcb9dc626..bd2bd045e4 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -1,9 +1,9 @@ [Unit] Description=Shutdown Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.Off" + SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service index f0f03a1cc9..5a46cc0100 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -1,10 +1,10 @@ [Unit] Description=Reset Host Server -Requires=host-gpio.service -After=host-gpio.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s "xyz.openbmc_project.State.Host.Transition.ForceWarmReboot" +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer + SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb index 8a6fc631c3..676fec1462 100644 --- a/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb +++ b/meta-fii/meta-kudo/recipes-kudo/ipmi/fii-ipmi-oem_git.bb @@ -11,7 +11,7 @@ DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd libgpiod" inherit meson pkgconfig SRC_URI = "git://github.com/openbmc/foxconn-ipmi-oem.git;branch=master;protocol=https" -SRCREV = "40553244bd6131be9c3395f212bed39e44932651" +SRCREV = "c2663f1c98ad690e150736896bcfdca6a15f391a" FILES:${PN}:append = " ${libdir}/ipmid-providers" FILES:${PN}:append = " ${libdir}/host-ipmid" diff --git a/meta-google/OWNERS b/meta-google/OWNERS index 1972513e66..be13eef2c6 100644 --- a/meta-google/OWNERS +++ b/meta-google/OWNERS @@ -2,7 +2,6 @@ owners: - yuenn@google.com - wak@google.com - benjaminfair@google.com -- edtanous@google.com - brandonkim@google.com - wltu@google.com - nanzhoumails@gmail.com diff --git a/meta-google/classes/image_types_hoth.bbclass b/meta-google/classes/image_types_hoth.bbclass index f01ed90ddc..00e9c4c1ff 100644 --- a/meta-google/classes/image_types_hoth.bbclass +++ b/meta-google/classes/image_types_hoth.bbclass @@ -9,9 +9,14 @@ FLASH_HOTH_SECONDARY_OFFSET:hoth = "${@61376 if FLASH_SIZE == '65536' else 7296} FLASH_IMAGE_DESC_OFFSET:hoth:aarch64 = "${@61312 if FLASH_SIZE == '65536' else 7232}" FLASH_HOTH_UPDATE_OFFSET:hoth:aarch64 = "${@61376 if FLASH_SIZE == '65536' else 31744}" +FLASH_IMAGE_DESC_OFFSET:hoth:aarch64:flash-131072 = "126848" +FLASH_HOTH_UPDATE_OFFSET:hoth:aarch64:flash-131072 = "126912" +FLASH_HOTH_MAILBOX_OFFSET:hoth:aarch64:flash-131072 = "131008" + # Leave a zero-size u-boot env partition. FLASH_UBOOT_ENV_OFFSET = "${FLASH_KERNEL_OFFSET}" FLASH_UBOOT_ENV_OFFSET:flash-65536 = "${FLASH_KERNEL_OFFSET:flash-65536}" +FLASH_UBOOT_ENV_OFFSET:flash-131072 = "${FLASH_KERNEL_OFFSET:flash-131072}" # Support BMC image to have secondary hoth firmware ENABLE_HOTH_SECONDARY ?= "no" diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf index 1311aa7529..0f5c6e8672 100644 --- a/meta-google/conf/distro/gbmc.conf +++ b/meta-google/conf/distro/gbmc.conf @@ -39,10 +39,15 @@ OBMC_ORG_YAML_SUBDIRS += " com/google" # Force the patches to not have any fuzz for gBMC ERROR_QA:append = " patch-fuzz" -IGPS_MACHINE:npcm8xx = "Google" +IGPS_MACHINE_DEFAULT = "EB" +IGPS_MACHINE_DEFAULT:npcm8xx = "Google" +IGPS_MACHINE ?= "${IGPS_MACHINE_DEFAULT}" # Remove dependencies on python3-core when using nftables PACKAGECONFIG:remove:pn-nftables = "python" # Do not configure TPM layer SKIP_META_TPM_SANITY_CHECK = "1" + +# Set /var/log directory to be volatile +VOLATILE_LOG_DIR = "yes" diff --git a/meta-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc index 477009357d..66a070a7c6 100644 --- a/meta-google/recipes-google/google-misc/google-misc.inc +++ b/meta-google/recipes-google/google-misc/google-misc.inc @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "git://github.com/openbmc/google-misc;branch=master;protocol=https" -SRCREV = "4dba220d361271859f824aaa2c7861ceb63ca2dd" +SRCREV = "a9bd43e7a12d456569548b007f71b638a6a67ef4" S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}" inherit meson pkgconfig diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index 850d9b4715..383d9ad978 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -23,7 +23,7 @@ RDEPENDS:${PN} += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys;branch=master;protocol=https" -SRCREV = "9846023c7e811d6f831941d37270b10046916fef" +SRCREV = "56b2d9f30b05a0471fec58adbba666bfe31032f3" FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb b/meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb deleted file mode 100644 index c86750f8b6..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb-generator_0.4.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -require nanopb.inc - -inherit python3-dir - -DEPENDS = "protobuf-native" -RDEPENDS:${PN} += "python3-protobuf" - -EXTRA_OECMAKE += " \ - -Dnanopb_PYTHON_INSTDIR_OVERRIDE=${PYTHON_SITEPACKAGES_DIR} \ - -Dnanopb_BUILD_RUNTIME=OFF \ - -Dnanopb_BUILD_GENERATOR=ON \ - " - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb b/meta-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb deleted file mode 100644 index e43931a4ec..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb-runtime_0.4.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -require nanopb.inc - -EXTRA_OECMAKE += " \ - -Dnanopb_PROTOC_PATH=/bin/false \ - -DBUILD_SHARED_LIBS=ON \ - -Dnanopb_BUILD_RUNTIME=ON \ - -Dnanopb_BUILD_GENERATOR=OFF \ - " - -# Maintain compatability with old header locations for packages -# which haven't yet migrated to `nanopb/pb*.h` -do_install:append() { - for hdr in ${D}${includedir}/nanopb/*; do - ln -sv nanopb/$(basename "$hdr") ${D}${includedir}/ - done -} - diff --git a/meta-google/recipes-google/nanopb/nanopb.bb b/meta-google/recipes-google/nanopb/nanopb.bb deleted file mode 100644 index 7ad6a32782..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Combined nanopb package" -PV = "1.0" -PR = "r1" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -DEPENDS = " \ - nanopb-generator \ - nanopb-runtime \ -" - -RDEPENDS:${PN} = " \ - nanopb-generator \ - nanopb-runtime \ -" diff --git a/meta-google/recipes-google/nanopb/nanopb.inc b/meta-google/recipes-google/nanopb/nanopb.inc deleted file mode 100644 index 87dbc73e63..0000000000 --- a/meta-google/recipes-google/nanopb/nanopb.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION="Protocol Buffers with small code size" -LICENSE="Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" - -SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" -SRCREV = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb index 12a8d03407..6fad50a3ca 100644 --- a/meta-google/recipes-google/ncsi/ncsid_git.bb +++ b/meta-google/recipes-google/ncsi/ncsid_git.bb @@ -11,16 +11,10 @@ EXTRA_OEMESON = " \ " SYSTEMD_SERVICE:${PN} += " \ - dhcp4@.service \ - dhcp6@.service \ ncsid@.service \ nic-hostful@.target \ nic-hostless@.target \ update-ra-gw@.service \ - update-ra-neighbor@.service \ - update-ra-neighbor@.timer \ - update-static-neighbors@.service \ - update-static-neighbors@.timer \ " DEPENDS += " \ diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend index 5253fe970b..0116afa896 100644 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,4 @@ EXTRA_OEMESON:append = " \ - -Dinsecure-tftp-update=enabled \ -Dibm-management-console=enabled \ -Dredfish-dump-log=enabled \ -Dredfish-oem-manager-fan-data=disabled \ diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c118d925e8..e0bd907a4d 100644 --- a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -13,6 +13,7 @@ RDEPENDS:${PN}-extras:append = " \ phosphor-virtual-sensor \ libmctp \ tzdata-core \ + iei-ipmi-oem \ " RDEPENDS:${PN}-devtools:append = " \ diff --git a/meta-ieisystems/meta-nf5280m7/conf/layer.conf b/meta-ieisystems/meta-nf5280m7/conf/layer.conf new file mode 100644 index 0000000000..f0f36da335 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "nf5280m7-layer" +BBFILE_PATTERN_nf5280m7-layer = "^${LAYERDIR}/" +LAYERSERIES_COMPAT_nf5280m7-layer = "nanbield scarthgap" + diff --git a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf new file mode 100644 index 0000000000..2f020adde1 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf @@ -0,0 +1,17 @@ +# Add a device tree for nf5280m7 +KMACHINE = "aspeed" +KERNEL_DEVICETREE = " \ + aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \ +" + +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_DEVICETREE = "ast2600-evb" +# UBOOT_DEVICETREE = "${UMACHINE}-ieisystems-${MACHINE}" +SPL_BINARY = "spl/u-boot-spl.bin" + +require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-bsp-common.inc + +FLASH_SIZE = "65536" + +SOCSEC_SIGN_ENABLE = "0" diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample b/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample new file mode 100644 index 0000000000..6297743d11 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample @@ -0,0 +1,20 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-ieisystems \ + ##OEROOT##/meta-ieisystems/meta-nf5280m7 \ + " + diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt new file mode 100644 index 0000000000..9b3c01a556 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample b/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample new file mode 100644 index 0000000000..033b6bbde2 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample @@ -0,0 +1,17 @@ +MACHINE ??= "nf5280m7" +DISTRO ?= "openbmc-phosphor" +PACKAGE_CLASSES ?= "package_ipk" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS ??= "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" +CONF_VERSION = "2" diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg b/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg new file mode 100644 index 0000000000..e1299422a2 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg @@ -0,0 +1,39 @@ +CONFIG_BONDING=y +CONFIG_SENSORS_EMC1403=y +CONFIG_SENSORS_ADC128D818=y +CONFIG_SENSORS_MP2888=y +CONFIG_SENSORS_INA2XX=y +CONFIG_IPMB_DEVICE_INTERFACE=y + +CONFIG_PECI=y +CONFIG_PECI_ASPEED=y +CONFIG_PECI_CHARDEV=y +CONFIG_MFD_INTEL_PECI_CLIENT=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_SENSORS_PECI_CPUPOWER=y +CONFIG_SENSORS_PECI_DIMMPOWER=y +CONFIG_SENSORS_PECI_PLATFORMPOWER=y + +# Used by nftables configurations +# copied from gbmc +CONFIG_NETFILTER=y +CONFIG_NF_CONNTRACK=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_TABLES=y +CONFIG_NFT_CT=y +CONFIG_NF_TABLES_INET=y +CONFIG_NFT_REJECT=y +CONFIG_NFT_LOG=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_NF_LOG_IPV4=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP6_NF_IPTABLES=y +CONFIG_NF_LOG_IPV6=y +CONFIG_NFT_FIB_IPV6=y +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y + +CONFIG_PANIC_TIMEOUT=900 diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 0000000000..6a0c70228b --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append: = " \ + file://nf5280m7.cfg \ +" diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend new file mode 100644 index 0000000000..3586206559 --- /dev/null +++ b/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -0,0 +1,42 @@ +SUMMARY = "OpenBMC for IEISystems - Applications" +PR = "r1" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES += " \ + ${PN}-chassis \ + ${PN}-fans \ + ${PN}-flash \ + ${PN}-system \ + " + +PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-fan-mgmt" +PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" + +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" + +SUMMARY:${PN}-chassis = "IEI Chassis" +RDEPENDS:${PN}-chassis = " \ + x86-power-control \ + " + +SUMMARY:${PN}-fans = "IEI Fans" +RDEPENDS:${PN}-fans = " \ + " + +SUMMARY:${PN}-flash = "IEI Flash" +RDEPENDS:${PN}-flash = " \ + " + +SUMMARY:${PN}-system = "IEI System" +RDEPENDS:${PN}-system = " \ + entity-manager \ + iei-ipmi-oem \ + ipmitool \ + " diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb new file mode 100644 index 0000000000..4e0f8af8f3 --- /dev/null +++ b/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "IEISystems OEM IPMI commands" +DESCRIPTION = "IEISystems OEM IPMI commands" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +SRC_URI = "git://github.com/openbmc/iei-ipmi-oem;branch=master;protocol=https" +SRCREV = "0917ac423df7a3ae700bbb21fac32f540cb58682" + +S = "${WORKDIR}/git" +PV = "0.1+git${SRCPV}" + +DEPENDS += "phosphor-ipmi-host" +DEPENDS += "phosphor-logging" + +inherit meson pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +PACKAGECONFIG ??= "" + +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" diff --git a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index de28ec2505..9c2335263f 100644 --- a/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/openbmc/host-error-monitor;branch=master;protocol=ht DEPENDS = "boost sdbusplus libgpiod libpeci phosphor-dbus-interfaces" PV = "0.1+git${SRCPV}" -SRCREV = "3a046aa90bb65c534d1460034743b07d9a140085" +SRCREV = "a6895608d542a3ad8bfd249a774877d0a2dcf43c" S = "${WORKDIR}/git" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index cd6bd15b63..2953b73ca6 100755 --- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem;branch=master;protocol=https" -SRCREV = "54d6fc709a4a737b1178cec8b352e0724c1857eb" +SRCREV = "4c0424026539c153b1b63648adfd306580a96d40" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb index 78a2908dd5..33c74f8b24 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -8,7 +8,7 @@ inherit cmake systemd pkgconfig SRC_URI = "git://github.com/openbmc/pfr-manager;branch=master;protocol=https" PV = "0.1+git${SRCPV}" -SRCREV = "1388f6cf6c0e287331e5be6062bd0f58310e1bd0" +SRCREV = "76b85dba1dc3e58fb35d740d3a0fa809b07a9113" S = "${WORKDIR}/git" diff --git a/meta-nuvoton/conf/machine/include/npcm8xx.inc b/meta-nuvoton/conf/machine/include/npcm8xx.inc index 1516966a20..218b81fe29 100644 --- a/meta-nuvoton/conf/machine/include/npcm8xx.inc +++ b/meta-nuvoton/conf/machine/include/npcm8xx.inc @@ -12,7 +12,7 @@ KERNEL_IMAGETYPES:df-obmc-static-norootfs = "${KERNEL_IMAGETYPE}" KERNEL_EXTRA_ARGS ?= "UIMAGE_LOADADDR=0x00008000" -UBOOT_MACHINE ?= "ArbelEVB_defconfig" +UBOOT_MACHINE ?= "arbel_evb_defconfig" UBOOT_ENTRYPOINT ?= "0x6200000" UBOOT_LOADADDRESS ?= "0x6200000" diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/dd.cfg b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/dd.cfg new file mode 100644 index 0000000000..f52accc509 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/dd.cfg @@ -0,0 +1,2 @@ +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/head.cfg b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/head.cfg new file mode 100644 index 0000000000..16017ea486 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox/head.cfg @@ -0,0 +1 @@ +CONFIG_FEATURE_FANCY_HEAD=y diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox_%.bbappend index b103c1a1a6..7a905cf8b5 100644 --- a/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox_%.bbappend +++ b/meta-nuvoton/meta-evb-npcm845/recipes-core/busybox/busybox_%.bbappend @@ -2,3 +2,5 @@ FILESEXTRAPATHS:prepend:evb-npcm845 := "${THISDIR}/${PN}:" SRC_URI:append:evb-npcm845 = " file://lsusb.cfg" SRC_URI:append:evb-npcm845 = " file://timeout.cfg" +SRC_URI:append:evb-npcm845 = " file://dd.cfg" +SRC_URI:append:evb-npcm845 = " file://head.cfg" diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/config-evb-npcm845.json b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/config-evb-npcm845.json new file mode 100644 index 0000000000..0c54ba6b51 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/config-evb-npcm845.json @@ -0,0 +1,149 @@ +{ + "sensors" : [ + { + "name": "Fan1", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan1", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm1", + "min": 0, + "max": 255 + }, + { + "name": "Fan2", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan2", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm2", + "min": 0, + "max": 255 + }, + { + "name": "Fan3", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan3", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm3", + "min": 0, + "max": 255 + }, + { + "name": "Fan4", + "type": "fan", + "readPath": "/xyz/openbmc_project/sensors/fan_tach/Fan4", + "writePath": "/sys/devices/platform/ahb/ahb:apb/f0103000.pwm-fan-controller/hwmon/**/pwm4", + "min": 0, + "max": 255 + }, + { + "name": "EVB_Temp", + "type": "temp", + "readPath": "/xyz/openbmc_project/sensors/temperature/EVB_Temp", + "writePath": "", + "ignoreDbusMinMax": true, + "timeout": 0 + } + ], + "zones" : [ + { + "id": 0, + "minThermalOutput": 0.0, + "failsafePercent": 100.0, + "pids": [ + { + "name": "Fan1", + "type": "fan", + "inputs": ["Fan1"], + "setpoint": 40.0, + "pid": { + "samplePeriod": 1.0, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 1.0, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 10.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + } + ] + }, + { + "id": 1, + "minThermalOutput": 0.0, + "failsafePercent": 100.0, + "pids": [ + { + "name": "Fan4", + "type": "fan", + "inputs": ["Fan4"], + "setpoint": 90.0, + "pid": { + "samplePeriod": 0.1, + "proportionalCoeff": 0.0, + "integralCoeff": 0.0, + "feedFwdOffsetCoeff": 0.0, + "feedFwdGainCoeff": 1.0, + "integralLimit_min": 0.0, + "integralLimit_max": 0.0, + "outLim_min": 10.0, + "outLim_max": 100.0, + "slewNeg": 0.0, + "slewPos": 0.0 + } + }, + { + "name": "EVB_Temp", + "type": "stepwise", + "inputs": ["EVB_Temp"], + "setpoint": 30.0, + "pid": { + "samplePeriod": 1.0, + "positiveHysteresis": 0.0, + "negativeHysteresis": 0.0, + "isCeiling": false, + "reading": { + "0": 25, + "1": 28, + "2": 31, + "3": 34, + "4": 37, + "5": 40, + "6": 43, + "7": 46, + "8": 49, + "9": 52, + "10": 55, + "11": 58, + "12": 61, + "13": 64, + "14": 67, + "15": 70 + }, + "output": { + "0": 10, + "1": 10, + "2": 20, + "3": 20, + "4": 20, + "5": 30, + "6": 30, + "7": 30, + "8": 40, + "9": 50, + "10": 60, + "11": 70, + "12": 80, + "13": 90, + "14": 100, + "15": 100 + } + + + } + } + + ] + } + ] +} diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service new file mode 100644 index 0000000000..19e99ec4bb --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service @@ -0,0 +1,14 @@ +[Unit] +Description=OpenBMC Fan Control Daemon +After=xyz.openbmc_project.fansensor.service + +[Service] +Type=simple +ExecStartPre=/usr/bin/env mapper wait /xyz/openbmc_project/sensors/temperature/EVB_Temp +ExecStart=/usr/bin/swampd +Restart=always +RestartSec=5 +StartLimitInterval=0 + +[Install] +WantedBy=basic.target diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 0000000000..a75074f7ff --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " \ + file://config-evb-npcm845.json \ + file://phosphor-pid-control.service \ + " + +FILES:${PN}:append = " ${datadir}/swampd/config.json" +RDEPENDS:${PN} += "bash" + +SYSTEMD_SERVICE:${PN}:append = " phosphor-pid-control.service" + +do_install:append() { + install -d ${D}${datadir}/swampd + install -m 0644 -D ${WORKDIR}/config-evb-npcm845.json \ + ${D}${datadir}/swampd/config.json + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/phosphor-pid-control.service \ + ${D}${systemd_system_unitdir} +} diff --git a/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend new file mode 100644 index 0000000000..d7aa6b2743 --- /dev/null +++ b/meta-nuvoton/meta-evb-npcm845/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append = " log-threshold log-alarm log-watchdog send-to-logger" diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc index 71e22251b4..5948d3cec9 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock.inc @@ -4,25 +4,36 @@ HOMEPAGE = "https://github.com/Nuvoton-Israel/npcm8xx-bootblock" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -BB_TIP = "arbel_a35_bootblock.bin" -BB_NO_TIP = "arbel_a35_bootblock_no_tip.bin" - -OUTPUT_BB_TIP_BIN = "Images/tip" -OUTPUT_BB_NO_TIP_BIN = "Images/no_tip" +PACKAGE_ARCH = "${MACHINE_ARCH}" S = "${WORKDIR}/git" - +B = "${S}/Sources" +BB_BRANCH ?= "main" SRC_URI = " \ - git://github.com/Nuvoton-Israel/npcm8xx-bootblock;branch=main;protocol=https" + git://github.com/Nuvoton-Israel/npcm8xx-bootblock;branch=${BB_BRANCH};protocol=https" -inherit deploy +export CROSS_COMPILE="${TARGET_PREFIX}" +CFLAGS[unexport] = "1" +LDFLAGS[unexport] = "1" +AS[unexport] = "1" +LD[unexport] = "1" +do_configure[noexec] = "1" + +EXTRA_OEMAKE += "CROSS_COMPILER_INC=${STAGING_DIR_HOST}${includedir}" -do_deploy () { - if [ "${TIP_IMAGE}" = "True" ] ; then - install -D -m 644 ${OUTPUT_BB_TIP_BIN}/${BB_TIP} ${DEPLOYDIR}/${BB_TIP} - else - install -D -m 644 ${OUTPUT_BB_NO_TIP_BIN}/${BB_NO_TIP} ${DEPLOYDIR}/${BB_NO_TIP} - fi +TIP = "${@'tip' if d.getVar("TIP_IMAGE") == 'True' else 'no_tip'}" +BOOTBLOCK = "arbel_a35_bootblock" +BOOTBLOCK .= "${@'_no_tip' if d.getVar("TIP_IMAGE") != 'True' else ''}" + +do_compile() { + oe_runmake "${BOOTBLOCK}" ENCLAVE="${TIP}" +} +do_compile[cleandirs] = "${B}/Images" + +inherit deploy +do_deploy() { + install -d ${DEPLOYDIR} + install -m 644 "${B}/Images/${TIP}/${BOOTBLOCK}.bin" "${DEPLOYDIR}/${BOOTBLOCK}.bin" } addtask deploy before do_build after do_compile diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb deleted file mode 100644 index 61de1333e7..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRCREV = "b45a45bce6e557af49b43492904579edb5f084a3" - -require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb new file mode 100644 index 0000000000..17a94bef91 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.4.8.bb @@ -0,0 +1,3 @@ +SRCREV = "e18737d17d4cf5e7768598a291a7ef2b8a07a776" + +require npcm8xx-bootblock.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb deleted file mode 100644 index 37b21cdcb5..0000000000 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.00.08.bb +++ /dev/null @@ -1,4 +0,0 @@ -# tag IGPS_04.00.08 -SRCREV = "7e009f77dcc5b4cde80f1ba47b1cf5a010d7e197" - -require npcm8xx-igps.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb new file mode 100644 index 0000000000..78210af9d3 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_04.01.03.bb @@ -0,0 +1,4 @@ +# tag IGPS_04.01.03 +SRCREV = "ae5ddb6c8ff350835d411b9e3bfb4443db596067" + +require npcm8xx-igps.inc diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.7.0.5.6.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.1.0.6.0.bb index 3275ec7091..90f074f157 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.7.0.5.6.bb +++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.7.1.0.6.0.bb @@ -1,4 +1,4 @@ -SRCREV = "65c421f6bd7efb96c1d95fcaaf13425129fba2c0" +SRCREV = "bdbfc0324150c4471c77bafc2cf5f6f3c64cf814" OUTPUT_BIN = "output_binaries_${DEVICE_GEN}_${IGPS_MACHINE}" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc new file mode 100644 index 0000000000..07919f114b --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2021.04.inc @@ -0,0 +1,14 @@ +HOMEPAGE = "https://github.com/Nuvoton-Israel/u-boot" +SECTION = "bootloaders" +DEPENDS += "flex-native bison-native" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" + +UBRANCH = "npcm-v2021.04" +SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https" +SRCREV = "1501268746d3f0c538908ddb7a1b901864dbfcff" + +S = "${WORKDIR}/git" + +PV .= "+${UBRANCH}+" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc index e05f15f622..78f8e092e6 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton_2023.10.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" UBRANCH = "npcm-v2023.10" SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH};protocol=https" -SRCREV = "6cb728fcca9f9e1854e7b34c1c991a9e02eff86d" +SRCREV = "fb62cf0fb4b97420ca20e9ccb0e12fa8e59213d3" S = "${WORKDIR}/git" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb new file mode 100644 index 0000000000..4f06ecf2a0 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_2021.04.bb @@ -0,0 +1,42 @@ +require u-boot-common-nuvoton_${PV}.inc + +SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities" +DEPENDS = "mtd-utils bison-native" +RDEPENDS:${PN} = "udev-nuvoton-mtd-partitions" + +PROVIDES += "u-boot-fw-utils" +SRC_URI += "file://fw_env.config" + +INSANE_SKIP:${PN} = "already-stripped" + +EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" HOSTCC="${BUILD_CC} ${BUILD_FLAGS} ${BUILD_LDFLAGS}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1' +EXTRA_OEMAKE:class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' + +inherit uboot-config + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake envtools +} + +do_install () { + install -d ${D}${base_sbindir} + install -d ${D}${sysconfdir} + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv + install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +} + +do_install:class-cross () { + install -d ${D}${bindir_cross} + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv +} + +SYSROOT_PREPROCESS_FUNCS:class-cross = "uboot_fw_utils_cross" +uboot_fw_utils_cross() { + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "cross" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb new file mode 100644 index 0000000000..6ad140eeec --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_2021.04.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "U-boot for Nuvoton NPCM7xx/NPCM8xx Baseboard Management Controller" + +require u-boot-common-nuvoton_${PV}.inc +require u-boot-nuvoton.inc + +PROVIDES += "u-boot" + +DEPENDS += "dtc-native" + +SRC_URI:append:df-phosphor-mmc = " file://u-boot-emmc.cfg" diff --git a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb index ebdf6a25c4..fc25fb1d3a 100644 --- a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb +++ b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb @@ -10,7 +10,7 @@ inherit meson inherit pkgconfig SRC_URI = "git://git@github.com/open-power/ecmd-pdbg.git;branch=master;protocol=https" -SRCREV = "7a5fc053a17691a959296bc092f24153ceeeb136" +SRCREV = "0362725415c9529c20ada661c92b2dcfc514006e" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 32e3655ed5..cf555d4692 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -11,7 +11,7 @@ inherit pkgconfig meson S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/guard;branch="main";protocol=https" -SRCREV = "e000b571c82e854180ddcbda3b76754341c72618" +SRCREV = "b4c8eaa3dd5d02083a2c954c103cfda39fa87d4c" DEPENDS = "cli11" diff --git a/meta-openpower/recipes-bsp/ipl/ipl_git.bb b/meta-openpower/recipes-bsp/ipl/ipl_git.bb index 8dd17dafcb..59cb749a2b 100644 --- a/meta-openpower/recipes-bsp/ipl/ipl_git.bb +++ b/meta-openpower/recipes-bsp/ipl/ipl_git.bb @@ -12,7 +12,7 @@ inherit autotools pkgconfig S = "${WORKDIR}/git" SRC_URI = "git://git@github.com/open-power/ipl;branch="main";protocol=https" -SRCREV = "da64b07adeb2a234c47343642c43f8aab96904a2" +SRCREV = "d6c5ff27426b2cedc7c2d29c6888b40ad96ef381" DEPENDS = " \ libekb pdbg autoconf-archive guard pdata \ diff --git a/meta-openpower/recipes-bsp/pdata/pdata_git.bb b/meta-openpower/recipes-bsp/pdata/pdata_git.bb index 9a614290ac..79d46b7e29 100644 --- a/meta-openpower/recipes-bsp/pdata/pdata_git.bb +++ b/meta-openpower/recipes-bsp/pdata/pdata_git.bb @@ -13,7 +13,7 @@ inherit autotools \ perlnative SRC_URI = "git://git@github.com/open-power/pdata;branch="main";protocol=https" -SRCREV = "298b7970fb2268ea1e2de7bfc7db338243dc7fc3" +SRCREV = "1c25e47b7d6ef2aa40c93c038a4360bf00d78086" DEPENDS = "pdbg \ libxml-simple-perl-native \ diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb index b92dc9e53e..306798374e 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_3.6.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/open-power/pdbg.git;branch=master;protocol=https" -SRCREV = "e81f3f66684aa1f8a7d843528e6353751a3a223e" +SRCREV = "f429a97edc64114ffe18530a338682b6e5928195" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 675cbb82fa..031ff3dea6 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector;branch=master;protocol=https" -SRCREV = "ef64604bc773cc537f37a3274787baadbadabd48" +SRCREV = "3dc34cf9c77359155d33aa6c18e82688bde0d2dc" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index b1c36dd4e5..83548a7c49 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/openpower-pnor-code-mgmt;branch=master;protocol=https" -SRCREV = "a96df3e39b3e3fb214ae56b7e1cadde2cba2a7e6" +SRCREV = "96442c882548d1ae0014d8cbc662e9f8a9225c9b" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index ee1d9ea667..7c528ee83c 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI = "git://github.com/openbmc/openpower-proc-control;branch=master;protocol=https" -SRCREV = "969196c323cb9bac9281195191c5774184d1daad" +SRCREV = "01e2f5c69978756418480ea68edbdfdf504b7af8" DEPENDS += " \ phosphor-logging \ diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 7f8af837ee..35e11fd7f7 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags;branch=master;protocol=https" -SRCREV = "a92dc027c4532d20ba94c96ab7029d74fad6e6cb" +SRCREV = "0c1487cb3db64d0781a7a36d78d3d810d1d79c9c" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index aa24f814eb..5b3c54b159 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control;branch=master;protocol=https" -SRCREV = "7651c06bc9ed170b6d0934fb2266dbf6fa8a6fed" +SRCREV = "c33171bb8287007c269846a18b366caa4a30290c" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 55c207d384..14914f464a 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser;branch=master;protocol=https" -SRCREV = "7ef9c8cda7c4c1315706c71c703a47ead57f2d23" +SRCREV = "893bf5debaea1ad9510e5631bd29a0a9cda4c83f" DEPENDS += "\ nlohmann-json \ cli11 \ diff --git a/meta-phosphor/classes/fit-image.bbclass b/meta-phosphor/classes/fit-image.bbclass index f37aa0271f..bf0fc4f1b9 100644 --- a/meta-phosphor/classes/fit-image.bbclass +++ b/meta-phosphor/classes/fit-image.bbclass @@ -12,7 +12,7 @@ FIT_KERNEL_COMP_ALG_EXTENSION ?= "" do_image_cpio[depends] += "virtual/kernel:do_deploy" run_assemble_fitimage() { - export linux_comp="none" + export linux_comp="${FIT_KERNEL_COMP_ALG}" fitimage_assemble $1.its $1.fitImage 1 # The fitimage_assemble puts the image into DEPLOY_DIR_NAME due to diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass index 8fefd827e0..3923a2c90f 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass @@ -30,14 +30,6 @@ do_prepare_bootloaders[depends] += " \ addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static -# Include the full bootblock and u-boot in the final static image -python do_generate_static:append() { - _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), - int(d.getVar('FLASH_UBOOT_OFFSET', True)), - int(d.getVar('FLASH_KERNEL_OFFSET', True))) -} - do_make_ubi:append() { # Concatenate the uboot and ubi partitions dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ diff --git a/meta-phosphor/recipes-core/busybox/busybox/top.cfg b/meta-phosphor/recipes-core/busybox/busybox/top.cfg new file mode 100644 index 0000000000..2cf2727e85 --- /dev/null +++ b/meta-phosphor/recipes-core/busybox/busybox/top.cfg @@ -0,0 +1,6 @@ +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_INTERACTIVE=y diff --git a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend index ee8b6223aa..93c510de6b 100644 --- a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend +++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend @@ -5,6 +5,7 @@ SRC_URI += " \ file://flash.cfg \ file://less.cfg \ file://mountpoint.cfg \ + file://top.cfg \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', \ '', 'file://reboot.cfg', d)} \ " diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 832c87291a..c4e7efdb96 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV ?= "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus;branch=master;protocol=https" -SRCREV = "1a39b64fafa18f03c62e5cbc6cd0d2da2cc6ed6d" +SRCREV = "03b2c26c8d0b97e943a0418378abbe4828184423" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 51f0b696e6..94d9c56e86 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow i LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" -SRCREV = "033b18e03fec76a026df1b71fbc2e00f2ee6fece" +SRCREV = "1ece8e3c72c256af0b921ce0eed296b00364d79d" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index e666c71460..c7d3e510e8 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -14,7 +14,7 @@ DEPENDS = " boost \ phosphor-logging \ sdbusplus \ systemd " -SRCREV = "20de6de8a8fb01032dc90d698559259af4245a87" +SRCREV = "c65f0a3aa1b77917006918908681350def2140e3" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 201a44e3c0..f03644d7c8 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ sdbusplus \ sdeventplus \ " -SRCREV = "798dca541c5d582d43fc953b0768a5aa2b009be5" +SRCREV = "887ba5bf5fd89e83a80c5011027bcea4f134a0f2" PACKAGECONFIG ??= "bmcweb-cert authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "-Dca-cert-extension=enabled,-Dca-cert-extension=disabled" PACKAGECONFIG[bmcweb-cert] = "-Dconfig-bmcweb=enabled,-Dconfig-bmcweb=disabled" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index df564f5354..01585b755b 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -9,7 +9,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "3610608ce00dd68a08929a48931835ae375d51f9" +SRCREV = "010035ee96cd6b32d1bff77eb5110d030f4e2684" PACKAGECONFIG ??= "signals handler" PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,${VIRTUAL-RUNTIME_obmc-host-state-manager} ${VIRTUAL-RUNTIME_obmc-chassis-state-manager}" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index af8434fede..7af2351bea 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -9,7 +9,7 @@ DEPENDS = "boost \ sdbusplus \ valijson \ " -SRCREV = "513976bed89432f4c24a40c7ba768f023dc280cd" +SRCREV = "0a78b90d2fce79b205a18da80d2a10998599ff15" PACKAGECONFIG ??= "ipmi-fru" PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," PACKAGECONFIG[validate-json] = "-Dvalidate-json=true, \ diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 51d531981f..517cc7982f 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "b7dddbc63e601298474dee68ea4c0cc25b865461" +SRCREV = "46d9ef298f2e26f4c513fedff3b8a26fdf4b2d35" PACKAGECONFIG ??= "udev ssh" PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" PACKAGECONFIG[concurrent-servers] = "-Dconcurrent-servers=true,-Dconcurrent-servers=false," diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index c351fa6b49..c12af9a290 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,7 +7,7 @@ DEPENDS += " \ sdbusplus \ systemd \ " -SRCREV = "b77f80647113037e831d5aa488ed333d508ae0b6" +SRCREV = "668170f4032c3ee56956c4df8b67c42042d550da" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb index 063a2eb534..0a2f77ccb1 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -9,7 +9,7 @@ DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "cli11" -SRCREV = "883d91d7d8f9a0f2bcf150990f75073cad21d94c" +SRCREV = "fb853663a2e3ca3366bf96a21a0a045f69d7ed2a" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 7a1827ef5b..1af0a71ba3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector;branch=master;protocol=https" -SRCREV = "8f3f94da33eefc7a78f58c9a9260299ecaac3eaa" +SRCREV = "50646c2de021b8cfba21d63f656f5ad559cb2818" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 1f281e5633..c28aa3bb1a 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -14,6 +14,7 @@ DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ + nlohmann-json \ " PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', \ 'obmc-ubi-fs phosphor-mmc obmc-static-norootfs', '', 'jffs-workaround', d)}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 0939a1c145..6e9c54c55e 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence;branch=master;protocol=https" -SRCREV = "613b5367e8758f88a9bf302d88e8770ac693aa17" +SRCREV = "99914e5e9ce30f6a6b7346fcf592e4b2845b5174" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 0491d5ff0a..fc7ae48d45 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -17,7 +17,7 @@ DEPENDS += "cli11" DEPENDS += "boost" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" -SRCREV = "8dc277cc790efa2a25a4778693cba1bfa24ab741" +SRCREV = "5d897e2a20a5107d4677d4da4b1ec9b0eab9e006" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 83dfe59a22..dca45f8edd 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt;branch=master;protocol=https" -SRCREV = "30352a66bed92bbc1b12a2468d3ccb5eea500004" +SRCREV = "19dd56be1df79ec47bcffa621c610da5dfbf4bf6" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index 60ed910572..fe305b0a17 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "a3c17d0fcd101a698e24e20237b59bd84249eb3f" +SRCREV = "3901884ece5dbbd6532eb262e97c9f5f8586fffe" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 2cea421f9b..92576b78f9 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -SRCREV = "c8491cb0b416637f1c1119c3f0d95500a4bd9c29" +SRCREV = "f653730d1217408bef941f998be34e2e534549fb" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 87e01a7ace..8df06ee33d 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager;branch=master;protocol=https" -SRCREV = "31424485624109a9c1e6e79e2c1e043afbfedcaa" +SRCREV = "58a0c359fb9984698a702a3580ddee0a848c05e3" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index fa2f1c3a75..0b43397bd4 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "systemd" PROVIDES += "virtual/obmc-host-ipmi-hw" -SRCREV = "b847a932b79ef5d57a04d71908bec310c28b0c9f" +SRCREV = "fc0fa20df27a48437575f0486b67883513b5cc1e" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 0cbc5ad5ff..cd57160bde 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ systemd \ ipmi-blob-tool \ " -SRCREV = "3f5962877855937e32008aac96dd750d8264cd00" +SRCREV = "166b4f19bd1c3937ef7c1a18ad9981edf5c036a0" PACKAGECONFIG ?= "cleanup-delete" PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled" # If using static-layout, reboot-update is a good option to handle updating. diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index e4c87f46a1..6890733ad5 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser;branch=master;protocol=https" -SRCREV = "d90dda488a311792646e58477d0c3381c61941e5" +SRCREV = "bc5725d02de2dec594c6ce972fa1cc077eed27db" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 333a9c0576..596e178aea 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid;branch=master;protocol=https" -SRCREV = "8fb5b89ac71ec9c344ff3c030b84a209f09e1b1c" +SRCREV = "42f64efc1eb8d6c09fb55777da2e6b6305cda3db" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index ccd7fdf531..513ee50985 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -8,7 +8,7 @@ DEPENDS = "sdbusplus \ i2c-tools \ boost \ nlohmann-json" -SRCREV = "0736e213fa0cc2d2b3463ea8918765ce3b158574" +SRCREV = "524f753f54d33984ea9d85dc940f647c66a74aa6" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index fafc500b35..487fccef5e 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager;branch=master;protocol=https" -SRCREV = "e13034150bcee2de25bb0bb02c21c33d78d230f8" +SRCREV = "94e894cb0286404821a34db04b711d7dfc4b9fd6" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index f801b54544..5718106c89 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -8,7 +8,7 @@ DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" -SRCREV = "d508bfb51df8c7d2174a7a0e678599e9d1ccab5a" +SRCREV = "29bd56b16682ef75ca5ac856bd7c72281c90e892" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 4de7cca645..50d4762eeb 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "1fe5899eacb2f736766be07fe1a053784ed016b3" +SRCREV = "b3de343e8b8952d337102df130a02dd13cce5b83" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir,systemd" diff --git a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb index 24e778bd4e..b7a15ac770 100644 --- a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb +++ b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "PLDM library implementing various PLDM specifications" HOMEPAGE = "https://github.com/openbmc/libpldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "458475a912c81f46a292a63753015ce6081061cc" +SRCREV = "9e3a5d456ec5e029cdbe0939dccbd17f033a54a5" LIBPLDM_ABI_DEVELOPMENT = "deprecated,stable,testing" LIBPLDM_ABI_MAINTENANCE = "stable,testing" LIBPLDM_ABI_PRODUCTION = "deprecated,stable" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 4e500f1515..5c41888691 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -16,7 +16,7 @@ DEPENDS += "libcereal" DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" DEPENDS += "dbus" -SRCREV = "e8026679f89642e3336b8c5e495f6ab694988e7a" +SRCREV = "7cc55b582ed88b0525d6243e2a907ffaa7c0e156" PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ -Dopenpower-pel-extension=enabled, \ diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index e1176e4202..2ba9a46658 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm;branch=master;protocol=https" -SRCREV = "15ce5a18e226e8495ddc9467c56eedaa6c9df618" +SRCREV = "079e776975ca6ef8635aff40bea71e1389242fb4" SUMMARY = "PLDM Stack" DESCRIPTION = "Implementation of the PLDM specifications" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 24749a7f4f..2420aa69ca 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power;branch=master;protocol=https" -SRCREV = "2d068dc70d1ab893315edaaaffd84160cd90c9fd" +SRCREV = "1838dbf934e4788c613b8b106f2d9cc1382d30b9" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index 4be5a49d0c..dfe4234aac 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -10,7 +10,7 @@ DEPENDS = " \ sdbusplus \ openssl \ " -SRCREV = "64c18b07e867920ec53e47bf387f2d5e5b08ca0e" +SRCREV = "33cf9f08755eee80498ee5b2e0056263d1ed00bc" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 389f20f8cd..45461a8cdd 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -SRCREV = "394f0c525355fead2f997c6d9a2096d1fb88b1f0" +SRCREV = "d8e48df6fe7a09eaad64becd8a46e42b89ba900c" PACKAGECONFIG ??= " \ adcsensor \ intelcpusensor \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 3459723495..910e66adda 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "a77827224ed0847779da98c206450bdd82b21f78" +SRCREV = "3b2e5a9b2f56e37982add882c208e50a9d41d080" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 8040e40505..23c68352a5 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -10,7 +10,7 @@ DEPENDS:append = "\ phosphor-logging \ sdbusplus \ " -SRCREV = "9358f6bda1b5bcbf300fdb67804dc16a91ac7acc" +SRCREV = "5f07fa36bbca2e9c02cb2b7f1dba0fa618a48cf9" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index 1249e8f468..aed878ee81 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "c13c87544d9fda10f668f61d5c91f9475a5028b2" +SRCREV = "0fe13aba22a36e0b0b6a369c010ff637b43b4d63" PACKAGECONFIG[smbios-no-dimm] = "-Ddimm-dbus=disabled,-Ddimm-dbus=enabled" PACKAGECONFIG[cpuinfo] = "-Dcpuinfo=enabled,-Dcpuinfo=disabled,i2c-tools" PACKAGECONFIG[cpuinfo-peci] = "-Dcpuinfo-peci=enabled,-Dcpuinfo-peci=disabled,libpeci" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index 877c21473b..ba057e3078 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -12,7 +12,7 @@ DEPENDS = " \ sdbusplus \ systemd \ " -SRCREV = "d8effd63e885cb755aa44665d833b20f187c0e53" +SRCREV = "ee190f032091dda63053a82e90866244f09ed54b" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 4f088e2cbf..fbfbbc608c 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "f2da78deb3a105c7270f74d9d747c77f0feaae2c" +SRCREV = "4653cd492616bc88da1ad24cf9bd684975cab2b5" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index f6fa3c4e4a..e0abd46ac7 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -1,5 +1,5 @@ HOST_DEFAULT_TARGETS = " \ - multi-user.target.requires/obmc-host-reset@{}.target \ + multi-user.target.wants/obmc-host-reset@{}.target \ multi-user.target.wants/phosphor-discover-system-state@{}.service \ obmc-host-start@{}.target.requires/obmc-host-startmin@{}.target \ obmc-host-start@{}.target.requires/phosphor-reset-host-reboot-attempts@{}.service \ diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index f2d4831109..72ef4cf509 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -266,6 +266,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OB SYSTEMD_LINK[vardeps] += "OBMC_CHASSIS_INSTANCES OBMC_HOST_INSTANCES" SRC_URI = "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "1901ab743aa3f820a304299aa4aea6c2827ba1de" +SRCREV = "3ff5a3603df99030a4b9bdfe6da73356eec66f96" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb index b084597da5..b4f73bdf71 100644 --- a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb +++ b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb @@ -9,7 +9,7 @@ DEPENDS += "openssl" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "stdplus" -SRCREV = "3cf9e80680a02a33c428a82769a697373612c9be" +SRCREV = "d4554f2a17686e36a77ac4a3619efd685fcbb15c" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 42160fea53..23006ae2a5 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -24,6 +24,10 @@ inherit useradd EXTRA_OEMESON = "-Dtests=disabled" +PACKAGECONFIG ?= "root-user-mgmt" +PACKAGECONFIG[root-user-mgmt] = "-Droot_user_mgmt=enabled, -Droot_user_mgmt=disabled" + + do_install:append() { install -d ${D}${libexecdir} install -m 0755 ${WORKDIR}/upgrade_hostconsole_group.sh ${D}${libexecdir}/upgrade_hostconsole_group.sh diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a453391213..e03807b378 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS:prepend = "nodejs-native " -SRCREV = "07368136b6578638f04f961b3842e93d57e41397" +SRCREV = "620e6466db409f535fc3d4a2ab85dd672e3de6dd" PV = "1.0+git${SRCPV}" # This recipe requires online access to build, as it uses NPM for dependency # management and resolution. diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 32ad115d24..7e451a5387 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "58232256fdd892e0a6193c5dd3a0dc5aab2b6477" +SRCREV = "1cc7921fb3229ee61c3162c2b6cbc8db1231cb34" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" diff --git a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb index 1b7b50cdfc..be35a51790 100644 --- a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb +++ b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb @@ -2,7 +2,7 @@ SUMMARY = "PECI Library" DESCRIPTION = "PECI Library" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" -SRCREV = "127609cc41c9ef12f62d9a280a25b7d7c1ba5793" +SRCREV = "5302b933aca5417c3e7aabcdde4d05d2ea5c3bd3" PACKAGECONFIG ??= "" PACKAGECONFIG[dbus-raw-peci] = "-Draw-peci='enabled',-Draw-peci='disabled',boost sdbusplus" PV = "0.1+git${SRCPV}" @@ -40,15 +40,15 @@ machine() { local cfg name tmpl local configs - # zsh requires wordsplit so that variable expansion behaves like bash - if [ -n "$ZSH_NAME" ]; then - setopt local_options shwordsplit - fi - if which find > /dev/null 2>&1; then + # zsh requires wordsplit so that variable expansion behaves like bash + if [ -n "$ZSH_NAME" ]; then + setopt local_options shwordsplit + fi + if which find > /dev/null 2>&1; then configs="$(find meta-* -path "*/conf/machine/*.conf")" - else - configs=$(ls -1 meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf) - fi + else + configs=$(ls -1 meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf) + fi # Add qemu machines. configs="$configs $(ls -1 poky/meta/conf/machine/qemu*.conf)" @@ -94,9 +94,9 @@ machine() { } if [ -z "$1" ]; then - echo Target machine must be specified. Use one of: - echo - machine | sort | sed "s/qemu[^[:space:]]*//" | "${COLUMN[@]}" + echo Target machine must be specified. Use one of: + echo + machine | sort | sed "s/qemu[^[:space:]]*//" | "${COLUMN[@]}" else bld_dir=$2 if [ -z "$2" ]; then |