> -----Original Message----- > From: Dave Martin [mailto:dave.martin@xxxxxxxxxx] > Sent: Thursday, February 03, 2011 11:33 PM > To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: Dave Martin; Tony Lindgren; Santosh Shilimkar; Jean Pihet; > linux-omap@xxxxxxxxxxxxxxx; Nicolas Pitre > Subject: [PATCH v2 4/5] ARM: omap3: Thumb-2 compatibility for > sram34xx.S > > * Remove deprecated/undefined PC-relative stores > * Add the required ENDPROC() directive for each ENTRY(). > * .align before data words > > Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx> OMAP3 core DVFS needs to be tested with this change. > --- > arch/arm/mach-omap2/sram34xx.S | 28 ++++++++++++++++++++-------- > 1 files changed, 20 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach- > omap2/sram34xx.S > index 7f893a2..829d235 100644 > --- a/arch/arm/mach-omap2/sram34xx.S > +++ b/arch/arm/mach-omap2/sram34xx.S > @@ -116,24 +116,34 @@ ENTRY(omap3_sram_configure_core_dpll) > > @ pull the extra args off the stack > @ and store them in SRAM > + > +@ PC-relative stores 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] > - str r4, omap_sdrc_rfr_ctrl_0_val > + strtext r4, omap_sdrc_rfr_ctrl_0_val > 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] > - str r4, omap_sdrc_actim_ctrl_b_0_val > + strtext r4, omap_sdrc_actim_ctrl_b_0_val > ldr r4, [sp, #64] > - str r4, omap_sdrc_mr_0_val > + strtext r4, omap_sdrc_mr_0_val > 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, > beq skip_cs1_params @ do not use cs1 params > 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] > - str r4, omap_sdrc_actim_ctrl_b_1_val > + strtext r4, omap_sdrc_actim_ctrl_b_1_val > ldr r4, [sp, #80] > - str r4, omap_sdrc_mr_1_val > + strtext r4, omap_sdrc_mr_1_val > skip_cs1_params: > mrc p15, 0, r8, c1, c0, 0 @ read ctrl register > bic r10, r8, #0x800 @ clear Z-bit, disable branch > prediction > @@ -271,6 +281,7 @@ skip_cs1_prog: > ldr r12, [r11] @ posted-write barrier for SDRC > bx lr > > + .align > omap3_sdrc_power: > .word OMAP34XX_SDRC_REGADDR(SDRC_POWER) > omap3_cm_clksel1_pll: > @@ -319,6 +330,7 @@ omap3_sdrc_dlla_ctrl: > .word OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL) > core_m2_mask_val: > .word 0x07FFFFFF > +ENDPROC(omap3_sram_configure_core_dpll) > > ENTRY(omap3_sram_configure_core_dpll_sz) > .word . - omap3_sram_configure_core_dpll > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
