Skip to contentSkip to conversation

loongson: Hibernation Support in mips system

PATCH In review Wu Zhangjin 2 participants 3 messages May 15, 2009 – May 25, 2009

Subsystems (3)
MIPS Suspend to RAM Hibernation
lore
Share & tools
lore

Wu Zhangjin

author
#0 lore raw

PATCH 25/30 loongson: Hibernation Support in mips system

From d4776f4891b9be96d357910f62d9ebaf898a3015 Mon Sep 17 00:00:00 2001
From: Wu Zhangjin <[email protected]>
Date: Sat, 16 May 2009 04:51:26 +0800
Subject: [PATCH 25/30] loongson: Hibernation Support in mips system

---
 arch/mips/Kconfig               |    3 +
 arch/mips/Makefile              |    3 +
 arch/mips/include/asm/suspend.h |    2 +
 arch/mips/kernel/asm-offsets.c  |   13 ++++++
 arch/mips/power/Makefile        |    1 +
 arch/mips/power/cpu.c           |   48 ++++++++++++++++++++++++
 arch/mips/power/hibernate.S     |   78
+++++++++++++++++++++++++++++++++++++++
 include/linux/suspend.h         |    2 +-
 8 files changed, 149 insertions(+), 1 deletions(-)
 create mode 100644 arch/mips/power/Makefile
 create mode 100644 arch/mips/power/cpu.c
 create mode 100644 arch/mips/power/hibernate.S
arch/mips/Kconfig +3 -0
index 68c12de..b14e866 100644
@@ -2130,6 +2130,9 @@ endmenu
 
 menu "Power management options"
 
+config ARCH_HIBERNATION_POSSIBLE
+	def_bool y
+
 config ARCH_SUSPEND_POSSIBLE
 	def_bool y
 	depends on !SMP
arch/mips/Makefile +0 -0
index d73f084..8bde363 100644
@@ -677,6 +677,9 @@ core-y			+= arch/mips/kernel/ arch/mips/mm/

arch/mips/math-emu/

drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/

+# suspend and hibernation support
+drivers-$(CONFIG_PM) += arch/mips/power/
+
ifdef CONFIG_LASAT
rom.bin rom.sw: vmlinux
$(Q)$(MAKE) $(build)=arch/mips/lasat/image $@

(quoted diff) +0 -0

b/arch/mips/include/asm/suspend.h
index 2562f8f..1d44287 100644

arch/mips/include/asm/suspend.h +2 -0
@@ -3,4 +3,6 @@
 
 /* Somewhen...  Maybe :-)  */
 
+static inline int arch_prepare_suspend(void) { return 0; }
+
 #endif /* __ASM_SUSPEND_H */
(quoted diff) +0 -0

b/arch/mips/kernel/asm-offsets.c
index c901c22..94964f5 100644

arch/mips/kernel/asm-offsets.c +13 -0
@@ -14,6 +14,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/kbuild.h>
+#include <linux/suspend.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 

@@ -326,3 +327,15 @@ void output_octeon_cop2_state_defines(void)
 	BLANK();
 }
 #endif
+
+#ifdef CONFIG_HIBERNATION
+void output_pbe_defines(void)
+{
+ 	COMMENT(" Linux struct pbe offsets. ");
+ 	OFFSET(PBE_ADDRESS , pbe, address);
+ 	OFFSET(PBE_ORIG_ADDRESS  , pbe, orig_address);
+ 	OFFSET(PBE_NEXT  , pbe, next);
+ 	DEFINE(PBE_SIZE  , sizeof(struct pbe));
+ 	BLANK();
+}
+#endif
arch/mips/power/Makefile new file +1 -0
new file mode 100644
index 0000000..73d56b8
@@ -0,0 +1 @@
+obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o
arch/mips/power/cpu.c new file +46 -0

46 lines not on this page · raw message

PAGE_SHIFT;
+ return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);
+}

arch/mips/power/hibernate.S new file +78 -0

78 lines not on this page · raw message

include/linux/suspend.h +0 -1
index c7d9bb1..4ed4879 100644
@@ -1,7 +1,7 @@
 #ifndef _LINUX_SUSPEND_H
 #define _LINUX_SUSPEND_H
 
-#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32)

|| defined(CONFIG_PPC64)
+#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32)
|| defined(CONFIG_PPC64) || defined(CONFIG_MIPS)

#include <asm/suspend.h>
#endif
#include <linux/swap.h>

Signature · 1 line
1.6.2.1
#1 lore raw

Hi!

Quoted 14 lines
Quoted 1 line

From d4776f4891b9be96d357910f62d9ebaf898a3015 Mon Sep 17 00:00:00 2001

From: Wu Zhangjin <[email protected]>
Date: Sat, 16 May 2009 04:51:26 +0800
Subject: [PATCH 25/30] loongson: Hibernation Support in mips system

