openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SPARC64]: Define ARCH_HAS_READ_CURRENT_TIMER. 

This gives more consistent bogomips and delay() semantics,
especially on sun4v.  It gives weird looking values though...

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-02-17 12:33:13 -08:00
parent 3f19a84e39
commit 3763be32d5
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/sparc64/kernel/time.c
View File

@ -1029,11 +1029,10 @@ static void sparc64_start_timers(irqreturn_t (*cfunc)(int, void *, struct pt_reg
} }
struct freq_table { struct freq_table {
unsigned long udelay_val_ref;
unsigned long clock_tick_ref; unsigned long clock_tick_ref;
unsigned int ref_freq; unsigned int ref_freq;
}; };
static DEFINE_PER_CPU(struct freq_table, sparc64_freq_table) = { 0, 0, 0 }; static DEFINE_PER_CPU(struct freq_table, sparc64_freq_table) = { 0, 0 };
unsigned long sparc64_get_clock_tick(unsigned int cpu) unsigned long sparc64_get_clock_tick(unsigned int cpu)
{ {
@ -1055,16 +1054,11 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val
if (!ft->ref_freq) { if (!ft->ref_freq) {
ft->ref_freq = freq->old; ft->ref_freq = freq->old;
ft->udelay_val_ref = cpu_data(cpu).udelay_val;
ft->clock_tick_ref = cpu_data(cpu).clock_tick; ft->clock_tick_ref = cpu_data(cpu).clock_tick;
} }
if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) ||
(val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||
(val == CPUFREQ_RESUMECHANGE)) { (val == CPUFREQ_RESUMECHANGE)) {
cpu_data(cpu).udelay_val =
cpufreq_scale(ft->udelay_val_ref,
ft->ref_freq,
freq->new);
cpu_data(cpu).clock_tick = cpu_data(cpu).clock_tick =
cpufreq_scale(ft->clock_tick_ref, cpufreq_scale(ft->clock_tick_ref,
ft->ref_freq, ft->ref_freq,

19
arch/sparc64/lib/delay.c
View File

@ -1,6 +1,6 @@
/* delay.c: Delay loops for sparc64 /* delay.c: Delay loops for sparc64
* *
* Copyright (C) 2004 David S. Miller <davem@redhat.com> * Copyright (C) 2004, 2006 David S. Miller <davem@davemloft.net>
* *
* Based heavily upon x86 variant which is: * Based heavily upon x86 variant which is:
* Copyright (C) 1993 Linus Torvalds * Copyright (C) 1993 Linus Torvalds
@ -8,19 +8,16 @@
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/timer.h>
void __delay(unsigned long loops) void __delay(unsigned long loops)
{ {
__asm__ __volatile__( unsigned long bclock, now;
" b,pt %%xcc, 1f\n"
" cmp %0, 0\n" bclock = tick_ops->get_tick();
" .align 32\n" do {
"1:\n" now = tick_ops->get_tick();
" bne,pt %%xcc, 1b\n" } while ((now-bclock) < loops);
" subcc %0, 1, %0\n"
: "=&r" (loops)
: "0" (loops)
: "cc");
} }
/* We used to multiply by HZ after shifting down by 32 bits /* We used to multiply by HZ after shifting down by 32 bits

6
include/asm-sparc64/timex.h
View File

@ -14,4 +14,10 @@
typedef unsigned long cycles_t; typedef unsigned long cycles_t;
#define get_cycles() tick_ops->get_tick() #define get_cycles() tick_ops->get_tick()
#define ARCH_HAS_READ_CURRENT_TIMER 1
#define read_current_timer(timer_val_p) \
({ *timer_val_p = tick_ops->get_tick(); \
0; \
})
#endif #endif