From: Russell King - ARM Linux <linux@arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 08/25] ARM: pm: reallocate registers to avoid r2, r3 Date: Thu, 23 Jun 2011 20:11:43 +0100 [thread overview] Message-ID: <E1QZpJX-0005mB-Sg@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20110623190900.GH9449@n2100.arm.linux.org.uk> Avoid using r2 and r3 in the suspend code, allowing these to be passed further into the function as arguments. Acked-by: Frank Hofmann <frank.hofmann@tomtom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/kernel/sleep.S | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 8dbca93..358be13 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -20,26 +20,26 @@ ENTRY(cpu_suspend) mov r9, lr #ifdef MULTI_CPU ldr r10, =processor - ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state + ldr r5, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function #else - ldr r0, =cpu_suspend_size + ldr r5, =cpu_suspend_size ldr ip, =cpu_do_resume #endif - mov r2, sp @ current virtual SP - sub sp, sp, r0 @ allocate CPU state on stack + mov r6, sp @ current virtual SP + sub sp, sp, r5 @ allocate CPU state on stack mov r0, sp @ save pointer add ip, ip, r1 @ convert resume fn to phys - stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn - ldr r3, =sleep_save_sp - add r2, sp, r1 @ convert SP to phys + stmfd sp!, {r1, r6, ip} @ save v:p, virt SP, phys resume fn + ldr r5, =sleep_save_sp + add r6, sp, r1 @ convert SP to phys #ifdef CONFIG_SMP ALT_SMP(mrc p15, 0, lr, c0, c0, 5) ALT_UP(mov lr, #0) and lr, lr, #15 - str r2, [r3, lr, lsl #2] @ save phys SP + str r6, [r5, lr, lsl #2] @ save phys SP #else - str r2, [r3] @ save phys SP + str r6, [r5] @ save phys SP #endif #ifdef MULTI_CPU mov lr, pc -- 1.7.4.4
WARNING: multiple messages have this Message-ID (diff)
From: linux@arm.linux.org.uk (Russell King - ARM Linux) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/25] ARM: pm: reallocate registers to avoid r2, r3 Date: Thu, 23 Jun 2011 20:11:43 +0100 [thread overview] Message-ID: <E1QZpJX-0005mB-Sg@rmk-PC.arm.linux.org.uk> (raw) In-Reply-To: <20110623190900.GH9449@n2100.arm.linux.org.uk> Avoid using r2 and r3 in the suspend code, allowing these to be passed further into the function as arguments. Acked-by: Frank Hofmann <frank.hofmann@tomtom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/kernel/sleep.S | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 8dbca93..358be13 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -20,26 +20,26 @@ ENTRY(cpu_suspend) mov r9, lr #ifdef MULTI_CPU ldr r10, =processor - ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state + ldr r5, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function #else - ldr r0, =cpu_suspend_size + ldr r5, =cpu_suspend_size ldr ip, =cpu_do_resume #endif - mov r2, sp @ current virtual SP - sub sp, sp, r0 @ allocate CPU state on stack + mov r6, sp @ current virtual SP + sub sp, sp, r5 @ allocate CPU state on stack mov r0, sp @ save pointer add ip, ip, r1 @ convert resume fn to phys - stmfd sp!, {r1, r2, ip} @ save v:p, virt SP, phys resume fn - ldr r3, =sleep_save_sp - add r2, sp, r1 @ convert SP to phys + stmfd sp!, {r1, r6, ip} @ save v:p, virt SP, phys resume fn + ldr r5, =sleep_save_sp + add r6, sp, r1 @ convert SP to phys #ifdef CONFIG_SMP ALT_SMP(mrc p15, 0, lr, c0, c0, 5) ALT_UP(mov lr, #0) and lr, lr, #15 - str r2, [r3, lr, lsl #2] @ save phys SP + str r6, [r5, lr, lsl #2] @ save phys SP #else - str r2, [r3] @ save phys SP + str r6, [r5] @ save phys SP #endif #ifdef MULTI_CPU mov lr, pc -- 1.7.4.4
next prev parent reply other threads:[~2011-06-23 19:11 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-23 19:09 [PATCH 00/25] Re-jig cpu_suspend for a saner calling convention Russell King - ARM Linux 2011-06-23 19:09 ` Russell King - ARM Linux 2011-06-23 19:09 ` [PATCH 01/25] ARM: pm: ensure ARMv7 CPUs save and restore the TLS register Russell King - ARM Linux 2011-06-23 19:09 ` Russell King - ARM Linux 2011-06-23 19:09 ` [PATCH 02/25] ARM: pm: arrange for cpu_proc_init() to be called on resume Russell King - ARM Linux 2011-06-23 19:09 ` Russell King - ARM Linux 2011-06-23 19:10 ` [PATCH 03/25] ARM: pm: sa1100: no need to re-enable clock switching Russell King - ARM Linux 2011-06-23 19:10 ` Russell King - ARM Linux 2011-06-23 19:10 ` [PATCH 04/25] ARM: pm: make MULTI_CPU and !MULTI_CPU resume paths the same Russell King - ARM Linux 2011-06-23 19:10 ` Russell King - ARM Linux 2011-06-23 19:10 ` [PATCH 05/25] ARM: pm: move return address (for cpu_resume) to top of stack Russell King - ARM Linux 2011-06-23 19:10 ` Russell King - ARM Linux 2011-06-23 19:11 ` [PATCH 06/25] ARM: pm: extract common code from MULTI_CPU/!MULTI_CPU paths Russell King - ARM Linux 2011-06-23 19:11 ` Russell King - ARM Linux 2011-06-23 19:11 ` [PATCH 07/25] ARM: pm: preserve r4 - r11 across a suspend Russell King - ARM Linux 2011-06-23 19:11 ` Russell King - ARM Linux 2011-06-23 19:11 ` Russell King - ARM Linux [this message] 2011-06-23 19:11 ` [PATCH 08/25] ARM: pm: reallocate registers to avoid r2, r3 Russell King - ARM Linux 2011-06-23 19:12 ` [PATCH 09/25] ARM: pm: rejig suspend follow-on function calling convention Russell King - ARM Linux 2011-06-23 19:12 ` Russell King - ARM Linux 2011-06-23 19:12 ` [PATCH 10/25] ARM: pm: move sa1100 to use proper suspend func arg0 Russell King - ARM Linux 2011-06-23 19:12 ` Russell King - ARM Linux 2011-06-23 19:12 ` [PATCH 11/25] ARM: pm: convert cpu_suspend() to a normal function Russell King - ARM Linux 2011-06-23 19:12 ` Russell King - ARM Linux 2011-06-23 19:13 ` [PATCH 12/25] ARM: pm: move cpu_init() call into core code Russell King - ARM Linux 2011-06-23 19:13 ` Russell King - ARM Linux 2011-06-23 19:13 ` [PATCH 13/25] ARM: pm: sa1100: move cpu_suspend into C code Russell King - ARM Linux 2011-06-23 19:13 ` Russell King - ARM Linux 2011-06-23 19:13 ` [PATCH 14/25] ARM: pm: plat-s3c24xx: cleanup s3c_cpu_save Russell King - ARM Linux 2011-06-23 19:13 ` Russell King - ARM Linux 2011-06-24 6:48 ` Kukjin Kim 2011-06-24 6:48 ` Kukjin Kim 2011-06-23 19:14 ` [PATCH 15/25] ARM: pm: mach-s5pv210: " Russell King - ARM Linux 2011-06-23 19:14 ` Russell King - ARM Linux 2011-06-23 19:14 ` [PATCH 16/25] ARM: pm: mach-exynos4: " Russell King - ARM Linux 2011-06-23 19:14 ` Russell King - ARM Linux 2011-06-23 19:14 ` [PATCH 17/25] ARM: pm: mach-s3c64xx: " Russell King - ARM Linux 2011-06-23 19:14 ` Russell King - ARM Linux 2011-06-23 19:15 ` [PATCH 18/25] ARM: pm: samsung: move cpu_suspend into C code Russell King - ARM Linux 2011-06-23 19:15 ` Russell King - ARM Linux 2011-06-23 19:15 ` [PATCH 19/25] ARM: pm: samsung: no need to call flush_cache_all() Russell King - ARM Linux 2011-06-23 19:15 ` Russell King - ARM Linux 2011-06-23 19:15 ` [PATCH 20/25] ARM: pm: pxa: move cpu_suspend into C code Russell King - ARM Linux 2011-06-23 19:15 ` Russell King - ARM Linux 2011-06-23 19:16 ` [PATCH 21/25] ARM: pm: omap34xx: no need to save all registers in sleep34xx.S Russell King - ARM Linux 2011-06-23 19:16 ` Russell King - ARM Linux 2011-06-23 19:16 ` [PATCH 22/25] ARM: pm: omap34xx: remove misleading comment and use of r9 Russell King - ARM Linux 2011-06-23 19:16 ` Russell King - ARM Linux 2011-06-23 19:16 ` [PATCH 23/25] ARM: pm: omap34xx: convert to generic suspend/resume support Russell King - ARM Linux 2011-06-23 19:16 ` Russell King - ARM Linux 2011-06-24 7:37 ` Jean Pihet 2011-06-24 7:37 ` Jean Pihet 2011-06-24 7:42 ` Russell King - ARM Linux 2011-06-24 7:42 ` Russell King - ARM Linux 2011-06-23 19:17 ` [PATCH 24/25] ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code Russell King - ARM Linux 2011-06-23 19:17 ` Russell King - ARM Linux 2011-06-23 21:27 ` Kevin Hilman 2011-06-23 21:27 ` Kevin Hilman 2011-06-23 19:17 ` [PATCH 25/25] ARM: pm: ensure our temporary page table entry is removed from the TLB Russell King - ARM Linux 2011-06-23 19:17 ` Russell King - ARM Linux 2011-06-23 22:14 ` [PATCH 00/25] Re-jig cpu_suspend for a saner calling convention Kevin Hilman 2011-06-23 22:14 ` Kevin Hilman 2011-06-24 7:43 ` Jean Pihet 2011-06-24 7:43 ` Jean Pihet
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=E1QZpJX-0005mB-Sg@rmk-PC.arm.linux.org.uk \ --to=linux@arm.linux.org.uk \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-samsung-soc@vger.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: linkBe 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.