#include <linux/kobject.h>
 #include <linux/delay.h>
 #include <linux/memblock.h>
+#include <linux/kthread.h>
+#include <linux/freezer.h>
 
 #include <asm/machdep.h>
 #include <asm/opal.h>
 static DEFINE_SPINLOCK(opal_notifier_lock);
 static uint64_t last_notified_mask = 0x0ul;
 static atomic_t opal_notifier_hold = ATOMIC_INIT(0);
+static uint32_t opal_heartbeat;
 
 static void opal_reinit_cores(void)
 {
        }
 }
 
+static int kopald(void *unused)
+{
+       set_freezable();
+       do {
+               try_to_freeze();
+               opal_poll_events(NULL);
+               msleep_interruptible(opal_heartbeat);
+       } while (!kthread_should_stop());
+
+       return 0;
+}
+
+static void opal_init_heartbeat(void)
+{
+       /* Old firwmware, we assume the HVC heartbeat is sufficient */
+       if (of_property_read_u32(opal_node, "ibm,heartbeat-ms",
+                                &opal_heartbeat) != 0)
+               opal_heartbeat = 0;
+
+       if (opal_heartbeat)
+               kthread_run(kopald, NULL, "kopald");
+}
+
 static int __init opal_init(void)
 {
        struct device_node *np, *consoles;
        /* Create i2c platform devices */
        opal_i2c_create_devs();
 
+       /* Setup a heatbeat thread if requested by OPAL */
+       opal_init_heartbeat();
+
        /* Find all OPAL interrupts and request them */
        opal_irq_init(opal_node);
 
                opal_msglog_init();
        }
 
+       /* Initialize OPAL IPMI backend */
        opal_ipmi_init(opal_node);
 
        return 0;