diff options
| author | Michael Tritz <mtritz@us.ibm.com> | 2017-02-21 10:42:07 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-02-21 17:46:19 +0000 |
| commit | 56dbf72c44c080fd2b54ee8de9cc877975bc1011 (patch) | |
| tree | ba8b25167fa854a0adaaddc114abada19181e4d1 | |
| parent | 9bcfdbb366f58aec8b91786e723fa941268522bc (diff) | |
| download | talos-openbmc-56dbf72c44c080fd2b54ee8de9cc877975bc1011.tar.gz talos-openbmc-56dbf72c44c080fd2b54ee8de9cc877975bc1011.zip | |
skeleton-rev.bbclass bump & disable watchdog patch
Change-Id: I57d8b7371c33f3fac7e286d14deafcaf91020b26
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
| -rw-r--r-- | meta-phosphor/classes/skeleton-rev.bbclass | 2 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/chassis/files/skeleton-0001-Temporarily-disable-watchdog-support.patch | 42 |
2 files changed, 21 insertions, 23 deletions
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index 45129a893..90df14506 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,2 +1,2 @@ -SRCREV ?= "7812b6d7ca6b885d1ff2b7d156e1021d0e14e0f1" +SRCREV ?= "6d2f6c3dddd43c15972df379a0785d2ea2403fdc" SKELETON_URI ?= "git://github.com/openbmc/skeleton" 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 d75f8c7eb..d13348ef9 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) |
