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

Commit b6338bdc authored by Jean Pihet's avatar Jean Pihet Committed by Russell King
Browse files

ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 



The new fncpy API is better suited* for copying some
code to SRAM at runtime. This patch changes the ad-hoc
code to the more generic fncpy API.

*: 1. fncpy ensures that the thumb mode bit is propagated,
   2. fncpy provides the security of type safety between the
     original function and the sram function pointer.

Tested OK on OMAP3 in low power modes (RET/OFF)
using omap2plus_defconfig with !CONFIG_THUMB2_KERNEL.
Compile tested on OMAP1/2 using omap1_defconfig.

Boot tested on OMAP1 & OMAP2
Tested OK with suspend/resume on OMAP2420/n810

Boots fine on osk5912 and n800

Signed-off-by: default avatarJean Pihet <j-pihet@ti.com>
Acked-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarDave Martin <dave.martin@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5756e9dd

arch/arm/mach-omap1/pm.h

+3 −3
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ extern void allow_idle_sleep(void); 
extern void omap1_pm_idle(void);

extern void omap1_pm_suspend(void);



extern void omap7xx_cpu_suspend(unsigned short, unsigned short);

extern void omap1510_cpu_suspend(unsigned short, unsigned short);

extern void omap1610_cpu_suspend(unsigned short, unsigned short);

extern void omap7xx_cpu_suspend(unsigned long, unsigned long);

extern void omap1510_cpu_suspend(unsigned long, unsigned long);

extern void omap1610_cpu_suspend(unsigned long, unsigned long);

extern void omap7xx_idle_loop_suspend(void);

extern void omap1510_idle_loop_suspend(void);

extern void omap1610_idle_loop_suspend(void);

arch/arm/mach-omap1/sleep.S

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
 */



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

	.align	3

ENTRY(omap7xx_cpu_suspend)



	@ save registers on stack
@@ -137,6 +138,7 @@ ENTRY(omap7xx_cpu_suspend_sz) 
#endif /* CONFIG_ARCH_OMAP730 || CONFIG_ARCH_OMAP850 */



#ifdef CONFIG_ARCH_OMAP15XX

	.align	3

ENTRY(omap1510_cpu_suspend)



	@ save registers on stack
@@ -211,6 +213,7 @@ ENTRY(omap1510_cpu_suspend_sz) 
#endif /* CONFIG_ARCH_OMAP15XX */



#if defined(CONFIG_ARCH_OMAP16XX)

	.align	3

ENTRY(omap1610_cpu_suspend)



	@ save registers on stack

arch/arm/mach-omap1/sram.S

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
/*

 * Reprograms ULPD and CKCTL.

 */

	.align	3

ENTRY(omap1_sram_reprogram_clock)

	stmfd	sp!, {r0 - r12, lr}		@ save registers on stack

arch/arm/mach-omap2/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ extern void omap24xx_idle_loop_suspend(void); 
extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl,

					void __iomem *sdrc_power);

extern void omap34xx_cpu_suspend(u32 *addr, int save_state);

extern void save_secure_ram_context(u32 *addr);

extern int save_secure_ram_context(u32 *addr);

extern void omap3_save_scratchpad_contents(void);



extern unsigned int omap24xx_idle_loop_suspend_sz;

arch/arm/mach-omap2/sleep24xx.S

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
 * Note: This code get's copied to internal SRAM at boot. When the OMAP

 *	 wakes up it continues execution at the point it went to sleep.

 */

	.align	3

ENTRY(omap24xx_idle_loop_suspend)

	stmfd	sp!, {r0, lr}		@ save registers on stack

	mov	r0, #0			@ clear for mcr setup
@@ -82,6 +83,7 @@ ENTRY(omap24xx_idle_loop_suspend_sz) 
 * The DLL load value is not kept in RETENTION or OFF.	It needs to be restored

 * at wake

 */

	.align	3

ENTRY(omap24xx_cpu_suspend)

	stmfd	sp!, {r0 - r12, lr}	@ save registers on stack

	mov	r3, #0x0		@ clear for mcr call