* [PATCH skeleton v3 0/2] Disable watchdog timer if debug_mode is set
@ 2016-06-30 17:51 OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 1/2] Reformat pychassisctl/chassis_control.py with pep8 standards OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
0 siblings, 2 replies; 4+ messages in thread
From: OpenBMC Patches @ 2016-06-30 17:51 UTC (permalink / raw)
To: openbmc
https://github.com/openbmc/openbmc/issues/246
debug_mode is used when the host is not going to be started.
In this case, we do not want the watchdog timer to be started
because there is no one to keep it from resetting.
This code change prevents the watchdog from being started
during poweron.
Potential side affects could be if we do start the host
in this code path. The watchdog is un-tested when it's
not started but software comes in and tries to reset it.
The code in control_host_obj.c currently enforces the
no-host-power-on when debug_mode is set.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/openbmc/skeleton/120)
<!-- Reviewable:end -->
https://github.com/openbmc/skeleton/pull/120
Andrew Geissler (2):
Reformat pychassisctl/chassis_control.py with pep8 standards
Disable watchdog timer if debug_mode is set
pychassisctl/chassis_control.py | 408 +++++++++++++++++++++-------------------
1 file changed, 216 insertions(+), 192 deletions(-)
mode change 100644 => 100755 pychassisctl/chassis_control.py
--
2.9.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH skeleton v3 1/2] Reformat pychassisctl/chassis_control.py with pep8 standards
2016-06-30 17:51 [PATCH skeleton v3 0/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
@ 2016-06-30 17:51 ` OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
1 sibling, 0 replies; 4+ messages in thread
From: OpenBMC Patches @ 2016-06-30 17:51 UTC (permalink / raw)
To: openbmc; +Cc: Andrew Geissler
From: Andrew Geissler <andrewg@us.ibm.com>
This commit is formatting only, no functional changes.
---
pychassisctl/chassis_control.py | 392 ++++++++++++++++++++--------------------
1 file changed, 200 insertions(+), 192 deletions(-)
diff --git a/pychassisctl/chassis_control.py b/pychassisctl/chassis_control.py
index 376e0e9..8d34e2e 100644
--- a/pychassisctl/chassis_control.py
+++ b/pychassisctl/chassis_control.py
@@ -19,197 +19,205 @@ POWER_ON = 1
BOOTED = 100
-class ChassisControlObject(DbusProperties,DbusObjectManager):
- def getUuid(self):
- uuid = "";
- try:
- with open(MACHINE_ID) as f:
- data = f.readline().rstrip('\n')
- if (len(data) == 32):
- uuid = data
- else:
- print "ERROR: UUID is not formatted correctly: "+data
- except:
- print "ERROR: Unable to open uuid file: "+MACHINE_ID
-
- return uuid
-
- def __init__(self,bus,name):
- self.dbus_objects = { }
- DbusProperties.__init__(self)
- DbusObjectManager.__init__(self)
- dbus.service.Object.__init__(self,bus,name)
- ## load utilized objects
- self.dbus_objects = {
- 'power_control' : {
- 'bus_name' : 'org.openbmc.control.Power',
- 'object_name' : '/org/openbmc/control/power0',
- 'interface_name' : 'org.openbmc.control.Power'
- },
- 'identify_led' : {
- 'bus_name' : 'org.openbmc.control.led',
- 'object_name' : '/org/openbmc/control/led/identify',
- 'interface_name' : 'org.openbmc.Led'
- },
- 'watchdog' : {
- 'bus_name' : 'org.openbmc.watchdog.Host',
- 'object_name' : '/org/openbmc/watchdog/host0',
- 'interface_name' : 'org.openbmc.Watchdog'
- },
- 'host_services' : {
- 'bus_name' : 'org.openbmc.HostServices',
- 'object_name' : '/org/openbmc/HostServices',
- 'interface_name' : 'org.openbmc.HostServices'
- },
- 'settings' : {
- 'bus_name' : 'org.openbmc.settings.Host',
- 'object_name' : '/org/openbmc/settings/host0',
- 'interface_name' : 'org.freedesktop.DBus.Properties'
- },
- }
-
- #uuid
- self.Set(DBUS_NAME,"uuid",self.getUuid())
- self.Set(DBUS_NAME,"reboot",0)
-
- bus.add_signal_receiver(self.power_button_signal_handler,
- dbus_interface = "org.openbmc.Button", signal_name = "Released",
- path="/org/openbmc/buttons/power0" )
- bus.add_signal_receiver(self.reset_button_signal_handler,
- dbus_interface = "org.openbmc.Button", signal_name = "PressedLong",
- path="/org/openbmc/buttons/power0" )
- bus.add_signal_receiver(self.softreset_button_signal_handler,
- dbus_interface = "org.openbmc.Button", signal_name = "Released",
- path="/org/openbmc/buttons/reset0" )
-
- bus.add_signal_receiver(self.host_watchdog_signal_handler,
- dbus_interface = "org.openbmc.Watchdog", signal_name = "WatchdogError")
-
- bus.add_signal_receiver(self.emergency_shutdown_signal_handler,
- dbus_interface = "org.openbmc.SensorThresholds", signal_name = "Emergency")
-
- bus.add_signal_receiver(self.SystemStateHandler,signal_name = "GotoSystemState")
- self.InterfacesAdded(name,self.properties)
-
-
- def getInterface(self,name):
- o = self.dbus_objects[name]
- obj = bus.get_object(o['bus_name'],o['object_name'],introspect=False)
- return dbus.Interface(obj,o['interface_name'])
-
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def setIdentify(self):
- print "Turn on identify"
- intf = self.getInterface('identify_led')
- intf.setOn()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def clearIdentify(self):
- print "Turn on identify"
- intf = self.getInterface('identify_led')
- intf.setOff()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def powerOn(self):
- print "Turn on power and boot"
- self.Set(DBUS_NAME,"reboot",0)
- if (self.getPowerState()==0):
- intf = self.getInterface('power_control')
- intf.setPowerState(POWER_ON)
- intfwatchdog = self.getInterface('watchdog')
- #Start watchdog with 30s timeout per the OpenPower Host IPMI Spec
- #Once the host starts booting, it'll reset and refresh the timer
- intfwatchdog.set(30000)
- intfwatchdog.start()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def powerOff(self):
- print "Turn off power"
- intfwatchdog = self.getInterface('watchdog')
- intfwatchdog.stop()
- intf = self.getInterface('power_control')
- intf.setPowerState(POWER_OFF)
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def softPowerOff(self):
- print "Soft off power"
- intf = self.getInterface('host_services')
- ## host services will call power off when ready
- intf.SoftPowerOff()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def reboot(self):
- print "Rebooting"
- if self.getPowerState() == POWER_OFF:
- self.powerOn();
- else:
- self.Set(DBUS_NAME,"reboot",1)
- self.powerOff()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='')
- def softReboot(self):
- print "Soft Rebooting"
- if self.getPowerState() == POWER_OFF:
- self.powerOn();
- else:
- self.Set(DBUS_NAME,"reboot",1)
- self.softPowerOff()
- return None
-
- @dbus.service.method(DBUS_NAME,
- in_signature='', out_signature='i')
- def getPowerState(self):
- intf = self.getInterface('power_control')
- return intf.getPowerState()
-
- ## Signal handler
-
- def SystemStateHandler(self,state_name):
- if (state_name == "HOST_POWERED_OFF" or state_name == "HOST_POWERED_ON"):
- intf = self.getInterface('settings')
- intf.Set("org.openbmc.settings.Host","system_state",state_name)
-
- if (state_name == "HOST_POWERED_OFF" and self.Get(DBUS_NAME,"reboot")==1):
- self.powerOn()
-
- def power_button_signal_handler(self):
- # toggle power
- state = self.getPowerState()
- if state == POWER_OFF:
- self.powerOn()
- elif state == POWER_ON:
- self.powerOff();
-
- def reset_button_signal_handler(self):
- self.reboot();
-
- def softreset_button_signal_handler(self):
- self.softReboot();
-
- def host_watchdog_signal_handler(self):
- print "Watchdog Error, Hard Rebooting"
- self.Set(DBUS_NAME,"reboot",1)
- self.powerOff()
-
- def emergency_shutdown_signal_handler(self):
- print "Emergency Shutdown!"
- self.powerOff()
-
-
+
+class ChassisControlObject(DbusProperties, DbusObjectManager):
+ def getUuid(self):
+ uuid = "";
+ try:
+ with open(MACHINE_ID) as f:
+ data = f.readline().rstrip('\n')
+ if (len(data) == 32):
+ uuid = data
+ else:
+ print "ERROR: UUID is not formatted correctly: " + data
+ except:
+ print "ERROR: Unable to open uuid file: " + MACHINE_ID
+
+ return uuid
+
+ def __init__(self, bus, name):
+ self.dbus_objects = {}
+ DbusProperties.__init__(self)
+ DbusObjectManager.__init__(self)
+ dbus.service.Object.__init__(self, bus, name)
+ ## load utilized objects
+ self.dbus_objects = {
+ 'power_control': {
+ 'bus_name': 'org.openbmc.control.Power',
+ 'object_name': '/org/openbmc/control/power0',
+ 'interface_name': 'org.openbmc.control.Power'
+ },
+ 'identify_led': {
+ 'bus_name': 'org.openbmc.control.led',
+ 'object_name': '/org/openbmc/control/led/identify',
+ 'interface_name': 'org.openbmc.Led'
+ },
+ 'watchdog': {
+ 'bus_name': 'org.openbmc.watchdog.Host',
+ 'object_name': '/org/openbmc/watchdog/host0',
+ 'interface_name': 'org.openbmc.Watchdog'
+ },
+ 'host_services': {
+ 'bus_name': 'org.openbmc.HostServices',
+ 'object_name': '/org/openbmc/HostServices',
+ 'interface_name': 'org.openbmc.HostServices'
+ },
+ 'settings': {
+ 'bus_name': 'org.openbmc.settings.Host',
+ 'object_name': '/org/openbmc/settings/host0',
+ 'interface_name': 'org.freedesktop.DBus.Properties'
+ },
+ }
+
+ # uuid
+ self.Set(DBUS_NAME, "uuid", self.getUuid())
+ self.Set(DBUS_NAME, "reboot", 0)
+
+ bus.add_signal_receiver(self.power_button_signal_handler,
+ dbus_interface="org.openbmc.Button",
+ signal_name="Released",
+ path="/org/openbmc/buttons/power0")
+ bus.add_signal_receiver(self.reset_button_signal_handler,
+ dbus_interface="org.openbmc.Button",
+ signal_name="PressedLong",
+ path="/org/openbmc/buttons/power0")
+ bus.add_signal_receiver(self.softreset_button_signal_handler,
+ dbus_interface="org.openbmc.Button",
+ signal_name="Released",
+ path="/org/openbmc/buttons/reset0")
+
+ bus.add_signal_receiver(self.host_watchdog_signal_handler,
+ dbus_interface="org.openbmc.Watchdog",
+ signal_name="WatchdogError")
+
+ bus.add_signal_receiver(self.emergency_shutdown_signal_handler,
+ dbus_interface="org.openbmc.SensorThresholds",
+ signal_name="Emergency")
+
+ bus.add_signal_receiver(self.SystemStateHandler,
+ signal_name="GotoSystemState")
+ self.InterfacesAdded(name, self.properties)
+
+
+ def getInterface(self, name):
+ o = self.dbus_objects[name]
+ obj = bus.get_object(o['bus_name'], o['object_name'], introspect=False)
+ return dbus.Interface(obj, o['interface_name'])
+
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def setIdentify(self):
+ print "Turn on identify"
+ intf = self.getInterface('identify_led')
+ intf.setOn()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def clearIdentify(self):
+ print "Turn on identify"
+ intf = self.getInterface('identify_led')
+ intf.setOff()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def powerOn(self):
+ print "Turn on power and boot"
+ self.Set(DBUS_NAME, "reboot", 0)
+ if (self.getPowerState() == 0):
+ intf = self.getInterface('power_control')
+ intf.setPowerState(POWER_ON)
+ intfwatchdog = self.getInterface('watchdog')
+ # Start watchdog with 30s timeout per the OpenPower Host IPMI Spec
+ #Once the host starts booting, it'll reset and refresh the timer
+ intfwatchdog.set(30000)
+ intfwatchdog.start()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def powerOff(self):
+ print "Turn off power"
+ intfwatchdog = self.getInterface('watchdog')
+ intfwatchdog.stop()
+ intf = self.getInterface('power_control')
+ intf.setPowerState(POWER_OFF)
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def softPowerOff(self):
+ print "Soft off power"
+ intf = self.getInterface('host_services')
+ ## host services will call power off when ready
+ intf.SoftPowerOff()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def reboot(self):
+ print "Rebooting"
+ if self.getPowerState() == POWER_OFF:
+ self.powerOn();
+ else:
+ self.Set(DBUS_NAME, "reboot", 1)
+ self.powerOff()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='')
+ def softReboot(self):
+ print "Soft Rebooting"
+ if self.getPowerState() == POWER_OFF:
+ self.powerOn();
+ else:
+ self.Set(DBUS_NAME, "reboot", 1)
+ self.softPowerOff()
+ return None
+
+ @dbus.service.method(DBUS_NAME,
+ in_signature='', out_signature='i')
+ def getPowerState(self):
+ intf = self.getInterface('power_control')
+ return intf.getPowerState()
+
+ ## Signal handler
+
+ def SystemStateHandler(self, state_name):
+ if (
+ state_name == "HOST_POWERED_OFF" or state_name == "HOST_POWERED_ON"):
+ intf = self.getInterface('settings')
+ intf.Set("org.openbmc.settings.Host", "system_state", state_name)
+
+ if (state_name == "HOST_POWERED_OFF" and self.Get(DBUS_NAME,
+ "reboot") == 1):
+ self.powerOn()
+
+ def power_button_signal_handler(self):
+ # toggle power
+ state = self.getPowerState()
+ if state == POWER_OFF:
+ self.powerOn()
+ elif state == POWER_ON:
+ self.powerOff();
+
+ def reset_button_signal_handler(self):
+ self.reboot();
+
+ def softreset_button_signal_handler(self):
+ self.softReboot();
+
+ def host_watchdog_signal_handler(self):
+ print "Watchdog Error, Hard Rebooting"
+ self.Set(DBUS_NAME, "reboot", 1)
+ self.powerOff()
+
+ def emergency_shutdown_signal_handler(self):
+ print "Emergency Shutdown!"
+ self.powerOff()
+
if __name__ == '__main__':
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -218,7 +226,7 @@ if __name__ == '__main__':
name = dbus.service.BusName(DBUS_NAME, bus)
obj = ChassisControlObject(bus, OBJ_NAME)
mainloop = gobject.MainLoop()
-
+
print "Running ChassisControlService"
mainloop.run()
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set
2016-06-30 17:51 [PATCH skeleton v3 0/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 1/2] Reformat pychassisctl/chassis_control.py with pep8 standards OpenBMC Patches
@ 2016-06-30 17:51 ` OpenBMC Patches
2016-06-30 21:17 ` Patrick Williams
1 sibling, 1 reply; 4+ messages in thread
From: OpenBMC Patches @ 2016-06-30 17:51 UTC (permalink / raw)
To: openbmc; +Cc: Andrew Geissler
From: Andrew Geissler <andrewg@us.ibm.com>
https://github.com/openbmc/openbmc/issues/246
debug_mode is used when the host is not going to be started.
In this case, we do not want the watchdog timer to be started
because there is no one to keep it from resetting.
This code change prevents the watchdog from being started
during poweron.
Potential side affects could be if we do start the host
in this code path. The watchdog is un-tested when it's
not started but software comes in and tries to reset it.
The code in control_host_obj.c currently enforces the
no-host-power-on when debug_mode is set.
---
pychassisctl/chassis_control.py | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
mode change 100644 => 100755 pychassisctl/chassis_control.py
diff --git a/pychassisctl/chassis_control.py b/pychassisctl/chassis_control.py
old mode 100644
new mode 100755
index 8d34e2e..56a2116
--- a/pychassisctl/chassis_control.py
+++ b/pychassisctl/chassis_control.py
@@ -67,6 +67,11 @@ class ChassisControlObject(DbusProperties, DbusObjectManager):
'object_name': '/org/openbmc/settings/host0',
'interface_name': 'org.freedesktop.DBus.Properties'
},
+ 'host_control': {
+ 'bus_name': 'org.openbmc.control.Host',
+ 'object_name': '/org/openbmc/control/host0',
+ 'interface_name': 'org.openbmc.control.Host'
+ },
}
# uuid
@@ -129,11 +134,22 @@ class ChassisControlObject(DbusProperties, DbusObjectManager):
if (self.getPowerState() == 0):
intf = self.getInterface('power_control')
intf.setPowerState(POWER_ON)
- intfwatchdog = self.getInterface('watchdog')
- # Start watchdog with 30s timeout per the OpenPower Host IPMI Spec
- #Once the host starts booting, it'll reset and refresh the timer
- intfwatchdog.set(30000)
- intfwatchdog.start()
+
+ # Determine if debug_mode is set. If it is then we don't
+ # want to start the watchdog since debug mode
+ intfcontrol = self.getInterface('host_control')
+ intfproperties = dbus.Interface(intfcontrol,
+ "org.freedesktop.DBus.Properties")
+ debug_mode = intfproperties.Get('org.openbmc.control.Host',
+ 'debug_mode')
+ if(not debug_mode):
+ intfwatchdog = self.getInterface('watchdog')
+ # Start watchdog with 30s timeout per the OpenPower Host IPMI Spec
+ #Once the host starts booting, it'll reset and refresh the timer
+ intfwatchdog.set(30000)
+ intfwatchdog.start()
+ else:
+ print "Debug mode is on, no watchdog"
return None
@dbus.service.method(DBUS_NAME,
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set
2016-06-30 17:51 ` [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
@ 2016-06-30 21:17 ` Patrick Williams
0 siblings, 0 replies; 4+ messages in thread
From: Patrick Williams @ 2016-06-30 21:17 UTC (permalink / raw)
To: OpenBMC Patches; +Cc: openbmc, Andrew Geissler
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
On Thu, Jun 30, 2016 at 12:51:12PM -0500, OpenBMC Patches wrote:
> From: Andrew Geissler <andrewg@us.ibm.com>
>
> https://github.com/openbmc/openbmc/issues/246
Should be something like 'Resolves openbmc/openbmc#246'.
See https://help.github.com/articles/closing-issues-via-commit-messages/
--
Patrick Williams
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-30 21:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-30 17:51 [PATCH skeleton v3 0/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 1/2] Reformat pychassisctl/chassis_control.py with pep8 standards OpenBMC Patches
2016-06-30 17:51 ` [PATCH skeleton v3 2/2] Disable watchdog timer if debug_mode is set OpenBMC Patches
2016-06-30 21:17 ` Patrick Williams
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.