Skip to content

Commit

Permalink
microblaze: Improve ftrace time measuring
Browse files Browse the repository at this point in the history
I had to comment sched_clock generic function because of broken toolchain.
It is fine grain timing.

Signed-off-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Michal Simek committed Aug 4, 2010
1 parent ce3266c commit 6f34b08
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/microblaze/include/asm/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ void disable_early_printk(void);
void heartbeat(void);
void setup_heartbeat(void);

unsigned long long sched_clock(void);

# ifdef CONFIG_MMU
extern void mmu_reset(void);
extern void early_console_reg_tlb_alloc(unsigned int addr);
Expand Down
17 changes: 17 additions & 0 deletions arch/microblaze/kernel/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ static int __init microblaze_clocksource_init(void)
return 0;
}

/*
* We have to protect accesses before timer initialization
* and return 0 for sched_clock function below.
*/
static int timer_initialized;

void __init time_init(void)
{
u32 irq, i = 0;
Expand Down Expand Up @@ -289,4 +295,15 @@ void __init time_init(void)
#endif
microblaze_clocksource_init();
microblaze_clockevent_init();
timer_initialized = 1;
}

unsigned long long notrace sched_clock(void)
{
if (timer_initialized) {
struct clocksource *cs = &clocksource_microblaze;
cycle_t cyc = cs->read(NULL);
return clocksource_cyc2ns(cyc, cs->mult, cs->shift);
}
return 0;
}

0 comments on commit 6f34b08

Please sign in to comment.