Subject: [PATCH-V6 1/3] ARM: OMAP1: FIX: check possible error condition in timer_init

From: [email-masked] (Kevin Hilman)
Date: Wed, 02 May 2012 13:08:09 -0700

Vaibhav Hiremath <[email-masked]> writes:

> OMAP1, omap_32k_timer_init() function always returns "true",
> irrespective of whether error occurred while initializing 32k sync
> counter as a kernel clocksource or not and execution will never
> fallback to mpu_timer clocksource init code.
>
> This patch adds check for return value from function
> omap_init_clocksource_32k(), and fallback to omap_mpu_timer_init()
> in case of failure/error from omap_init_clocksource_32k().
>
> Signed-off-by: Vaibhav Hiremath <[email-masked]>
> Cc: Tony Lindgren <[email-masked]>
> Cc: Kevin Hilman <[email-masked]>
> Cc: Paul Walmsley <[email-masked]>
> Cc: Benoit Cousson <[email-masked]>
> ---
> This is new patch addition compared to original series (<=V5).
>
> Also, note that, this patch is only compile tested, since
> I do not have omap1 board with me to validate it.
> Kevin, can you help me to validate it.

I boot tested on OMAP1 (5912/OSK) with 32k timer and MPU timer
Kconfigs.  Works fine, but needs small change below for compile warnings.

Otherwise, looks good.

Acked-by: Kevin Hilman <[email-masked]>

>  arch/arm/mach-omap1/common.h   |   10 +++++++++-
>  arch/arm/mach-omap1/time.c     |   16 +---------------
>  arch/arm/mach-omap1/timer32k.c |   13 +++++++++----
>  3 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
> index 8cc616e..e8c9ad3 100644
> --- a/arch/arm/mach-omap1/common.h
> +++ b/arch/arm/mach-omap1/common.h
> @@ -63,7 +63,15 @@ extern void omap1_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
>  			       unsigned int ctrl);
>
>  extern struct sys_timer omap1_timer;
> -extern bool omap_32k_timer_init(void);
> +
> +#ifdef CONFIG_OMAP_32K_TIMER
> +extern int omap_32k_timer_init(void);
> +#else
> +static int __init omap_32k_timer_init(void)

This needs to be inline.   Compile test on OMAP1 with
CONFIG_OMAP_32K_TIMER=n to see why.

> +{
> +	return -ENODEV;
> +}
> +#endif
>
>  extern u32 omap_irq_flags;
>
> diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
> index 4d8dd9a..4062480 100644
> --- a/arch/arm/mach-omap1/time.c
> +++ b/arch/arm/mach-omap1/time.c
> @@ -232,20 +232,6 @@ static inline void omap_mpu_timer_init(void)
>  }
>  #endif	/* CONFIG_OMAP_MPU_TIMER */
>
> -static inline int omap_32k_timer_usable(void)
> -{
> -	int res = false;
> -
> -	if (cpu_is_omap730() || cpu_is_omap15xx())
> -		return res;
> -
> -#ifdef CONFIG_OMAP_32K_TIMER
> -	res = omap_32k_timer_init();
> -#endif
> -
> -	return res;
> -}
> -
>  /*
>   * ---------------------------------------------------------------------------
>   * Timer initialization
> @@ -253,7 +239,7 @@ static inline int omap_32k_timer_usable(void)
>   */
>  static void __init omap1_timer_init(void)
>  {
> -	if (!omap_32k_timer_usable())
> +	if (omap_32k_timer_init() != 0)
>  		omap_mpu_timer_init();
>  }
>
> diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
> index 325b9a0..e3613a8 100644
> --- a/arch/arm/mach-omap1/timer32k.c
> +++ b/arch/arm/mach-omap1/timer32k.c
> @@ -182,10 +182,15 @@ static __init void omap_init_32k_timer(void)
>   * Timer initialization
>   * ---------------------------------------------------------------------------
>   */
> -bool __init omap_32k_timer_init(void)
> +int __init omap_32k_timer_init(void)
>  {
> -	omap_init_clocksource_32k();
> -	omap_init_32k_timer();
> +	int ret = -ENODEV;
>
> -	return true;
> +	if (cpu_is_omap16xx())
> +		ret = omap_init_clocksource_32k();
> +
> +	if (!ret)
> +		omap_init_32k_timer();
> +
> +	return ret;
>  }
> --
> 1.7.0.4
>
> --
> 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