arch/mips/Makefile +0 -0
index d73f084..8bde363 100644
@@ -677,6 +677,9 @@ core-y			+= arch/mips/kernel/ arch/mips/mm/

arch/mips/math-emu/

drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/

arch/mips/Makefile

Quoted 3 lines
arch/mips/Makefile +3 -0
+# suspend and hibernation support
+drivers-$(CONFIG_PM)	+= arch/mips/power/
+

Do all config combinations compile?

arch/mips/Makefile line 7

Quoted 6 lines
arch/mips/Makefile +2 -0
@@ -3,4 +3,6 @@
 
 /* Somewhen...  Maybe :-)  */
 
+static inline int arch_prepare_suspend(void) { return 0; }
+

And kill the somewhen comment?

Quoted 6 lines
arch/mips/Makefile +2 -0
@@ -326,3 +327,15 @@ void output_octeon_cop2_state_defines(void)
 	BLANK();
 }
 #endif
+
+#ifdef CONFIG_HIBERNATION

arch/mips/Makefile void output_octeon_cop2_state_defines(void) · line 341

Quoted 10 lines
arch/mips/Makefile +10 -0
+void output_pbe_defines(void)
+{
+ 	COMMENT(" Linux struct pbe offsets. ");
+ 	OFFSET(PBE_ADDRESS , pbe, address);
+ 	OFFSET(PBE_ORIG_ADDRESS  , pbe, orig_address);
+ 	OFFSET(PBE_NEXT  , pbe, next);
+ 	DEFINE(PBE_SIZE  , sizeof(struct pbe));
+ 	BLANK();
+}
+#endif

What is this? please delete spaces before ,.

Quoted 54 lines
arch/mips/power/hibernate.S new file +48 -0
new file mode 100644
index 0000000..e45ec45
@@ -0,0 +1,78 @@
+#incldue <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include <asm/regdef.h>
+#include <asm/asm.h>
+
+.text 
+LEAF(swsusp_arch_suspend)
+	 PTR_LA t0, saved_ra
+	 PTR_S ra, (t0)
+	 PTR_LA t0, saved_sp
+	 PTR_S sp, (t0)
+	 PTR_LA t0, saved_fp
+	 PTR_S fp, (t0)
+	 PTR_LA t0, saved_gp
+	 PTR_S gp, (t0)
+	 PTR_LA t0, saved_s0
+	 PTR_S s0, (t0) 
+	 PTR_LA t0, saved_s1
+	 PTR_S s1, (t0)
+	 PTR_LA t0, saved_s2
+	 PTR_S s2, (t0)
+	 PTR_LA t0, saved_s3
+	 PTR_S s3, (t0)
+	 PTR_LA t0, saved_s4
+	 PTR_S s4, (t0)
+	 PTR_LA t0, saved_s5
+	 PTR_S s5, (t0)
+	 PTR_LA t0, saved_s6
+	 PTR_S s6, (t0)
+	 PTR_LA t0, saved_s7
+	 PTR_S s7, (t0)
+	 PTR_LA t0, saved_a0
+	 PTR_S a0, (t0)
+	 PTR_LA t0, saved_a1
+	 PTR_S a1, (t0)
+	 PTR_LA t0, saved_a2
+	 PTR_S a2, (t0)
+	 PTR_LA t0, saved_v1
+	 PTR_S v1, (t0)
+	 j swsusp_save
+	 nop
+END(swsusp_arch_suspend)
+
+LEAF(swsusp_arch_resume)
+	PTR_L t0, restore_pblist
+0: 
+	PTR_L t1, PBE_ADDRESS(t0)   /* source */
+ 	PTR_L t2, PBE_ORIG_ADDRESS(t0) /* destination */

arch/mips/power/hibernate.S line 58

Quoted 10 lines
arch/mips/power/hibernate.S new file +10 -0
+ 	PTR_ADDIU t3, t1, _PAGE_SIZE
+1: 
+	REG_L t8, (t1)
+ 	REG_S t8, (t2)
+ 	PTR_ADDIU t1, t1, SZREG
+ 	PTR_ADDIU t2, t2, SZREG
+ 	bne t1, t3, 1b
+ 	PTR_L t0, PBE_NEXT(t0)
+ 	bnez t0, 0b
+	//flush cache and tlb. no need?I am not sure.

Avoid c++ comments... and yes, I guess you should flush cache/tlb.

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
author
#2 lore raw
Quoted 2 lines · Pavel Machek

Hi!

sorry, this is an old version without check via scripts/checkpatch.pl, please ignore it, the latest version goes here:

[loongson-PATCH-v1 22/27] Hibernation Support in mips system

and the above one is also out of date, can not apply to the latest linux-mip development git repo(-rc7). so, please also ignore it, i am working on a new version of it in the latest linux-mips git tree. and will apply the existing feedbacks from the mailing list.

