From 877bb743df657b88806c94504b88cd2cced1ec5d Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Tue, 28 May 2019 10:12:28 -0500 Subject: witherspoon-128: Use ${MACHINE} for device tree file name Replace "witherspoon-128" with ${MACHINE} for the device tree file name as it's better practice to use bitbake variables instead of hard-coding values. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-witherspoon-128.dtb" (From meta-ibm rev: 8bbd213225ea5d6e3d1eb8537308f398dc85b6a2) Change-Id: I46e72947ddf47d3cbc20ab04f2b949ee717423cf Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf index 284340d9f..a3981cc4f 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf @@ -1,7 +1,7 @@ require conf/machine/witherspoon.conf MACHINEOVERRIDES .= ":witherspoon" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon-128.dtb" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" MRW_XML = "witherspoon.xml" -- cgit v1.2.3 From c745faa233a7c11f2fcad3cf2fbdc614ffa65545 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 21:32:34 +0000 Subject: phosphor-state-manager: srcrev bump 3a30b0542b..5b95027528 Andrew Geissler (1): Replace call_noreply() with call() (From meta-phosphor rev: 8ef61410d00e16ff72525ac28fcac5e00cd87923) Change-Id: Iba7a66b7d45009e73f35a6c1e25045a3866f6397 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 9da5475c7..5ba755456 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -132,6 +132,6 @@ HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TG SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "3a30b0542b602e0fe42d033c5e0fb1330988b840" +SRCREV = "5b95027528483ec7ce8761a2fdd018d671979d0b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 713e7e6af036ef4289e8fd14e29de89e05d43f52 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 22:32:00 +0000 Subject: phosphor-ipmi-flash: srcrev bump 0c642fd04b..072a7dd6b5 Patrick Venture (3): test: firmware notYetStarted: add missing comment test: add state check helper method test: firmware uploadInProgress: minor cleanup (From meta-phosphor rev: bc33553a6591335fae45602332b8b8fcbf4ca889) Change-Id: I218be064f080de23c6d27a77e0247faa2bba6aa1 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 37caeab99..ed25ba156 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "0c642fd04b8f004deff7e3ebaf5613435c2177ea" +SRCREV = "072a7dd6b58bdb6c5ce11f3e941646f7c5467442" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From cf7807f084b02ffb18e34fcbe6929cdd423d958a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 01:02:30 +0000 Subject: phosphor-webui: srcrev bump 44da471fce..1a606bee74 Derick Montague (1): Add .ng-leave and .ng-enter rulesets for page transition Gunnar Mills (5): Firmware: Remove unused interpolate Remove unused server_status Remove unused activateErrorModal Remove unused chassis_state Remove unused errors.html (From meta-phosphor rev: 7757c122967b8011609aec5d5d60fd6ffe036726) Change-Id: Ifdca2b71cb4f6b985211ff94a990f046ab6f8d86 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 1595121c7..d3887f6fd 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "44da471fceb3790b49a43bc023781f62b19f9fde" +SRCREV = "1a606bee74ab53f2d9c18b38bbc637620260799b" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 3d7dfa8ac4678523c79f43b8caac2ea55dba349f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 May 2019 19:27:14 -0400 Subject: meta-ibm: witherspoon: remove unused inventory recipes With the transition to target class recipes for phosphor-inventory a couple files are now dead code and can be removed. (From meta-ibm rev: 2728c26b8515a86d9c773948faa4b750e6d3e448) Change-Id: I4dc355349a7ad34e87314ea021963816f0ebe50e Signed-off-by: Brad Bishop --- .../inventory/inventory-cleanup-native.bb | 16 ---------------- .../phosphor-inventory-manager-config-native.bbappend | 1 - 2 files changed, 17 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb deleted file mode 100644 index 80e6e6de5..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-inventory-manager - -SRC_URI += "file://inventory-cleanup.yaml" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}${base_datadir}/events.d/ - install ${S}/inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml -} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend deleted file mode 100644 index d9304c045..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "inventory-cleanup-native" -- cgit v1.2.3 From 3e264b0f9ef78d60e27aef09724f131000dbd29b Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 22 May 2019 07:37:24 -0500 Subject: rsyslogd: Install default server config This reverts commit 37bc1a3568f2e87987be05243627a984dc051de1. In addition, it changes the default rsyslog server config to ignore all messages. Also bumps up phosphor-logging: phosphor-logging: srcrev bump f59854e94b..0a0b5ea558 Santosh Puranik (1): rsyslod: Change disable action Tested: Verified that the default rsyslog behavior is to now ignore all messages. (From meta-phosphor rev: 138108a05f68ada8b990024bbaa8b68b135d6aeb) Signed-off-by: Santosh Puranik Change-Id: Iba11dfa153eaeef17417c82ab26f9a26fe5f9125 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf | 3 --- meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf | 1 + meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend | 6 ++++++ meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 - 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf deleted file mode 100644 index 458f52f27..000000000 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -# This file exists only if remote logging has been configured -ConditionPathExists=/etc/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf new file mode 100644 index 000000000..cf47ba306 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1 @@ +*.* ~ diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index 3901844ae..0a2fb3334 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,9 +2,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://rsyslog.conf \ + file://server.conf \ " PACKAGECONFIG ??= " \ rsyslogd rsyslogrt inet regexp uuid \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/server.conf \ + ${D}${sysconfdir}/rsyslog.d/server.conf +} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 89d71ae3c..f710ed087 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -53,7 +53,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f59854e94b077630200117b390c4e943d588be31" +SRCREV = "0a0b5ea558adeb109a3ac52e55ad720e188adb90" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index c783d00ce..238ee293e 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -92,7 +92,6 @@ RDEPENDS_${PN}-logging = " \ SUMMARY_${PN}-remote-logging = "Remote logging applications" RDEPENDS_${PN}-remote-logging = " \ rsyslog \ - rsyslog-policy \ phosphor-rsyslog-config \ " -- cgit v1.2.3 From 1cd444bccb30dea393baa0f19e2b860c225e70dc Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 22 May 2019 08:02:38 -0500 Subject: Revert "meta-phosphor: rsyslog: turn off remote logging" This reverts commit b2c81a4dbdb409e1fae7fdefda99adb97f40d912. With changes made to the default rsyslog.conf, rsyslog discards all messages. This prevents the scenario where systemd would try to launch rsyslog on socket activation, causing slowness during boot. (From meta-phosphor rev: e989a6ba8103be2116ba4159e93b910dfc7555ca) Signed-off-by: Santosh Puranik Change-Id: I7eb5511fc0109bc661a0e837f5bc11a636c7d36a Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5981066b8..b428205ab 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -68,6 +68,7 @@ IMAGE_FEATURES += " \ obmc-inventory \ obmc-leds \ obmc-logging-mgmt \ + obmc-remote-logging-mgmt \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ -- cgit v1.2.3 From 8ba9dc50a90887e6ef4f4934e7d8c821973bf7da Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 17:50:52 +0000 Subject: intel-ipmi-oem: srcrev bump 52ce662cab..de750c6aca Jason M. Bills (1): Improve SEL entry parsing Vernon Mauery (1): Move commands from ipmi-providers Yong Li (1): Static code analysis scan issue fix Yu Guohui (1): Static code analysis scan issue fix (From meta-intel rev: 0f7e0fba7a246a907cfa9c679044f83c8c830639) Change-Id: I2a79176f75f4a2df963d504f11c3ed9a8679fd21 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 2d8b6f531..a2938ffba 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "52ce662cab6e5646170c4092a4553e2208eef98d" +SRCREV = "de750c6aca98a7444579e5a6c51bdf10247371a3" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 36c69bf34220d075b7d83cc83da1b4197592f6c0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 16:20:55 +0000 Subject: intel-ipmi-oem: srcrev bump de750c6aca..b1cc61d2a0 Richard Marian Thomaiyar (1): Build Fix: In repo build failure fix (From meta-intel rev: 720ee658132bb0c00939a343834fae9416ff299f) Change-Id: I3aaa73f025c9bed0c7e08d7ebf6a9adea1127bae Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index a2938ffba..139be0251 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "de750c6aca98a7444579e5a6c51bdf10247371a3" +SRCREV = "b1cc61d2a0f0d36169915349476e96b006d058a5" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 681099eafb8b436218f53d585f9601d2e4e9a89f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 13:52:22 +0000 Subject: phosphor-webui: srcrev bump 1a606bee74..21f8cb9439 Yoshie Muranaka (1): Fix the tabbing order in the primary and secondary navigation (From meta-phosphor rev: 98917f40c7057615c45bac9295b157b4e02db86b) Change-Id: Idd121ec05d7002bd32c70d989431ac53a24bad0b Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index d3887f6fd..c525f23e0 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "1a606bee74ab53f2d9c18b38bbc637620260799b" +SRCREV = "21f8cb9439e876108c00d80346cae1f89fd1a45e" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 59776b1be0e132522cbfddb215e73e2c24b562a0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 15:52:19 +0000 Subject: phosphor-webui: srcrev bump 21f8cb9439..6a3b3b2cdd Yoshie Muranaka (1): Fix tablet alignment issues for event logs (From meta-phosphor rev: 340d0dec947db765589fa2177b665e44b453a2a7) Change-Id: I4b2588aec68817df84a2bbaef1eea1c5ee3c5c36 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index c525f23e0..59b00a885 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "21f8cb9439e876108c00d80346cae1f89fd1a45e" +SRCREV = "6a3b3b2cdd8e92265997fe66f6c8489caf1dd403" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From a54f63e0828502e370ca88e949e26941e3eedb88 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 May 2019 19:28:52 -0400 Subject: meta-phosphor: inventory: drop config-native With the switch of phosphor-inventory-manager to target class configuration recipes, this recipe is no longer used. Drop. (From meta-phosphor rev: 921266cc8ecd2bb5b04adff91007f9c1438fd32b) Change-Id: I5ba6a47b61cf2164ac9b58bdfaabd9a7393a1e02 Signed-off-by: Brad Bishop --- .../phosphor-inventory-manager-config-native.bb | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb deleted file mode 100644 index a776e5bd8..000000000 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Phosphor Inventory Manager Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -data to the native /usr/share/phosphor-inventory-manager filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native - -PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "phosphor-inventory-manager-assettag-native" - -# To add additional managed inventory items, create a recipe in your layer, -# and add it to PHOSPHOR_INVENTORY_MANAGER_CONFIGS with a bbappend to this recipe. - -DEPENDS += "${PHOSPHOR_INVENTORY_MANAGER_CONFIGS}" -- cgit v1.2.3 From fdcc46c93e5eb69acd6fc9c9d2e07b381b907afb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:31:49 +0000 Subject: bmcweb: srcrev bump 22c33710fe..c72aa4757b Ed Tanous (2): Fix a trailing slash on LogServices Add security headers to websockets Jason M. Bills (1): Add ClearLog support for the Redfish Event Log Service Jennifer Lee (1): [Redfish] Enable PATCH for DHCPv4 properties in EthernetInterface schema Lei YU (1): REST: PUT: return DBus error description Santosh Puranik (1): Set GraphicalConsole to enabled (From meta-phosphor rev: 954b962f092ae9da443eef49916bcf8427034e16) Change-Id: Ic13bc06762927c625506bcb05206070264051e91 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 181ef9c62..30da37c49 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "22c33710fed78a5c47446ee91ececf8b8ab104db" +SRCREV = "c72aa4757b57da6e4dae2325b7d0570c6be3d89b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3106189751ea1c6c7b18a0c8cc2ad69114406e35 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:42:13 +0000 Subject: phosphor-ipmi-flash: srcrev bump 072a7dd6b5..615c69ef59 Patrick Venture (11): test: firmware verificationPending: minor fixes tools: updater: cppcheck fixups test: firmware verificationStarted: canHandle, getBlobIds, open test: firmware verificationCompleted: stat(activehash) bmc: cleanup stat(blob) handler test: firmware verificationCompleted: canHandleBlob,getBlobIds test: firmware verificationCompleted: read(session) test: firmware verificationCompleted: write test: firmware verificationCompleted: writeMeta test: firmware verificationCompleted: open test: firmware verificationCompleted: stat(session) (From meta-phosphor rev: dccba1f0ba0dc06809601cfa1eca52b9a40f2fd5) Change-Id: I542850064c2ad933f774f793c3be021073e3f678 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index ed25ba156..ccea00c88 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "072a7dd6b58bdb6c5ce11f3e941646f7c5467442" +SRCREV = "615c69ef597a044c0d3e7747d9603263f8e462dc" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From e83680404ac019e5c070505c0c51b15cfa6d46d6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:41:56 +0000 Subject: ipmi-blob-tool: srcrev bump 444746495a..ef5e09252d Patrick Venture (1): ipmi exceptions: add method to grab code (From meta-phosphor rev: 4e246b5b7ed91443a565425c4c2f524ec9a521b1) Change-Id: I4c99336a7a146ea7f9e4015c3bf75f278b201773 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 0125d730c..30b540b7d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "444746495ad3f951cb093c7144b7cb9218b8599f" +SRCREV = "ef5e09252dba451acda30e53e8f5b28f08eac0cb" -- cgit v1.2.3 From 2115ac10bc51a9414cf1175d93f797184ea8a3d0 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 29 May 2019 16:07:53 -0400 Subject: meta-phosphor: ipmi: drop channel.yaml This file isn't used by ipmid anymore, so don't bother passing it in. See ipmid change 41ac50530a for details. (From meta-phosphor rev: 2bda2f162fdb25d2d77f7845157ff70d94af44d4) Change-Id: I1a0b02a6aa7c1767254b94e91b80ed92c3e99d16 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 4e69c2d36..0654cfeb0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -75,7 +75,6 @@ EXTRA_OECONF = " \ SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ - CHANNEL_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/channel.yaml \ ENTITY_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/entity.yaml \ POWER_READING_SENSOR=${datadir}/ipmi-providers/power_reading.json\ " -- cgit v1.2.3 From ec3a9710860c0842b71c08d0aa4dbc5e9871b64e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 29 May 2019 15:55:54 -0400 Subject: meta-ibm: witherspoon: drop channel.yaml These files aren't used by ipmid anymore, so drop. See host-ipmid change 41ac50530a for details. (From meta-ibm rev: 19be7dbb08bb6c4e9a992a41972148240f955b75) Change-Id: I648cb8b7f1dba2a5a32ed1a1b05c18a15334763a Signed-off-by: Brad Bishop --- .../recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml | 4 ---- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 ----- 2 files changed, 9 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml deleted file mode 100644 index 627f4965f..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Channel Number (must be unique) is the key -1: - # ifName the ethernet device name (used in the dbus path) - ifName: eth0 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index eec3999f2..bb28054c6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,14 +2,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " \ file://occ_sensors.hardcoded.yaml \ file://hwmon_sensors.hardcoded.yaml \ - file://channel.yaml \ " # System-specific sensors SRC_URI_append_witherspoon = " \ file://witherspoon_hwmon_sensors.hardcoded.yaml \ " - -EXTRA_OECONF_append = " \ - CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ - " -- cgit v1.2.3 From e8d650aaba430baa5df8d31cd1364a15ffeba82c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 28 May 2019 16:07:50 -0700 Subject: sdeventplus: Depend on function2 An upcoming change will require this dependency for sdeventplus, so that we can store functions containing move-only types for callbacks. (From meta-phosphor rev: c345eb3b55f168f17e7025eaeed5ad603af6745f) Change-Id: I30b3caa38f26414b82493301bd7acd466f9814bc Signed-off-by: William A. Kennington III Signed-off-by: Brad Bishop --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index d1ddff9f4..2f2ce3568 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit meson pkgconfig DEPENDS += " \ + function2 \ stdplus \ systemd \ " -- cgit v1.2.3 From d216c789aa0fc202448e6bf9fc95f3bc5206f8ea Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 29 May 2019 13:35:22 -0500 Subject: Revert "Accelerator interface for sensorinventory items" This reverts commit f510f7b6b708b22db1f08faf369994f01edd0ddc. The change causes a compilation error when building the swift machine, reverting until a fix is submitted. Tested: Built swift successfully. (From meta-phosphor rev: 7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52) Change-Id: I690ff08d233ff9e654cfc6fbf1b466f39b447360 Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- .../recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py | 7 ------- .../ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml | 1 - 2 files changed, 8 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 877e3eb57..5e6c4b5e6 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py @@ -12,11 +12,6 @@ import sys import yaml import copy -# Custom representer for None types. This is to handle empty dictionaries. -# By default Pyyaml outputs these as "null", whereas we want an empty character. -def represent_none(self, _): - return self.represent_scalar('tag:yaml.org,2002:null', '') - def dict_merge(target, source): """Deep merge for dicts. @@ -48,8 +43,6 @@ if len(sys.argv) == 2: # No overrides to handle sys.exit(0) -yaml.add_representer(type(None), represent_none) - target_filename = sys.argv[1] with open(target_filename) as target_file: data = yaml.safe_load(target_file) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml index 8188612b3..ec82afed6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml @@ -207,7 +207,6 @@ gpu_func_sensor: type: "bool" assert: true deassert: false - xyz.openbmc_project.Inventory.Item.Accelerator: # Field replaceable doesn't come as a sensor data # but we know that GPU is Field replaceable so setting # true in both cases. -- cgit v1.2.3 From 85b484ca342da7732cf3ca9f602a4a49531bfe50 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 3 May 2019 14:34:40 -0500 Subject: meta-ibm: Swift: Add inventory config YAML It will create the xyz.openbmc_project.Inventory.Item.Chassis interface on the chassis. (From meta-ibm rev: 8074814d81f5bd8b3b9467e2392f1888059ec897) Change-Id: I40c3d94bfdce7388e6c525b253d6b456b10b8604 Signed-off-by: Matt Spinler Signed-off-by: Brad Bishop --- .../inventory/inventory-cleanup.bb | 2 +- .../inventory-cleanup/inventory-cleanup.yaml | 51 ---------------------- .../inventory-cleanup/swift/inventory-cleanup.yaml | 16 +++++++ .../witherspoon/inventory-cleanup.yaml | 51 ++++++++++++++++++++++ .../phosphor-inventory-manager_%.bbappend | 2 +- 5 files changed, 69 insertions(+), 53 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb index cdb146c50..f68edcb62 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb @@ -1,4 +1,4 @@ -SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager" +SUMMARY = "Copy the inventory cleanup yaml for inventory manager" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml deleted file mode 100644 index a363bda8d..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ /dev/null @@ -1,51 +0,0 @@ -description: > - Witherspoon inventory fixups - -events: - - name: Remove power_supplies - description: > - Remove the deprecated 'power_supply' objects - type: startup - actions: - - name: destroyObjects - paths: - - /system/chassis/power_supply0 - - /system/chassis/power_supply1 - - /system/chassis/powersupply0 - - /system/chassis/powersupply1 - - - name: Remove fan1 - description: > - Remove all fan1 associated objects and have fan presence and - fan monitor create it based on cooling type. - type: startup - filters: - - name: propertyIs - service: xyz.openbmc_project.Inventory.Manager - path: /system/chassis - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType - property: WaterCooled - value: - value: true - type: boolean - dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ - Decorator::server::CoolingType" - actions: - - name: destroyObjects - paths: - - /system/chassis/motherboard/fan1/fan1_0 - - /system/chassis/motherboard/fan1/fan1_1 - - /system/chassis/motherboard/fan1 - - - name: Add Chassis interface - description: > - Add the chassis interface on the chassis inventory path - type: startup - actions: - - name: createObjects - objs: - /system/chassis: - xyz.openbmc_project.Inventory.Item.Chassis: - Type: - value: "RackMount" - type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml new file mode 100644 index 000000000..a2ff9d177 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Swift inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml new file mode 100644 index 000000000..a363bda8d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml @@ -0,0 +1,51 @@ +description: > + Witherspoon inventory fixups + +events: + - name: Remove power_supplies + description: > + Remove the deprecated 'power_supply' objects + type: startup + actions: + - name: destroyObjects + paths: + - /system/chassis/power_supply0 + - /system/chassis/power_supply1 + - /system/chassis/powersupply0 + - /system/chassis/powersupply1 + + - name: Remove fan1 + description: > + Remove all fan1 associated objects and have fan presence and + fan monitor create it based on cooling type. + type: startup + filters: + - name: propertyIs + service: xyz.openbmc_project.Inventory.Manager + path: /system/chassis + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + property: WaterCooled + value: + value: true + type: boolean + dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ + Decorator::server::CoolingType" + actions: + - name: destroyObjects + paths: + - /system/chassis/motherboard/fan1/fan1_0 + - /system/chassis/motherboard/fan1/fan1_1 + - /system/chassis/motherboard/fan1 + + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 9b5b948fa..39f87342e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -3,7 +3,7 @@ PACKAGECONFIG_append = " associations" SRC_URI += "file://associations.json" -DEPENDS_append_witherspoon = " inventory-cleanup" +DEPENDS_append = " inventory-cleanup" do_install_append() { install -d ${D}${base_datadir} -- cgit v1.2.3 From 10bc2ef852277cf8e9858f75cea9f55b482bf85b Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 6 Jun 2019 09:43:20 -0700 Subject: Update to internal 6-6-19 Signed-off-by: Ed Tanous --- meta-openbmc-mods/conf/machine/include/intel.inc | 2 + meta-openbmc-mods/meta-ast2500/conf/layer.conf | 21 + .../conf/machine/include/intel-ast2500.inc | 19 + .../conf/machine/include/obmc-bsp-si-common.inc | 31 + .../0001-arm-dts-add-DTS-for-Intel-platforms.patch | 414 ++++ ...le-pass-through-on-GPIOE1-and-GPIOE3-free.patch | 121 ++ ...GPIOE0-and-GPIOE2-pass-through-by-default.patch | 70 + .../linux-aspeed/0004-Test-code-for-LPC-MBOX.patch | 112 ++ .../linux-aspeed/0005-128MB-flashmap-for-PFR.patch | 30 + ...w-monitoring-of-power-control-input-GPIOs.patch | 80 + .../linux/linux-aspeed/intel-ast2500.cfg | 69 + .../recipes-kernel/linux/linux-aspeed_%.bbappend | 9 + .../entity-manager/CYP-baseboard.json | 1348 +++++++++++++ .../entity-manager/FCXXPDBASSMBL_PDB.json | 91 + .../entity-manager/MIDPLANE-2U2X12SWITCH.json | 104 + .../entity-manager/OPB2RH-Chassis.json | 19 + .../entity-manager/TNP-baseboard.json | 1824 +++++++++++++++++ .../configuration/entity-manager/WC-Baseboard.json | 2040 +++++++++++++++++++ .../configuration/entity-manager/WP-Baseboard.json | 2033 +++++++++++++++++++ .../configuration/entity-manager_%.bbappend | 15 + .../console/obmc-console/obmc-console.conf | 3 + .../console/obmc-console/obmc-console@.service | 21 + .../console/obmc-console/sol-option-check.sh | 25 + .../console/obmc-console_%.bbappend | 8 + .../recipes-phosphor/fans/fan-default-speed.bb | 20 + .../fan-default-speed/fan-default-speed.service | 10 + .../fans/fan-default-speed/set_fan_speeds.py | 23 + .../recipes-phosphor/fru/default-fru.bb | 27 + .../fru/default-fru/S2600CYP.fru.bin | Bin 0 -> 513 bytes .../fru/default-fru/S2600TNP.fru.bin | Bin 0 -> 512 bytes .../fru/default-fru/S2600WC.fru.bin | Bin 0 -> 511 bytes .../fru/default-fru/S2600WFT.fru.bin | Bin 0 -> 512 bytes .../fru/default-fru/S2600WP.fru.bin | Bin 0 -> 512 bytes .../fru/default-fru/SetBaseboardFru.service | 9 + .../recipes-phosphor/fru/default-fru/checkFru.sh | 38 + .../recipes-phosphor/workbook/wolfpass-config.bb | 10 + meta-openbmc-mods/meta-ast2500/recipes.txt | 2 + .../classes/obmc-phosphor-image-common.bbclass | 1 - .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 14 +- .../u-boot/u-boot-fw-utils-aspeed_%.bbappend | 38 +- .../recipes-core/at-scale-debug/at-scale-debug.bb | 4 +- .../recipes-core/crashdump/crashdump_git.bb | 4 +- .../recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 +- .../recipes-core/ipmi/ipmi-providers.bb | 2 +- .../recipes-core/os-release/os-release.bbappend | 56 +- .../recipes-core/os-release/version-vars.inc | 78 + .../recipes-core/peci-pcie/peci-pcie_git.bb | 4 +- .../recipes-devtools/mtd-util/mtd-util.bb | 2 +- .../sdbusplus/sdbusplus_%.bbappend | 2 +- .../recipes-intel/chassis/intel-chassis-control.bb | 234 +-- .../intel-power-forceoff@.service | 15 - .../intel-power-start@.service | 16 - .../intel-power-stop@.service | 17 - .../intel-power-warm-reset@.service | 14 - .../intel-chassis-control/intel-wait-host-off.sh | 32 - .../intel-wait-host-off@.service | 21 - .../intel-chassis-control/intel-wait-host-on.sh | 32 - .../intel-wait-host-on@.service | 19 - .../intel-chassis-control/intel-wait-power-off.sh | 32 - .../intel-wait-power-off@.service | 23 - .../intel-chassis-control/intel-wait-power-on.sh | 32 - .../intel-wait-power-on@.service | 21 - .../obmc-chassis-hard-poweroff@.target | 11 - .../obmc-chassis-poweroff@.target | 10 - .../obmc-chassis-poweron@.target | 9 - .../obmc-chassis-powerreset@.target | 7 - .../intel-chassis-control/obmc-host-reboot@.target | 10 - .../obmc-host-shutdown@.target | 5 - .../obmc-host-soft-reboot@.target | 10 - .../intel-chassis-control/obmc-host-start@.target | 9 - .../obmc-host-startmin@.target | 6 - .../intel-chassis-control/obmc-host-stop@.target | 9 - .../obmc-host-warm-reset@.target | 9 - .../obmc-send-signal-host-starting@.service | 13 - .../obmc-send-signal-host-stopping@.service | 13 - .../obmc-send-signal-post-host-start@.service | 13 - .../obmc-send-signal-post-host-stop@.service | 13 - .../obmc-send-signal-pre-host-start@.service | 13 - .../obmc-send-signal-pre-host-stop@.service | 14 - .../op-reset-chassis-on@.service | 15 - .../op-reset-chassis-running@.service | 15 - .../xyz.openbmc_project.Chassis.Buttons@.service | 14 - ...penbmc_project.Chassis.Control.Chassis@.service | 15 - ....openbmc_project.Chassis.Control.Power@.service | 17 - .../packagegroups/packagegroup-intel-apps.bb | 1 - .../packagegroups/packagegroup-obmc-apps.bbappend | 1 + .../recipes-intel/smbios/smbios-mdrv1.bb | 4 +- .../recipes-intel/smbios/smbios-mdrv2.bb | 4 +- ...d-remove-source-buffer-allocation-before-.patch | 40 +- ...d-fix-an-incorrect-timeout-checking-in-mo.patch | 30 - ...eed-add-a-workaround-to-fix-a-silicon-bug.patch | 26 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 1 - .../configuration/entity-manager_%.bbappend | 2 +- ...is-power-cycle-and-reset-to-Chassis-State.patch | 40 + ...0023-Add-host-interrupt-to-the-Host-State.patch | 31 + .../dbus/phosphor-dbus-interfaces_%.bbappend | 4 +- .../fans/phosphor-pid-control_%.bbappend | 2 +- .../recipes-phosphor/gpiodaemon/gpiodaemon.bb | 4 +- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-config/channel_config.json | 4 +- .../0012-ipmi-set-get-boot-options.patch | 62 - ...3-Fix-keep-looping-issue-when-entering-OS.patch | 16 +- ...nbmc_project.State.Chassis-for-IPMI-chass.patch | 127 ++ .../0062-Update-IPMI-Chassis-Control-command.patch | 214 ++ .../ipmi/phosphor-ipmi-host_%.bbappend | 5 +- .../ipmi/phosphor-node-manager-proxy_git.bb | 2 +- .../leds/intel-led-manager-config/led.yaml | 4 + .../multi-node-manager/multi-node-manager.bb | 2 +- .../selftest/intel-self-test_git.bb | 2 +- .../sensors/dbus-sensors_%.bbappend | 4 +- .../special-mode-mgr/special-mode-mgr_git.bb | 2 +- .../srvcfg-manager/srvcfg-manager_git.bb | 4 +- .../recipes-phosphor/system/callback-manager.bb | 4 +- .../users/phosphor-user-manager_%.bbappend | 2 +- ...-log-support-for-IPMI-watchdog-timeout-ac.patch | 31 +- .../webui/phosphor-webui_%.bbappend | 2 +- .../recipes-support/libgpiod/libgpiod_%.bbappend | 2 + .../meta-wht/conf/bblayers.conf.sample | 25 + meta-openbmc-mods/meta-wht/conf/conf-notes.txt | 5 + meta-openbmc-mods/meta-wht/conf/layer.conf | 14 + meta-openbmc-mods/meta-wht/conf/local.conf.sample | 20 + .../meta-wht/conf/machine/intel-ast2500.conf | 1 + .../meta-wolfpass/conf/bblayers.conf.sample | 1 + meta-openbmc-mods/meta-wolfpass/conf/layer.conf | 4 +- .../meta-wolfpass/conf/local.conf.sample | 9 +- .../conf/machine/include/obmc-bsp-si-common.inc | 31 - .../meta-wolfpass/conf/machine/intel-ast2500.conf | 1 + .../meta-wolfpass/conf/machine/wolfpass.conf | 19 - .../recipes-intel/temporary/set-passthrough.bb | 13 - .../temporary/set-passthrough/set-passthrough.sh | 41 - .../0001-arm-dts-add-DTS-for-Intel-platforms.patch | 414 ---- ...le-pass-through-on-GPIOE1-and-GPIOE3-free.patch | 121 -- ...GPIOE0-and-GPIOE2-pass-through-by-default.patch | 70 - .../linux-aspeed/0004-Test-code-for-LPC-MBOX.patch | 112 -- .../linux-aspeed/0005-128MB-flashmap-for-PFR.patch | 30 - .../recipes-kernel/linux/linux-aspeed/wolfpass.cfg | 69 - .../recipes-kernel/linux/linux-aspeed_%.bbappend | 8 - .../entity-manager/CYP-baseboard.json | 1369 ------------- .../entity-manager/FCXXPDBASSMBL_PDB.json | 91 - .../entity-manager/MIDPLANE-2U2X12SWITCH.json | 104 - .../entity-manager/OPB2RH-Chassis.json | 19 - .../entity-manager/TNP-baseboard.json | 1845 ----------------- .../configuration/entity-manager/WC-Baseboard.json | 2082 -------------------- .../configuration/entity-manager/WP-Baseboard.json | 2075 ------------------- .../configuration/entity-manager_%.bbappend | 15 - .../console/obmc-console/obmc-console.conf | 3 - .../console/obmc-console/obmc-console@.service | 21 - .../console/obmc-console/sol-option-check.sh | 25 - .../console/obmc-console_%.bbappend | 8 - .../recipes-phosphor/fans/fan-default-speed.bb | 20 - .../fan-default-speed/fan-default-speed.service | 10 - .../fans/fan-default-speed/set_fan_speeds.py | 23 - .../recipes-phosphor/fru/default-fru.bb | 27 - .../recipes-phosphor/fru/default-fru/LICENCE | 13 - .../fru/default-fru/S2600CYP.fru.bin | Bin 513 -> 0 bytes .../fru/default-fru/S2600TNP.fru.bin | Bin 512 -> 0 bytes .../fru/default-fru/S2600WC.fru.bin | Bin 511 -> 0 bytes .../fru/default-fru/S2600WFT.fru.bin | Bin 512 -> 0 bytes .../fru/default-fru/S2600WP.fru.bin | Bin 512 -> 0 bytes .../fru/default-fru/SetBaseboardFru.service | 9 - .../recipes-phosphor/fru/default-fru/checkFru.sh | 38 - .../recipes-phosphor/workbook/wolfpass-config.bb | 10 - meta-openbmc-mods/meta-wolfpass/recipes.txt | 2 - 163 files changed, 9346 insertions(+), 9765 deletions(-) create mode 100644 meta-openbmc-mods/meta-ast2500/conf/layer.conf create mode 100644 meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc create mode 100644 meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service create mode 100755 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service create mode 100755 meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh create mode 100644 meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb create mode 100644 meta-openbmc-mods/meta-ast2500/recipes.txt mode change 100644 => 120000 meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend create mode 100644 meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service delete mode 100755 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service delete mode 100755 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service delete mode 100755 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service delete mode 100755 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service delete mode 100644 meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch mode change 100755 => 100644 meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml create mode 100644 meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample create mode 100644 meta-openbmc-mods/meta-wht/conf/conf-notes.txt create mode 100644 meta-openbmc-mods/meta-wht/conf/layer.conf create mode 100644 meta-openbmc-mods/meta-wht/conf/local.conf.sample create mode 100644 meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf delete mode 100644 meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc create mode 100644 meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf delete mode 100644 meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service delete mode 100755 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service delete mode 100755 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb delete mode 100644 meta-openbmc-mods/meta-wolfpass/recipes.txt diff --git a/meta-openbmc-mods/conf/machine/include/intel.inc b/meta-openbmc-mods/conf/machine/include/intel.inc index 9fedc33e7..236ccb768 100644 --- a/meta-openbmc-mods/conf/machine/include/intel.inc +++ b/meta-openbmc-mods/conf/machine/include/intel.inc @@ -11,6 +11,8 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager" VIRTUAL-RUNTIME_obmc-led-monitor = "" +VIRTUAL-RUNTIME_obmc-host-state-manager = "intel-chassis-control" +VIRTUAL-RUNTIME_obmc-chassis-state-manager = "intel-chassis-control" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" diff --git a/meta-openbmc-mods/meta-ast2500/conf/layer.conf b/meta-openbmc-mods/meta-ast2500/conf/layer.conf new file mode 100644 index 000000000..99ca15d28 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/conf/layer.conf @@ -0,0 +1,21 @@ +LOCALCONF_VERSION = "3" +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "ast2500" +BBFILE_PATTERN_ast2500 = "" +BBFILE_PRIORITY_ast2500 = "6" +LAYERSERIES_COMPAT_ast2500 = "warrior" + +INHERIT += "extrausers" +#INHERIT += " cve-check" + +EXTRA_USERS_PARAMS_append_pn-intel-platforms = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " + +hostname_pn-base-files = "intel-obmc" diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc new file mode 100644 index 000000000..cc9e30495 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc @@ -0,0 +1,19 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-purley.dtb" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-si-common.inc +require conf/machine/include/intel.inc +require conf/distro/include/phosphor-tiny.inc + +UBOOT_MACHINE = "ast_g5_phy_config" + +#Developer to specify the appropriate IMAGE_TYPE and FLASH_SIZE +#On Intel Whitley platforms PFR feature requires 128MB flash, default is 64MB +#IMAGE_TYPE = "default" or "pfr" or "non-pfr" +# "non-pfr" setting for future which is for BMC secure boot +#for PFR its 128MB in KBs - 128*1024=131072, for non-pfr its 64MB= 64*1024 = 65536 +#pfr IMAGE_TYPE enforces the image signature verification during the image update +IMAGE_TYPE = "default" + +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc new file mode 100644 index 000000000..24ec3113b --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/obmc-bsp-si-common.inc @@ -0,0 +1,31 @@ +#@TYPE: Machine +#@NAME: OpenBMC +#@DESCRIPTION: Common machine configuration for OpenBMC chips + +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" +EXTRA_IMAGEDEPENDS += "u-boot" + +IMAGE_FSTYPES += "squashfs-xz" +IMAGE_FSTYPES += "mtd-auto" +INITRAMFS_FSTYPES = "squashfs-xz" +EXTRA_IMAGECMD_squashfs-xz_append = "-processors ${BB_NUMBER_THREADS} -b 262144 -Xdict-size 100% -Xbcj arm" + +KERNEL_CLASSES ?= "kernel-fitimage" +KERNEL_IMAGETYPES ?= "fitImage" +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" + +UBOOT_SUFFIX ?= "bin" + +MACHINEOVERRIDES =. "openbmc:" + +OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" +OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils-aspeed" + +IMAGE_CLASSES += "image_types image_types_phosphor_auto" + +INITRAMFS_CTYPE ?= "lzma" +INITRAMFS_IMAGE = "obmc-phosphor-initramfs" + +MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" + +KERNEL_IMAGETYPES += "zImage" diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch new file mode 100644 index 000000000..978489110 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch @@ -0,0 +1,414 @@ +From fbbad6c3a18ec7f1e9d95c09e44e765de303329c Mon Sep 17 00:00:00 2001 +From: Yuan Li +Date: Tue, 19 Sep 2017 15:55:39 +0800 +Subject: [PATCH] arm: dts: add DTS for Intel platforms + +Add the DTS file for Intel systems. + +Signed-off-by: Yuan Li +Signed-off-by: Yong Li +Signed-off-by: James Feist +Signed-off-by: Jae Hyun Yoo +Signed-off-by: Jason M. Bills +--- + arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 388 ++++++++++++++++++++++++++ + 1 file changed, 388 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts + +diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +new file mode 100644 +index 0000000..421699c +--- /dev/null ++++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +@@ -0,0 +1,388 @@ ++/dts-v1/; ++ ++#include "aspeed-g5.dtsi" ++#include ++#include ++ ++/ { ++ model = "Purley BMC"; ++ compatible = "intel,purley-bmc", "aspeed,ast2500"; ++ ++ aliases { ++ serial4 = &uart5; ++ }; ++ ++ chosen { ++ stdout-path = &uart5; ++ bootargs = "console=ttyS4,115200 earlyprintk"; ++ }; ++ ++ memory@80000000 { ++ reg = <0x80000000 0x20000000>; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ vga_memory: framebuffer@7f000000 { ++ no-map; ++ reg = <0x7f000000 0x01000000>; ++ }; ++ ++ gfx_memory: framebuffer { ++ size = <0x01000000>; ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ ++ video_engine_memory: jpegbuffer { ++ size = <0x02000000>; /* 32M */ ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; ++ }; ++ ++ vga-shared-memory { ++ compatible = "aspeed,ast2500-vga-sharedmem"; ++ reg = <0x9ff00000 0x100000>; ++ }; ++ ++ iio-hwmon { ++ compatible = "iio-hwmon"; ++ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, ++ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, ++ <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>, ++ <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ identify { ++ default-state = "off"; ++ gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; ++ }; ++ ++ status_amber { ++ default-state = "off"; ++ gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; ++ }; ++ ++ status_green { ++ default-state = "keep"; ++ gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ beeper { ++ compatible = "pwm-beeper"; ++ pwms = <&timer 5 1000000 0>; ++ }; ++}; ++ ++&fmc { ++ status = "okay"; ++ flash@0 { ++ status = "okay"; ++ m25p,fast-read; ++#include "openbmc-flash-layout-intel-64MB.dtsi" ++ }; ++}; ++ ++&espi { ++ status = "okay"; ++}; ++ ++&jtag { ++ status = "okay"; ++}; ++ ++&peci0 { ++ status = "okay"; ++}; ++ ++&syscon { ++ uart-clock-high-speed; ++ status = "okay"; ++}; ++ ++&adc { ++ status = "okay"; ++}; ++ ++&gpio { ++ status = "okay"; ++ gpio-line-names = ++ /*A0-A7*/ "","","","","","","","", ++ /*B0-B7*/ "","","","","","","","", ++ /*C0-C7*/ "","","","","","","","", ++ /*D0-D7*/ "","","","","","","","", ++ /*E0-E7*/ "RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","", ++ /*F0-F7*/ "","","","","","","","", ++ /*G0-G7*/ "","","","","","","","", ++ /*H0-H7*/ "","","","","","","","", ++ /*I0-I7*/ "","","","","","","","", ++ /*J0-J7*/ "","","","","","","","", ++ /*K0-K7*/ "","","","","","","","", ++ /*L0-L7*/ "","","","","","","","", ++ /*M0-M7*/ "","","","","","","","", ++ /*N0-N7*/ "","","","","","","","", ++ /*O0-O7*/ "","","","","","","","", ++ /*P0-P7*/ "","","","","","","","", ++ /*Q0-Q7*/ "","","","","","","","", ++ /*R0-R7*/ "","","","","","","","", ++ /*S0-S7*/ "","","","","","","","", ++ /*T0-T7*/ "","","","","","","","", ++ /*U0-U7*/ "","","","","","","","", ++ /*V0-V7*/ "","","","","","","","", ++ /*W0-W7*/ "","","","","","","","", ++ /*X0-X7*/ "","","","","","","","", ++ /*Y0-Y7*/ "SIO_S3","SIO_S5","","SIO_ONCONTROL","","","","", ++ /*Z0-Z7*/ "","SIO_POWER_GOOD","","","","","","", ++ /*AA0-AA7*/ "","","","","","","","POST_COMPLETE", ++ /*AB0-AB7*/ "","NMI_BUTTON","ID_BUTTON","PS_PWROK","","","","", ++ /*AC0-AC7*/ "","","","","","","",""; ++}; ++ ++&kcs3 { ++ kcs_addr = <0xCA2>; ++ status = "okay"; ++}; ++ ++&kcs4 { ++ kcs_addr = <0xCA4>; ++ status = "okay"; ++}; ++ ++&lpc_sio { ++ status = "okay"; ++}; ++ ++&lpc_snoop { ++ snoop-ports = <0x80>; ++ status = "okay"; ++}; ++ ++&mbox { ++ status = "okay"; ++}; ++ ++/** ++ * SAFS through SPI1 is available only on Wilson Point. ++ * These pins are used as fan presence checking gpios in WFP ++ * so commenting it out for now. ++ * &spi1 { ++ * status = "okay"; ++ * ++ * flash@0 { ++ * m25p,fast-read; ++ * status = "okay"; ++ * }; ++ *}; ++ */ ++ ++&sgpio { ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd1_default ++ &pinctrl_rxd1_default ++ &pinctrl_nrts1_default ++ &pinctrl_ndtr1_default ++ &pinctrl_ndsr1_default ++ &pinctrl_ncts1_default ++ &pinctrl_ndcd1_default ++ &pinctrl_nri1_default>; ++}; ++ ++&uart2 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_txd2_default ++ &pinctrl_rxd2_default ++ &pinctrl_nrts2_default ++ &pinctrl_ndtr2_default ++ &pinctrl_ndsr2_default ++ &pinctrl_ncts2_default ++ &pinctrl_ndcd2_default ++ &pinctrl_nri2_default>; ++}; ++ ++&uart3 { ++ status = "okay"; ++}; ++ ++&uart4 { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <>; ++}; ++ ++&uart5 { ++ status = "okay"; ++}; ++ ++&mac1 { ++ status = "okay"; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; ++}; ++ ++&mac0 { ++ status = "okay"; ++ use-ncsi; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_rmii1_default>; ++}; ++ ++&i2c0 { ++ multi-master; ++ general-call; ++ status = "okay"; ++ ++ ipmb0@10 { ++ compatible = "slave-mqueue"; ++ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; ++ }; ++}; ++ ++&i2c1 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&i2c2 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&i2c3 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&i2c4 { ++ multi-master; ++ status = "okay"; ++ ++ hsbp0@10 { ++ compatible = "slave-mqueue"; ++ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; ++ }; ++}; ++ ++&i2c5 { ++ bus-frequency = <1000000>; ++ multi-master; ++ status = "okay"; ++ ++ smlink0@10 { ++ compatible = "slave-mqueue"; ++ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; ++ }; ++}; ++ ++&i2c6 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&i2c7 { ++ multi-master; ++ #retries = <3>; ++ status = "okay"; ++}; ++ ++&i2c9 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&i2c13 { ++ multi-master; ++ status = "okay"; ++}; ++ ++&gfx { ++ status = "okay"; ++ memory-region = <&gfx_memory>; ++}; ++ ++&vuart { ++ status = "okay"; ++}; ++ ++&pwm_tacho { ++ status = "okay"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default ++ &pinctrl_pwm2_default &pinctrl_pwm3_default ++ &pinctrl_pwm4_default &pinctrl_pwm5_default ++ &pinctrl_pwm6_default &pinctrl_pwm7_default>; ++ ++ fan@0 { ++ reg = <0x00>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; ++ }; ++ fan@1 { ++ reg = <0x01>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; ++ }; ++ fan@2 { ++ reg = <0x02>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; ++ }; ++ fan@3 { ++ reg = <0x03>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; ++ }; ++ fan@4 { ++ reg = <0x04>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>; ++ }; ++ fan@5 { ++ reg = <0x05>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0A 0x0B>; ++ }; ++ fan@6 { ++ reg = <0x06>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0C 0x0D>; ++ }; ++ fan@7 { ++ reg = <0x07>; ++ aspeed,fan-tach-ch = /bits/ 8 <0x0E 0x0F>; ++ }; ++ ++}; ++ ++&timer { ++/* ++ * Available settings: ++ * fttmr010,pwm-outputs = <5>, <6>, <7>, <8>; ++ * pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default ++ * &pinctrl_timer7_default &pinctrl_timer8_default>; ++ */ ++ fttmr010,pwm-outputs = <5>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_timer5_default>; ++ #pwm-cells = <3>; ++ status = "okay"; ++}; ++ ++&video { ++ status = "okay"; ++ memory-region = <&video_engine_memory>; ++}; ++ ++&vhub { ++ status = "okay"; ++}; +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch new file mode 100644 index 000000000..b05ad2502 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch @@ -0,0 +1,121 @@ +From 9537923d6e6a793cb2bf3c1daacd12562263bc0a Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Fri, 3 May 2019 16:12:39 -0700 +Subject: [PATCH] Enable pass-through on GPIOE1 and GPIOE3 free + +This change adds a gpio_disable_free() implementation that checks +if the GPIO being freed is GPIOE1 (33) or GPIOE3 (35) and will +re-enable the pass-through mux. + +Tested: +Requested GPIOs 33 and 35 and used devmem to check that pass-through +was disabled. Then freed them and checked that pass-through was +enabled again. + +Signed-off-by: Jason M. Bills +--- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 60 ++++++++++++++++++++++++++++++ + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 3 ++ + 3 files changed, 64 insertions(+) + +diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +index 187abd7..beb0729 100644 +--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c ++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +@@ -2498,6 +2498,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = { + .get_function_groups = aspeed_pinmux_get_fn_groups, + .set_mux = aspeed_pinmux_set_mux, + .gpio_request_enable = aspeed_gpio_request_enable, ++ .gpio_disable_free = aspeed_gpio_disable_free, + .strict = true, + }; + +diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c +index eb87ab7..f06d752 100644 +--- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c ++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c +@@ -538,6 +538,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, + return aspeed_sig_expr_enable(expr, pdata->maps); + } + ++void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, ++ struct pinctrl_gpio_range *range, ++ unsigned int offset) ++{ ++ const struct aspeed_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev); ++ const struct aspeed_pin_desc *pdesc = pdata->pins[offset].drv_data; ++ const struct aspeed_sig_expr ***prios, **funcs, *expr; ++ int ret; ++ ++ /* ++ * If we're freeing GPIOE1 (33) or GPIOE3 (35) then re-enable the ++ * pass-through mux setting; otherwise, do nothing. ++ */ ++ if (offset != 33 && offset != 35) ++ return; ++ ++ dev_dbg(pctldev->dev, ++ "Freeing pass-through pin %s (%d). Re-enabling pass-through.\n", ++ pdesc->name, offset); ++ ++ if (!pdesc) ++ return; ++ ++ prios = pdesc->prios; ++ ++ if (!prios) ++ return; ++ ++ /* Disable any functions of higher priority than GPIO just in case */ ++ while (funcs = *prios) { ++ if (aspeed_gpio_in_exprs(funcs)) ++ break; ++ ++ ret = aspeed_disable_sig(funcs, pdata->maps); ++ if (ret) ++ return; ++ ++ prios++; ++ } ++ ++ if (!funcs) { ++ char *signals = get_defined_signals(pdesc); ++ ++ pr_warn("No GPIO signal type found on pin %s (%d). Found: %s\n", ++ pdesc->name, offset, signals); ++ kfree(signals); ++ ++ return; ++ } ++ ++ /* ++ * Pass-through should be one priority higher than the GPIO function, ++ * so decrement our prios and enable that function ++ */ ++ prios--; ++ funcs = *prios; ++ expr = *funcs; ++ aspeed_sig_expr_enable(expr, pdata->maps); ++} ++ + int aspeed_pinctrl_probe(struct platform_device *pdev, + struct pinctrl_desc *pdesc, + struct aspeed_pinctrl_data *pdata) +diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h +index d4d7f03..0037b11 100644 +--- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h ++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h +@@ -595,6 +595,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, + int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, + struct pinctrl_gpio_range *range, + unsigned int offset); ++void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, ++ struct pinctrl_gpio_range *range, ++ unsigned int offset); + int aspeed_pinctrl_probe(struct platform_device *pdev, + struct pinctrl_desc *pdesc, + struct aspeed_pinctrl_data *pdata); +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch new file mode 100644 index 000000000..1d26b9667 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch @@ -0,0 +1,70 @@ +From d26dd7c4ef1a2cb88440420deccc54eb88129c60 Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Mon, 6 May 2019 14:18:27 -0700 +Subject: [PATCH] Enable GPIOE0 and GPIOE2 pass-through by default + +This change sets the gpio DT pinctrl default configuration to +enable GPIOE0 and GPIOE2 pass-through. Since this causes +pinctrl_get_select_default() to be called automatically for +the gpio driver to claim the GPIO pins in those groups, we +also need to call pinctrl_put() to release claim on the +pass-through GPIOs so they can be requested at runtime. + +Tested: +Disabled pass-through in uboot and confirmed that after booting +Linux, pass-through is enabled and 'cat /sys/kernel/debug/pinctrl/ +1e6e2000.syscon\:pinctrl-aspeed-g5-pinctrl/pinmux-pins' shows that +the pass-through GPIOs are UNCLAIMED. + +Signed-off-by: Jason M. Bills +--- + arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 4 ++++ + drivers/gpio/gpio-aspeed.c | 10 ++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +index 45556ac..051e927 100644 +--- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts ++++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +@@ -124,6 +124,10 @@ + + &gpio { + status = "okay"; ++ /* Enable GPIOE0 and GPIOE2 pass-through by default */ ++ pinctrl-names = "pass-through"; ++ pinctrl-0 = <&pinctrl_gpie0_default ++ &pinctrl_gpie2_default>; + gpio-line-names = + /*A0-A8*/ "","","","","","","","", + /*B0-B8*/ "","","","","","","","", +diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c +index 2175070..f47d139 100644 +--- a/drivers/gpio/gpio-aspeed.c ++++ b/drivers/gpio/gpio-aspeed.c +@@ -1157,6 +1157,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) + const struct of_device_id *gpio_id; + struct aspeed_gpio *gpio; + struct resource *res; ++ struct pinctrl *pinctrl; + int rc, i, banks; + + gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); +@@ -1205,6 +1206,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) + return -ENOMEM; + + /* ++ * Select the pass-through pinctrl config to enable the pass-through ++ * mux for GPIOs E0 and E2. Then call pinctrl_put() to release claim ++ * of the GPIO pins, so they can be requested at runtime. ++ */ ++ pinctrl = pinctrl_get_select(&pdev->dev, "pass-through"); ++ if (pinctrl) ++ pinctrl_put(pinctrl); ++ ++ /* + * Populate it with initial values read from the HW and switch + * all command sources to the ARM by default + */ +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch new file mode 100644 index 000000000..dbb163d20 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch @@ -0,0 +1,112 @@ +From 2f3587cf9e44f261fe74413ef6a54467686c910b Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo +Date: Tue, 20 Nov 2018 15:49:15 -0800 +Subject: [PATCH] Test code for LPC MBOX + +Blocked interrupt driven code for test. + +Signed-off-by: Jae Hyun Yoo +--- + drivers/misc/aspeed-lpc-mbox.c | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/drivers/misc/aspeed-lpc-mbox.c b/drivers/misc/aspeed-lpc-mbox.c +index 0f0c711bafee..0933e0553953 100644 +--- a/drivers/misc/aspeed-lpc-mbox.c ++++ b/drivers/misc/aspeed-lpc-mbox.c +@@ -19,6 +19,8 @@ + + #define DEVICE_NAME "aspeed-mbox" + ++#define MBX_USE_INTERRUPT 0 ++ + #define ASPEED_MBOX_NUM_REGS 16 + + #define ASPEED_MBOX_DATA_0 0x00 +@@ -79,12 +81,14 @@ static int aspeed_mbox_open(struct inode *inode, struct file *file) + struct aspeed_mbox *mbox = file_mbox(file); + + if (atomic_inc_return(&aspeed_mbox_open_count) == 1) { ++#if MBX_USE_INTERRUPT + /* + * Clear the interrupt status bit if it was left on and unmask + * interrupts. + * ASPEED_MBOX_CTRL_RECV bit is W1C, this also unmasks in 1 step + */ + aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); ++#endif + return 0; + } + +@@ -106,6 +110,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, + if (count + *ppos > ASPEED_MBOX_NUM_REGS) + return -EINVAL; + ++#if MBX_USE_INTERRUPT + if (file->f_flags & O_NONBLOCK) { + if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & + ASPEED_MBOX_CTRL_RECV)) +@@ -115,6 +120,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, + ASPEED_MBOX_CTRL_RECV)) { + return -ERESTARTSYS; + } ++#endif + + mutex_lock(&mbox->mutex); + +@@ -129,8 +135,10 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, + count--; + } + ++#if MBX_USE_INTERRUPT + /* ASPEED_MBOX_CTRL_RECV bit is write to clear, this also unmasks in 1 step */ + aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); ++#endif + ret = p - buf; + + out_unlock: +@@ -180,7 +188,9 @@ static unsigned int aspeed_mbox_poll(struct file *file, poll_table *wait) + + poll_wait(file, &mbox->queue, wait); + ++#if MBX_USE_INTERRUPT + if (aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV) ++#endif + mask |= POLLIN; + + return mask; +@@ -206,6 +216,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg) + { + struct aspeed_mbox *mbox = arg; + ++#if MBX_USE_INTERRUPT + if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV)) + return IRQ_NONE; + +@@ -216,6 +227,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg) + + /* Mask it off, we'll clear it when we the data gets read */ + aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL); ++#endif + + wake_up(&mbox->queue); + return IRQ_HANDLED; +@@ -248,7 +260,14 @@ static int aspeed_mbox_config_irq(struct aspeed_mbox *mbox, + aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_0); + aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_1); + +- aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); ++ aspeed_mbox_outb(mbox, aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) | ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL); ++ ++ /* ++ * Because mailbox data register init value is random, need to give a ++ * init value to mailbox data register. ++ */ ++ aspeed_mbox_outb(mbox, 0x00, ASPEED_MBOX_DATA_0); ++ + return 0; + } + +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch new file mode 100644 index 000000000..03b4f4da4 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch @@ -0,0 +1,30 @@ +From ddfbe1364c6ecf77f06990e6550dfe5a3791e6bf Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy +Date: Wed, 6 Feb 2019 15:59:34 +0530 +Subject: [PATCH] Selecting 128MB for PFR + +PFR platforms requires 128MB flash mapping. +This will override the existing 64MB flash map +and loads 128MB flash map. + +Signed-off-by: Vikram Bodireddy +--- + arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +index 8aba46cdce46..6959a06d04e2 100644 +--- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts ++++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts +@@ -90,7 +90,7 @@ + flash@0 { + status = "okay"; + m25p,fast-read; +-#include "openbmc-flash-layout-intel-64MB.dtsi" ++#include "openbmc-flash-layout-intel-128MB.dtsi" + }; + }; + +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch new file mode 100644 index 000000000..d3b850efe --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0006-Allow-monitoring-of-power-control-input-GPIOs.patch @@ -0,0 +1,80 @@ +From 2e834ae04eba975066f80102c6f4656da314ca1e Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Fri, 24 May 2019 12:42:59 -0700 +Subject: [PATCH] Allow monitoring of power control input GPIOs + +The pass-through input GPIOs cannot be monitored because when +requested, pass-through is disabled which causes a change on the +pass-through output. + +The SIO GPIOs cannot be monitored because when requested, the +request is rejected based on the value of the ACPI strap. + +This change removes the register check condition from the pass- +through and desired SIO GPIOs so they can be requsted and +monitored from power control. + +Tested: +For pass-through, I used gpioset to hold a request on the input +GPIOs and confirmed that pass-through remained enabled. + +For SIO, I used gpioget to confirm that I can successfully request +and read the GPIO value. + +Signed-off-by: Jason M. Bills +--- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +index beb0729..05d1081 100644 +--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c ++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +@@ -250,7 +250,7 @@ FUNC_GROUP_DECL(SD2, F19, E21, F20, D20, D21, E20, G18, C21); + + #define B20 32 + SIG_EXPR_LIST_DECL_SINGLE(NCTS3, NCTS3, SIG_DESC_SET(SCU80, 16)); +-SIG_EXPR_DECL(GPIE0IN, GPIE0, GPIE0_DESC); ++SIG_EXPR_DECL(GPIE0IN, GPIE0); + SIG_EXPR_DECL(GPIE0IN, GPIE, GPIE_DESC); + SIG_EXPR_LIST_DECL_DUAL(GPIE0IN, GPIE0, GPIE); + MS_PIN_DECL(B20, GPIOE0, NCTS3, GPIE0IN); +@@ -270,7 +270,7 @@ FUNC_GROUP_DECL(GPIE0, B20, C20); + + #define F18 34 + SIG_EXPR_LIST_DECL_SINGLE(NDSR3, NDSR3, SIG_DESC_SET(SCU80, 18)); +-SIG_EXPR_DECL(GPIE2IN, GPIE2, GPIE2_DESC); ++SIG_EXPR_DECL(GPIE2IN, GPIE2); + SIG_EXPR_DECL(GPIE2IN, GPIE, GPIE_DESC); + SIG_EXPR_LIST_DECL_DUAL(GPIE2IN, GPIE2, GPIE); + MS_PIN_DECL(F18, GPIOE2, NDSR3, GPIE2IN); +@@ -1349,7 +1349,7 @@ FUNC_GROUP_DECL(ADC15, H4); + + #define R22 192 + SIG_EXPR_DECL(SIOS3, SIOS3, SIG_DESC_SET(SCUA4, 8)); +-SIG_EXPR_DECL(SIOS3, ACPI, ACPI_DESC); ++SIG_EXPR_DECL(SIOS3, ACPI); + SIG_EXPR_LIST_DECL_DUAL(SIOS3, SIOS3, ACPI); + SIG_EXPR_LIST_DECL_SINGLE(DASHR22, DASHR22, SIG_DESC_SET(SCU94, 10)); + MS_PIN_DECL(R22, GPIOY0, SIOS3, DASHR22); +@@ -1357,7 +1357,7 @@ FUNC_GROUP_DECL(SIOS3, R22); + + #define R21 193 + SIG_EXPR_DECL(SIOS5, SIOS5, SIG_DESC_SET(SCUA4, 9)); +-SIG_EXPR_DECL(SIOS5, ACPI, ACPI_DESC); ++SIG_EXPR_DECL(SIOS5, ACPI); + SIG_EXPR_LIST_DECL_DUAL(SIOS5, SIOS5, ACPI); + SIG_EXPR_LIST_DECL_SINGLE(DASHR21, DASHR21, SIG_DESC_SET(SCU94, 10)); + MS_PIN_DECL(R21, GPIOY1, SIOS5, DASHR21); +@@ -1373,7 +1373,7 @@ FUNC_GROUP_DECL(SIOPWREQ, P22); + + #define P21 195 + SIG_EXPR_DECL(SIOONCTRL, SIOONCTRL, SIG_DESC_SET(SCUA4, 11)); +-SIG_EXPR_DECL(SIOONCTRL, ACPI, ACPI_DESC); ++SIG_EXPR_DECL(SIOONCTRL, ACPI); + SIG_EXPR_LIST_DECL_DUAL(SIOONCTRL, SIOONCTRL, ACPI); + SIG_EXPR_LIST_DECL_SINGLE(DASHP21, DASHP21, SIG_DESC_SET(SCU94, 11)); + MS_PIN_DECL(P21, GPIOY3, SIOONCTRL, DASHP21); +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg new file mode 100644 index 000000000..480d4cc18 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/intel-ast2500.cfg @@ -0,0 +1,69 @@ +CONFIG_HWMON=y +CONFIG_SENSORS_ASPEED=y +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_IIO=y +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_ASPEED_ADC=y +CONFIG_SGPIO_ASPEED=y +CONFIG_CRC8=y +CONFIG_PECI=y +CONFIG_PECI_CHARDEV=y +CONFIG_PECI_ASPEED=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_OF_CONFIGFS=y +CONFIG_CONFIGFS_FS=y +CONFIG_BLK_DEV_RAM_SIZE=49152 +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_ASPEED_ESPI_SLAVE=y +CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=n +CONFIG_I2C_SLAVE_MQUEUE=y +CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 +CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 +CONFIG_ASPEED_LPC_SIO=y +CONFIG_JTAG=y +CONFIG_JTAG_ASPEED=y +CONFIG_FRAME_VECTOR=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_ASPEED=y +CONFIG_VIDEOBUF2_CORE=y +CONFIG_VIDEOBUF2_V4L2=y +CONFIG_VIDEOBUF2_MEMOPS=y +CONFIG_VIDEOBUF2_DMA_CONTIG=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_LIBCOMPOSITE=y +CONFIG_USB_F_HID=y +CONFIG_USB_GADGET=y +CONFIG_U_SERIAL_CONSOLE=y +CONFIG_USB_ASPEED_VHUB=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_ASPEED_UART_ROUTING=y +CONFIG_DEVMEM=y +CONFIG_ASPEED_VGA_SHAREDMEM=y +CONFIG_DEVMEM_BOOTPARAM=n +CONFIG_PWM=y +CONFIG_PWM_FTTMR010=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_PWM_BEEPER=y +CONFIG_VFAT_FS=y +CONFIG_NLS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_UTF8=y + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..0ba716442 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://intel-ast2500.cfg \ + file://0001-arm-dts-add-DTS-for-Intel-platforms.patch \ + file://0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch \ + file://0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch \ + file://0004-Test-code-for-LPC-MBOX.patch \ + file://0006-Allow-monitoring-of-power-control-input-GPIOs.patch \ + " +SRC_URI += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}" diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json new file mode 100644 index 000000000..271881706 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json @@ -0,0 +1,1348 @@ +{ + "Exposes": [ + { + "Index": 0, + "Name": "P12V_PSU_RIGHT", + "PowerState": "On", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "P3V3", + "PowerState": "On", + "ScaleFactor": 0.4107, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.647 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.541 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 3.066 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.974 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "PVNN_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.081 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.049 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.807 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.783 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "P105_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.139 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.106 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.995 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.966 + } + ], + "Type": "ADC" + }, + { + "Index": 4, + "Name": "P12V_PSU_LEFT", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "P12V_AUX", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "P1V8_PCH", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.961 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.904 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.699 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.648 + } + ], + "Type": "ADC" + }, + { + "Index": 7, + "Name": "P3VBAT", + "ScaleFactor": 0.3333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.296 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.457 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.138 + } + ], + "Type": "ADC" + }, + { + "Index": 8, + "Name": "PVCCIN_CPU0", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 9, + "Name": "PVCCIN_CPU1", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 10, + "Name": "PVDQ_ABCD_CPU0", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 11, + "Name": "PVDQ_EFGH_CPU0", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 12, + "Name": "PVDQ_ABCD_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 13, + "Name": "PVDQ_EFGH_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 14, + "Name": "PVCCIO_CPU0", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 15, + "Name": "PVCCIO_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "BindGpioIntrusion": "Chassis Intrusion GPIO", + "Class": "Gpio", + "Name": "Chassis Intrusion Sensor", + "Type": "ChassisIntrusionSensor" + }, + { + "Direction": "In", + "Index": 0, + "Name": "Board REV ID0", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 3, + "Name": "Board REV ID1", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 8, + "Name": "Board SKU ID0", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 9, + "Name": "Board SKU ID1", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 10, + "Name": "Board SKU ID2", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 11, + "Name": "Board SKU ID3", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 12, + "Name": "Board SKU ID4", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 18, + "Name": "OCP3 PRSNTB0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 19, + "Name": "OCP3 PRSNTB1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 20, + "Name": "OCP3 PRSNTB2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 21, + "Name": "OCP3 PRSNTB3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 24, + "Name": "Force BMC Update", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 26, + "Name": "OCP PWRGD Aux", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 42, + "Name": "CPU1 Memhot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 43, + "Name": "CPU2 Memhot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 44, + "Name": "Cpu Err0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 45, + "Name": "Cpu Err1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 46, + "Name": "Platform Reset", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 47, + "Name": "CPU PRDY", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 48, + "Name": "Cpu Err2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 49, + "Name": "Cpu Caterr", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 50, + "Name": "PCH Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 51, + "Name": "Board REV ID2", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 52, + "Name": "NMI Event", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 53, + "Name": "Board SKU ID5", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 56, + "Name": "Rise1 PWRGD", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 57, + "Name": "Rise2 PWRGD", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 61, + "Name": "Rise3 PWRGD", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "In", + "Index": 62, + "Name": "Rise4 PWRGD", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 63, + "Name": "240VA OC", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 64, + "Name": "SYS FAN0 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 65, + "Name": "SYS FAN1 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 66, + "Name": "SYS FAN2 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 67, + "Name": "SYS FAN3 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 68, + "Name": "SASM ROC ID0", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 69, + "Name": "SASM ROC ID1", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 70, + "Name": "Midplane Switch ID0", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 71, + "Name": "Midplane Switch ID1", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 137, + "Name": "PCA9555 Intr", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 138, + "Name": "SYS FAN4 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 139, + "Name": "SYS FAN5 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 140, + "Name": "SYS FAN6 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 141, + "Name": "SYS FAN7 PRSNT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 143, + "Name": "Chassis Intrusion GPIO", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 144, + "Name": "Remote Debug Enable", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 146, + "Name": "RSMRST", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 214, + "Name": "SMI Active", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 218, + "Name": "ID Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 232, + "Name": "CPU1 Present", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 233, + "Name": "CPU1 Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 234, + "Name": "CPU1 VR Hot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 235, + "Name": "CPU1 FIVR Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 236, + "Name": "CPU1 Mem VR Hot1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 237, + "Name": "CPU1 Mem VR Hot2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 238, + "Name": "CPU1 ID0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 239, + "Name": "CPU1 ID1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 240, + "Name": "CPU1 Mismatch", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 241, + "Name": "CPU1 DIMM Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 242, + "Name": "CPU2 Present", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 243, + "Name": "CPU2 Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 244, + "Name": "CPU2 VR Hot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 245, + "Name": "CPU2 FIVR Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 246, + "Name": "CPU2 Mem VR Hot1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 247, + "Name": "CPU1 Mem VR Hot2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 248, + "Name": "CPU2 ID0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 249, + "Name": "CPU2 ID1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 250, + "Name": "CPU2 Mismatch", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 251, + "Name": "CPU2 DIMM Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 272, + "Name": "PLD Minor Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 273, + "Name": "PLD Minor Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 274, + "Name": "PLD Minor Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 275, + "Name": "PLD Minor Revison Bit 3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 276, + "Name": "PLD Minor Revison Bit 4", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 277, + "Name": "PLD Minor Revison Bit 5", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 278, + "Name": "PLD Minor Revison Bit 6", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 279, + "Name": "PLD Minor Revison Bit 7", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 280, + "Name": "Main PLD Major Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 281, + "Name": "Main PLD Major Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 282, + "Name": "Main PLD Major Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 283, + "Name": "Main PLD Major Revison Bit 3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 284, + "Name": "Main PLD Major Revison Bit 4", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 285, + "Name": "Main PLD Major Revison Bit 5", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 286, + "Name": "Main PLD Major Revison Bit 6", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 287, + "Name": "Main PLD Major Revison Bit 7", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 289, + "Name": "Memory Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 290, + "Name": "CPU Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 291, + "Name": "P3V3 Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 292, + "Name": "PSU Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 295, + "Name": "PCH Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Address": "0x4D", + "Bus": 6, + "Name": "CPU0 VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP421" + }, + { + "Address": "0x4F", + "Bus": 6, + "Name": "CPU1 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP421" + }, + { + "Address": "0x4A", + "Bus": 6, + "Name": "BMC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4B", + "Bus": 6, + "Name": "RightRear Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4E", + "Bus": 6, + "Name": "LeftRear Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4C", + "Bus": 6, + "Name": "PCH DS Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "CYP Baseboard", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})", + "Type": "Board", + "ProductId": 152, + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + } +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json new file mode 100644 index 000000000..22f8b1c6d --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json @@ -0,0 +1,91 @@ +[ + { + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "FCXXPDBASSMBL Fru", + "Type": "24C01" + }, + { + "Address": "0x18", + "Bus": "$bus", + "Name": "Multi Node Presence Detector", + "Type": "MultiNode" + }, + { + "Address": "0x48", + "Bus": "$bus", + "Name": "PDB Temp1", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 80 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 75 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x49", + "Bus": "$bus", + "Name": "PDB Temp2", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 80 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 75 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "FCXXPDBASSMBL PDB", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FCXXPDBASSMBL', 'ADDRESS' : 85})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + } + } +] \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json new file mode 100644 index 000000000..53edbfe87 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json @@ -0,0 +1,104 @@ +[ + { + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Midplane 1 Fru", + "Type": "EEPROM" + }, + { + "Address": "0x4E", + "Bus": "$bus", + "Name": "Midplane 1 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 80 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 75 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "Midplane 1", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U2X12SWITCH', 'ADDRESS' : 86})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + } + }, + { + "Exposes": [ + { + "Address": "$address", + "Bus": "$bus", + "Name": "Midplane 2 Fru", + "Type": "EEPROM" + }, + { + "Address": "0x4F", + "Bus": "$bus", + "Name": "Midplane 2 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 80 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 75 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "Midplane 2", + "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U2X12SWITCH', 'ADDRESS' : 87})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$BOARD_MANUFACTURER", + "Model": "$BOARD_PRODUCT_NAME", + "PartNumber": "$BOARD_PART_NUMBER", + "SerialNumber": "$BOARD_SERIAL_NUMBER" + } + } +] \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json new file mode 100644 index 000000000..7b86bfae0 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json @@ -0,0 +1,19 @@ +{ + "Exposes": [ + { + "Name": "Multi Node Supported", + "Type": "MultiNode" + } + ], + "Name": "OPB2RH Chassis", + "Probe": [ + "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FCXXPDBASSMBL'})" + ], + "Type": "Chassis", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "Intel Corporation", + "Model": "OPB2RH", + "PartNumber": "R1234", + "SerialNumber": "12345" + } +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json new file mode 100644 index 000000000..75cd39719 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json @@ -0,0 +1,1824 @@ +{ + "Exposes": [ + { + "Index": 0, + "Name": "Baseboard 12 Volt", + "PowerState": "On", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 4, + "Name": "P0V83_LAN_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 0.901 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 0.875 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.786 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.763 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "P105_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.139 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.106 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.995 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.966 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "P12V_AUX", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "P1V8_PCH", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.961 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.904 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.699 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.648 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "P3V3", + "PowerState": "On", + "ScaleFactor": 0.4107, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.647 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.541 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 3.066 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.974 + } + ], + "Type": "ADC" + }, + { + "Index": 7, + "Name": "P3VBAT", + "ScaleFactor": 0.3333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.296 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.457 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.138 + } + ], + "Type": "ADC" + }, + { + "Index": 8, + "Name": "PVCCIN_CPU1", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 9, + "Name": "PVCCIN_CPU2", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 14, + "Name": "PVCCIO_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 15, + "Name": "PVCCIO_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 10, + "Name": "PVDQ_ABCD_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 12, + "Name": "PVDQ_ABCD_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 11, + "Name": "PVDQ_EFGH_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 13, + "Name": "PVDQ_EFGH_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "PVNN_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.081 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.049 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.807 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.783 + } + ], + "Type": "ADC" + }, + { + "Direction": "Input", + "Index": 40, + "Name": "NMI Out", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 50, + "Name": "PCH Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 51, + "Name": "Lcp Enter Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 52, + "Name": "Lcp Left Button", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 53, + "Name": "Lcp Right Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 49, + "Name": "Cpu Caterr", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 48, + "Name": "Cpu Err2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 63, + "Name": "PU 240VA Status", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 208, + "Name": "P3v3bat BridgeEn", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 214, + "Name": "Nmi Button", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 218, + "Name": "ID Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 232, + "Name": "Post Complete led0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 233, + "Name": "Post Complete led1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 233, + "Name": "CPU1 Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 234, + "Name": "Post Complete led2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 234, + "Name": "CPU1 VR Hot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 235, + "Name": "Post Complete led3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 236, + "Name": "Post Complete led4", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 236, + "Name": "CPU1 Mem VR Hot1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 237, + "Name": "Post Complete led5", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 237, + "Name": "CPU1 Mem VR Hot2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 238, + "Name": "Post Complete led6", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 239, + "Name": "Post Complete led7", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 232, + "Name": "CPU1 Present", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 235, + "Name": "CPU1 FIVR Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 238, + "Name": "CPU1 ID0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 240, + "Name": "CPU1 CH1 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 240, + "Name": "CPU1 Mismatch", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 241, + "Name": "CPU1 CH1 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 241, + "Name": "CPU1 DIMM Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 242, + "Name": "CPU1 CH2 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 242, + "Name": "CPU2 Present", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 243, + "Name": "CPU1 CH2 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 243, + "Name": "CPU2 Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 244, + "Name": "CPU1 CH3 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 244, + "Name": "CPU2 VR Hot", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 245, + "Name": "CPU1 CH3 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 245, + "Name": "CPU2 FIVR Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 246, + "Name": "CPU1 CH4 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 246, + "Name": "CPU2 Mem VR Hot1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 247, + "Name": "CPU1 CH4 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 247, + "Name": "CPU1 Mem VR Hot2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 248, + "Name": "CPU1 CH5 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 248, + "Name": "CPU2 ID0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 249, + "Name": "CPU1 CH5 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 250, + "Name": "CPU1 CH6 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 250, + "Name": "CPU2 Mismatch", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 251, + "Name": "CPU1 CH6 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 251, + "Name": "CPU2 DIMM Thermaltrip", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 252, + "Name": "Fan1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 253, + "Name": "Fan2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 254, + "Name": "Fan3 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 255, + "Name": "Fan4 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 256, + "Name": "Fan5 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 257, + "Name": "Fan6 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 258, + "Name": "Fan7 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 259, + "Name": "Fan8 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 260, + "Name": "CPU2 CH1 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 261, + "Name": "CPU2 CH1 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 262, + "Name": "CPU2 CH2 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 263, + "Name": "CPU2 CH2 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 264, + "Name": "CPU2 CH3 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 265, + "Name": "CPU2 CH3 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 266, + "Name": "CPU2 CH4 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 267, + "Name": "CPU2 CH4 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 268, + "Name": "CPU2 CH5 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 269, + "Name": "CPU2 CH5 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 270, + "Name": "CPU2 CH6 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 271, + "Name": "CPU2 CH6 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 272, + "Name": "CPU3 CH1 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 272, + "Name": "PLD Minor Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 273, + "Name": "CPU3 CH1 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 273, + "Name": "PLD Minor Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 274, + "Name": "CPU3 CH2 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 274, + "Name": "PLD Minor Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 275, + "Name": "CPU3 CH2 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 275, + "Name": "PLD Minor Revison Bit 3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 276, + "Name": "CPU3 CH3 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 276, + "Name": "PLD Major Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 277, + "Name": "CPU3 CH3 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 277, + "Name": "PLD Major Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 278, + "Name": "CPU3 CH4 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 278, + "Name": "PLD Major Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 279, + "Name": "CPU3 CH4 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 279, + "Name": "PLD Major Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 280, + "Name": "CPU3 CH5 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 280, + "Name": "Main PLD Minor Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 281, + "Name": "CPU3 CH5 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 281, + "Name": "Main PLD Minor Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 282, + "Name": "CPU3 CH6 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 282, + "Name": "Main PLD Minor Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 283, + "Name": "CPU3 CH6 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 283, + "Name": "Main PLD Minor Revison Bit 3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 284, + "Name": "CPU4 CH1 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 284, + "Name": "Main PLD Major Revison Bit 0", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 285, + "Name": "CPU4 CH1 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 285, + "Name": "Main PLD Major Revison Bit 1", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 286, + "Name": "CPU4 CH2 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 286, + "Name": "Main PLD Major Revison Bit 2", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 287, + "Name": "CPU4 CH2 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 287, + "Name": "Main PLD Major Revison Bit 3", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 288, + "Name": "CPU4 CH3 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 289, + "Name": "CPU4 CH3 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 289, + "Name": "Memory Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 290, + "Name": "CPU4 CH4 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 290, + "Name": "CPU Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 291, + "Name": "CPU4 CH4 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 291, + "Name": "P5V P3V3 Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 292, + "Name": "CPU4 CH5 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 292, + "Name": "PSU Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 293, + "Name": "CPU4 CH5 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 293, + "Name": "SAS Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 294, + "Name": "CPU4 CH6 DIMM1 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 294, + "Name": "Lan Aux Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Out", + "Index": 295, + "Name": "CPU4 CH6 DIMM2 FAULT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 295, + "Name": "PCH Pwr Fault", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 27, + "Name": "Node ID GPIO 0", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 26, + "Name": "Node ID GPIO 1", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Name": "CPU 1 Fan Connector", + "Pwm": 7, + "Status": "disabled", + "Tachs": [ + 13 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "CPU 2 Fan Connector", + "Pwm": 8, + "Status": "disabled", + "Tachs": [ + 14 + ], + "Type": "IntelFanConnector" + }, + { + "Address": "0x8", + "Class": "METemp", + "Name": "SSB Temp", + "PowerState": "BiosPost", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 103 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 98 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x7c", + "Class": "PxeBridgeTemp", + "Name": "CPU1 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x70", + "Class": "PxeBridgeTemp", + "Name": "CPU1 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x74", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem ABC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x78", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem DEF Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x9c", + "Class": "PxeBridgeTemp", + "Name": "CPU2 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x50", + "Class": "PxeBridgeTemp", + "Name": "CPU2 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x94", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem ABC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x98", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem DEF Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xAC", + "Class": "PxeBridgeTemp", + "Name": "VR P1V05 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "BindGpioNodeID": "Node ID GPIO 0", + "Name": "Multi Node ID 0", + "Type": "MultiNode" + }, + { + "BindGpioNodeID": "Node ID GPIO 1", + "Name": "Multi Node ID 1", + "Type": "MultiNode" + }, + { + "Address": "0x71", + "Bus": 2, + "ChannelNames": [ + "M2_Slot1", + "M2_Slot2", + "", + "" + ], + "Name": "M.2 Mux", + "Type": "PCA9543Mux" + }, + { + "Address": "0x30", + "Bus": 0, + "CpuID": 1, + "Name": "Xeon CPU 1", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "DIMM", + "Name": "upper critical", + "Severity": 1, + "Value": 99 + }, + { + "Direction": "greater than", + "Label": "DIMM", + "Name": "upper non critical", + "Severity": 0, + "Value": 89 + } + ], + "Type": "XeonCPU" + }, + { + "Address": "0x31", + "Bus": 0, + "CpuID": 2, + "Name": "Xeon CPU 2", + "Thresholds": [ + { + "Direction": "greater than", + "Label": "DIMM", + "Name": "upper critical", + "Severity": 1, + "Value": 99 + }, + { + "Direction": "greater than", + "Label": "DIMM", + "Name": "upper non critical", + "Severity": 0, + "Value": 89 + } + ], + "Type": "XeonCPU" + }, + { + "Address": "0x4E", + "Bus": 6, + "Name": "Exit Air Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4B", + "Bus": 6, + "Name": "Inlet Air Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "TNP Baseboard", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})", + "Type": "Board", + "ProductId": 153, + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + } +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json new file mode 100644 index 000000000..982dade40 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json @@ -0,0 +1,2040 @@ +{ + "Exposes": [ + { + "Index": 0, + "Name": "A_P12V_PSU_SCALED", + "PowerState": "On", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "P105_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.139 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.106 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.995 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.966 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "P12V_AUX", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "P1V8_PCH", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.961 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.904 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.699 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.648 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "P3V3", + "PowerState": "On", + "ScaleFactor": 0.4107, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.647 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.541 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 3.066 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.974 + } + ], + "Type": "ADC" + }, + { + "BridgeGpio": 208, + "Index": 7, + "Name": "P3VBAT", + "ScaleFactor": 0.3333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.296 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.457 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.138 + } + ], + "Type": "ADC" + }, + { + "Index": 8, + "Name": "PVCCIN_CPU1", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 9, + "Name": "PVCCIN_CPU2", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 14, + "Name": "PVCCIO_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 15, + "Name": "PVCCIO_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 10, + "Name": "PVDQ_ABC_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 12, + "Name": "PVDQ_ABC_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 11, + "Name": "PVDQ_DEF_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 13, + "Name": "PVDQ_DEF_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "PVNN_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.081 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.049 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.807 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.783 + } + ], + "Type": "ADC" + }, + { + "BindConnector": "System Fan connector 1", + "Index": 0, + "Name": "Fan 1a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 1", + "Index": 1, + "Name": "Fan 1b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 2", + "Index": 2, + "Name": "Fan 2a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 2", + "Index": 3, + "Name": "Fan 2b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 3", + "Index": 4, + "Name": "Fan 3a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 3", + "Index": 5, + "Name": "Fan 3b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 4", + "Index": 6, + "Name": "Fan 4a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 4", + "Index": 7, + "Name": "Fan 4b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 5", + "Index": 8, + "Name": "Fan 5a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 5", + "Index": 9, + "Name": "Fan 5b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 6", + "Index": 10, + "Name": "Fan 6a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 6", + "Index": 11, + "Name": "Fan 6b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 7", + "Index": 12, + "Name": "Fan 7a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 7", + "Index": 13, + "Name": "Fan 7b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 8", + "Index": 14, + "Name": "Fan 8a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 8", + "Index": 15, + "Name": "Fan 8b", + "Type": "AspeedFan" + }, + { + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, + "Tachs": [ + "Fan 1a", + "Fan 1b", + "Fan 2a", + "Fan 2b", + "Fan 3a", + "Fan 3b", + "Fan 4a", + "Fan 4b", + "Fan 5a", + "Fan 5b", + "Fan 6a", + "Fan 6b", + "Fan 7a", + "Fan 7b", + "Fan 8a", + "Fan 8b" + ], + "Type": "CFMSensor" + }, + { + "AlphaF": 4.352, + "AlphaS": 0.512, + "Name": "Exit Air Temp", + "PowerFactorMax": 1.0, + "PowerFactorMin": 0.4, + "QMax": 88, + "QMin": 15, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 80 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "ExitAirTempSensor" + }, + { + "AllowedFailures": 1, + "Name": "FanRedundancy", + "Type": "FanRedundancy" + }, + { + "Direction": "Out", + "Index": 208, + "Name": "Bridge P3VBAT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 40, + "Name": "NMI Input", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 48, + "Name": "CPU ERR2", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 49, + "Name": "CPU CATERR", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 214, + "Name": "SMI Input", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 218, + "Name": "ID Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Name": "System Fan connector 1", + "Pwm": 0, + "Tachs": [ + 0, + 1 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 2", + "Pwm": 1, + "Tachs": [ + 2, + 3 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 3", + "Pwm": 2, + "Tachs": [ + 4, + 5 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 4", + "Pwm": 3, + "Tachs": [ + 6, + 7 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 5", + "Pwm": 4, + "Tachs": [ + 8, + 9 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 6", + "Pwm": 5, + "Tachs": [ + 10, + 11 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 7", + "Pwm": 6, + "Tachs": [ + 12, + 13 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 8", + "Pwm": 7, + "Tachs": [ + 14, + 15 + ], + "Type": "IntelFanConnector" + }, + { + "Address": "0x8", + "Class": "METemp", + "Name": "SSB Temp", + "PowerState": "BiosPost", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 103 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 98 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xC4", + "Class": "MpsBridgeTemp", + "Name": "CPU1 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xB4", + "Class": "PxeBridgeTemp", + "Name": "CPU1 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xDC", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem ABCD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xDC", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem EFGH Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x4A", + "Class": "IRBridgeTemp", + "Name": "CPU1 VR P1V8", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xCC", + "Class": "MpsBridgeTemp", + "Name": "CPU2 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xD4", + "Class": "PxeBridgeTemp", + "Name": "CPU2 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xB0", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem ABCD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xEC", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem EFGH Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x4C", + "Class": "IRBridgeTemp", + "Name": "CPU2 VR P1V8", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x71", + "Bus": 2, + "ChannelNames": [ + "M2Slot1", + "M2Slot2" + ], + "Name": "M2 Mux", + "Type": "PCA9543Mux" + }, + { + "Address": "0x72", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "", + "FruChannel" + ], + "Name": "Riser 1 Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x73", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "", + "FruChannel" + ], + "Name": "Riser 2 Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x73", + "Bus": 9, + "ChannelNames": [ + "MemoryChannel1", + "MemoryChannel2", + "MemoryChannel3", + "MemoryChannel4" + ], + "Name": "Memory Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x74", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "PcieSlot3", + "PcieSlot4" + ], + "Name": "PCIE Mux", + "Type": "PCA9546Mux" + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Exit Air Temp" + ], + "Name": "Exit Air Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 1a", + "Fan 1b" + ], + "Name": "Fan 1", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 1" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 2a", + "Fan 2b" + ], + "Name": "Fan 2", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 2" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 3a", + "Fan 3b" + ], + "Name": "Fan 3", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 3" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 4a", + "Fan 4b" + ], + "Name": "Fan 4", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 4" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 5a", + "Fan 5b" + ], + "Name": "Fan 5", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 5" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 6a", + "Fan 6b" + ], + "Name": "Fan 6", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 6" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 7a", + "Fan 7b" + ], + "Name": "Fan 7", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 7" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 8a", + "Fan 8b" + ], + "Name": "Fan 8", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 8" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "BMC Temp" + ], + "Name": "BMC Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [ABC]\\d+ CPU1" + ], + "Name": "CPU1 DIMM ABC", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [DEF]\\d+ CPU1" + ], + "Name": "CPU1 DIMM DEF", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [ABC]\\d+ CPU2" + ], + "Name": "CPU2 DIMM ABC", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [DEF]\\d+ CPU2" + ], + "Name": "CPU2 DIMM DEF", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DTS CPU1" + ], + "Name": "DTS CPU1", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DTS CPU2" + ], + "Name": "DTS CPU2", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Left Rear Temp" + ], + "Name": "Left Rear Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Right Rear Board" + ], + "Name": "Right Rear Board", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "SSB Temp" + ], + "Name": "SSB Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "VR 1 Temp" + ], + "Name": "VR 1 Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "VR 2 Temp" + ], + "Name": "VR 2 Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "Left", + "Type": "Pid.Zone" + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "Right", + "Type": "Pid.Zone" + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "PSU", + "Type": "Pid.Zone" + }, + { + "Class": "Ceiling", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel UCC", + "NegativeHysteresis": 2, + "Output": [ + 70.0, + 80.0 + ], + "PositiveHysteresis": 0, + "Profiles": [ + "Acoustic" + ], + "Reading": [ + 22.0, + 32.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "Floor", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel LCC", + "NegativeHysteresis": 2, + "Output": [ + 50.0, + 60.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 20.0, + 30.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Address": "0x4A", + "Bus": 6, + "Name": "BMC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4B", + "Bus": 6, + "Name": "Right Rear Board Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x49", + "Bus": 6, + "Name": "Left Rear Board Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x48", + "Bus": 6, + "Name": "PCH M.2 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4f", + "Bus": 6, + "Name": "Inlet BRD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4D", + "Bus": "0x1", + "Name": "Front Panel Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 55 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 50 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x30", + "Bus": 0, + "CpuID": 1, + "Name": "CPU 1", + "PresenceGpio": 232, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 99, + "label": "DIMM" + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 89, + "label": "DIMM" + } + ], + "Type": "XeonCPU" + }, + { + "Address": "0x31", + "Bus": 0, + "CpuID": 2, + "Name": "CPU 2", + "PresenceGpio": 242, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 99, + "label": "DIMM" + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 89, + "label": "DIMM" + } + ], + "Type": "XeonCPU" + } + ], + "Name": "WC Baseboard", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})", + "ProductId": 145, + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + } +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json new file mode 100644 index 000000000..bdf6b7d9c --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json @@ -0,0 +1,2033 @@ +{ + "Exposes": [ + { + "Index": 0, + "Name": "A_P12V_PSU_SCALED", + "PowerState": "On", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "P105_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.139 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.106 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.995 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.966 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "P12V_AUX", + "ScaleFactor": 0.1124, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "P1V8_PCH", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.961 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.904 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.699 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.648 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "P3V3", + "PowerState": "On", + "ScaleFactor": 0.4107, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.647 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.541 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 3.066 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.974 + } + ], + "Type": "ADC" + }, + { + "BridgeGpio": 208, + "Index": 7, + "Name": "P3VBAT", + "ScaleFactor": 0.3333, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.296 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 2.457 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.138 + } + ], + "Type": "ADC" + }, + { + "Index": 8, + "Name": "PVCCIN_CPU1", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 9, + "Name": "PVCCIN_CPU2", + "PowerState": "On", + "ScaleFactor": 0.7505, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "Index": 14, + "Name": "PVCCIO_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 15, + "Name": "PVCCIO_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "Index": 10, + "Name": "PVDQ_ABC_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 12, + "Name": "PVDQ_ABC_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 11, + "Name": "PVDQ_DEF_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 13, + "Name": "PVDQ_DEF_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "PVNN_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.081 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.049 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.807 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.783 + } + ], + "Type": "ADC" + }, + { + "BindConnector": "System Fan connector 1", + "Index": 0, + "Name": "Fan 1a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 1", + "Index": 1, + "Name": "Fan 1b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 2", + "Index": 2, + "Name": "Fan 2a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 2", + "Index": 3, + "Name": "Fan 2b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 3", + "Index": 4, + "Name": "Fan 3a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 3", + "Index": 5, + "Name": "Fan 3b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 4", + "Index": 6, + "Name": "Fan 4a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 4", + "Index": 7, + "Name": "Fan 4b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 5", + "Index": 8, + "Name": "Fan 5a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 5", + "Index": 9, + "Name": "Fan 5b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 6", + "Index": 10, + "Name": "Fan 6a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 6", + "Index": 11, + "Name": "Fan 6b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 7", + "Index": 12, + "Name": "Fan 7a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 7", + "Index": 13, + "Name": "Fan 7b", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 8", + "Index": 14, + "Name": "Fan 8a", + "Type": "AspeedFan" + }, + { + "BindConnector": "System Fan connector 8", + "Index": 15, + "Name": "Fan 8b", + "Type": "AspeedFan" + }, + { + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, + "Tachs": [ + "Fan 1a", + "Fan 1b", + "Fan 2a", + "Fan 2b", + "Fan 3a", + "Fan 3b", + "Fan 4a", + "Fan 4b", + "Fan 5a", + "Fan 5b", + "Fan 6a", + "Fan 6b", + "Fan 7a", + "Fan 7b", + "Fan 8a", + "Fan 8b" + ], + "Type": "CFMSensor" + }, + { + "AlphaF": 4.352, + "AlphaS": 0.512, + "Name": "Exit Air Temp", + "PowerFactorMax": 1.0, + "PowerFactorMin": 0.4, + "QMax": 88, + "QMin": 15, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 85 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 80 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "ExitAirTempSensor" + }, + { + "AllowedFailures": 1, + "Name": "FanRedundancy", + "Type": "FanRedundancy" + }, + { + "Direction": "Out", + "Index": 208, + "Name": "Bridge P3VBAT", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 40, + "Name": "NMI Input", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 49, + "Name": "CPU CATERR", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 214, + "Name": "SMI Input", + "Polarity": "High", + "Type": "Gpio" + }, + { + "Direction": "Input", + "Index": 218, + "Name": "ID Button", + "Polarity": "Low", + "Type": "Gpio" + }, + { + "Name": "System Fan connector 1", + "Pwm": 0, + "Tachs": [ + 0, + 1 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 2", + "Pwm": 1, + "Tachs": [ + 2, + 3 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 3", + "Pwm": 2, + "Tachs": [ + 4, + 5 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 4", + "Pwm": 3, + "Tachs": [ + 6, + 7 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 5", + "Pwm": 4, + "Tachs": [ + 8, + 9 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 6", + "Pwm": 5, + "Tachs": [ + 10, + 11 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 7", + "Pwm": 6, + "Tachs": [ + 12, + 13 + ], + "Type": "IntelFanConnector" + }, + { + "Name": "System Fan connector 8", + "Pwm": 7, + "Tachs": [ + 14, + 15 + ], + "Type": "IntelFanConnector" + }, + { + "Address": "0x8", + "Class": "METemp", + "Name": "SSB Temp", + "PowerState": "BiosPost", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 103 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 98 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xC4", + "Class": "MpsBridgeTemp", + "Name": "CPU1 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xB4", + "Class": "PxeBridgeTemp", + "Name": "CPU1 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xDC", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem ABCD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xDC", + "Class": "PxeBridgeTemp", + "Name": "CPU1 VR Mem EFGH Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x4A", + "Class": "IRBridgeTemp", + "Name": "CPU1 VR P1V8", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xCC", + "Class": "MpsBridgeTemp", + "Name": "CPU2 P12V PVCCIN VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xD4", + "Class": "PxeBridgeTemp", + "Name": "CPU2 P12V PVCCIO VR Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xB0", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem ABCD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0xEC", + "Class": "PxeBridgeTemp", + "Name": "CPU2 VR Mem EFGH Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x4C", + "Class": "IRBridgeTemp", + "Name": "CPU2 VR P1V8", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "IpmbSensor" + }, + { + "Address": "0x71", + "Bus": 2, + "ChannelNames": [ + "M2Slot1", + "M2Slot2" + ], + "Name": "M2 Mux", + "Type": "PCA9543Mux" + }, + { + "Address": "0x72", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "", + "FruChannel" + ], + "Name": "Riser 1 Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x73", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "", + "FruChannel" + ], + "Name": "Riser 2 Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x73", + "Bus": 9, + "ChannelNames": [ + "MemoryChannel1", + "MemoryChannel2", + "MemoryChannel3", + "MemoryChannel4" + ], + "Name": "Memory Mux", + "Type": "PCA9545Mux" + }, + { + "Address": "0x74", + "Bus": 2, + "ChannelNames": [ + "PcieSlot1", + "PcieSlot2", + "PcieSlot3", + "PcieSlot4" + ], + "Name": "PCIE Mux", + "Type": "PCA9546Mux" + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Exit Air Temp" + ], + "Name": "Exit Air Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 1a", + "Fan 1b" + ], + "Name": "Fan 1", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 1" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 2a", + "Fan 2b" + ], + "Name": "Fan 2", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 2" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 3a", + "Fan 3b" + ], + "Name": "Fan 3", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 3" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 4a", + "Fan 4b" + ], + "Name": "Fan 4", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 4" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 5a", + "Fan 5b" + ], + "Name": "Fan 5", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 5" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 6a", + "Fan 6b" + ], + "Name": "Fan 6", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 6" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 7a", + "Fan 7b" + ], + "Name": "Fan 7", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 7" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "fan", + "FFGainCoefficient": 1.0, + "FFOffCoefficient": 0.0, + "ICoefficient": 0.0, + "ILimitMax": 0.0, + "ILimitMin": 0.0, + "Inputs": [ + "Fan 8a", + "Fan 8b" + ], + "Name": "Fan 8", + "NegativeHysteresis": 0.0, + "OutLimitMax": 100.0, + "OutLimitMin": 30.0, + "Outputs": [ + "Pwm 8" + ], + "PCoefficient": 0.0, + "PositiveHysteresis": 0.0, + "SlewNeg": 0.0, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "BMC Temp" + ], + "Name": "BMC Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [ABC]\\d+ CPU1" + ], + "Name": "CPU1 DIMM ABC", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [DEF]\\d+ CPU1" + ], + "Name": "CPU1 DIMM DEF", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [ABC]\\d+ CPU2" + ], + "Name": "CPU2 DIMM ABC", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DIMM [DEF]\\d+ CPU2" + ], + "Name": "CPU2 DIMM DEF", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DTS CPU1" + ], + "Name": "DTS CPU1", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "DTS CPU2" + ], + "Name": "DTS CPU2", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Left Rear Temp" + ], + "Name": "Left Rear Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "Right Rear Board" + ], + "Name": "Right Rear Board", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "SSB Temp" + ], + "Name": "SSB Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "VR 1 Temp" + ], + "Name": "VR 1 Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Left" + ] + }, + { + "Class": "temp", + "FFGainCoefficient": 0.0, + "FFOffCoefficient": 0.0, + "ICoefficient": -1.0, + "ILimitMax": 100, + "ILimitMin": 30, + "Inputs": [ + "VR 2 Temp" + ], + "Name": "VR 2 Temp", + "NegativeHysteresis": 5.0, + "OutLimitMax": 100, + "OutLimitMin": 30, + "Outputs": [], + "PCoefficient": -0.15, + "PositiveHysteresis": 0.0, + "SetPoint": 60.0, + "SlewNeg": -1, + "SlewPos": 0.0, + "Type": "Pid", + "Zones": [ + "Right", + "PSU" + ] + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "Left", + "Type": "Pid.Zone" + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "Right", + "Type": "Pid.Zone" + }, + { + "FailSafePercent": 100, + "MinThermalOutput": 30, + "Name": "PSU", + "Type": "Pid.Zone" + }, + { + "Class": "Ceiling", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel UCC", + "NegativeHysteresis": 2, + "Output": [ + 70.0, + 80.0 + ], + "PositiveHysteresis": 0, + "Profiles": [ + "Acoustic" + ], + "Reading": [ + 22.0, + 32.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Class": "Floor", + "Inputs": [ + "Front Panel Temp" + ], + "Name": "Front Panel LCC", + "NegativeHysteresis": 2, + "Output": [ + 50.0, + 60.0 + ], + "PositiveHysteresis": 0, + "Reading": [ + 20.0, + 30.0 + ], + "Type": "Stepwise", + "Zones": [ + "Left", + "Right" + ] + }, + { + "Address": "0x4A", + "Bus": 6, + "Name": "BMC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4B", + "Bus": 6, + "Name": "Right Rear Board Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x49", + "Bus": 6, + "Name": "Left Rear Board Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x48", + "Bus": 6, + "Name": "PCH M.2 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4f", + "Bus": 6, + "Name": "Inlet BRD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x4D", + "Bus": "0x1", + "Name": "Front Panel Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 55 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 50 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": "0x30", + "Bus": 0, + "CpuID": 1, + "Name": "CPU 1", + "PresenceGpio": 232, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 99, + "label": "DIMM" + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 89, + "label": "DIMM" + } + ], + "Type": "XeonCPU" + }, + { + "Address": "0x31", + "Bus": 0, + "CpuID": 2, + "Name": "CPU 2", + "PresenceGpio": 242, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 99, + "label": "DIMM" + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 89, + "label": "DIMM" + } + ], + "Type": "XeonCPU" + } + ], + "Name": "WP Baseboard", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})", + "ProductId": 154, + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "$PRODUCT_MANUFACTURER", + "Model": "$PRODUCT_PRODUCT_NAME", + "PartNumber": "$PRODUCT_PART_NUMBER", + "SerialNumber": "$PRODUCT_SERIAL_NUMBER" + } +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend new file mode 100644 index 000000000..b8b38ecff --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append = " file://WC-Baseboard.json \ + file://WP-Baseboard.json \ + file://TNP-baseboard.json \ + file://FCXXPDBASSMBL_PDB.json \ + file://OPB2RH-Chassis.json \ + file://CYP-baseboard.json \ + file://MIDPLANE-2U2X12SWITCH.json" + +RDEPENDS_${PN} += " default-fru" + +do_install_append(){ + install -d ${D}/usr/share/entity-manager/configurations + install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 000000000..1d332e2a2 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1,3 @@ +baud = 921600 +local-tty = ttyS3 +local-tty-baud = 921600 diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service new file mode 100644 index 000000000..7fb8f79d3 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -0,0 +1,21 @@ +[Unit] +Description=Phosphor Console Muxer listening on device /dev/%I +BindsTo=dev-%i.device +After=dev-%i.device + +[Service] +ExecStartPre=/usr/bin/sol-option-check.sh +ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' +ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' +ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' +ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' +ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i +ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' +ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' +ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' +ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' +SyslogIdentifier=obmc-console-server +Restart=always + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh new file mode 100755 index 000000000..ef32fcb9a --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console/sol-option-check.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# Copyright 2017 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +if [ $(grep 192000000 /sys/class/tty/ttyS0/uartclk | wc -l) != 0 ]; then + echo "hs-uart" + sed -i -e 's/115200/921600/g' /etc/obmc-console.conf +else + echo "normal uart" + sed -i -e 's/921600/115200/g' /etc/obmc-console.conf +fi diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..e808e4929 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend_intel-ast2500 := "${THISDIR}/${PN}:" +OBMC_CONSOLE_HOST_TTY = "ttyS2" +SRC_URI += "file://sol-option-check.sh" + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/sol-option-check.sh ${D}${bindir} +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb new file mode 100644 index 000000000..9c10c5b3d --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed.bb @@ -0,0 +1,20 @@ +SUMMARY = "Set Wolfpass fan default speeds" +DESCRIPTION = "Sets all fans to a single speed" + +inherit allarch +inherit obmc-phosphor-systemd + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +RDEPENDS_${PN} += "python" + +S = "${WORKDIR}" +SRC_URI += "file://set_fan_speeds.py" + +SYSTEMD_SERVICE_${PN} += "fan-default-speed.service" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/set_fan_speeds.py ${D}/${bindir}/set_fan_speeds.py +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service new file mode 100644 index 000000000..267fdee43 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service @@ -0,0 +1,10 @@ +[Unit] +Description=Set fans to a default speed +ConditionFileNotEmpty={bindir}/set_fan_speeds.py + +[Service] +ExecStart={bindir}/set_fan_speeds.py 150 +Type=oneshot + +[Install] +WantedBy=default.target diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py new file mode 100644 index 000000000..70ba64799 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py @@ -0,0 +1,23 @@ +#!/usr/bin/python +import os +import glob +import time +import sys + +HWMON_DIR = "/sys/class/hwmon/hwmon0" + +count = 0 +inputs = None +while not inputs: + count += 1 + if count > 20: + print("pwm missing!") + sys.exit(0) + + inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*")) + time.sleep(5) + +inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*")) +for pwm in inputs: + with open(pwm, 'w') as f: + f.write(sys.argv[1]) diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb new file mode 100644 index 000000000..1ae1680e0 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru.bb @@ -0,0 +1,27 @@ +SUMMARY = "Default Fru" +DESCRIPTION = "Installs a default fru file to image" + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "SetBaseboardFru.service" + +S = "${WORKDIR}" +SRC_URI = "file://checkFru.sh \ + file://SetBaseboardFru.service \ + file://*.fru.bin" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +RDEPENDS_${PN} = "bash" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/checkFru.sh ${D}/${bindir}/checkFru.sh + + install -d ${D}${sysconfdir}/fru + cp ${S}/*.fru.bin ${D}/${sysconfdir}/fru + + install -d ${D}${base_libdir}/systemd/system + install -m 0644 ${S}/SetBaseboardFru.service ${D}${base_libdir}/systemd/system +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin new file mode 100644 index 000000000..ba5b96392 Binary files /dev/null and b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin differ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin new file mode 100644 index 000000000..afd58e6b9 Binary files /dev/null and b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin differ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin new file mode 100644 index 000000000..76c4b8d4b Binary files /dev/null and b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WC.fru.bin differ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin new file mode 100644 index 000000000..1b9f97ff4 Binary files /dev/null and b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin differ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin new file mode 100644 index 000000000..fb219c0ce Binary files /dev/null and b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/S2600WP.fru.bin differ diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service new file mode 100644 index 000000000..dec53725e --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/SetBaseboardFru.service @@ -0,0 +1,9 @@ +[Unit] +Description=Reads GPIO and Loads the FRU + +[Service] +ExecStart=/usr/bin/checkFru.sh +Type=oneshot + +[Install] +WantedBy=basic.target diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh new file mode 100755 index 000000000..1eb79b299 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/fru/default-fru/checkFru.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# this script checks the gpio id and loads the correct baseboard fru +fruFile="/etc/fru/baseboard.fru.bin" +idGpio=( 8 9 10 11 12 53) +result=0 +idx=0 + +if [ -f $fruFile ]; then + exit 0 +fi + +cd /etc/fru +for gpio in "${idGpio[@]}" +do + echo $gpio > /sys/class/gpio/export + typeset -i value=$(cat /sys/class/gpio/gpio$gpio/value) + value=$((value << idx)) + result=$((result | value)) + idx=$((idx+1)) +done + +# wp +if (($result == 62)); then + cat S2600WP.fru.bin > $fruFile +# wc +elif (($result == 45)); then + cat S2600WC.fru.bin > $fruFile +# cyp +elif (($result == 60)); then + cat S2600CYP.fru.bin > $fruFile +# tnp +elif (($result == 12)); then + cat S2600TNP.fru.bin > $fruFile +# default to wft +else + cat S2600WFT.fru.bin > $fruFile +fi diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb new file mode 100644 index 000000000..c91053536 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb @@ -0,0 +1,10 @@ +SUMMARY = "Wolfpass board wiring" +DESCRIPTION = "Board wiring information for the Wolfpass system." +PR = "r1" + +inherit config-in-skeleton + +LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +SRCREV = "946064239016e38cd1cc346047b1d26960c06cdb" +SKELETON_URI = "git://git@github.com/Intel-BMC/skeleton.git;protocol=ssh;branch=intel" diff --git a/meta-openbmc-mods/meta-ast2500/recipes.txt b/meta-openbmc-mods/meta-ast2500/recipes.txt new file mode 100644 index 000000000..3ec3f4a42 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes.txt @@ -0,0 +1,2 @@ +recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies +recipes-phosphor - Phosphor OpenBMC applications and configuration diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass index cff93d0ee..1520cb7b9 100644 --- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass +++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass @@ -19,7 +19,6 @@ IMAGE_INSTALL_append = " \ phosphor-host-postd \ smbios-mdrv1 \ phosphor-certificate-manager \ - set-passthrough \ phosphor-sel-logger \ gpiodaemon \ smbios-mdrv2 \ diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 6026f8d91..798e43295 100644 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_append_wolfpass:= "${THISDIR}/files:" +FILESEXTRAPATHS_append_intel-ast2500:= "${THISDIR}/files:" # the meta-phosphor layer adds this patch, which conflicts # with the intel layout for environment -SRC_URI_remove_wolfpass = " file://0001-configs-ast-Add-redundnant-env.patch" +SRC_URI_remove_intel-ast2500 = " file://0001-configs-ast-Add-redundnant-env.patch" -SRC_URI_append_wolfpass = " \ +SRC_URI_append_intel-ast2500 = " \ file://0001-flash-use-readX-writeX-not-udelay.patch \ file://0002-intel-layout-environment-addr.patch \ file://0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch \ @@ -34,4 +34,10 @@ SRC_URI_append_wolfpass = " \ file://0027-CPLD-u-boot-commands-support-for-PFR.patch \ file://0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch \ " -SRC_URI_append_wolfpass += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}" +SRC_URI_append_intel-ast2500 += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}" + +require recipes-core/os-release/version-vars.inc + +BUILD_CFLAGS_append = " -DVER_MAJOR=${IPMI_MAJOR} -DVER_MINOR=${IPMI_MINOR}" +BUILD_CFLAGS_append += " -DVER_AUX13=${IPMI_AUX13} -DVER_AUX14=${IPMI_AUX14}" +BUILD_CFLAGS_append += " -DVER_AUX15=${IPMI_AUX15} -DVER_AUX16=${IPMI_AUX16}" diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend deleted file mode 100644 index 6026f8d91..000000000 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend +++ /dev/null @@ -1,37 +0,0 @@ -FILESEXTRAPATHS_append_wolfpass:= "${THISDIR}/files:" - -# the meta-phosphor layer adds this patch, which conflicts -# with the intel layout for environment -SRC_URI_remove_wolfpass = " file://0001-configs-ast-Add-redundnant-env.patch" - -SRC_URI_append_wolfpass = " \ - file://0001-flash-use-readX-writeX-not-udelay.patch \ - file://0002-intel-layout-environment-addr.patch \ - file://0004-Make-sure-debug-uart-is-using-24MHz-clock-source.patch \ - file://0005-enable-passthrough-in-uboot.patch \ - file://0006-Add-Aspeed-g5-interrupt-support.patch \ - file://0007-Add-espi-support.patch \ - file://0008-add-sgio-support-for-port80-snoop-post-LEDs.patch \ - file://0009-Add-basic-GPIO-support.patch \ - file://0010-Update-Force-Firmware-Update-Jumper-to-use-new-gpio.patch \ - file://0011-Add-basic-timer-support-for-Aspeed-g5-in-U-Boot.patch \ - file://0012-Add-status-and-ID-LED-support.patch \ - file://0013-aspeed-Add-Pwm-Driver.patch \ - file://0014-Keep-interrupts-enabled-until-last-second.patch \ - file://0015-Rewrite-memmove-to-optimize-on-word-transfers.patch \ - file://0016-Add-support-for-128MB-Macronix-spi-flash-MX66L1G45G.patch \ - file://0017-Enable-Macronix-and-Micron-SPI-support.patch \ - file://0018-Add-support-for-Macronix-and-Micron-1Gbits-SPI-flash.patch \ - file://0019-u-boot-full-platform-reset-espi-oob-ready.patch \ - file://0020-Enable-PCIe-L1-support.patch \ - file://0020-Add-system-reset-status-support.patch \ - file://0021-Config-host-uart-clock-source-using-environment-vari.patch \ - file://0022-KCS-driver-support-in-uBoot.patch \ - file://0023-Add-TPM-enable-pulse-triggering.patch \ - file://0024-IPMI-command-handler-implementation-in-uboot.patch \ - file://0025-Manufacturing-mode-physical-presence-detection.patch \ - file://0026-Aspeed-I2C-support-in-U-Boot.patch \ - file://0027-CPLD-u-boot-commands-support-for-PFR.patch \ - file://0028-Enabling-uart1-uart2-in-u-boot-for-BIOS-messages.patch \ - " -SRC_URI_append_wolfpass += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0022-u-boot-env-change-for-PFR-image.patch', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend new file mode 120000 index 000000000..742334ade --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend @@ -0,0 +1 @@ +u-boot-aspeed_%.bbappend \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb index fd71e0abf..fda0716c5 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb @@ -12,9 +12,9 @@ DEPENDS = "sdbusplus openssl libpam" do_configure[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d" +SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service" diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb index bbf4f0183..a1c53389d 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb @@ -10,8 +10,8 @@ inherit cmake LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" -SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d" +SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" +SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60" S = "${WORKDIR}/git/crashdump" PACKAGES += "libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index 01cc72e69..22568dba2 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,2 +1,2 @@ SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "1f2eb5eac4a75a219ece15850a3c2dfc0fdc5991" +SRCREV = "53870d7308e374df0c0382e3208ff1567a160947" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb index d4ad9c4e6..b5448060f 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb @@ -1,7 +1,7 @@ SUMMARY = "Intel IPMI Providers" DESCRIPTION = "IPMI Provider Libraries" -SRC_URI = "git://github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" SRCREV = "3f8aa7959d2e8475e50743d32ff178257aafc1e7" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend index 584d3b645..059931ed2 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/os-release.bbappend @@ -5,60 +5,9 @@ # and pasting into another recipe ensure it is understood # what that means! -def irun_git(d, oeroot, git_cmd, **kwargs): - err = None - try: - cmd = 'git --work-tree {} --git-dir {}/.git {}'.format(oeroot, oeroot, git_cmd) - ret, err = bb.process.run(cmd, **kwargs) - if err is not None: - ret += err - except bb.process.ExecutionError as e: - ret = '' - if e.stdout is not None: - ret += e.stdout - if e.stderr is not None: - ret += e.stderr - except Exception as e: - ret = str(e) - return ret.strip('\n') +require version-vars.inc -def repo_status(d, f, repo, tagargs): - import subprocess - - cmd_list = [['HEAD', 'rev-parse HEAD'], - ['TAG', 'describe {} --dirty --long'.format(tagargs)], - ['STATUS', 'status -sb']] - - f.write(('\n# REPOSITORY: {} '.format(os.path.basename(repo))).ljust(80, '+') + '\n') - for item in cmd_list: - f.write('# {}: '.format(item[0])) - sb = irun_git(d, repo, item[1]) - if sb: - sb_lines = sb.split('\n') - if len(sb_lines) == 1: - f.write(sb_lines[0]) - else: - f.write('\n# ' + '\n# '.join(sb_lines)) - f.write('\n') - -python() { - corebase = d.getVar('COREBASE', True) - mibase = os.path.join(corebase, 'meta-openbmc-mods') - obmc_vers = irun_git(d, corebase, 'describe --dirty --long') - meta_vers = irun_git(d, mibase, 'rev-parse HEAD')[0:7] - version_id = '{}-{}'.format(obmc_vers, meta_vers) - if version_id: - d.setVar('VERSION_ID', version_id) - versionList = version_id.split('-') - version = '{}-{}'.format(versionList[0], versionList[1]) - d.setVar('VERSION', version) - - build_id = irun_git(d, corebase, 'describe --abbrev=0') - if build_id: - d.setVar('BUILD_ID', build_id) -} - -OS_RELEASE_FIELDS_append = " BUILD_ID" +OS_RELEASE_FIELDS_append = " OPENBMC_VERSION IPMI_MAJOR IPMI_MINOR IPMI_AUX13 IPMI_AUX14 IPMI_AUX15 IPMI_AUX16" python do_compile_append () { import glob @@ -80,6 +29,7 @@ python do_compile_append () { # Ensure the git commands run every time bitbake is invoked. BB_DONT_CACHE = "1" +do_compile[nostamp]="1" # Make os-release available to other recipes. SYSROOT_DIRS_append = " ${sysconfdir}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc new file mode 100644 index 000000000..b6a2504a2 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc @@ -0,0 +1,78 @@ +def irun_git(d, oeroot, git_cmd, **kwargs): + err = None + try: + cmd = 'git --work-tree {} --git-dir {}/.git {}'.format(oeroot, oeroot, git_cmd) + ret, err = bb.process.run(cmd, **kwargs) + if err is not None: + ret += err + except bb.process.ExecutionError as e: + ret = '' + if e.stdout is not None: + ret += e.stdout + if e.stderr is not None: + ret += e.stderr + except Exception as e: + ret = str(e) + return ret.strip('\n') + +def repo_status(d, f, repo, tagargs): + import subprocess + + cmd_list = [['HEAD', 'rev-parse HEAD'], + ['TAG', 'describe {} --dirty --long'.format(tagargs)], + ['STATUS', 'status -sb']] + + f.write(('\n# REPOSITORY: {} '.format(os.path.basename(repo))).ljust(80, '+') + '\n') + for item in cmd_list: + f.write('# {}: '.format(item[0])) + sb = irun_git(d, repo, item[1]) + if sb: + sb_lines = sb.split('\n') + if len(sb_lines) == 1: + f.write(sb_lines[0]) + else: + f.write('\n# ' + '\n# '.join(sb_lines)) + f.write('\n') + +python() { + import re + + gen = d.getVar('PRODUCT_GENERATION', True) + if gen is None: + gen = 'unknown' + + corebase = d.getVar('COREBASE', True) + mibase = os.path.join(corebase, 'meta-openbmc-mods') + obmc_vers = irun_git(d, corebase, 'describe --dirty --long') + if obmc_vers is None: + raise bb.build.FuncFailed("Missing version tag for openbmc-openbmc") + d.setVar('OPENBMC_VERSION', obmc_vers) + + obmc_hash = irun_git(d, corebase, 'rev-parse HEAD') + meta_vers = irun_git(d, mibase, + 'describe --long --abbrev=6 ' + + '--match \'{}-[0-9]*\.[0-9]*\''.format(gen)) + + # Until tags in meta-openbmc-mods, interim measure keep builds working. + if meta_vers.startswith('fatal:'): + meta_vers = '{}-0.0-0'.format(gen) + + meta_hash = irun_git(d, mibase, 'rev-parse HEAD') + version_id = '{}-{}'.format(meta_vers, obmc_hash[0:7]) + if version_id: + d.setVar('VERSION_ID', version_id) + versionList = version_id.split('-') + versionList = re.split('-|\.', version_id) + version = '{}.{}-{}'.format(versionList[0], versionList[1], versionList[2]) + d.setVar('VERSION', version) + d.setVar('IPMI_MAJOR', versionList[1]) + d.setVar('IPMI_MINOR', versionList[2]) + d.setVar('IPMI_AUX13', hex(int(versionList[3]))) + d.setVar('IPMI_AUX14', '0x{}'.format(meta_hash[0:2])) + d.setVar('IPMI_AUX15', '0x{}'.format(meta_hash[2:4])) + d.setVar('IPMI_AUX16', '0x{}'.format(meta_hash[4:6])) + + build_id = irun_git(d, mibase, 'describe --abbrev=0') + if build_id: + d.setVar('BUILD_ID', build_id) +} diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb index 506484311..d66a14281 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb @@ -5,12 +5,12 @@ LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" inherit cmake systemd -SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" DEPENDS = "boost sdbusplus crashdump" PV = "0.1+git${SRCPV}" -SRCREV = "acf016bebe2cada610eb4aab7b97fdcd03e2200d" +SRCREV = "0536b8cc3591a310ab36d145540811c728f8ef60" S = "${WORKDIR}/git/peci_pcie" diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb index 3e88648b4..46a185cdf 100644 --- a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb +++ b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb @@ -3,7 +3,7 @@ DESCRIPTION = "OpenBMC mtd-util" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b77c43ae4eaf67bd73fb6452b2f113a3" -SRC_URI = "git://github.com/Intel-BMC/mtd-util;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/mtd-util;protocol=ssh" PV = "1.0+git${SRCPV}" SRCREV = "0414bd37ba324867c5c89fc91ab80714309f4c80" diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend index 995f99cfd..b174f271e 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend @@ -1,4 +1,4 @@ #SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "66ef099b5a77315bb531300dfcc81a53867cd5fa" +SRCREV = "c14699f63e909ed6d8599e65503ee9c1e3a104d6" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb index 61dfce853..4b11782e8 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control.bb @@ -1,14 +1,8 @@ SUMMARY = "Chassis Power Control service for Intel based platform" DESCRIPTION = "Chassis Power Control service for Intel based platfrom" -SRC_URI = "git://github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh" -SRCREV = "7cbb2153afedf3b7d3fa7856f0a306138c4b4297" - -SRC_URI += "file://intel-wait-power-on.sh \ - file://intel-wait-power-off.sh \ - file://intel-wait-host-on.sh \ - file://intel-wait-host-off.sh \ - " +SRC_URI = "git://git@github.com/Intel-BMC/intel-chassis-control.git;protocol=ssh" +SRCREV = "d98b80a3ce937abe6282b7b9011b47e8b2f162be" S = "${WORKDIR}/git/services/chassis/" @@ -17,239 +11,19 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit cmake pkgconfig pythonnative -inherit obmc-phosphor-dbus-service - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power@.service" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Chassis@.service" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Buttons@.service" - -# Force the standby target to run these services -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" - -POWER_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Power@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -POWER_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Power@{0}.service" -POWER_FMT_CTRL = "../${POWER_TMPL_CTRL}:${SYSD_TGT}.wants/${POWER_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWER_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -CHASSIS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -CHASSIS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Control.Chassis@{0}.service" -CHASSIS_FMT_CTRL = "../${CHASSIS_TMPL_CTRL}:${SYSD_TGT}.wants/${CHASSIS_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -BUTTONS_TMPL_CTRL = "xyz.openbmc_project.Chassis.Buttons@.service" -#SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -BUTTONS_INSTFMT_CTRL = "xyz.openbmc_project.Chassis.Buttons@{0}.service" -BUTTONS_FMT_CTRL = "../${BUTTONS_TMPL_CTRL}:${SYSD_TGT}.wants/${BUTTONS_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'BUTTONS_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -SYSTEMD_SERVICE_${PN} += " \ - obmc-host-start@.target \ - obmc-host-startmin@.target \ - obmc-host-stop@.target \ - obmc-host-shutdown@.target \ - obmc-host-reboot@.target \ - obmc-chassis-poweroff@.target \ - obmc-chassis-poweron@.target \ - obmc-chassis-hard-poweroff@.target \ - obmc-host-soft-reboot@.target \ - obmc-host-warm-reset@.target \ - obmc-chassis-powerreset@.target \ - " - -RESET_TGTFMT = "obmc-chassis-powerreset@{0}.target" - -RESET_ON_TMPL = "op-reset-chassis-running@.service" -RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service" -RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service" -RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" -RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${RESET_ON_CHASSIS_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -# Force the standby target to run the chassis reset check target -RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" -RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -START_TMPL = "intel-power-start@.service" -START_TGTFMT = "obmc-chassis-poweron@{0}.target" -START_INSTFMT = "intel-power-start@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${START_TMPL}" - -ON_TMPL = "intel-wait-power-on@.service" -ON_TGTFMT = "obmc-chassis-poweron@{0}.target" -ON_INSTFMT = "intel-wait-power-on@{0}.service" -ON_FMT = "../${ON_TMPL}:${ON_TGTFMT}.requires/${ON_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${ON_TMPL}" - -OFF_TMPL = "intel-wait-power-off@.service" -OFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" -OFF_INSTFMT = "intel-wait-power-off@{0}.service" -OFF_FMT = "../${OFF_TMPL}:${OFF_TGTFMT}.requires/${OFF_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${OFF_TMPL}" - -STOP_TMPL = "intel-power-stop@.service" -STOP_TGTFMT = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT = "intel-power-stop@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${STOP_TMPL}" - -WARM_RESET_TMPL = "intel-power-warm-reset@.service" -WARM_RESET_TGTFMT = "obmc-host-warm-reset@{0}.target" -WARM_RESET_INSTFMT = "intel-power-warm-reset@{0}.service" -WARM_RESET_FMT = "../${WARM_RESET_TMPL}:${WARM_RESET_TGTFMT}.requires/${WARM_RESET_INSTFMT}" -WARM_RESET_LINK_FMT = "obmc-host-warm-reset@.target:${WARM_RESET_TGTFMT}" -SYSTEMD_SERVICE_${PN} += "${WARM_RESET_TMPL}" - -# Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WARM_RESET_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'OFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +inherit cmake systemd -#The main control target requires these power targets -START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target" -START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" -START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'START_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -HOSTON_TMPL_CTRL = "intel-wait-host-on@.service" -START_TGTFMT_CTRL = "obmc-host-startmin@{0}.target" -HOSTON_INSTFMT_CTRL = "intel-wait-host-on@{0}.service" -HOSTON_FMT_CTRL = "../${HOSTON_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${HOSTON_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTON_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOSTON_TMPL_CTRL}" - -HOSTOFF_TMPL_CTRL = "intel-wait-host-off@.service" -HOSTSTOP_TGTFMT_CTRL = "obmc-host-stop@{0}.target" -HOSTOFF_INSTFMT_CTRL = "intel-wait-host-off@{0}.service" -HOSTOFF_FMT_CTRL = "../${HOSTOFF_TMPL_CTRL}:${HOSTSTOP_TGTFMT_CTRL}.requires/${HOSTOFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOSTOFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOSTOFF_TMPL_CTRL}" - -# Chassis off requires host off -STOP_TMPL_CTRL = "obmc-host-stop@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT_CTRL = "obmc-host-stop@{0}.target" -STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Hard power off requires chassis off -HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Hard power off requires the forceoff flag service -FORCE_OFF_TMPL_CTRL = "intel-power-forceoff@.service" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -FORCE_OFF_INSTFMT_CTRL = "intel-power-forceoff@{0}.service" -FORCE_OFF_FMT_CTRL = "../${FORCE_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${FORCE_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FORCE_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${FORCE_OFF_TMPL_CTRL}" - -# Host soft reboot to run the shutdown target -HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" -HOST_SOFT_REBOOT_TMPL = "obmc-host-soft-reboot@.target" -HOST_SOFT_REBOOT_TGTFMT = "obmc-host-soft-reboot@{0}.target" -HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" -HOST_SOFT_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" -# And also to call the host startmin service -HOST_SOFT_REBOOT_SVC = "phosphor-reboot-host@.service" -HOST_SOFT_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" -HOST_SOFT_REBOOT_SVC_FMT = "../${HOST_SOFT_REBOOT_SVC}:${HOST_SOFT_REBOOT_TGTFMT}.requires/${HOST_SOFT_REBOOT_SVC_INST}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SOFT_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -#Broadcast Host state -PRE_HOST_START_TMPL = "obmc-send-signal-pre-host-start@.service" -PRE_HOST_START_TGTFMT = "obmc-host-start-pre@{0}.target" -PRE_HOST_START_INSTFMT = "obmc-send-signal-pre-host-start@{0}.service" -PRE_HOST_START_FMT = "../${PRE_HOST_START_TMPL}:${PRE_HOST_START_TGTFMT}.requires/${PRE_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -POST_HOST_START_TMPL = "obmc-send-signal-post-host-start@.service" -POST_HOST_START_TGTFMT = "obmc-host-started@{0}.target" -POST_HOST_START_INSTFMT = "obmc-send-signal-post-host-start@{0}.service" -POST_HOST_START_FMT = "../${POST_HOST_START_TMPL}:${POST_HOST_START_TGTFMT}.requires/${POST_HOST_START_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_START_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -HOST_STARTING_TMPL = "obmc-send-signal-host-starting@.service" -HOST_STARTING_TGTFMT = "obmc-host-starting@{0}.target" -HOST_STARTING_INSTFMT = "obmc-send-signal-host-starting@{0}.service" -HOST_STARTING_FMT = "../${HOST_STARTING_TMPL}:${HOST_STARTING_TGTFMT}.requires/${HOST_STARTING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STARTING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STARTING_FMT', 'OBMC_HOST_INSTANCES')}" - -PRE_HOST_STOP_TMPL = "obmc-send-signal-pre-host-stop@.service" -PRE_HOST_STOP_TGTFMT = "obmc-host-stop-pre@{0}.target" -PRE_HOST_STOP_INSTFMT = "obmc-send-signal-pre-host-stop@{0}.service" -PRE_HOST_STOP_FMT = "../${PRE_HOST_STOP_TMPL}:${PRE_HOST_STOP_TGTFMT}.requires/${PRE_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${PRE_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'PRE_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" - -POST_HOST_STOP_TMPL = "obmc-send-signal-post-host-stop@.service" -POST_HOST_STOP_TGTFMT = "obmc-host-stopped@{0}.target" -POST_HOST_STOP_INSTFMT = "obmc-send-signal-post-host-stop@{0}.service" -POST_HOST_STOP_FMT = "../${POST_HOST_STOP_TMPL}:${POST_HOST_STOP_TGTFMT}.requires/${POST_HOST_STOP_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${POST_HOST_STOP_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POST_HOST_STOP_FMT', 'OBMC_HOST_INSTANCES')}" - -HOST_STOPPING_TMPL = "obmc-send-signal-host-stopping@.service" -HOST_STOPPING_TGTFMT = "obmc-host-stopping@{0}.target" -HOST_STOPPING_INSTFMT = "obmc-send-signal-host-stopping@{0}.service" -HOST_STOPPING_FMT = "../${HOST_STOPPING_TMPL}:${HOST_STOPPING_TGTFMT}.requires/${HOST_STOPPING_INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${HOST_STOPPING_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_STOPPING_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service" DEPENDS += " \ - autoconf-archive-native \ boost \ i2c-tools \ libgpiod \ - systemd \ - sdbusplus \ - sdbusplus-native \ - phosphor-dbus-interfaces \ - phosphor-dbus-interfaces-native \ - phosphor-logging \ - " -RDEPENDS_${PN} += " \ - libsystemd \ sdbusplus \ - phosphor-dbus-interfaces \ phosphor-logging \ - bash \ " -EXTRA_OECMAKE = " -DENABLE_GTEST=OFF -DCMAKE_SKIP_RPATH=ON" - # linux-libc-headers guides this way to include custom uapi headers CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" do_configure[depends] += "virtual/kernel:do_shared_workdir" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/intel-wait-power-on.sh ${D}/${bindir}/intel-wait-power-on.sh - install -m 0755 ${WORKDIR}/intel-wait-power-off.sh ${D}/${bindir}/intel-wait-power-off.sh - install -m 0755 ${WORKDIR}/intel-wait-host-on.sh ${D}/${bindir}/intel-wait-host-on.sh - install -m 0755 ${WORKDIR}/intel-wait-host-off.sh ${D}/${bindir}/intel-wait-host-off.sh -} diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service deleted file mode 100644 index 54b9befa4..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-forceoff@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Add force power offf flag for Power%i -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-host-start@%i.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "mkdir -p /run/openbmc && touch /run/openbmc/host@%i-request" -SyslogIdentifier=intel-power-forceoff -StartLimitInterval=0 - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service deleted file mode 100644 index 763c11546..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-start@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Start Power%i on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 1" -SyslogIdentifier=intel-power-start -StartLimitInterval=0 - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service deleted file mode 100644 index d0476e9b2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-stop@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Stop Power%i -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-host-start@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 0" -SyslogIdentifier=intel-power-stop -StartLimitInterval=0 - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service deleted file mode 100644 index 8d4897a25..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-power-warm-reset@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Power%i warm reset -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` \ - /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power setPowerState i 2" -SyslogIdentifier=intel-power-warm-reset - -[Install] -WantedBy=obmc-host-warm-reset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh deleted file mode 100755 index 983f1bc8d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for vrd_good = OFF" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!OFF" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) -done -echo "vrd_good = OFF" \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service deleted file mode 100644 index eedfcc78a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-off@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Wait for Host%i to turn off -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -#After=obmc-chassis-poweroff@%i.target -Before=intel-wait-power-off@%i.service -After=intel-power-stop@%i.service -Conflicts=obmc-chassis-poweron@%i.target -ConditionPathExists=/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-host-off.sh -ExecStartPost=/bin/sh -c "rm -rf /run/openbmc/host@%i-on" - -SyslogIdentifier=intel-wait-host-off -TimeoutSec=30 - -[Install] -RequiredBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh deleted file mode 100755 index 74f6bd47b..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for vrd_good = ON" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!ON" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power vrd_good \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) -done -echo "vrd_good = ON" \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service deleted file mode 100644 index a1fc316c2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-host-on@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Wait for Host%i to turn on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-wait-power-on@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-host-on.sh -ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/host@%i-on" - -SyslogIdentifier=intel-wait-host-on -TimeoutSec=30 - -[Install] -RequiredBy=obmc-host-startmin@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh deleted file mode 100755 index be58682cc..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for pgood = OFF" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!OFF" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[0]/off/' | grep off | wc -l) -done -echo "pgood = OFF" \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service deleted file mode 100644 index 0dcc897ce..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-off@.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn off -Before=obmc-power-off@%i.target -Wants=obmc-power-stop@%i.target -Before=obmc-power-stop@%i.target -Wants=obmc-power-stop-pre@%i.target -After=obmc-power-stop-pre@%i.target -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-wait-host-off@%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-power-off.sh -ExecStartPost=/bin/rm -f /run/openbmc/chassis@%i-on -ExecStartPost=/bin/rm -f /run/openbmc/host@%i-request -SyslogIdentifier=intel-wait-power-off -TimeoutSec=15 - -[Install] -WantedBy=obmc-host-stop@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh deleted file mode 100755 index 970e5a420..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2019 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -echo "wait for pgood = ON" -SERVICE=$(mapper get-service /xyz/openbmc_project/Chassis/Control/Power0) -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) - -while [ $PGOOD == 0 ]; do - echo "!ON" -sleep 1 -PGOOD=$(busctl get-property $SERVICE \ - /xyz/openbmc_project/Chassis/Control/Power0 xyz.openbmc_project.Chassis.Control.Power pgood \ - | sed 's/i\s*[1]/on/' | grep on | wc -l) -done -echo "pgood = ON" \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service deleted file mode 100644 index 140ee5b8d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/intel-wait-power-on@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn on -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=intel-power-start@%i.service -Before=intel-wait-host-on@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/intel-wait-power-on.sh - -ExecStartPost=/bin/sh -c "mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on" - -SyslogIdentifier=intel-wait-power-on -TimeoutSec=15 - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target deleted file mode 100644 index 265a48982..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-hard-poweroff@.target +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Chassis%i (Hard Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target -Conflicts=obmc-host-shutdown@%i.target -RefuseManualStop=yes - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target deleted file mode 100644 index 34580a21f..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweroff@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Chassis%i (Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-reset@%i.target -RefuseManualStop=yes - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target deleted file mode 100644 index e95e46353..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-poweron@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Chassis%i (Power On) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target deleted file mode 100644 index 8d7c47e6b..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-chassis-powerreset@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Chassis%i (Reset Check) -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target deleted file mode 100644 index c860889e3..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-reboot@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target deleted file mode 100644 index 585886b26..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-shutdown@.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Power%i Host Off -Wants=multi-user.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target deleted file mode 100644 index c35c3e1ae..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-soft-reboot@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Soft Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target deleted file mode 100644 index 2f8c24929..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-start@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Start Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target deleted file mode 100644 index 69056254a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-startmin@.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Start Host%i Minimum -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target deleted file mode 100644 index 625eda8ee..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-stop@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Stop Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target deleted file mode 100644 index 8fc9358e2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-host-warm-reset@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Warm reset Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailureJobMode=flush diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service deleted file mode 100644 index 4e84c8783..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-starting@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast host starting signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStarting" -SyslogIdentifier=hoststartingsignal - -[Install] -WantedBy=obmc-host-starting@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service deleted file mode 100644 index 0f89f94a8..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-host-stopping@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast host stopping signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.HostStoping" -SyslogIdentifier=hoststoppingsignal - -[Install] -WantedBy=obmc-host-stopping@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service deleted file mode 100644 index f7e0a3bde..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-start@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast post host start signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStart" -SyslogIdentifier=posthoststartsignal - -[Install] -WantedBy=obmc-host-started@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service deleted file mode 100644 index 90007dbf2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-post-host-stop@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast post host stop signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PostHostStop" -SyslogIdentifier=posthoststopsignal - -[Install] -WantedBy=obmc-host-stopped@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service deleted file mode 100644 index a57423e2c..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-start@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcast pre host start signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStart" -SyslogIdentifier=prehoststartsignal - -[Install] -WantedBy=obmc-host-start-pre@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service deleted file mode 100644 index ec6f453cd..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/obmc-send-signal-pre-host-stop@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Broadcast pre host stop signal to dbus -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "dbus-send --system --type=signal /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host.PreHostStop" -SyslogIdentifier=prehoststopsignal - -[Install] -WantedBy=obmc-host-stop-pre@%i.target - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service deleted file mode 100644 index d3ea71639..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-on@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Start chassis%i on after BMC reset -Requires=op-reset-chassis-running@%i.service -After=op-reset-chassis-running@%i.service -After=obmc-power-reset-on@%i.target -Requires=obmc-power-reset-on@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=no -ExecStart=/bin/systemctl start obmc-host-start@%i.target - - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service deleted file mode 100644 index 3280d0a40..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/op-reset-chassis-running@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Check Chassis%i pgood and create a file to indicate it -Wants=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -After=mapper-wait@-xyz-openbmc_project-Chassis-Control-Power%i.service -Wants=obmc-power-reset-on@%i.target -Before=obmc-power-reset-on@%i.target -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/bin/sh -c "if [ $(busctl get-property `mapper get-service /xyz/openbmc_project/Chassis/Control/Power%i` /xyz/openbmc_project/Chassis/Control/Power%i xyz.openbmc_project.Chassis.Control.Power pgood | sed 's/i\s*[1]/on/' | grep on | wc -l) != 0 ]; then mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on; fi" - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service deleted file mode 100644 index e1e3baedf..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Buttons@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Intel Buttons%i - -[Service] -Restart=always -RestartSec=3 -ExecStart=/usr/bin/env buttons -SyslogIdentifier=buttons -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service deleted file mode 100644 index 521cb17b4..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Chassis@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Intel Chassis%i Control - -[Service] -Restart=always -ExecStart=/usr/bin/env chassis-control -SyslogIdentifier=chassis-control -Type=dbus -BusName={BUSNAME} -Nice=19 -TimeoutStartSec=180s - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service b/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service deleted file mode 100644 index bf83a54e2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-intel/chassis/intel-chassis-control/xyz.openbmc_project.Chassis.Control.Power@.service +++ /dev/null @@ -1,17 +0,0 @@ - -[Unit] -Description=Intel Power Control%i -Wants=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service -After=mapper-wait@-xyz-openbmc_project-control-gpio-Power_Good.service - -[Service] -Restart=always -RestartSec=3 -ExecStart=/usr/bin/env power-control -SyslogIdentifier=power-control -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} - diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index fdaf60b41..923133be7 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -27,7 +27,6 @@ RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" SUMMARY_${PN}-chassis = "Intel Chassis" RDEPENDS_${PN}-chassis = " \ intel-chassis-control \ - libgpiod \ obmc-host-failure-reboots \ " diff --git a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend index b352295ba..c71e84bdc 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-intel/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,3 @@ # this is for image signing and signature verification RDEPENDS_${PN}-extras += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', ' phosphor-image-signing', '', d)}" +RDEPENDS_${PN}-extrasdevtools = "libgpiod-tools" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb index 3abbb16fb..64645da2b 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb @@ -1,8 +1,8 @@ SUMMARY = "SMBIOS MDR version 1 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 1 service for Intel based platfrom" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" +SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391" S = "${WORKDIR}/git/services/smbios/" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb index 1a39c0017..175d5edf9 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb @@ -1,8 +1,8 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" +SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391" S = "${WORKDIR}/git/services/smbios-mdrv2/" diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch index e4161961e..41bf4fb55 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0059-media-aspeed-remove-source-buffer-allocation-before-.patch @@ -1,19 +1,19 @@ -From aa8f405609038693481bad4393d58f0c665569a6 Mon Sep 17 00:00:00 2001 +From 28aa61a720d2db812d66b2b59681ba184771ff3e Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Tue, 21 May 2019 16:00:28 -0700 -Subject: [PATCH 1/4] media: aspeed: remove source buffer allocation before - mode detection +Subject: [PATCH] media: aspeed: remove source buffer allocation before mode + detection Mode detection doesn't require source buffer allocation so this commit removes that. Signed-off-by: Jae Hyun Yoo --- - drivers/media/platform/aspeed-video.c | 21 --------------------- - 1 file changed, 21 deletions(-) + drivers/media/platform/aspeed-video.c | 37 +++++------------------------------ + 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c -index 1bb863b32836..ee1f87a08c7c 100644 +index 1bb863b32836..fed51fd22ce2 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -733,27 +733,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) @@ -44,6 +44,32 @@ index 1bb863b32836..ee1f87a08c7c 100644 do { if (tries) { set_current_state(TASK_INTERRUPTIBLE); +@@ -873,20 +852,14 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) + + size *= 4; + +- if (size == video->srcs[0].size / 2) { +- aspeed_video_write(video, VE_SRC1_ADDR, +- video->srcs[0].dma + size); +- } else if (size == video->srcs[0].size) { +- if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) +- goto err_mem; +- +- aspeed_video_write(video, VE_SRC1_ADDR, video->srcs[1].dma); +- } else { +- aspeed_video_free_buf(video, &video->srcs[0]); ++ if (size != video->srcs[0].size) { ++ if (video->srcs[0].size) ++ aspeed_video_free_buf(video, &video->srcs[0]); ++ if (video->srcs[1].size) ++ aspeed_video_free_buf(video, &video->srcs[1]); + + if (!aspeed_video_alloc_buf(video, &video->srcs[0], size)) + goto err_mem; +- + if (!aspeed_video_alloc_buf(video, &video->srcs[1], size)) + goto err_mem; + -- -2.21.0 +2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch deleted file mode 100644 index 7739d5214..000000000 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 294391f66df034de8dc63ac2e78f3a00d14075d9 Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo -Date: Thu, 23 May 2019 14:24:25 -0700 -Subject: [PATCH 3/4] media: aspeed: fix an incorrect timeout checking in mode - detection - -There is an incorrect timeout checking in mode detection logic so -it misses resolution detecting chances. This commit fixes the bug. - -Signed-off-by: Jae Hyun Yoo ---- - drivers/media/platform/aspeed-video.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c -index b8540cc7848d..da20e93f58d3 100644 ---- a/drivers/media/platform/aspeed-video.c -+++ b/drivers/media/platform/aspeed-video.c -@@ -737,7 +737,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) - do { - if (tries) { - set_current_state(TASK_INTERRUPTIBLE); -- if (schedule_timeout(INVALID_RESOLUTION_DELAY)) -+ if (!schedule_timeout(INVALID_RESOLUTION_DELAY)) - return; - } - --- -2.21.0 - diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch index efa6f5023..a10963572 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch @@ -1,7 +1,7 @@ -From 09ec380a1d6ae66b2a8124c8fdd984ff829b41d1 Mon Sep 17 00:00:00 2001 +From fa386f96691ed8501949daf5129667b72723a55e Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo Date: Thu, 23 May 2019 14:33:03 -0700 -Subject: [PATCH 4/4] media: aspeed: add a workaround to fix a silicon bug +Subject: [PATCH] media: aspeed: add a workaround to fix a silicon bug AST2500 silicon revision A1 and A2 have a silicon bug which causes extremly long capturing time on specific resolutions (1680 width). @@ -12,14 +12,14 @@ result will be the same. Signed-off-by: Jae Hyun Yoo --- - drivers/media/platform/aspeed-video.c | 26 +++++++++++++++++++------- - 1 file changed, 19 insertions(+), 7 deletions(-) + drivers/media/platform/aspeed-video.c | 28 +++++++++++++++++++++------- + 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c -index da20e93f58d3..c2d4a2e6f20f 100644 +index 67d6380d4ef3..f58f44eab588 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c -@@ -826,8 +826,27 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) +@@ -826,8 +826,29 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) struct v4l2_bt_timings *act = &video->active_timings; unsigned int size = act->width * act->height; @@ -29,9 +29,11 @@ index da20e93f58d3..c2d4a2e6f20f 100644 + if (video->active_timings.width == 1680) { + /* + * This is a workaround to fix a silicon bug on A1 and A2 -+ * revisions. Since it doesn't break capturing operation on A0 -+ * revision, use it for all revisions without checking the -+ * revision ID. ++ * revisions. Since it doesn't break capturing operation of ++ * other revisions, use it for all revisions without checking ++ * the revision ID. It picked 1728 which is a very next ++ * 64-pixels aligned value to 1680 to minimize memory bandwidth ++ * and to get better access speed from video engine. + */ + aspeed_video_write(video, VE_CAP_WINDOW, + 1728 << 16 | act->height); @@ -47,7 +49,7 @@ index da20e93f58d3..c2d4a2e6f20f 100644 /* Don't use direct mode below 1024 x 768 (irqs don't fire) */ if (size < DIRECT_FETCH_THRESHOLD) { aspeed_video_write(video, VE_TGS_0, -@@ -844,13 +863,6 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) +@@ -844,13 +865,6 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) aspeed_video_update(video, VE_CTRL, 0, VE_CTRL_DIRECT_FETCH); } @@ -60,7 +62,7 @@ index da20e93f58d3..c2d4a2e6f20f 100644 - size *= 4; - if (size == video->srcs[0].size / 2) { + if (size != video->srcs[0].size) { -- -2.21.0 +2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend index c5d48eb90..7ae4b5e64 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -43,6 +43,5 @@ SRC_URI += " \ file://0058-i2c-aspeed-add-general-call-support.patch \ file://0059-media-aspeed-remove-source-buffer-allocation-before-.patch \ file://0060-media-aspeed-use-different-delays-for-triggering-VE-.patch \ - file://0061-media-aspeed-fix-an-incorrect-timeout-checking-in-mo.patch \ file://0062-media-aspeed-add-a-workaround-to-fix-a-silicon-bug.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index 77ef33c29..e773da3cd 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,6 +1,6 @@ # this is here just to bump faster than upstream SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "24b01fdd5681726c71ddab73b2b9dfc89ee3de70" +SRCREV = "683ff83b9cfe0ec3d9683f7220bd40ef77dbfe96" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch new file mode 100644 index 000000000..181d12428 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch @@ -0,0 +1,40 @@ +From b55c6847b18fdee5a72d601b871d73085481e4d9 Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Mon, 3 Jun 2019 16:31:29 -0700 +Subject: [PATCH] Add chassis power-cycle and reset to Chassis State + +This adds chassis PowerCycle and Reset as possible Transition +values for the Chassis State. These are to support chassis +power cycle and a chassis reset button, respectively. + +Signed-off-by: Jason M. Bills +--- + xyz/openbmc_project/State/Chassis.interface.yaml | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/xyz/openbmc_project/State/Chassis.interface.yaml b/xyz/openbmc_project/State/Chassis.interface.yaml +index 4ae6274..470a3a2 100644 +--- a/xyz/openbmc_project/State/Chassis.interface.yaml ++++ b/xyz/openbmc_project/State/Chassis.interface.yaml +@@ -31,10 +31,17 @@ enumerations: + values: + - name: 'Off' + description: > +- Chassis power should be off ++ Chassis power should be off + - name: 'On' + description: > + Chassis power should be on ++ - name: 'PowerCycle' ++ description: > ++ Chassis power should be cycled ++ - name: 'Reset' ++ description: > ++ Chassis should be reset ++ + + - name: PowerState + description: > +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch new file mode 100644 index 000000000..650fd3bc9 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0023-Add-host-interrupt-to-the-Host-State.patch @@ -0,0 +1,31 @@ +From 9c94439a5a55efbb72bee10e9cfa0827dbedf511 Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Mon, 3 Jun 2019 16:35:46 -0700 +Subject: [PATCH] Add host interrupt to the Host State + +This adds host Interrupt as possible Transition value for the +Host State. This is to support an interrupt signal to the host +firmware or software. + +Signed-off-by: Jason M. Bills +--- + xyz/openbmc_project/State/Host.interface.yaml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/xyz/openbmc_project/State/Host.interface.yaml b/xyz/openbmc_project/State/Host.interface.yaml +index 1ceba13..3d71280 100644 +--- a/xyz/openbmc_project/State/Host.interface.yaml ++++ b/xyz/openbmc_project/State/Host.interface.yaml +@@ -28,6 +28,9 @@ enumerations: + description: > + The desired transition for host firmware + values: ++ - name: 'Interrupt' ++ description: > ++ Host firmware should be interrupted + - name: 'Off' + description: > + Host firmware should be off +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 8521f6839..94eff8ac7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces.git" -SRCREV = "b8a82d92bb6e1727257d745189215b03016a39c6" +SRCREV = "57b878d048f929643276f1bf7fdf750abc4bde8b" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -16,4 +16,6 @@ SRC_URI += "file://0002-Modify-Dbus-for-IPv6.patch \ file://0018-Define-post-code-interfaces-for-post-code-manager.patch \ file://0019-Creating-the-Session-interface-for-Host-and-LAN.patch \ file://0021-Add-interface-suppot-for-provisioning-modes.patch \ + file://0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch \ + file://0023-Add-host-interrupt-to-the-Host-State.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 2706f8508..1ce94dca4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -5,6 +5,6 @@ SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" EXTRA_OECONF = "--enable-configure-dbus=yes" SRC_URI = "git://github.com/openbmc/phosphor-pid-control.git" -SRCREV = "ded0ab5662212155e5d209343375e34ce9d34cdb" +SRCREV = "98b704e179f12d987179fe6b0ea6234d1bace48f" FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb index 588ae46b6..e24245525 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/gpiodaemon/gpiodaemon.bb @@ -8,9 +8,9 @@ S = "${WORKDIR}/git/gpiodaemon" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" +SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "gpiodaemon.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 62e332e2e..6ac05b61d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "22c33710fed78a5c47446ee91ececf8b8ab104db" +SRCREV = "d62cec731dcb533b3fecb08ba115dbf713539681" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json index a7815a9a9..c2f3c9a0e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json @@ -77,7 +77,7 @@ } }, "7" : { - "name" : "ipmi-kcs4", + "name" : "ipmi_kcs4", "is_valid" : true, "active_sessions" : 0, "channel_info" : { @@ -165,7 +165,7 @@ } }, "15" : { - "name" : "ipmi-kcs3", + "name" : "ipmi_kcs3", "is_valid" : true, "active_sessions" : 0, "channel_info" : { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch deleted file mode 100644 index fb5dcee09..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0012-ipmi-set-get-boot-options.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 7b5c6a54c049a447b1fd3a42f9d63322dcee4dc7 Mon Sep 17 00:00:00 2001 -From: Yong Li -Date: Sun, 16 Sep 2018 19:45:10 +0800 -Subject: [PATCH] [ipmi] set/get boot options - -1. fix issue for handling unsupported paramter -2. add support for floppy/USB boot - -Change-Id: I2b888c1ad67fec7924dd5825f78622cd216a55f4 -Signed-off-by: Jia, Chunhui -Signed-off-by: Yong Li ---- - chassishandler.cpp | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/chassishandler.cpp b/chassishandler.cpp -index 666addb..77af2dc 100644 ---- a/chassishandler.cpp -+++ b/chassishandler.cpp -@@ -1244,7 +1244,8 @@ constexpr auto ipmiDefault = 0; - std::map sourceIpmiToDbus = { - {0x01, Source::Sources::Network}, - {0x02, Source::Sources::Disk}, - {0x05, Source::Sources::ExternalMedia}, -+ {0x0f, Source::Sources::RemovableMedia}, - {ipmiDefault, Source::Sources::Default}}; - - std::map modeIpmiToDbus = { -@@ -1255,7 +1256,8 @@ std::map modeIpmiToDbus = { - std::map sourceDbusToIpmi = { - {Source::Sources::Network, 0x01}, - {Source::Sources::Disk, 0x02}, - {Source::Sources::ExternalMedia, 0x05}, -+ {Source::Sources::RemovableMedia, 0x0f}, - {Source::Sources::Default, ipmiDefault}}; - - std::map modeDbusToIpmi = { -@@ -1533,7 +1535,7 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd, - setBootMode(Mode::Modes::Regular); - } - } -- if (modeIpmiToDbus.end() != modeItr) -+ else if (modeIpmiToDbus.end() != modeItr) - { - rc = setBootMode(modeItr->second); - if (rc != IPMI_CC_OK) -@@ -1550,6 +1552,12 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd, - setBootSource(Source::Sources::Default); - } - } -+ else -+ { -+ // if boot option is not in support list, return error -+ *data_len = 0; -+ return IPMI_CC_INVALID_FIELD_REQUEST; -+ } - } - catch (InternalFailure& e) - { --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch index 2a4cc9bb1..903ae96a7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch @@ -1,4 +1,4 @@ -From 9ed3fd11047f8c360b7d808946939ef280813811 Mon Sep 17 00:00:00 2001 +From ad93a6e17310d92ef07b8d367b23c93793562d0f Mon Sep 17 00:00:00 2001 From: Cheng C Yang Date: Wed, 23 Jan 2019 17:02:40 +0800 Subject: [PATCH] Fix keep looping issue when entering OS @@ -20,19 +20,19 @@ correctly through KCS channel. 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/host-cmd-manager.cpp b/host-cmd-manager.cpp -index 0a61e63..6e50684 100644 +index f3aba7f..465eb81 100644 --- a/host-cmd-manager.cpp +++ b/host-cmd-manager.cpp @@ -26,6 +26,8 @@ constexpr auto MAPPER_INTERFACE = "xyz.openbmc_project.ObjectMapper"; constexpr auto HOST_STATE_PATH = "/xyz/openbmc_project/state/host0"; constexpr auto HOST_STATE_INTERFACE = "xyz.openbmc_project.State.Host"; constexpr auto HOST_TRANS_PROP = "RequestedHostTransition"; -+constexpr const char* IPMI_PATH = "/org/openbmc/HostIpmi/1"; -+constexpr const char* IPMI_INTERFACE = "org.openbmc.HostIpmi"; ++constexpr const char* IPMI_PATH = "/xyz/openbmc_project/Ipmi/Channel/ipmi_kcs3"; ++constexpr const char* IPMI_INTERFACE = "xyz.openbmc_project.Ipmi.Channel.SMS"; // For throwing exceptions using namespace phosphor::logging; -@@ -107,6 +109,20 @@ void Manager::clearQueue() +@@ -106,6 +108,20 @@ void Manager::clearQueue() // `false` indicating Failure std::get(command)(ipmiCmdData, false); } @@ -53,7 +53,7 @@ index 0a61e63..6e50684 100644 } // Called for alerting the host -@@ -116,9 +132,6 @@ void Manager::checkQueueAndAlertHost() +@@ -115,9 +131,6 @@ void Manager::checkQueueAndAlertHost() { log("Asserting SMS Attention"); @@ -63,7 +63,7 @@ index 0a61e63..6e50684 100644 auto host = ::ipmi::getService(this->bus, IPMI_INTERFACE, IPMI_PATH); // Start the timer for this transaction -@@ -132,9 +145,8 @@ void Manager::checkQueueAndAlertHost() +@@ -131,9 +144,8 @@ void Manager::checkQueueAndAlertHost() return; } @@ -76,5 +76,5 @@ index 0a61e63..6e50684 100644 if (reply.is_method_error()) -- -2.16.2 +2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch new file mode 100644 index 000000000..877c5336a --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch @@ -0,0 +1,127 @@ +From 514b76d1c05d7ed7fb7e1df27833e423e04c9a1c Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Tue, 21 May 2019 09:57:16 -0700 +Subject: [PATCH] Use xyz.openbmc_project.State.Chassis for IPMI chassis status + +Instead of directly using pgood on dbus, this change uses the +xyz.openbmc_project.State.Chassis "CurrentPowerState" property +for the IPMI chassis status command. This will allow us to +remove pgood from dbus. + +Tested: +Ran IPMI chassis commands and confirmed that they behave as +expected: +ipmitool power status +Chassis Power is on + +ipmitool power off +Chassis Power Control: Down/Off + +ipmitool power status +Chassis Power is off + +ipmitool power on +Chassis Power Control: Up/On + +ipmitool power status +Chassis Power is on + +Change-Id: I7836c16b76c3b309f176186f3e2453082e4cd1af +Signed-off-by: Jason M. Bills +--- + chassishandler.cpp | 61 ++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 41 insertions(+), 20 deletions(-) + +diff --git a/chassishandler.cpp b/chassishandler.cpp +index 1738ccc..e4e842d 100644 +--- a/chassishandler.cpp ++++ b/chassishandler.cpp +@@ -824,44 +824,65 @@ std::optional getPowerRestorePolicy() + */ + std::optional getPowerStatus() + { +- constexpr const char* powerControlObj = +- "/xyz/openbmc_project/Chassis/Control/Power0"; +- constexpr const char* powerControlIntf = +- "xyz.openbmc_project.Chassis.Control.Power"; + bool powerGood = false; + std::shared_ptr busp = getSdBus(); + try + { ++ constexpr const char* chassisStatePath = ++ "/xyz/openbmc_project/state/chassis0"; ++ constexpr const char* chassisStateIntf = ++ "xyz.openbmc_project.State.Chassis"; + auto service = +- ipmi::getService(*busp, powerControlIntf, powerControlObj); ++ ipmi::getService(*busp, chassisStateIntf, chassisStatePath); + +- ipmi::Value variant = ipmi::getDbusProperty( +- *busp, service, powerControlObj, powerControlIntf, "pgood"); +- powerGood = static_cast(std::get(variant)); ++ ipmi::Value variant = ++ ipmi::getDbusProperty(*busp, service, chassisStatePath, ++ chassisStateIntf, "CurrentPowerState"); ++ std::string powerState = std::get(variant); ++ if (powerState == "xyz.openbmc_project.State.Chassis.PowerState.On") ++ { ++ powerGood = true; ++ } + } + catch (const std::exception& e) + { + try + { +- // FIXME: some legacy modules use the older path; try that next +- constexpr const char* legacyPwrCtrlObj = +- "/org/openbmc/control/power0"; +- constexpr const char* legacyPwrCtrlIntf = +- "org.openbmc.control.Power"; ++ // FIXME: some modules use pgood; try that next ++ constexpr const char* powerControlObj = ++ "/xyz/openbmc_project/Chassis/Control/Power0"; ++ constexpr const char* powerControlIntf = ++ "xyz.openbmc_project.Chassis.Control.Power"; + auto service = +- ipmi::getService(*busp, legacyPwrCtrlIntf, legacyPwrCtrlObj); ++ ipmi::getService(*busp, powerControlIntf, powerControlObj); + + ipmi::Value variant = ipmi::getDbusProperty( +- *busp, service, legacyPwrCtrlObj, legacyPwrCtrlIntf, "pgood"); ++ *busp, service, powerControlObj, powerControlIntf, "pgood"); + powerGood = static_cast(std::get(variant)); + } + catch (const std::exception& e) + { +- log("Failed to fetch pgood property", +- entry("ERROR=%s", e.what()), +- entry("PATH=%s", powerControlObj), +- entry("INTERFACE=%s", powerControlIntf)); +- return std::nullopt; ++ try ++ { ++ // FIXME: some legacy modules use the older path; try that next ++ constexpr const char* legacyPwrCtrlObj = ++ "/org/openbmc/control/power0"; ++ constexpr const char* legacyPwrCtrlIntf = ++ "org.openbmc.control.Power"; ++ auto service = ipmi::getService(*busp, legacyPwrCtrlIntf, ++ legacyPwrCtrlObj); ++ ++ ipmi::Value variant = ++ ipmi::getDbusProperty(*busp, service, legacyPwrCtrlObj, ++ legacyPwrCtrlIntf, "pgood"); ++ powerGood = static_cast(std::get(variant)); ++ } ++ catch (const std::exception& e) ++ { ++ log("Failed to fetch pgood property", ++ entry("ERROR=%s", e.what())); ++ return std::nullopt; ++ } + } + } + return std::make_optional(powerGood); +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch new file mode 100644 index 000000000..498233881 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch @@ -0,0 +1,214 @@ +From f11928c6b39052c679c9300e9d836837ef60be06 Mon Sep 17 00:00:00 2001 +From: "Jason M. Bills" +Date: Mon, 3 Jun 2019 17:01:47 -0700 +Subject: [PATCH] Update IPMI Chassis Control command + +This change updates the IPMI Chassis Control command to use the new +chassis state transitions. This allows each chassis control action +to more closely follow the behavior defined in the IPMI spec. + +Tested: +Ran each IPMI chassis control command to confirm the expected +behavior: +ipmitool power on: system is powered-on +ipmitool power off: system is forced off +ipmitool power cycle: system is forced off then powered-on +ipmitool power reset: system is hard reset +ipmitool power soft: soft power-off requested from system software + +Change-Id: Ic9fba3ca4abd9a758eb88f1e6ee09f7ca64ff80a +Signed-off-by: Jason M. Bills +--- + chassishandler.cpp | 138 +++++++++++++++++++++-------------------------------- + 1 file changed, 54 insertions(+), 84 deletions(-) + +diff --git a/chassishandler.cpp b/chassishandler.cpp +index e4e842d..d71b95f 100644 +--- a/chassishandler.cpp ++++ b/chassishandler.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -712,59 +713,63 @@ ipmi_ret_t ipmi_set_chassis_cap(ipmi_netfn_t netfn, ipmi_cmd_t cmd, + //------------------------------------------ + // Calls into Host State Manager Dbus object + //------------------------------------------ +-int initiate_state_transition(State::Host::Transition transition) ++int initiateHostStateTransition(State::Host::Transition transition) + { + // OpenBMC Host State Manager dbus framework +- constexpr auto HOST_STATE_MANAGER_ROOT = "/xyz/openbmc_project/state/host0"; +- constexpr auto HOST_STATE_MANAGER_IFACE = "xyz.openbmc_project.State.Host"; +- constexpr auto DBUS_PROPERTY_IFACE = "org.freedesktop.DBus.Properties"; +- constexpr auto PROPERTY = "RequestedHostTransition"; ++ constexpr auto hostStatePath = "/xyz/openbmc_project/state/host0"; ++ constexpr auto hostStateIntf = "xyz.openbmc_project.State.Host"; + +- // sd_bus error +- int rc = 0; +- char* busname = NULL; ++ auto service = ipmi::getService(*getSdBus(), hostStateIntf, hostStatePath); + +- // SD Bus error report mechanism. +- sd_bus_error bus_error = SD_BUS_ERROR_NULL; ++ // Convert to string equivalent of the passed in transition enum. ++ auto request = State::convertForMessage(transition); + +- // Gets a hook onto either a SYSTEM or SESSION bus +- sd_bus* bus_type = ipmid_get_sd_bus_connection(); +- rc = mapper_get_service(bus_type, HOST_STATE_MANAGER_ROOT, &busname); +- if (rc < 0) ++ try ++ { ++ ipmi::setDbusProperty(*getSdBus(), service, hostStatePath, ++ hostStateIntf, "RequestedHostTransition", ++ request); ++ } ++ catch (std::exception& e) + { + log( +- "Failed to get bus name", +- entry("ERRNO=0x%X, OBJPATH=%s", -rc, HOST_STATE_MANAGER_ROOT)); +- return rc; ++ "Failed to initiate transition", ++ entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str())); ++ return -1; + } ++ return 0; ++} ++ ++//------------------------------------------ ++// Calls into Chassis State Manager Dbus object ++//------------------------------------------ ++int initiateChassisStateTransition(State::Chassis::Transition transition) ++{ ++ // OpenBMC Chassis State Manager dbus framework ++ constexpr auto chassisStatePath = "/xyz/openbmc_project/state/chassis0"; ++ constexpr auto chassisStateIntf = "xyz.openbmc_project.State.Chassis"; ++ ++ auto service = ++ ipmi::getService(*getSdBus(), chassisStateIntf, chassisStatePath); + + // Convert to string equivalent of the passed in transition enum. + auto request = State::convertForMessage(transition); + +- rc = sd_bus_call_method(bus_type, // On the system bus +- busname, // Service to contact +- HOST_STATE_MANAGER_ROOT, // Object path +- DBUS_PROPERTY_IFACE, // Interface name +- "Set", // Method to be called +- &bus_error, // object to return error +- nullptr, // Response buffer if any +- "ssv", // Takes 3 arguments +- HOST_STATE_MANAGER_IFACE, PROPERTY, "s", +- request.c_str()); +- if (rc < 0) ++ try + { +- log("Failed to initiate transition", +- entry("ERRNO=0x%X, REQUEST=%s", -rc, request.c_str())); ++ ipmi::setDbusProperty(*getSdBus(), service, chassisStatePath, ++ chassisStateIntf, "RequestedPowerTransition", ++ request); + } +- else ++ catch (std::exception& e) + { +- log("Transition request initiated successfully"); ++ log( ++ "Failed to initiate transition", ++ entry("EXCEPTION=%s, REQUEST=%s", e.what(), request.c_str())); ++ return -1; + } + +- sd_bus_error_free(&bus_error); +- free(busname); +- +- return rc; ++ return 0; + } + + namespace power_policy +@@ -1138,61 +1143,26 @@ ipmi::RspType<> ipmiChassisControl(uint8_t chassisControl) + switch (chassisControl) + { + case CMD_POWER_ON: +- rc = initiate_state_transition(State::Host::Transition::On); ++ rc = initiateHostStateTransition(State::Host::Transition::On); + break; + case CMD_POWER_OFF: +- // This path would be hit in 2 conditions. +- // 1: When user asks for power off using ipmi chassis command 0x04 +- // 2: Host asking for power off post shutting down. +- +- // If it's a host requested power off, then need to nudge Softoff +- // application that it needs to stop the watchdog timer if running. +- // If it is a user requested power off, then this is not really +- // needed. But then we need to differentiate between user and host +- // calling this same command +- +- // For now, we are going ahead with trying to nudge the soft off and +- // interpret the failure to do so as a non softoff case +- rc = stop_soft_off_timer(); +- +- // Only request the Off transition if the soft power off +- // application is not running +- if (rc < 0) +- { +- // First create a file to indicate to the soft off application +- // that it should not run. Not doing this will result in State +- // manager doing a default soft power off when asked for power +- // off. +- indicate_no_softoff_needed(); +- +- // Now request the shutdown +- rc = initiate_state_transition(State::Host::Transition::Off); +- } +- else +- { +- log("Soft off is running, so let shutdown target " +- "stop the host"); +- } ++ rc = ++ initiateChassisStateTransition(State::Chassis::Transition::Off); + break; +- + case CMD_HARD_RESET: ++ rc = initiateChassisStateTransition( ++ State::Chassis::Transition::Reset); ++ break; + case CMD_POWER_CYCLE: +- // SPEC has a section that says certain implementations can trigger +- // PowerOn if power is Off when a command to power cycle is +- // requested +- +- // First create a file to indicate to the soft off application +- // that it should not run since this is a direct user initiated +- // power reboot request (i.e. a reboot request that is not +- // originating via a soft power off SMS request) +- indicate_no_softoff_needed(); +- +- rc = initiate_state_transition(State::Host::Transition::Reboot); ++ rc = initiateChassisStateTransition( ++ State::Chassis::Transition::PowerCycle); + break; +- + case CMD_SOFT_OFF_VIA_OVER_TEMP: +- // Request Host State Manager to do a soft power off +- rc = initiate_state_transition(State::Host::Transition::Off); ++ rc = initiateHostStateTransition(State::Host::Transition::Off); ++ break; ++ case CMD_PULSE_DIAGNOSTIC_INTR: ++ rc = ++ initiateHostStateTransition(State::Host::Transition::Interrupt); + break; + + default: +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 91319a9d3..3509ebfd6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -3,12 +3,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # TODO: This should be removed, once up-stream bump up # issue is resolved #SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "fdb8389df74f9f0d6428252a75c33f6abf6d8481" +SRCREV = "ea1c401c4bac43d6070bf7d515df08f8bf57c0a2" SRC_URI += "file://phosphor-ipmi-host.service \ file://0009-IPv6-Network-changes.patch \ file://0010-fix-get-system-GUID-ipmi-command.patch \ - file://0012-ipmi-set-get-boot-options.patch \ file://0013-ipmi-add-set-bios-id-to-whitelist.patch \ file://0021-Implement-IPMI-Commmand-Get-Host-Restart-Cause.patch \ file://0039-ipmi-add-oem-command-get-AIC-FRU-to-whitelist.patch \ @@ -20,6 +19,8 @@ SRC_URI += "file://phosphor-ipmi-host.service \ file://0057-Add-timer-use-actions-support.patch \ file://0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch \ file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \ + file://0061-Use-xyz.openbmc_project.State.Chassis-for-IPMI-chass.patch \ + file://0062-Update-IPMI-Chassis-Control-command.patch \ " # remove the softpoweroff service since we do not need it diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb index 4861755b6..af83facf6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Node Manager Proxy" DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \ with Management Engine via IPMB" -SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/node-manager;protocol=ssh" SRCREV = "2ab90332828614c95e0ce22c0c95285734b55b65" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml old mode 100755 new mode 100644 index 7b193f85b..533df68a4 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml @@ -34,6 +34,10 @@ enclosure_identify: identify: Action: 'On' +enclosure_identify_blink: + identify: + Action: 'Blink' + cpu0_fault: cpu0fault: Action: 'On' diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb index e7cd1ab42..31b9e9338 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb @@ -1,7 +1,7 @@ SUMMARY = "Multi node manager" DESCRIPTION = "Daemon to handle chassis level shared resources on multi-node platform" -SRC_URI = "git://github.com/Intel-BMC/multi-node-manager.git;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/multi-node-manager.git;protocol=ssh" SRCREV = "8a34c017e04dd8f327aff127f64855f6132bd318" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb index f655d22e4..da1d74207 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb @@ -1,7 +1,7 @@ SUMMARY = "BMC Self Test service" DESCRIPTION = "BMC Self Test service for subsystem diagnosis failure info" -SRC_URI = "git://github.com/Intel-BMC/intel-self-test;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/intel-self-test;protocol=ssh" PV = "1.0+git${SRCPV}" SRCREV = "d039998ad2c55aeae4191af30e15bbd3032508c1" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index ba82532fc..996f11b42 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,7 +1,7 @@ -SRCREV = "8dbb395364629673a1f1dde81b1cf7d8041b0662" +SRCREV = "930fcde3c8776c02f2a3d969d05608e2155eb159" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -DEPENDS_append = " i2c-tools" +DEPENDS_append = " libgpiod" #todo(cheng) remove this when synced upstream SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.psusensor.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb index bcb8361dd..503f3875a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/git/special-mode-mgr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1" +SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1" SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" inherit cmake systemd diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index c3d71d30c..878de75bb 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git/srvcfg-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" +SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb index 818259153..4bef0fd0e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb @@ -1,13 +1,13 @@ SUMMARY = "Callback Manager" DESCRIPTION = "D-Bus daemon that registers matches that trigger method calls" -SRC_URI = "git://github.com/Intel-BMC/provingground;protocol=ssh" +SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh" inherit cmake systemd DEPENDS = "boost sdbusplus" PV = "0.1+git${SRCPV}" -SRCREV = "ec8f1c06be71d6059c82fd442475420286f5dbcd" +SRCREV = "9d2d365a79591ec21b54ecde957263f1ba1d8391" S = "${WORKDIR}/git/callback-manager" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend index 70cbc72f6..0cb531e60 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/users/phosphor-user-manager_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" #SRC_URI = "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "fef578960f632abacc5cd615b2bedfb3ab9ebb90" +SRCREV = "59dba4435d0d553369790e8936d7eb43251ff302" SRC_URI += " \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch index 6e057f681..28995d14b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/watchdog/phosphor-watchdog/0001-Add-redfish-log-support-for-IPMI-watchdog-timeout-ac.patch @@ -1,4 +1,4 @@ -From 1c0e658833ea7595b2fb42261ce5e0ce781bac98 Mon Sep 17 00:00:00 2001 +From 38faf5c040660e752741dcf7f03e4bb1e9f3411b Mon Sep 17 00:00:00 2001 From: Yong Li Date: Thu, 4 Apr 2019 18:24:54 +0800 Subject: [PATCH] Add redfish log support for IPMI watchdog timeout actions @@ -17,11 +17,11 @@ https://BMCIP/redfish/v1/Systems/system/LogServices/EventLog/Entries Signed-off-by: Yong Li --- - watchdog.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) + watchdog.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/watchdog.cpp b/watchdog.cpp -index d529746..008cde5 100644 +index bc3ba95..4774fd8 100644 --- a/watchdog.cpp +++ b/watchdog.cpp @@ -1,5 +1,7 @@ @@ -32,19 +32,20 @@ index d529746..008cde5 100644 #include #include #include -@@ -115,6 +117,12 @@ void Watchdog::timeOutHandler() - entry("ACTION=%s", convertForMessage(action).c_str()), - entry("TARGET=%s", target->second.c_str())); +@@ -101,6 +103,13 @@ void Watchdog::timeOutHandler() + action = fallback->action; + } -+ // Log into redfish event log -+ sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s; TARGET=%s", -+ convertForMessage(action).c_str(), -+ target->second.c_str(), "PRIORITY=%i", LOG_INFO, -+ "REDFISH_MESSAGE_ID=%s", "IPMIWatchdog", NULL); ++ // Log into redfish event log ++ sd_journal_send("MESSAGE=IPMIWatchdog: Timed out ACTION=%s", ++ convertForMessage(action).c_str(), "PRIORITY=%i", LOG_INFO, ++ "REDFISH_MESSAGE_ID=%s", "OpenBMC.0.1.IPMIWatchdog", ++ "REDFISH_MESSAGE_ARGS=%s", ++ convertForMessage(action).c_str(), NULL); + - try - { - auto method = bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_ROOT, + expiredTimerUse(currentTimerUse()); + + auto target = actionTargetMap.find(action); -- 2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index 3d8f359f8..e6e329d06 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" #SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "44da471fceb3790b49a43bc023781f62b19f9fde" +SRCREV = "5bd1dec7fdc8f6a3a20e6c23dc491b3d31392bc5" SRC_URI += "file://0004-Implement-force-boot-to-bios-in-server-power-control.patch" diff --git a/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend index aa28e8d85..5c3c24ec5 100644 --- a/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-support/libgpiod/libgpiod_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG += " cxx" + SRC_URI += " \ file://0001-Add-pass-through-setting-in-gpioset.patch \ " diff --git a/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample new file mode 100644 index 000000000..09c2bbc4a --- /dev/null +++ b/meta-openbmc-mods/meta-wht/conf/bblayers.conf.sample @@ -0,0 +1,25 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "10" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-x86 \ + ##OEROOT##/meta-openbmc-mods \ + ##OEROOT##/meta-intel \ + ##OEROOT##/meta-openbmc-mods/meta-common \ + ##OEROOT##/meta-openbmc-mods/meta-common-small \ + ##OEROOT##/meta-openbmc-mods/meta-ast2500 \ + ##OEROOT##/meta-openbmc-mods/meta-wht \ + ##OEROOT##/meta-security \ + " diff --git a/meta-openbmc-mods/meta-wht/conf/conf-notes.txt b/meta-openbmc-mods/meta-wht/conf/conf-notes.txt new file mode 100644 index 000000000..558487db6 --- /dev/null +++ b/meta-openbmc-mods/meta-wht/conf/conf-notes.txt @@ -0,0 +1,5 @@ +Common targets are: + intel-platforms + obmc-phosphor-image + virtual/kernel + phosphor-ipmi-host diff --git a/meta-openbmc-mods/meta-wht/conf/layer.conf b/meta-openbmc-mods/meta-wht/conf/layer.conf new file mode 100644 index 000000000..99d7ee689 --- /dev/null +++ b/meta-openbmc-mods/meta-wht/conf/layer.conf @@ -0,0 +1,14 @@ +LOCALCONF_VERSION = "3" +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "wht" +BBFILE_PATTERN_wht = "" +BBFILE_PRIORITY_wht = "7" +LAYERSERIES_COMPAT_wht = "warrior" + +PRODUCT_GENERATION_pn-os-release = "wht" diff --git a/meta-openbmc-mods/meta-wht/conf/local.conf.sample b/meta-openbmc-mods/meta-wht/conf/local.conf.sample new file mode 100644 index 000000000..31b18a76e --- /dev/null +++ b/meta-openbmc-mods/meta-wht/conf/local.conf.sample @@ -0,0 +1,20 @@ +MACHINE ??= "intel-ast2500" +#DL_DIR ?= "/~YoctoDownloads" +#SSTATE_DIR ?= "/~YoctoSstate-cache" +DISTRO ?= "openbmc-phosphor" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "3" +#BB_NUMBER_THREADS = "70" diff --git a/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf b/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf new file mode 100644 index 000000000..907b9f1e1 --- /dev/null +++ b/meta-openbmc-mods/meta-wht/conf/machine/intel-ast2500.conf @@ -0,0 +1 @@ +require conf/machine/include/intel-ast2500.inc diff --git a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample index 12d9af86b..f3a4bc513 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample +++ b/meta-openbmc-mods/meta-wolfpass/conf/bblayers.conf.sample @@ -19,6 +19,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-intel \ ##OEROOT##/meta-openbmc-mods/meta-common \ ##OEROOT##/meta-openbmc-mods/meta-common-small \ + ##OEROOT##/meta-openbmc-mods/meta-ast2500 \ ##OEROOT##/meta-openbmc-mods/meta-wolfpass \ ##OEROOT##/meta-security \ " diff --git a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf index 2d85bfdce..711850f6d 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/layer.conf +++ b/meta-openbmc-mods/meta-wolfpass/conf/layer.conf @@ -8,5 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "wolfpass" BBFILE_PATTERN_wolfpass = "" -BBFILE_PRIORITY_wolfpass = "6" +BBFILE_PRIORITY_wolfpass = "7" LAYERSERIES_COMPAT_wolfpass = "warrior" + +PRODUCT_GENERATION_pn-os-release = "prl" diff --git a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample index d39fb371c..49ffc117f 100644 --- a/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample +++ b/meta-openbmc-mods/meta-wolfpass/conf/local.conf.sample @@ -1,4 +1,4 @@ -MACHINE ??= "wolfpass" +MACHINE ??= "intel-ast2500" #DL_DIR ?= "/~YoctoDownloads" #SSTATE_DIR ?= "/~YoctoSstate-cache" DISTRO ?= "openbmc-phosphor" @@ -17,9 +17,6 @@ BB_DISKMON_DIRS = "\ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" CONF_VERSION = "3" -INHERIT += "extrausers" - -EXTRA_USERS_PARAMS_append_pn-intel-platforms = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " #BB_NUMBER_THREADS = "70" + +#INHERIT += "cve-check" diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc deleted file mode 100644 index 24ec3113b..000000000 --- a/meta-openbmc-mods/meta-wolfpass/conf/machine/include/obmc-bsp-si-common.inc +++ /dev/null @@ -1,31 +0,0 @@ -#@TYPE: Machine -#@NAME: OpenBMC -#@DESCRIPTION: Common machine configuration for OpenBMC chips - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -EXTRA_IMAGEDEPENDS += "u-boot" - -IMAGE_FSTYPES += "squashfs-xz" -IMAGE_FSTYPES += "mtd-auto" -INITRAMFS_FSTYPES = "squashfs-xz" -EXTRA_IMAGECMD_squashfs-xz_append = "-processors ${BB_NUMBER_THREADS} -b 262144 -Xdict-size 100% -Xbcj arm" - -KERNEL_CLASSES ?= "kernel-fitimage" -KERNEL_IMAGETYPES ?= "fitImage" -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" - -UBOOT_SUFFIX ?= "bin" - -MACHINEOVERRIDES =. "openbmc:" - -OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" -OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils-aspeed" - -IMAGE_CLASSES += "image_types image_types_phosphor_auto" - -INITRAMFS_CTYPE ?= "lzma" -INITRAMFS_IMAGE = "obmc-phosphor-initramfs" - -MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode" - -KERNEL_IMAGETYPES += "zImage" diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf new file mode 100644 index 000000000..907b9f1e1 --- /dev/null +++ b/meta-openbmc-mods/meta-wolfpass/conf/machine/intel-ast2500.conf @@ -0,0 +1 @@ +require conf/machine/include/intel-ast2500.inc diff --git a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf b/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf deleted file mode 100644 index cc9e30495..000000000 --- a/meta-openbmc-mods/meta-wolfpass/conf/machine/wolfpass.conf +++ /dev/null @@ -1,19 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-purley.dtb" - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-si-common.inc -require conf/machine/include/intel.inc -require conf/distro/include/phosphor-tiny.inc - -UBOOT_MACHINE = "ast_g5_phy_config" - -#Developer to specify the appropriate IMAGE_TYPE and FLASH_SIZE -#On Intel Whitley platforms PFR feature requires 128MB flash, default is 64MB -#IMAGE_TYPE = "default" or "pfr" or "non-pfr" -# "non-pfr" setting for future which is for BMC secure boot -#for PFR its 128MB in KBs - 128*1024=131072, for non-pfr its 64MB= 64*1024 = 65536 -#pfr IMAGE_TYPE enforces the image signature verification during the image update -IMAGE_TYPE = "default" - -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb b/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb deleted file mode 100644 index e20ea75cf..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Set passthrough" -DESCRIPTION = "Script to enable / disable passthrough" - -S = "${WORKDIR}" -SRC_URI = "file://set-passthrough.sh" - -LICENSE = "CLOSED" -RDEPENDS_${PN} += "bash" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/set-passthrough.sh ${D}/${bindir}/set-passthrough.sh -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh b/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh deleted file mode 100644 index 2b9ef6876..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-intel/temporary/set-passthrough/set-passthrough.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# this script uses devmem to set hardware passthrough -# it is temporary and should be removed in the future - -PASSTHROUGH_ENABLE=0x3000 - -if [[ -z $1 ]]; then - echo "First Argument Must Be 1 To Enable or 0 To Disable" - exit 1 -fi - -if [[ $1 != "0" && $1 != "1" ]]; then - echo "Arg 1 must be 0 or 1" - exit 1 -fi - -# read register -var=$(devmem 0x1e6e208C w) - -# convert to int -typeset -i value=$( echo $(( $var )) ) - -if [[ $1 == "0" ]]; then - value=$((value & ~PASSTHROUGH_ENABLE)) - # Mark the gpio reset out & power up pin as released - echo "1" > /sys/class/gpio/gpio33/value - echo "1" > /sys/class/gpio/gpio35/value -fi - -if [[ $1 == "1" ]]; then - value=$((value | PASSTHROUGH_ENABLE)) -fi - -val=$(printf '0x%x\n' $value) - -#echo $val - -devmem 0x1e6e208C w $val - -# devmem 0x1e6e208C w diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch deleted file mode 100644 index 5f8e0fd5c..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-platforms.patch +++ /dev/null @@ -1,414 +0,0 @@ -From 429f3710a88d81d6875aec7a848dde96074ee8df Mon Sep 17 00:00:00 2001 -From: Yuan Li -Date: Tue, 19 Sep 2017 15:55:39 +0800 -Subject: [PATCH] arm: dts: add DTS for Intel platforms - -Add the DTS file for Intel systems. - -Signed-off-by: Yuan Li -Signed-off-by: Yong Li -Signed-off-by: James Feist -Signed-off-by: Jae Hyun Yoo -Signed-off-by: Jason M. Bills ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 388 ++++++++++++++++++++++++++ - 1 file changed, 388 insertions(+) - create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-purley.dts - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -new file mode 100644 -index 0000000..20067f5 ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -0,0 +1,388 @@ -+/dts-v1/; -+ -+#include "aspeed-g5.dtsi" -+#include -+#include -+ -+/ { -+ model = "Purley BMC"; -+ compatible = "intel,purley-bmc", "aspeed,ast2500"; -+ -+ aliases { -+ serial4 = &uart5; -+ }; -+ -+ chosen { -+ stdout-path = &uart5; -+ bootargs = "console=ttyS4,115200 earlyprintk"; -+ }; -+ -+ memory@80000000 { -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ ranges; -+ -+ vga_memory: framebuffer@7f000000 { -+ no-map; -+ reg = <0x7f000000 0x01000000>; -+ }; -+ -+ gfx_memory: framebuffer { -+ size = <0x01000000>; -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ -+ video_engine_memory: jpegbuffer { -+ size = <0x02000000>; /* 32M */ -+ alignment = <0x01000000>; -+ compatible = "shared-dma-pool"; -+ reusable; -+ }; -+ }; -+ -+ vga-shared-memory { -+ compatible = "aspeed,ast2500-vga-sharedmem"; -+ reg = <0x9ff00000 0x100000>; -+ }; -+ -+ iio-hwmon { -+ compatible = "iio-hwmon"; -+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, -+ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>, -+ <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>, -+ <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ identify { -+ default-state = "off"; -+ gpios = <&gpio ASPEED_GPIO(S, 6) GPIO_ACTIVE_LOW>; -+ }; -+ -+ status_amber { -+ default-state = "off"; -+ gpios = <&gpio ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>; -+ }; -+ -+ status_green { -+ default-state = "keep"; -+ gpios = <&gpio ASPEED_GPIO(S, 4) GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ beeper { -+ compatible = "pwm-beeper"; -+ pwms = <&timer 5 1000000 0>; -+ }; -+}; -+ -+&fmc { -+ status = "okay"; -+ flash@0 { -+ status = "okay"; -+ m25p,fast-read; -+#include "openbmc-flash-layout-intel-64MB.dtsi" -+ }; -+}; -+ -+&espi { -+ status = "okay"; -+}; -+ -+&jtag { -+ status = "okay"; -+}; -+ -+&peci0 { -+ status = "okay"; -+}; -+ -+&syscon { -+ uart-clock-high-speed; -+ status = "okay"; -+}; -+ -+&adc { -+ status = "okay"; -+}; -+ -+&gpio { -+ status = "okay"; -+ gpio-line-names = -+ /*A0-A7*/ "","","","","","","","", -+ /*B0-B7*/ "","","","","","","","", -+ /*C0-C7*/ "","","","","","","","", -+ /*D0-D7*/ "","","","","","","","", -+ /*E0-E7*/ "RESET_BUTTON","RESET_OUT","POWER_BUTTON","POWER_OUT","","","","", -+ /*F0-F7*/ "","","","","","","","", -+ /*G0-G7*/ "","","","","","","","", -+ /*H0-H7*/ "","","","","","","","", -+ /*I0-I7*/ "","","","","","","","", -+ /*J0-J7*/ "","","","","","","","", -+ /*K0-K7*/ "","","","","","","","", -+ /*L0-L7*/ "","","","","","","","", -+ /*M0-M7*/ "","","","","","","","", -+ /*N0-N7*/ "","","","","","","","", -+ /*O0-O7*/ "","","","","","","","", -+ /*P0-P7*/ "","","","","","","","", -+ /*Q0-Q7*/ "","","","","","","","", -+ /*R0-R7*/ "","","","","","","","", -+ /*S0-S7*/ "","","","","","","ID_BUTTON","", -+ /*T0-T7*/ "","","","","","","","", -+ /*U0-U7*/ "","","","","","","","", -+ /*V0-V7*/ "","","","","","","","", -+ /*W0-W7*/ "","","","","","","","", -+ /*X0-X7*/ "","","","","","","","", -+ /*Y0-Y7*/ "","","","","","","","", -+ /*Z0-Z7*/ "","","","","","","","", -+ /*AA0-AA7*/ "","","","","","","","POST_COMPLETE", -+ /*AB0-AB7*/ "","","","PGOOD","","","","", -+ /*AC0-AC7*/ "","","","","","","",""; -+}; -+ -+&kcs3 { -+ kcs_addr = <0xCA2>; -+ status = "okay"; -+}; -+ -+&kcs4 { -+ kcs_addr = <0xCA4>; -+ status = "okay"; -+}; -+ -+&lpc_sio { -+ status = "okay"; -+}; -+ -+&lpc_snoop { -+ snoop-ports = <0x80>; -+ status = "okay"; -+}; -+ -+&mbox { -+ status = "okay"; -+}; -+ -+/** -+ * SAFS through SPI1 is available only on Wilson Point. -+ * These pins are used as fan presence checking gpios in WFP -+ * so commenting it out for now. -+ * &spi1 { -+ * status = "okay"; -+ * -+ * flash@0 { -+ * m25p,fast-read; -+ * status = "okay"; -+ * }; -+ *}; -+ */ -+ -+&sgpio { -+ status = "okay"; -+}; -+ -+&uart1 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd1_default -+ &pinctrl_rxd1_default -+ &pinctrl_nrts1_default -+ &pinctrl_ndtr1_default -+ &pinctrl_ndsr1_default -+ &pinctrl_ncts1_default -+ &pinctrl_ndcd1_default -+ &pinctrl_nri1_default>; -+}; -+ -+&uart2 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_txd2_default -+ &pinctrl_rxd2_default -+ &pinctrl_nrts2_default -+ &pinctrl_ndtr2_default -+ &pinctrl_ndsr2_default -+ &pinctrl_ncts2_default -+ &pinctrl_ndcd2_default -+ &pinctrl_nri2_default>; -+}; -+ -+&uart3 { -+ status = "okay"; -+}; -+ -+&uart4 { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <>; -+}; -+ -+&uart5 { -+ status = "okay"; -+}; -+ -+&mac1 { -+ status = "okay"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>; -+}; -+ -+&mac0 { -+ status = "okay"; -+ use-ncsi; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_rmii1_default>; -+}; -+ -+&i2c0 { -+ multi-master; -+ general-call; -+ status = "okay"; -+ -+ ipmb0@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; -+}; -+ -+&i2c1 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&i2c2 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&i2c3 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&i2c4 { -+ multi-master; -+ status = "okay"; -+ -+ hsbp0@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; -+}; -+ -+&i2c5 { -+ bus-frequency = <1000000>; -+ multi-master; -+ status = "okay"; -+ -+ smlink0@10 { -+ compatible = "slave-mqueue"; -+ reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; -+ }; -+}; -+ -+&i2c6 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&i2c7 { -+ multi-master; -+ #retries = <3>; -+ status = "okay"; -+}; -+ -+&i2c9 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&i2c13 { -+ multi-master; -+ status = "okay"; -+}; -+ -+&gfx { -+ status = "okay"; -+ memory-region = <&gfx_memory>; -+}; -+ -+&vuart { -+ status = "okay"; -+}; -+ -+&pwm_tacho { -+ status = "okay"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default -+ &pinctrl_pwm2_default &pinctrl_pwm3_default -+ &pinctrl_pwm4_default &pinctrl_pwm5_default -+ &pinctrl_pwm6_default &pinctrl_pwm7_default>; -+ -+ fan@0 { -+ reg = <0x00>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>; -+ }; -+ fan@1 { -+ reg = <0x01>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>; -+ }; -+ fan@2 { -+ reg = <0x02>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>; -+ }; -+ fan@3 { -+ reg = <0x03>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>; -+ }; -+ fan@4 { -+ reg = <0x04>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x08 0x09>; -+ }; -+ fan@5 { -+ reg = <0x05>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0A 0x0B>; -+ }; -+ fan@6 { -+ reg = <0x06>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0C 0x0D>; -+ }; -+ fan@7 { -+ reg = <0x07>; -+ aspeed,fan-tach-ch = /bits/ 8 <0x0E 0x0F>; -+ }; -+ -+}; -+ -+&timer { -+/* -+ * Available settings: -+ * fttmr010,pwm-outputs = <5>, <6>, <7>, <8>; -+ * pinctrl-0 = <&pinctrl_timer5_default &pinctrl_timer6_default -+ * &pinctrl_timer7_default &pinctrl_timer8_default>; -+ */ -+ fttmr010,pwm-outputs = <5>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_timer5_default>; -+ #pwm-cells = <3>; -+ status = "okay"; -+}; -+ -+&video { -+ status = "okay"; -+ memory-region = <&video_engine_memory>; -+}; -+ -+&vhub { -+ status = "okay"; -+}; --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch deleted file mode 100644 index b05ad2502..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 9537923d6e6a793cb2bf3c1daacd12562263bc0a Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" -Date: Fri, 3 May 2019 16:12:39 -0700 -Subject: [PATCH] Enable pass-through on GPIOE1 and GPIOE3 free - -This change adds a gpio_disable_free() implementation that checks -if the GPIO being freed is GPIOE1 (33) or GPIOE3 (35) and will -re-enable the pass-through mux. - -Tested: -Requested GPIOs 33 and 35 and used devmem to check that pass-through -was disabled. Then freed them and checked that pass-through was -enabled again. - -Signed-off-by: Jason M. Bills ---- - drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1 + - drivers/pinctrl/aspeed/pinctrl-aspeed.c | 60 ++++++++++++++++++++++++++++++ - drivers/pinctrl/aspeed/pinctrl-aspeed.h | 3 ++ - 3 files changed, 64 insertions(+) - -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -index 187abd7..beb0729 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c -@@ -2498,6 +2498,7 @@ static const struct pinmux_ops aspeed_g5_pinmux_ops = { - .get_function_groups = aspeed_pinmux_get_fn_groups, - .set_mux = aspeed_pinmux_set_mux, - .gpio_request_enable = aspeed_gpio_request_enable, -+ .gpio_disable_free = aspeed_gpio_disable_free, - .strict = true, - }; - -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c -index eb87ab7..f06d752 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c -@@ -538,6 +538,66 @@ int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, - return aspeed_sig_expr_enable(expr, pdata->maps); - } - -+void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, -+ struct pinctrl_gpio_range *range, -+ unsigned int offset) -+{ -+ const struct aspeed_pinctrl_data *pdata = pinctrl_dev_get_drvdata(pctldev); -+ const struct aspeed_pin_desc *pdesc = pdata->pins[offset].drv_data; -+ const struct aspeed_sig_expr ***prios, **funcs, *expr; -+ int ret; -+ -+ /* -+ * If we're freeing GPIOE1 (33) or GPIOE3 (35) then re-enable the -+ * pass-through mux setting; otherwise, do nothing. -+ */ -+ if (offset != 33 && offset != 35) -+ return; -+ -+ dev_dbg(pctldev->dev, -+ "Freeing pass-through pin %s (%d). Re-enabling pass-through.\n", -+ pdesc->name, offset); -+ -+ if (!pdesc) -+ return; -+ -+ prios = pdesc->prios; -+ -+ if (!prios) -+ return; -+ -+ /* Disable any functions of higher priority than GPIO just in case */ -+ while (funcs = *prios) { -+ if (aspeed_gpio_in_exprs(funcs)) -+ break; -+ -+ ret = aspeed_disable_sig(funcs, pdata->maps); -+ if (ret) -+ return; -+ -+ prios++; -+ } -+ -+ if (!funcs) { -+ char *signals = get_defined_signals(pdesc); -+ -+ pr_warn("No GPIO signal type found on pin %s (%d). Found: %s\n", -+ pdesc->name, offset, signals); -+ kfree(signals); -+ -+ return; -+ } -+ -+ /* -+ * Pass-through should be one priority higher than the GPIO function, -+ * so decrement our prios and enable that function -+ */ -+ prios--; -+ funcs = *prios; -+ expr = *funcs; -+ aspeed_sig_expr_enable(expr, pdata->maps); -+} -+ - int aspeed_pinctrl_probe(struct platform_device *pdev, - struct pinctrl_desc *pdesc, - struct aspeed_pinctrl_data *pdata) -diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.h b/drivers/pinctrl/aspeed/pinctrl-aspeed.h -index d4d7f03..0037b11 100644 ---- a/drivers/pinctrl/aspeed/pinctrl-aspeed.h -+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.h -@@ -595,6 +595,9 @@ int aspeed_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int function, - int aspeed_gpio_request_enable(struct pinctrl_dev *pctldev, - struct pinctrl_gpio_range *range, - unsigned int offset); -+void aspeed_gpio_disable_free(struct pinctrl_dev *pctldev, -+ struct pinctrl_gpio_range *range, -+ unsigned int offset); - int aspeed_pinctrl_probe(struct platform_device *pdev, - struct pinctrl_desc *pdesc, - struct aspeed_pinctrl_data *pdata); --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch deleted file mode 100644 index 1d26b9667..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d26dd7c4ef1a2cb88440420deccc54eb88129c60 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" -Date: Mon, 6 May 2019 14:18:27 -0700 -Subject: [PATCH] Enable GPIOE0 and GPIOE2 pass-through by default - -This change sets the gpio DT pinctrl default configuration to -enable GPIOE0 and GPIOE2 pass-through. Since this causes -pinctrl_get_select_default() to be called automatically for -the gpio driver to claim the GPIO pins in those groups, we -also need to call pinctrl_put() to release claim on the -pass-through GPIOs so they can be requested at runtime. - -Tested: -Disabled pass-through in uboot and confirmed that after booting -Linux, pass-through is enabled and 'cat /sys/kernel/debug/pinctrl/ -1e6e2000.syscon\:pinctrl-aspeed-g5-pinctrl/pinmux-pins' shows that -the pass-through GPIOs are UNCLAIMED. - -Signed-off-by: Jason M. Bills ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 4 ++++ - drivers/gpio/gpio-aspeed.c | 10 ++++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -index 45556ac..051e927 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -124,6 +124,10 @@ - - &gpio { - status = "okay"; -+ /* Enable GPIOE0 and GPIOE2 pass-through by default */ -+ pinctrl-names = "pass-through"; -+ pinctrl-0 = <&pinctrl_gpie0_default -+ &pinctrl_gpie2_default>; - gpio-line-names = - /*A0-A8*/ "","","","","","","","", - /*B0-B8*/ "","","","","","","","", -diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c -index 2175070..f47d139 100644 ---- a/drivers/gpio/gpio-aspeed.c -+++ b/drivers/gpio/gpio-aspeed.c -@@ -1157,6 +1157,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) - const struct of_device_id *gpio_id; - struct aspeed_gpio *gpio; - struct resource *res; -+ struct pinctrl *pinctrl; - int rc, i, banks; - - gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); -@@ -1205,6 +1206,15 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) - return -ENOMEM; - - /* -+ * Select the pass-through pinctrl config to enable the pass-through -+ * mux for GPIOs E0 and E2. Then call pinctrl_put() to release claim -+ * of the GPIO pins, so they can be requested at runtime. -+ */ -+ pinctrl = pinctrl_get_select(&pdev->dev, "pass-through"); -+ if (pinctrl) -+ pinctrl_put(pinctrl); -+ -+ /* - * Populate it with initial values read from the HW and switch - * all command sources to the ARM by default - */ --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch deleted file mode 100644 index dbb163d20..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0004-Test-code-for-LPC-MBOX.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 2f3587cf9e44f261fe74413ef6a54467686c910b Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo -Date: Tue, 20 Nov 2018 15:49:15 -0800 -Subject: [PATCH] Test code for LPC MBOX - -Blocked interrupt driven code for test. - -Signed-off-by: Jae Hyun Yoo ---- - drivers/misc/aspeed-lpc-mbox.c | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/drivers/misc/aspeed-lpc-mbox.c b/drivers/misc/aspeed-lpc-mbox.c -index 0f0c711bafee..0933e0553953 100644 ---- a/drivers/misc/aspeed-lpc-mbox.c -+++ b/drivers/misc/aspeed-lpc-mbox.c -@@ -19,6 +19,8 @@ - - #define DEVICE_NAME "aspeed-mbox" - -+#define MBX_USE_INTERRUPT 0 -+ - #define ASPEED_MBOX_NUM_REGS 16 - - #define ASPEED_MBOX_DATA_0 0x00 -@@ -79,12 +81,14 @@ static int aspeed_mbox_open(struct inode *inode, struct file *file) - struct aspeed_mbox *mbox = file_mbox(file); - - if (atomic_inc_return(&aspeed_mbox_open_count) == 1) { -+#if MBX_USE_INTERRUPT - /* - * Clear the interrupt status bit if it was left on and unmask - * interrupts. - * ASPEED_MBOX_CTRL_RECV bit is W1C, this also unmasks in 1 step - */ - aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); -+#endif - return 0; - } - -@@ -106,6 +110,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, - if (count + *ppos > ASPEED_MBOX_NUM_REGS) - return -EINVAL; - -+#if MBX_USE_INTERRUPT - if (file->f_flags & O_NONBLOCK) { - if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & - ASPEED_MBOX_CTRL_RECV)) -@@ -115,6 +120,7 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, - ASPEED_MBOX_CTRL_RECV)) { - return -ERESTARTSYS; - } -+#endif - - mutex_lock(&mbox->mutex); - -@@ -129,8 +135,10 @@ static ssize_t aspeed_mbox_read(struct file *file, char __user *buf, - count--; - } - -+#if MBX_USE_INTERRUPT - /* ASPEED_MBOX_CTRL_RECV bit is write to clear, this also unmasks in 1 step */ - aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); -+#endif - ret = p - buf; - - out_unlock: -@@ -180,7 +188,9 @@ static unsigned int aspeed_mbox_poll(struct file *file, poll_table *wait) - - poll_wait(file, &mbox->queue, wait); - -+#if MBX_USE_INTERRUPT - if (aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV) -+#endif - mask |= POLLIN; - - return mask; -@@ -206,6 +216,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg) - { - struct aspeed_mbox *mbox = arg; - -+#if MBX_USE_INTERRUPT - if (!(aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) & ASPEED_MBOX_CTRL_RECV)) - return IRQ_NONE; - -@@ -216,6 +227,7 @@ static irqreturn_t aspeed_mbox_irq(int irq, void *arg) - - /* Mask it off, we'll clear it when we the data gets read */ - aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL); -+#endif - - wake_up(&mbox->queue); - return IRQ_HANDLED; -@@ -248,7 +260,14 @@ static int aspeed_mbox_config_irq(struct aspeed_mbox *mbox, - aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_0); - aspeed_mbox_outb(mbox, 0xff, ASPEED_MBOX_STATUS_1); - -- aspeed_mbox_outb(mbox, ASPEED_MBOX_CTRL_RECV, ASPEED_MBOX_BMC_CTRL); -+ aspeed_mbox_outb(mbox, aspeed_mbox_inb(mbox, ASPEED_MBOX_BMC_CTRL) | ASPEED_MBOX_CTRL_MASK, ASPEED_MBOX_BMC_CTRL); -+ -+ /* -+ * Because mailbox data register init value is random, need to give a -+ * init value to mailbox data register. -+ */ -+ aspeed_mbox_outb(mbox, 0x00, ASPEED_MBOX_DATA_0); -+ - return 0; - } - --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch deleted file mode 100644 index 03b4f4da4..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/0005-128MB-flashmap-for-PFR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ddfbe1364c6ecf77f06990e6550dfe5a3791e6bf Mon Sep 17 00:00:00 2001 -From: Vikram Bodireddy -Date: Wed, 6 Feb 2019 15:59:34 +0530 -Subject: [PATCH] Selecting 128MB for PFR - -PFR platforms requires 128MB flash mapping. -This will override the existing 64MB flash map -and loads 128MB flash map. - -Signed-off-by: Vikram Bodireddy ---- - arch/arm/boot/dts/aspeed-bmc-intel-purley.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -index 8aba46cdce46..6959a06d04e2 100644 ---- a/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -+++ b/arch/arm/boot/dts/aspeed-bmc-intel-purley.dts -@@ -90,7 +90,7 @@ - flash@0 { - status = "okay"; - m25p,fast-read; --#include "openbmc-flash-layout-intel-64MB.dtsi" -+#include "openbmc-flash-layout-intel-128MB.dtsi" - }; - }; - --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg deleted file mode 100644 index 480d4cc18..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed/wolfpass.cfg +++ /dev/null @@ -1,69 +0,0 @@ -CONFIG_HWMON=y -CONFIG_SENSORS_ASPEED=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_IIO=y -CONFIG_SENSORS_IIO_HWMON=y -CONFIG_ASPEED_ADC=y -CONFIG_SGPIO_ASPEED=y -CONFIG_CRC8=y -CONFIG_PECI=y -CONFIG_PECI_CHARDEV=y -CONFIG_PECI_ASPEED=y -CONFIG_SENSORS_PECI_CPUTEMP=y -CONFIG_SENSORS_PECI_DIMMTEMP=y -CONFIG_OF_CONFIGFS=y -CONFIG_CONFIGFS_FS=y -CONFIG_BLK_DEV_RAM_SIZE=49152 -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01 -CONFIG_MAGIC_SYSRQ_SERIAL=y -CONFIG_ASPEED_ESPI_SLAVE=y -CONFIG_ASPEED_KCS_IPMI_BMC=y -CONFIG_I2C_SLAVE=y -CONFIG_I2C_SLAVE_EEPROM=n -CONFIG_I2C_SLAVE_MQUEUE=y -CONFIG_I2C_SLAVE_MQUEUE_MESSAGE_SIZE=256 -CONFIG_I2C_SLAVE_MQUEUE_QUEUE_SIZE=32 -CONFIG_ASPEED_LPC_SIO=y -CONFIG_JTAG=y -CONFIG_JTAG_ASPEED=y -CONFIG_FRAME_VECTOR=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L2=y -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_ASPEED=y -CONFIG_VIDEOBUF2_CORE=y -CONFIG_VIDEOBUF2_V4L2=y -CONFIG_VIDEOBUF2_MEMOPS=y -CONFIG_VIDEOBUF2_DMA_CONTIG=y -CONFIG_MEDIA_SUBDRV_AUTOSELECT=y -CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -CONFIG_USB_LIBCOMPOSITE=y -CONFIG_USB_F_HID=y -CONFIG_USB_GADGET=y -CONFIG_U_SERIAL_CONSOLE=y -CONFIG_USB_ASPEED_VHUB=y -CONFIG_USB_CONFIGFS=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_ASPEED_UART_ROUTING=y -CONFIG_DEVMEM=y -CONFIG_ASPEED_VGA_SHAREDMEM=y -CONFIG_DEVMEM_BOOTPARAM=n -CONFIG_PWM=y -CONFIG_PWM_FTTMR010=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PWM_BEEPER=y -CONFIG_VFAT_FS=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_UTF8=y - diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index 782fc6532..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://wolfpass.cfg \ - file://0001-arm-dts-add-DTS-for-Intel-platforms.patch \ - file://0002-Enable-pass-through-on-GPIOE1-and-GPIOE3-free.patch \ - file://0003-Enable-GPIOE0-and-GPIOE2-pass-through-by-default.patch \ - file://0004-Test-code-for-LPC-MBOX.patch \ - " -SRC_URI += "${@bb.utils.contains('IMAGE_TYPE', 'pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}" diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json deleted file mode 100644 index 474dc0565..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json +++ /dev/null @@ -1,1369 +0,0 @@ -{ - "Exposes": [ - { - "Index": 0, - "Name": "P12V_PSU_RIGHT", - "PowerState": "On", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 1, - "Name": "P3V3", - "PowerState": "On", - "ScaleFactor": 0.4107, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.647 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.541 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 3.066 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.974 - } - ], - "Type": "ADC" - }, - { - "Index": 2, - "Name": "PVNN_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.081 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.049 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.807 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.783 - } - ], - "Type": "ADC" - }, - { - "Index": 3, - "Name": "P105_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.139 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.106 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.995 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.966 - } - ], - "Type": "ADC" - }, - { - "Index": 4, - "Name": "P12V_PSU_LEFT", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 5, - "Name": "P12V_AUX", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 6, - "Name": "P1V8_PCH", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.961 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.904 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.699 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.648 - } - ], - "Type": "ADC" - }, - { - "Index": 7, - "Name": "P3VBAT", - "ScaleFactor": 0.3333, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.296 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 2.457 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.138 - } - ], - "Type": "ADC" - }, - { - "Index": 8, - "Name": "PVCCIN_CPU0", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 9, - "Name": "PVCCIN_CPU1", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 10, - "Name": "PVDQ_ABCD_CPU0", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 11, - "Name": "PVDQ_EFGH_CPU0", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 12, - "Name": "PVDQ_ABCD_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 13, - "Name": "PVDQ_EFGH_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 14, - "Name": "PVCCIO_CPU0", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 15, - "Name": "PVCCIO_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "BindGpioIntrusion": "Chassis Intrusion GPIO", - "Class": "Gpio", - "Name": "Chassis Intrusion Sensor", - "Type": "ChassisIntrusionSensor" - }, - { - "Direction": "In", - "Index": 0, - "Name": "Board REV ID0", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 3, - "Name": "Board REV ID1", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 8, - "Name": "Board SKU ID0", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 9, - "Name": "Board SKU ID1", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 10, - "Name": "Board SKU ID2", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 11, - "Name": "Board SKU ID3", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 12, - "Name": "Board SKU ID4", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 18, - "Name": "OCP3 PRSNTB0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 19, - "Name": "OCP3 PRSNTB1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 20, - "Name": "OCP3 PRSNTB2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 21, - "Name": "OCP3 PRSNTB3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 24, - "Name": "Force BMC Update", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 26, - "Name": "OCP PWRGD Aux", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 42, - "Name": "CPU1 Memhot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 43, - "Name": "CPU2 Memhot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 44, - "Name": "Cpu Err0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 45, - "Name": "Cpu Err1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 46, - "Name": "Platform Reset", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 47, - "Name": "CPU PRDY", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 48, - "Name": "Cpu Err2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 49, - "Name": "Cpu Caterr", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 50, - "Name": "PCH Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 51, - "Name": "Board REV ID2", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 52, - "Name": "NMI Event", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 53, - "Name": "Board SKU ID5", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 56, - "Name": "Rise1 PWRGD", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 57, - "Name": "Rise2 PWRGD", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 61, - "Name": "Rise3 PWRGD", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "In", - "Index": 62, - "Name": "Rise4 PWRGD", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 63, - "Name": "240VA OC", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 64, - "Name": "SYS FAN0 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 65, - "Name": "SYS FAN1 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 66, - "Name": "SYS FAN2 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 67, - "Name": "SYS FAN3 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 68, - "Name": "SASM ROC ID0", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 69, - "Name": "SASM ROC ID1", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 70, - "Name": "Midplane Switch ID0", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 71, - "Name": "Midplane Switch ID1", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 137, - "Name": "PCA9555 Intr", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 138, - "Name": "SYS FAN4 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 139, - "Name": "SYS FAN5 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 140, - "Name": "SYS FAN6 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 141, - "Name": "SYS FAN7 PRSNT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 143, - "Name": "Chassis Intrusion GPIO", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 144, - "Name": "Remote Debug Enable", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 146, - "Name": "RSMRST", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 214, - "Name": "SMI Active", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 215, - "Name": "Post complete", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 217, - "Name": "Nmi Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 218, - "Name": "ID Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 219, - "Name": "Power Good", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 232, - "Name": "CPU1 Present", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 233, - "Name": "CPU1 Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 234, - "Name": "CPU1 VR Hot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 235, - "Name": "CPU1 FIVR Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 236, - "Name": "CPU1 Mem VR Hot1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 237, - "Name": "CPU1 Mem VR Hot2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 238, - "Name": "CPU1 ID0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 239, - "Name": "CPU1 ID1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 240, - "Name": "CPU1 Mismatch", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 241, - "Name": "CPU1 DIMM Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 242, - "Name": "CPU2 Present", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 243, - "Name": "CPU2 Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 244, - "Name": "CPU2 VR Hot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 245, - "Name": "CPU2 FIVR Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 246, - "Name": "CPU2 Mem VR Hot1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 247, - "Name": "CPU1 Mem VR Hot2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 248, - "Name": "CPU2 ID0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 249, - "Name": "CPU2 ID1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 250, - "Name": "CPU2 Mismatch", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 251, - "Name": "CPU2 DIMM Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 272, - "Name": "PLD Minor Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 273, - "Name": "PLD Minor Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 274, - "Name": "PLD Minor Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 275, - "Name": "PLD Minor Revison Bit 3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 276, - "Name": "PLD Minor Revison Bit 4", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 277, - "Name": "PLD Minor Revison Bit 5", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 278, - "Name": "PLD Minor Revison Bit 6", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 279, - "Name": "PLD Minor Revison Bit 7", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 280, - "Name": "Main PLD Major Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 281, - "Name": "Main PLD Major Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 282, - "Name": "Main PLD Major Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 283, - "Name": "Main PLD Major Revison Bit 3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 284, - "Name": "Main PLD Major Revison Bit 4", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 285, - "Name": "Main PLD Major Revison Bit 5", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 286, - "Name": "Main PLD Major Revison Bit 6", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 287, - "Name": "Main PLD Major Revison Bit 7", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 289, - "Name": "Memory Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 290, - "Name": "CPU Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 291, - "Name": "P3V3 Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 292, - "Name": "PSU Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 295, - "Name": "PCH Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Address": "0x4D", - "Bus": 6, - "Name": "CPU0 VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP421" - }, - { - "Address": "0x4F", - "Bus": 6, - "Name": "CPU1 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP421" - }, - { - "Address": "0x4A", - "Bus": 6, - "Name": "BMC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4B", - "Bus": 6, - "Name": "RightRear Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4E", - "Bus": 6, - "Name": "LeftRear Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4C", - "Bus": 6, - "Name": "PCH DS Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "CYP Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})", - "Type": "Board", - "ProductId": 152, - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$PRODUCT_MANUFACTURER", - "Model": "$PRODUCT_PRODUCT_NAME", - "PartNumber": "$PRODUCT_PART_NUMBER", - "SerialNumber": "$PRODUCT_SERIAL_NUMBER" - } -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json deleted file mode 100644 index 22f8b1c6d..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/FCXXPDBASSMBL_PDB.json +++ /dev/null @@ -1,91 +0,0 @@ -[ - { - "Exposes": [ - { - "Address": "$address", - "Bus": "$bus", - "Name": "FCXXPDBASSMBL Fru", - "Type": "24C01" - }, - { - "Address": "0x18", - "Bus": "$bus", - "Name": "Multi Node Presence Detector", - "Type": "MultiNode" - }, - { - "Address": "0x48", - "Bus": "$bus", - "Name": "PDB Temp1", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 80 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 75 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x49", - "Bus": "$bus", - "Name": "PDB Temp2", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 80 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 75 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "FCXXPDBASSMBL PDB", - "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FCXXPDBASSMBL', 'ADDRESS' : 85})", - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$BOARD_MANUFACTURER", - "Model": "$BOARD_PRODUCT_NAME", - "PartNumber": "$BOARD_PART_NUMBER", - "SerialNumber": "$BOARD_SERIAL_NUMBER" - } - } -] \ No newline at end of file diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json deleted file mode 100644 index 53edbfe87..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/MIDPLANE-2U2X12SWITCH.json +++ /dev/null @@ -1,104 +0,0 @@ -[ - { - "Exposes": [ - { - "Address": "$address", - "Bus": "$bus", - "Name": "Midplane 1 Fru", - "Type": "EEPROM" - }, - { - "Address": "0x4E", - "Bus": "$bus", - "Name": "Midplane 1 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 80 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 75 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "Midplane 1", - "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U2X12SWITCH', 'ADDRESS' : 86})", - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$BOARD_MANUFACTURER", - "Model": "$BOARD_PRODUCT_NAME", - "PartNumber": "$BOARD_PART_NUMBER", - "SerialNumber": "$BOARD_SERIAL_NUMBER" - } - }, - { - "Exposes": [ - { - "Address": "$address", - "Bus": "$bus", - "Name": "Midplane 2 Fru", - "Type": "EEPROM" - }, - { - "Address": "0x4F", - "Bus": "$bus", - "Name": "Midplane 2 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 80 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 75 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "Midplane 2", - "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U2X12SWITCH', 'ADDRESS' : 87})", - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$BOARD_MANUFACTURER", - "Model": "$BOARD_PRODUCT_NAME", - "PartNumber": "$BOARD_PART_NUMBER", - "SerialNumber": "$BOARD_SERIAL_NUMBER" - } - } -] \ No newline at end of file diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json deleted file mode 100644 index 7b86bfae0..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/OPB2RH-Chassis.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Exposes": [ - { - "Name": "Multi Node Supported", - "Type": "MultiNode" - } - ], - "Name": "OPB2RH Chassis", - "Probe": [ - "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FCXXPDBASSMBL'})" - ], - "Type": "Chassis", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "Intel Corporation", - "Model": "OPB2RH", - "PartNumber": "R1234", - "SerialNumber": "12345" - } -} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json deleted file mode 100644 index 6a1696432..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json +++ /dev/null @@ -1,1845 +0,0 @@ -{ - "Exposes": [ - { - "Index": 0, - "Name": "Baseboard 12 Volt", - "PowerState": "On", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 4, - "Name": "P0V83_LAN_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 0.901 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 0.875 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.786 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.763 - } - ], - "Type": "ADC" - }, - { - "Index": 3, - "Name": "P105_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.139 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.106 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.995 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.966 - } - ], - "Type": "ADC" - }, - { - "Index": 5, - "Name": "P12V_AUX", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 6, - "Name": "P1V8_PCH", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.961 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.904 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.699 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.648 - } - ], - "Type": "ADC" - }, - { - "Index": 1, - "Name": "P3V3", - "PowerState": "On", - "ScaleFactor": 0.4107, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.647 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.541 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 3.066 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.974 - } - ], - "Type": "ADC" - }, - { - "Index": 7, - "Name": "P3VBAT", - "ScaleFactor": 0.3333, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.296 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 2.457 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.138 - } - ], - "Type": "ADC" - }, - { - "Index": 8, - "Name": "PVCCIN_CPU1", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 9, - "Name": "PVCCIN_CPU2", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 14, - "Name": "PVCCIO_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 15, - "Name": "PVCCIO_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 10, - "Name": "PVDQ_ABCD_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 12, - "Name": "PVDQ_ABCD_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 11, - "Name": "PVDQ_EFGH_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 13, - "Name": "PVDQ_EFGH_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 2, - "Name": "PVNN_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.081 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.049 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.807 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.783 - } - ], - "Type": "ADC" - }, - { - "Direction": "Input", - "Index": 40, - "Name": "NMI Out", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 50, - "Name": "PCH Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 51, - "Name": "Lcp Enter Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 52, - "Name": "Lcp Left Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 53, - "Name": "Lcp Right Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 49, - "Name": "Cpu Caterr", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 48, - "Name": "Cpu Err2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 63, - "Name": "PU 240VA Status", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 208, - "Name": "P3v3bat BridgeEn", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 214, - "Name": "Nmi Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 215, - "Name": "Post complete", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 217, - "Name": "Nmi Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 218, - "Name": "ID Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 219, - "Name": "Power Good", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 232, - "Name": "Post Complete led0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 233, - "Name": "Post Complete led1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 233, - "Name": "CPU1 Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 234, - "Name": "Post Complete led2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 234, - "Name": "CPU1 VR Hot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 235, - "Name": "Post Complete led3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 236, - "Name": "Post Complete led4", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 236, - "Name": "CPU1 Mem VR Hot1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 237, - "Name": "Post Complete led5", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 237, - "Name": "CPU1 Mem VR Hot2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 238, - "Name": "Post Complete led6", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 239, - "Name": "Post Complete led7", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 232, - "Name": "CPU1 Present", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 235, - "Name": "CPU1 FIVR Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 238, - "Name": "CPU1 ID0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 240, - "Name": "CPU1 CH1 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 240, - "Name": "CPU1 Mismatch", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 241, - "Name": "CPU1 CH1 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 241, - "Name": "CPU1 DIMM Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 242, - "Name": "CPU1 CH2 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 242, - "Name": "CPU2 Present", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 243, - "Name": "CPU1 CH2 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 243, - "Name": "CPU2 Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 244, - "Name": "CPU1 CH3 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 244, - "Name": "CPU2 VR Hot", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 245, - "Name": "CPU1 CH3 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 245, - "Name": "CPU2 FIVR Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 246, - "Name": "CPU1 CH4 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 246, - "Name": "CPU2 Mem VR Hot1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 247, - "Name": "CPU1 CH4 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 247, - "Name": "CPU1 Mem VR Hot2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 248, - "Name": "CPU1 CH5 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 248, - "Name": "CPU2 ID0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 249, - "Name": "CPU1 CH5 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 250, - "Name": "CPU1 CH6 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 250, - "Name": "CPU2 Mismatch", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 251, - "Name": "CPU1 CH6 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 251, - "Name": "CPU2 DIMM Thermaltrip", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 252, - "Name": "Fan1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 253, - "Name": "Fan2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 254, - "Name": "Fan3 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 255, - "Name": "Fan4 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 256, - "Name": "Fan5 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 257, - "Name": "Fan6 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 258, - "Name": "Fan7 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 259, - "Name": "Fan8 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 260, - "Name": "CPU2 CH1 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 261, - "Name": "CPU2 CH1 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 262, - "Name": "CPU2 CH2 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 263, - "Name": "CPU2 CH2 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 264, - "Name": "CPU2 CH3 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 265, - "Name": "CPU2 CH3 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 266, - "Name": "CPU2 CH4 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 267, - "Name": "CPU2 CH4 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 268, - "Name": "CPU2 CH5 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 269, - "Name": "CPU2 CH5 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 270, - "Name": "CPU2 CH6 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 271, - "Name": "CPU2 CH6 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 272, - "Name": "CPU3 CH1 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 272, - "Name": "PLD Minor Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 273, - "Name": "CPU3 CH1 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 273, - "Name": "PLD Minor Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 274, - "Name": "CPU3 CH2 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 274, - "Name": "PLD Minor Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 275, - "Name": "CPU3 CH2 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 275, - "Name": "PLD Minor Revison Bit 3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 276, - "Name": "CPU3 CH3 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 276, - "Name": "PLD Major Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 277, - "Name": "CPU3 CH3 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 277, - "Name": "PLD Major Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 278, - "Name": "CPU3 CH4 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 278, - "Name": "PLD Major Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 279, - "Name": "CPU3 CH4 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 279, - "Name": "PLD Major Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 280, - "Name": "CPU3 CH5 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 280, - "Name": "Main PLD Minor Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 281, - "Name": "CPU3 CH5 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 281, - "Name": "Main PLD Minor Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 282, - "Name": "CPU3 CH6 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 282, - "Name": "Main PLD Minor Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 283, - "Name": "CPU3 CH6 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 283, - "Name": "Main PLD Minor Revison Bit 3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 284, - "Name": "CPU4 CH1 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 284, - "Name": "Main PLD Major Revison Bit 0", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 285, - "Name": "CPU4 CH1 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 285, - "Name": "Main PLD Major Revison Bit 1", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 286, - "Name": "CPU4 CH2 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 286, - "Name": "Main PLD Major Revison Bit 2", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 287, - "Name": "CPU4 CH2 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 287, - "Name": "Main PLD Major Revison Bit 3", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 288, - "Name": "CPU4 CH3 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 289, - "Name": "CPU4 CH3 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 289, - "Name": "Memory Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 290, - "Name": "CPU4 CH4 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 290, - "Name": "CPU Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 291, - "Name": "CPU4 CH4 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 291, - "Name": "P5V P3V3 Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 292, - "Name": "CPU4 CH5 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 292, - "Name": "PSU Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 293, - "Name": "CPU4 CH5 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 293, - "Name": "SAS Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 294, - "Name": "CPU4 CH6 DIMM1 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 294, - "Name": "Lan Aux Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Out", - "Index": 295, - "Name": "CPU4 CH6 DIMM2 FAULT", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 295, - "Name": "PCH Pwr Fault", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 27, - "Name": "Node ID GPIO 0", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 26, - "Name": "Node ID GPIO 1", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Name": "CPU 1 Fan Connector", - "Pwm": 7, - "Status": "disabled", - "Tachs": [ - 13 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "CPU 2 Fan Connector", - "Pwm": 8, - "Status": "disabled", - "Tachs": [ - 14 - ], - "Type": "IntelFanConnector" - }, - { - "Address": "0x8", - "Class": "METemp", - "Name": "SSB Temp", - "PowerState": "BiosPost", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 103 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 98 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x7c", - "Class": "PxeBridgeTemp", - "Name": "CPU1 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x70", - "Class": "PxeBridgeTemp", - "Name": "CPU1 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x74", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem ABC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x78", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem DEF Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x9c", - "Class": "PxeBridgeTemp", - "Name": "CPU2 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x50", - "Class": "PxeBridgeTemp", - "Name": "CPU2 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x94", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem ABC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x98", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem DEF Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xAC", - "Class": "PxeBridgeTemp", - "Name": "VR P1V05 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "BindGpioNodeID": "Node ID GPIO 0", - "Name": "Multi Node ID 0", - "Type": "MultiNode" - }, - { - "BindGpioNodeID": "Node ID GPIO 1", - "Name": "Multi Node ID 1", - "Type": "MultiNode" - }, - { - "Address": "0x71", - "Bus": 2, - "ChannelNames": [ - "M2_Slot1", - "M2_Slot2", - "", - "" - ], - "Name": "M.2 Mux", - "Type": "PCA9543Mux" - }, - { - "Address": "0x30", - "Bus": 0, - "CpuID": 1, - "Name": "Xeon CPU 1", - "Thresholds": [ - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper critical", - "Severity": 1, - "Value": 99 - }, - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper non critical", - "Severity": 0, - "Value": 89 - } - ], - "Type": "XeonCPU" - }, - { - "Address": "0x31", - "Bus": 0, - "CpuID": 2, - "Name": "Xeon CPU 2", - "Thresholds": [ - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper critical", - "Severity": 1, - "Value": 99 - }, - { - "Direction": "greater than", - "Label": "DIMM", - "Name": "upper non critical", - "Severity": 0, - "Value": 89 - } - ], - "Type": "XeonCPU" - }, - { - "Address": "0x4E", - "Bus": 6, - "Name": "Exit Air Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4B", - "Bus": 6, - "Name": "Inlet Air Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "TNP Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})", - "Type": "Board", - "ProductId": 153, - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$PRODUCT_MANUFACTURER", - "Model": "$PRODUCT_PRODUCT_NAME", - "PartNumber": "$PRODUCT_PART_NUMBER", - "SerialNumber": "$PRODUCT_SERIAL_NUMBER" - } -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json deleted file mode 100644 index c88e50676..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json +++ /dev/null @@ -1,2082 +0,0 @@ -{ - "Exposes": [ - { - "Index": 0, - "Name": "A_P12V_PSU_SCALED", - "PowerState": "On", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 4, - "Name": "P0V83_LAN_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 0.901 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 0.875 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.786 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.763 - } - ], - "Type": "ADC" - }, - { - "Index": 3, - "Name": "P105_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.139 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.106 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.995 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.966 - } - ], - "Type": "ADC" - }, - { - "Index": 5, - "Name": "P12V_AUX", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 6, - "Name": "P1V8_PCH", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.961 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.904 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.699 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.648 - } - ], - "Type": "ADC" - }, - { - "Index": 1, - "Name": "P3V3", - "PowerState": "On", - "ScaleFactor": 0.4107, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.647 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.541 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 3.066 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.974 - } - ], - "Type": "ADC" - }, - { - "Index": 7, - "Name": "P3VBAT", - "ScaleFactor": 0.3333, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.296 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 2.457 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.138 - } - ], - "Type": "ADC" - }, - { - "Index": 8, - "Name": "PVCCIN_CPU1", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 9, - "Name": "PVCCIN_CPU2", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 14, - "Name": "PVCCIO_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 15, - "Name": "PVCCIO_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 10, - "Name": "PVDQ_ABC_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 12, - "Name": "PVDQ_ABC_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 11, - "Name": "PVDQ_DEF_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 13, - "Name": "PVDQ_DEF_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 2, - "Name": "PVNN_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.081 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.049 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.807 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.783 - } - ], - "Type": "ADC" - }, - { - "BindConnector": "System Fan connector 1", - "Index": 0, - "Name": "Fan 1a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 1", - "Index": 1, - "Name": "Fan 1b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 2", - "Index": 2, - "Name": "Fan 2a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 2", - "Index": 3, - "Name": "Fan 2b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 3", - "Index": 4, - "Name": "Fan 3a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 3", - "Index": 5, - "Name": "Fan 3b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 4", - "Index": 6, - "Name": "Fan 4a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 4", - "Index": 7, - "Name": "Fan 4b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 5", - "Index": 8, - "Name": "Fan 5a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 5", - "Index": 9, - "Name": "Fan 5b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 6", - "Index": 10, - "Name": "Fan 6a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 6", - "Index": 11, - "Name": "Fan 6b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 7", - "Index": 12, - "Name": "Fan 7a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 7", - "Index": 13, - "Name": "Fan 7b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 8", - "Index": 14, - "Name": "Fan 8a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 8", - "Index": 15, - "Name": "Fan 8b", - "Type": "AspeedFan" - }, - { - "C1": 92.16, - "C2": 107.52, - "MaxCFM": 17.5, - "Name": "System Airflow", - "TachMaxPercent": 100, - "TachMinPercent": 20, - "Tachs": [ - "Fan 1a", - "Fan 1b", - "Fan 2a", - "Fan 2b", - "Fan 3a", - "Fan 3b", - "Fan 4a", - "Fan 4b", - "Fan 5a", - "Fan 5b", - "Fan 6a", - "Fan 6b", - "Fan 7a", - "Fan 7b", - "Fan 8a", - "Fan 8b" - ], - "Type": "CFMSensor" - }, - { - "AlphaF": 4.352, - "AlphaS": 0.512, - "Name": "Exit Air Temp", - "PowerFactorMax": 1.0, - "PowerFactorMin": 0.4, - "QMax": 88, - "QMin": 15, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 85 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 80 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "ExitAirTempSensor" - }, - { - "AllowedFailures": 1, - "Name": "FanRedundancy", - "Type": "FanRedundancy" - }, - { - "Direction": "Input", - "Index": 40, - "Name": "NMI Input", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 48, - "Name": "CPU ERR2", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 49, - "Name": "CPU CATERR", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 214, - "Name": "SMI Input", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 215, - "Name": "Post Complete", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 217, - "Name": "Nmi Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 218, - "Name": "ID Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 219, - "Name": "Power Good", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Name": "System Fan connector 1", - "Pwm": 0, - "Tachs": [ - 0, - 1 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 2", - "Pwm": 1, - "Tachs": [ - 2, - 3 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 3", - "Pwm": 2, - "Tachs": [ - 4, - 5 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 4", - "Pwm": 3, - "Tachs": [ - 6, - 7 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 5", - "Pwm": 4, - "Tachs": [ - 8, - 9 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 6", - "Pwm": 5, - "Tachs": [ - 10, - 11 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 7", - "Pwm": 6, - "Tachs": [ - 12, - 13 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 8", - "Pwm": 7, - "Tachs": [ - 14, - 15 - ], - "Type": "IntelFanConnector" - }, - { - "Address": "0x8", - "Class": "METemp", - "Name": "SSB Temp", - "PowerState": "BiosPost", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 103 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 98 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xC4", - "Class": "MpsBridgeTemp", - "Name": "CPU1 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xB4", - "Class": "PxeBridgeTemp", - "Name": "CPU1 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xDC", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem ABCD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xDC", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem EFGH Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x4A", - "Class": "IRBridgeTemp", - "Name": "CPU1 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xCC", - "Class": "MpsBridgeTemp", - "Name": "CPU2 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xD4", - "Class": "PxeBridgeTemp", - "Name": "CPU2 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xB0", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem ABCD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xEC", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem EFGH Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x4C", - "Class": "IRBridgeTemp", - "Name": "CPU2 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x71", - "Bus": 2, - "ChannelNames": [ - "M2Slot1", - "M2Slot2" - ], - "Name": "M2 Mux", - "Type": "PCA9543Mux" - }, - { - "Address": "0x72", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "", - "FruChannel" - ], - "Name": "Riser 1 Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x73", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "", - "FruChannel" - ], - "Name": "Riser 2 Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x73", - "Bus": 9, - "ChannelNames": [ - "MemoryChannel1", - "MemoryChannel2", - "MemoryChannel3", - "MemoryChannel4" - ], - "Name": "Memory Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x74", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "PcieSlot3", - "PcieSlot4" - ], - "Name": "PCIE Mux", - "Type": "PCA9546Mux" - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Exit Air Temp" - ], - "Name": "Exit Air Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 1a", - "Fan 1b" - ], - "Name": "Fan 1", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 1" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 2a", - "Fan 2b" - ], - "Name": "Fan 2", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 2" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 3a", - "Fan 3b" - ], - "Name": "Fan 3", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 3" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 4a", - "Fan 4b" - ], - "Name": "Fan 4", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 4" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 5a", - "Fan 5b" - ], - "Name": "Fan 5", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 5" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 6a", - "Fan 6b" - ], - "Name": "Fan 6", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 6" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 7a", - "Fan 7b" - ], - "Name": "Fan 7", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 7" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 8a", - "Fan 8b" - ], - "Name": "Fan 8", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 8" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "BMC Temp" - ], - "Name": "BMC Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU1" - ], - "Name": "CPU1 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU1" - ], - "Name": "CPU1 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU2" - ], - "Name": "CPU2 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU2" - ], - "Name": "CPU2 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU1" - ], - "Name": "DTS CPU1", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU2" - ], - "Name": "DTS CPU2", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Left Rear Temp" - ], - "Name": "Left Rear Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Right Rear Board" - ], - "Name": "Right Rear Board", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "SSB Temp" - ], - "Name": "SSB Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 1 Temp" - ], - "Name": "VR 1 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 2 Temp" - ], - "Name": "VR 2 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "Left", - "Type": "Pid.Zone" - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "Right", - "Type": "Pid.Zone" - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "PSU", - "Type": "Pid.Zone" - }, - { - "Class": "Ceiling", - "Inputs": [ - "Front Panel Temp" - ], - "Name": "Front Panel UCC", - "NegativeHysteresis": 2, - "Output": [ - 70.0, - 80.0 - ], - "PositiveHysteresis": 0, - "Profiles": [ - "Acoustic" - ], - "Reading": [ - 22.0, - 32.0 - ], - "Type": "Stepwise", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "Floor", - "Inputs": [ - "Front Panel Temp" - ], - "Name": "Front Panel LCC", - "NegativeHysteresis": 2, - "Output": [ - 50.0, - 60.0 - ], - "PositiveHysteresis": 0, - "Reading": [ - 20.0, - 30.0 - ], - "Type": "Stepwise", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Address": "0x4A", - "Bus": 6, - "Name": "BMC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4B", - "Bus": 6, - "Name": "Right Rear Board Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x49", - "Bus": 6, - "Name": "Left Rear Board Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x48", - "Bus": 6, - "Name": "PCH M.2 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4f", - "Bus": 6, - "Name": "Inlet BRD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4D", - "Bus": "0x1", - "Name": "Front Panel Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 55 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 50 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x30", - "Bus": 0, - "CpuID": 1, - "Name": "Xeon CPU 1", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" - } - ], - "Type": "XeonCPU" - }, - { - "Address": "0x31", - "Bus": 0, - "CpuID": 2, - "Name": "Xeon CPU 2", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" - } - ], - "Type": "XeonCPU" - } - ], - "Name": "WC Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})", - "ProductId": 145, - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$PRODUCT_MANUFACTURER", - "Model": "$PRODUCT_PRODUCT_NAME", - "PartNumber": "$PRODUCT_PART_NUMBER", - "SerialNumber": "$PRODUCT_SERIAL_NUMBER" - } -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json deleted file mode 100644 index fc851f200..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json +++ /dev/null @@ -1,2075 +0,0 @@ -{ - "Exposes": [ - { - "Index": 0, - "Name": "A_P12V_PSU_SCALED", - "PowerState": "On", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 4, - "Name": "P0V83_LAN_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 0.901 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 0.875 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.786 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.763 - } - ], - "Type": "ADC" - }, - { - "Index": 3, - "Name": "P105_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.139 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.106 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.995 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.966 - } - ], - "Type": "ADC" - }, - { - "Index": 5, - "Name": "P12V_AUX", - "ScaleFactor": 0.1124, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 6, - "Name": "P1V8_PCH", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.961 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.904 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.699 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.648 - } - ], - "Type": "ADC" - }, - { - "Index": 1, - "Name": "P3V3", - "PowerState": "On", - "ScaleFactor": 0.4107, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.647 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.541 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 3.066 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.974 - } - ], - "Type": "ADC" - }, - { - "Index": 7, - "Name": "P3VBAT", - "ScaleFactor": 0.3333, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.296 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 2.457 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.138 - } - ], - "Type": "ADC" - }, - { - "Index": 8, - "Name": "PVCCIN_CPU1", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 9, - "Name": "PVCCIN_CPU2", - "PowerState": "On", - "ScaleFactor": 0.7505, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "Index": 14, - "Name": "PVCCIO_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 15, - "Name": "PVCCIO_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "Index": 10, - "Name": "PVDQ_ABC_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 12, - "Name": "PVDQ_ABC_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 11, - "Name": "PVDQ_DEF_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 13, - "Name": "PVDQ_DEF_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 2, - "Name": "PVNN_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.081 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.049 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.807 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.783 - } - ], - "Type": "ADC" - }, - { - "BindConnector": "System Fan connector 1", - "Index": 0, - "Name": "Fan 1a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 1", - "Index": 1, - "Name": "Fan 1b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 2", - "Index": 2, - "Name": "Fan 2a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 2", - "Index": 3, - "Name": "Fan 2b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 3", - "Index": 4, - "Name": "Fan 3a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 3", - "Index": 5, - "Name": "Fan 3b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 4", - "Index": 6, - "Name": "Fan 4a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 4", - "Index": 7, - "Name": "Fan 4b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 5", - "Index": 8, - "Name": "Fan 5a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 5", - "Index": 9, - "Name": "Fan 5b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 6", - "Index": 10, - "Name": "Fan 6a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 6", - "Index": 11, - "Name": "Fan 6b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 7", - "Index": 12, - "Name": "Fan 7a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 7", - "Index": 13, - "Name": "Fan 7b", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 8", - "Index": 14, - "Name": "Fan 8a", - "Type": "AspeedFan" - }, - { - "BindConnector": "System Fan connector 8", - "Index": 15, - "Name": "Fan 8b", - "Type": "AspeedFan" - }, - { - "C1": 92.16, - "C2": 107.52, - "MaxCFM": 17.5, - "Name": "System Airflow", - "TachMaxPercent": 100, - "TachMinPercent": 20, - "Tachs": [ - "Fan 1a", - "Fan 1b", - "Fan 2a", - "Fan 2b", - "Fan 3a", - "Fan 3b", - "Fan 4a", - "Fan 4b", - "Fan 5a", - "Fan 5b", - "Fan 6a", - "Fan 6b", - "Fan 7a", - "Fan 7b", - "Fan 8a", - "Fan 8b" - ], - "Type": "CFMSensor" - }, - { - "AlphaF": 4.352, - "AlphaS": 0.512, - "Name": "Exit Air Temp", - "PowerFactorMax": 1.0, - "PowerFactorMin": 0.4, - "QMax": 88, - "QMin": 15, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 85 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 80 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "ExitAirTempSensor" - }, - { - "AllowedFailures": 1, - "Name": "FanRedundancy", - "Type": "FanRedundancy" - }, - { - "Direction": "Input", - "Index": 40, - "Name": "NMI Input", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 49, - "Name": "CPU CATERR", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 214, - "Name": "SMI Input", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 215, - "Name": "Post Complete", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 217, - "Name": "Nmi Button", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 218, - "Name": "ID Button", - "Polarity": "Low", - "Type": "Gpio" - }, - { - "Direction": "Input", - "Index": 219, - "Name": "Power Good", - "Polarity": "High", - "Type": "Gpio" - }, - { - "Name": "System Fan connector 1", - "Pwm": 0, - "Tachs": [ - 0, - 1 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 2", - "Pwm": 1, - "Tachs": [ - 2, - 3 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 3", - "Pwm": 2, - "Tachs": [ - 4, - 5 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 4", - "Pwm": 3, - "Tachs": [ - 6, - 7 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 5", - "Pwm": 4, - "Tachs": [ - 8, - 9 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 6", - "Pwm": 5, - "Tachs": [ - 10, - 11 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 7", - "Pwm": 6, - "Tachs": [ - 12, - 13 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "System Fan connector 8", - "Pwm": 7, - "Tachs": [ - 14, - 15 - ], - "Type": "IntelFanConnector" - }, - { - "Address": "0x8", - "Class": "METemp", - "Name": "SSB Temp", - "PowerState": "BiosPost", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 103 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 98 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xC4", - "Class": "MpsBridgeTemp", - "Name": "CPU1 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xB4", - "Class": "PxeBridgeTemp", - "Name": "CPU1 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xDC", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem ABCD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xDC", - "Class": "PxeBridgeTemp", - "Name": "CPU1 VR Mem EFGH Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x4A", - "Class": "IRBridgeTemp", - "Name": "CPU1 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xCC", - "Class": "MpsBridgeTemp", - "Name": "CPU2 P12V PVCCIN VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xD4", - "Class": "PxeBridgeTemp", - "Name": "CPU2 P12V PVCCIO VR Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xB0", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem ABCD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0xEC", - "Class": "PxeBridgeTemp", - "Name": "CPU2 VR Mem EFGH Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x4C", - "Class": "IRBridgeTemp", - "Name": "CPU2 VR P1V8", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x71", - "Bus": 2, - "ChannelNames": [ - "M2Slot1", - "M2Slot2" - ], - "Name": "M2 Mux", - "Type": "PCA9543Mux" - }, - { - "Address": "0x72", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "", - "FruChannel" - ], - "Name": "Riser 1 Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x73", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "", - "FruChannel" - ], - "Name": "Riser 2 Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x73", - "Bus": 9, - "ChannelNames": [ - "MemoryChannel1", - "MemoryChannel2", - "MemoryChannel3", - "MemoryChannel4" - ], - "Name": "Memory Mux", - "Type": "PCA9545Mux" - }, - { - "Address": "0x74", - "Bus": 2, - "ChannelNames": [ - "PcieSlot1", - "PcieSlot2", - "PcieSlot3", - "PcieSlot4" - ], - "Name": "PCIE Mux", - "Type": "PCA9546Mux" - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Exit Air Temp" - ], - "Name": "Exit Air Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 1a", - "Fan 1b" - ], - "Name": "Fan 1", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 1" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 2a", - "Fan 2b" - ], - "Name": "Fan 2", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 2" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 3a", - "Fan 3b" - ], - "Name": "Fan 3", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 3" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 4a", - "Fan 4b" - ], - "Name": "Fan 4", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 4" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 5a", - "Fan 5b" - ], - "Name": "Fan 5", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 5" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 6a", - "Fan 6b" - ], - "Name": "Fan 6", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 6" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 7a", - "Fan 7b" - ], - "Name": "Fan 7", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 7" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "fan", - "FFGainCoefficient": 1.0, - "FFOffCoefficient": 0.0, - "ICoefficient": 0.0, - "ILimitMax": 0.0, - "ILimitMin": 0.0, - "Inputs": [ - "Fan 8a", - "Fan 8b" - ], - "Name": "Fan 8", - "NegativeHysteresis": 0.0, - "OutLimitMax": 100.0, - "OutLimitMin": 30.0, - "Outputs": [ - "Pwm 8" - ], - "PCoefficient": 0.0, - "PositiveHysteresis": 0.0, - "SlewNeg": 0.0, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "BMC Temp" - ], - "Name": "BMC Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU1" - ], - "Name": "CPU1 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU1" - ], - "Name": "CPU1 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU2" - ], - "Name": "CPU2 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU2" - ], - "Name": "CPU2 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU1" - ], - "Name": "DTS CPU1", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU2" - ], - "Name": "DTS CPU2", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Left Rear Temp" - ], - "Name": "Left Rear Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Right Rear Board" - ], - "Name": "Right Rear Board", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "SSB Temp" - ], - "Name": "SSB Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 1 Temp" - ], - "Name": "VR 1 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Left" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 2 Temp" - ], - "Name": "VR 2 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 60.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Right", - "PSU" - ] - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "Left", - "Type": "Pid.Zone" - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "Right", - "Type": "Pid.Zone" - }, - { - "FailSafePercent": 100, - "MinThermalOutput": 30, - "Name": "PSU", - "Type": "Pid.Zone" - }, - { - "Class": "Ceiling", - "Inputs": [ - "Front Panel Temp" - ], - "Name": "Front Panel UCC", - "NegativeHysteresis": 2, - "Output": [ - 70.0, - 80.0 - ], - "PositiveHysteresis": 0, - "Profiles": [ - "Acoustic" - ], - "Reading": [ - 22.0, - 32.0 - ], - "Type": "Stepwise", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Class": "Floor", - "Inputs": [ - "Front Panel Temp" - ], - "Name": "Front Panel LCC", - "NegativeHysteresis": 2, - "Output": [ - 50.0, - 60.0 - ], - "PositiveHysteresis": 0, - "Reading": [ - 20.0, - 30.0 - ], - "Type": "Stepwise", - "Zones": [ - "Left", - "Right" - ] - }, - { - "Address": "0x4A", - "Bus": 6, - "Name": "BMC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4B", - "Bus": 6, - "Name": "Right Rear Board Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x49", - "Bus": 6, - "Name": "Left Rear Board Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x48", - "Bus": 6, - "Name": "PCH M.2 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4f", - "Bus": 6, - "Name": "Inlet BRD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4D", - "Bus": "0x1", - "Name": "Front Panel Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 55 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 50 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x30", - "Bus": 0, - "CpuID": 1, - "Name": "Xeon CPU 1", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" - } - ], - "Type": "XeonCPU" - }, - { - "Address": "0x31", - "Bus": 0, - "CpuID": 2, - "Name": "Xeon CPU 2", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 99, - "label": "DIMM" - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 89, - "label": "DIMM" - } - ], - "Type": "XeonCPU" - } - ], - "Name": "WP Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})", - "ProductId": 154, - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$PRODUCT_MANUFACTURER", - "Model": "$PRODUCT_PRODUCT_NAME", - "PartNumber": "$PRODUCT_PART_NUMBER", - "SerialNumber": "$PRODUCT_SERIAL_NUMBER" - } -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend deleted file mode 100644 index b8b38ecff..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager_%.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " file://WC-Baseboard.json \ - file://WP-Baseboard.json \ - file://TNP-baseboard.json \ - file://FCXXPDBASSMBL_PDB.json \ - file://OPB2RH-Chassis.json \ - file://CYP-baseboard.json \ - file://MIDPLANE-2U2X12SWITCH.json" - -RDEPENDS_${PN} += " default-fru" - -do_install_append(){ - install -d ${D}/usr/share/entity-manager/configurations - install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index 1d332e2a2..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,3 +0,0 @@ -baud = 921600 -local-tty = ttyS3 -local-tty-baud = 921600 diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service deleted file mode 100644 index 7fb8f79d3..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/obmc-console@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Phosphor Console Muxer listening on device /dev/%I -BindsTo=dev-%i.device -After=dev-%i.device - -[Service] -ExecStartPre=/usr/bin/sol-option-check.sh -ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' -ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i -ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' -SyslogIdentifier=obmc-console-server -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh deleted file mode 100755 index ef32fcb9a..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console/sol-option-check.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Copyright 2017 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -if [ $(grep 192000000 /sys/class/tty/ttyS0/uartclk | wc -l) != 0 ]; then - echo "hs-uart" - sed -i -e 's/115200/921600/g' /etc/obmc-console.conf -else - echo "normal uart" - sed -i -e 's/921600/115200/g' /etc/obmc-console.conf -fi diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend deleted file mode 100644 index c2aad5e50..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/console/obmc-console_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend_wolfpass := "${THISDIR}/${PN}:" -OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI += "file://sol-option-check.sh" - -do_install_append() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/sol-option-check.sh ${D}${bindir} -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb deleted file mode 100644 index 9c10c5b3d..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Set Wolfpass fan default speeds" -DESCRIPTION = "Sets all fans to a single speed" - -inherit allarch -inherit obmc-phosphor-systemd - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -RDEPENDS_${PN} += "python" - -S = "${WORKDIR}" -SRC_URI += "file://set_fan_speeds.py" - -SYSTEMD_SERVICE_${PN} += "fan-default-speed.service" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/set_fan_speeds.py ${D}/${bindir}/set_fan_speeds.py -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service deleted file mode 100644 index 267fdee43..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/fan-default-speed.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Set fans to a default speed -ConditionFileNotEmpty={bindir}/set_fan_speeds.py - -[Service] -ExecStart={bindir}/set_fan_speeds.py 150 -Type=oneshot - -[Install] -WantedBy=default.target diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py deleted file mode 100644 index 70ba64799..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fans/fan-default-speed/set_fan_speeds.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python -import os -import glob -import time -import sys - -HWMON_DIR = "/sys/class/hwmon/hwmon0" - -count = 0 -inputs = None -while not inputs: - count += 1 - if count > 20: - print("pwm missing!") - sys.exit(0) - - inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*")) - time.sleep(5) - -inputs = glob.glob(os.path.join(HWMON_DIR, "pwm*")) -for pwm in inputs: - with open(pwm, 'w') as f: - f.write(sys.argv[1]) diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb deleted file mode 100644 index af0505d1f..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Default Fru" -DESCRIPTION = "Installs a default fru file to image" - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "SetBaseboardFru.service" - -S = "${WORKDIR}" -SRC_URI = "file://checkFru.sh \ - file://SetBaseboardFru.service \ - file://*.fru.bin" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" - -RDEPENDS_${PN} = "bash" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/checkFru.sh ${D}/${bindir}/checkFru.sh - - install -d ${D}${sysconfdir}/fru - cp ${S}/*.fru.bin ${D}/${sysconfdir}/fru - - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${S}/SetBaseboardFru.service ${D}${base_libdir}/systemd/system -} diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE deleted file mode 100644 index dd0408376..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/LICENCE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2018 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin deleted file mode 100644 index ba5b96392..000000000 Binary files a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600CYP.fru.bin and /dev/null differ diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin deleted file mode 100644 index afd58e6b9..000000000 Binary files a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin and /dev/null differ diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin deleted file mode 100644 index 76c4b8d4b..000000000 Binary files a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WC.fru.bin and /dev/null differ diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin deleted file mode 100644 index 1b9f97ff4..000000000 Binary files a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WFT.fru.bin and /dev/null differ diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin deleted file mode 100644 index fb219c0ce..000000000 Binary files a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600WP.fru.bin and /dev/null differ diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service deleted file mode 100644 index dec53725e..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/SetBaseboardFru.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Reads GPIO and Loads the FRU - -[Service] -ExecStart=/usr/bin/checkFru.sh -Type=oneshot - -[Install] -WantedBy=basic.target diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh deleted file mode 100755 index 1eb79b299..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/checkFru.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# this script checks the gpio id and loads the correct baseboard fru -fruFile="/etc/fru/baseboard.fru.bin" -idGpio=( 8 9 10 11 12 53) -result=0 -idx=0 - -if [ -f $fruFile ]; then - exit 0 -fi - -cd /etc/fru -for gpio in "${idGpio[@]}" -do - echo $gpio > /sys/class/gpio/export - typeset -i value=$(cat /sys/class/gpio/gpio$gpio/value) - value=$((value << idx)) - result=$((result | value)) - idx=$((idx+1)) -done - -# wp -if (($result == 62)); then - cat S2600WP.fru.bin > $fruFile -# wc -elif (($result == 45)); then - cat S2600WC.fru.bin > $fruFile -# cyp -elif (($result == 60)); then - cat S2600CYP.fru.bin > $fruFile -# tnp -elif (($result == 12)); then - cat S2600TNP.fru.bin > $fruFile -# default to wft -else - cat S2600WFT.fru.bin > $fruFile -fi diff --git a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb b/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb deleted file mode 100644 index ead62f47e..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes-phosphor/workbook/wolfpass-config.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Wolfpass board wiring" -DESCRIPTION = "Board wiring information for the Wolfpass system." -PR = "r1" - -inherit config-in-skeleton - -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -SRCREV = "946064239016e38cd1cc346047b1d26960c06cdb" -SKELETON_URI = "git://git-amr-1.devtools.intel.com:29418/openbmc-skeleton.git;protocol=ssh;branch=intel" diff --git a/meta-openbmc-mods/meta-wolfpass/recipes.txt b/meta-openbmc-mods/meta-wolfpass/recipes.txt deleted file mode 100644 index 3ec3f4a42..000000000 --- a/meta-openbmc-mods/meta-wolfpass/recipes.txt +++ /dev/null @@ -1,2 +0,0 @@ -recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies -recipes-phosphor - Phosphor OpenBMC applications and configuration -- cgit v1.2.3