For powermac, we need to do some things between suspending devices and
device_power_off, for example setting the decrementer. This patch allows
architectures to have arch_s2ram_{en,dis}able_irqs functions to control
this step.
This patch also replaces local_irq_save/restore with
local_irq_disable/enable since the code must be called with interrupts
enabled.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
This version uses weak symbols instead of macros.
kernel/power/main.c | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
--- wireless-dev.orig/kernel/power/main.c 2007-04-20 23:35:20.911107385 +0200
+++ wireless-dev/kernel/power/main.c 2007-04-20 23:35:21.511107385 +0200
@@ -128,13 +128,34 @@ static int suspend_prepare(suspend_state
return error;
}
+/**
+ * arch_s2ram_disable_irqs - disable IRQs for suspend
+ *
+ * Disables IRQs (in the default case) and allows architectures
+ * to override it if more needs to be done.
+ */
+void __attribute__ ((weak)) arch_s2ram_disable_irqs(void)
+{
+ local_irq_disable();
+}
+
+/**
+ * arch_s2ram_enable_irqs - enable IRQs after suspend
+ *
+ * Enables IRQs (in the default case) and allows architectures
+ * to override it if more needs to be done.
+ */
+void __attribute__ ((weak)) arch_s2ram_enable_irqs(void)
+{
+ local_irq_enable();
+}
int suspend_enter(suspend_state_t state)
{
int error = 0;
- unsigned long flags;
- local_irq_save(flags);
+ arch_s2ram_disable_irqs();
+ BUG_ON(!irqs_disabled());
if ((error = device_power_down(PMSG_SUSPEND))) {
printk(KERN_ERR "Some devices failed to power down\n");
@@ -143,7 +164,8 @@ int suspend_enter(suspend_state_t state)
error = pm_ops->enter(state);
device_power_up();
Done:
- local_irq_restore(flags);
+ arch_s2ram_enable_irqs();
+ BUG_ON(irqs_disabled());
return error;
}
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
