diff options
author | Michael Tritz <mtritz@us.ibm.com> | 2017-02-21 19:42:07 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-21 20:46:19 +0300 |
commit | 56dbf72c44c080fd2b54ee8de9cc877975bc1011 (patch) | |
tree | ba8b25167fa854a0adaaddc114abada19181e4d1 /meta-phosphor/common/recipes-phosphor/chassis | |
parent | 9bcfdbb366f58aec8b91786e723fa941268522bc (diff) | |
download | openbmc-56dbf72c44c080fd2b54ee8de9cc877975bc1011.tar.xz |
skeleton-rev.bbclass bump & disable watchdog patch
Change-Id: I57d8b7371c33f3fac7e286d14deafcaf91020b26
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/chassis')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch | 42 |
1 files changed, 20 insertions, 22 deletions
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 index d75f8c7ebc..d13348ef9e 100644 --- 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 @@ -1,33 +1,31 @@ -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 +From a850cab934be49a08d467403a03ed1d6d76794f2 Mon Sep 17 00:00:00 2001 +From: Michael Tritz <mtritz@us.ibm.com> +Date: Tue, 21 Feb 2017 10:22:59 -0600 +Subject: [PATCH] Disable watchdog - communication issues with host -Hostboot does not support IPMI on P9 systems yet, so they do -not send the watchdog updates. Disable the watchdog until -they support. +This patch will temporarily disable watchdog +errors from doing anything meaningful until +Hostboot supports IPMI. -Change-Id: I03e5dca06f1eecfb24b35161f81190c23bf39b7f -Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +Change-Id: I6afdc3b4c7bb2733f1e4469f5e45b2ea956d42c6 +Signed-off-by: Michael Tritz <mtritz@us.ibm.com> --- - chassis_control.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) + chassis_control.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chassis_control.py b/chassis_control.py -index 3637d82..f475ecd 100644 +index faf7d1d..2ec9bd2 100644 --- a/chassis_control.py +++ b/chassis_control.py -@@ -199,9 +199,7 @@ class ChassisControlObject(DbusProperties, DbusObjectManager): +@@ -207,8 +207,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." - +- print "Watchdog Error, Going to quiesce" +- self.quiesce() ++ print "Watchdog Error, ignoring due to Hostboot not supporting IPMI" + def emergency_shutdown_signal_handler(self, message): print "Emergency Shutdown!" --- -2.10.2 - +-- +2.10.1 (Apple Git-78) |