Re: [PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S

[Yu Chen]

On Wed, Sep 19, 2018 at 10:41:16AM +0200, Rafael J. Wysocki wrote:
> On Wed, Sep 19, 2018 at 9:31 AM Chen Yu  wrote:
> >
> > From: Zhimin Gu 
> >
> > Backport
> > Commit ef0f3ed5a4ac (x86/asm/power: Create stack frames
> > in hibernate_asm_64.S)
> > and
> > Commit 4ce827b4cc58 (x86/power/64: Fix hibernation return
> > address corruption)
> >
> > And also prepare for relocated code and jump address
> > mapping.
> 
> I don't like the changelog.
> 
> It should explain the technical reasons for making the changes in the
> first place and then mention that analogous changes were made for
> 64-bit before and by which commits.
>
Ok, will change it in next version.

Thanks,
Yu
> Thanks,
> Rafael

Re: [PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S

[Rafael J. Wysocki]

On Wed, Sep 19, 2018 at 9:31 AM Chen Yu  wrote:
>
> From: Zhimin Gu 
>
> Backport
> Commit ef0f3ed5a4ac (x86/asm/power: Create stack frames
> in hibernate_asm_64.S)
> and
> Commit 4ce827b4cc58 (x86/power/64: Fix hibernation return
> address corruption)
>
> And also prepare for relocated code and jump address
> mapping.

I don't like the changelog.

It should explain the technical reasons for making the changes in the
first place and then mention that analogous changes were made for
64-bit before and by which commits.

Thanks,
Rafael

[PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S

[Chen Yu]

From: Zhimin Gu 

Backport
Commit ef0f3ed5a4ac (x86/asm/power: Create stack frames
in hibernate_asm_64.S)
and
Commit 4ce827b4cc58 (x86/power/64: Fix hibernation return
address corruption)

And also prepare for relocated code and jump address
mapping.

Cc: "Rafael J. Wysocki" 
Signed-off-by: Zhimin Gu 
Signed-off-by: Chen Yu 
---
 arch/x86/include/asm/suspend_32.h | 4 
 arch/x86/power/hibernate_asm_32.S | 9 +
 2 files changed, 13 insertions(+)

diff --git a/arch/x86/include/asm/suspend_32.h 
b/arch/x86/include/asm/suspend_32.h
index 8be6afb58471..fdbd9d7b7bca 100644
--- a/arch/x86/include/asm/suspend_32.h
+++ b/arch/x86/include/asm/suspend_32.h
@@ -32,4 +32,8 @@ struct saved_context {
unsigned long return_address;
 } __attribute__((packed));
 
+/* routines for saving/restoring kernel state */
+extern char core_restore_code[];
+extern char restore_registers[];
+
 #endif /* _ASM_X86_SUSPEND_32_H */
diff --git a/arch/x86/power/hibernate_asm_32.S 
b/arch/x86/power/hibernate_asm_32.S
index 6e56815e13a0..671d38d0d931 100644
--- a/arch/x86/power/hibernate_asm_32.S
+++ b/arch/x86/power/hibernate_asm_32.S
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 
 .text
 
@@ -24,8 +25,11 @@ ENTRY(swsusp_arch_suspend)
pushfl
popl saved_context_eflags
 
+   FRAME_BEGIN
call swsusp_save
+   FRAME_END
ret
+ENDPROC(swsusp_arch_suspend)
 
 ENTRY(restore_image)
movlmmu_cr4_features, %ecx
@@ -58,6 +62,10 @@ copy_loop:
.p2align 4,,7
 
 done:
+
+   /* code below belongs to the image kernel */
+   .align PAGE_SIZE
+ENTRY(restore_registers)
/* go back to the original page tables */
movl$swapper_pg_dir, %eax
subl$__PAGE_OFFSET, %eax
@@ -83,3 +91,4 @@ done:
xorl%eax, %eax
 
ret
+ENDPROC(restore_registers)
-- 
2.17.1