Commit defbb2c9 authored by hawkes@sgi.com's avatar hawkes@sgi.com Committed by Tony Luck
Browse files

[IA64] ia64: simplify and fix udelay() 



The original ia64 udelay() was simple, but flawed for platforms without
synchronized ITCs:  a preemption and migration to another CPU during the
while-loop likely resulted in too-early termination or very, very
lengthy looping.

The first fix (now in 2.6.15) broke the delay loop into smaller,
non-preemptible chunks, reenabling preemption between the chunks.  This
fix is flawed in that the total udelay is computed to be the sum of just
the non-premptible while-loop pieces, i.e., not counting the time spent
in the interim preemptible periods.  If an interrupt or a migration
occurs during one of these interim periods, then that time is invisible
and only serves to lengthen the effective udelay().

This new fix backs out the current flawed fix and returns to a simple
udelay(), fully preemptible and interruptible.  It implements two simple
alternative udelay() routines:  one a default generic version that uses
ia64_get_itc(), and the other an sn-specific version that uses that
platform's RTC.

Signed-off-by: default avatarJohn Hawkes <hawkes@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 4c2cd966

arch/ia64/kernel/time.c

+17 −22
Original line number Original line Diff line number Diff line
@@ -250,32 +250,27 @@ time_init (void) 
	set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);

	set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);

}

}





#define SMALLUSECS 100



void

udelay (unsigned long usecs)

{

	unsigned long start;

	unsigned long cycles;

	unsigned long smallusecs;



/*

/*

	 * Execute the non-preemptible delay loop (because the ITC might

 * Generic udelay assumes that if preemption is allowed and the thread

	 * not be synchronized between CPUS) in relatively short time

 * migrates to another CPU, that the ITC values are synchronized across

	 * chunks, allowing preemption between the chunks.

 * all CPUs.

 */

 */

	while (usecs > 0) {

static void

		smallusecs = (usecs > SMALLUSECS) ? SMALLUSECS : usecs;

ia64_itc_udelay (unsigned long usecs)

		preempt_disable();

{

		cycles = smallusecs*local_cpu_data->cyc_per_usec;

	unsigned long start = ia64_get_itc();

		start = ia64_get_itc();

	unsigned long end = start + usecs*local_cpu_data->cyc_per_usec;





		while (ia64_get_itc() - start < cycles)

	while (time_before(ia64_get_itc(), end))

		cpu_relax();

		cpu_relax();



		preempt_enable();

		usecs -= smallusecs;

}

}



void (*ia64_udelay)(unsigned long usecs) = &ia64_itc_udelay;



void

udelay (unsigned long usecs)

{

	(*ia64_udelay)(usecs);

}

}

EXPORT_SYMBOL(udelay);

EXPORT_SYMBOL(udelay);

arch/ia64/sn/kernel/sn2/timer.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




#include <asm/hw_irq.h>

#include <asm/hw_irq.h>

#include <asm/system.h>

#include <asm/system.h>

#include <asm/timex.h>





#include <asm/sn/leds.h>

#include <asm/sn/leds.h>

#include <asm/sn/shub_mmr.h>

#include <asm/sn/shub_mmr.h>
@@ -28,9 +29,27 @@ static struct time_interpolator sn2_interpolator = { 
	.source = TIME_SOURCE_MMIO64

	.source = TIME_SOURCE_MMIO64

};

};





/*

 * sn udelay uses the RTC instead of the ITC because the ITC is not

 * synchronized across all CPUs, and the thread may migrate to another CPU

 * if preemption is enabled.

 */

static void

ia64_sn_udelay (unsigned long usecs)

{

	unsigned long start = rtc_time();

	unsigned long end = start +

			usecs * sn_rtc_cycles_per_second / 1000000;



	while (time_before((unsigned long)rtc_time(), end))

		cpu_relax();

}



void __init sn_timer_init(void)

void __init sn_timer_init(void)

{

{

	sn2_interpolator.frequency = sn_rtc_cycles_per_second;

	sn2_interpolator.frequency = sn_rtc_cycles_per_second;

	sn2_interpolator.addr = RTC_COUNTER_ADDR;

	sn2_interpolator.addr = RTC_COUNTER_ADDR;

	register_time_interpolator(&sn2_interpolator);

	register_time_interpolator(&sn2_interpolator);



	ia64_udelay = &ia64_sn_udelay;

}
 
}

include/asm-ia64/timex.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,8 @@ 




typedef unsigned long cycles_t;

typedef unsigned long cycles_t;





extern void (*ia64_udelay)(unsigned long usecs);



/*

/*

 * For performance reasons, we don't want to define CLOCK_TICK_TRATE as

 * For performance reasons, we don't want to define CLOCK_TICK_TRATE as

 * local_cpu_data->itc_rate.  Fortunately, we don't have to, either: according to George

 * local_cpu_data->itc_rate.  Fortunately, we don't have to, either: according to George

CRA Git | Maintained and supported by SUSTech CRA and CCSE