]> err.no Git - linux-2.6/commit
[POWERPC] Fix suspend states again
authorJohannes Berg <johannes@sipsolutions.net>
Mon, 30 Apr 2007 11:37:15 +0000 (21:37 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 May 2007 10:04:30 +0000 (20:04 +1000)
commitbe9c94dd7776467813419f49fabe8017bc2d4c81
treec5ea55aa69f2d1fcfa554f380f554a314b546288
parentf88df14b1f15cdeffa060580a40c1ce3e13bb79e
[POWERPC] Fix suspend states again

In commit 0fba3a1f39f8b0a50b56c8b068fa52131cbc84c2 (a very long time ago,
May 2006), I fixed a bug that caused powermacs to crash when you tried
entering standby/mem suspend states.

As I'm now getting more familiar with the suspend code I notice a few
more things:
 1. we previously misunderstood what pm_ops is for, it isn't supposed to be
    for doing platform dependent suspend/resume stuff that needs to be done
    for suspend to disk (as we currently try to use it!), it is instead for
    entering platform dependent suspend states ("standby", "mem").
 2. due to the first point, we never properly save FPU and altivec states
    when suspending to disk. It probably hasn't hurt yet because the process
    that writes the "disk" to /sys/power/state uses neither and its context
    is used.

This patch addresses these points as follows:
 1. remove all pm_ops from powermac, powermac suspend to ram isn't currently
    usable via /sys/power/state but is done via the PMU instead.
 2. move the code responsible for storing FPU/altivec state into
    save_processor_state and the set_context() call to restore_processor_state.
 3. add a call to kernel_enable_spe()

It may look like there is some code removal missing but that is
actually because the new suspend.h file overrides the ppc/suspend.h
one which was previously used.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/swsusp.c [new file with mode: 0644]
arch/powerpc/platforms/powermac/setup.c
include/asm-powerpc/suspend.h [new file with mode: 0644]