[PATCH] MIPS: GIC: Select R4K counter as fallback.

[PATCH] MIPS: GIC: Select R4K counter as fallback.

[Steven J. Hill]

From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>

If CONFIG_CSRC_GIC is selected and the GIC is not found during
boot, then fallback to the R4K counter gracefully.

Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
---
 arch/mips/include/asm/time.h |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 2d7b9df..1194c31 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -75,11 +75,13 @@ extern int init_r4k_clocksource(void);
 
 static inline int init_mips_clocksource(void)
 {
-#if defined(CONFIG_CSRC_R4K) && !defined(CONFIG_CSRC_GIC)
-	return init_r4k_clocksource();
-#else
-	return 0;
+#ifdef CONFIG_CSRC_R4K
+#ifdef CONFIG_CSRC_GIC
+	if (!gic_present)
 #endif
+		return init_r4k_clocksource();
+#endif
+	return 0;
 }
 
 static inline void clockevent_set_clock(struct clock_event_device *cd,
-- 
1.7.9.5

Re: [PATCH] MIPS: GIC: Select R4K counter as fallback.

[David Daney]

On 09/11/2013 11:53 AM, Steven J. Hill wrote:
> From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
>
> If CONFIG_CSRC_GIC is selected and the GIC is not found during
> boot, then fallback to the R4K counter gracefully.
>
> Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
> Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
> ---
>   arch/mips/include/asm/time.h |   10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
> index 2d7b9df..1194c31 100644
> --- a/arch/mips/include/asm/time.h
> +++ b/arch/mips/include/asm/time.h
> @@ -75,11 +75,13 @@ extern int init_r4k_clocksource(void);
>
>   static inline int init_mips_clocksource(void)
>   {
> -#if defined(CONFIG_CSRC_R4K) && !defined(CONFIG_CSRC_GIC)
> -	return init_r4k_clocksource();
> -#else
> -	return 0;
> +#ifdef CONFIG_CSRC_R4K
> +#ifdef CONFIG_CSRC_GIC
> +	if (!gic_present)
>   #endif
> +		return init_r4k_clocksource();
> +#endif
> +	return 0;
>   }

An alternative would be to place in gic.h something like:

#ifdef CONFIG_CSRC_GIC
# define use_mips_gic_csrc gic_present
#else
# define use_mips_gic_csrc 0
#endif

Then the above code would be


if (!use_mips_gic_csrc)
	return init_r4k_clocksource();


With less #if ugliness


>
>   static inline void clockevent_set_clock(struct clock_event_device *cd,
>