AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: omap3: Thumb-2 compatibility for sram34xx.S

Browse Source 
* Build unconditionally as ARM for correct interoperation with
   OMAP firmware.

 * Remove deprecated PC-relative stores

 * Add the required ENDPROC() directive for each ENTRY().

 * .align before data words

Signed-off-by: Dave Martin <dave.martin@linaro.org>
Tested-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Dave Martin 2011-03-04 15:33:56 +00:00 committed by Kevin Hilman
parent 76d5001820
commit ef7a87d340
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/mach-omap2/sram34xx.S
View File

@ -34,6 +34,12 @@
#include "sdrc.h" #include "sdrc.h"
#include "cm2xxx_3xxx.h" #include "cm2xxx_3xxx.h"
/*
* This file needs be built unconditionally as ARM to interoperate correctly
* with non-Thumb-2-capable firmware.
*/
.arm
.text .text
/* r1 parameters */ /* r1 parameters */
@ -116,24 +122,36 @@ ENTRY(omap3_sram_configure_core_dpll)
@ pull the extra args off the stack @ pull the extra args off the stack
@ and store them in SRAM @ and store them in SRAM
/*
* PC-relative stores are deprecated in ARMv7 and lead to undefined behaviour
* in Thumb-2: use a r7 as a base instead.
* Be careful not to clobber r7 when maintaing this file.
*/
THUMB( adr r7, omap3_sram_configure_core_dpll )
.macro strtext Rt:req, label:req
ARM( str \Rt, \label )
THUMB( str \Rt, [r7, \label - omap3_sram_configure_core_dpll] )
.endm
ldr r4, [sp, #52] ldr r4, [sp, #52]
str r4, omap_sdrc_rfr_ctrl_0_val strtext r4, omap_sdrc_rfr_ctrl_0_val
ldr r4, [sp, #56] ldr r4, [sp, #56]
str r4, omap_sdrc_actim_ctrl_a_0_val strtext r4, omap_sdrc_actim_ctrl_a_0_val
ldr r4, [sp, #60] ldr r4, [sp, #60]
str r4, omap_sdrc_actim_ctrl_b_0_val strtext r4, omap_sdrc_actim_ctrl_b_0_val
ldr r4, [sp, #64] ldr r4, [sp, #64]
str r4, omap_sdrc_mr_0_val strtext r4, omap_sdrc_mr_0_val
ldr r4, [sp, #68] ldr r4, [sp, #68]
str r4, omap_sdrc_rfr_ctrl_1_val strtext r4, omap_sdrc_rfr_ctrl_1_val
cmp r4, #0 @ if SDRC_RFR_CTRL_1 is 0, cmp r4, #0 @ if SDRC_RFR_CTRL_1 is 0,
beq skip_cs1_params @ do not use cs1 params beq skip_cs1_params @ do not use cs1 params
ldr r4, [sp, #72] ldr r4, [sp, #72]
str r4, omap_sdrc_actim_ctrl_a_1_val strtext r4, omap_sdrc_actim_ctrl_a_1_val
ldr r4, [sp, #76] ldr r4, [sp, #76]
str r4, omap_sdrc_actim_ctrl_b_1_val strtext r4, omap_sdrc_actim_ctrl_b_1_val
ldr r4, [sp, #80] ldr r4, [sp, #80]
str r4, omap_sdrc_mr_1_val strtext r4, omap_sdrc_mr_1_val
skip_cs1_params: skip_cs1_params:
mrc p15, 0, r8, c1, c0, 0 @ read ctrl register mrc p15, 0, r8, c1, c0, 0 @ read ctrl register
bic r10, r8, #0x800 @ clear Z-bit, disable branch prediction bic r10, r8, #0x800 @ clear Z-bit, disable branch prediction
@ -271,6 +289,7 @@ skip_cs1_prog:
ldr r12, [r11] @ posted-write barrier for SDRC ldr r12, [r11] @ posted-write barrier for SDRC
bx lr bx lr
.align
omap3_sdrc_power: omap3_sdrc_power:
.word OMAP34XX_SDRC_REGADDR(SDRC_POWER) .word OMAP34XX_SDRC_REGADDR(SDRC_POWER)
omap3_cm_clksel1_pll: omap3_cm_clksel1_pll:
@ -319,6 +338,7 @@ omap3_sdrc_dlla_ctrl:
.word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL) .word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)
core_m2_mask_val: core_m2_mask_val:
.word 0x07FFFFFF .word 0x07FFFFFF
ENDPROC(omap3_sram_configure_core_dpll)
ENTRY(omap3_sram_configure_core_dpll_sz) ENTRY(omap3_sram_configure_core_dpll_sz)
.word . - omap3_sram_configure_core_dpll .word . - omap3_sram_configure_core_dpll