Minor powerdomain/clockdomain/SDRC patches for 2.6.33
Subsystems (6)
Paul Walmsley
maintainercover Minor powerdomain/clockdomain/SDRC patches for 2.6.33
Hello,
This series contains some powerdomain, clockdomain, and SDRC patches intended for 2.6.33. There's not much of great importance here; perhaps the most notable patch is "OMAP3: SDRC: Place SDRC AC timing and MR changes in CORE DVFS SRAM code behind Kconfig", which can reduce lockups on systems with many active initiators during CORE DVFS, but has the downside of reducing SDRAM performance.
- Paul
---
Paul Walmsley (7):
OMAP2/3 PRCM: don't export prm_*(), cm_*() functions
OMAP clockdomain/powerdomain: remove CONFIG_OMAP_DEBUG_{CLOCK,POWER}DOMAIN OMAP clockdomain/powerdomain: optimize out sleepdep code on OMAP24xx OMAP powerdomain/PM: use symbolic constants for the max number of power states OMAP powerdomain: rearrange struct powerdomain to save some memory
OMAP3: SDRC: Place SDRC AC timing and MR changes in CORE DVFS SRAM code behind Kconfig OMAP clock/hwmod: fix off-by-one errors
Roel Kluin (1):
OMAP2/3 powerdomain: return errors rather than returning the output of IS_ERR()
Thara Gopinath (1):
OMAP3: PM: Fix for MPU power domain MEM BANK position
arch/arm/mach-omap2/Kconfig | 13 +++++ arch/arm/mach-omap2/clockdomain.c | 6 +- arch/arm/mach-omap2/cm.c | 7 ++- arch/arm/mach-omap2/omap_hwmod.c | 13 ++--- arch/arm/mach-omap2/pm-debug.c | 4 +- arch/arm/mach-omap2/powerdomain.c | 36 ++++++++------- arch/arm/mach-omap2/powerdomains34xx.h | 1 arch/arm/mach-omap2/prcm.c | 11 +--- arch/arm/mach-omap2/sram34xx.S | 19 +++++++- arch/arm/plat-omap/Kconfig | 62 ++++++++----------------- arch/arm/plat-omap/include/plat/common.h | 20 ++++++++ arch/arm/plat-omap/include/plat/powerdomain.h | 17 ++++--- 12 files changed, 117 insertions(+), 92 deletions(-)
Paul Walmsley
maintainerPATCH 1/9 OMAP2/3 PRCM: don't export prm_*(), cm_*() functions
Device drivers and loadable modules should not be calling these prm_* and cm_* functions, so stop exporting them. Only core code and device driver integration code (in arch/arm/*omap*) should call these functions.
--- arch/arm/mach-omap2/prcm.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/prcm.c +0 -6
@@ -170,14 +170,12 @@ u32 prm_read_mod_reg(s16 module, u16 idx) {return __omap_prcm_read (prm_base, module, idx); } -EXPORT_SYMBOL (prm_read_mod_reg);/* Write into a register in a PRM module */ void prm_write_mod_reg (u32 val,s16 module,u16 idx) {__omap_prcm_write (val, prm_base, module, idx); } -EXPORT_SYMBOL (prm_write_mod_reg);/* Read-modify-write a register in a PRM module. Caller must lock */ u32 prm_rmw_mod_reg_bits (u32 mask,u32 bits,s16 module,s16 idx)
@@ -191,21 +189,18 @@ u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx)return v; } -EXPORT_SYMBOL (prm_rmw_mod_reg_bits);/* Read a register in a CM module */ u32 cm_read_mod_reg (s16 module,u16 idx) {return __omap_prcm_read (cm_base, module, idx); } -EXPORT_SYMBOL (cm_read_mod_reg);/* Write into a register in a CM module */ void cm_write_mod_reg (u32 val,s16 module,u16 idx) {__omap_prcm_write (val, cm_base, module, idx); } -EXPORT_SYMBOL (cm_write_mod_reg);/* Read-modify-write a register in a CM module. Caller must lock */ u32 cm_rmw_mod_reg_bits (u32 mask,u32 bits,s16 module,s16 idx)
@@ -219,7 +214,6 @@ u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx)return v; } -EXPORT_SYMBOL (cm_rmw_mod_reg_bits);/** * omap2_cm_wait_idlest - wait for IDLEST bit to indicate module readiness
Paul Walmsley
maintainerPATCH 2/9 OMAP clockdomain/powerdomain: remove CONFIG_OMAP_DEBUG_{CLOCK, POWER}DOMAIN
In reply to Paul WalmsleyAvoid cluttering the Kconfig space with debug options that are rarely used. These can now be enabled and disabled by patching the "#undef DEBUG" in the source files with "#define DEBUG", conforming to the practice for the rest of the linux-omap code.
Also, while we're here, some lines in plat-omap/Kconfig use sets of leading spaces when those lines should start with tabs. Convert most of them to use tabs.
--- arch/arm/mach-omap2/clockdomain.c | 6 +--- arch/arm/mach-omap2/powerdomain.c | 4 +- arch/arm/plat-omap/Kconfig | 62 ++++++++++++------------------------- 3 files changed, 23 insertions(+), 49 deletions(-)
arch/arm/mach-omap2/clockdomain.c +2 -4
@@ -2,7 +2,7 @@* OMAP2/3 clockdomain framework functions * * Copyright (C) 2008 Texas Instruments, Inc. -* Copyright (C) 2008 Nokia Corporation +* Copyright (C) 2008-2009 Nokia Corporation * * Written by Paul Walmsley and Jouni H?gander *
@@ -10,9 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifdef CONFIG_OMAP_DEBUG_CLOCKDOMAIN -# define DEBUG -#endif +#undef DEBUG#include <linux/module.h> #include <linux/kernel.h>
arch/arm/mach-omap2/powerdomain.c +1 -3
@@ -10,9 +10,7 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#ifdef CONFIG_OMAP_DEBUG_POWERDOMAIN -# define DEBUG -#endif +#undef DEBUG#include <linux/kernel.h> #include <linux/module.h>
arch/arm/plat-omap/Kconfig +20 -42
94 lines not on this page · raw message
Paul Walmsley
maintainerPATCH 3/9 OMAP clockdomain/powerdomain: optimize out sleepdep code on OMAP24xx
In reply to Paul WalmsleyOMAP24xx chips don't support software-configurable sleep dependencies. Test early for this so the compiler can redact the entire function body on OMAP24xx.
--- arch/arm/mach-omap2/powerdomain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/powerdomain.c +6 -6
@@ -571,10 +571,10 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2) {struct powerdomain *p; -if (!pwrdm1) +if (!cpu_is_omap34xx ())return -EINVAL ; -if (!cpu_is_omap34xx ()) +if (!pwrdm1)return -EINVAL ; p =_pwrdm_deps_lookup (pwrdm2, pwrdm1->sleepdep_srcs);
@@ -610,10 +610,10 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2) {struct powerdomain *p; -if (!pwrdm1) +if (!cpu_is_omap34xx ())return -EINVAL ; -if (!cpu_is_omap34xx ()) +if (!pwrdm1)return -EINVAL ; p =_pwrdm_deps_lookup (pwrdm2, pwrdm1->sleepdep_srcs);
@@ -653,10 +653,10 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2) {struct powerdomain *p; -if (!pwrdm1) +if (!cpu_is_omap34xx ())return -EINVAL ; -if (!cpu_is_omap34xx ()) +if (!pwrdm1)return -EINVAL ; p =_pwrdm_deps_lookup (pwrdm2, pwrdm1->sleepdep_srcs);
Paul Walmsley
maintainerPATCH 4/9 OMAP powerdomain/PM: use symbolic constants for the max number of power states
In reply to Paul WalmsleyReplace some bare constants with power states.
--- arch/arm/mach-omap2/pm-debug.c | 4 ++-- arch/arm/mach-omap2/powerdomain.c | 2 +- arch/arm/plat-omap/include/plat/powerdomain.h | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/pm-debug.c +2 -2
@@ -326,7 +326,7 @@ int pm_dbg_regset_save(int reg_set)return 0 ; } -static const char pwrdm_state_names[][4 ] = { +static const char pwrdm_state_names[][PWRDM_MAX_PWRSTS ] = {"OFF" ,"RET" ,"INA" ,
@@ -381,7 +381,7 @@ static int pwrdm_dbg_show_counter(struct powerdomain *pwrdm, void *user)seq_printf (s,"%s (%s)" , pwrdm->name, pwrdm_state_names[pwrdm->state]); -for (i =0 ; i <4 ; i++) +for (i =0 ; i <PWRDM_MAX_PWRSTS ; i++)seq_printf (s,",%s:%d" , pwrdm_state_names[i], pwrdm->state_counter[i]);
arch/arm/mach-omap2/powerdomain.c +1 -1
@@ -158,7 +158,7 @@ static __init void _pwrdm_setup(struct powerdomain *pwrdm) {int i; -for (i =0 ; i <4 ; i++) +for (i =0 ; i <PWRDM_MAX_PWRSTS ; i++) pwrdm->state_counter[i] =0 ;pwrdm_wait_transition (pwrdm);
arch/arm/plat-omap/include/plat/powerdomain.h +4 -2
@@ -28,6 +28,8 @@#define PWRDM_POWER_INACTIVE 0x2#define PWRDM_POWER_ON 0x3 +#define PWRDM_MAX_PWRSTS 4 +/* Powerdomain allowable state bitfields */ #define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ (1 << PWRDM_POWER_ON))
@@ -118,11 +120,11 @@ struct powerdomain {struct list_head node;int state; -unsigned state_counter[4 ]; +unsigned state_counter[PWRDM_MAX_PWRSTS ];#ifdef CONFIG_PM_DEBUG s64 timer; -s64 state_timer[4 ]; +s64 state_timer[PWRDM_MAX_PWRSTS ];#endif };
Paul Walmsley
maintainerPATCH 5/9 OMAP powerdomain: rearrange struct powerdomain to save some memory
In reply to Paul WalmsleyThis patch rearranges the order of structure members in struct powerdomain to avoid wasting memory due to alignment restrictions.
--- arch/arm/plat-omap/include/plat/powerdomain.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/plat-omap/include/plat/powerdomain.h +3 -3
@@ -87,15 +87,15 @@ struct powerdomain {/* Used to represent the OMAP chip types containing this pwrdm */ const struct omap_chip_id omap_chip; -/* Bit shift of this powerdomain's PM_WKDEP/CM_SLEEPDEP bit */ -const u8 dep_bit; -/* Powerdomains that can be told to wake this powerdomain up */ struct pwrdm_dep *wkdep_srcs;/* Powerdomains that can be told to keep this pwrdm from inactivity */ struct pwrdm_dep *sleepdep_srcs; +/* Bit shift of this powerdomain's PM_WKDEP/CM_SLEEPDEP bit */ +const u8 dep_bit; +/* Possible powerdomain power states */ const u8 pwrsts;
Paul Walmsley
maintainerPATCH 6/9 OMAP2/3 powerdomain: return errors rather than returning the output of IS_ERR()
In reply to Paul WalmsleyFrom: Roel Kluin <[email protected]>
IS_ERR returns only 1 or 0, and the functions return a negative error in other cases anyways.
--- arch/arm/mach-omap2/powerdomain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/powerdomain.c +6 -6
@@ -478,7 +478,7 @@ int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)if (IS_ERR (p)) {pr_debug ("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } pr_debug("powerdomain: hardware will wake up %s when %s wakes up\n",
@@ -511,7 +511,7 @@ int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)if (IS_ERR (p)) {pr_debug ("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } pr_debug("powerdomain: hardware will no longer wake up %s after %s "
@@ -548,7 +548,7 @@ int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)if (IS_ERR (p)) {pr_debug ("powerdomain: hardware cannot set/clear wake up of " "%s when %s wakes up\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } return prm_read_mod_bits_shift(pwrdm1->prcm_offs, PM_WKDEP,
@@ -582,7 +582,7 @@ int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)pr_debug ("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } pr_debug("powerdomain: will prevent %s from sleeping if %s is active\n",
@@ -621,7 +621,7 @@ int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)pr_debug ("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } pr_debug("powerdomain: will no longer prevent %s from sleeping if "
@@ -664,7 +664,7 @@ int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2)pr_debug ("powerdomain: hardware cannot set/clear sleep " "dependency affecting %s from %s\n" , pwrdm1->name, pwrdm2->name); -return IS_ERR (p); +return PTR_ERR (p); } return prm_read_mod_bits_shift(pwrdm1->prcm_offs, OMAP3430_CM_SLEEPDEP,
Paul Walmsley
maintainerPATCH 7/9 OMAP3: SDRC: Place SDRC AC timing and MR changes in CORE DVFS SRAM code behind Kconfig
In reply to Paul WalmsleyThe code that reprograms the SDRC memory controller during CORE DVFS, mach-omap2/sram34xx.S:omap3_sram_configure_core_dpll(), does not ensure that all L3 initiators are prevented from accessing the SDRAM before modifying the SDRC AC timing and MR registers. This can cause memory to be corrupted or cause the SDRC to enter an unpredictable state. This patch places that code behind a Kconfig option, CONFIG_OMAP3_SDRC_AC_TIMING for now, and adds a note explaining what is going on. Ideally the code can be added back in once supporting code is present to ensure that other initiators aren't touching the SDRAM. At the very least, these registers should be reprogrammable during kernel init to deal with buggy bootloaders. Users who know that all other system initiators will not be touching the SDRAM can also re-enable this Kconfig option.
This is a modification of a patch originally written by Rajendra Nayak <[email protected]> (the original is at http://patchwork.kernel.org/patch/51927/).
Rather than removing the code completely, this patch just comments it out.
Thanks to Beno?t Cousson <[email protected]> and Christophe Sucur <[email protected]> for explaining the technical basis for this and for explaining what can be done to make this path work in future code. Thanks to Richard Woodruff <[email protected]> and Nishanth Menon <[email protected]> for their comments.
--- arch/arm/mach-omap2/Kconfig | 13 +++++++++++++ arch/arm/mach-omap2/sram34xx.S | 19 +++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/Kconfig +13 -0
@@ -100,3 +100,16 @@ config MACH_OMAP_ZOOM2 config MACH_OMAP_4430SDP bool "OMAP 4430 SDP board" depends on ARCH_OMAP4 + +config OMAP3_SDRC_AC_TIMING + bool "Enable SDRC AC timing register changes" + depends on ARCH_OMAP3 && ARCH_OMAP34XX + default n + help + If you know that none of your system initiators will attempt to + access SDRAM during CORE DVFS, select Y here. This should boost + SDRAM performance at lower CORE OPPs. There are relatively few + users who will wish to say yes at this point - almost everyone will + wish to say no. Selecting yes without understanding what is + going on could result in system crashes; +
arch/arm/mach-omap2/sram34xx.S +17 -2
@@ -91,8 +91,19 @@ * new SDRC_ACTIM_CTRL_B_1 register contents * new SDRC_MR_1 register value * - * If the param SDRC_RFR_CTRL_1 is 0, the parameters - * are not programmed into the SDRC CS1 registers + * If the param SDRC_RFR_CTRL_1 is 0, the parameters are not programmed into + * the SDRC CS1 registers + * + * NOTE: This code no longer attempts to program the SDRC AC timing and MR + * registers. This is because the code currently cannot ensure that all + * L3 initiators (e.g., sDMA, IVA, DSS DISPC, etc.) are not accessing the + * SDRAM when the registers are written. If the registers are changed while + * an initiator is accessing SDRAM, memory can be corrupted and/or the SDRC + * may enter an unpredictable state. In the future, the intent is to + * re-enable this code in cases where we can ensure that no initiators are + * touching the SDRAM. Until that time, users who know that their use case + * can satisfy the above requirement can enable the CONFIG_OMAP3_SDRC_AC_TIMING + * option. */ ENTRY(omap3_sram_configure_core_dpll) stmfd sp!, {r1-r12, lr} @ store regs to stack
@@ -219,6 +230,7 @@ configure_sdrc: ldr r12, omap_sdrc_rfr_ctrl_0_val @ fetch value from SRAM ldr r11, omap3_sdrc_rfr_ctrl_0 @ fetch addr from SRAM str r12, [r11] @ store +#ifdef CONFIG_OMAP3_SDRC_AC_TIMING ldr r12, omap_sdrc_actim_ctrl_a_0_val ldr r11, omap3_sdrc_actim_ctrl_a_0 str r12, [r11]
@@ -228,11 +240,13 @@ configure_sdrc: ldr r12, omap_sdrc_mr_0_val ldr r11, omap3_sdrc_mr_0 str r12, [r11] +#endif ldr r12, omap_sdrc_rfr_ctrl_1_val cmp r12, #0 @ if SDRC_RFR_CTRL_1 is 0, beq skip_cs1_prog @ do not program cs1 params ldr r11, omap3_sdrc_rfr_ctrl_1 str r12, [r11] +#ifdef CONFIG_OMAP3_SDRC_AC_TIMING ldr r12, omap_sdrc_actim_ctrl_a_1_val ldr r11, omap3_sdrc_actim_ctrl_a_1 str r12, [r11]
@@ -242,6 +256,7 @@ configure_sdrc: ldr r12, omap_sdrc_mr_1_val ldr r11, omap3_sdrc_mr_1 str r12, [r11] +#endif skip_cs1_prog: ldr r12, [r11] @ posted-write barrier for SDRC bx lr
Paul Walmsley
maintainerPATCH 8/9 OMAP3: PM: Fix for MPU power domain MEM BANK position
In reply to Paul WalmsleyFrom: Thara Gopinath <[email protected]>
MPU power domain bank 0 bits are displayed in position of bank 1 in PWRSTS and PREPWRSTS registers. So read them from correct position
--- arch/arm/mach-omap2/powerdomain.c | 6 ++++++ arch/arm/mach-omap2/powerdomains34xx.h | 1 + arch/arm/plat-omap/include/plat/powerdomain.h | 5 ++++- 3 files changed, 11 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/powerdomain.c +6 -0
@@ -983,6 +983,9 @@ int pwrdm_read_mem_pwrst(struct powerdomain *pwrdm, u8 bank)if (pwrdm->banks < (bank +1 ))return -EEXIST ; +if (pwrdm->flags &PWRDM_HAS_MPU_QUIRK ) + bank =1 ; +/* * The register bit names below may not correspond to the * actual names of the bits in each powerdomain's register,
@@ -1030,6 +1033,9 @@ int pwrdm_read_prev_mem_pwrst(struct powerdomain *pwrdm, u8 bank)if (pwrdm->banks < (bank +1 ))return -EEXIST ; +if (pwrdm->flags &PWRDM_HAS_MPU_QUIRK ) + bank =1 ; +/* * The register bit names below may not correspond to the * actual names of the bits in each powerdomain's register,
arch/arm/mach-omap2/powerdomains34xx.h +1 -0
@@ -190,6 +190,7 @@ static struct powerdomain mpu_34xx_pwrdm = { .wkdep_srcs = mpu_34xx_wkdeps, .pwrsts = PWRSTS_OFF_RET_ON, .pwrsts_logic_ret = PWRSTS_OFF_RET, + .flags = PWRDM_HAS_MPU_QUIRK, .banks = 1, .pwrsts_mem_ret = { [0] = PWRSTS_OFF_RET,
arch/arm/plat-omap/include/plat/powerdomain.h +4 -1
@@ -42,7 +42,10 @@/* Powerdomain flags */ #define PWRDM_HAS_HDWR_SAR (1 << 0)/* hardware save-and-restore support */ - +#define PWRDM_HAS_MPU_QUIRK (1 << 1)/* MPU pwr domain has MEM bank 0 bits +* in MEM bank 1 position. This is +* true for OMAP3430 +*/ /* * Number of memory banks that are power-controllable. On OMAP3430, the
Paul Walmsley
maintainerPATCH 9/9 OMAP clock/hwmod: fix off-by-one errors
In reply to Paul WalmsleyFix loop bailout off-by-one bugs reported by Juha Lepp?nen <[email protected]>.
This second version incorporates comments from Russell King <[email protected]>. A new macro, 'omap_test_timeout', has been created, with cleaner code, and existing code has been converted to use it.
--- arch/arm/mach-omap2/cm.c | 7 ++++--- arch/arm/mach-omap2/omap_hwmod.c | 13 +++++-------- arch/arm/mach-omap2/prcm.c | 5 ++--- arch/arm/plat-omap/include/plat/common.h | 20 ++++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-)
arch/arm/mach-omap2/cm.c +4 -3
@@ -21,6 +21,8 @@#include <asm/atomic.h> +#include <plat/common.h> +#include "cm.h" #include "cm-regbits-24xx.h" #include "cm-regbits-34xx.h"
@@ -61,9 +63,8 @@ int omap2_cm_wait_module_ready(s16 prcm_mod, u8 idlest_id, u8 idlest_shift) mask =1 << idlest_shift;/* XXX should be OMAP2 CM */ -while (((cm_read_mod_reg (prcm_mod, cm_idlest_reg) & mask) != ena) && - (i++ <MAX_MODULE_READY_TIME )) -udelay (1 ); +omap_test_timeout (((cm_read_mod_reg (prcm_mod, cm_idlest_reg) & mask) == ena), +MAX_MODULE_READY_TIME , i);return (i <MAX_MODULE_READY_TIME ) ?0 : -EBUSY ; }
arch/arm/mach-omap2/omap_hwmod.c +5 -8
@@ -45,6 +45,7 @@#include <linux/mutex.h> #include <linux/bootmem.h> +#include <plat/common.h> #include <plat/cpu.h> #include <plat/clockdomain.h> #include <plat/powerdomain.h>
@@ -736,7 +737,7 @@ static int _wait_target_ready(struct omap_hwmod *oh)static int _reset (struct omap_hwmod *oh) {u32 r, v; -int c; +int c =0 ; if (!oh->sysconfig || !(oh->sysconfig->sysc_flags & SYSC_HAS_SOFTRESET) ||
@@ -758,13 +759,9 @@ static int _reset(struct omap_hwmod *oh)return r;_write_sysconfig (v, oh); - c =0 ; -while (c <MAX_MODULE_RESET_WAIT && - !(omap_hwmod_readl (oh, oh->sysconfig->syss_offs) & -SYSS_RESETDONE_MASK )) { -udelay (1 ); - c++; - } +omap_test_timeout ((omap_hwmod_readl (oh, oh->sysconfig->syss_offs) & +SYSS_RESETDONE_MASK ), +MAX_MODULE_RESET_WAIT , c);if (c ==MAX_MODULE_RESET_WAIT ) WARN(1, "omap_hwmod: %s: failed to reset in %d usec\n",
arch/arm/mach-omap2/prcm.c +2 -3
@@ -241,9 +241,8 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, const char *name)BUG ();/* Wait for lock */ -while (((__raw_readl (reg) & mask) != ena) && - (i++ <MAX_MODULE_ENABLE_WAIT )) -udelay (1 ); +omap_test_timeout (((__raw_readl (reg) & mask) == ena), +MAX_MODULE_ENABLE_WAIT , i);if (i <MAX_MODULE_ENABLE_WAIT ) pr_debug("cm: Module associated with clock %s ready after %d "
arch/arm/plat-omap/include/plat/common.h +20 -0
@@ -71,4 +71,24 @@ void omap2_set_globals_sdrc(struct omap_globals *);void omap2_set_globals_control (struct omap_globals *);void omap2_set_globals_prcm (struct omap_globals *); +/** +* omap_test_timeout - busy-loop, testing a condition +* @cond: condition to test until it evaluates to true +* @timeout: maximum number of microseconds in the timeout +* @index: loop index (integer) +* +* Loop waiting for @cond to become true or until@least @timeout +* microseconds have passed. To use, define some integer @index in the +* calling code. After running, if @index == @timeout, then the loop has +* timed out. +*/ +#define omap_test_timeout (cond, timeout, index) \ +({ \ + for (index = 0; index < timeout; index++) { \ + if (cond) \ + break; \ + udelay(1); \ + } \ +}) +#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */