| Message ID | E1QWAju-0002dr-P6@rmk-PC.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 13 Jun 2011, Russell King - ARM Linux wrote: > Very little code is different between these two paths now, so extract > the common code. What about simply always using the MULTI_CPU path unconditionally here? The struct processor pointer could be made available in all cases, and non critical paths could choose to always use it to simplify the code. > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/kernel/sleep.S | 24 ++++++------------------ > 1 files changed, 6 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S > index f8e9251..0a778c3 100644 > --- a/arch/arm/kernel/sleep.S > +++ b/arch/arm/kernel/sleep.S > @@ -19,29 +19,13 @@ ENTRY(cpu_suspend) > mov r9, lr > #ifdef MULTI_CPU > ldr r10, =processor > - mov r2, sp @ current virtual SP > ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state > ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function > - sub sp, sp, r0 @ 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 > -#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 > #else > - str r2, [r3] @ save phys SP > -#endif > - mov lr, pc > - ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state > -#else > - mov r2, sp @ current virtual SP > ldr r0, =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 r0, sp @ save pointer > add ip, ip, r1 @ convert resume fn to phys > @@ -56,6 +40,10 @@ ENTRY(cpu_suspend) > #else > str r2, [r3] @ save phys SP > #endif > +#ifdef MULTI_CPU > + mov lr, pc > + ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state > +#else > bl cpu_do_suspend > #endif > > -- > 1.7.4.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On Mon, Jun 13, 2011 at 03:29:02PM -0400, Nicolas Pitre wrote: > On Mon, 13 Jun 2011, Russell King - ARM Linux wrote: > > > Very little code is different between these two paths now, so extract > > the common code. > > What about simply always using the MULTI_CPU path unconditionally here? > The struct processor pointer could be made available in all cases, and > non critical paths could choose to always use it to simplify the code. For the ifdef sections I don't think its worth it.
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index f8e9251..0a778c3 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -19,29 +19,13 @@ ENTRY(cpu_suspend) mov r9, lr #ifdef MULTI_CPU ldr r10, =processor - mov r2, sp @ current virtual SP ldr r0, [r10, #CPU_SLEEP_SIZE] @ size of CPU sleep state ldr ip, [r10, #CPU_DO_RESUME] @ virtual resume function - sub sp, sp, r0 @ 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 -#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 #else - str r2, [r3] @ save phys SP -#endif - mov lr, pc - ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state -#else - mov r2, sp @ current virtual SP ldr r0, =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 r0, sp @ save pointer add ip, ip, r1 @ convert resume fn to phys @@ -56,6 +40,10 @@ ENTRY(cpu_suspend) #else str r2, [r3] @ save phys SP #endif +#ifdef MULTI_CPU + mov lr, pc + ldr pc, [r10, #CPU_DO_SUSPEND] @ save CPU state +#else bl cpu_do_suspend #endif
Very little code is different between these two paths now, so extract the common code. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/kernel/sleep.S | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-)