Commit 8b99cfb8 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: More sensible udelay implementation. 



Take a page from the powerpc folks and just calculate the
delay factor directly.

Since frequency scaling chips use a system-tick register,
the value is going to be the same system-wide.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27a2ef38

arch/sparc64/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) 
		   "D$ parity tl1\t: %u\n"

		   "I$ parity tl1\t: %u\n"

#ifndef CONFIG_SMP

		   "Cpu0Bogo\t: %lu.%02lu\n"

		   "Cpu0ClkTck\t: %016lx\n"

#endif

		   ,
@@ -457,8 +456,6 @@ static int show_cpuinfo(struct seq_file *m, void *__unused) 
		   dcache_parity_tl1_occurred,

		   icache_parity_tl1_occurred

#ifndef CONFIG_SMP

		   , cpu_data(0).udelay_val/(500000/HZ),

		   (cpu_data(0).udelay_val/(5000/HZ)) % 100,

		   cpu_data(0).clock_tick

#endif

		);

arch/sparc64/kernel/smp.c

+0 −24
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ extern void calibrate_delay(void); 


int sparc64_multi_core __read_mostly;



/* Please don't make this stuff initdata!!!  --DaveM */

unsigned char boot_cpu_id;



cpumask_t cpu_possible_map __read_mostly = CPU_MASK_NONE;

cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE;

cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly =
@@ -82,10 +79,7 @@ void smp_bogo(struct seq_file *m) 
	

	for_each_online_cpu(i)

		seq_printf(m,

			   "Cpu%dBogo\t: %lu.%02lu\n"

			   "Cpu%dClkTck\t: %016lx\n",

			   i, cpu_data(i).udelay_val / (500000/HZ),

			   (cpu_data(i).udelay_val / (5000/HZ)) % 100,

			   i, cpu_data(i).clock_tick);

}
@@ -112,8 +106,6 @@ void __devinit smp_callin(void) 


	local_irq_enable();



	calibrate_delay();

	cpu_data(cpuid).udelay_val = loops_per_jiffy;

	callin_flag = 1;

	__asm__ __volatile__("membar #Sync\n\t"

			     "flush  %%g6" : : : "memory");
@@ -1231,11 +1223,6 @@ void smp_penguin_jailcell(int irq, struct pt_regs *regs) 
	preempt_enable();

}



void __init smp_tick_init(void)

{

	boot_cpu_id = hard_smp_processor_id();

}



/* /proc/profile writes can call this, don't __init it please. */

int setup_profiling_timer(unsigned int multiplier)

{
@@ -1244,7 +1231,6 @@ int setup_profiling_timer(unsigned int multiplier) 


void __init smp_prepare_cpus(unsigned int max_cpus)

{

	cpu_data(boot_cpu_id).udelay_val = loops_per_jiffy;

}



void __devinit smp_prepare_boot_cpu(void)
@@ -1323,16 +1309,6 @@ void __cpu_die(unsigned int cpu) 


void __init smp_cpus_done(unsigned int max_cpus)

{

	unsigned long bogosum = 0;

	int i;



	for_each_online_cpu(i)

		bogosum += cpu_data(i).udelay_val;

	printk("Total of %ld processors activated "

	       "(%lu.%02lu BogoMIPS).\n",

	       (long) num_online_cpus(),

	       bogosum/(500000/HZ),

	       (bogosum/(5000/HZ))%100);

}



void smp_send_reschedule(int cpu)

arch/sparc64/kernel/sparc64_ksyms.c

+2 −10
Original line number Diff line number Diff line 
/* $Id: sparc64_ksyms.c,v 1.121 2002/02/09 19:49:31 davem Exp $

 * arch/sparc64/kernel/sparc64_ksyms.c: Sparc64 specific ksyms support.

/* arch/sparc64/kernel/sparc64_ksyms.c: Sparc64 specific ksyms support.

 *

 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)

 * Copyright (C) 1996 Eddie C. Dost (ecd@skynet.be)

 * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz)

 */
@@ -28,7 +27,6 @@ 
#include <net/compat.h>



#include <asm/oplib.h>

#include <asm/delay.h>

#include <asm/system.h>

#include <asm/auxio.h>

#include <asm/pgtable.h>
@@ -326,12 +324,6 @@ EXPORT_SYMBOL(memset); 
EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(strncmp);



/* Delay routines. */

EXPORT_SYMBOL(__udelay);

EXPORT_SYMBOL(__ndelay);

EXPORT_SYMBOL(__const_udelay);

EXPORT_SYMBOL(__delay);



void VISenter(void);

/* RAID code needs this */

EXPORT_SYMBOL(VISenter);

arch/sparc64/kernel/sysfs.c

+0 −2
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ static ssize_t show_##NAME(struct sys_device *dev, char *buf) \ 
}



SHOW_CPUDATA_ULONG_NAME(clock_tick, clock_tick);

SHOW_CPUDATA_ULONG_NAME(udelay_val, udelay_val);

SHOW_CPUDATA_UINT_NAME(l1_dcache_size, dcache_size);

SHOW_CPUDATA_UINT_NAME(l1_dcache_line_size, dcache_line_size);

SHOW_CPUDATA_UINT_NAME(l1_icache_size, icache_size);
@@ -203,7 +202,6 @@ SHOW_CPUDATA_UINT_NAME(l2_cache_line_size, ecache_line_size); 


static struct sysdev_attribute cpu_core_attrs[] = {

	_SYSDEV_ATTR(clock_tick,          0444, show_clock_tick, NULL),

	_SYSDEV_ATTR(udelay_val,          0444, show_udelay_val, NULL),

	_SYSDEV_ATTR(l1_dcache_size,      0444, show_l1_dcache_size, NULL),

	_SYSDEV_ATTR(l1_dcache_line_size, 0444, show_l1_dcache_line_size, NULL),

	_SYSDEV_ATTR(l1_icache_size,      0444, show_l1_icache_size, NULL),

arch/sparc64/kernel/time.c

+21 −7
Original line number Diff line number Diff line
@@ -849,9 +849,6 @@ static unsigned long sparc64_init_timers(void) 
{

	struct device_node *dp;

	unsigned long clock;

#ifdef CONFIG_SMP

	extern void smp_tick_init(void);

#endif



	dp = of_find_node_by_path("/");

	if (tlb_type == spitfire) {
@@ -874,10 +871,6 @@ static unsigned long sparc64_init_timers(void) 
		clock = of_getintprop_default(dp, "stick-frequency", 0);

	}



#ifdef CONFIG_SMP

	smp_tick_init();

#endif



	return clock;

}
@@ -1038,10 +1031,31 @@ static void __init setup_clockevent_multiplier(unsigned long hz) 
	sparc64_clockevent.mult = mult;

}



static unsigned long tb_ticks_per_usec __read_mostly;



void __delay(unsigned long loops)

{

	unsigned long bclock, now;



	bclock = tick_ops->get_tick();

	do {

		now = tick_ops->get_tick();

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

}

EXPORT_SYMBOL(__delay);



void udelay(unsigned long usecs)

{

	__delay(tb_ticks_per_usec * usecs);

}

EXPORT_SYMBOL(udelay);



void __init time_init(void)

{

	unsigned long clock = sparc64_init_timers();



	tb_ticks_per_usec = clock / USEC_PER_SEC;



	timer_ticks_per_nsec_quotient =

		clocksource_hz2mult(clock, SPARC64_NSEC_PER_CYC_SHIFT);