OMAP clock/SDRC patches on v2.6.30-rc5
Subsystems (5)
Paul Walmsley
maintainercover OMAP clock/SDRC patches on v2.6.30-rc5
Hello Russell,
This series contains OMAP clock and SDRAM controller patches against v2.6.30-rc5. If you are happy with these, Tony will merge them into his for-next branch for you to pull.
This series includes the clk_init_one() to clk_preinit() rename that we've discussed recently. Most of the patches prepare for CORE DPLL M2 rate changing support.
regards,
- Paul
---
Artem Bityutskiy (1):
OMAP3 clock: lessen amount of noisy messages
Paul Walmsley (9):
OMAP2xxx clock: rename clk_init_one() to clk_preinit()
OMAP3 clock: use pr_debug() rather than pr_info() in some clock change code OMAP3 clock: only unlock SDRC DLL if SDRC clk < 83MHz
OMAP3 SRAM: renumber registers to make space for argument passing OMAP3 SDRC: initialize SDRC_POWER at boot
OMAP3 SRAM: clear the SDRC PWRENA bit during SDRC frequency change OMAP3 clock: add interconnect barriers to CORE DPLL M2 change OMAP3 SRAM: add ARM barriers to omap3_sram_configure_core_dpll OMAP3 SRAM: mark OCM RAM as Non-cacheable Normal memory
arch/arm/mach-omap1/clock.c | 2 arch/arm/mach-omap2/clock.c | 14 ++- arch/arm/mach-omap2/clock24xx.c | 2 arch/arm/mach-omap2/clock34xx.c | 20 +++-- arch/arm/mach-omap2/sdrc.c | 19 ++++- arch/arm/mach-omap2/sram34xx.S | 129 ++++++++++++++++--------------- arch/arm/plat-omap/clock.c | 4 - arch/arm/plat-omap/include/mach/clock.h | 2 arch/arm/plat-omap/include/mach/sram.h | 6 + arch/arm/plat-omap/sram.c | 16 +++- 10 files changed, 128 insertions(+), 86 deletions(-)
Paul Walmsley
maintainerPATCH 1/10 OMAP3 SRAM: mark OCM RAM as Non-cacheable Normal memory
Mark the SRAM (aka OCM RAM) as Non-cacheable Normal memory[1]. This is to prevent the ARM from evicting existing cache lines to SDRAM while code is executing from the SRAM. Necessary since one of the primary uses for the SRAM is to hold the code and data for the CORE DPLL M2 divider reprogramming code, which must execute while the SDRC is idled. If the ARM attempts to write cache lines back to the while the SRAM code is running, the ARM will stall[2].
TI deals with this problem in the CDP kernel by marking the SRAM as Strongly-ordered memory.
Tero Kristo <[email protected]> caught a bug in an earlier version of this patch - thanks Tero.
...
1. ARMv7 ARM (DDI 0406A) pp. A3-30, A3-31, B3-32.
2. Private communication with Richard Woodruff <[email protected]>
--- arch/arm/plat-omap/sram.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
arch/arm/plat-omap/sram.c +9 -0
@@ -201,6 +201,15 @@ void __init omap_map_sram(void) base =OMAP3_SRAM_PA ; base =ROUND_DOWN (base,PAGE_SIZE ); omap_sram_io_desc[0 ].pfn =__phys_to_pfn (base); + +/* +* SRAM must be marked as non-cached on OMAP3 since the +* CORE DPLL M2 divider change code (in SRAM) runs with the +* SDRAM controller disabled, and if it is marked cached, +* the ARM may attempt to write cache lines back to SDRAM +* which will cause the system to hang. +*/ + omap_sram_io_desc[0 ].type =MT_MEMORY_NONCACHED ; } omap_sram_io_desc[0 ].length =1024 *1024 ;/* Use section desc */
Paul Walmsley
maintainerPATCH 2/10 OMAP3 SRAM: add ARM barriers to omap3_sram_configure_core_dpll
In reply to Paul WalmsleyAdd more barriers in the SRAM CORE DPLL M2 divider change code.
- Add a DSB SY after the function's entry point to flush all cached and buffered writes and wait for the interconnect to claim that they have completed[1]. The idea here is to force all delayed write traffic going to the SDRAM to at least post to the L3 interconnect before continuing. If these writes are allowed to occur after the SDRC is idled, the writes will not be acknowledged and the ARM will stall.
Note that in this case, it does not matter if the writes actually complete to the SDRAM - it is only necessary for the writes to leave the ARM itself. If the writes are posted by the interconnect when the SDRC goes into idle, the writes will be delayed until the SDRC returns from idle[2]. If the SDRC is in the middle of a write when it is requested to enter idle, the SDRC will not acknowledge the idle request until the writes complete to the SDRAM.[3]
The old-style DMB in sdram_in_selfrefresh is now superfluous, so, remove it.
- Add an ISB before the function's exit point to prevent the ARM from speculatively executing into SDRAM before the SDRAM is enabled[4].
...
1. ARMv7 ARM (DDI 0406A) A3-47, A3-48.
2. Private communication with Richard Woodruff <[email protected]>.
3. Private communication with Richard Woodruff <[email protected]>.
4. ARMv7 ARM (DDI 0406A) A3-48.
--- arch/arm/mach-omap2/sram34xx.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/sram34xx.S +2 -2
@@ -43,6 +43,7 @@ */ ENTRY(omap3_sram_configure_core_dpll) stmfd sp!, {r1-r12, lr} @ store regs to stack + dsb @ flush buffered writes to interconnect cmp r3, #0x2 blne configure_sdrc cmp r3, #0x2
@@ -58,6 +59,7 @@ ENTRY(omap3_sram_configure_core_dpll) blne wait_dll_lock cmp r3, #0x1 blne configure_sdrc + isb @ prevent speculative exec past here mov r0, #0 @ return value ldmfd sp!, {r1-r12, pc} @ restore regs and return unlock_dll:
@@ -73,8 +75,6 @@ lock_dll: str r5, [r4] bx lr sdram_in_selfrefresh: - mov r5, #0x0 @ Move 0 to R5 - mcr p15, 0, r5, c7, c10, 5 @ memory barrier ldr r4, omap3_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
Paul Walmsley
maintainerPATCH 3/10 OMAP3 clock: add interconnect barriers to CORE DPLL M2 change
In reply to Paul WalmsleyWhere necessary, add interconnect barriers to force posted writes to complete before continuing.
--- arch/arm/mach-omap2/sram34xx.S | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/sram34xx.S +6 -3
@@ -66,22 +66,23 @@ unlock_dll: ldr r4, omap3_sdrc_dlla_ctrl ldr r5, [r4] orr r5, r5, #0x4 - str r5, [r4] + str r5, [r4] @ (no OCP barrier needed) bx lr lock_dll: ldr r4, omap3_sdrc_dlla_ctrl ldr r5, [r4] bic r5, r5, #0x4 - str r5, [r4] + str r5, [r4] @ (no OCP barrier needed) bx lr sdram_in_selfrefresh: ldr r4, omap3_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 + ldr r5, [r4] @ posted-write barrier for SDRC ldr r4, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg ldr r5, [r4] - bic r5, r5, #0x2 @ disable iclk bit for SRDC + bic r5, r5, #0x2 @ disable iclk bit for SDRC str r5, [r4] wait_sdrc_idle: ldr r4, omap3_cm_idlest1_core
@@ -97,6 +98,7 @@ configure_core_dpll: and r5, r5, r6 orr r5, r5, r3, lsl #0x1B @ r3 contains the M2 val str r5, [r4] + ldr r5, [r4] @ posted-write barrier for CM mov r5, #0x800 @ wait for the clock to stabilise cmp r3, #2 bne wait_clk_stable
@@ -152,6 +154,7 @@ configure_sdrc: str r1, [r4] ldr r4, omap3_sdrc_actim_ctrlb str r2, [r4] + ldr r2, [r4] @ posted-write barrier for SDRC bx lr omap3_sdrc_power:
Paul Walmsley
maintainerPATCH 4/10 OMAP3 SRAM: clear the SDRC PWRENA bit during SDRC frequency change
In reply to Paul WalmsleyClear the SDRC_POWER.PWRENA bit before putting the SDRAM into self-refresh mode. This prevents the SDRC from attempting to power off the SDRAM, which can cause the system to hang.
--- arch/arm/mach-omap2/sram34xx.S | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/sram34xx.S +4 -3
@@ -77,7 +77,9 @@ lock_dll: sdram_in_selfrefresh: ldr r4, omap3_sdrc_power @ read the SDRC_POWER register ldr r5, [r4] @ read the contents of SDRC_POWER + mov r9, r5 @ keep a copy of SDRC_POWER bits orr r5, r5, #0x40 @ enable self refresh on idle req + bic r5, r5, #0x4 @ clear PWDENA str r5, [r4] @ write back to SDRC_POWER register ldr r5, [r4] @ posted-write barrier for SDRC ldr r4, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg
@@ -128,10 +130,9 @@ wait_sdrc_idle1: and r5, r5, #0x2 cmp r5, #0 bne wait_sdrc_idle1 +restore_sdrc_power_val: ldr r4, omap3_sdrc_power - ldr r5, [r4] - bic r5, r5, #0x40 - str r5, [r4] + str r9, [r4] @ restore SDRC_POWER, no barrier needed bx lr wait_dll_lock: ldr r4, omap3_sdrc_dlla_status
Paul Walmsley
maintainerPATCH 5/10 OMAP3 SDRC: initialize SDRC_POWER at boot
In reply to Paul WalmsleyInitialize SDRC_POWER to a known-good setting when the kernel boots. Necessary since some bootloaders don't initialize SDRC_POWER properly.
--- arch/arm/mach-omap2/sdrc.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/sdrc.c +18 -1
@@ -37,6 +37,10 @@ static struct omap_sdrc_params *sdrc_init_params;void __iomem *omap2_sdrc_base;void __iomem *omap2_sms_base; +/* SDRC_POWER register bits */ +#define SDRC_POWER_EXTCLKDIS_SHIFT 3 +#define SDRC_POWER_PWDENA_SHIFT 2 +#define SDRC_POWER_PAGEPOLICY_SHIFT 0/** * omap2_sdrc_get_params - return SDRC register values for a given clock rate
@@ -74,7 +78,14 @@ void __init omap2_set_globals_sdrc(struct omap_globals *omap2_globals) omap2_sms_base = omap2_globals->sms; } -/* turn on smart idle modes for SDRAM scheduler and controller */ +/** +* omap2_sdrc_init - initialize SMS, SDRC devices on boot +* @sp: pointer to a null-terminated list of struct omap_sdrc_params +* +* Turn on smart idle modes for SDRAM scheduler and controller. +* Program a known-good configuration for the SDRC to deal with buggy +* bootloaders. +*/ void __init omap2_sdrc_init (struct omap_sdrc_params *sp) {u32 l;
@@ -90,4 +101,10 @@ void __init omap2_sdrc_init(struct omap_sdrc_params *sp)sdrc_write_reg (l,SDRC_SYSCONFIG ); sdrc_init_params = sp; + +/* XXX Enable SRFRONIDLEREQ here also? */ + l = (1 <<SDRC_POWER_EXTCLKDIS_SHIFT ) | + (1 <<SDRC_POWER_PWDENA_SHIFT ) | + (1 <<SDRC_POWER_PAGEPOLICY_SHIFT ); +sdrc_write_reg (l,SDRC_POWER ); }
Paul Walmsley
maintainerPATCH 6/10 OMAP3 SRAM: renumber registers to make space for argument passing
In reply to Paul WalmsleyRenumber registers in omap3_sram_configure_core_dpll() assembly code to make space for additional parameters.
--- arch/arm/mach-omap2/sram34xx.S | 114 ++++++++++++++++++++-------------------- 1 files changed, 57 insertions(+), 57 deletions(-)
arch/arm/mach-omap2/sram34xx.S +57 -57
@@ -63,50 +63,50 @@ ENTRY(omap3_sram_configure_core_dpll) mov r0, #0 @ return value ldmfd sp!, {r1-r12, pc} @ restore regs and return unlock_dll: - ldr r4, omap3_sdrc_dlla_ctrl - ldr r5, [r4] - orr r5, r5, #0x4 - str r5, [r4] @ (no OCP barrier needed) + ldr r11, omap3_sdrc_dlla_ctrl + ldr r12, [r11] + orr r12, r12, #0x4 + str r12, [r11] @ (no OCP barrier needed) bx lr lock_dll: - ldr r4, omap3_sdrc_dlla_ctrl - ldr r5, [r4] - bic r5, r5, #0x4 - str r5, [r4] @ (no OCP barrier needed) + ldr r11, omap3_sdrc_dlla_ctrl + ldr r12, [r11] + bic r12, r12, #0x4 + str r12, [r11] @ (no OCP barrier needed) bx lr sdram_in_selfrefresh: - ldr r4, omap3_sdrc_power @ read the SDRC_POWER register - ldr r5, [r4] @ read the contents of SDRC_POWER - mov r9, r5 @ keep a copy of SDRC_POWER bits - orr r5, r5, #0x40 @ enable self refresh on idle req - bic r5, r5, #0x4 @ clear PWDENA - str r5, [r4] @ write back to SDRC_POWER register - ldr r5, [r4] @ posted-write barrier for SDRC - ldr r4, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg - ldr r5, [r4] - bic r5, r5, #0x2 @ disable iclk bit for SDRC - str r5, [r4] + ldr r11, omap3_sdrc_power @ read the SDRC_POWER register + ldr r12, [r11] @ read the contents of SDRC_POWER + mov r9, r12 @ keep a copy of SDRC_POWER bits + orr r12, r12, #0x40 @ enable self refresh on idle req + bic r12, r12, #0x4 @ clear PWDENA + str r12, [r11] @ write back to SDRC_POWER register + ldr r12, [r11] @ posted-write barrier for SDRC + ldr r11, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg + ldr r12, [r11] + bic r12, r12, #0x2 @ disable iclk bit for SDRC + str r12, [r11] wait_sdrc_idle: - ldr r4, omap3_cm_idlest1_core - ldr r5, [r4] - and r5, r5, #0x2 @ check for SDRC idle - cmp r5, #2 + ldr r11, omap3_cm_idlest1_core + ldr r12, [r11] + and r12, r12, #0x2 @ check for SDRC idle + cmp r12, #2 bne wait_sdrc_idle bx lr configure_core_dpll: - ldr r4, omap3_cm_clksel1_pll - ldr r5, [r4] - ldr r6, core_m2_mask_val @ modify m2 for core dpll - and r5, r5, r6 - orr r5, r5, r3, lsl #0x1B @ r3 contains the M2 val - str r5, [r4] - ldr r5, [r4] @ posted-write barrier for CM - mov r5, #0x800 @ wait for the clock to stabilise + ldr r11, omap3_cm_clksel1_pll + ldr r12, [r11] + ldr r10, core_m2_mask_val @ modify m2 for core dpll + and r12, r12, r10 + orr r12, r12, r3, lsl #0x1B @ r3 contains the M2 val + str r12, [r11] + ldr r12, [r11] @ posted-write barrier for CM + mov r12, #0x800 @ wait for the clock to stabilise cmp r3, #2 bne wait_clk_stable bx lr wait_clk_stable: - subs r5, r5, #1 + subs r12, r12, #1 bne wait_clk_stable nop nop
@@ -120,42 +120,42 @@ wait_clk_stable: nop bx lr enable_sdrc: - ldr r4, omap3_cm_iclken1_core - ldr r5, [r4] - orr r5, r5, #0x2 @ enable iclk bit for SDRC - str r5, [r4] + ldr r11, omap3_cm_iclken1_core + ldr r12, [r11] + orr r12, r12, #0x2 @ enable iclk bit for SDRC + str r12, [r11] wait_sdrc_idle1: - ldr r4, omap3_cm_idlest1_core - ldr r5, [r4] - and r5, r5, #0x2 - cmp r5, #0 + ldr r11, omap3_cm_idlest1_core + ldr r12, [r11] + and r12, r12, #0x2 + cmp r12, #0 bne wait_sdrc_idle1 restore_sdrc_power_val: - ldr r4, omap3_sdrc_power - str r9, [r4] @ restore SDRC_POWER, no barrier needed + ldr r11, omap3_sdrc_power + str r9, [r11] @ restore SDRC_POWER, no barrier needed bx lr wait_dll_lock: - ldr r4, omap3_sdrc_dlla_status - ldr r5, [r4] - and r5, r5, #0x4 - cmp r5, #0x4 + ldr r11, omap3_sdrc_dlla_status + ldr r12, [r11] + and r12, r12, #0x4 + cmp r12, #0x4 bne wait_dll_lock bx lr wait_dll_unlock: - ldr r4, omap3_sdrc_dlla_status - ldr r5, [r4] - and r5, r5, #0x4 - cmp r5, #0x0 + ldr r11, omap3_sdrc_dlla_status + ldr r12, [r11] + and r12, r12, #0x4 + cmp r12, #0x0 bne wait_dll_unlock bx lr configure_sdrc: - ldr r4, omap3_sdrc_rfr_ctrl - str r0, [r4] - ldr r4, omap3_sdrc_actim_ctrla - str r1, [r4] - ldr r4, omap3_sdrc_actim_ctrlb - str r2, [r4] - ldr r2, [r4] @ posted-write barrier for SDRC + ldr r11, omap3_sdrc_rfr_ctrl + str r0, [r11] + ldr r11, omap3_sdrc_actim_ctrla + str r1, [r11] + ldr r11, omap3_sdrc_actim_ctrlb + str r2, [r11] + ldr r2, [r11] @ posted-write barrier for SDRC bx lr omap3_sdrc_power:
Paul Walmsley
maintainerPATCH 7/10 OMAP3 clock: only unlock SDRC DLL if SDRC clk < 83MHz
In reply to Paul WalmsleyAccording to the 34xx TRM Rev. K section 11.2.4.4.11.1 "Purpose of the DLL/CDL Module," the SDRC delay-locked-loop can be locked at any SDRC clock frequency from 83MHz to 166MHz. CDP code unconditionally unlocked the DLL whenever shifting to a lower SDRC speed, but this seems unnecessary and error-prone, as the DLL is no longer able to compensate for process, voltage, and temperature variations. Instead, only unlock the DLL when the SDRC clock rate would be less than 83MHz.
--- arch/arm/mach-omap2/clock34xx.c | 10 +++++++++- arch/arm/mach-omap2/sram34xx.S | 13 +++++++------ arch/arm/plat-omap/include/mach/sram.h | 6 ++++-- arch/arm/plat-omap/sram.c | 7 ++++--- 4 files changed, 24 insertions(+), 12 deletions(-)
arch/arm/mach-omap2/clock34xx.c +9 -1
@@ -281,6 +281,8 @@ static struct omap_clk omap34xx_clks[] = {#define MAX_DPLL_WAIT_TRIES 1000000 +#define MIN_SDRC_DLL_LOCK_FREQ 83000000 +/** * omap3_dpll_recalc - recalculate DPLL rate * @clk: DPLL struct clk
@@ -703,6 +705,7 @@ static int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate)static int omap3_core_dpll_m2_set_rate (struct clk *clk,unsigned long rate) {u32 new_div =0 ; +u32 unlock_dll =0 ;unsigned long validrate, sdrcrate;struct omap_sdrc_params *sp;
@@ -729,6 +732,11 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)if (!sp)return -EINVAL ; +if (sdrcrate <MIN_SDRC_DLL_LOCK_FREQ ) { +pr_debug ("clock: will unlock SDRC DLL\n" ); + unlock_dll =1 ; + } +pr_info ("clock: changing CORE DPLL rate from %lu to %lu\n" , clk->rate, validrate); pr_info("clock: SDRC timing params used: %08x %08x %08x\n",
@@ -739,7 +747,7 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)/* REVISIT: Add SDRC_MR changing to this code also */ omap3_configure_core_dpll (sp->rfr_ctrl, sp->actim_ctrla, - sp->actim_ctrlb, new_div); + sp->actim_ctrlb, new_div, unlock_dll);return 0 ; }
arch/arm/mach-omap2/sram34xx.S +7 -6
@@ -40,22 +40,23 @@ /* * Change frequency of core dpll * r0 = sdrc_rfr_ctrl r1 = sdrc_actim_ctrla r2 = sdrc_actim_ctrlb r3 = M2 + * r4 = Unlock SDRC DLL? (1 = yes, 0 = no) -- only unlock DLL for + * SDRC rates < 83MHz */ ENTRY(omap3_sram_configure_core_dpll) stmfd sp!, {r1-r12, lr} @ store regs to stack + ldr r4, [sp, #52] @ pull extra args off the stack dsb @ flush buffered writes to interconnect cmp r3, #0x2 blne configure_sdrc - cmp r3, #0x2 + cmp r4, #0x1 + bleq unlock_dll blne lock_dll - cmp r3, #0x1 - blne unlock_dll bl sdram_in_selfrefresh @ put the SDRAM in self refresh bl configure_core_dpll bl enable_sdrc - cmp r3, #0x1 - blne wait_dll_unlock - cmp r3, #0x2 + cmp r4, #0x1 + bleq wait_dll_unlock blne wait_dll_lock cmp r3, #0x1 blne configure_sdrc
arch/arm/plat-omap/include/mach/sram.h +4 -2
@@ -23,7 +23,8 @@ extern u32 omap2_set_prcm(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);extern u32 omap3_configure_core_dpll (u32 sdrc_rfr_ctrl,u32 sdrc_actim_ctrla, -u32 sdrc_actim_ctrlb,u32 m2); +u32 sdrc_actim_ctrlb,u32 m2, +u32 unlock_dll);/* Do not use these */ extern void omap1_sram_reprogram_clock (u32 ckctl,u32 dpllctl);
@@ -60,7 +61,8 @@ extern unsigned long omap243x_sram_reprogram_sdrc_sz;extern u32 omap3_sram_configure_core_dpll (u32 sdrc_rfr_ctrl,u32 sdrc_actim_ctrla, -u32 sdrc_actim_ctrlb,u32 m2); +u32 sdrc_actim_ctrlb,u32 m2, +u32 unlock_dll);extern unsigned long omap3_sram_configure_core_dpll_sz;#endif
arch/arm/plat-omap/sram.c +4 -3
@@ -365,16 +365,17 @@ static inline int omap243x_sram_init(void)static u32 (*_omap3_sram_configure_core_dpll)(u32 sdrc_rfr_ctrl,u32 sdrc_actim_ctrla,u32 sdrc_actim_ctrlb, -u32 m2); +u32 m2,u32 unlock_dll);u32 omap3_configure_core_dpll (u32 sdrc_rfr_ctrl,u32 sdrc_actim_ctrla, -u32 sdrc_actim_ctrlb,u32 m2) +u32 sdrc_actim_ctrlb,u32 m2,u32 unlock_dll) {if (!_omap3_sram_configure_core_dpll)omap_sram_error ();return _omap3_sram_configure_core_dpll (sdrc_rfr_ctrl, sdrc_actim_ctrla, - sdrc_actim_ctrlb, m2); + sdrc_actim_ctrlb, m2, + unlock_dll); }/* REVISIT: Should this be same as omap34xx_sram_init() after off-idle? */
Paul Walmsley
maintainerPATCH 8/10 OMAP3 clock: use pr_debug() rather than pr_info() in some clock change code
In reply to Paul WalmsleyThe CORE DPLL M2 frequency change code should use pr_debug(), not pr_info(), for its debug messages. Same with omap2_clksel_round_rate_div(). While here, convert a few printk(KERN_ERR .. into pr_err().
--- arch/arm/mach-omap2/clock.c | 12 ++++++------ arch/arm/mach-omap2/clock34xx.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/mach-omap2/clock.c +6 -6
@@ -547,8 +547,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,const struct clksel_rate *clkr;u32 last_div =0 ; -printk (KERN_INFO "clock: clksel_round_rate_div: %s target_rate %ld\n" , - clk->name, target_rate); +pr_debug ("clock: clksel_round_rate_div: %s target_rate %ld\n" , + clk->name, target_rate); *new_div =1 ;
@@ -562,7 +562,7 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,/* Sanity check */ if (clkr->div <= last_div) -printk (KERN_ERR "clock: clksel_rate table not sorted " +pr_err ("clock: clksel_rate table not sorted " "for clock %s" , clk->name); last_div = clkr->div;
@@ -574,7 +574,7 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, }if (!clkr->div) { -printk (KERN_ERR "clock: Could not find divisor for target " +pr_err ("clock: Could not find divisor for target " "rate %ld for clock %s parent %s\n" , target_rate, clk->name, clk->parent->name);return ~0 ;
@@ -582,8 +582,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, *new_div = clkr->div; -printk (KERN_INFO "clock: new_div = %d, new_rate = %ld\n" , *new_div, - (clk->parent->rate / clkr->div)); +pr_debug ("clock: new_div = %d, new_rate = %ld\n" , *new_div, + (clk->parent->rate / clkr->div));return (clk->parent->rate / clkr->div); }
arch/arm/mach-omap2/clock34xx.c +4 -4
@@ -737,10 +737,10 @@ static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) unlock_dll =1 ; } -pr_info ("clock: changing CORE DPLL rate from %lu to %lu\n" , clk->rate, - validrate); -pr_info ("clock: SDRC timing params used: %08x %08x %08x\n" , - sp->rfr_ctrl, sp->actim_ctrla, sp->actim_ctrlb); +pr_debug ("clock: changing CORE DPLL rate from %lu to %lu\n" , clk->rate, + validrate); +pr_debug ("clock: SDRC timing params used: %08x %08x %08x\n" , + sp->rfr_ctrl, sp->actim_ctrla, sp->actim_ctrlb);/* REVISIT: SRAM code doesn't support other M2 divisors yet */ WARN_ON (new_div !=1 && new_div !=2 );
Paul Walmsley
maintainerPATCH 9/10 OMAP3 clock: lessen amount of noisy messages
In reply to Paul WalmsleyFrom: Artem Bityutskiy <[email protected]>
On our system we see the following messages:
Disabling unused clock "gpt2_ick"
Disabling unused clock "gpt3_ick"
Disabling unused clock "gpt4_ick"
Disabling unused clock "gpt5_ick"
...
The messages have KERN_INFO level and if you have serial console, they normally go there. I do not think it is good idea to print that much stuff there. Moreover, messages are not properly prefixed and for mortals it is not immeadietly clear where they come from.
Let's give them debugging level instead.
--- arch/arm/mach-omap2/clock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/clock.c +1 -1
@@ -1035,7 +1035,7 @@ void omap2_clk_disable_unused(struct clk *clk)if ((regval32 & (1 << clk->enable_bit)) == v)return ; -printk (KERN_INFO "Disabling unused clock \"%s\"\n" , clk->name); +printk (KERN_DEBUG "Disabling unused clock \"%s\"\n" , clk->name);if (cpu_is_omap34xx ()) {omap2_clk_enable (clk);omap2_clk_disable (clk);
Paul Walmsley
maintainerPATCH 10/10 OMAP2xxx clock: rename clk_init_one() to clk_preinit()
In reply to Paul WalmsleyRename clk_init_one() to clk_preinit() to distinguish its function from clk_init() and the individual struct clk init functions.
--- arch/arm/mach-omap1/clock.c | 2 +- arch/arm/mach-omap2/clock24xx.c | 2 +- arch/arm/mach-omap2/clock34xx.c | 2 +- arch/arm/plat-omap/clock.c | 4 ++-- arch/arm/plat-omap/include/mach/clock.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap1/clock.c +1 -1
@@ -776,7 +776,7 @@ int __init omap1_clk_init(void) arm_idlect1_mask = ~0 ;for (c = omap_clks; c < omap_clks +ARRAY_SIZE (omap_clks); c++) -clk_init_one (c->lk.clk); +clk_preinit (c->lk.clk); cpu_mask =0 ;if (cpu_is_omap16xx ())
arch/arm/mach-omap2/clock24xx.c +1 -1
@@ -722,7 +722,7 @@ int __init omap2_clk_init(void)clk_init (&omap2_clk_functions);for (c = omap24xx_clks; c < omap24xx_clks +ARRAY_SIZE (omap24xx_clks); c++) -clk_init_one (c->lk.clk); +clk_preinit (c->lk.clk); osc_ck.rate =omap2_osc_clk_recalc (&osc_ck);propagate_rate (&osc_ck);
arch/arm/mach-omap2/clock34xx.c +1 -1
@@ -964,7 +964,7 @@ int __init omap2_clk_init(void)clk_init (&omap2_clk_functions);for (c = omap34xx_clks; c < omap34xx_clks +ARRAY_SIZE (omap34xx_clks); c++) -clk_init_one (c->lk.clk); +clk_preinit (c->lk.clk);for (c = omap34xx_clks; c < omap34xx_clks +ARRAY_SIZE (omap34xx_clks); c++)if (c->cpu & cpu_clkflg) {
arch/arm/plat-omap/clock.c +2 -2
@@ -240,13 +240,13 @@ void recalculate_root_clocks(void) }/** -* clk_init_one - initialize any fields in the struct clk before clk init +* clk_preinit - initialize any fields in the struct clk before clk init * @clk: struct clk * to initialize * * Initialize any struct clk fields needed before normal clk initialization * can run. No return value. */ -void clk_init_one (struct clk *clk) +void clk_preinit (struct clk *clk) {INIT_LIST_HEAD (&clk->children); }
arch/arm/plat-omap/include/mach/clock.h +1 -1
@@ -119,7 +119,7 @@ struct clk_functions {extern unsigned int mpurate;extern int clk_init (struct clk_functions *custom_clocks); -extern void clk_init_one (struct clk *clk); +extern void clk_preinit (struct clk *clk);extern int clk_register (struct clk *clk);extern void clk_reparent (struct clk *child,struct clk *parent);extern void clk_unregister (struct clk *clk);
Paul Walmsley
maintainerHello Russell,
Quoted 7 lines · Paul Walmsley
This series contains OMAP clock and SDRAM controller patches against v2.6.30-rc5. If you are happy with these, Tony will merge them into his for-next branch for you to pull.
This series includes the
clk_init_one()toclk_preinit()rename that we've discussed recently. Most of the patches prepare for CORE DPLL M2 rate changing support.
Any comments on these patches?
- Paul
Quoted 8 lines · Paul Walmsley
Hello Russell,
Quoted 4 lines · Paul Walmsley
This series contains OMAP clock and SDRAM controller patches against v2.6.30-rc5. If you are happy with these, Tony will merge them into his for-next branch for you to pull.
Quoted 5 lines
Quoted 3 lines
This series includes the
clk_init_one()toclk_preinit()rename that we've discussed recently. Most of the patches prepare for CORE DPLL M2 rate changing support.Any comments on these patches?
All look fine to me.
Paul Walmsley
maintainerQuoted 9 lines · Russell King - ARM Linux
Quoted 8 lines · Paul Walmsley
Hello Russell,
Quoted 4 lines · Paul Walmsley
This series contains OMAP clock and SDRAM controller patches against v2.6.30-rc5. If you are happy with these, Tony will merge them into his for-next branch for you to pull.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
This series includes the
clk_init_one()toclk_preinit()rename that we've discussed recently. Most of the patches prepare for CORE DPLL M2 rate changing support.Any comments on these patches?
All look fine to me.
Great, thanks.
- Paul
Tony Lindgren
maintainerQuoted 15 lines · Paul Walmsley
Quoted 13 lines · Russell King - ARM Linux
Quoted 12 lines · Paul Walmsley
Hello Russell,
Quoted 7 lines · Paul Walmsley
This series contains OMAP clock and SDRAM controller patches against v2.6.30-rc5. If you are happy with these, Tony will merge them into his for-next branch for you to pull.
This series includes the
clk_init_one()toclk_preinit()rename that we've discussed recently. Most of the patches prepare for CORE DPLL M2 rate changing support.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Any comments on these patches?
All look fine to me.
Great, thanks.
I've pulled these to the omap for-next branch to wait for the merge window.
Tony