diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
| commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
| tree | 8019999b0ca042482e5193d6cabc06220c71d776 /meta-fii | |
| parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
| parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
| download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz | |
Update
Diffstat (limited to 'meta-fii')
47 files changed, 330 insertions, 3766 deletions
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf index 4cb55ee26..ea180d473 100644 --- a/meta-fii/conf/layer.conf +++ b/meta-fii/conf/layer.conf @@ -5,4 +5,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "fii-layer" BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fii-layer = "warrior zeus gatesgarth dunfell hardknott" +LAYERSERIES_COMPAT_fii-layer = "hardknott honister" diff --git a/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf new file mode 100644 index 000000000..c64588405 --- /dev/null +++ b/meta-fii/meta-kudo/conf/distro/openbmc-kudo.conf @@ -0,0 +1,5 @@ +require conf/distro/openbmc-phosphor.conf +require conf/distro/gbmc.conf + +DISTRO = "openbmc-kudo" +VERSION_ID:kudo = "v0.d-00-kudo" diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf index 84c091cea..d2b0e57e2 100644 --- a/meta-fii/meta-kudo/conf/layer.conf +++ b/meta-fii/meta-kudo/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "kudo-layer" BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_kudo-layer = "warrior zeus gatesgarth dunfell hardknott" +LAYERSERIES_COMPAT_kudo-layer = "hardknott honister" diff --git a/meta-fii/meta-kudo/conf/local.conf.sample b/meta-fii/meta-kudo/conf/local.conf.sample index 8d07a5b5b..ed6eb492b 100644 --- a/meta-fii/meta-kudo/conf/local.conf.sample +++ b/meta-fii/meta-kudo/conf/local.conf.sample @@ -1,7 +1,7 @@ MACHINE ??= "kudo" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-kudo" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" @@ -14,5 +14,5 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 768719d8b..9f64c476b 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -5,10 +5,10 @@ require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc FLASH_SIZE = "65536" -FLASH_UBOOT_OFFSET_flash-65536 = "0" -FLASH_KERNEL_OFFSET_flash-65536 = "2048" -FLASH_ROFS_OFFSET_flash-65536 = "7168" -FLASH_RWFS_OFFSET_flash-65536 = "62400" +FLASH_UBOOT_OFFSET:flash-65536 = "0" +FLASH_KERNEL_OFFSET:flash-65536 = "2048" +FLASH_ROFS_OFFSET:flash-65536 = "7168" +FLASH_RWFS_OFFSET:flash-65536 = "62400" UBOOT_MACHINE = "PolegSVB_config" UBOOT_DEVICETREE = "nuvoton-npcm730-kudo" @@ -26,6 +26,7 @@ OBMC_MACHINE_FEATURES += " \ obmc-host-ipmi \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-chassis-mgmt \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" @@ -33,5 +34,7 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" +PREFERRED_PROVIDER_virtual/bmc-update = "kudo-bmc-update" +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-kudo-apps" # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-health-monitor" diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend index 5c56e17a0..7f1ede941 100644 --- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://fw_env.config" +SRC_URI:append:kudo = " file://fw_env.config" -do_install_append_kudo () { +do_install:append:kudo () { install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend index 1c1383680..3c0bd73a7 100644 --- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://kudo.cfg" +SRC_URI:append:kudo = " file://kudo.cfg" diff --git a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf index 46a287eef..b98610635 100644 --- a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -8,11 +8,11 @@ # Ported from debian's sysklogd.conf # Journal-style logging -# Limit to no more than 2000 entries in one minute and enable the +# Limit to no more than 4000 entries in one minute and enable the # journal workaround to avoid duplicate entries module(load="imjournal" StateFile="/var/log/state" RateLimit.Interval="60" - RateLimit.Burst="2000") + RateLimit.Burst="4000") # Template for IPMI SEL messages # "<timestamp> <ID>,<Type>,<EventData>,[<Generator ID>,<Path>,<Direction>]" diff --git a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend index 278debb32..46862b9d0 100644 --- a/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://rsyslog.conf \ file://rsyslog.logrotate \ file://rotate-event-logs.service \ @@ -8,11 +8,11 @@ SRC_URI_append_kudo = " \ file://rsyslog-override.conf \ " -FILES_${PN}_append_kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" +FILES:${PN}:append:kudo = " ${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" -PACKAGECONFIG_append_kudo = " imjournal" +PACKAGECONFIG:append:kudo = " imjournal" -do_install_append_kudo() { +do_install:append:kudo() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}/rsyslog.service.d install -m 0644 ${WORKDIR}/rsyslog-override.conf \ @@ -22,4 +22,4 @@ do_install_append_kudo() { rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN}_append_kudo = " rotate-event-logs.service" +SYSTEMD_SERVICE:${PN}:append:kudo = " rotate-event-logs.service" diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg index ff6022724..7fb979261 100644 --- a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton/kudo.cfg @@ -1,13 +1,14 @@ CONFIG_HWMON=y CONFIG_SENSORS_TMP100=y CONFIG_SENSORS_LM75=y -CONFIG_SENSORS_FAN=y +CONFIG_SENSORS_PWM_FAN=y CONFIG_SENSORS_ADC128D818=y CONFIG_SENSORS_ADM1275=y CONFIG_SENSORS_TMP102=y CONFIG_SENSORS_TMP421=y CONFIG_SENSORS_MAX31790=y CONFIG_SENSORS_MAX34440=y +CONFIG_SENSORS_ADM1266=y CONFIG_PMBUS=y CONFIG_SENSORS_PMBUS=y diff --git a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend index 5276bef59..611af3240 100644 --- a/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-fii/meta-kudo/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/linux-nuvoton:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/linux-nuvoton:" -SRC_URI_append_kudo = " file://kudo.cfg" +SRC_URI:append:kudo = " file://kudo.cfg" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index affbcf727..f7daa94a8 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -20,10 +20,10 @@ SRC_URI = "file://ampere-host-shutdown.service \ " DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ampere-host-shutdown.service \ ampere-host-reset.service \ ampere-chassis-poweroff.service \ @@ -37,42 +37,42 @@ SYSTEMD_SERVICE_${PN} = " \ HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" # Force the power cycle target to run the ampere power cycle HOST_REBOOT_SVC = "ampere-host-power-cycle.service" HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite the host reset to graceful reset HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite force reboot HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb index d01b898a9..12098adfa 100644 --- a/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb +++ b/meta-fii/meta-kudo/recipes-kudo/hotswap-power-cycle/hotswap-power-cycle.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append_kudo = " file://hotswap-power-cycle.service" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append:kudo = " file://hotswap-power-cycle.service" do_install() { install -d ${D}${systemd_unitdir}/system/ @@ -18,4 +18,4 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " hotswap-power-cycle.service" +SYSTEMD_SERVICE:${PN} = " hotswap-power-cycle.service" 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 c0793adf6..b56ce441e 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 @@ -20,7 +20,7 @@ SRCREV = "35c1ac40e476caa19c84a546d4f85ba96cb5dbbd" HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}" -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}" +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-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb index b126bfc8c..9fb7d243c 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bios-update.bb @@ -10,18 +10,18 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-bios-update.service \ file://config-bios.json \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-bios-update.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb index 184f3efc6..0b7cfbee0 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-bmc-update.bb @@ -6,11 +6,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" +RPROVIDES:${PN} += "virtual/bmc-update" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" - -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://config-bmc.json \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb index b2fd8209d..d32b280ea 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-cpld-update.bb @@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmccpld.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-mbcpld.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-bmccpld-update.service \ file://phosphor-ipmi-flash-mbcpld-update.service \ file://config-bmccpld.json \ @@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-bmccpld-update.service \ phosphor-ipmi-flash-mbcpld-update.service \ " @@ -36,4 +36,4 @@ do_install () { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-bmccpld-update.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-ipmi-flash-mbcpld-update.service ${D}${systemd_system_unitdir} -}
\ No newline at end of file +} diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb index 03ce088fc..28d276f96 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw.bb @@ -10,8 +10,8 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI = " \ @@ -22,7 +22,7 @@ SRC_URI = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ kudo-fw-ver.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index a63c3e61c..5e0763a64 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -23,14 +23,14 @@ function fwbios() { if [ ! -f $1 ]; then echo " Cannot find the" $1 "image file" - exit 1 + return 1 fi echo "Flashing BIOS @/dev/$BIOS_MTD" flashcp -v $1 /dev/$BIOS_MTD if [ $? -ne 0 ]; then echo "Flashing the bios failed " >&2 - exit 1 + return 1 fi wait @@ -47,17 +47,19 @@ function fwbios() { # nvparm -s 0x1 -o 0x5F0638 if [ $? -ne 0 ]; then echo "Setting default nvparms failed " >&2 - exit 1 + return 1 fi if [[ $(find ${1} -type f -size +17156k 2>/dev/null) ]]; then echo "Extracting the SCP from the image" dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img + # Update both primary and backup EEPROM fwscp /run/initramfs/myscp.img + fwscpback /run/initramfs/myscp.img fi - rm -f $1 - exit 0 + + return 0 } function fwbmccpld() { @@ -66,12 +68,12 @@ function fwbmccpld() { loadsvf -d /dev/jtag0 -s $1 -m 0 if [ $? -ne 0 ]; then echo "BMC CPLD update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 218 out 1 - rm -f $1 - exit 0 + + return 0 } function fwmbcpld() { @@ -82,47 +84,49 @@ function fwmbcpld() { loadsvf -d /dev/jtag0 -s $1 -m 0 if [ $? -ne 0 ]; then echo "Mobo CPLD update failed" >&2 - exit 1 + return 1 fi wait - rm -f $1 - exit 0 + + return 0 } function fwscp() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU + scp_eeprom_sel=`get_gpio_ctrl 168` set_gpio_ctrl 168 out 1 set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 if [ $? -ne 0 ]; then echo "SCP eeprom update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out 1 - rm -f $1 - exit 0 + set_gpio_ctrl 168 out $scp_eeprom_sel + + return 0 } function fwscpback() { # BMC_I2C_BACKUP_SEL #168 0:failover, 1:main # BMC_CPU_EEPROM_I2C_SEL #85 0:BMC, 1:CPU + scp_eeprom_sel=`get_gpio_ctrl 168` set_gpio_ctrl 168 out 0 set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 if [ $? -ne 0 ]; then echo "SCP BACKUP eeprom update failed" >&2 - exit 1 + return 1 fi wait set_gpio_ctrl 85 out 1 - set_gpio_ctrl 168 out 1 - rm -f $1 - exit 0 + set_gpio_ctrl 168 out $scp_eeprom_sel + + return 0 } function fwmb_pwr_seq(){ @@ -130,24 +134,23 @@ function fwmb_pwr_seq(){ #$2 0x41 seq config file if [[ ! -e $1 ]]; then echo "$1 file does not exist" - exit 1 + return 1 fi if [[ ! -e $2 ]]; then echo "$2 file does not exist" - exit 1 + return 1 fi echo 32-0040 > /sys/bus/i2c/drivers/adm1266/unbind echo 32-0041 > /sys/bus/i2c/drivers/adm1266/unbind adm1266_fw_fx $1 $2 if [ $? -ne 0 ]; then echo "The power seq flash failed" >&2 - exit 1 + return 1 fi echo 32-0040 > /sys/bus/i2c/drivers/adm1266/bind echo 32-0041 > /sys/bus/i2c/drivers/adm1266/bind - rm -f $1 - rm -f $2 - exit 0 + + return 0 } if [[ ! $(which flashcp) ]]; then @@ -189,3 +192,8 @@ case $1 in *) ;; esac +ret=$? + +rm -f $2 $3 + +exit $ret diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb index 2c82ac8f6..70c40e631 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-scp-update.bb @@ -10,13 +10,13 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scp.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-scpback.json" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://phosphor-ipmi-flash-scp-update.service \ file://phosphor-ipmi-flash-scpback-update.service \ file://config-scp.json \ @@ -24,7 +24,7 @@ SRC_URI_append_kudo = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ phosphor-ipmi-flash-scp-update.service \ phosphor-ipmi-flash-scpback-update.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb index 87e4f747b..c800f266e 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot.bb @@ -9,8 +9,8 @@ inherit systemd inherit obmc-phosphor-systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI = " \ file://init_once.sh \ @@ -18,7 +18,7 @@ SRC_URI = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ host-powerctrl.service \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh index 5145009a6..adb86f238 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh @@ -1,15 +1,23 @@ #!/bin/bash source /usr/sbin/kudo-lib.sh +# 0 for EVT. DVT will have a non-zero board version +boardver=$(printf '%d' `cat /sys/bus/i2c/drivers/fiicpld/34-0076/CMD00 | awk '{print $6}'`) # sleep so that FRU and all ipmitool Devices are ready before HOST OS # gpio 143 for HPM_STBY_RST_N do to DC-SCM spec set_gpio_ctrl 143 out 1 -sleep 5 # for the MUX to get ready +sleep 5 # for the MUX to get ready # set all mux route to CPU before power on host # BMC_CPU_RTC_I2C_SEL #120 set_gpio_ctrl 120 out 1 # BMC_CPU_DDR_I2C_SEL #84 set_gpio_ctrl 84 out 1 +# On EVT machines, the secondary SCP EEPROM is used. +# Set BMC_I2C_BACKUP_SEL to secondary. +if [[ $boardver == 0 ]]; then + echo "EVT system. Choosing secondary SCP EEPROM." + set_gpio_ctrl 168 out 0 +fi # BMC_CPU_EEPROM_I2C_SEL #85 set_gpio_ctrl 85 out 1 # BMC_CPU_PMBUS_SEL #86 diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb index f4e0bb09f..324bd640c 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd.bb @@ -5,7 +5,7 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " \ file://kudo.sh \ diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb index 85006dadc..0b0ac37c6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-system/kudo-entity-association-map.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 SRC_URI += "file://kudo_entity_association_map.json" -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/ipmi-entity-association/entity_association_map.json \ " diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb index 249e454ae..6e7be67c2 100644 --- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb +++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb @@ -4,18 +4,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -SRC_URI_append += " \ +SRC_URI:append += " \ file://usb_network.sh \ file://usb_network.service \ file://00-bmc-usb0.network \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN}_append = " usb_network.service" -FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" +SYSTEMD_SERVICE:${PN}:append = " usb_network.service" +FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" do_install() { install -d ${D}/${sbindir} diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index cc32052c5..800efde74 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -11,23 +11,23 @@ PACKAGES = " \ ${PN}-fan-mgmt \ " +PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" -RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" -RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" -SUMMARY_${PN}-kudo-chassis = "kudo chassis" -RDEPENDS_${PN}-kudo-chassis = " \ +SUMMARY:${PN}-kudo-chassis = "kudo chassis" +RDEPENDS:${PN}-kudo-chassis = " \ phosphor-hostlogger \ obmc-op-control-power \ - obmc-phosphor-buttons-signals \ - obmc-phosphor-buttons-handler \ " -SUMMARY_${PN}-kudo-system = "kudo System" -RDEPENDS_${PN}-kudo-system = " \ +SUMMARY:${PN}-kudo-system = "kudo System" +RDEPENDS:${PN}-kudo-system = " \ ipmitool \ ethtool \ memtester \ @@ -42,10 +42,11 @@ RDEPENDS_${PN}-kudo-system = " \ kudo-boot \ kudo-cmd \ phosphor-state-manager \ + smbios-mdr \ " -SUMMARY_${PN}-kudo-fw = "kudo Firmware" -RDEPENDS_${PN}-kudo-fw = " \ +SUMMARY:${PN}-kudo-fw = "kudo Firmware" +RDEPENDS:${PN}-kudo-fw = " \ kudo-fw \ kudo-bios-update \ kudo-bmc-update \ @@ -53,8 +54,8 @@ RDEPENDS_${PN}-kudo-fw = " \ kudo-scp-update \ " -SUMMARY_${PN}-fan-mgmt = "kudo fan mgmt" -RDEPENDS_${PN}-fan-mgmt = " \ +SUMMARY:${PN}-fan-mgmt = "kudo fan mgmt" +RDEPENDS:${PN}-fan-mgmt = " \ pwm-init \ phosphor-pid-control \ " diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json index b304fe1d9..cba3d0108 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/blacklist.json @@ -1,3 +1,3 @@ { - "buses": [1] + "buses": [1, 12] } diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json deleted file mode 100644 index a2cb8750b..000000000 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager/kudo.json +++ /dev/null @@ -1,3569 +0,0 @@ -[ - { - "Exposes":[ - { - "Address":"$address", - "Bus":"$bus", - "Name":"BMC FRU", - "Type":"EEPROM" - }, - { - "Address":"0x59", - "Bus":14, - "Name":"BMC_MAX34440", - "EntityID" : "0x13", - "Labels":[ - "vout2", - "vout3", - "vout4", - "vout5", - "vout6" - ], - "vout2_Name":"DC_P2V5", - "vout3_Name":"DC_P1V2", - "vout4_Name":"DC_P3V3_PU", - "vout5_Name":"DC_3V3_STBY", - "vout6_Name":"DC_P1V175", - "vout2_Max":3.5, - "vout3_Max":2.5, - "vout4_Max":5.8, - "vout5_Max":5.8, - "vout6_Max":3, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":2.877 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":2.74 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":2.260 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":2.192 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.33 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.22 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.15 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":1.137 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":3.927 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":3.745 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":2.951 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":2.724 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":3.927 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":3.745 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":2.951 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":2.724 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":1.298 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":1.239 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":1.109 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":1.109 - } - ], - "Type":"MAX34440" - }, - { - "Name":"DC_P2V5", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":0 - }, - { - "Name":"DC_P1V2", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":1 - }, - { - "Name":"DC_P3V3_PU", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":2 - }, - { - "Name":"DC_3V3_STBY", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":3 - }, - { - "Name":"DC_P1V175", - "Type":"MAX34440", - "EntityId":"0x13", - "EntityInstance":4 - } - ], - "Name":"Kudo_BMC", - "Probe":"xyz.openbmc_project.FruDevice({'BOARD_SERIAL_NUMBER': 'ACN*'})", - "Type":"Board", - "xyz.openbmc_project.Inventory.Decorator.Asset":{ - "Manufacturer":"$BOARD_MANUFACTURER", - "Model":"$BOARD_PRODUCT_NAME", - "PartNumber":"$BOARD_PART_NUMBER", - "SerialNumber":"$BOARD_SERIAL_NUMBER" - }, - "xyz.openbmc_project.Inventory.Decorator.FruDevice":{ - "Bus":"$bus", - "Address":"$address" - }, - "xyz.openbmc_project.Inventory.Decorator.Ipmi": { - "EntityId": "0x07", - "EntityInstance": 0 - } - }, - { - "Exposes":[ - { - "Address":"$address", - "Bus":"$bus", - "Name":"MB FRU", - "Type":"EEPROM" - }, - { - "Address":"0x48", - "Bus":42, - "Name":"Mobo_M2_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":70 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":60 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 1 - }, - { - "Address":"0x49", - "Bus":43, - "Name":"Mobo_BATT_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":70 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":60 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 2 - }, - { - "Address":"0x48", - "Bus":44, - "Name":"CPU0_NBM_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":80 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":70 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 3 - }, - { - "Address":"0x49", - "Bus":45, - "Name":"CPU1_NBM_ZONE_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":80 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":70 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 4 - }, - { - "Address":"0x5c", - "Bus":20, - "Name":"Mobo_INLET1_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":46 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":42 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 5 - }, - { - "Address":"0x5c", - "Bus":21, - "Name":"Mobo_OUTLET1_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 6 - }, - { - "Address":"0x5c", - "Bus":22, - "Name":"Mobo_OUTLET2_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 7 - }, - { - "Address":"0x5c", - "Bus":23, - "Name":"Mobo_OUTLET3_T", - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Severity":1, - "Value":85 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Severity":0, - "Value":80 - } - ], - "Type":"TMP75", - "EntityId": "0x03", - "EntityInstance": 8 - }, - { - "Address":"0x74", - "Bus":26, - "Name":"Mobo_STB_T", - "Labels":[ - "temp1" - ], - "temp1_Name":"Mobo_STB_T", - "temp1_Max":255, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":105 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - } - ], - "Type":"pmbus", - "EntityId": "0x03", - "EntityInstance": 9 - }, - { - "Address":"0x40", - "Bus":32, - "Name":"MB_ADM1266_0", - "Labels":[ - "vout1", - "vout2", - "vout3", - "vout4", - "vout5", - "vout6", - "vout7", - "vout8", - "vout9", - "vout10", - "vout11", - "vout12", - "vout13", - "vout14", - "vout15", - "vout16", - "vout17" - ], - "vout1_Name":"Mobo_12V_PSTB", - "vout2_Name":"Mobo_5V", - "vout3_Name":"Mobo_3V3", - "vout4_Name":"Mobo_3V3_STB", - "vout5_Name":"Mobo_48V", - "vout6_Name":"CPU0_13V5_NBM", - "vout7_Name":"CPU0_3V3_SOC", - "vout8_Name":"CPU0_1V2_DQ0123", - "vout9_Name":"CPU0_1V2_DQ4567", - "vout10_Name":"Mobo_8V5_PSTB", - "vout11_Name":"Mobo_5V_PSTB", - "vout12_Name":"CPU0_1V8_VDDH", - "vout13_Name":"CPU0_1V5_VDDH", - "vout14_Name":"Mobo_1V8_SATA", - "vout15_Name":"CPU0_1V8_SOC", - "vout16_Name":"CPU0_0V8_DC_SOC", - "vout17_Name":"Mobo_VBAT_RTC", - "vout1_Max":14.5, - "vout2_Max":8.5, - "vout3_Max":6, - "vout4_Max":6, - "vout5_Max":70, - "vout6_Max":19.5, - "vout7_Max":5, - "vout8_Max":3, - "vout9_Max":3, - "vout10_Max":11.5, - "vout11_Max":7.5, - "vout12_Max":4, - "vout13_Max":3, - "vout14_Max":4.5, - "vout15_Max":5, - "vout16_Max":3, - "vout17_Max":6, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":12.654 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":12.483 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":11.856 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":11.343 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":6.127 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":5.328 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":4.695 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":3.397 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":4.019 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":3.502 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":3.079 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":2.773 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":5.593 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":4.935 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":235 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":1.762 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":65.175 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":60.225 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":39.6 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":36.3 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":16.872 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":15.048 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":9.88 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":8.436 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout7", - "Severity":1, - "Value":4.018 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout7", - "Severity":0, - "Value":3.489 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout7", - "Severity":0, - "Value":3.097 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout7", - "Severity":1, - "Value":2.234 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout8", - "Severity":1, - "Value":1.829 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout8", - "Severity":0, - "Value":1.286 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout8", - "Severity":0, - "Value":1.121 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout8", - "Severity":1, - "Value":0.755 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout9", - "Severity":1, - "Value":1.805 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout9", - "Severity":0, - "Value":1.263 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout9", - "Severity":0, - "Value":1.145 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout9", - "Severity":1, - "Value":0.802 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout10", - "Severity":1, - "Value":9.02 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout10", - "Severity":0, - "Value":8.975 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout10", - "Severity":0, - "Value":7.983 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout10", - "Severity":1, - "Value":7.938 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout11", - "Severity":1, - "Value":5.321 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout11", - "Severity":0, - "Value":5.204 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout11", - "Severity":0, - "Value":4.792 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout11", - "Severity":1, - "Value":4.704 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout12", - "Severity":1, - "Value":2.198 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout12", - "Severity":0, - "Value":1.915 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout12", - "Severity":0, - "Value":1.680 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout12", - "Severity":1, - "Value":1.193 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout13", - "Severity":1, - "Value":1.829 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout13", - "Severity":0, - "Value":1.711 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout13", - "Severity":0, - "Value":1.404 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout13", - "Severity":1, - "Value":1.003 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout14", - "Severity":1, - "Value":2.112 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout14", - "Severity":0, - "Value":1.918 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout14", - "Severity":0, - "Value":1.672 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout14", - "Severity":1, - "Value":1.408 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout15", - "Severity":1, - "Value":2.195 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout15", - "Severity":0, - "Value":1.92 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout15", - "Severity":0, - "Value":1.666 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout15", - "Severity":1, - "Value":1.176 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout16", - "Severity":1, - "Value":1.215 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout16", - "Severity":0, - "Value":1.062 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout16", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout16", - "Severity":1, - "Value":0.578 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout17", - "Severity":1, - "Value":4.019 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout17", - "Severity":0, - "Value":3.713 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout17", - "Severity":0, - "Value":3.079 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout17", - "Severity":1, - "Value":2.280 - } - ], - "Type":"ADM1266" - }, - { - "Name":"Mobo_12V_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":5 - }, - { - "Name":"Mobo_5V", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":6 - }, - { - "Name":"Mobo_3V3", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":7 - }, - { - "Name":"Mobo_3V3_STB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":8 - }, - { - "Name":"Mobo_48V", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":9 - }, - { - "Name":"CPU0_13V5_NBM", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":10 - }, - { - "Name":"CPU0_3V3_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":11 - }, - { - "Name":"CPU0_1V2_DQ0123", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":12 - }, - { - "Name":"CPU0_1V2_DQ4567", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":13 - }, - { - "Name":"Mobo_8V5_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":14 - }, - { - "Name":"Mobo_5V_PSTB", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":15 - }, - { - "Name":"CPU0_1V8_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":16 - }, - { - "Name":"CPU0_1V5_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":17 - }, - { - "Name":"Mobo_1V8_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":18 - }, - { - "Name":"CPU0_1V8_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":19 - }, - { - "Name":"CPU0_0V8_DC_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":20 - }, - { - "Name":"Mobo_VBAT_RTC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":21 - }, - { - "Address":"0x41", - "Bus":32, - "Name":"MB_ADM1266_1", - "Labels":[ - "vout2", - "vout3", - "vout4", - "vout5", - "vout6", - "vout7", - "vout8", - "vout9", - "vout10", - "vout11", - "vout12", - "vout13", - "vout14", - "vout15", - "vout16", - "vout17" - ], - "vout2_Name":"Mobo_5V_SATA", - "vout3_Name":"Mobo_1V_SATA", - "vout4_Name":"CPU0_0V85_DC_RCA", - "vout5_Name":"CPU0_1V8_PCP", - "vout6_Name":"CPU1_13V5_NBM", - "vout7_Name":"CPU1_3V3_SOC", - "vout8_Name":"CPU1_1V2_DQ0123", - "vout9_Name":"CPU1_1V2_DQ4567", - "vout10_Name":"CPU0_0V75_PCP", - "vout11_Name":"CPU1_0V75_PCP", - "vout12_Name":"CPU1_1V8_VDDH", - "vout13_Name":"CPU1_1V5_VDDH", - "vout14_Name":"CPU1_0V85_DC_RCA", - "vout15_Name":"CPU1_1V8_SOC", - "vout16_Name":"CPU1_0V8_DC_SOC", - "vout17_Name":"CPU1_1V8_PCP", - "vout2_Max":9, - "vout3_Max":4.5, - "vout4_Max":3, - "vout5_Max":4, - "vout6_Max":20, - "vout7_Max":5.5, - "vout8_Max":3.5, - "vout9_Max":3.5, - "vout10_Max":3, - "vout11_Max":3, - "vout12_Max":4, - "vout13_Max":3.4, - "vout14_Max":3, - "vout15_Max":4, - "vout16_Max":3.2, - "vout17_Max":4, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":6.178 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":5.648 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":4.059 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":3.389 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":3.08 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":2.816 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":0.49 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.44 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout4", - "Severity":1, - "Value":2.006 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout4", - "Severity":0, - "Value":1.77 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout4", - "Severity":0, - "Value":0.354 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout4", - "Severity":1, - "Value":0.177 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout5", - "Severity":1, - "Value":2.355 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout5", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout5", - "Severity":0, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout5", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout6", - "Severity":1, - "Value":18.33 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout6", - "Severity":0, - "Value":16.77 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout6", - "Severity":0, - "Value":9.36 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout6", - "Severity":1, - "Value":7.8 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout7", - "Severity":1, - "Value":4.212 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout7", - "Severity":0, - "Value":3.888 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout7", - "Severity":0, - "Value":2.268 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout7", - "Severity":1, - "Value":2.16 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout8", - "Severity":1, - "Value":2.055 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout8", - "Severity":0, - "Value":1.644 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout8", - "Severity":0, - "Value":0.959 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout8", - "Severity":1, - "Value":0.685 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout9", - "Severity":1, - "Value":2.055 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout9", - "Severity":0, - "Value":1.644 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout9", - "Severity":0, - "Value":0.959 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout9", - "Severity":1, - "Value":0.685 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout10", - "Severity":1, - "Value":1.416 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout10", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout10", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout10", - "Severity":1, - "Value":0.531 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout11", - "Severity":1, - "Value":1.416 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout11", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout11", - "Severity":0, - "Value":0.649 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout11", - "Severity":1, - "Value":0.531 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout12", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout12", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout12", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout12", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout13", - "Severity":1, - "Value":2.06 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout13", - "Severity":0, - "Value":1.79 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout13", - "Severity":0, - "Value":1.197 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout13", - "Severity":1, - "Value":0.931 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout14", - "Severity":1, - "Value":2.124 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout14", - "Severity":0, - "Value":1.888 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout14", - "Severity":0, - "Value":0.354 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout14", - "Severity":1, - "Value":0.165 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout15", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout15", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout15", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout15", - "Severity":1, - "Value":1.099 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout16", - "Severity":1, - "Value":1.375 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout16", - "Severity":0, - "Value":1.125 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout16", - "Severity":0, - "Value":0.6 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout16", - "Severity":1, - "Value":0.5 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout17", - "Severity":1, - "Value":2.433 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout17", - "Severity":0, - "Value":2.119 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout17", - "Severity":0, - "Value":1.413 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout17", - "Severity":1, - "Value":1.099 - } - ], - "Type":"ADM1266" - }, - { - "Name":"Mobo_5V_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":22 - }, - { - "Name":"Mobo_1V_SATA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":23 - }, - { - "Name":"CPU0_0V85_DC_RCA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":24 - }, - { - "Name":"CPU0_1V8_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":25 - }, - { - "Name":"CPU1_13V5_NBM", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":26 - }, - { - "Name":"CPU1_3V3_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":27 - }, - { - "Name":"CPU1_1V2_DQ0123", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":28 - }, - { - "Name":"CPU1_1V2_DQ4567", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":29 - }, - { - "Name":"CPU0_0V75_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":30 - }, - { - "Name":"CPU1_0V75_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":31 - }, - { - "Name":"CPU1_1V8_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":32 - }, - { - "Name":"CPU1_1V5_VDDH", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":33 - }, - { - "Name":"CPU1_0V85_DC_RCA", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":34 - }, - { - "Name":"CPU1_1V8_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":35 - }, - { - "Name":"CPU1_0V8_DC_SOC", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":36 - }, - { - "Name":"CPU1_1V8_PCP", - "Type":"ADM1266", - "EntityId":"0x13", - "EntityInstance":37 - }, - { - "Address":"0x4e", - "Bus":2, - "Name":"MB_smpro_CPU1", - "Labels":[ - "temp1", - "temp2", - "temp3", - "temp4", - "temp5", - "temp6", - "temp7", - "temp8", - "temp9", - "temp10", - "temp11", - "temp12", - "temp13", - "power1", - "power2", - "power3", - "power4", - "power5", - "vout0", - "vout1", - "vout2", - "vout3", - "vout4", - "iout1", - "iout2", - "iout3", - "iout4", - "iout5" - ], - "Type":"AC01_SMPRO", - "temp1_Name":"CPU1_SOC_T", - "temp2_Name":"CPU1_SOC_VRD_T", - "temp3_Name":"CPU1_DIMM_VRD_T", - "temp4_Name":"CPU1_CORE_VRD_T", - "temp5_Name":"CPU1_CH0DIMM_T", - "temp6_Name":"CPU1_CH1DIMM_T", - "temp7_Name":"CPU1_CH2DIMM_T", - "temp8_Name":"CPU1_CH3DIMM_T", - "temp9_Name":"CPU1_CH4DIMM_T", - "temp10_Name":"CPU1_CH5DIMM_T", - "temp11_Name":"CPU1_CH6DIMM_T", - "temp12_Name":"CPU1_CH7DIMM_T", - "temp13_Name":"CPU1_RCA_VR_T", - "power1_Name":"CPU1_CPU_PW", - "power2_Name":"CPU1_SOC_TDP_PW", - "power3_Name":"CPU1_DIMM_VR1_PW", - "power4_Name":"CPU1_DIMM_VR2_PW", - "power5_Name":"CPU1_RCA_VR_PW", - "vout0_Name":"CPU1_CPU_VCORE", - "vout1_Name":"CPU1_SOC_V", - "vout2_Name":"CPU1_DIMM_VR1_V", - "vout3_Name":"CPU1_DIMM_VR2_V", - "vout4_Name":"CPU1_RCA_VR_V", - "iout1_Name":"CPU1_CORE_VRD_CU", - "iout2_Name":"CPU1_SOC_VRD_CU", - "iout3_Name":"CPU1_DIMM_VR1_CU", - "iout4_Name":"CPU1_DIMM_VR2_CU", - "iout5_Name":"CPU1_RCA_VRD_CU", - "temp1_Max":255, - "temp2_Max":255, - "temp3_Max":255, - "temp4_Max":255, - "temp5_Max":255, - "temp6_Max":255, - "temp7_Max":255, - "temp8_Max":255, - "temp9_Max":255, - "temp10_Max":255, - "temp11_Max":255, - "temp12_Max":255, - "temp13_Max":255, - "power1_Max":255, - "power2_Max":255, - "power3_Max":40, - "power4_Max":40, - "power5_Max":255, - "vout0_Max":3.2, - "vout1_Max":3.3, - "vout2_Max":3, - "vout3_Max":3, - "vout4_Max":7, - "iout1_Max":40, - "iout2_Max":14, - "iout3_Max":20, - "iout4_Max":20, - "iout5_Max":18, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp2", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp2", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp3", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp3", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp4", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp4", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp6", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp6", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp7", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp7", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp8", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp8", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp9", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp9", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp10", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp10", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp11", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp11", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp12", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp12", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp13", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp13", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power1", - "Severity":1, - "Value":54 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"power1", - "Severity":0, - "Value":48 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power3", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power4", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout0", - "Severity":1, - "Value":1.375 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout0", - "Severity":1, - "Value":0.312 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout0", - "Severity":0, - "Value":1.375 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout0", - "Severity":0, - "Value":0.312 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":1.032 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":0.32 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":0.903 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":0.45 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":1.475 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":0.920 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":1.357 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":1.003 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.475 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.920 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.357 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.003 - } - ] - }, - { - "Name":"CPU1_SOC_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":12 - }, - { - "Name":"CPU1_SOC_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":13 - }, - { - "Name":"CPU1_DIMM_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":14 - }, - { - "Name":"CPU1_CORE_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":15 - }, - { - "Name":"CPU1_DIMMG_T", - "EntityId":"0x03", - "EntityInstance":16 - }, - { - "Name":"CPU1_CH0DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":17 - }, - { - "Name":"CPU1_CH1DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":18 - }, - { - "Name":"CPU1_CH2DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":19 - }, - { - "Name":"CPU1_CH3DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":20 - }, - { - "Name":"CPU1_CH4DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":22 - }, - { - "Name":"CPU1_CH5DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":23 - }, - { - "Name":"CPU1_CH6DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":24 - }, - { - "Name":"CPU1_CH7DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":25 - }, - { - "Name":"CPU1_CPU_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":38 - }, - { - "Name":"CPU1_DIMM_VR1_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":39 - }, - { - "Name":"CPU1_DIMM_VR2_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":40 - }, - { - "Name":"CPU1_MEM_PW", - "EntityId":"0x13", - "EntityInstance":41 - }, - { - "Name":"CPU1_RCA_VR_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":42 - }, - { - "Name":"CPU1_SOC_TDP_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":43 - }, - { - "Name":"CPU1_CPU_VCORE", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":44 - }, - { - "Name":"CPU1_SOC_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":45 - }, - { - "Name":"CPU1_DIMM_VR1_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":46 - }, - { - "Name":"CPU1_DIMM_VR2_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":47 - }, - { - "Name":"CPU1_DIMM_DDR_V", - "EntityId":"0x13", - "EntityInstance":48 - }, - { - "Name":"CPU1_RCA_VR_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":49 - }, - { - "Name":"CPU1_RCA_VR_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":26 - }, - { - "Name":"CPU1_CORE_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":50 - }, - { - "Name":"CPU1_SOC_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":51 - }, - { - "Name":"CPU1_DIMM_VR1_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":52 - }, - { - "Name":"CPU1_DIMM_VR2_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":53 - }, - { - "Name":"CPU1_RCA_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":54 - }, - { - "Address":"0x4f", - "Bus":2, - "Name":"MB_smpro_CPU0", - "Labels":[ - "temp1", - "temp2", - "temp3", - "temp4", - "temp5", - "temp6", - "temp7", - "temp8", - "temp9", - "temp10", - "temp11", - "temp12", - "temp13", - "power1", - "power2", - "power3", - "power4", - "power5", - "vout0", - "vout1", - "vout2", - "vout3", - "vout4", - "iout1", - "iout2", - "iout3", - "iout4", - "iout5" - ], - "Type":"AC01_SMPRO", - "temp1_Name":"CPU0_SOC_T", - "temp2_Name":"CPU0_SOC_VRD_T", - "temp3_Name":"CPU0_DIMM_VRD_T", - "temp4_Name":"CPU0_CORE_VRD_T", - "temp5_Name":"CPU0_CH0DIMM_T", - "temp6_Name":"CPU0_CH1DIMM_T", - "temp7_Name":"CPU0_CH2DIMM_T", - "temp8_Name":"CPU0_CH3DIMM_T", - "temp9_Name":"CPU0_CH4DIMM_T", - "temp10_Name":"CPU0_CH5DIMM_T", - "temp11_Name":"CPU0_CH6DIMM_T", - "temp12_Name":"CPU0_CH7DIMM_T", - "temp13_Name":"CPU0_RCA_VR_T", - "power1_Name":"CPU0_CPU_PW", - "power2_Name":"CPU0_SOC_TDP_PW", - "power3_Name":"CPU0_DIMM_VR1_PW", - "power4_Name":"CPU0_DIMM_VR2_PW", - "power5_Name":"CPU0_RCA_VR_PW", - "vout0_Name":"CPU0_CPU_VCORE", - "vout1_Name":"CPU0_SOC_V", - "vout2_Name":"CPU0_DIMM_VR1_V", - "vout3_Name":"CPU0_DIMM_VR2_V", - "vout4_Name":"CPU0_RCA_VR_V", - "iout1_Name":"CPU0_CORE_VRD_CU", - "iout2_Name":"CPU0_SOC_VRD_CU", - "iout3_Name":"CPU0_DIMM_VR1_CU", - "iout4_Name":"CPU0_DIMM_VR2_CU", - "iout5_Name":"CPU0_RCA_VRD_CU", - "temp1_Max":255, - "temp2_Max":255, - "temp3_Max":255, - "temp4_Max":255, - "temp5_Max":255, - "temp6_Max":255, - "temp7_Max":255, - "temp8_Max":255, - "temp9_Max":255, - "temp10_Max":255, - "temp11_Max":255, - "temp12_Max":255, - "temp13_Max":255, - "power1_Max":350, - "power2_Max":250, - "power3_Max":40, - "power4_Max":80, - "power5_Max":255, - "vout0_Max":3, - "vout1_Max":3.5, - "vout2_Max":3.5, - "vout3_Max":3.5, - "vout4_Max":5, - "iout1_Max":40, - "iout2_Max":14, - "iout3_Max":20, - "iout4_Max":20, - "iout5_Max":18, - "Thresholds":[ - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp1", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp1", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp2", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp2", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp3", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp3", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp4", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp4", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp5", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp5", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp6", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp6", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp7", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp7", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp8", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp8", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp9", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp9", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp10", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp10", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp11", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp11", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp12", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp12", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"temp13", - "Severity":1, - "Value":104.5 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"temp13", - "Severity":0, - "Value":100 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power1", - "Severity":1, - "Value":54 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"power1", - "Severity":0, - "Value":49 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power3", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"power4", - "Severity":1, - "Value":40 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout0", - "Severity":1, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout0", - "Severity":1, - "Value":0.295 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout0", - "Severity":0, - "Value":1.298 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout0", - "Severity":0, - "Value":0.295 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout1", - "Severity":1, - "Value":1.16 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout1", - "Severity":1, - "Value":0.34 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout1", - "Severity":0, - "Value":1.0 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout1", - "Severity":0, - "Value":0.342 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout2", - "Severity":1, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout2", - "Severity":1, - "Value":0.959 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout2", - "Severity":0, - "Value":1.50 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout2", - "Severity":0, - "Value":1.06 - }, - { - "Direction":"greater than", - "Name":"upper critical", - "Label":"vout3", - "Severity":1, - "Value":1.57 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Label":"vout3", - "Severity":1, - "Value":0.959 - }, - { - "Direction":"greater than", - "Name":"upper non critical", - "Label":"vout3", - "Severity":0, - "Value":1.507 - }, - { - "Direction":"less than", - "Name":"lower non critical", - "Label":"vout3", - "Severity":0, - "Value":1.06 - } - ] - }, - { - "Name":"CPU0_SOC_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":27 - }, - { - "Name":"CPU0_SOC_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":28 - }, - { - "Name":"CPU0_DIMM_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":29 - }, - { - "Name":"CPU0_CORE_VRD_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":30 - }, - { - "Name":"CPU0_DIMMG_T", - "EntityId":"0x03", - "EntityInstance":31 - }, - { - "Name":"CPU0_CH0DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":32 - }, - { - "Name":"CPU0_CH1DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":33 - }, - { - "Name":"CPU0_CH2DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":34 - }, - { - "Name":"CPU0_CH3DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":35 - }, - { - "Name":"CPU0_CH4DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":37 - }, - { - "Name":"CPU0_CH5DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":38 - }, - { - "Name":"CPU0_CH6DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":39 - }, - { - "Name":"CPU0_CH7DIMM_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":40 - }, - { - "Name":"CPU0_CPU_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":55 - }, - { - "Name":"CPU0_DIMM_VR1_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":56 - }, - { - "Name":"CPU0_DIMM_VR2_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":57 - }, - { - "Name":"CPU0_MEM_PW", - "EntityId":"0x13", - "EntityInstance":58 - }, - { - "Name":"CPU0_RCA_VR_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":59 - }, - { - "Name":"CPU0_SOC_TDP_PW", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":60 - }, - { - "Name":"CPU0_CPU_VCORE", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":61 - }, - { - "Name":"CPU0_SOC_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":62 - }, - { - "Name":"CPU0_DIMM_VR1_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":63 - }, - { - "Name":"CPU0_DIMM_VR2_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":64 - }, - { - "Name":"CPU0_DIMM_DDR_V", - "EntityId":"0x13", - "EntityInstance":65 - }, - { - "Name":"CPU0_RCA_VR_V", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":66 - }, - { - "Name":"CPU0_RCA_VR_T", - "Type":"AC01_SMPRO", - "EntityId":"0x03", - "EntityInstance":41 - }, - { - "Name":"CPU0_CORE_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":67 - }, - { - "Name":"CPU0_SOC_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":68 - }, - { - "Name":"CPU0_DIMM_VR1_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":69 - }, - { - "Name":"CPU0_DIMM_VR2_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":70 - }, - { - "Name":"CPU0_RCA_VRD_CU", - "Type":"AC01_SMPRO", - "EntityId":"0x13", - "EntityInstance":71 - }, - { - "Index" : 8, - "Name" : "CPU0_NBM_V", - "Type" : "ADC", - "MaxValue": 4.04, - "MinValue": 0, - "EntityId" : "0x13", - "EntityInstance" : 72 - }, - { - "Index" : 9, - "Name" : "CPU1_NBM_V", - "Type" : "ADC", - "MaxValue": 4.04, - "MinValue": 0, - "EntityId" : "0x13", - "EntityInstance" : 73 - }, - { - "Name" : "CPU0_NBM_T" - }, - { - "Name" : "CPU1_NBM_T" - }, - { - "AllowedFailures":1, - "Name":"FanRedundancy", - "Type":"FanRedundancy" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN0_SPEED", - "Pwm":0, - "PwmName":"REAR_FAN0_PWM", - "Tachs":[ - 0 - ] - }, - "Index":0, - "MaxReading":20000, - "Name":"REAR_FAN0_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":6, - "Mutable":true - }, - { - "EntityId":"0x1D", - "EntityInstance":0, - "Mutable":true, - "Name":"REAR_FAN0_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN1_SPEED", - "Pwm":1, - "PwmName":"REAR_FAN1_PWM", - "Tachs":[ - 0 - ] - }, - "Index":1, - "MaxReading":20000, - "Name":"REAR_FAN1_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":7 - }, - { - "EntityId":"0x1D", - "EntityInstance":1, - "Mutable":true, - "Name":"REAR_FAN1_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN2_SPEED", - "Pwm":2, - "PwmName":"REAR_FAN2_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":8, - "Mutable":true - }, - "Index":2, - "MaxReading":20000, - "Name":"REAR_FAN2_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":2 - }, - { - "EntityId":"0x1D", - "EntityInstance":2, - "Mutable":true, - "Name":"REAR_FAN2_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN3_SPEED", - "Pwm":3, - "PwmName":"REAR_FAN3_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":3, - "Mutable":true - }, - "Index":3, - "MaxReading":20000, - "Name":"REAR_FAN3_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":9 - }, - { - "EntityId":"0x1D", - "EntityInstance":3, - "Mutable":true, - "Name":"REAR_FAN3_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN4_SPEED", - "Pwm":4, - "PwmName":"REAR_FAN4_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":4, - "Mutable":true - }, - "Index":4, - "MaxReading":20000, - "Name":"REAR_FAN4_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":10 - }, - { - "EntityId":"0x1D", - "EntityInstance":4, - "Mutable":true, - "Name":"REAR_FAN4_PWM", - "Type":"I2CFan" - }, - { - "Address":"0x2c", - "Bus":"18", - "Connector":{ - "Name":"REAR_FAN5_SPEED", - "Pwm":5, - "PwmName":"REAR_FAN5_PWM", - "Tachs":[ - 0 - ], - "EntityId":"0x1D", - "EntityInstance":5, - "Mutable":true - }, - "Index":5, - "MaxReading":20000, - "Name":"REAR_FAN5_SPEED", - "PowerState":"Always", - "Thresholds":[ - { - "Direction":"less than", - "Name":"lower non critical", - "Severity":0, - "Value":1000 - }, - { - "Direction":"less than", - "Name":"lower critical", - "Severity":1, - "Value":2000 - } - ], - "Type":"I2CFan", - "EntityId":"0x1D", - "EntityInstance":11 - }, - { - "EntityId":"0x1D", - "EntityInstance":5, - "Mutable":true, - "Name":"REAR_FAN5_PWM", - "Type":"I2CFan" - }, - { - "Name": "Fan1Zone", - "Type": "Pid.Zone", - "MinThermalOutput": 25, - "FailSafePercent": 100 - }, - { - "Name": "Fan2Zone", - "Type": "Pid.Zone", - "MinThermalOutput": 25, - "FailSafePercent": 100 - }, - { - "Name": "REAR_FAN012", - "Type": "Pid", - "Class": "fan", - "SetPoint": 65.0, - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "PCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "REAR_FAN0_SPEED", - "REAR_FAN1_SPEED", - "REAR_FAN2_SPEED" - ], - "Outputs": [ - "REAR_FAN0_PWM", - "REAR_FAN1_PWM", - "REAR_FAN2_PWM" - ], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "REAR_FAN345", - "Type": "Pid", - "Class": "fan", - "SetPoint": 65.0, - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "PCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "REAR_FAN4_SPEED", - "REAR_FAN5_SPEED", - "REAR_FAN3_SPEED" - ], - "Outputs": [ - "REAR_FAN4_PWM", - "REAR_FAN5_PWM", - "REAR_FAN3_PWM" - ], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_SOC_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 90.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -4.5, - "ICoefficient": -0.3, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_SOC_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU0_VRD_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_SOC_VRD_T", - "CPU0_DIMM_VRD_T", - "CPU0_CORE_VRD_T", - "CPU0_RCA_VR_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU0_DIMMG_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_DIMMG_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_SOC_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 90.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -4.5, - "ICoefficient": -0.3, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_SOC_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU1_VRD_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_SOC_VRD_T", - "CPU1_DIMM_VRD_T", - "CPU1_CORE_VRD_T", - "CPU1_RCA_VR_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU1_DIMMG_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_DIMMG_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "Mobo_STB_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 85.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_STB_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_NBM_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 75.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_NBM_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_NBM_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 75.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_NBM_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "CPU0_NBM_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU0_NBM_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "CPU1_NBM_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 60.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "CPU1_NBM_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - }, - { - "Name": "Mobo_M2_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 50.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -2.0, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_M2_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan1Zone" - ] - }, - { - "Name": "Mobo_BATT_ZONE_TEMP", - "Type": "Pid", - "Class": "temp", - "SetPoint": 50.0, - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "PCoefficient": -3.5, - "ICoefficient": -0.1, - "ILimitMin": 0.0, - "ILimitMax": 0.0, - "PositiveHysteresis": 0.0, - "NegativeHysteresis": 0.0, - "SlewPos": 0.0, - "SlewNeg": 0.0, - "OutLimitMin": 25.0, - "OutLimitMax": 100.0, - "Inputs": [ - "Mobo_BATT_ZONE_T" - ], - "Outputs": [], - "Zones": [ - "Fan2Zone" - ] - } - ], - "Name":"Kudo_MB", - "Probe":"xyz.openbmc_project.FruDevice({'BOARD_SERIAL_NUMBER': 'MCN*'})", - "Type":"Board", - "xyz.openbmc_project.Inventory.Decorator.Asset":{ - "Manufacturer":"$BOARD_MANUFACTURER", - "Model":"$BOARD_PRODUCT_NAME", - "PartNumber":"$BOARD_PART_NUMBER", - "SerialNumber":"$BOARD_SERIAL_NUMBER" - }, - "xyz.openbmc_project.Inventory.Decorator.FruDevice":{ - "Bus":"$bus", - "Address":"$address" - }, - "xyz.openbmc_project.Inventory.Decorator.Ipmi": { - "EntityId": "0x07", - "EntityInstance": 1 - } - } -] diff --git a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend index 7daa029eb..ae0d3f5ca 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,11 +1,9 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " \ - file://kudo.json \ +SRC_URI:append:kudo = " \ file://blacklist.json \ " -do_install_append_kudo () { - install -m 0644 -D ${WORKDIR}/kudo.json ${D}${datadir}/${PN}/configurations/kudo.json +do_install:append:kudo () { install -m 0644 -D ${WORKDIR}/blacklist.json ${D}${datadir}/${PN}/blacklist.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend index 9daae7c86..b08aab399 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -RDEPENDS_${PN}_append_kudo = " bash" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +RDEPENDS:${PN}:append:kudo = " bash" # Remove what installed by common recipe OBMC_CONSOLE_HOST_TTY = "" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS_remove_kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" # Declare port spcific conf and service files HOST_CONSOLE_TTY = "ttyS1 ttyS3" CONSOLE_CONF_FMT = "file://server.{0}.conf" -SRC_URI_append_kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" -SRC_URI_append_kudo = " file://${BPN}@.service" -SRC_URI_append_kudo = " file://kudo_uart_mux_ctrl.sh" +SRC_URI:append:kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" +SRC_URI:append:kudo = " file://${BPN}@.service" +SRC_URI:append:kudo = " file://kudo_uart_mux_ctrl.sh" -SYSTEMD_SERVICE_${PN}_append_kudo = " \ +SYSTEMD_SERVICE:${PN}:append:kudo = " \ ${PN}@.service \ " -do_install_append() { +do_install:append() { for i in ${HOST_CONSOLE_TTY} do install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf @@ -35,7 +35,7 @@ do_install_append() { } -pkg_postinst_${PN}_append () { +pkg_postinst:${PN}:append () { systemctl --root=$D enable obmc-console@ttyS1.service systemctl --root=$D enable obmc-console@ttyS3.service } diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 03f391cc1..59b0db26e 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://phosphor-pid-control.service" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://phosphor-pid-control.service" inherit systemd -SYSTEMD_SERVICE_${PN}_append_kudo = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:kudo = " phosphor-pid-control.service" diff --git a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb index c380feba3..f4b04e60b 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb +++ b/meta-fii/meta-kudo/recipes-phosphor/fans/pwm-init.bb @@ -6,10 +6,10 @@ PR = "r1" inherit systemd DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" S = "${WORKDIR}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://pwm_init.service \ file://bin/pwm_init.sh \ @@ -17,11 +17,11 @@ SRC_URI += " \ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} += "pwm_init.service" +SYSTEMD_SERVICE:${PN} += "pwm_init.service" -FILES_${PN} += "${bindir}/* ${systemd_system_unitdir}/*" +FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*" -do_install_append() { +do_install:append() { install -d ${D}${bindir} install -m 0755 ${S}/bin/* ${D}${bindir}/ install -d ${D}${systemd_system_unitdir} diff --git a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend index 87dc22827..682932a1c 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -1,12 +1,12 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-blobs-binarystore" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-ethstats" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-flash" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-net" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-ipmi-host" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-host-postd" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-logging" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-sel-logger" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " entity-manager" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " dbus-sensors" -OBMC_IMAGE_EXTRA_INSTALL_append_kudo = " phosphor-virtual-sensor" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-blobs-binarystore" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-ethstats" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-flash" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-net" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-ipmi-host" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-logging" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-sel-logger" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " entity-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " dbus-sensors" +OBMC_IMAGE_EXTRA_INSTALL:append:kudo = " phosphor-virtual-sensor" diff --git a/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend new file mode 100644 index 000000000..4dd9dc131 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -0,0 +1,4 @@ +EXTRA_OEMESON:append:kudo = " \ + -Dredfish-dump-log=enabled \ + -Dredfish-bmc-journal=enabled \ +" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend index f87ac040f..a1ed74666 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" -SRC_URI_append_kudo = " file://config.json" -FILES_${PN}_append_kudo = " ${datadir}/binaryblob/config.json" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" +SRC_URI:append:kudo = " file://config.json" +FILES:${PN}:append:kudo = " ${datadir}/binaryblob/config.json" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/binaryblob/ install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json } diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..a7f4b8c35 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json new file mode 100644 index 000000000..6b543b9ec --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json @@ -0,0 +1,2 @@ +{"id": 0, "revision": 1, "addn_dev_support": 133, + "manuf_id": 17084, "prod_id": 1, "aux": 0} diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index fa9468ac4..e00d74db7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1,3 +1,3 @@ -PACKAGECONFIG_append_kudo = " nuvoton-p2a-mbox net-bridge" +PACKAGECONFIG:append:kudo = " nuvoton-p2a-mbox net-bridge" -IPMI_FLASH_BMC_ADDRESS_kudo = "0xF0848000" +IPMI_FLASH_BMC_ADDRESS:kudo = "0xF0848000" diff --git a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 5e0eddc71..da7f376e3 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" #Add sensorhandler.hpp and selutilty.hpp since intel-ipmi-oem requires these libs -do_install_append_kudo(){ +do_install:append:kudo(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..6618bf117 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:kudo = " nic-ethtool" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 3fffde0d4..9b203e722 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1,2 @@ -PACKAGECONFIG_append_kudo = " log-threshold" +# Enable threshold, pulse, and watchdog monitoring +PACKAGECONFIG:append:kudo = " log-threshold log-pulse log-watchdog clears-sel" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index c353e8216..5ee9143fb 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -14,6 +14,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -22,13 +35,13 @@ "ParamName": "V1", "Desc": { - "Name": "CPU0_NBM_V", + "Name": "CPU0_NBM_TEMP_V", "SensorType": "voltage" } } ] }, - "Expression": "(V1 - 2.73) * 100" + "Expression": "(V1 == V1) ? (V1 - 2.73) * 100 : NULL" }, { "Desc": @@ -45,6 +58,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -53,13 +79,13 @@ "ParamName": "V2", "Desc": { - "Name": "CPU1_NBM_V", + "Name": "CPU1_NBM_TEMP_V", "SensorType": "voltage" } } ] }, - "Expression": "(V2 - 2.73) * 100" + "Expression": "(V2 == V2) ? (V2 - 2.73) * 100 : NULL" }, { "Desc": @@ -76,6 +102,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -146,7 +185,7 @@ } ] }, - "Expression": "max((CH0 == CH0) ? CH0 : 0,(CH1 == CH1) ? CH1 : 0,(CH2 == CH2) ? CH2 : 0,(CH3 == CH3) ? CH3 : 0,(CH4 == CH4) ? CH4 : 0,(CH5 == CH5) ? CH5 : 0,(CH6 == CH6) ? CH6 : 0,(CH7 == CH7) ? CH7 : 0)" + "Expression": "max((CH0 == CH0) ? CH0 : NULL,(CH1 == CH1) ? CH1 : NULL,(CH2 == CH2) ? CH2 : NULL,(CH3 == CH3) ? CH3 : NULL,(CH4 == CH4) ? CH4 : NULL,(CH5 == CH5) ? CH5 : NULL,(CH6 == CH6) ? CH6 : NULL,(CH7 == CH7) ? CH7 : NULL)" }, { "Desc": @@ -163,6 +202,19 @@ "WarningHigh": 85, "WarningLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -233,7 +285,7 @@ } ] }, - "Expression": "max((CH0 == CH0) ? CH0 : 0,(CH1 == CH1) ? CH1 : 0,(CH2 == CH2) ? CH2 : 0,(CH3 == CH3) ? CH3 : 0,(CH4 == CH4) ? CH4 : 0,(CH5 == CH5) ? CH5 : 0,(CH6 == CH6) ? CH6 : 0,(CH7 == CH7) ? CH7 : 0)" + "Expression": "max((CH0 == CH0) ? CH0 : NULL,(CH1 == CH1) ? CH1 : NULL,(CH2 == CH2) ? CH2 : NULL,(CH3 == CH3) ? CH3 : NULL,(CH4 == CH4) ? CH4 : NULL,(CH5 == CH5) ? CH5 : NULL,(CH6 == CH6) ? CH6 : NULL,(CH7 == CH7) ? CH7 : NULL)" }, { "Desc": @@ -246,10 +298,21 @@ "Threshold" : { "CriticalHigh": 2.999, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -272,7 +335,7 @@ } ] }, - "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : -1" + "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : NULL" }, { "Desc": @@ -285,10 +348,21 @@ "Threshold" : { "CriticalHigh": 2.999, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -311,7 +385,7 @@ } ] }, - "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : -1" + "Expression": "(V1 + V2) >= 0 ? (V1 + V2) : NULL" }, { "Desc": @@ -324,10 +398,21 @@ "Threshold" : { "CriticalHigh": 29.987, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -350,7 +435,7 @@ } ] }, - "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : -1" + "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : NULL" }, { "Desc": @@ -363,10 +448,21 @@ "Threshold" : { "CriticalHigh": 29.987, - "CriticalLow": 0, - "WarningHigh": 0, - "WarningLow": 0 + "CriticalLow": 0 }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/board/Kudo_MB" + ] + ], "Params": { "DbusParam": @@ -389,6 +485,7 @@ } ] }, - "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : -1" + "Expression": "(P1 + P2) >= 0 ? (P1 + P2) : NULL" } ] + diff --git a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 43f5f5660..f89f5d9a7 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" inherit systemd -RDEPENDS_${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_kudo = " tla2024-enable.service" +RDEPENDS:${PN} += "bash" +SYSTEMD_SERVICE:${PN}:append:kudo = " tla2024-enable.service" -SRC_URI_append_kudo = " \ +SRC_URI:append:kudo = " \ file://virtual_sensor_config.json \ file://tla2024-enable.service \ file://tla2024-enable.sh \ " -FILES_${PN}_append_kudo = " ${bindir}/tla2024-enable.sh" +FILES:${PN}:append:kudo = " ${bindir}/tla2024-enable.sh" -do_install_append_kudo() { +do_install:append:kudo() { install -d ${D}${datadir}/${PN} install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/${PN}/virtual_sensor_config.json install -m 0755 ${WORKDIR}/tla2024-enable.sh ${D}${bindir}/tla2024-enable.sh diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 79d7ac0b0..1f559ef91 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://chassis_capabilities.override.yml" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://chassis_capabilities.override.yml" diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 533a69a91..889b91091 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" -SRC_URI_append_kudo = " file://gpio_defs.json" +FILESEXTRAPATHS:append:kudo := ":${THISDIR}/${PN}" +SRC_URI:append:kudo = " file://gpio_defs.json" diff --git a/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend b/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend new file mode 100644 index 000000000..c665531a4 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/smbios/smbios-mdr_git.bbappend @@ -0,0 +1,3 @@ +PACKAGECONFIG:append:kudo = " smbios-ipmi-blob" + +PACKAGECONFIG:remove:kudo = " cpuinfo" diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index e795905ab..020212ad8 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}_remove_kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_SERVICE_${PN}_kudo = " phosphor-watchdog.service \ +SYSTEMD_OVERRIDE:${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ phosphor-watchdog-host-reset.service\ |