From: Tony Lindgren <tony@atomide.com> To: Kevin Hilman <khilman@ti.com> Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 07/10] omap2+: Reserve clocksource and timesource and initialize dmtimer later Date: Mon, 27 Jun 2011 03:44:28 -0700 [thread overview] Message-ID: <20110627104428.GK23145@atomide.com> (raw) In-Reply-To: <20110627075101.GE23145@atomide.com> * Tony Lindgren <tony@atomide.com> [110627 00:46]: > * Kevin Hilman <khilman@ti.com> [110623 10:08]: > > Tony Lindgren <tony@atomide.com> writes: > > > > > There's no need to initialize the dmtimer framework early. > > > Just mark the clocksource and timesource as reserved, and > > > initialize dmtimer with an arch_initcall. > > > > > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > > Reviewed-by: Kevin Hilman <khilman@ti.com> > > > > Also, when you are able to fully get rid of omap_dm_timer_init(), you > > can probably remove it from dmtimer.h and make it static in dmtimer.c > > Good catch. That can be made static now. Here's an updated version of this patch. Tony From: Tony Lindgren <tony@atomide.com> Date: Tue, 29 Mar 2011 15:54:49 -0700 Subject: [PATCH] omap2+: Reserve clocksource and timesource and initialize dmtimer later There's no need to initialize the dmtimer framework early. Just mark the clocksource and timesource as reserved, and initialize dmtimer with an arch_initcall. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com> diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 13d7b8f..96604a5 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -183,10 +183,6 @@ static __init void omap_init_32k_timer(void) bool __init omap_32k_timer_init(void) { omap_init_clocksource_32k(); - -#ifdef CONFIG_OMAP_DM_TIMER - omap_dm_timer_init(); -#endif omap_init_32k_timer(); return true; diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 578e9df..cf2ec85 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -69,6 +69,8 @@ /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12 +u32 sys_timer_reserved; + /* Clockevent code */ static struct omap_dm_timer clkev; @@ -195,6 +197,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, omap_hwmod_enable(oh); + sys_timer_reserved |= (1 << (gptimer_id - 1)); + if (gptimer_id != 12) { struct clk *src; @@ -321,7 +325,6 @@ static void __init omap2_gp_clocksource_init(void) #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src) \ static void __init omap##name##_timer_init(void) \ { \ - omap_dm_timer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src); \ omap2_gp_clocksource_init(); \ } @@ -350,7 +353,6 @@ static void __init omap4_timer_init(void) twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); BUG_ON(!twd_base); #endif - omap_dm_timer_init(); omap2_gp_clockevent_init(1, OMAP4_CLKEV_SOURCE); omap2_gp_clocksource_init(); } diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 7c5cb4e..8dfb818 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -572,7 +572,7 @@ int omap_dm_timers_active(void) } EXPORT_SYMBOL_GPL(omap_dm_timers_active); -int __init omap_dm_timer_init(void) +static int __init omap_dm_timer_init(void) { struct omap_dm_timer *timer; int i, map_size = SZ_8K; /* Module 4KB + L4 4KB except on omap1 */ @@ -625,8 +625,16 @@ int __init omap_dm_timer_init(void) sprintf(clk_name, "gpt%d_fck", i + 1); timer->fclk = clk_get(NULL, clk_name); } + + /* One or two timers may be set up early for sys_timer */ + if (sys_timer_reserved & (1 << i)) { + timer->reserved = 1; + timer->posted = 1; + } #endif } return 0; } + +arch_initcall(omap_dm_timer_init); diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index dd8b3ff..40d7936 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h @@ -62,8 +62,6 @@ struct omap_dm_timer; extern struct omap_dm_timer *gptimer_wakeup; struct clk; -int omap_dm_timer_init(void); - struct omap_dm_timer *omap_dm_timer_request(void); struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id); void omap_dm_timer_free(struct omap_dm_timer *timer); @@ -222,6 +220,7 @@ struct omap_dm_timer { unsigned posted:1; }; +extern u32 sys_timer_reserved; void omap_dm_timer_prepare(struct omap_dm_timer *timer); static inline u32 __omap_dm_timer_read(void __iomem *base, u32 reg,
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/10] omap2+: Reserve clocksource and timesource and initialize dmtimer later Date: Mon, 27 Jun 2011 03:44:28 -0700 [thread overview] Message-ID: <20110627104428.GK23145@atomide.com> (raw) In-Reply-To: <20110627075101.GE23145@atomide.com> * Tony Lindgren <tony@atomide.com> [110627 00:46]: > * Kevin Hilman <khilman@ti.com> [110623 10:08]: > > Tony Lindgren <tony@atomide.com> writes: > > > > > There's no need to initialize the dmtimer framework early. > > > Just mark the clocksource and timesource as reserved, and > > > initialize dmtimer with an arch_initcall. > > > > > > Signed-off-by: Tony Lindgren <tony@atomide.com> > > > Reviewed-by: Kevin Hilman <khilman@ti.com> > > > > Also, when you are able to fully get rid of omap_dm_timer_init(), you > > can probably remove it from dmtimer.h and make it static in dmtimer.c > > Good catch. That can be made static now. Here's an updated version of this patch. Tony From: Tony Lindgren <tony@atomide.com> Date: Tue, 29 Mar 2011 15:54:49 -0700 Subject: [PATCH] omap2+: Reserve clocksource and timesource and initialize dmtimer later There's no need to initialize the dmtimer framework early. Just mark the clocksource and timesource as reserved, and initialize dmtimer with an arch_initcall. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com> diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 13d7b8f..96604a5 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -183,10 +183,6 @@ static __init void omap_init_32k_timer(void) bool __init omap_32k_timer_init(void) { omap_init_clocksource_32k(); - -#ifdef CONFIG_OMAP_DM_TIMER - omap_dm_timer_init(); -#endif omap_init_32k_timer(); return true; diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c index 578e9df..cf2ec85 100644 --- a/arch/arm/mach-omap2/timer-gp.c +++ b/arch/arm/mach-omap2/timer-gp.c @@ -69,6 +69,8 @@ /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ #define MAX_GPTIMER_ID 12 +u32 sys_timer_reserved; + /* Clockevent code */ static struct omap_dm_timer clkev; @@ -195,6 +197,8 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, omap_hwmod_enable(oh); + sys_timer_reserved |= (1 << (gptimer_id - 1)); + if (gptimer_id != 12) { struct clk *src; @@ -321,7 +325,6 @@ static void __init omap2_gp_clocksource_init(void) #define OMAP_SYS_TIMER_INIT(name, clkev_nr, clkev_src) \ static void __init omap##name##_timer_init(void) \ { \ - omap_dm_timer_init(); \ omap2_gp_clockevent_init((clkev_nr), clkev_src); \ omap2_gp_clocksource_init(); \ } @@ -350,7 +353,6 @@ static void __init omap4_timer_init(void) twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256); BUG_ON(!twd_base); #endif - omap_dm_timer_init(); omap2_gp_clockevent_init(1, OMAP4_CLKEV_SOURCE); omap2_gp_clocksource_init(); } diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 7c5cb4e..8dfb818 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -572,7 +572,7 @@ int omap_dm_timers_active(void) } EXPORT_SYMBOL_GPL(omap_dm_timers_active); -int __init omap_dm_timer_init(void) +static int __init omap_dm_timer_init(void) { struct omap_dm_timer *timer; int i, map_size = SZ_8K; /* Module 4KB + L4 4KB except on omap1 */ @@ -625,8 +625,16 @@ int __init omap_dm_timer_init(void) sprintf(clk_name, "gpt%d_fck", i + 1); timer->fclk = clk_get(NULL, clk_name); } + + /* One or two timers may be set up early for sys_timer */ + if (sys_timer_reserved & (1 << i)) { + timer->reserved = 1; + timer->posted = 1; + } #endif } return 0; } + +arch_initcall(omap_dm_timer_init); diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h b/arch/arm/plat-omap/include/plat/dmtimer.h index dd8b3ff..40d7936 100644 --- a/arch/arm/plat-omap/include/plat/dmtimer.h +++ b/arch/arm/plat-omap/include/plat/dmtimer.h @@ -62,8 +62,6 @@ struct omap_dm_timer; extern struct omap_dm_timer *gptimer_wakeup; struct clk; -int omap_dm_timer_init(void); - struct omap_dm_timer *omap_dm_timer_request(void); struct omap_dm_timer *omap_dm_timer_request_specific(int timer_id); void omap_dm_timer_free(struct omap_dm_timer *timer); @@ -222,6 +220,7 @@ struct omap_dm_timer { unsigned posted:1; }; +extern u32 sys_timer_reserved; void omap_dm_timer_prepare(struct omap_dm_timer *timer); static inline u32 __omap_dm_timer_read(void __iomem *base, u32 reg,
next prev parent reply other threads:[~2011-06-27 10:44 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-06-20 9:23 [PATCH 00/10] init_early cleanup for omap init_irq and init_timer Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 01/10] omap: Use separate init_irq functions to avoid cpu_is_omap tests early Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:54 ` Russell King - ARM Linux 2011-06-20 9:54 ` Russell King - ARM Linux 2011-06-20 10:14 ` Tony Lindgren 2011-06-20 10:14 ` Tony Lindgren 2011-06-27 17:08 ` Kevin Hilman 2011-06-27 17:08 ` Kevin Hilman 2011-06-20 9:23 ` [PATCH 02/10] omap: Set separate timer init functions to avoid cpu_is_omap tests Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 03/10] omap: Move dmtimer defines to dmtimer.h Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:56 ` Russell King - ARM Linux 2011-06-20 9:56 ` Russell King - ARM Linux 2011-06-20 10:17 ` Tony Lindgren 2011-06-20 10:17 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 04/10] omap: Make a subset of dmtimer functions into inline functions Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 05/10] omap2+: Use dmtimer macros for clockevent Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-23 17:07 ` Kevin Hilman 2011-06-23 17:07 ` Kevin Hilman 2011-06-27 7:39 ` Tony Lindgren 2011-06-27 7:39 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 06/10] omap2+: Remove gptimer_wakeup for now Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:39 ` Santosh Shilimkar 2011-06-20 9:39 ` Santosh Shilimkar 2011-06-20 9:48 ` Tony Lindgren 2011-06-20 9:48 ` Tony Lindgren 2011-06-23 15:05 ` Kevin Hilman 2011-06-23 15:05 ` Kevin Hilman 2011-06-23 15:13 ` Santosh Shilimkar 2011-06-23 15:13 ` Santosh Shilimkar 2011-06-27 8:08 ` Tony Lindgren 2011-06-27 8:08 ` Tony Lindgren 2011-06-27 16:30 ` Kevin Hilman 2011-06-27 16:30 ` Kevin Hilman 2011-06-27 18:16 ` Tony Lindgren 2011-06-27 18:16 ` Tony Lindgren 2011-06-27 17:32 ` Kevin Hilman 2011-06-27 17:32 ` Kevin Hilman 2011-06-27 19:19 ` Tony Lindgren 2011-06-27 19:19 ` Tony Lindgren 2011-06-27 21:16 ` Kevin Hilman 2011-06-27 21:16 ` Kevin Hilman 2011-06-20 9:23 ` [PATCH 07/10] omap2+: Reserve clocksource and timesource and initialize dmtimer later Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-23 17:01 ` Kevin Hilman 2011-06-23 17:01 ` Kevin Hilman 2011-06-27 7:48 ` Tony Lindgren 2011-06-27 7:48 ` Tony Lindgren 2011-06-27 16:41 ` Kevin Hilman 2011-06-27 16:41 ` Kevin Hilman 2011-06-23 17:13 ` Kevin Hilman 2011-06-23 17:13 ` Kevin Hilman 2011-06-27 7:51 ` Tony Lindgren 2011-06-27 7:51 ` Tony Lindgren 2011-06-27 10:44 ` Tony Lindgren [this message] 2011-06-27 10:44 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 08/10] omap2+: Use dmtimer macros for clocksource Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-23 15:28 ` Kevin Hilman 2011-06-23 15:28 ` Kevin Hilman 2011-06-23 16:47 ` Kevin Hilman 2011-06-23 16:47 ` Kevin Hilman 2011-06-23 17:10 ` Kevin Hilman 2011-06-23 17:10 ` Kevin Hilman 2011-06-27 7:54 ` Tony Lindgren 2011-06-27 7:54 ` Tony Lindgren 2011-06-27 10:48 ` Tony Lindgren 2011-06-27 10:48 ` Tony Lindgren 2011-06-27 16:41 ` Kevin Hilman 2011-06-27 16:41 ` Kevin Hilman 2011-06-20 9:23 ` [PATCH 09/10] omap2+: Remove omap2_gp_clockevent_set_gptimer Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren 2011-06-20 9:23 ` [PATCH 10/10] omap2+: Rename timer-gp.c into timer.c to combine timer init functions Tony Lindgren 2011-06-20 9:23 ` Tony Lindgren -- strict thread matches above, loose matches on Subject: below -- 2011-03-28 22:21 [PATCH 00/10] omap init_early changes for irq and timer init Tony Lindgren 2011-03-28 22:21 ` [PATCH 07/10] omap2+: Reserve clocksource and timesource and initialize dmtimer later Tony Lindgren 2011-03-28 22:21 ` Tony Lindgren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110627104428.GK23145@atomide.com \ --to=tony@atomide.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.