redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Blackfin: convert SMP to only use generic time framework

Browse source 
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Graf Yang 2009-05-27 09:58:35 +00:00 committed by Mike Frysinger
parent ffc4d8bc44
commit 9b9bfded62
2 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/blackfin/Kconfig
View file

@ -223,6 +223,7 @@ endchoice
config SMP config SMP
depends on BF561 depends on BF561
select GENERIC_TIME
bool "Symmetric multi-processing support" bool "Symmetric multi-processing support"
---help--- ---help---
This enables support for systems with more than one CPU, This enables support for systems with more than one CPU,

55
arch/blackfin/kernel/time.c
View file

@ -24,14 +24,10 @@
static struct irqaction bfin_timer_irq = { static struct irqaction bfin_timer_irq = {
.name = "Blackfin Timer Tick", .name = "Blackfin Timer Tick",
#ifdef CONFIG_IRQ_PER_CPU
.flags = IRQF_DISABLED | IRQF_PERCPU,
#else
.flags = IRQF_DISABLED .flags = IRQF_DISABLED
#endif
}; };
#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE) #if defined(CONFIG_IPIPE)
void __init setup_system_timer0(void) void __init setup_system_timer0(void)
{ {
/* Power down the core timer, just to play safe. */ /* Power down the core timer, just to play safe. */
@ -74,7 +70,7 @@ void __init setup_core_timer(void)
static void __init static void __init
time_sched_init(irqreturn_t(*timer_routine) (int, void *)) time_sched_init(irqreturn_t(*timer_routine) (int, void *))
{ {
#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE) #if defined(CONFIG_IPIPE)
setup_system_timer0(); setup_system_timer0();
bfin_timer_irq.handler = timer_routine; bfin_timer_irq.handler = timer_routine;
setup_irq(IRQ_TIMER0, &bfin_timer_irq); setup_irq(IRQ_TIMER0, &bfin_timer_irq);
@ -94,7 +90,7 @@ static unsigned long gettimeoffset(void)
unsigned long offset; unsigned long offset;
unsigned long clocks_per_jiffy; unsigned long clocks_per_jiffy;
#if defined(CONFIG_TICKSOURCE_GPTMR0) || defined(CONFIG_IPIPE) #if defined(CONFIG_IPIPE)
clocks_per_jiffy = bfin_read_TIMER0_PERIOD(); clocks_per_jiffy = bfin_read_TIMER0_PERIOD();
offset = bfin_read_TIMER0_COUNTER() / \ offset = bfin_read_TIMER0_COUNTER() / \
(((clocks_per_jiffy + 1) * HZ) / USEC_PER_SEC); (((clocks_per_jiffy + 1) * HZ) / USEC_PER_SEC);
@ -133,36 +129,25 @@ irqreturn_t timer_interrupt(int irq, void *dummy)
static long last_rtc_update; static long last_rtc_update;
write_seqlock(&xtime_lock); write_seqlock(&xtime_lock);
#if defined(CONFIG_TICKSOURCE_GPTMR0) && !defined(CONFIG_IPIPE) do_timer(1);
/*
* TIMIL0 is latched in __ipipe_grab_irq() when the I-Pipe is
* enabled.
*/
if (get_gptimer_status(0) & TIMER_STATUS_TIMIL0) {
#endif
do_timer(1);
/* /*
* If we have an externally synchronized Linux clock, then update * If we have an externally synchronized Linux clock, then update
* CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
* called as close as possible to 500 ms before the new second starts. * called as close as possible to 500 ms before the new second starts.
*/ */
if (ntp_synced() && if (ntp_synced() &&
xtime.tv_sec > last_rtc_update + 660 && xtime.tv_sec > last_rtc_update + 660 &&
(xtime.tv_nsec / NSEC_PER_USEC) >= (xtime.tv_nsec / NSEC_PER_USEC) >=
500000 - ((unsigned)TICK_SIZE) / 2 500000 - ((unsigned)TICK_SIZE) / 2
&& (xtime.tv_nsec / NSEC_PER_USEC) <= && (xtime.tv_nsec / NSEC_PER_USEC) <=
500000 + ((unsigned)TICK_SIZE) / 2) { 500000 + ((unsigned)TICK_SIZE) / 2) {
if (set_rtc_mmss(xtime.tv_sec) == 0) if (set_rtc_mmss(xtime.tv_sec) == 0)
last_rtc_update = xtime.tv_sec; last_rtc_update = xtime.tv_sec;
else else
/* Do it again in 60s. */ /* Do it again in 60s. */
last_rtc_update = xtime.tv_sec - 600; last_rtc_update = xtime.tv_sec - 600;
}
#if defined(CONFIG_TICKSOURCE_GPTMR0) && !defined(CONFIG_IPIPE)
set_gptimer_status(0, TIMER_STATUS_TIMIL0);
} }
#endif
write_sequnlock(&xtime_lock); write_sequnlock(&xtime_lock);
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE