diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-01-19 21:53:55 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-19 21:56:50 -0600 |
| commit | 58d51ef5015b7f49e926f2e1cea7a463531e0c27 (patch) | |
| tree | 1832c760e46c7cf637618ae05373dbe74f334124 | |
| parent | 9e206396d08360bf8248e571d07337cd75ad8fe0 (diff) | |
| download | talos-openbmc-58d51ef5015b7f49e926f2e1cea7a463531e0c27.tar.gz talos-openbmc-58d51ef5015b7f49e926f2e1cea7a463531e0c27.zip | |
openpower-p9: disable host watchdog
Hostboot currently does not have IPMI support enabled on P9
systems. Therefore, we need to disable the host watchdog.
Temporary workaround to be removed with openbmc/openbmc#993.
Change-Id: I875a3927af6ec34d2caf4c694b0a89c35a2bff74
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
3 files changed, 35 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend new file mode 100644 index 000000000..d68eeb185 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-control-chassis.bbappend @@ -0,0 +1 @@ +SRC_URI += "file://skeleton-0001-Temporarily-disable-watchdog-support.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend new file mode 100644 index 000000000..d68eeb185 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/obmc-control-chassis.bbappend @@ -0,0 +1 @@ +SRC_URI += "file://skeleton-0001-Temporarily-disable-watchdog-support.patch" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch b/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch new file mode 100644 index 000000000..d75f8c7eb --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch @@ -0,0 +1,33 @@ +From 8f6ee172bf6d0a347696ecfb000eeb686245db90 Mon Sep 17 00:00:00 2001 +From: Patrick Williams <patrick@stwcx.xyz> +Date: Thu, 19 Jan 2017 21:27:51 -0600 +Subject: [PATCH] Temporarily disable watchdog support + +Hostboot does not support IPMI on P9 systems yet, so they do +not send the watchdog updates. Disable the watchdog until +they support. + +Change-Id: I03e5dca06f1eecfb24b35161f81190c23bf39b7f +Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +--- + chassis_control.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/chassis_control.py b/chassis_control.py +index 3637d82..f475ecd 100644 +--- a/chassis_control.py ++++ b/chassis_control.py +@@ -199,9 +199,7 @@ class ChassisControlObject(DbusProperties, DbusObjectManager): + self.softReboot() + + def host_watchdog_signal_handler(self): +- print "Watchdog Error, Hard Rebooting" +- self.Set(DBUS_NAME, "reboot", 1) +- self.powerOff() ++ print "Watchdog Error, ignoring due to Hostboot not supporting IPMI." + + def emergency_shutdown_signal_handler(self, message): + print "Emergency Shutdown!" +-- +2.10.2 + |
