All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chen Yu <yu.c.chen@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	linux-pm@vger.kernel.org, Pavel Machek <pavel@ucw.cz>,
	Len Brown <len.brown@intel.com>, Zhimin Gu <kookoo.gu@intel.com>,
	Yu Chen <yu.c.chen@intel.com>
Subject: [PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S
Date: Wed, 19 Sep 2018 15:38:25 +0800	[thread overview]
Message-ID: <19aed6bb376b47f672800b4c59da07efca0f9e5a.1537275915.git.yu.c.chen@intel.com> (raw)
In-Reply-To: <cover.1537275915.git.yu.c.chen@intel.com>

From: Zhimin Gu <kookoo.gu@intel.com>

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" <rjw@rjwysocki.net>
Signed-off-by: Zhimin Gu <kookoo.gu@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
 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 <asm/page_types.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor-flags.h>
+#include <asm/frame.h>
 
 .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)
 	movl	mmu_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


  parent reply	other threads:[~2018-09-19  7:31 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-19  7:37 [PATCH 00/12][RFC v3] Backport several fixes from 64bits to 32bits hibernation Chen Yu
2018-09-19  7:37 ` [PATCH 01/12][RFC v3] x86, hibernate: Fix nosave_regions setup for hibernation Chen Yu
2018-09-19  8:34   ` Rafael J. Wysocki
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:38 ` [PATCH 02/12][RFC v3] PM / hibernate: Check the success of generating md5 digest before hibernation Chen Yu
2018-09-19  8:36   ` Rafael J. Wysocki
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:38 ` Chen Yu [this message]
2018-09-19  8:41   ` [PATCH 03/12][RFC v3] x86-32/asm/power: Create stack frames in hibernate_asm_32.S Rafael J. Wysocki
2018-09-19  8:54     ` Yu Chen
2018-09-19  7:38 ` [PATCH 04/12][RFC v3] x86, hibernate: Extract the common code of 64/32 bit system Chen Yu
2018-09-19  9:03   ` Rafael J. Wysocki
2018-09-19 10:15     ` Rafael J. Wysocki
2018-09-19 10:34     ` Ingo Molnar
2018-09-19 10:36       ` Rafael J. Wysocki
2018-09-20 22:05         ` Pavel Machek
2018-09-19  7:38 ` [PATCH 05/12][RFC v3] x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER set on 32bit system Chen Yu
2018-09-19 10:31   ` Rafael J. Wysocki
2018-09-19  7:42 ` [PATCH 06/12][RFC v3] x86, hibernate: Rename temp_level4_pgt to temp_pgt Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:42 ` [PATCH 07/12][RFC v3] x86-32, hibernate: Use temp_pgt as the temporary page table Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:42 ` [PATCH 08/12][RFC v3] x86-32, hibernate: Use the page size macro instead of constant value Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:43 ` [PATCH 09/12][RFC v3] x86-32, hibernate: Switch to original page table after resumed Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:43 ` [PATCH 10/12][RFC v3] x86-32, hibernate: Switch to relocated restore code during resume on 32bit system Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:43 ` [PATCH 11/12][RFC v3] x86-32, hibernate: Set up temporary text mapping for " Chen Yu
2018-09-20 22:05   ` Pavel Machek
2018-09-19  7:43 ` [PATCH 12/12][RFC v3] x86-32, hibernate: Adjust in_suspend after resumed on " Chen Yu
2018-09-20 22:06   ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=19aed6bb376b47f672800b4c59da07efca0f9e5a.1537275915.git.yu.c.chen@intel.com \
    --to=yu.c.chen@intel.com \
    --cc=kookoo.gu@intel.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rjw@rjwysocki.net \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.