From 5170cc88253567d9a82a2fd7d424764b71b558fb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 22 Sep 2021 16:39:33 -0500 Subject: witherspoon-tacoma: disable host watchdog function Hostboot utilizes inband IPMI on witherspoon-tacoma. They relied on OPAL firmware to continue pinging the watchdog and eventually disabling it. For the most part though, IBM utilizes PHYP on witherspoon-tacoma machines and they do not have the needed in-band IPMI support to do this. IBM needs either both firmware stacks (hostboot and PHYP) to use PLDM (i.e. p10bmc) or IPMI (witherspoon). Tacoma is an outlier so just disable the host watchdog function on Tacoma. Tested: - Verified a witherspoon-tacoma with PHYP booted successfully Signed-off-by: Andrew Geissler Change-Id: Ibceb2ad6933973b97e122b83c89f6be7e7b8f868 --- meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor/ipmi') diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 38fbd717c..45678d981 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,9 @@ DEPENDS:append:ibm-ac-server = " acx22-yaml-config" DEPENDS:append:mihawk = " acx22-yaml-config" +# host watchdog does not work with witherspoon-tacoma host firmware +RDEPENDS:${PN}:remove:witherspoon-tacoma = "virtual/obmc-watchdog" + EXTRA_OECONF:ibm-ac-server = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ @@ -10,4 +13,4 @@ EXTRA_OECONF:mihawk = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ - " \ No newline at end of file + " -- cgit v1.2.3 From 1cc1a21533c7e430ee629c27abafe5e6d10a4b25 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 08:50:15 +0000 Subject: wistron-ipmi-oem: srcrev bump ba89a1ea57..572a22ad0a Manojkiran Eda (1): Add OWNERS file Change-Id: Iadf9a75728ff8321a6745d843abe649adbb6cf19 Signed-off-by: Andrew Geissler --- meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor/ipmi') diff --git a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb index e72755d0c..91dbfe031 100644 --- a/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb +++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" -SRCREV = "ba89a1ea570cb010c2e929ac11ada3714878ca7d" +SRCREV = "572a22ad0a72142db434b5b78ec28182e27a57fd" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From e6eef4f32824ed887cbaddf92268c8b2b49d1de4 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 27 Oct 2021 09:34:15 -0500 Subject: meta-ibm: mihawk: fix invalid JSON `eslint` reported an issue with the supplied JSON and it appeared to be missing a simple comma to separate two values in an array. Signed-off-by: Patrick Williams Change-Id: I2dd167143ea31c730c26254b3ddc2ad25109e34f --- .../recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm/recipes-phosphor/ipmi') diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json index cd72656e2..ed4cb0b28 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json @@ -3,7 +3,7 @@ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255} ], "baseboard": [ - {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253} + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253}, {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254} ], "cpu": [ -- cgit v1.2.3