thanks!
Wu Zhangjin

Quoted 118 lines
Quoted 14 lines
Quoted 1 line

From d4776f4891b9be96d357910f62d9ebaf898a3015 Mon Sep 17 00:00:00 2001

From: Wu Zhangjin <[email protected]>
Date: Sat, 16 May 2009 04:51:26 +0800
Subject: [PATCH 25/30] loongson: Hibernation Support in mips system

arch/mips/Makefile +0 -0
index d73f084..8bde363 100644
@@ -677,6 +677,9 @@ core-y			+= arch/mips/kernel/ arch/mips/mm/

arch/mips/math-emu/

drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/

arch/mips/Makefile

Quoted 3 lines
arch/mips/Makefile +3 -0
+# suspend and hibernation support
+drivers-$(CONFIG_PM)	+= arch/mips/power/
+

Do all config combinations compile?

arch/mips/Makefile line 7

Quoted 6 lines
arch/mips/Makefile +2 -0
@@ -3,4 +3,6 @@
 
 /* Somewhen...  Maybe :-)  */
 
+static inline int arch_prepare_suspend(void) { return 0; }
+

And kill the somewhen comment?

Quoted 6 lines
arch/mips/Makefile +2 -0
@@ -326,3 +327,15 @@ void output_octeon_cop2_state_defines(void)
 	BLANK();
 }
 #endif
+
+#ifdef CONFIG_HIBERNATION

arch/mips/Makefile void output_octeon_cop2_state_defines(void) · line 341

Quoted 10 lines
arch/mips/Makefile +10 -0
+void output_pbe_defines(void)
+{
+ 	COMMENT(" Linux struct pbe offsets. ");
+ 	OFFSET(PBE_ADDRESS , pbe, address);
+ 	OFFSET(PBE_ORIG_ADDRESS  , pbe, orig_address);
+ 	OFFSET(PBE_NEXT  , pbe, next);
+ 	DEFINE(PBE_SIZE  , sizeof(struct pbe));
+ 	BLANK();
+}
+#endif

What is this? please delete spaces before ,.

Quoted 54 lines
arch/mips/power/hibernate.S new file +48 -0
new file mode 100644
index 0000000..e45ec45
@@ -0,0 +1,78 @@
+#incldue <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include <asm/regdef.h>
+#include <asm/asm.h>
+
+.text 
+LEAF(swsusp_arch_suspend)
+	 PTR_LA t0, saved_ra
+	 PTR_S ra, (t0)
+	 PTR_LA t0, saved_sp
+	 PTR_S sp, (t0)
+	 PTR_LA t0, saved_fp
+	 PTR_S fp, (t0)
+	 PTR_LA t0, saved_gp
+	 PTR_S gp, (t0)
+	 PTR_LA t0, saved_s0
+	 PTR_S s0, (t0) 
+	 PTR_LA t0, saved_s1
+	 PTR_S s1, (t0)
+	 PTR_LA t0, saved_s2
+	 PTR_S s2, (t0)
+	 PTR_LA t0, saved_s3
+	 PTR_S s3, (t0)
+	 PTR_LA t0, saved_s4
+	 PTR_S s4, (t0)
+	 PTR_LA t0, saved_s5
+	 PTR_S s5, (t0)
+	 PTR_LA t0, saved_s6
+	 PTR_S s6, (t0)
+	 PTR_LA t0, saved_s7
+	 PTR_S s7, (t0)
+	 PTR_LA t0, saved_a0
+	 PTR_S a0, (t0)
+	 PTR_LA t0, saved_a1
+	 PTR_S a1, (t0)
+	 PTR_LA t0, saved_a2
+	 PTR_S a2, (t0)
+	 PTR_LA t0, saved_v1
+	 PTR_S v1, (t0)
+	 j swsusp_save
+	 nop
+END(swsusp_arch_suspend)
+
+LEAF(swsusp_arch_resume)
+	PTR_L t0, restore_pblist
+0: 
+	PTR_L t1, PBE_ADDRESS(t0)   /* source */
+ 	PTR_L t2, PBE_ORIG_ADDRESS(t0) /* destination */

arch/mips/power/hibernate.S line 58

Quoted 10 lines
arch/mips/power/hibernate.S new file +10 -0
+ 	PTR_ADDIU t3, t1, _PAGE_SIZE
+1: 
+	REG_L t8, (t1)
+ 	REG_S t8, (t2)
+ 	PTR_ADDIU t1, t1, SZREG
+ 	PTR_ADDIU t2, t2, SZREG
+ 	bne t1, t3, 1b
+ 	PTR_L t0, PBE_NEXT(t0)
+ 	bnez t0, 0b
+	//flush cache and tlb. no need?I am not sure.

Avoid c++ comments... and yes, I guess you should flush cache/tlb.