public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
From: Russ Dill <Russ.Dill@ti.com>
To: linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Cc: linux-kbuild@vger.kernel.org,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	mans@mansr.com, Shawn Guo <shawn.guo@linaro.org>,
	Dave Martin <Dave.Martin@arm.com>,
	Russell King - ARM Linux <linux@arm.linux.org.uk>
Subject: [RFC PATCH 08/11] ARM: PIE: Add macro for generating PIE resume trampoline
Date: Tue, 17 Sep 2013 05:43:34 -0700	[thread overview]
Message-ID: <1379421817-15759-9-git-send-email-Russ.Dill@ti.com> (raw)
In-Reply-To: <1379421817-15759-1-git-send-email-Russ.Dill@ti.com>

Add a helper that generates a short snippet of code that updates PIE
relocations, loads the stack pointer and calls a C (or asm) function.
The code gets placed into a PIE section.

Signed-off-by: Russ Dill <Russ.Dill@ti.com>
---
 arch/arm/include/asm/suspend.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm/include/asm/suspend.h b/arch/arm/include/asm/suspend.h
index cd20029..92996f0 100644
--- a/arch/arm/include/asm/suspend.h
+++ b/arch/arm/include/asm/suspend.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ARM_SUSPEND_H
 #define __ASM_ARM_SUSPEND_H
 
+#include <asm/pie.h>
+
 struct sleep_save_sp {
 	u32 *save_ptr_stash;
 	u32 save_ptr_stash_phys;
@@ -9,4 +11,27 @@ struct sleep_save_sp {
 extern void cpu_resume(void);
 extern int cpu_suspend(unsigned long, int (*)(unsigned long));
 
+/**
+ * ARM_PIE_RESUME - generate a PIE trampoline for resume
+ * @proc:	SoC, should match argument used with PIE_OVERLAY_SECTION()
+ * @func:	C or asm function to call at resume
+ * @stack:	stack to use before calling func
+ */
+#define ARM_PIE_RESUME(proc, func, stack)				\
+static void __naked __noreturn __pie(proc) proc##_resume_trampoline2(void) \
+{									\
+	__asm__ __volatile__(						\
+	"	mov	sp, %0\n"					\
+	: : "r"((stack)) : "sp");					\
+									\
+	func();								\
+}									\
+									\
+void __naked __noreturn __pie(proc) proc##_resume_trampoline(void)	\
+{									\
+	pie_relocate_from_pie();					\
+	proc##_resume_trampoline2();					\
+}									\
+EXPORT_PIE_SYMBOL(proc##_resume_trampoline)
+
 #endif
-- 
1.8.3.2


  parent reply	other threads:[~2013-09-17 12:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-17 12:43 [RFC PATCH 00/11] Embeddable Position Independent Executable Russ Dill
2013-09-17 12:43 ` [RFC PATCH 01/11] asm-generic: io: Add exec versions of ioremap Russ Dill
2013-09-17 12:43 ` [RFC PATCH 02/11] lib: devres: Add exec versions of devm_ioremap_resource and friends Russ Dill
2013-09-17 12:43 ` [RFC PATCH 03/11] misc: SRAM: Add option to map SRAM to allow code execution Russ Dill
2013-09-17 12:43 ` [RFC PATCH 04/11] asm-generic: fncpy: Add function copying macros Russ Dill
2013-09-17 14:23   ` Geert Uytterhoeven
2013-09-17 12:43 ` [RFC PATCH 05/11] PIE: Support embedding position independent executables Russ Dill
2013-09-17 12:43 ` [RFC PATCH 06/11] ARM: PIE: Add position independent executable embedding to ARM Russ Dill
2013-09-17 12:43 ` [RFC PATCH 07/11] ARM: PIE: Add support for updating PIE relocations Russ Dill
2013-09-17 12:43 ` Russ Dill [this message]
2013-09-17 12:43 ` [RFC PATCH 09/11] ARM: dts: AM33XX: Associate SRAM with MPU and mark it exec Russ Dill
2013-09-17 12:43 ` [RFC PATCH 10/11] ARM: OMAP2+: AM33XX: Add PIE support for AM33XX Russ Dill
2013-09-17 12:43 ` [RFC PATCH 11/11] ARM: OMAP2+: AM33XX: Basic suspend resume support Russ Dill
2013-10-23 14:11 ` [RFC PATCH 00/11] Embeddable Position Independent Executable Linus Walleij
2013-10-24  8:09 ` Heiko Stübner
2014-04-22  8:15   ` Heiko Stübner
2014-06-04 13:36     ` Pascal Hürst
2013-11-07 23:29 ` Kevin Hilman
2013-11-08 18:09 ` Dave Martin

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=1379421817-15759-9-git-send-email-Russ.Dill@ti.com \
    --to=russ.dill@ti.com \
    --cc=Dave.Martin@arm.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mans@mansr.com \
    --cc=shawn.guo@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox