Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ef7f0da authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: hibernation support 



Add Suspend-to-disk / swsusp / CONFIG_HIBERNATION support
to the SuperH architecture.

To suspend, use "swapon /dev/sda2; echo disk > /sys/power/state"
To resume, pass "resume=/dev/sda2" on the kernel command line.

The patch "pm: rework includes, remove arch ifdefs V2" is
needed to allow the generic swsusp code to build properly.

Hibernation is not enabled with this patch though, a patch
setting ARCH_HIBERNATION_POSSIBLE will be submitted later.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent edab56f4

arch/sh/include/asm/sections.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <asm-generic/sections.h>



extern void __nosave_begin, __nosave_end;

extern long __machvec_start, __machvec_end;

extern char __uncached_start, __uncached_end;

extern char _ebss[];

arch/sh/include/asm/suspend.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef _ASM_SH_SUSPEND_H

#define _ASM_SH_SUSPEND_H



static inline int arch_prepare_suspend(void) { return 0; }



#include <asm/ptrace.h>



struct swsusp_arch_regs {

	struct pt_regs user_regs;

	unsigned long bank1_regs[8];

};



#endif /* _ASM_SH_SUSPEND_H */

arch/sh/kernel/Makefile_32

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ obj-$(CONFIG_KPROBES) += kprobes.o 
obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_DUMP_CODE)		+= disassemble.o

obj-$(CONFIG_HIBERNATION)	+= swsusp.o



EXTRA_CFLAGS += -Werror

arch/sh/kernel/asm-offsets.c

+8 −0
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ 
#include <linux/types.h>

#include <linux/mm.h>

#include <linux/kbuild.h>

#include <linux/suspend.h>



#include <asm/thread_info.h>

#include <asm/suspend.h>



int main(void)

{
@@ -25,5 +27,11 @@ int main(void) 
	DEFINE(TI_PRE_COUNT,	offsetof(struct thread_info, preempt_count));

	DEFINE(TI_RESTART_BLOCK,offsetof(struct thread_info, restart_block));



#ifdef CONFIG_HIBERNATION

	DEFINE(PBE_ADDRESS, offsetof(struct pbe, address));

	DEFINE(PBE_ORIG_ADDRESS, offsetof(struct pbe, orig_address));

	DEFINE(PBE_NEXT, offsetof(struct pbe, next));

	DEFINE(SWSUSP_ARCH_REGS_SIZE, sizeof(struct swsusp_arch_regs));

#endif

	return 0;

}

arch/sh/kernel/cpu/sh3/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


obj-y	:= ex.o probe.o entry.o setup-sh3.o



obj-$(CONFIG_HIBERNATION)		+= swsusp.o



# CPU subtype setup

obj-$(CONFIG_CPU_SUBTYPE_SH7705)	+= setup-sh7705.o

obj-$(CONFIG_CPU_SUBTYPE_SH7706)	+= setup-sh770x.o