Commit 3763be32 authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f19a84e

arch/sparc64/kernel/time.c

+1 −7
Original line number Diff line number Diff line
@@ -1029,11 +1029,10 @@ static void sparc64_start_timers(irqreturn_t (*cfunc)(int, void *, struct pt_reg 
}



struct freq_table {

	unsigned long udelay_val_ref;

	unsigned long clock_tick_ref;

	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)

{
@@ -1055,16 +1054,11 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val 


	if (!ft->ref_freq) {

		ft->ref_freq = freq->old;

		ft->udelay_val_ref = cpu_data(cpu).udelay_val;

		ft->clock_tick_ref = cpu_data(cpu).clock_tick;

	}

	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||

	    (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||

	    (val == CPUFREQ_RESUMECHANGE)) {

		cpu_data(cpu).udelay_val =

			cpufreq_scale(ft->udelay_val_ref,

				      ft->ref_freq,

				      freq->new);

		cpu_data(cpu).clock_tick =

			cpufreq_scale(ft->clock_tick_ref,

				      ft->ref_freq,

arch/sparc64/lib/delay.c

+8 −11
Original line number Diff line number Diff line 
/* 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:

 *	Copyright (C) 1993 Linus Torvalds
@@ -8,19 +8,16 @@ 
 */



#include <linux/delay.h>

#include <asm/timer.h>



void __delay(unsigned long loops)

{

	__asm__ __volatile__(

"	b,pt	%%xcc, 1f\n"

"	 cmp	%0, 0\n"

"	.align	32\n"

"1:\n"

"	bne,pt	%%xcc, 1b\n"

"	 subcc	%0, 1, %0\n"

	: "=&r" (loops)

	: "0" (loops)

	: "cc");

	unsigned long bclock, now;

	

	bclock = tick_ops->get_tick();

	do {

		now = tick_ops->get_tick();

	} while ((now-bclock) < loops);

}



/* We used to multiply by HZ after shifting down by 32 bits

include/asm-sparc64/timex.h

+6 −0
Original line number Diff line number Diff line
@@ -14,4 +14,10 @@ 
typedef unsigned long cycles_t;

#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