OMAP3: clean up ASM sleep code
v4 cover OMAP3: clean up ASM sleep code
From: Jean Pihet <[email protected]>
This patch only contains clean-ups and cosmetic changes, no functional change.
Clean-up of the ASM sleep code, for better readability and easier maintenance.
Applies on top of Nishant's latest idle path errata fixes step 2, cf. http://marc.info/?l=linux-omap&m=129139584919242&w=2
Jean Pihet (7):
OMAP2+: use global values for the SRAM PA addresses
OMAP3: remove hardcoded values from the ASM sleep code
OMAP3: re-organize the ASM sleep code
OMAP3: rework of the ASM sleep code execution paths
OMAP3: add comments for low power code errata
OMAP3: ASM sleep code format rework
OMAP3: remove unused code from the ASM sleep code
arch/arm/mach-omap2/control.c | 10 +- arch/arm/mach-omap2/control.h | 2 + arch/arm/mach-omap2/pm.h | 1 - arch/arm/mach-omap2/pm34xx.c | 4 +- arch/arm/mach-omap2/sdrc.h | 7 + arch/arm/mach-omap2/sleep34xx.S | 714 +++++++++++++++++++++------------------ arch/arm/plat-omap/sram.c | 7 +- 7 files changed, 401 insertions(+), 344 deletions(-)
PATCH v4 1/7 OMAP3: remove unused code from the ASM sleep code
From: Jean Pihet <[email protected]>
Remove unused code:
- macros,
- variables,
- unused semaphore locking API. This API shall be added back when needed,
- infinite loops for debug.
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/pm.h | 1 - arch/arm/mach-omap2/sleep34xx.S | 58 ++++----------------------------------- 2 files changed, 6 insertions(+), 53 deletions(-)
arch/arm/mach-omap2/pm.h +0 -1
@@ -80,7 +80,6 @@ extern void save_secure_ram_context(u32 *addr);extern void omap3_save_scratchpad_contents (void );extern unsigned int omap24xx_idle_loop_suspend_sz; -extern unsigned int omap34xx_suspend_sz;extern unsigned int save_secure_ram_context_sz;extern unsigned int omap24xx_cpu_suspend_sz;extern unsigned int omap34xx_cpu_suspend_sz;
arch/arm/mach-omap2/sleep34xx.S +6 -52
121 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 2/7 OMAP2+: use global values for the SRAM PA addresses
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
The SRAM PA addresses are locally defined and used in both the SRAM management code and the idle sleep code.
A global macro defines the values at a centralized place, for easier maintenance.
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/sdrc.h | 7 +++++++ arch/arm/plat-omap/sram.c | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/sdrc.h +7 -0
@@ -74,5 +74,12 @@ static inline u32 sms_read_reg(u16 reg)*/ #define SDRC_MPURATE_LOOPS 96 +/* +* OMAP2+: define the SRAM PA addresses. +* Used by the SRAM management code and the idle sleep code. +*/ +#define OMAP2_SRAM_PA 0x40200000 +#define OMAP3_SRAM_PA 0x40200000 +#define OMAP4_SRAM_PA 0x40300000#endif
arch/arm/plat-omap/sram.c +2 -5
@@ -41,15 +41,12 @@#define OMAP1_SRAM_PA 0x20000000#define OMAP1_SRAM_VA VMALLOC_END -#define OMAP2_SRAM_PA 0x40200000 -#define OMAP2_SRAM_PUB_PA 0x4020f800 +#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)#define OMAP2_SRAM_VA 0xfe400000#define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) -#define OMAP3_SRAM_PA 0x40200000#define OMAP3_SRAM_VA 0xfe400000 -#define OMAP3_SRAM_PUB_PA 0x40208000 +#define OMAP3_SRAM_PUB_PA (OMAP3_SRAM_PA + 0x8000)#define OMAP3_SRAM_PUB_VA (OMAP3_SRAM_VA + 0x8000) -#define OMAP4_SRAM_PA 0x40300000#define OMAP4_SRAM_VA 0xfe400000#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000)#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000)
Signature · 1 line
1.7.1
PATCH v4 2/7 OMAP2+: use global values for the SRAM PA addresses
Quoted 31 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 2/7] OMAP2+: use global values for the SRAM PA addressesFrom: Jean Pihet <[email protected]>
The SRAM PA addresses are locally defined and used in both the SRAM management code and the idle sleep code.
A global macro defines the values at a centralized place, for easier maintenance.Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>--- arch/arm/mach-omap2/sdrc.h | 7 +++++++ arch/arm/plat-omap/sram.c | 7 ++----- 2 files changed, 9 insertions(+), 5 deletions(-)arch/arm/mach-omap2/sdrc.h +0
-0@@ -74,5 +74,12 @@ static inline u32 sms_read_reg(u16 reg)*/
arch/arm/mach-omap2/sdrc.h static inline u32 sms_read_reg(u16 reg) · line 84
Quoted 10 lines
arch/arm/mach-omap2/sdrc.h +7
-0#define SDRC_MPURATE_LOOPS 96 +/* +* OMAP2+: define the SRAM PA addresses. +* Used by the SRAM management code and the idle sleep code. +*/ +#define OMAP2_SRAM_PA 0x40200000 +#define OMAP3_SRAM_PA 0x40200000 +#define OMAP4_SRAM_PA 0x40300000
Header choice is wrong. Certainly SDRC is not the place. Right place should be "#include <plat/sram.h>" OMAP4 doesn't even have SDRC IP
Quoted 30 lines
arch/arm/mach-omap2/sdrc.h +0
-0#endif arch/arm/plat-omap/sram.c +2
-6@@ -41,15 +41,12 @@#define OMAP1_SRAM_PA 0x20000000#define OMAP1_SRAM_VA VMALLOC_END -#define OMAP2_SRAM_PA 0x40200000 -#define OMAP2_SRAM_PUB_PA 0x4020f800 +#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)#define OMAP2_SRAM_VA 0xfe400000#define OMAP2_SRAM_PUB_VA (OMAP2_SRAM_VA + 0x800) -#define OMAP3_SRAM_PA 0x40200000#define OMAP3_SRAM_VA 0xfe400000 -#define OMAP3_SRAM_PUB_PA 0x40208000 +#define OMAP3_SRAM_PUB_PA (OMAP3_SRAM_PA + 0x8000)#define OMAP3_SRAM_PUB_VA (OMAP3_SRAM_VA + 0x8000) -#define OMAP4_SRAM_PA 0x40300000#define OMAP4_SRAM_VA 0xfe400000#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000)#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000) --1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 2/7 OMAP2+: use global values for the SRAM PA addresses
Hi Santosh,
Quoted 33 lines · Santosh Shilimkar
Quoted 33 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 2/7] OMAP2+: use global values for the SRAM PA addressesFrom: Jean Pihet <[email protected]>
The SRAM PA addresses are locally defined and used in both the SRAM management code and the idle sleep code.
A global macro defines the values at a centralized place, for easier maintenance.Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>---
?arch/arm/mach-omap2/sdrc.h | ? ?7 +++++++
?arch/arm/plat-omap/sram.c ?| ? ?7 ++-----
?2 files changed, 9 insertions(+), 5 deletions(-)arch/arm/mach-omap2/sdrc.h +0
-0@@ -74,5 +74,12 @@ static inline u32 sms_read_reg(u16 reg)? */
?#defineSDRC_MPURATE_LOOPS? ? ? ? ? 96
Quoted 11 lines
arch/arm/mach-omap2/sdrc.h static inline u32 sms_read_reg(u16 reg)
Quoted 8 lines
arch/arm/mach-omap2/sdrc.h +7
-0+/* +* OMAP2+: define the SRAM PA addresses. +* Used by the SRAM management code and the idle sleep code. +*/ +#define OMAP2_SRAM_PA ? ? ? ? ? ? ? ?0x40200000 +#define OMAP3_SRAM_PA ? ? ? ? ? 0x40200000 +#define OMAP4_SRAM_PA ? ? ? ? ? ? ? ?0x40300000Header choice is wrong. Certainly SDRC is not the place. Right place should be "#include <
plat/sram.h>" OMAP4 doesn't even have SDRC IP
This is correct
Furthermore it would have broken the OMAP1 build since sdrc.h is only included for OMAP2 & 3.
Nice catch!
Thanks,
Jean
Quoted 32 lines
Quoted 31 lines
?#endif
arch/arm/plat-omap/sram.c +0
-0@@ -41,15 +41,12 @@?#define
OMAP1_SRAM_PA? ? ? ? ? ? ? ?0x20000000
?#defineOMAP1_SRAM_VA? ? ? ? ? ? ? ?VMALLOC_ENDarch/arm/plat-omap/sram.c +1
-2-#define OMAP2_SRAM_PA ? ? ? ? ? ? ? ?0x40200000 -#define OMAP2_SRAM_PUB_PA ? ?0x4020f800 +#define OMAP2_SRAM_PUB_PA ? ?(OMAP2_SRAM_PA + 0xf800)?#define
OMAP2_SRAM_VA? ? ? ? ? ? ? ?0xfe400000 ?#defineOMAP2_SRAM_PUB_VA? ?(OMAP2_SRAM_VA +0x800) -#defineOMAP3_SRAM_PA? ? ? ? ?0x40200000?#defineOMAP3_SRAM_VA? ? ? ? ?0xfe400000arch/arm/plat-omap/sram.c +1
-1-#define OMAP3_SRAM_PUB_PA ? ? ? 0x40208000 +#define OMAP3_SRAM_PUB_PA ? ? ? (OMAP3_SRAM_PA + 0x8000)?#define
OMAP3_SRAM_PUB_VA? ? ? (OMAP3_SRAM_VA+0x8000) -#defineOMAP4_SRAM_PA? ? ? ? ? ? ? ?0x40300000 ?#defineOMAP4_SRAM_VA? ? ? ? ? ? ? ?0xfe400000 ?#defineOMAP4_SRAM_PUB_PA? ?(OMAP4_SRAM_PA +0x4000) ?#defineOMAP4_SRAM_PUB_VA? ?(OMAP4_SRAM_VA +0x4000) --
1.7.1--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
PATCH v4 3/7 OMAP3: remove hardcoded values from the ASM sleep code
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
Using macros from existing include files for registers addresses.
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Based on original patch from Vishwa.
--- arch/arm/mach-omap2/control.h | 2 ++ arch/arm/mach-omap2/sleep34xx.S | 29 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-)
arch/arm/mach-omap2/control.h +2 -0
@@ -274,6 +274,8 @@#define OMAP343X_SCRATCHPAD_ROM (OMAP343X_CTRL_BASE + 0x860)#define OMAP343X_SCRATCHPAD (OMAP343X_CTRL_BASE + 0x910)#define OMAP343X_SCRATCHPAD_ROM_OFFSET 0x19C +#define OMAP343X_SCRATCHPAD_REGADDR (reg) OMAP2_L4_IO_ADDRESS(\ + OMAP343X_SCRATCHPAD + reg)/* AM35XX_CONTROL_IPSS_CLK_CTRL bits */ #define AM35XX_USBOTG_VBUSP_CLK_SHIFT 0
arch/arm/mach-omap2/sleep34xx.S +18 -11
@@ -33,20 +33,27 @@ #include "sdrc.h" #include "control.h" -#define SDRC_SCRATCHPAD_SEM_V 0xfa00291c - -#define PM_PREPWSTST_CORE_P 0x48306AE8 +/* + * Registers access definitions + */ +#define SDRC_SCRATCHPAD_SEM_OFFS 0xc +#define SDRC_SCRATCHPAD_SEM_V OMAP343X_SCRATCHPAD_REGADDR\ + (SDRC_SCRATCHPAD_SEM_OFFS) +#define PM_PREPWSTST_CORE_P OMAP3430_PRM_BASE + CORE_MOD +\ + OMAP3430_PM_PREPWSTST #define PM_PWSTCTRL_MPU_P OMAP3430_PRM_BASE + MPU_MOD + OMAP2_PM_PWSTCTRL #define CM_IDLEST1_CORE_V OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST1) #define CM_IDLEST_CKGEN_V OMAP34XX_CM_REGADDR(PLL_MOD, CM_IDLEST) -#define SRAM_BASE_P 0x40200000 -#define CONTROL_STAT 0x480022F0 -#define CONTROL_MEM_RTA_CTRL (OMAP343X_CTRL_BASE\ - + OMAP36XX_CONTROL_MEM_RTA_CTRL) -#define SCRATCHPAD_MEM_OFFS 0x310 /* Move this as correct place is - * available */ -#define SCRATCHPAD_BASE_P (OMAP343X_CTRL_BASE + OMAP343X_CONTROL_MEM_WKUP\ - + SCRATCHPAD_MEM_OFFS) +#define SRAM_BASE_P OMAP3_SRAM_PA +#define CONTROL_STAT OMAP343X_CTRL_BASE + OMAP343X_CONTROL_STATUS +#define CONTROL_MEM_RTA_CTRL (OMAP343X_CTRL_BASE +\ + OMAP36XX_CONTROL_MEM_RTA_CTRL) + +/* Move this as correct place is available */ +#define SCRATCHPAD_MEM_OFFS 0x310 +#define SCRATCHPAD_BASE_P (OMAP343X_CTRL_BASE +\ + OMAP343X_CONTROL_MEM_WKUP +\ + SCRATCHPAD_MEM_OFFS) #define SDRC_POWER_V OMAP34XX_SDRC_REGADDR(SDRC_POWER) #define SDRC_SYSCONFIG_P (OMAP343X_SDRC_BASE + SDRC_SYSCONFIG) #define SDRC_MR_0_P (OMAP343X_SDRC_BASE + SDRC_MR_0)
Signature · 1 line
1.7.1
PATCH v4 4/7 OMAP3: re-organize the ASM sleep code
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
Organize the code in the following sections:
- register access macros,
- API functions,
- internal functions.
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/sleep34xx.S | 114 +++++++++++++++++++++------------------ 1 files changed, 61 insertions(+), 53 deletions(-)
arch/arm/mach-omap2/sleep34xx.S +61 -53
@@ -78,6 +78,7 @@ ENTRY(get_restore_pointer) ldmfd sp!, {pc} @ restore regs and return ENTRY(get_restore_pointer_sz) .word . - get_restore_pointer + .text /* Function call to get the restore pointer for 3630 resume from OFF */ ENTRY(get_omap3630_restore_pointer)
@@ -88,9 +89,18 @@ ENTRY(get_omap3630_restore_pointer_sz) .word . - get_omap3630_restore_pointer .text +/* Function call to get the restore pointer for ES3 to resume from OFF */ +ENTRY(get_es3_restore_pointer) + stmfd sp!, {lr} @ save registers on stack + adr r0, restore_es3 + ldmfd sp!, {pc} @ restore regs and return +ENTRY(get_es3_restore_pointer_sz) + .word . - get_es3_restore_pointer + + .text /* * L2 cache needs to be toggled for stable OFF mode functionality on 3630. - * This function sets up a fflag that will allow for this toggling to take + * This function sets up a flag that will allow for this toggling to take * place on 3630. Hopefully some version in the future maynot need this */ ENTRY(enable_omap3630_toggle_l2_on_restore)
@@ -100,58 +110,6 @@ ENTRY(enable_omap3630_toggle_l2_on_restore) str r1, l2dis_3630 ldmfd sp!, {pc} @ restore regs and return - .text -/* Function call to get the restore pointer for for ES3 to resume from OFF */ -ENTRY(get_es3_restore_pointer) - stmfd sp!, {lr} @ save registers on stack - adr r0, restore_es3 - ldmfd sp!, {pc} @ restore regs and return -ENTRY(get_es3_restore_pointer_sz) - .word . - get_es3_restore_pointer - -ENTRY(es3_sdrc_fix) - ldr r4, sdrc_syscfg @ get config addr - ldr r5, [r4] @ get value - tst r5, #0x100 @ is part access blocked - it eq - biceq r5, r5, #0x100 @ clear bit if set - str r5, [r4] @ write back change - ldr r4, sdrc_mr_0 @ get config addr - ldr r5, [r4] @ get value - str r5, [r4] @ write back change - ldr r4, sdrc_emr2_0 @ get config addr - ldr r5, [r4] @ get value - str r5, [r4] @ write back change - ldr r4, sdrc_manual_0 @ get config addr - mov r5, #0x2 @ autorefresh command - str r5, [r4] @ kick off refreshes - ldr r4, sdrc_mr_1 @ get config addr - ldr r5, [r4] @ get value - str r5, [r4] @ write back change - ldr r4, sdrc_emr2_1 @ get config addr - ldr r5, [r4] @ get value - str r5, [r4] @ write back change - ldr r4, sdrc_manual_1 @ get config addr - mov r5, #0x2 @ autorefresh command - str r5, [r4] @ kick off refreshes - bx lr -sdrc_syscfg: - .word SDRC_SYSCONFIG_P -sdrc_mr_0: - .word SDRC_MR_0_P -sdrc_emr2_0: - .word SDRC_EMR2_0_P -sdrc_manual_0: - .word SDRC_MANUAL_0_P -sdrc_mr_1: - .word SDRC_MR_1_P -sdrc_emr2_1: - .word SDRC_EMR2_1_P -sdrc_manual_1: - .word SDRC_MANUAL_1_P -ENTRY(es3_sdrc_fix_sz) - .word . - es3_sdrc_fix - /* Function to call rom code to save secure ram context */ ENTRY(save_secure_ram_context) stmfd sp!, {r1-r12, lr} @ save registers on stack
@@ -576,6 +534,56 @@ skip_l2_inval: /* restore regs and return */ ldmfd sp!, {r0-r12, pc} + +/* + * Internal functions + */ + + .text +ENTRY(es3_sdrc_fix) + ldr r4, sdrc_syscfg @ get config addr + ldr r5, [r4] @ get value + tst r5, #0x100 @ is part access blocked + it eq + biceq r5, r5, #0x100 @ clear bit if set + str r5, [r4] @ write back change + ldr r4, sdrc_mr_0 @ get config addr + ldr r5, [r4] @ get value + str r5, [r4] @ write back change + ldr r4, sdrc_emr2_0 @ get config addr + ldr r5, [r4] @ get value + str r5, [r4] @ write back change + ldr r4, sdrc_manual_0 @ get config addr + mov r5, #0x2 @ autorefresh command + str r5, [r4] @ kick off refreshes + ldr r4, sdrc_mr_1 @ get config addr + ldr r5, [r4] @ get value + str r5, [r4] @ write back change + ldr r4, sdrc_emr2_1 @ get config addr + ldr r5, [r4] @ get value + str r5, [r4] @ write back change + ldr r4, sdrc_manual_1 @ get config addr + mov r5, #0x2 @ autorefresh command + str r5, [r4] @ kick off refreshes + bx lr + +sdrc_syscfg: + .word SDRC_SYSCONFIG_P +sdrc_mr_0: + .word SDRC_MR_0_P +sdrc_emr2_0: + .word SDRC_EMR2_0_P +sdrc_manual_0: + .word SDRC_MANUAL_0_P +sdrc_mr_1: + .word SDRC_MR_1_P +sdrc_emr2_1: + .word SDRC_EMR2_1_P +sdrc_manual_1: + .word SDRC_MANUAL_1_P +ENTRY(es3_sdrc_fix_sz) + .word . - es3_sdrc_fix + /* Make sure SDRC accesses are ok */ wait_sdrc_ok:
Signature · 1 line
1.7.1
PATCH v4 5/7 OMAP3: rework of the ASM sleep code execution paths
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
- Reworked and simplified the execution paths for better readability and to avoid duplication of code,
- Added comments on the entry and exit points and the interaction with the ROM code for OFF mode restore,
- Reworked the existing comments for better readability.
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/control.c | 10 +- arch/arm/mach-omap2/sleep34xx.S | 309 ++++++++++++++++++++++---------------- 2 files changed, 188 insertions(+), 131 deletions(-)
arch/arm/mach-omap2/control.c +9 -1
@@ -239,7 +239,15 @@ void omap3_save_scratchpad_contents(void)struct omap3_scratchpad_prcm_block prcm_block_contents;struct omap3_scratchpad_sdrc_block sdrc_block_contents; -/* Populate the Scratchpad contents */ +/* +* Populate the Scratchpad contents +* +* The get_*restore_pointer functions are used to get the resume +* function pointer to be called by the ROM code when back from WFI +* in OFF mode. +* The restore pointer is stored into the scratchpad for later access +* by the ROM code. +*/ scratchpad_contents.boot_config_ptr =0x0 ;if (cpu_is_omap3630 ()) scratchpad_contents.public_restore_ptr =
arch/arm/mach-omap2/sleep34xx.S +179 -130
368 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v4 5/7 OMAP3: rework of the ASM sleep code execution paths
Quoted 17 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 5/7] OMAP3: rework of the ASM sleep code execution pathsFrom: Jean Pihet <[email protected]>
- Reworked and simplified the execution paths for better readability and to avoid duplication of code,
- Added comments on the entry and exit points and the interaction with the ROM code for OFF mode restore,
- Reworked the existing comments for better readability.
Quoted 7 lines
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>--- arch/arm/mach-omap2/control.c | 10 +- arch/arm/mach-omap2/sleep34xx.S | 309
++++++++++++++++++++++------------
Review
Quoted 4 lines
----
2 files changed, 188 insertions(+), 131 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.c void omap3_save_scratchpad_contents(void) · line 246
Quoted 13 lines
index 728f268..5cb7276 100644
arch/arm/mach-omap2/control.c +5
-1@@ -239,7 +239,15 @@ void omap3_save_scratchpad_contents(void)struct omap3_scratchpad_prcm_block prcm_block_contents;struct omap3_scratchpad_sdrc_block sdrc_block_contents; -/* Populate the Scratchpad contents */ +/* +* Populate the Scratchpad contents +* +* The get_*restore_pointer functions are used to get the resume +* function pointer to be called by the ROM code when back from
WFI
arch/arm/mach-omap2/control.c void omap3_save_scratchpad_contents(void) · line 247
Quoted 1 line
arch/arm/mach-omap2/control.c +1
-0+* in OFF mode.
Align your text here.
arch/arm/mach-omap2/control.c void omap3_save_scratchpad_contents(void) · line 249
Quoted 3 lines
arch/arm/mach-omap2/control.c +1
-0+* The restore pointer is stored into the scratchpad for later access
arch/arm/mach-omap2/control.c +1
-0+* by the ROM code.
The text needs to be reworked a bit.
The "get_*restore_pointer" functions are used to provide a physical restore
address where ROM code jumps while waking up from MPU OFF/OSWR state. The restore pointer is stored into the scratchpad
Quoted 10 lines
arch/arm/mach-omap2/control.c +1
-0+*/ scratchpad_contents.boot_config_ptr =0x0 ;if (cpu_is_omap3630 ()) scratchpad_contents.public_restore_ptr =arch/arm/mach- renamed from arch/arm/mach-omap2/sleep34xx.S +0
-0
omap2/sleep34xx.S
index 426af02..55ddd5a 100644
arch/arm/mach-omap2/sleep34xx.S line 76
Quoted 7 lines
arch/arm/mach-omap2/sleep34xx.S +4
-0@@ -70,6 +70,11 @@ * API functions */ +/* + * The get_*restore_pointer functions are returning the resume + * function pointer to be called by the ROM code when back from WFI + * in OFF mode.
Ditto
The "get_*restore_pointer" functions are used to provide a physical restore
address where ROM code jumps while waking up from MPU OFF/OSWR state. The restore pointer is stored into the scratchpad
arch/arm/mach-omap2/sleep34xx.S ENTRY(get_es3_restore_pointer_sz) · line 107
Quoted 7 lines
arch/arm/mach-omap2/sleep34xx.S +1
-0+ */ .text /* Function call to get the restore pointer for resume from OFF */ ENTRY(get_restore_pointer)@@ -101,7 +106,7 @@ ENTRY(get_es3_restore_pointer_sz) /* * L2 cache needs to be toggled for stable OFF mode functionality on
3630.
arch/arm/mach-omap2/sleep34xx.S ENTRY(get_es3_restore_pointer_sz) · line 108
Quoted 1 line
arch/arm/mach-omap2/sleep34xx.S +0
-0* This function sets up a flag that will allow for this toggling to
take
arch/arm/mach-omap2/sleep34xx.S ENTRY(get_es3_restore_pointer_sz) · line 109
Quoted 2 lines
arch/arm/mach-omap2/sleep34xx.S +1
-1- * place on 3630. Hopefully some version in the future maynot need this + * place on 3630. Hopefully some version in the future maynot need
this.
'maynot' ..... may not
Quoted 8 lines
arch/arm/mach-omap2/sleep34xx.S +1
-0*/ ENTRY(enable_omap3630_toggle_l2_on_restore) stmfd sp!, {lr} @ save registers on stack@@ -143,34 +148,156 @@ ENTRY(save_secure_ram_context_sz) .word . - save_secure_ram_context /* + * ======================
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz) · line 159
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +6
-2+ * == Idle entry point == + * ====================== + */ + +/* * Forces OMAP into idle state * - * omap34xx_suspend() - This bit of code just executes the WFI - * for normal idles. + * omap34xx_suspend() - This bit of code saves the CPU context if
needed
Quoted 9 lines
arch/arm/mach-omap2/sleep34xx.S +6
-2+ * and executes the WFI instruction * - * 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. + * Notes: + * - this code gets copied to internal SRAM at boot. + * - when the OMAP wakes up it continues at different execution points + * depending on the low power mode (non-OFF vs OFF modes), + * cf. 'Resume path for xxx mode' comments.
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz)
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +0
-6*/ ENTRY(omap34xx_cpu_suspend) stmfd sp!, {r0-r12, lr} @ save registers on stack - /* r0 contains restore pointer in sdram */ - /* r1 contains information about saving context */ - ldr r4, sdrc_power @ read the SDRC_POWER register - ldr r5, [r4] @ read the contents of SDRC_POWER - orr r5, r5, #0x40 @ enable self refresh on idle req - str r5, [r4] @ write back to SDRC_POWER
register
Quoted 9 lines
arch/arm/mach-omap2/sleep34xx.S +8
-0+ /* + * r0 contains restore pointer in sdram + * r1 contains information about saving context: + * 0 - No context lost + * 1 - Only L1 and logic lost + * 2 - Only L2 lost + * 3 - Both L1 and L2 lost + */
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz)
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +7
-2+ /* Save context only if required */ cmp r1, #0x0 - /* If context save is required, do that and execute wfi */ - bne save_context_wfi + beq omap3_do_wfi + +save_context_wfi: + mov r8, r0 @ Store SDRAM address in r8 + mrc p15, 0, r5, c1, c0, 1 @ Read Auxiliary Control Register + mov r4, #0x1 @ Number of parameters for restore
call
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz)
Quoted 6 lines
arch/arm/mach-omap2/sleep34xx.S +6
-0+ stmia r8!, {r4-r5} @ Push parameters for restore call + mrc p15, 1, r5, c9, c0, 2 @ Read L2 AUX ctrl register + stmia r8!, {r4-r5} @ Push parameters for restore call + + /* Check what that target sleep state is from r1 */ + cmp r1, #0x2 @ Only L2 lost, no need to save
context
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz) · line 203
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +10
-0+ beq clean_caches + +l1_logic_lost: + /* Store sp and spsr to SDRAM */ + mov r4, sp + mrs r5, spsr + mov r6, lr + stmia r8!, {r4-r6} + /* Save all ARM registers */ + /* Coprocessor access control register */
You might want to fix above commenting style as well
Quoted 29 lines
arch/arm/mach-omap2/sleep34xx.S +18
-0+ mrc p15, 0, r6, c1, c0, 2 + stmia r8!, {r6} + /* TTBR0, TTBR1 and Translation table base control */ + mrc p15, 0, r4, c2, c0, 0 + mrc p15, 0, r5, c2, c0, 1 + mrc p15, 0, r6, c2, c0, 2 + stmia r8!, {r4-r6} + /* + * Domain access control register, data fault status register, + * and instruction fault status register + */ + mrc p15, 0, r4, c3, c0, 0 + mrc p15, 0, r5, c5, c0, 0 + mrc p15, 0, r6, c5, c0, 1 + stmia r8!, {r4-r6} + /* + * Data aux fault status register, instruction aux fault status, + * data fault address register and instruction fault addressregister
arch/arm/mach-omap2/sleep34xx.S +10
-0+ */ + mrc p15, 0, r4, c5, c1, 0 + mrc p15, 0, r5, c5, c1, 1 + mrc p15, 0, r6, c6, c0, 0 + mrc p15, 0, r7, c6, c0, 2 + stmia r8!, {r4-r7} + /* + * user r/w thread and process ID, user r/o thread and process ID, + * priv only thread and process ID, cache size selection + */
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz)
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +10
-0+ mrc p15, 0, r4, c13, c0, 2 + mrc p15, 0, r5, c13, c0, 3 + mrc p15, 0, r6, c13, c0, 4 + mrc p15, 2, r7, c0, c0, 0 + stmia r8!, {r4-r7} + /* Data TLB lockdown, instruction TLB lockdown registers */ + mrc p15, 0, r5, c10, c0, 0 + mrc p15, 0, r6, c10, c0, 1 + stmia r8!, {r5-r6} + /* Secure or non secure vector base address, FCSE PID, Context
PID*/
Quoted 11 lines
arch/arm/mach-omap2/sleep34xx.S +11
-0+ mrc p15, 0, r4, c12, c0, 0 + mrc p15, 0, r5, c13, c0, 0 + mrc p15, 0, r6, c13, c0, 1 + stmia r8!, {r4-r6} + /* Primary remap, normal remap registers */ + mrc p15, 0, r4, c10, c2, 0 + mrc p15, 0, r5, c10, c2, 1 + stmia r8!,{r4-r5} + + /* Store current cpsr*/ + mrs r2, cpsr
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz) · line 262
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +10
-0+ stmia r8!, {r2} + + mrc p15, 0, r4, c1, c0, 0 + /* save control register */ + stmia r8!, {r4} + +clean_caches: + /* Clean Data or unified cache to POU*/ + /* How to invalidate only L1 cache???? - #FIX_ME# */ + /* mcr p15, 0, r11, c7, c11, 1 */
And this one too...
arch/arm/mach-omap2/sleep34xx.S
Quoted 1 line
arch/arm/mach-omap2/sleep34xx.S +1
-0+ cmp r1, #0x1 @ Check whether L2 inval is
required
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +7
-0+ beq omap3_do_wfi + +clean_l2: + /* + * jump out to kernel flush routine + * - reuse that code is better + * - it executes in a cached space so is faster than refetch per-block
arch/arm/mach-omap2/sleep34xx.S +2
-0+ * - should be faster and will change with kernel + * - 'might' have to copy address, load and jump to it
arch/arm/mach-omap2/sleep34xx.S ENTRY(save_secure_ram_context_sz)
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +10
-0+ */ + ldr r1, kernel_flush + mov lr, pc + bx r1 + +omap3_do_wfi: + ldr r4, sdrc_power @ read the SDRC_POWER register + ldr r5, [r4] @ read the contents of SDRC_POWER + orr r5, r5, #0x40 @ enable self refresh on idle req + str r5, [r4] @ write back to SDRC_POWER
register
Quoted 81 lines
arch/arm/mach-omap2/sleep34xx.S +37
-3+ /* Data memory barrier and Data sync barrier */ mov r1, #0 mcr p15, 0, r1, c7, c10, 4 mcr p15, 0, r1, c7, c10, 5 +/* + * =================================== + * == WFI instruction => Enter idle == + * =================================== + */ wfi @ wait for interrupt +/* + * =================================== + * == Resume path for non-OFF modes == + * =================================== + */ nop nop nop@@ -183,7 +310,29 @@ ENTRY(omap34xx_cpu_suspend) nop bl wait_sdrc_ok - ldmfd sp!, {r0-r12, pc} @ restore regs and return +/* + * =================================== + * == Exit point from non-OFF modes == + * =================================== + */ + ldmfd sp!, {r0-r12, pc} @ restore regs and return + + +/* + * ============================== + * == Resume path for OFF mode == + * ============================== + */ + +/* + * The restore_* functions are called by the ROM code + * when back from WFI in OFF mode. + * Cf. the get_*restore_pointer functions. + * + * restore_es3: applies to 34xx >= ES3.0 + * restore_3630: applies to 36xx + * restore: common code for 3xxx + */ restore_es3: ldr r5, pm_prepwstst_core_p ldr r4, [r5]@@ -213,12 +362,17 @@ restore_3630: ldr r1, control_mem_rta mov r2, #OMAP36XX_RTA_DISABLE str r2, [r1] - /* Fall thru for the remaining logic */ + + /* Fall thru to common code for the remaining logic */ + restore: - /* Check what was the reason for mpu reset and store the reasonin r9*/
arch/arm/mach-omap2/sleep34xx.S +2
-3- /* 1 - Only L1 and logic lost */ - /* 2 - Only L2 lost - In this case, we wont be here */ - /* 3 - Both L1 and L2 lost */ + /* + * Check what was the reason for mpu reset and store the reason inr9:
arch/arm/mach-omap2/sleep34xx.S +5
-0+ * 0 - No context lost + * 1 - Only L1 and logic lost + * 2 - Only L2 lost - In this case, we wont be here + * 3 - Both L1 and L2 lost + */ ldr r1, pm_pwstctrl_mpu ldr r2, [r1] and r2, r2, #0x3@@ -421,118 +575,12 @@ usettbr0: and r4, r2 mcr p15, 0, r4, c1, c0, 0
arch/arm/mach-omap2/sleep34xx.S usettbr0: · line 428
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +5
-4+/* + * ============================== + * == Exit point from OFF mode == + * ============================== + */ ldmfd sp!, {r0-r12, pc} @ restore regs and return -save_context_wfi: - mov r8, r0 /* Store SDRAM address in r8 */ - mrc p15, 0, r5, c1, c0, 1 @ Read Auxiliary Control Register - mov r4, #0x1 @ Number of parameters for restore
call
Quoted 44 lines
arch/arm/mach-omap2/sleep34xx.S +0
-36- stmia r8!, {r4-r5} @ Push parameters for restore call - mrc p15, 1, r5, c9, c0, 2 @ Read L2 AUX ctrl register - stmia r8!, {r4-r5} @ Push parameters for restore call - /* Check what that target sleep state is:stored in r1*/ - /* 1 - Only L1 and logic lost */ - /* 2 - Only L2 lost */ - /* 3 - Both L1 and L2 lost */ - cmp r1, #0x2 /* Only L2 lost */ - beq clean_l2 - cmp r1, #0x1 /* L2 retained */ - /* r9 stores whether to clean L2 or not*/ - moveq r9, #0x0 /* Dont Clean L2 */ - movne r9, #0x1 /* Clean L2 */ -l1_logic_lost: - /* Store sp and spsr to SDRAM */ - mov r4, sp - mrs r5, spsr - mov r6, lr - stmia r8!, {r4-r6} - /* Save all ARM registers */ - /* Coprocessor access control register */ - mrc p15, 0, r6, c1, c0, 2 - stmia r8!, {r6} - /* TTBR0, TTBR1 and Translation table base control */ - mrc p15, 0, r4, c2, c0, 0 - mrc p15, 0, r5, c2, c0, 1 - mrc p15, 0, r6, c2, c0, 2 - stmia r8!, {r4-r6} - /* Domain access control register, data fault status register, - and instruction fault status register */ - mrc p15, 0, r4, c3, c0, 0 - mrc p15, 0, r5, c5, c0, 0 - mrc p15, 0, r6, c5, c0, 1 - stmia r8!, {r4-r6} - /* Data aux fault status register, instruction aux fault status, - datat fault address register and instruction fault addressregister*/
arch/arm/mach-omap2/sleep34xx.S +0
-7- mrc p15, 0, r4, c5, c1, 0 - mrc p15, 0, r5, c5, c1, 1 - mrc p15, 0, r6, c6, c0, 0 - mrc p15, 0, r7, c6, c0, 2 - stmia r8!, {r4-r7} - /* user r/w thread and process ID, user r/o thread and process ID, - priv only thread and process ID, cache size selection */
arch/arm/mach-omap2/sleep34xx.S usettbr0:
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +0
-10- mrc p15, 0, r4, c13, c0, 2 - mrc p15, 0, r5, c13, c0, 3 - mrc p15, 0, r6, c13, c0, 4 - mrc p15, 2, r7, c0, c0, 0 - stmia r8!, {r4-r7} - /* Data TLB lockdown, instruction TLB lockdown registers */ - mrc p15, 0, r5, c10, c0, 0 - mrc p15, 0, r6, c10, c0, 1 - stmia r8!, {r5-r6} - /* Secure or non secure vector base address, FCSE PID, Context
PID*/
Quoted 72 lines
arch/arm/mach-omap2/sleep34xx.S +0
-27- mrc p15, 0, r4, c12, c0, 0 - mrc p15, 0, r5, c13, c0, 0 - mrc p15, 0, r6, c13, c0, 1 - stmia r8!, {r4-r6} - /* Primary remap, normal remap registers */ - mrc p15, 0, r4, c10, c2, 0 - mrc p15, 0, r5, c10, c2, 1 - stmia r8!,{r4-r5} - - /* Store current cpsr*/ - mrs r2, cpsr - stmia r8!, {r2} - - mrc p15, 0, r4, c1, c0, 0 - /* save control register */ - stmia r8!, {r4} -clean_caches: - /* Clean Data or unified cache to POU*/ - /* How to invalidate only L1 cache???? - #FIX_ME# */ - /* mcr p15, 0, r11, c7, c11, 1 */ - cmp r9, #1 /* Check whether L2 inval is required or not*/ - bne skip_l2_inval -clean_l2: - /* - * Jump out to kernel flush routine - * - reuse that code is better - * - it executes in a cached space so is faster than refetch per-block
arch/arm/mach-omap2/sleep34xx.S +1
-28- * - should be faster and will change with kernel - * - 'might' have to copy address, load and jump to it - */ - ldr r1, kernel_flush - mov lr, pc - bx r1 - -skip_l2_inval: - /* Data memory barrier and Data sync barrier */ - mov r1, #0 - mcr p15, 0, r1, c7, c10, 4 - mcr p15, 0, r1, c7, c10, 5 - - wfi @ wait for interrupt - nop - nop - nop - nop - nop - nop - nop - nop - nop - nop - bl wait_sdrc_ok - /* restore regs and return */ - ldmfd sp!, {r0-r12, pc} /*@@ -682,5 +730,6 @@ kick_counter: .word 0 wait_dll_lock_counter: .word 0 + ENTRY(omap34xx_cpu_suspend_sz) .word . - omap34xx_cpu_suspend --1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 5/7 OMAP3: rework of the ASM sleep code execution paths
Quoted 49 lines · Santosh Shilimkar
Quoted 17 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 5/7] OMAP3: rework of the ASM sleep code execution pathsFrom: Jean Pihet <[email protected]>
- Reworked and simplified the execution paths for better ? readability and to avoid duplication of code,
- Added comments on the entry and exit points and the interaction ? with the ROM code for OFF mode restore,
- Reworked the existing comments for better readability.Quoted 7 lines
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>---
?arch/arm/mach-omap2/control.c ? | ? 10 +-
?arch/arm/mach-omap2/sleep34xx.S | ?309++++++++++++++++++++++------------
Review
Quoted 4 lines
----
?2 files changed, 188 insertions(+), 131 deletions(-)(quoted diff) +0
-0
b/arch/arm/mach-omap2/control.carch/arm/mach-omap2/control.c void omap3_save_scratchpad_contents(void) · line 246
Quoted 13 lines
index 728f268..5cb7276 100644
arch/arm/mach-omap2/control.c +5
-1@@ -239,7 +239,15 @@ void omap3_save_scratchpad_contents(void) ? ? ? struct omap3_scratchpad_prcm_block prcm_block_contents; ? ? ? struct omap3_scratchpad_sdrc_block sdrc_block_contents; - ? ? /* Populate the Scratchpad contents */ + ? ? /* +? ? ?* Populate the Scratchpad contents +? ? ?* +? ? ?* The get_*restore_pointer functions are used to get the resume +? ? ?* ?function pointer to be called by the ROM code when back from WFI
arch/arm/mach-omap2/control.c void omap3_save_scratchpad_contents(void) · line 247
Quoted 1 line
arch/arm/mach-omap2/control.c +1
-0+ ? ? ?* ?in OFF mode.Align your text here.
Quoted 3 lines
arch/arm/mach-omap2/control.c +1
-0+ ? ? ?* The restore pointer is stored into the scratchpad for lateraccess
+ ? ? ?* ?by the ROM code.
Quoted 6 lines
The text needs to be reworked a bit.
The "get_*restore_pointer" functions are used to provide a physical restore
address where ROM code jumps while waking up from MPU OFF/OSWR state. The restore pointer is stored into the scratchpad
That sounds better. Fixed.
Quoted 14 lines
Quoted 14 lines
+ ? ? ?*/
? ? ? scratchpad_contents.boot_config_ptr =0x0; ? ? ? if (cpu_is_omap3630())
? ? ? ? ? ? ? scratchpad_contents.public_restore_ptr =arch/arm/mach- renamed from arch/arm/mach-omap2/sleep34xx.S +0
-0
omap2/sleep34xx.S
index 426af02..55ddd5a 100644arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -70,6 +70,11 @@? * API functions
? */
Quoted 9 lines
Quoted 4 lines
+/*
+ * The get_*restore_pointer functions are returning the resume
+ * ?function pointer to be called by the ROM code when back from WFI
+ * ?in OFF mode.Ditto
The "get_*restore_pointer" functions are used to provide a physical restore
address where ROM code jumps while waking up from MPU OFF/OSWR state. The restore pointer is stored into the scratchpad
Idem
Quoted 9 lines
Quoted 8 lines
+ */
? ? ? .text
?/* Function call to get the restore pointer for resume from OFF */ ?ENTRY(get_restore_pointer)arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -101,7 +106,7 @@ ENTRY(get_es3_restore_pointer_sz)?/*
? * L2 cache needs to be toggled for stable OFF mode functionality on3630.
Quoted 6 lines
Quoted 1 line
? * This function sets up a flag that will allow for this toggling to
take
Quoted 2 lines
- * place on 3630. Hopefully some version in the future maynot need this
+ * place on 3630. Hopefully some version in the future maynot needthis.
'maynot' ..... may not
Fixed
Quoted 377 lines
Quoted 13 lines
? */ ?ENTRY(enable_omap3630_toggle_l2_on_restore)
? ? ? ? ?stmfd ? sp!, {lr} ? ? @ save registers on stackarch/arm/mach-omap2/sleep34xx.S +0
-0@@ -143,34 +148,156 @@ ENTRY(save_secure_ram_context_sz)? ? ? .word ? . -
save_secure_ram_context?/*
+ * ======================
+ * == Idle entry point ==
+ * ======================
+ */arch/arm/mach-omap2/sleep34xx.S +2
-0+ +/*Quoted 5 lines
? * Forces OMAP into idle state
? *
- *omap34xx_suspend()- This bit of code just executes the WFI
- * for normal idles.
+ *omap34xx_suspend()- This bit of code saves the CPU context ifneeded
Quoted 13 lines
+ * and executes the WFI instruction
? *
- * 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.
+ * Notes:
+ * - this code gets copied to internal SRAM at boot.
+ * - when the OMAP wakes up it continues at different execution points
+ * ? depending on the low power mode (non-OFF vs OFF modes),
+ * ? cf. 'Resume path for xxx mode' comments.
? */
?ENTRY(omap34xx_cpu_suspend)
? ? ? stmfd ? sp!, {r0-r12, lr} ? ? ? ? ? ? ? @ save registers on stackQuoted 6 lines
- ? ? /* r0 contains restore pointer in sdram */
- ? ? /* r1 contains information about saving context */
- ? ? ldr ? ? r4,sdrc_power? ? ? ? ?@ read theSDRC_POWERregister
- ? ? ldr ? ? r5, [r4] ? ? ? ? ? ? ? ?@ read the contents ofSDRC_POWER
- ? ? orr ? ? r5, r5, #0x40 ? ? ? ? ? @ enable self refresh on idle req
- ? ? str ? ? r5, [r4] ? ? ? ? ? ? ? ?@ write back toSDRC_POWERregister
Quoted 14 lines
+ ? ? /*
+ ? ? ?* r0 contains restore pointer in sdram
+ ? ? ?* r1 contains information about saving context:
+ ? ? ?* ? 0 - No context lost
+ ? ? ?* ? 1 - Only L1 and logic lost
+ ? ? ?* ? 2 - Only L2 lost
+ ? ? ?* ? 3 - Both L1 and L2 lost
+ ? ? ?*/+ ? ? /* Save context only if required */
? ? ? cmp ? ? r1, #0x0
- ? ? /* If context save is required, do that and execute wfi */
- ? ? bne ? ?save_context_wfi
+ ? ? beq ? ?omap3_do_wfiarch/arm/mach-omap2/sleep34xx.S
Quoted 5 lines
arch/arm/mach-omap2/sleep34xx.S +5
-0+ +save_context_wfi: + ? ? mov ? ? r8, r0 ? ? ? ? ? ? ? ? ?@ Store SDRAM address in r8 + ? ? mrc ? ? p15, 0, r5, c1, c0, 1 ? @ Read Auxiliary Control Register + ? ? mov ? ? r4, #0x1 ? ? ? ? ? ? ? ?@ Number of parameters for restorecall
Quoted 6 lines
+ ? ? stmia ? r8!, {r4-r5} ? ? ? ? ? ?@ Push parameters for restore call
+ ? ? mrc ? ? p15, 1, r5, c9, c0, 2 ? @ Read L2 AUX ctrl register
+ ? ? stmia ? r8!, {r4-r5} ? ? ? ? ? ?@ Push parameters for restore call +
+ ? ? ? ?/* Check what that target sleep state is from r1 */
+ ? ? cmp ? ? r1, #0x2 ? ? ? ? ? ? ? ?@ Only L2 lost, no need to savecontext
arch/arm/mach-omap2/sleep34xx.S
Quoted 10 lines
+ ? ? beq ? ?
clean_cachesarch/arm/mach-omap2/sleep34xx.S +9
-0+ +l1_logic_lost: + ? ? /* Store sp and spsr to SDRAM */ + ? ? mov ? ? r4, sp + ? ? mrs ? ? r5, spsr + ? ? mov ? ? r6, lr + ? ? stmia ? r8!, {r4-r6} + ? ? /* Save all ARM registers */ + ? ? /* Coprocessor access control register */You might want to fix above commenting style as well
Quoted 31 lines
+ ? ? mrc ? ? p15, 0, r6, c1, c0, 2
+ ? ? stmia ? r8!, {r6}
+ ? ? /* TTBR0, TTBR1 and Translation table base control */
+ ? ? mrc ? ? p15, 0, r4, c2, c0, 0
+ ? ? mrc ? ? p15, 0, r5, c2, c0, 1
+ ? ? mrc ? ? p15, 0, r6, c2, c0, 2
+ ? ? stmia ? r8!, {r4-r6}
+ ? ? /*
+ ? ? ?* Domain access control register, data fault status register,
+ ? ? ?* and instruction fault status register
+ ? ? ?*/
+ ? ? mrc ? ? p15, 0, r4, c3, c0, 0
+ ? ? mrc ? ? p15, 0, r5, c5, c0, 0
+ ? ? mrc ? ? p15, 0, r6, c5, c0, 1
+ ? ? stmia ? r8!, {r4-r6}
+ ? ? /*
+ ? ? ?* Data aux fault status register, instruction aux fault status,
+ ? ? ?* data fault address register and instruction fault address register
+ ? ? ?*/
+ ? ? mrc ? ? p15, 0, r4, c5, c1, 0
+ ? ? mrc ? ? p15, 0, r5, c5, c1, 1
+ ? ? mrc ? ? p15, 0, r6, c6, c0, 0
+ ? ? mrc ? ? p15, 0, r7, c6, c0, 2
+ ? ? stmia ? r8!, {r4-r7}
+ ? ? /*
+ ? ? ?* user r/w thread and process ID, user r/o thread and process ID,
+ ? ? ?* priv only thread and process ID, cache size selection
+ ? ? ?*/
+ ? ? mrc ? ? p15, 0, r4, c13, c0, 2
+ ? ? mrc ? ? p15, 0, r5, c13, c0, 3Quoted 8 lines
+ ? ? mrc ? ? p15, 0, r6, c13, c0, 4
+ ? ? mrc ? ? p15, 2, r7, c0, c0, 0
+ ? ? stmia ? r8!, {r4-r7}
+ ? ? /* Data TLB lockdown, instruction TLB lockdown registers */
+ ? ? mrc ? ? p15, 0, r5, c10, c0, 0
+ ? ? mrc ? ? p15, 0, r6, c10, c0, 1
+ ? ? stmia ? r8!, {r5-r6}
+ ? ? /* Secure or non secure vector base address, FCSE PID, ContextPID*/
Quoted 11 lines
+ ? ? mrc ? ? p15, 0, r4, c12, c0, 0
+ ? ? mrc ? ? p15, 0, r5, c13, c0, 0
+ ? ? mrc ? ? p15, 0, r6, c13, c0, 1
+ ? ? stmia ? r8!, {r4-r6}
+ ? ? /* Primary remap, normal remap registers */
+ ? ? mrc ? ? p15, 0, r4, c10, c2, 0
+ ? ? mrc ? ? p15, 0, r5, c10, c2, 1
+ ? ? stmia ? r8!,{r4-r5}arch/arm/mach-omap2/sleep34xx.S +3
-0+ + ? ? /* Store current cpsr*/ + ? ? mrs ? ? r2, cpsrarch/arm/mach-omap2/sleep34xx.S
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +10
-0+ ? ? stmia ? r8!, {r2} + + ? ? mrc ? ? p15, 0, r4, c1, c0, 0 + ? ? /* save control register */ + ? ? stmia ? r8!, {r4} + +clean_caches: + ? ? /* Clean Data or unified cache to POU*/ + ? ? /* How to invalidate only L1 cache???? - #FIX_ME# */ + ? ? /* mcr ?p15, 0, r11, c7, c11, 1 */And this one too...
Quoted 1 line
+ ? ? cmp ? ? r1, #0x1 ? ? ? ? ? ? ? ?@ Check whether L2 inval is
required
Quoted 14 lines
+ ? ? beq ? ?
omap3_do_wfiarch/arm/mach-omap2/sleep34xx.S +6
-0+ +clean_l2: + ? ? /* + ? ? ?* jump out to kernel flush routine + ? ? ?* ?- reuse that code is better + ? ? ?* ?- it executes in a cached space so is faster than refetch per-block
+ ? ? ?* ?- should be faster and will change with kernel
+ ? ? ?* ?- 'might' have to copy address, load and jump to it
+ ? ? ?*/
+ ? ? ldr r1,kernel_flush
+ ? ? mov lr, pc
+ ? ? bx ?r1arch/arm/mach-omap2/sleep34xx.S
Quoted 6 lines
arch/arm/mach-omap2/sleep34xx.S +6
-0+ +omap3_do_wfi: + ? ? ldr ? ? r4, sdrc_power ? ? ? ? ?@ read the SDRC_POWER register + ? ? ldr ? ? r5, [r4] ? ? ? ? ? ? ? ?@ read the contents of SDRC_POWER + ? ? orr ? ? r5, r5, #0x40 ? ? ? ? ? @ enable self refresh on idle req + ? ? str ? ? r5, [r4] ? ? ? ? ? ? ? ?@ write back to SDRC_POWERregister
Quoted 81 lines
+
? ? ? /* Data memory barrier and Data sync barrier */ ? ? ? mov ? ? r1, #0
? ? ? mcr ? ? p15, 0, r1, c7, c10, 4
? ? ? mcr ? ? p15, 0, r1, c7, c10, 5+/*
+ * ===================================
+ * == WFI instruction => Enter idle ==
+ * ===================================
+ */
? ? ? wfi ? ? ? ? ? ? ? ? ? ? ? ? ? ? @ wait for interrupt+/*
+ * ===================================
+ * == Resume path for non-OFF modes ==
+ * ===================================
+ */
? ? ? nop
? ? ? nop
? ? ? noparch/arm/mach-omap2/sleep34xx.S +0
-0@@ -183,7 +310,29 @@ ENTRY(omap34xx_cpu_suspend)? ? ? nop
? ? ? blwait_sdrc_ok- ? ? ldmfd ? sp!, {r0-r12, pc} ? ? ? ? ? ? ? @ restore regs and return
arch/arm/mach-omap2/sleep34xx.S +23
-0+/* + * =================================== + * == Exit point from non-OFF modes == + * =================================== + */ + ? ? ldmfd ? sp!, {r0-r12, pc} ? ? ? @ restore regs and return + + +/* + * ============================== + * == Resume path for OFF mode == + * ============================== + */ + +/* + * The restore_* functions are called by the ROM code + * ?when back from WFI in OFF mode. + * Cf. the get_*restore_pointer functions. + * + * ?restore_es3: applies to 34xx >= ES3.0 + * ?restore_3630: applies to 36xx + * ?restore: common code for 3xxx + */?restore_es3:
? ? ? ldr ? ? r5,pm_prepwstst_core_p
? ? ? ldr ? ? r4, [r5]arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -213,12 +362,17 @@ restore_3630:? ? ? ldr ? ? r1,
control_mem_rta
? ? ? mov ? ? r2, #OMAP36XX_RTA_DISABLE
? ? ? str ? ? r2, [r1]
- ? ? /* Fall thru for the remaining logic */arch/arm/mach-omap2/sleep34xx.S +3
-0+ + ? ? /* Fall thru to common code for the remaining logic */ +?restore:
- ? ? ? ?/* Check what was the reason for mpu reset and store the reason in r9*/
- ? ? ? ?/* 1 - Only L1 and logic lost */
- ? ? ? ?/* 2 - Only L2 lost - In this case, we wont be here */
- ? ? ? ?/* 3 - Both L1 and L2 lost */
+ ? ? ? ?/*
+ ? ? ?* Check what was the reason for mpu reset and store the reason in r9:
+ ? ? ?* ?0 - No context lost
+ ? ? ? ? * ?1 - Only L1 and logic lost
+ ? ? ? ? * ?2 - Only L2 lost - In this case, we wont be here
+ ? ? ? ? * ?3 - Both L1 and L2 lost
+ ? ? ?*/
? ? ? ldr ? ? r1,pm_pwstctrl_mpu
? ? ? ldr ? ? r2, [r1]
? ? ? and ? ? r2, r2, #0x3arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -421,118 +575,12 @@ usettbr0:? ? ? and ? ? r4, r2
? ? ? mcr ? ? p15, 0, r4, c1, c0, 0Quoted 10 lines
+/*
+ * ==============================
+ * == Exit point from OFF mode ==
+ * ==============================
+ */
? ? ? ldmfd ? sp!, {r0-r12, pc} ? ? ? ? ? ? ? @ restore regs and return -save_context_wfi:
- ? ? mov ? ? r8, r0 /* Store SDRAM address in r8 */
- ? ? mrc ? ? p15, 0, r5, c1, c0, 1 ? @ Read Auxiliary Control Register
- ? ? mov ? ? r4, #0x1 ? ? ? ? ? ? ? ?@ Number of parameters for restorecall
Quoted 46 lines
- ? ? stmia ? r8!, {r4-r5} ? ? ? ? ? ?@ Push parameters for restore call
- ? ? mrc ? ? p15, 1, r5, c9, c0, 2 ? @ Read L2 AUX ctrl register
- ? ? stmia ? r8!, {r4-r5} ? ? ? ? ? ?@ Push parameters for restore call
- ? ? ? ?/* Check what that target sleep state is:stored in r1*/
- ? ? ? ?/* 1 - Only L1 and logic lost */
- ? ? ? ?/* 2 - Only L2 lost */
- ? ? ? ?/* 3 - Both L1 and L2 lost */
- ? ? cmp ? ? r1, #0x2 /* Only L2 lost */
- ? ? beq ? ?clean_l2
- ? ? cmp ? ? r1, #0x1 /* L2 retained */
- ? ? /* r9 stores whether to clean L2 or not*/
- ? ? moveq ? r9, #0x0 /* Dont Clean L2 */
- ? ? movne ? r9, #0x1 /* Clean L2 */
-l1_logic_lost:
- ? ? /* Store sp and spsr to SDRAM */
- ? ? mov ? ? r4, sp
- ? ? mrs ? ? r5, spsr
- ? ? mov ? ? r6, lr
- ? ? stmia ? r8!, {r4-r6}
- ? ? /* Save all ARM registers */
- ? ? /* Coprocessor access control register */
- ? ? mrc ? ? p15, 0, r6, c1, c0, 2
- ? ? stmia ? r8!, {r6}
- ? ? /* TTBR0, TTBR1 and Translation table base control */
- ? ? mrc ? ? p15, 0, r4, c2, c0, 0
- ? ? mrc ? ? p15, 0, r5, c2, c0, 1
- ? ? mrc ? ? p15, 0, r6, c2, c0, 2
- ? ? stmia ? r8!, {r4-r6}
- ? ? /* Domain access control register, data fault status register,
- ? ? and instruction fault status register */
- ? ? mrc ? ? p15, 0, r4, c3, c0, 0
- ? ? mrc ? ? p15, 0, r5, c5, c0, 0
- ? ? mrc ? ? p15, 0, r6, c5, c0, 1
- ? ? stmia ? r8!, {r4-r6}
- ? ? /* Data aux fault status register, instruction aux fault status,
- ? ? datat fault address register and instruction fault address register*/
- ? ? mrc ? ? p15, 0, r4, c5, c1, 0
- ? ? mrc ? ? p15, 0, r5, c5, c1, 1
- ? ? mrc ? ? p15, 0, r6, c6, c0, 0
- ? ? mrc ? ? p15, 0, r7, c6, c0, 2
- ? ? stmia ? r8!, {r4-r7}
- ? ? /* user r/w thread and process ID, user r/o thread and process ID,
- ? ? priv only thread and process ID, cache size selection */
- ? ? mrc ? ? p15, 0, r4, c13, c0, 2
- ? ? mrc ? ? p15, 0, r5, c13, c0, 3Quoted 8 lines
- ? ? mrc ? ? p15, 0, r6, c13, c0, 4
- ? ? mrc ? ? p15, 2, r7, c0, c0, 0
- ? ? stmia ? r8!, {r4-r7}
- ? ? /* Data TLB lockdown, instruction TLB lockdown registers */
- ? ? mrc ? ? p15, 0, r5, c10, c0, 0
- ? ? mrc ? ? p15, 0, r6, c10, c0, 1
- ? ? stmia ? r8!, {r5-r6}
- ? ? /* Secure or non secure vector base address, FCSE PID, ContextPID*/
Quoted 68 lines
- ? ? mrc ? ? p15, 0, r4, c12, c0, 0
- ? ? mrc ? ? p15, 0, r5, c13, c0, 0
- ? ? mrc ? ? p15, 0, r6, c13, c0, 1
- ? ? stmia ? r8!, {r4-r6}
- ? ? /* Primary remap, normal remap registers */
- ? ? mrc ? ? p15, 0, r4, c10, c2, 0
- ? ? mrc ? ? p15, 0, r5, c10, c2, 1
- ? ? stmia ? r8!,{r4-r5}arch/arm/mach-omap2/sleep34xx.S +0
-19- - ? ? /* Store current cpsr*/ - ? ? mrs ? ? r2, cpsr - ? ? stmia ? r8!, {r2} - - ? ? mrc ? ? p15, 0, r4, c1, c0, 0 - ? ? /* save control register */ - ? ? stmia ? r8!, {r4} -clean_caches: - ? ? /* Clean Data or unified cache to POU*/ - ? ? /* How to invalidate only L1 cache???? - #FIX_ME# */ - ? ? /* mcr ?p15, 0, r11, c7, c11, 1 */ - ? ? cmp ? ? r9, #1 /* Check whether L2 inval is required or not*/ - ? ? bne ? ? skip_l2_inval -clean_l2: - ? ? /* - ? ? ?* Jump out to kernel flush routine - ? ? ?* ?- reuse that code is better - ? ? ?* ?- it executes in a cached space so is faster than refetch per-block
- ? ? ?* ?- should be faster and will change with kernel
- ? ? ?* ?- 'might' have to copy address, load and jump to it
- ? ? ?*/
- ? ? ldr r1,kernel_flush
- ? ? mov lr, pc
- ? ? bx ?r1arch/arm/mach-omap2/sleep34xx.S +0
-21- -skip_l2_inval: - ? ? /* Data memory barrier and Data sync barrier */ - ? ? mov ? ? r1, #0 - ? ? mcr ? ? p15, 0, r1, c7, c10, 4 - ? ? mcr ? ? p15, 0, r1, c7, c10, 5 - - ? ? wfi ? ? ? ? ? ? ? ? ? ? ? ? ? ? @ wait for interrupt - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? nop - ? ? bl wait_sdrc_ok - ? ? /* restore regs and return */ - ? ? ldmfd ? sp!, {r0-r12, pc}?/*
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -682,5 +730,6 @@ kick_counter:? ? ? .word ? 0
?wait_dll_lock_counter:
? ? ? .word ? 0
+
?ENTRY(omap34xx_cpu_suspend_sz)
? ? ? .word ? . -omap34xx_cpu_suspend
--
1.7.1
Quoted 5 lines
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
Jean
PATCH v4 6/7 OMAP3: add comments for low power code errata
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
Errata covered:
- 1.157 & 1.185
- i443
- i581
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/pm34xx.c | 4 ++-- arch/arm/mach-omap2/sleep34xx.S | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/pm34xx.c +2 -2
@@ -148,7 +148,7 @@ static void omap3_core_save_context(void)/* * Force write last pad into memory, as this can fail in some -* cases according to erratas 1.157, 1.185 +* cases according to errata 1.157, 1.185 */ omap_ctrl_writel (omap_ctrl_readl (OMAP343X_PADCONF_ETK_D14 ),OMAP343X_CONTROL_MEM_WKUP +0x2a0 );
@@ -446,7 +446,7 @@ void omap_sram_idle(void)/* * On EMU/HS devices ROM code restores a SRDC value * from scratchpad which has automatic self refresh on timeout -* of AUTO_CNT = 1 enabled. This takes care of errata 1.142. +* of AUTO_CNT = 1 enabled. This takes care of erratum ID i443. * Hence store/restore the SDRC_POWER register here. */ if (omap_rev() >= OMAP3430_REV_ES3_0 &&
arch/arm/mach-omap2/sleep34xx.S +11 -0
@@ -587,6 +587,7 @@ usettbr0: * Internal functions */ +/* This function implements the erratum ID i443 WA, applies to 34xx >= ES3.0 */ .text ENTRY(es3_sdrc_fix) ldr r4, sdrc_syscfg @ get config addr
@@ -632,6 +633,16 @@ sdrc_manual_1: ENTRY(es3_sdrc_fix_sz) .word . - es3_sdrc_fix +/* + * This function implements the erratum ID i581 WA: + * SDRC state restore before accessing the SDRAM + * + * Only used at return from non-OFF mode. For OFF + * mode the ROM code configures the SDRC and + * the DPLL before calling the restore code directly + * from DDR. + */ + /* Make sure SDRC accesses are ok */ wait_sdrc_ok:
Signature · 1 line
1.7.1
PATCH v4 7/7 OMAP3: ASM sleep code format rework
In reply to jean.pihet at newoldbits.comFrom: Jean Pihet <[email protected]>
Cosmetic fixes to the code:
- white spaces and tabs,
- alignement,
- comments rephrase and typos,
- multi-line comments
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
--- arch/arm/mach-omap2/sleep34xx.S | 221 +++++++++++++++++++++------------------ 1 files changed, 118 insertions(+), 103 deletions(-)
arch/arm/mach-omap2/sleep34xx.S +118 -103
@@ -1,6 +1,10 @@ /* * linux/arch/arm/mach-omap2/sleep.S * + * (C) Copyright 2010 + * Texas Instruments + * Jean Pihet <[email protected]> + * * (C) Copyright 2007 * Texas Instruments * Karthik Dasu <[email protected]>
@@ -78,20 +82,20 @@ .text /* Function call to get the restore pointer for resume from OFF */ ENTRY(get_restore_pointer) - stmfd sp!, {lr} @ save registers on stack + stmfd sp!, {lr} @ save registers on stack adr r0, restore - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return ENTRY(get_restore_pointer_sz) - .word . - get_restore_pointer + .word . - get_restore_pointer .text /* Function call to get the restore pointer for 3630 resume from OFF */ ENTRY(get_omap3630_restore_pointer) - stmfd sp!, {lr} @ save registers on stack + stmfd sp!, {lr} @ save registers on stack adr r0, restore_3630 - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return ENTRY(get_omap3630_restore_pointer_sz) - .word . - get_omap3630_restore_pointer + .word . - get_omap3630_restore_pointer .text /* Function call to get the restore pointer for ES3 to resume from OFF */
@@ -109,16 +113,16 @@ ENTRY(get_es3_restore_pointer_sz) * place on 3630. Hopefully some version in the future maynot need this. */ ENTRY(enable_omap3630_toggle_l2_on_restore) - stmfd sp!, {lr} @ save registers on stack + stmfd sp!, {lr} @ save registers on stack /* Setup so that we will disable and enable l2 */ mov r1, #0x1 str r1, l2dis_3630 - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return + .text /* Function to call rom code to save secure ram context */ ENTRY(save_secure_ram_context) stmfd sp!, {r1-r12, lr} @ save registers on stack - adr r3, api_params @ r3 points to parameters str r0, [r3,#0x4] @ r0 has sdram address ldr r12, high_mask
@@ -147,6 +151,7 @@ api_params: ENTRY(save_secure_ram_context_sz) .word . - save_secure_ram_context + /* * ====================== * == Idle entry point ==
@@ -160,13 +165,14 @@ ENTRY(save_secure_ram_context_sz) * and executes the WFI instruction * * Notes: - * - this code gets copied to internal SRAM at boot. + * - this code gets copied to internal SRAM at boot and after wake-up + * from OFF mode * - when the OMAP wakes up it continues at different execution points * depending on the low power mode (non-OFF vs OFF modes), * cf. 'Resume path for xxx mode' comments. */ ENTRY(omap34xx_cpu_suspend) - stmfd sp!, {r0-r12, lr} @ save registers on stack + stmfd sp!, {r0-r12, lr} @ save registers on stack /* * r0 contains restore pointer in sdram
@@ -271,9 +277,9 @@ clean_l2: * - should be faster and will change with kernel * - 'might' have to copy address, load and jump to it */ - ldr r1, kernel_flush - mov lr, pc - bx r1 + ldr r1, kernel_flush + mov lr, pc + bx r1 omap3_do_wfi: ldr r4, sdrc_power @ read the SDRC_POWER register
@@ -366,18 +372,18 @@ restore_3630: /* Fall thru to common code for the remaining logic */ restore: - /* + /* * Check what was the reason for mpu reset and store the reason in r9: * 0 - No context lost - * 1 - Only L1 and logic lost - * 2 - Only L2 lost - In this case, we wont be here - * 3 - Both L1 and L2 lost + * 1 - Only L1 and logic lost + * 2 - Only L2 lost - In this case, we wont be here + * 3 - Both L1 and L2 lost */ - ldr r1, pm_pwstctrl_mpu + ldr r1, pm_pwstctrl_mpu ldr r2, [r1] - and r2, r2, #0x3 - cmp r2, #0x0 @ Check if target power state was OFF or RET - moveq r9, #0x3 @ MPU OFF => L1 and L2 lost + and r2, r2, #0x3 + cmp r2, #0x0 @ Check if target power state was OFF or RET + moveq r9, #0x3 @ MPU OFF => L1 and L2 lost movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation bne logic_l1_restore
@@ -393,71 +399,74 @@ skipl2dis: and r1, #0x700 cmp r1, #0x300 beq l2_inv_gp - mov r0, #40 @ set service ID for PPA - mov r12, r0 @ copy secure Service ID in r12 - mov r1, #0 @ set task id for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r0, #40 @ set service ID for PPA + mov r12, r0 @ copy secure Service ID in r12 + mov r1, #0 @ set task id for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff adr r3, l2_inv_api_params @ r3 points to dummy parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) /* Write to Aux control register to set some bits */ - mov r0, #42 @ set service ID for PPA - mov r12, r0 @ copy secure Service ID in r12 - mov r1, #0 @ set task id for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r0, #42 @ set service ID for PPA + mov r12, r0 @ copy secure Service ID in r12 + mov r1, #0 @ set task id for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff ldr r4, scratchpad_base - ldr r3, [r4, #0xBC] @ r3 points to parameters + ldr r3, [r4, #0xBC] @ r3 points to parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) #ifdef CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE /* Restore L2 aux control register */ - @ set service ID for PPA + @ set service ID for PPA mov r0, #CONFIG_OMAP3_L2_AUX_SECURE_SERVICE_SET_ID - mov r12, r0 @ copy service ID in r12 - mov r1, #0 @ set task ID for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r12, r0 @ copy service ID in r12 + mov r1, #0 @ set task ID for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff ldr r4, scratchpad_base ldr r3, [r4, #0xBC] - adds r3, r3, #8 @ r3 points to parameters + adds r3, r3, #8 @ r3 points to parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) #endif b logic_l1_restore + l2_inv_api_params: - .word 0x1, 0x00 + .word 0x1, 0x00 l2_inv_gp: /* Execute smi to invalidate L2 cache */ - mov r12, #0x1 @ set up to invalide L2 -smi: .word 0xE1600070 @ Call SMI monitor (smieq) + mov r12, #0x1 @ set up to invalidate L2 + .word 0xE1600070 @ Call SMI monitor (smieq) /* Write to Aux control register to set some bits */ ldr r4, scratchpad_base ldr r3, [r4,#0xBC] ldr r0, [r3,#4] mov r12, #0x3 - .word 0xE1600070 @ Call SMI monitor (smieq) + .word 0xE1600070 @ Call SMI monitor (smieq) ldr r4, scratchpad_base ldr r3, [r4,#0xBC] ldr r0, [r3,#12] mov r12, #0x2 - .word 0xE1600070 @ Call SMI monitor (smieq) + .word 0xE1600070 @ Call SMI monitor (smieq) logic_l1_restore: ldr r1, l2dis_3630 - cmp r1, #0x1 @ Do we need to re-enable L2 on 3630? + cmp r1, #0x1 @ Test if L2 re-enable needed on 3630 bne skipl2reen mrc p15, 0, r1, c1, c0, 1 - orr r1, r1, #2 @ re-enable L2 cache + orr r1, r1, #2 @ re-enable L2 cache mcr p15, 0, r1, c1, c0, 1 skipl2reen: mov r1, #0 - /* Invalidate all instruction caches to PoU - * and flush branch target cache */ + /* + * Invalidate all instruction caches to PoU + * and flush branch target cache + */ mcr p15, 0, r1, c7, c5, 0 ldr r4, scratchpad_base
@@ -478,33 +487,33 @@ skipl2reen: MCR p15, 0, r6, c2, c0, 1 /* Translation table base control register */ MCR p15, 0, r7, c2, c0, 2 - /*domain access Control Register */ + /* Domain access Control Register */ MCR p15, 0, r8, c3, c0, 0 - /* data fault status Register */ + /* Data fault status Register */ MCR p15, 0, r9, c5, c0, 0 - ldmia r3!,{r4-r8} - /* instruction fault status Register */ + ldmia r3!,{r4-r8} + /* Instruction fault status Register */ MCR p15, 0, r4, c5, c0, 1 - /*Data Auxiliary Fault Status Register */ + /* Data Auxiliary Fault Status Register */ MCR p15, 0, r5, c5, c1, 0 - /*Instruction Auxiliary Fault Status Register*/ + /* Instruction Auxiliary Fault Status Register*/ MCR p15, 0, r6, c5, c1, 1 - /*Data Fault Address Register */ + /* Data Fault Address Register */ MCR p15, 0, r7, c6, c0, 0 - /*Instruction Fault Address Register*/ + /* Instruction Fault Address Register*/ MCR p15, 0, r8, c6, c0, 2 - ldmia r3!,{r4-r7} + ldmia r3!,{r4-r7} - /* user r/w thread and process ID */ + /* User r/w thread and process ID */ MCR p15, 0, r4, c13, c0, 2 - /* user ro thread and process ID */ + /* User ro thread and process ID */ MCR p15, 0, r5, c13, c0, 3 - /*Privileged only thread and process ID */ + /* Privileged only thread and process ID */ MCR p15, 0, r6, c13, c0, 4 - /* cache size selection */ + /* Cache size selection */ MCR p15, 2, r7, c0, c0, 0 - ldmia r3!,{r4-r8} + ldmia r3!,{r4-r8} /* Data TLB lockdown registers */ MCR p15, 0, r4, c10, c0, 0 /* Instruction TLB lockdown registers */
@@ -516,26 +525,27 @@ skipl2reen: /* Context PID */ MCR p15, 0, r8, c13, c0, 1 - ldmia r3!,{r4-r5} - /* primary memory remap register */ + ldmia r3!,{r4-r5} + /* Primary memory remap register */ MCR p15, 0, r4, c10, c2, 0 - /*normal memory remap register */ + /* Normal memory remap register */ MCR p15, 0, r5, c10, c2, 1 /* Restore cpsr */ - ldmia r3!,{r4} /*load CPSR from SDRAM*/ - msr cpsr, r4 /*store cpsr */ + ldmia r3!,{r4} @ load CPSR from SDRAM + msr cpsr, r4 @ store cpsr /* Enabling MMU here */ - mrc p15, 0, r7, c2, c0, 2 /* Read TTBRControl */ - /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1*/ + mrc p15, 0, r7, c2, c0, 2 @ Read TTBRControl + /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1 */ and r7, #0x7 cmp r7, #0x0 beq usettbr0 ttbr_error: - /* More work needs to be done to support N[0:2] value other than 0 - * So looping here so that the error can be detected - */ + /* + * More work needs to be done to support N[0:2] value other than 0 + * So looping here so that the error can be detected + */ b ttbr_error usettbr0: mrc p15, 0, r2, c2, c0, 0
@@ -543,21 +553,25 @@ usettbr0: and r2, r5 mov r4, pc ldr r5, table_index_mask - and r4, r5 /* r4 = 31 to 20 bits of pc */ + and r4, r5 @ r4 = 31 to 20 bits of pc /* Extract the value to be written to table entry */ ldr r1, table_entry - add r1, r1, r4 /* r1 has value to be written to table entry*/ + /* r1 has the value to be written to table entry*/ + add r1, r1, r4 /* Getting the address of table entry to modify */ lsr r4, #18 - add r2, r4 /* r2 has the location which needs to be modified */ + /* r2 has the location which needs to be modified */ + add r2, r4 /* Storing previous entry of location being modified */ ldr r5, scratchpad_base ldr r4, [r2] str r4, [r5, #0xC0] /* Modify the table entry */ str r1, [r2] - /* Storing address of entry being modified - * - will be restored after enabling MMU */ + /* + * Storing address of entry being modified + * - will be restored after enabling MMU + */ ldr r5, scratchpad_base str r2, [r5, #0xC4]
@@ -566,7 +580,7 @@ usettbr0: mcr p15, 0, r0, c7, c5, 6 @ Invalidate branch predictor array mcr p15, 0, r0, c8, c5, 0 @ Invalidate instruction TLB mcr p15, 0, r0, c8, c6, 0 @ Invalidate data TLB - /* Restore control register but dont enable caches here*/ + /* Restore control register but dont enable caches here */ /* Caches will be enabled after restoring MMU table entry */ ldmia r3!, {r4} /* Store previous value of control register in scratchpad */
@@ -580,7 +594,7 @@ usettbr0: * == Exit point from OFF mode == * ============================== */ - ldmfd sp!, {r0-r12, pc} @ restore regs and return + ldmfd sp!, {r0-r12, pc} @ restore regs and return /*
@@ -646,55 +660,56 @@ ENTRY(es3_sdrc_fix_sz) /* Make sure SDRC accesses are ok */ wait_sdrc_ok: -/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensures this. */ +/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensures this */ ldr r4, cm_idlest_ckgen wait_dpll3_lock: ldr r5, [r4] tst r5, #1 beq wait_dpll3_lock - ldr r4, cm_idlest1_core + ldr r4, cm_idlest1_core wait_sdrc_ready: - ldr r5, [r4] - tst r5, #0x2 - bne wait_sdrc_ready + ldr r5, [r4] + tst r5, #0x2 + bne wait_sdrc_ready /* allow DLL powerdown upon hw idle req */ - ldr r4, sdrc_power - ldr r5, [r4] - bic r5, r5, #0x40 - str r5, [r4] -is_dll_in_lock_mode: + ldr r4, sdrc_power + ldr r5, [r4] + bic r5, r5, #0x40 + str r5, [r4] - /* Is dll in lock mode? */ - ldr r4, sdrc_dlla_ctrl - ldr r5, [r4] - tst r5, #0x4 - bxne lr - /* wait till dll locks */ +is_dll_in_lock_mode: + /* Is dll in lock mode? */ + ldr r4, sdrc_dlla_ctrl + ldr r5, [r4] + tst r5, #0x4 + bxne lr @ Return if locked + /* wait till dll locks */ wait_dll_lock_timed: ldr r4, wait_dll_lock_counter add r4, r4, #1 str r4, wait_dll_lock_counter ldr r4, sdrc_dlla_status - mov r6, #8 /* Wait 20uS for lock */ + /* Wait 20uS for lock */ + mov r6, #8 wait_dll_lock: subs r6, r6, #0x1 beq kick_dll - ldr r5, [r4] - and r5, r5, #0x4 - cmp r5, #0x4 - bne wait_dll_lock - bx lr + ldr r5, [r4] + and r5, r5, #0x4 + cmp r5, #0x4 + bne wait_dll_lock + bx lr @ Return when locked /* disable/reenable DLL if not locked */ kick_dll: ldr r4, sdrc_dlla_ctrl ldr r5, [r4] mov r6, r5 - bic r6, #(1<<3) /* disable dll */ + bic r6, #(1<<3) @ disable dll str r6, [r4] dsb - orr r6, r6, #(1<<3) /* enable dll */ + orr r6, r6, #(1<<3) @ enable dll str r6, [r4] dsb ldr r4, kick_counter
@@ -719,7 +734,7 @@ scratchpad_base: sram_base: .word SRAM_BASE_P + 0x8000 sdrc_power: - .word SDRC_POWER_V + .word SDRC_POWER_V ttbrbit_mask: .word 0xFFFFC000 table_index_mask:
@@ -733,9 +748,9 @@ control_stat: control_mem_rta: .word CONTROL_MEM_RTA_CTRL kernel_flush: - .word v7_flush_dcache_all + .word v7_flush_dcache_all l2dis_3630: - .word 0 + .word 0 /* these 2 words need to be@the end !!! */ kick_counter: .word 0
Signature · 1 line
1.7.1
PATCH v4 7/7 OMAP3: ASM sleep code format rework
Quoted 17 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 7/7] OMAP3: ASM sleep code format reworkFrom: Jean Pihet <[email protected]>
Cosmetic fixes to the code:
- white spaces and tabs,
- alignement,
- comments rephrase and typos,
- multi-line comments
Quoted 6 lines
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>--- arch/arm/mach-omap2/sleep34xx.S | 221
+++++++++++++++++++++-------------
Quoted 36 lines
-----
1 files changed, 118 insertions(+), 103 deletions(-)arch/arm/mach- renamed from arch/arm/mach-omap2/sleep34xx.S +0
-0
omap2/sleep34xx.S
index 207f6e9..9c1c57e 100644arch/arm/mach-omap2/sleep34xx.S +7
-4@@ -1,6 +1,10 @@ /* * linux/arch/arm/mach-omap2/sleep.S * + * (C) Copyright 2010 + * Texas Instruments + * Jean Pihet <[email protected]> + * * (C) Copyright 2007 * Texas Instruments * Karthik Dasu <[email protected]>@@ -78,20 +82,20 @@ .text /* Function call to get the restore pointer for resume from OFF */ ENTRY(get_restore_pointer) - stmfd sp!, {lr} @ save registers on stack + stmfd sp!, {lr} @ save registers on stack adr r0, restore - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return ENTRY(get_restore_pointer_sz) - .word . - get_restore_pointer + .word . - get_restore_pointer .text /* Function call to get the restore pointer for 3630 resume from OFF */ ENTRY(get_omap3630_restore_pointer) - stmfd sp!, {lr} @ save registers on stack
arch/arm/mach-omap2/sleep34xx.S line 101
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +3
-2+ stmfd sp!, {lr} @ save registers on stack adr r0, restore_3630 - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return ENTRY(get_omap3630_restore_pointer_sz) - .word . - get_omap3630_restore_pointer + .word . - get_omap3630_restore_pointer .text /* Function call to get the restore pointer for ES3 to resume from OFF
*/
arch/arm/mach-omap2/sleep34xx.S ENTRY(get_es3_restore_pointer_sz) · line 113
Quoted 2 lines
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -109,16 +113,16 @@ ENTRY(get_es3_restore_pointer_sz) * place on 3630. Hopefully some version in the future maynot need
this.
Quoted 67 lines
arch/arm/mach-omap2/sleep34xx.S +11
-9*/ ENTRY(enable_omap3630_toggle_l2_on_restore) - stmfd sp!, {lr} @ save registers on stack + stmfd sp!, {lr} @ save registers on stack /* Setup so that we will disable and enable l2 */ mov r1, #0x1 str r1, l2dis_3630 - ldmfd sp!, {pc} @ restore regs and return + ldmfd sp!, {pc} @ restore regs and return + .text /* Function to call rom code to save secure ram context */ ENTRY(save_secure_ram_context) stmfd sp!, {r1-r12, lr} @ save registers on stack - adr r3, api_params @ r3 points to parameters str r0, [r3,#0x4] @ r0 has sdram address ldr r12, high_mask@@ -147,6 +151,7 @@ api_params: ENTRY(save_secure_ram_context_sz) .word . - save_secure_ram_context + /* * ====================== * == Idle entry point ==@@ -160,13 +165,14 @@ ENTRY(save_secure_ram_context_sz) * and executes the WFI instruction * * Notes: - * - this code gets copied to internal SRAM at boot. + * - this code gets copied to internal SRAM at boot and after wake-up + * from OFF mode * - when the OMAP wakes up it continues at different execution points * depending on the low power mode (non-OFF vs OFF modes), * cf. 'Resume path for xxx mode' comments. */ ENTRY(omap34xx_cpu_suspend) - stmfd sp!, {r0-r12, lr} @ save registers on stack + stmfd sp!, {r0-r12, lr} @ save registers on stack /* * r0 contains restore pointer in sdram@@ -271,9 +277,9 @@ clean_l2: * - should be faster and will change with kernel * - 'might' have to copy address, load and jump to it */ - ldr r1, kernel_flush - mov lr, pc - bx r1 + ldr r1, kernel_flush + mov lr, pc + bx r1 omap3_do_wfi: ldr r4, sdrc_power @ read the SDRC_POWER register@@ -366,18 +372,18 @@ restore_3630: /* Fall thru to common code for the remaining logic */ restore: - /* + /* * Check what was the reason for mpu reset and store the reason inr9:
arch/arm/mach-omap2/sleep34xx.S +0
-2* 0 - No context lost - * 1 - Only L1 and logic lost - * 2 - Only L2 lost - In this case, we wont be here
arch/arm/mach-omap2/sleep34xx.S restore_3630:
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +4
-4- * 3 - Both L1 and L2 lost + * 1 - Only L1 and logic lost + * 2 - Only L2 lost - In this case, we wont be here + * 3 - Both L1 and L2 lost */ - ldr r1, pm_pwstctrl_mpu + ldr r1, pm_pwstctrl_mpu ldr r2, [r1] - and r2, r2, #0x3 - cmp r2, #0x0 @ Check if target power state was OFF or
RET
arch/arm/mach-omap2/sleep34xx.S restore_3630:
Quoted 3 lines
arch/arm/mach-omap2/sleep34xx.S +2
-1- moveq r9, #0x3 @ MPU OFF => L1 and L2 lost + and r2, r2, #0x3 + cmp r2, #0x0 @ Check if target power state was OFF or
RET
arch/arm/mach-omap2/sleep34xx.S
Quoted 2 lines
arch/arm/mach-omap2/sleep34xx.S +1
-0+ moveq r9, #0x3 @ MPU OFF => L1 and L2 lost movne r9, #0x1 @ Only L1 and L2 lost => avoid L2
invalidation
Quoted 74 lines
arch/arm/mach-omap2/sleep34xx.S +19
-18bne logic_l1_restore@@ -393,71 +399,74 @@ skipl2dis: and r1, #0x700 cmp r1, #0x300 beq l2_inv_gp - mov r0, #40 @ set service ID for PPA - mov r12, r0 @ copy secure Service ID in r12 - mov r1, #0 @ set task id for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r0, #40 @ set service ID for PPA + mov r12, r0 @ copy secure Service ID in r12 + mov r1, #0 @ set task id for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff adr r3, l2_inv_api_params @ r3 points to dummy parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) /* Write to Aux control register to set some bits */ - mov r0, #42 @ set service ID for PPA - mov r12, r0 @ copy secure Service ID in r12 - mov r1, #0 @ set task id for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r0, #42 @ set service ID for PPA + mov r12, r0 @ copy secure Service ID in r12 + mov r1, #0 @ set task id for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff ldr r4, scratchpad_base - ldr r3, [r4, #0xBC] @ r3 points to parameters + ldr r3, [r4, #0xBC] @ r3 points to parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) #ifdef CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE /* Restore L2 aux control register */ - @ set service ID for PPA + @ set service ID for PPA mov r0, #CONFIG_OMAP3_L2_AUX_SECURE_SERVICE_SET_ID - mov r12, r0 @ copy service ID in r12 - mov r1, #0 @ set task ID for ROM code in r1 - mov r2, #4 @ set some flags in r2, r6 + mov r12, r0 @ copy service ID in r12 + mov r1, #0 @ set task ID for ROM code in r1 + mov r2, #4 @ set some flags in r2, r6 mov r6, #0xff ldr r4, scratchpad_base ldr r3, [r4, #0xBC] - adds r3, r3, #8 @ r3 points to parameters + adds r3, r3, #8 @ r3 points to parameters mcr p15, 0, r0, c7, c10, 4 @ data write barrier mcr p15, 0, r0, c7, c10, 5 @ data memory barrier .word 0xE1600071 @ call SMI monitor (smi #1) #endif b logic_l1_restore + l2_inv_api_params: - .word 0x1, 0x00 + .word 0x1, 0x00 l2_inv_gp: /* Execute smi to invalidate L2 cache */ - mov r12, #0x1 @ set up to invalide L2 -smi: .word 0xE1600070 @ Call SMI monitor (smieq) + mov r12, #0x1 @ set up to invalidate L2 + .word 0xE1600070 @ Call SMI monitor (smieq) /* Write to Aux control register to set some bits */ ldr r4, scratchpad_base ldr r3, [r4,#0xBC] ldr r0, [r3,#4] mov r12, #0x3 - .word 0xE1600070 @ Call SMI monitor (smieq) + .word 0xE1600070 @ Call SMI monitor (smieq)
arch/arm/mach-omap2/sleep34xx.S skipl2dis: · line 459
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +2
-2ldr r4, scratchpad_base ldr r3, [r4,#0xBC] ldr r0, [r3,#12] mov r12, #0x2 - .word 0xE1600070 @ Call SMI monitor (smieq) + .word 0xE1600070 @ Call SMI monitor (smieq) logic_l1_restore: ldr r1, l2dis_3630 - cmp r1, #0x1 @ Do we need to re-enable L2 on 3630? + cmp r1, #0x1 @ Test if L2 re-enable needed on
3630
Quoted 78 lines
arch/arm/mach-omap2/sleep34xx.S +22
-20bne skipl2reen mrc p15, 0, r1, c1, c0, 1 - orr r1, r1, #2 @ re-enable L2 cache + orr r1, r1, #2 @ re-enable L2 cache mcr p15, 0, r1, c1, c0, 1 skipl2reen: mov r1, #0 - /* Invalidate all instruction caches to PoU - * and flush branch target cache */ + /* + * Invalidate all instruction caches to PoU + * and flush branch target cache + */ mcr p15, 0, r1, c7, c5, 0 ldr r4, scratchpad_base@@ -478,33 +487,33 @@ skipl2reen: MCR p15, 0, r6, c2, c0, 1 /* Translation table base control register */ MCR p15, 0, r7, c2, c0, 2 - /*domain access Control Register */ + /* Domain access Control Register */ MCR p15, 0, r8, c3, c0, 0 - /* data fault status Register */ + /* Data fault status Register */ MCR p15, 0, r9, c5, c0, 0 - ldmia r3!,{r4-r8} - /* instruction fault status Register */ + ldmia r3!,{r4-r8} + /* Instruction fault status Register */ MCR p15, 0, r4, c5, c0, 1 - /*Data Auxiliary Fault Status Register */ + /* Data Auxiliary Fault Status Register */ MCR p15, 0, r5, c5, c1, 0 - /*Instruction Auxiliary Fault Status Register*/ + /* Instruction Auxiliary Fault Status Register*/ MCR p15, 0, r6, c5, c1, 1 - /*Data Fault Address Register */ + /* Data Fault Address Register */ MCR p15, 0, r7, c6, c0, 0 - /*Instruction Fault Address Register*/ + /* Instruction Fault Address Register*/ MCR p15, 0, r8, c6, c0, 2 - ldmia r3!,{r4-r7} + ldmia r3!,{r4-r7} - /* user r/w thread and process ID */ + /* User r/w thread and process ID */ MCR p15, 0, r4, c13, c0, 2 - /* user ro thread and process ID */ + /* User ro thread and process ID */ MCR p15, 0, r5, c13, c0, 3 - /*Privileged only thread and process ID */ + /* Privileged only thread and process ID */ MCR p15, 0, r6, c13, c0, 4 - /* cache size selection */ + /* Cache size selection */ MCR p15, 2, r7, c0, c0, 0 - ldmia r3!,{r4-r8} + ldmia r3!,{r4-r8} /* Data TLB lockdown registers */ MCR p15, 0, r4, c10, c0, 0 /* Instruction TLB lockdown registers */@@ -516,26 +525,27 @@ skipl2reen: /* Context PID */ MCR p15, 0, r8, c13, c0, 1 - ldmia r3!,{r4-r5} - /* primary memory remap register */ + ldmia r3!,{r4-r5} + /* Primary memory remap register */ MCR p15, 0, r4, c10, c2, 0 - /*normal memory remap register */ + /* Normal memory remap register */ MCR p15, 0, r5, c10, c2, 1 /* Restore cpsr */
arch/arm/mach-omap2/sleep34xx.S skipl2reen: · line 540
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +4
-4- ldmia r3!,{r4} /*load CPSR from SDRAM*/ - msr cpsr, r4 /*store cpsr */ + ldmia r3!,{r4} @ load CPSR from SDRAM + msr cpsr, r4 @ store cpsr /* Enabling MMU here */ - mrc p15, 0, r7, c2, c0, 2 /* Read TTBRControl */ - /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1*/ + mrc p15, 0, r7, c2, c0, 2 @ Read TTBRControl + /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1
*/
Quoted 18 lines
arch/arm/mach-omap2/sleep34xx.S +4
-3and r7, #0x7 cmp r7, #0x0 beq usettbr0 ttbr_error: - /* More work needs to be done to support N[0:2] value other than 0 - * So looping here so that the error can be detected - */ + /* + * More work needs to be done to support N[0:2] value other than 0 + * So looping here so that the error can be detected + */ b ttbr_error usettbr0: mrc p15, 0, r2, c2, c0, 0@@ -543,21 +553,25 @@ usettbr0: and r2, r5 mov r4, pc ldr r5, table_index_mask
arch/arm/mach-omap2/sleep34xx.S usettbr0: · line 552
Quoted 10 lines
arch/arm/mach-omap2/sleep34xx.S +3
-3- and r4, r5 /* r4 = 31 to 20 bits of pc */ + and r4, r5 @ r4 = 31 to 20 bits of pc /* Extract the value to be written to table entry */ ldr r1, table_entry - add r1, r1, r4 /* r1 has value to be written to table entry*/ + /* r1 has the value to be written to table entry*/ + add r1, r1, r4 /* Getting the address of table entry to modify */ lsr r4, #18 - add r2, r4 /* r2 has the location which needs to be modified
*/
Quoted 18 lines
arch/arm/mach-omap2/sleep34xx.S +6
-2+ /* r2 has the location which needs to be modified */ + add r2, r4 /* Storing previous entry of location being modified */ ldr r5, scratchpad_base ldr r4, [r2] str r4, [r5, #0xC0] /* Modify the table entry */ str r1, [r2] - /* Storing address of entry being modified - * - will be restored after enabling MMU */ + /* + * Storing address of entry being modified + * - will be restored after enabling MMU + */ ldr r5, scratchpad_base str r2, [r5, #0xC4]
arch/arm/mach-omap2/sleep34xx.S usettbr0: · line 580
Quoted 1 line
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -566,7 +580,7 @@ usettbr0: mcr p15, 0, r0, c7, c5, 6 @ Invalidate branch predictor
array
arch/arm/mach-omap2/sleep34xx.S usettbr0: · line 583
Quoted 4 lines
arch/arm/mach-omap2/sleep34xx.S +1
-1mcr p15, 0, r0, c8, c5, 0 @ Invalidate instruction TLB mcr p15, 0, r0, c8, c6, 0 @ Invalidate data TLB - /* Restore control register but dont enable caches here*/ + /* Restore control register but dont enable caches here */
don't.....don't
arch/arm/mach-omap2/sleep34xx.S usettbr0: · line 584
Quoted 1 line
arch/arm/mach-omap2/sleep34xx.S +0
-0/* Caches will be enabled after restoring MMU table entry */
Here too you can fix the commenting style
Quoted 122 lines
arch/arm/mach-omap2/sleep34xx.S +1
-2ldmia r3!, {r4} /* Store previous value of control register in scratchpad */@@ -580,7 +594,7 @@ usettbr0: * == Exit point from OFF mode == * ============================== */ - ldmfd sp!, {r0-r12, pc} @ restore regs and return + ldmfd sp!, {r0-r12, pc} @ restore regs and return /*@@ -646,55 +660,56 @@ ENTRY(es3_sdrc_fix_sz) /* Make sure SDRC accesses are ok */ wait_sdrc_ok: -/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensuresthis. */
+/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensures this */arch/arm/mach-omap2/sleep34xx.S +27
-27ldr r4, cm_idlest_ckgen wait_dpll3_lock: ldr r5, [r4] tst r5, #1 beq wait_dpll3_lock - ldr r4, cm_idlest1_core + ldr r4, cm_idlest1_core wait_sdrc_ready: - ldr r5, [r4] - tst r5, #0x2 - bne wait_sdrc_ready + ldr r5, [r4] + tst r5, #0x2 + bne wait_sdrc_ready /* allow DLL powerdown upon hw idle req */ - ldr r4, sdrc_power - ldr r5, [r4] - bic r5, r5, #0x40 - str r5, [r4] -is_dll_in_lock_mode: + ldr r4, sdrc_power + ldr r5, [r4] + bic r5, r5, #0x40 + str r5, [r4] - /* Is dll in lock mode? */ - ldr r4, sdrc_dlla_ctrl - ldr r5, [r4] - tst r5, #0x4 - bxne lr - /* wait till dll locks */ +is_dll_in_lock_mode: + /* Is dll in lock mode? */ + ldr r4, sdrc_dlla_ctrl + ldr r5, [r4] + tst r5, #0x4 + bxne lr @ Return if locked + /* wait till dll locks */ wait_dll_lock_timed: ldr r4, wait_dll_lock_counter add r4, r4, #1 str r4, wait_dll_lock_counter ldr r4, sdrc_dlla_status - mov r6, #8 /* Wait 20uS for lock */ + /* Wait 20uS for lock */ + mov r6, #8 wait_dll_lock: subs r6, r6, #0x1 beq kick_dll - ldr r5, [r4] - and r5, r5, #0x4 - cmp r5, #0x4 - bne wait_dll_lock - bx lr + ldr r5, [r4] + and r5, r5, #0x4 + cmp r5, #0x4 + bne wait_dll_lock + bx lr @ Return when locked /* disable/reenable DLL if not locked */ kick_dll: ldr r4, sdrc_dlla_ctrl ldr r5, [r4] mov r6, r5 - bic r6, #(1<<3) /* disable dll */ + bic r6, #(1<<3) @ disable dll str r6, [r4] dsb - orr r6, r6, #(1<<3) /* enable dll */ + orr r6, r6, #(1<<3) @ enable dll str r6, [r4] dsb ldr r4, kick_counter@@ -719,7 +734,7 @@ scratchpad_base: sram_base: .word SRAM_BASE_P + 0x8000 sdrc_power: - .word SDRC_POWER_V + .word SDRC_POWER_V ttbrbit_mask: .word 0xFFFFC000 table_index_mask:@@ -733,9 +748,9 @@ control_stat: control_mem_rta: .word CONTROL_MEM_RTA_CTRL kernel_flush: - .word v7_flush_dcache_all + .word v7_flush_dcache_all l2dis_3630: - .word 0 + .word 0 /* these 2 words need to be at the end !!! */ kick_counter: .word 0 --1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 7/7 OMAP3: ASM sleep code format rework
Quoted 379 lines · Santosh Shilimkar
Quoted 17 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 7/7] OMAP3: ASM sleep code format reworkFrom: Jean Pihet <[email protected]>
Cosmetic fixes to the code:
- white spaces and tabs,
- alignement,
- comments rephrase and typos,
- multi-line commentsQuoted 6 lines
Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend.
Signed-off-by Jean Pihet <[email protected]>---
?arch/arm/mach-omap2/sleep34xx.S | ?221+++++++++++++++++++++-------------
Quoted 44 lines
-----
?1 files changed, 118 insertions(+), 103 deletions(-)arch/arm/mach- renamed from arch/arm/mach-omap2/sleep34xx.S +0
-0
omap2/sleep34xx.S
index 207f6e9..9c1c57e 100644arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -1,6 +1,10 @@?/*
? *linux/arch/arm/mach-omap2/sleep.S
? *
+ * (C) Copyright 2010
+ * Texas Instruments
+ * Jean Pihet <[email protected]>
+ *
? * (C) Copyright 2007
? * Texas Instruments
? * Karthik Dasu <[email protected]>arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -78,20 +82,20 @@? ? ? .text
?/* Function call to get the restore pointer for resume from OFF */ ?ENTRY(get_restore_pointer)
- ? ? ? ?stmfd ? sp!, {lr} ? ? @ save registers on stack
+ ? ? stmfd ? sp!, {lr} ? ? ? @ save registers on stack ? ? ? adr ? ? r0, restore
- ? ? ? ?ldmfd ? sp!, {pc} ? ? @ restore regs and return
+ ? ? ldmfd ? sp!, {pc} ? ? ? @ restore regs and return ?ENTRY(get_restore_pointer_sz)
- ? ? ? ?.word ? . -get_restore_pointer
+ ? ? .word ? . -get_restore_pointer? ? ? .text
?/* Function call to get the restore pointer for 3630 resume from OFF */ ?ENTRY(get_omap3630_restore_pointer)
- ? ? ? ?stmfd ? sp!, {lr} ? ? @ save registers on stack
+ ? ? stmfd ? sp!, {lr} ? ? ? @ save registers on stack
? ? ? adr ? ? r0,restore_3630
- ? ? ? ?ldmfd ? sp!, {pc} ? ? @ restore regs and return
+ ? ? ldmfd ? sp!, {pc} ? ? ? @ restore regs and return ?ENTRY(get_omap3630_restore_pointer_sz)
- ? ? ? ?.word ? . -get_omap3630_restore_pointer
+ ? ? .word ? . -get_omap3630_restore_pointerQuoted 2 lines
? ? ? .text
?/* Function call to get the restore pointer for ES3 to resume from OFF*/
Quoted 2 lines
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -109,16 +113,16 @@ ENTRY(get_es3_restore_pointer_sz)? * place on 3630. Hopefully some version in the future maynot need
this.
Quoted 69 lines
? */ ?ENTRY(enable_omap3630_toggle_l2_on_restore)
- ? ? ? ?stmfd ? sp!, {lr} ? ? @ save registers on stack
+ ? ? stmfd ? sp!, {lr} ? ? ? @ save registers on stack ? ? ? /* Setup so that we will disable and enable l2 */ ? ? ? mov ? ? r1, #0x1
? ? ? str ? ? r1,l2dis_3630
- ? ? ? ?ldmfd ? sp!, {pc} ? ? @ restore regs and return
+ ? ? ldmfd ? sp!, {pc} ? ? ? @ restore regs and return+ ? ? .text
?/* Function to call rom code to save secure ram context */ ?ENTRY(save_secure_ram_context)
? ? ? stmfd ? sp!, {r1-r12, lr} ? ? ? @ save registers on stack -
? ? ? adr ? ? r3,api_params? ? ? ? ?@ r3 points to parameters ? ? ? str ? ? r0, [r3,#0x4] ? ? ? ? ? @ r0 has sdram address ? ? ? ldr ? ? r12,high_maskarch/arm/mach-omap2/sleep34xx.S +0
-0@@ -147,6 +151,7 @@ api_params: ?ENTRY(save_secure_ram_context_sz)? ? ? .word ? . -
save_secure_ram_context+
?/*
? * ======================
? * == Idle entry point ==arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -160,13 +165,14 @@ ENTRY(save_secure_ram_context_sz)? * and executes the WFI instruction
? *
? * Notes:
- * - this code gets copied to internal SRAM at boot.
+ * - this code gets copied to internal SRAM at boot and after wake-up
+ * ? from OFF mode
? * - when the OMAP wakes up it continues at different execution points ? * ? depending on the low power mode (non-OFF vs OFF modes), ? * ? cf. 'Resume path for xxx mode' comments.
? */
?ENTRY(omap34xx_cpu_suspend)
- ? ? stmfd ? sp!, {r0-r12, lr} ? ? ? ? ? ? ? @ save registers on stack
+ ? ? stmfd ? sp!, {r0-r12, lr} ? ? ? @ save registers on stack? ? ? /*
? ? ? ?* r0 contains restore pointer in sdramarch/arm/mach-omap2/sleep34xx.S +0
-0@@ -271,9 +277,9 @@ clean_l2:? ? ? ?* ?- should be faster and will change with kernel ? ? ? ?* ?- 'might' have to copy address, load and jump to it ? ? ? ?*/
- ? ? ldr r1,kernel_flush
- ? ? mov lr, pc
- ? ? bx ?r1
+ ? ? ldr ? ? r1,kernel_flush
+ ? ? mov ? ? lr, pc
+ ? ? bx ? ? ?r1?omap3_do_wfi:
? ? ? ldr ? ? r4,sdrc_power? ? ? ? ?@ read theSDRC_POWERregisterarch/arm/mach-omap2/sleep34xx.S +0
-0@@ -366,18 +372,18 @@ restore_3630:? ? ? /* Fall thru to common code for the remaining logic */
?restore:
- ? ? ? ?/*
+ ? ? /*
? ? ? ?* Check what was the reason for mpu reset and store the reason in r9:
? ? ? ?* ?0 - No context lost
- ? ? ? ? * ?1 - Only L1 and logic lost
- ? ? ? ? * ?2 - Only L2 lost - In this case, we wont be here
- ? ? ? ? * ?3 - Both L1 and L2 lost
+ ? ? ?* ?1 - Only L1 and logic lostQuoted 8 lines
+ ? ? ?* ?2 - Only L2 lost - In this case, we wont be here
+ ? ? ?* ?3 - Both L1 and L2 lost
? ? ? ?*/
- ? ? ldr ? ? r1,pm_pwstctrl_mpu
+ ? ? ldr ? ? r1,pm_pwstctrl_mpu
? ? ? ldr ? ? r2, [r1]
- ? ? and ? ? r2, r2, #0x3
- ? ? cmp ? ? r2, #0x0 ? ? ? ?@ Check if target power state was OFF orRET
Quoted 3 lines
- ? ? ? ?moveq ? r9, #0x3 ? ? ? ?@ MPU OFF => L1 and L2 lost
+ ? ? and ? ? r2, r2, #0x3
+ ? ? cmp ? ? r2, #0x0 ? ? ? ?@ Check if target power state was OFF orRET
Quoted 2 lines
+ ? ? moveq ? r9, #0x3 ? ? ? ?@ MPU OFF => L1 and L2 lost ? ? ? movne ? r9, #0x1 ? ? ? ?@ Only L1 and L2 lost => avoid L2
invalidation
Quoted 76 lines
? ? ? bne ? ?
logic_l1_restorearch/arm/mach-omap2/sleep34xx.S +0
-0@@ -393,71 +399,74 @@ skipl2dis:? ? ? and ? ? r1, #0x700
? ? ? cmp ? ? r1, #0x300
? ? ? beq ? ?l2_inv_gp
- ? ? mov ? ? r0, #40 ? ? ? ? @ set service ID for PPA
- ? ? mov ? ? r12, r0 ? ? ? ? @ copy secure Service ID in r12
- ? ? mov ? ? r1, #0 ? ? ? ? ?@ set task id for ROM code in r1
- ? ? mov ? ? r2, #4 ? ? ? ? ?@ set some flags in r2, r6
+ ? ? mov ? ? r0, #40 ? ? ? ? ? ? ? ? @ set service ID for PPA
+ ? ? mov ? ? r12, r0 ? ? ? ? ? ? ? ? @ copy secure Service ID in r12
+ ? ? mov ? ? r1, #0 ? ? ? ? ? ? ? ? ?@ set task id for ROM code in r1
+ ? ? mov ? ? r2, #4 ? ? ? ? ? ? ? ? ?@ set some flags in r2, r6 ? ? ? mov ? ? r6, #0xff
? ? ? adr ? ? r3,l2_inv_api_params? @ r3 points to dummy parameters ? ? ? mcr ? ? p15, 0, r0, c7, c10, 4 ?@ data write barrier ? ? ? mcr ? ? p15, 0, r0, c7, c10, 5 ?@ data memory barrier ? ? ? .word ?0xE1600071? ? ? ? ? ? ?@ call SMI monitor (smi #1) ? ? ? /* Write to Aux control register to set some bits */
- ? ? mov ? ? r0, #42 ? ? ? ? @ set service ID for PPA
- ? ? mov ? ? r12, r0 ? ? ? ? @ copy secure Service ID in r12
- ? ? mov ? ? r1, #0 ? ? ? ? ?@ set task id for ROM code in r1
- ? ? mov ? ? r2, #4 ? ? ? ? ?@ set some flags in r2, r6
+ ? ? mov ? ? r0, #42 ? ? ? ? ? ? ? ? @ set service ID for PPA
+ ? ? mov ? ? r12, r0 ? ? ? ? ? ? ? ? @ copy secure Service ID in r12
+ ? ? mov ? ? r1, #0 ? ? ? ? ? ? ? ? ?@ set task id for ROM code in r1
+ ? ? mov ? ? r2, #4 ? ? ? ? ? ? ? ? ?@ set some flags in r2, r6 ? ? ? mov ? ? r6, #0xff
? ? ? ldr ? ? r4,scratchpad_base
- ? ? ldr ? ? r3, [r4, #0xBC] @ r3 points to parameters
+ ? ? ldr ? ? r3, [r4, #0xBC] ? ? ? ? @ r3 points to parameters ? ? ? mcr ? ? p15, 0, r0, c7, c10, 4 ?@ data write barrier ? ? ? mcr ? ? p15, 0, r0, c7, c10, 5 ?@ data memory barrier ? ? ? .word ?0xE1600071? ? ? ? ? ? ?@ call SMI monitor (smi #1)?#ifdef
CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE
? ? ? /* Restore L2 aux control register */
- ? ? @ set service ID for PPA
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? @ set service ID for PPA ? ? ? mov ? ? r0, #CONFIG_OMAP3_L2_AUX_SECURE_SERVICE_SET_ID
- ? ? mov ? ? r12, r0 ? ? ? ? @ copy service ID in r12
- ? ? mov ? ? r1, #0 ? ? ? ? ?@ set task ID for ROM code in r1
- ? ? mov ? ? r2, #4 ? ? ? ? ?@ set some flags in r2, r6
+ ? ? mov ? ? r12, r0 ? ? ? ? ? ? ? ? @ copy service ID in r12
+ ? ? mov ? ? r1, #0 ? ? ? ? ? ? ? ? ?@ set task ID for ROM code in r1
+ ? ? mov ? ? r2, #4 ? ? ? ? ? ? ? ? ?@ set some flags in r2, r6 ? ? ? mov ? ? r6, #0xff
? ? ? ldr ? ? r4,scratchpad_base
? ? ? ldr ? ? r3, [r4, #0xBC]
- ? ? adds ? ?r3, r3, #8 ? ? ?@ r3 points to parameters
+ ? ? adds ? ?r3, r3, #8 ? ? ? ? ? ? ?@ r3 points to parameters ? ? ? mcr ? ? p15, 0, r0, c7, c10, 4 ?@ data write barrier ? ? ? mcr ? ? p15, 0, r0, c7, c10, 5 ?@ data memory barrier ? ? ? .word ?0xE1600071? ? ? ? ? ? ?@ call SMI monitor (smi #1) ?#endif
? ? ? b ? ? ?logic_l1_restore
+
?l2_inv_api_params:
- ? ? .word ?0x1,0x00
+ ? ? .word ?0x1,0x00
?l2_inv_gp:
? ? ? /* Execute smi to invalidate L2 cache */
- ? ? mov r12, #0x1 ? ? ? ? ? ? ? ? ? ? ? ? @ set up to invalide L2 -smi: ? ?.word0xE1600070? ? ? ? ? ? @ Call SMI monitor (smieq)
+ ? ? mov r12, #0x1 ? ? ? ? ? ? ? ? ? @ set up to invalidate L2
+ ? ? .word0xE1600070? ? ? ? ? ? ? ?@ Call SMI monitor (smieq) ? ? ? /* Write to Aux control register to set some bits */ ? ? ? ldr ? ? r4,scratchpad_base
? ? ? ldr ? ? r3, [r4,#0xBC]
? ? ? ldr ? ? r0, [r3,#4]
? ? ? mov ? ? r12, #0x3
- ? ? .word0xE1600070? ? ? ?@ Call SMI monitor (smieq)
+ ? ? .word ?0xE1600070? ? ? ? ? ? ?@ Call SMI monitor (smieq) ? ? ? ldr ? ? r4,scratchpad_base
? ? ? ldr ? ? r3, [r4,#0xBC]Quoted 8 lines
? ? ? ldr ? ? r0, [r3,#12]
? ? ? mov ? ? r12, #0x2
- ? ? .word0xE1600070? ? ? ?@ Call SMI monitor (smieq)
+ ? ? .word ?0xE1600070? ? ? ? ? ? ?@ Call SMI monitor (smieq) ?logic_l1_restore:
? ? ? ldr ? ? r1,l2dis_3630
- ? ? cmp ? ? r1, #0x1 ? ? ? ?@ Do we need to re-enable L2 on 3630?
+ ? ? cmp ? ? r1, #0x1 ? ? ? ? ? ? ? ?@ Test if L2 re-enable needed on3630
Quoted 83 lines
? ? ? bne ? ? skipl2reen
? ? ? mrc ? ? p15, 0, r1, c1, c0, 1
- ? ? orr ? ? r1, r1, #2 ? ? ?@ re-enable L2 cache
+ ? ? orr ? ? r1, r1, #2 ? ? ? ? ? ? ?@ re-enable L2 cache ? ? ? mcr ? ? p15, 0, r1, c1, c0, 1
?skipl2reen:
? ? ? mov ? ? r1, #0
- ? ? /* Invalidate all instruction caches to PoU
- ? ? ?* and flush branch target cache */
+ ? ? /*
+ ? ? ?* Invalidate all instruction caches to PoU
+ ? ? ?* and flush branch target cache
+ ? ? ?*/
? ? ? mcr ? ? p15, 0, r1, c7, c5, 0? ? ? ldr ? ? r4,
scratchpad_basearch/arm/mach-omap2/sleep34xx.S +0
-0@@ -478,33 +487,33 @@ skipl2reen:? ? ? MCR p15, 0, r6, c2, c0, 1
? ? ? /* Translation table base control register */ ? ? ? MCR p15, 0, r7, c2, c0, 2
- ? ? /*domain access Control Register */
+ ? ? /* Domain access Control Register */ ? ? ? MCR p15, 0, r8, c3, c0, 0
- ? ? /* data fault status Register */
+ ? ? /* Data fault status Register */
? ? ? MCR p15, 0, r9, c5, c0, 0- ? ? ldmia ?r3!,{r4-r8}
- ? ? /* instruction fault status Register */
+ ? ? ldmia ? r3!,{r4-r8}
+ ? ? /* Instruction fault status Register */ ? ? ? MCR p15, 0, r4, c5, c0, 1
- ? ? /*Data Auxiliary Fault Status Register */
+ ? ? /* Data Auxiliary Fault Status Register */ ? ? ? MCR p15, 0, r5, c5, c1, 0
- ? ? /*Instruction Auxiliary Fault Status Register*/
+ ? ? /* Instruction Auxiliary Fault Status Register*/ ? ? ? MCR p15, 0, r6, c5, c1, 1
- ? ? /*Data Fault Address Register */
+ ? ? /* Data Fault Address Register */
? ? ? MCR p15, 0, r7, c6, c0, 0
- ? ? /*Instruction Fault Address Register*/
+ ? ? /* Instruction Fault Address Register*/ ? ? ? MCR p15, 0, r8, c6, c0, 2
- ? ? ldmia ?r3!,{r4-r7}
+ ? ? ldmia ? r3!,{r4-r7}- ? ? /* user r/w thread and process ID */
+ ? ? /* User r/w thread and process ID */
? ? ? MCR p15, 0, r4, c13, c0, 2
- ? ? /* user ro thread and process ID */
+ ? ? /* User ro thread and process ID */
? ? ? MCR p15, 0, r5, c13, c0, 3
- ? ? /*Privileged only thread and process ID */
+ ? ? /* Privileged only thread and process ID */
? ? ? MCR p15, 0, r6, c13, c0, 4
- ? ? /* cache size selection */
+ ? ? /* Cache size selection */
? ? ? MCR p15, 2, r7, c0, c0, 0
- ? ? ldmia ?r3!,{r4-r8}
+ ? ? ldmia ? r3!,{r4-r8}
? ? ? /* Data TLB lockdown registers */
? ? ? MCR p15, 0, r4, c10, c0, 0
? ? ? /* Instruction TLB lockdown registers */arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -516,26 +525,27 @@ skipl2reen:? ? ? /* Context PID */
? ? ? MCR p15, 0, r8, c13, c0, 1- ? ? ldmia ?r3!,{r4-r5}
- ? ? /* primary memory remap register */
+ ? ? ldmia ? r3!,{r4-r5}
+ ? ? /* Primary memory remap register */
? ? ? MCR p15, 0, r4, c10, c2, 0
- ? ? /*normal memory remap register */
+ ? ? /* Normal memory remap register */
? ? ? MCR p15, 0, r5, c10, c2, 1? ? ? /* Restore cpsr */
- ? ? ldmia ? r3!,{r4} ? ? ? ?/*load CPSR from SDRAM*/
- ? ? msr ? ? cpsr, r4 ? ? ? ?/*store cpsr */
+ ? ? ldmia ? r3!,{r4} ? ? ? ? ? ? ? ?@ load CPSR from SDRAM
+ ? ? msr ? ? cpsr, r4 ? ? ? ? ? ? ? ?@ store cpsrQuoted 5 lines
? ? ? /* Enabling MMU here */
- ? ? mrc ? ? p15, 0, r7, c2, c0, 2 /* Read TTBRControl */
- ? ? /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1*/
+ ? ? mrc ? ? p15, 0, r7, c2, c0, 2 ? @ Read TTBRControl
+ ? ? /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1*/
Quoted 20 lines
? ? ? and ? ? r7, #0x7
? ? ? cmp ? ? r7, #0x0
? ? ? beq ? ? usettbr0
?ttbr_error:
- ? ? /* More work needs to be done to support N[0:2] value other than 0
- ? ? * So looping here so that the error can be detected
- ? ? */
+ ? ? /*
+ ? ? ?* More work needs to be done to support N[0:2] value other than 0
+ ? ? ?* So looping here so that the error can be detected
+ ? ? ?*/
? ? ? b ? ? ?ttbr_error
?usettbr0:
? ? ? mrc ? ? p15, 0, r2, c2, c0, 0arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -543,21 +553,25 @@ usettbr0:? ? ? and ? ? r2, r5
? ? ? mov ? ? r4, pc
? ? ? ldr ? ? r5,table_index_mask
- ? ? and ? ? r4, r5 /* r4 = 31 to 20 bits of pc */
+ ? ? and ? ? r4, r5 ? ? ? ? ? ? ? ? ?@ r4 = 31 to 20 bits of pcQuoted 8 lines
? ? ? /* Extract the value to be written to table entry */
? ? ? ldr ? ? r1,table_entry
- ? ? add ? ? r1, r1, r4 /* r1 has value to be written to table entry*/
+ ? ? /* r1 has the value to be written to table entry*/
+ ? ? add ? ? r1, r1, r4
? ? ? /* Getting the address of table entry to modify */
? ? ? lsr ? ? r4, #18
- ? ? add ? ? r2, r4 /* r2 has the location which needs to be modified*/
Quoted 17 lines
+ ? ? /* r2 has the location which needs to be modified */
+ ? ? add ? ? r2, r4
? ? ? /* Storing previous entry of location being modified */ ? ? ? ldr ? ? r5,scratchpad_base
? ? ? ldr ? ? r4, [r2]
? ? ? str ? ? r4, [r5, #0xC0]
? ? ? /* Modify the table entry */
? ? ? str ? ? r1, [r2]
- ? ? /* Storing address of entry being modified
- ? ? ?* - will be restored after enabling MMU */
+ ? ? /*
+ ? ? ?* Storing address of entry being modified
+ ? ? ?* - will be restored after enabling MMU
+ ? ? ?*/
? ? ? ldr ? ? r5,scratchpad_base
? ? ? str ? ? r2, [r5, #0xC4]
Quoted 8 lines
Quoted 2 lines
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -566,7 +580,7 @@ usettbr0:? ? ? mcr ? ? p15, 0, r0, c7, c5, 6 ? @ Invalidate branch predictor
array
Quoted 4 lines
? ? ? mcr ? ? p15, 0, r0, c8, c5, 0 ? @ Invalidate instruction TLB ? ? ? mcr ? ? p15, 0, r0, c8, c6, 0 ? @ Invalidate data TLB
- ? ? /* Restore control register ?but dont enable caches here*/
+ ? ? /* Restore control register ?but dont enable caches here */don't.....don't
Fixed
Quoted 1 line
Quoted 1 line
? ? ? /* Caches will be enabled after restoring MMU table entry */
Rephrased
Quoted 124 lines
Here too you can fix the commenting style
Quoted 122 lines
? ? ? ldmia ? r3!, {r4}
? ? ? /* Store previous value of control register in scratchpad */arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -580,7 +594,7 @@ usettbr0:? * == Exit point from OFF mode ==
? * ==============================
? */
- ? ? ldmfd ? sp!, {r0-r12, pc} ? ? ? ? ? ? ? @ restore regs and return
+ ? ? ldmfd ? sp!, {r0-r12, pc} ? ? ? @ restore regs and return?/*
arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -646,55 +660,56 @@ ENTRY(es3_sdrc_fix_sz)?/* Make sure SDRC accesses are ok */
?wait_sdrc_ok:-/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensures this. */
+/* DPLL3 must be locked before accessing the SDRC. Maybe the HW ensures this */
? ? ? ldr ? ? r4,cm_idlest_ckgen
?wait_dpll3_lock:
? ? ? ldr ? ? r5, [r4]
? ? ? tst ? ? r5, #1
? ? ? beq ? ?wait_dpll3_lock- ? ? ? ?ldr ? ? r4,
cm_idlest1_core
+ ? ? ldr ? ? r4,cm_idlest1_core
?wait_sdrc_ready:
- ? ? ? ?ldr ? ? r5, [r4]
- ? ? ? ?tst ? ? r5, #0x2
- ? ? ? ?bne ? ?wait_sdrc_ready
+ ? ? ldr ? ? r5, [r4]
+ ? ? tst ? ? r5, #0x2
+ ? ? bne ? ?wait_sdrc_ready
? ? ? /* allow DLL powerdown upon hw idle req */
- ? ? ? ?ldr ? ? r4,sdrc_power
- ? ? ? ?ldr ? ? r5, [r4]
- ? ? ? ?bic ? ? r5, r5, #0x40
- ? ? ? ?str ? ? r5, [r4]arch/arm/mach-omap2/sleep34xx.S +11
-7-is_dll_in_lock_mode: + ? ? ldr ? ? r4, sdrc_power + ? ? ldr ? ? r5, [r4] + ? ? bic ? ? r5, r5, #0x40 + ? ? str ? ? r5, [r4] - ? ? ? ?/* Is dll in lock mode? */ - ? ? ? ?ldr ? ? r4, sdrc_dlla_ctrl - ? ? ? ?ldr ? ? r5, [r4] - ? ? ? ?tst ? ? r5, #0x4 - ? ? ? ?bxne ? ?lr - ? ? ? ?/* wait till dll locks */ +is_dll_in_lock_mode: + ? ? /* Is dll in lock mode? */ + ? ? ldr ? ? r4, sdrc_dlla_ctrl + ? ? ldr ? ? r5, [r4] + ? ? tst ? ? r5, #0x4 + ? ? bxne ? ?lr ? ? ? ? ? ? ? ? ? ? ?@ Return if locked + ? ? /* wait till dll locks */?wait_dll_lock_timed:
? ? ? ldr ? ? r4,wait_dll_lock_counter
? ? ? add ? ? r4, r4, #1
? ? ? str ? ? r4,wait_dll_lock_counter
? ? ? ldr ? ? r4,sdrc_dlla_status
- ? ? ? ?mov ?r6, #8 ? ? ? ? ?/* Wait 20uS for lock */
+ ? ? /* Wait 20uS for lock */
+ ? ? mov ? ? r6, #8
?wait_dll_lock:
? ? ? subs ? ?r6, r6, #0x1
? ? ? beq ? ?kick_dll
- ? ? ? ?ldr ? ? r5, [r4]
- ? ? ? ?and ? ? r5, r5, #0x4
- ? ? ? ?cmp ? ? r5, #0x4
- ? ? ? ?bne ? ?wait_dll_lock
- ? ? ? ?bx ? ? ?lr
+ ? ? ldr ? ? r5, [r4]
+ ? ? and ? ? r5, r5, #0x4
+ ? ? cmp ? ? r5, #0x4
+ ? ? bne ? ?wait_dll_lock
+ ? ? bx ? ? ?lr ? ? ? ? ? ? ? ? ? ? ?@ Return when locked? ? ? /* disable/reenable DLL if not locked */ ?kick_dll:
? ? ? ldr ? ? r4,sdrc_dlla_ctrl
? ? ? ldr ? ? r5, [r4]
? ? ? mov ? ? r6, r5
- ? ? bic ? ? r6, #(1<<3) ? ? /* disable dll */
+ ? ? bic ? ? r6, #(1<<3) ? ? ? ? ? ? @ disable dll ? ? ? str ? ? r6, [r4]
? ? ? dsb
- ? ? orr ? ? r6, r6, #(1<<3) /* enable dll */
+ ? ? orr ? ? r6, r6, #(1<<3) ? ? ? ? @ enable dll ? ? ? str ? ? r6, [r4]
? ? ? dsb
? ? ? ldr ? ? r4,kick_counterarch/arm/mach-omap2/sleep34xx.S +0
-0@@ -719,7 +734,7 @@ scratchpad_base:?sram_base:
? ? ? .word ?SRAM_BASE_P+0x8000
?sdrc_power:
- ? ? .wordSDRC_POWER_V
+ ? ? .word ?SDRC_POWER_V
?ttbrbit_mask:
? ? ? .word ?0xFFFFC000
?table_index_mask:arch/arm/mach-omap2/sleep34xx.S +0
-0@@ -733,9 +748,9 @@ control_stat:?control_mem_rta:
? ? ? .word ?CONTROL_MEM_RTA_CTRL?kernel_flush:
- ? ? .wordv7_flush_dcache_all
+ ? ? .word ?v7_flush_dcache_all?l2dis_3630:
- ? ? .word 0
+ ? ? .word ? 0
? ? ? /* these 2 words need to be at the end !!! */ ?kick_counter:
? ? ? .word ? 0
--
1.7.1--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerv4 cover OMAP3: clean up ASM sleep code
In reply to jean.pihet at newoldbits.comQuoted 11 lines · jean.pihet at newoldbits.com
From: Jean Pihet <[email protected]>
This patch only contains clean-ups and cosmetic changes, no functional change.
Clean-up of the ASM sleep code, for better readability and easier maintenance.
Applies on top of Nishant's latest idle path errata fixes step 2, cf. http://marc.info/?l=linux-omap&m=129139584919242&w=2
Quoted 8 lines
Jean Pihet (7):
OMAP2+: use global values for the SRAM PA addresses
OMAP3: remove hardcoded values from the ASM sleep code
OMAP3: re-organize the ASM sleep code
OMAP3: rework of the ASM sleep code execution paths
OMAP3: add comments for low power code errata
OMAP3: ASM sleep code format rework
OMAP3: remove unused code from the ASM sleep code
Thanks for splitting it into several patches, looks good to me. Assuming Kevin will queue these, so:
v4 cover OMAP3: clean up ASM sleep code
In reply to jean.pihet at newoldbits.comJean,
Quoted 11 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 0/7 v4] OMAP3: clean up ASM sleep codeFrom: Jean Pihet <[email protected]>
Quoted 9 lines
This patch only contains clean-ups and cosmetic changes, no functional change.
Clean-up of the ASM sleep code, for better readability and easier maintenance.
Applies on top of Nishant's latest idle path errata fixes step 2, cf. http://marc.info/?l=linux-omap&m=129139584919242&w=2
Thanks for cleanup. Have few minor comments on these patches.
Quoted 9 lines
Jean Pihet (7):
OMAP2+: use global values for the SRAM PA addresses
OMAP3: remove hardcoded values from the ASM sleep code
OMAP3: re-organize the ASM sleep code
OMAP3: rework of the ASM sleep code execution paths
OMAP3: add comments for low power code errata
OMAP3: ASM sleep code format rework
OMAP3: remove unused code from the ASM sleep code
Quoted 6 lines
arch/arm/mach-omap2/control.c | 10 +- arch/arm/mach-omap2/control.h | 2 + arch/arm/mach-omap2/pm.h | 1 - arch/arm/mach-omap2/pm34xx.c | 4 +- arch/arm/mach-omap2/sdrc.h | 7 + arch/arm/mach-omap2/sleep34xx.S | 714
+++++++++++++++++++++-------------
Quoted 8 lines
-----
arch/arm/plat-omap/sram.c | 7 +- 7 files changed, 401 insertions(+), 344 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
v4 cover OMAP3: clean up ASM sleep code
Hi Santosh, Kevin,
Quoted 16 lines · Santosh Shilimkar
Jean,
Quoted 14 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com; linux-arm-kernel at lists.infradead.org; Jean Pihet
Subject: [PATCH 0/7 v4] OMAP3: clean up ASM sleep codeFrom: Jean Pihet <[email protected]>
This patch only contains clean-ups and cosmetic changes, no functional change.
Quoted 7 lines
Quoted 6 lines
Clean-up of the ASM sleep code, for better readability and easier maintenance.
Applies on top of Nishant's latest idle path errata fixes step 2, cf. http://marc.info/?l=linux-omap&m=129139584919242&w=2
Thanks for cleanup. Have few minor comments on these patches.
Thanks for the review.
I fixed the issues and reposted the series as '[PATCH 0/7 v5] OMAP3:
clean up ASM sleep code'.
Regards,
Jean
Quoted 30 lines
Quoted 10 lines
Jean Pihet (7):
? OMAP2+: use global values for the SRAM PA addresses ? OMAP3: remove hardcoded values from the ASM sleep code ? OMAP3: re-organize the ASM sleep code
? OMAP3: rework of the ASM sleep code execution paths ? OMAP3: add comments for low power code errata ? OMAP3: ASM sleep code format rework
? OMAP3: remove unused code from the ASM sleep codeQuoted 6 lines
?arch/arm/mach-omap2/control.c ? | ? 10 +- ?arch/arm/mach-omap2/control.h ? | ? ?2 + ?arch/arm/mach-omap2/pm.h ? ? ? ?| ? ?1 - ?arch/arm/mach-omap2/pm34xx.c ? ?| ? ?4 +- ?arch/arm/mach-omap2/sdrc.h ? ? ?| ? ?7 + ?arch/arm/mach-omap2/sleep34xx.S | ?714+++++++++++++++++++++-------------
Quoted 8 lines
-----
?arch/arm/plat-omap/sram.c ? ? ? | ? ?7 +-
?7 files changed, 401 insertions(+), 344 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html
v4 cover OMAP3: clean up ASM sleep code
Quoted 5 lines
-----Original Message-----
From: Jean Pihet [mailto:jean.pihet at newoldbits.com]
Sent: Friday, December 17, 2010 3:48 PM
To: Santosh Shilimkar; khilman at deeprootsystems.com
Cc: linux-omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org;
Jean
Quoted 15 lines
Pihet-XID
Subject: Re: [PATCH 0/7 v4] OMAP3: clean up ASM sleep codeHi Santosh, Kevin,
Quoted 8 lines · Santosh Shilimkar
Jean,
Quoted 6 lines
-----Original Message-----
From: linux-omap-owner at vger.kernel.org [mailto:linux-omap- owner at vger.kernel.org] On Behalf Of jean.pihet at newoldbits.com
Sent: Thursday, December 16, 2010 11:21 PM
To: linux-omap at vger.kernel.org
Cc: khilman at deeprootsystems.com;
linux-arm-kernel at lists.infradead.org;
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Jean Pihet
Subject: [PATCH 0/7 v4] OMAP3: clean up ASM sleep codeFrom: Jean Pihet <[email protected]>
This patch only contains clean-ups and cosmetic changes, no functional change.
Clean-up of the ASM sleep code, for better readability and easier maintenance.
Quoted 9 lines
Quoted 4 lines
Quoted 3 lines
Applies on top of Nishant's latest idle path errata fixes step 2, cf. http://marc.info/?l=linux-omap&m=129139584919242&w=2
Thanks for cleanup. Have few minor comments on these patches.
Thanks for the review.
I fixed the issues and reposted the series as '[PATCH 0/7 v5] OMAP3:
clean up ASM sleep code'.
Thanks. I checked it. Will ack your patches