p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CRISv32: use GENERIC_SCHED_CLOCK 

Provide a fast sched clock using the free-running timer and the generic
sched_clock infrastructure.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
This commit is contained in:
Rabin Vincent 2015-03-09 18:51:31 +01:00 committed by Jesper Nilsson
parent edfb6d5f1a
commit d3dad475b2
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/cris/Kconfig
View File

@ -57,6 +57,7 @@ config CRIS
select OF_EARLY_FLATTREE if ETRAX_ARCH_V32 select OF_EARLY_FLATTREE if ETRAX_ARCH_V32
select CLKSRC_MMIO if ETRAX_ARCH_V32 select CLKSRC_MMIO if ETRAX_ARCH_V32
select GENERIC_CLOCKEVENTS if ETRAX_ARCH_V32 select GENERIC_CLOCKEVENTS if ETRAX_ARCH_V32
select GENERIC_SCHED_CLOCK if ETRAX_ARCH_V32
config HZ config HZ
int int

9
arch/cris/arch-v32/kernel/time.c
View File

@ -15,6 +15,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/sched_clock.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/signal.h> #include <asm/signal.h>
@ -242,6 +243,11 @@ static struct irqaction irq_timer = {
.dev_id = &crisv32_clockevent, .dev_id = &crisv32_clockevent,
}; };
static u64 notrace crisv32_timer_sched_clock(void)
{
return REG_RD(timer, timer_base, r_time);
}
static void __init crisv32_timer_init(void) static void __init crisv32_timer_init(void)
{ {
reg_timer_rw_intr_mask timer_intr_mask; reg_timer_rw_intr_mask timer_intr_mask;
@ -275,6 +281,9 @@ void __init time_init(void)
crisv32_timer_init(); crisv32_timer_init();
sched_clock_register(crisv32_timer_sched_clock, 32,
CRISV32_TIMER_FREQ);
clocksource_mmio_init(timer_base + REG_RD_ADDR_timer_r_time, clocksource_mmio_init(timer_base + REG_RD_ADDR_timer_r_time,
"crisv32-timer", CRISV32_TIMER_FREQ, "crisv32-timer", CRISV32_TIMER_FREQ,
300, 32, clocksource_mmio_readl_up); 300, 32, clocksource_mmio_readl_up);

2
arch/cris/kernel/time.c
View File

@ -79,11 +79,13 @@ cris_do_profile(struct pt_regs* regs)
#endif #endif
} }
#ifndef CONFIG_GENERIC_SCHED_CLOCK
unsigned long long sched_clock(void) unsigned long long sched_clock(void)
{ {
return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ) + return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ) +
get_ns_in_jiffie(); get_ns_in_jiffie();
} }
#endif
static int static int
__init init_udelay(void) __init init_udelay(void)