* [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386)
@ 2005-10-14 1:59 john stultz
2005-10-14 2:08 ` [RFC] Generic Timeofday Subsystem Simulator (v1) john stultz
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: john stultz @ 2005-10-14 1:59 UTC (permalink / raw)
To: lkml
Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner,
Frank Sorenson, Nishanth Aravamudan, Darren Hart
[-- Attachment #1: Type: text/plain, Size: 2110 bytes --]
All,
Attached is the cumulative patch (for i386 only it does not include
x86-64 support, which is available as a separate patch to follow) for my
generic timekeeping rework (v. B7). Individual broken out patches to
follow. This patch provides the NTP changes, the timesource abstraction,
the core timekeeping code as well as the code to convert the i386 arch
and the i386 clocksources.
The biggest change here is the name changing from using "timesource" to
"clocksource" for the hardware counter abstraction. This had been
reccomended before, but I finally had enough people mention it that I
figured I ought to just do it. Hopefully this will allow the terms to
better map to related technical documentation.
With the exception of a few issues on the TODO list below, I'm feeling
the core arch generic code is getting really solid, and I intend to
focus on the arch specific bits and getting it into -mm soon. So please
let me know if you have further concerns or issues especially with the
arch generic bits.
New in this release: (most from suggestions by tglx)
o Cleaned up the fixed interval math code.
o Added better remainder accounting in the fixed interval math
o Further fast-path optimizations in periodic_hook()
o priority -> rating name change
o C code convention fixups
o Moved from array based to list based timesource management (from tglx)
o sysfs \n cleanup (from tglx)
Still on the TODO list:
o Optimize out the timesource_read switch statement
o Cleanup i386 arch specific bits
o Re-organize the clocksource drivers directory
This patch should apply against Linus' git tree from today.
I'd like to thank the following people who have contributed ideas,
criticism, testing and code that has helped shape this work:
George Anzinger, Nish Aravamudan, Max Asbock, Dominik Brodowski, Thomas
Gleixner, Darren Hart, Christoph Lameter, Matt Mackal, Keith Mannthey,
Ingo Molnar, Martin Schwidefsky, Frank Sorenson, Ulrich Windl, Darrick
Wong, Roman Zippel and any others whom I've accidentally forgotten.
Please let me know if you have any comments or feedback.
thanks
-john
[-- Attachment #2: linux-2.6.14-rc4_timeofday-all_B7.patch.bz2 --]
[-- Type: application/x-bzip, Size: 34617 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* [RFC] Generic Timeofday Subsystem Simulator (v1) 2005-10-14 1:59 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) john stultz @ 2005-10-14 2:08 ` john stultz 2005-10-14 2:09 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz 2005-10-14 4:01 ` [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) Kyle Moffett 2 siblings, 0 replies; 16+ messages in thread From: john stultz @ 2005-10-14 2:08 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart [-- Attachment #1: Type: text/plain, Size: 827 bytes --] All, At Roman's prodding, and inspired by Dave Mills' simulator, I've scratched out a pretty simple userspace simulator for my timeofday and NTP changes. The project is attached. It is pretty simple right now and if you have any suggestions for changes, please let me know. To use it: 1. Download my timeofday patches (or just the cumulative one) and apply them to a current git tree. 2. Untar the simulator. 3. Run ./generate.sh <path to patched kernel tree> 4. Run make 5. Run ./todsim <offset> <ppm skew> Pretty easy. It will output a whole lot of data providing: <simulator time> <kernel time> <hardware value> <offset> <ppm adj> Its not terribly interesting at the moment, but hopefully folks can play with it and make suggestions for improvements to the simulator, timeofday code or the ntp changes. thanks -john [-- Attachment #2: simulator.tar.bz2 --] [-- Type: application/x-bzip-compressed-tar, Size: 5133 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 1/12] Reduced NTP rework (part 1) 2005-10-14 1:59 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) john stultz 2005-10-14 2:08 ` [RFC] Generic Timeofday Subsystem Simulator (v1) john stultz @ 2005-10-14 2:09 ` john stultz 2005-10-14 2:10 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz 2005-10-14 4:01 ` [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) Kyle Moffett 2 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:09 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, With Roman's suggestions, I've been working on reducing the footprint of my timeofday patches. This is the first of two patches that reworks some of the interrupt time NTP adjustments so that it could be re-used with the timeofday patches. The motivation of the change is to logically separate the code which adjusts xtime and the code that decides, based on the NTP state variables, how much per tick to adjust xtime. Thus this patch should not affect the existing behaviour, but just separate the logical functionality so it can be re-used. This patch applies ontop of my ntp-shift-right patch I posted awhile back (currently in -mm). thanks -john timer.c | 88 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 33 deletions(-) linux-2.6.14-rc4_timeofday-ntp-part1_B7.patch ============================================ diff --git a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c +++ b/kernel/timer.c @@ -620,6 +620,7 @@ static long time_adj; /* tick adjust ( long time_reftime; /* time at last adjustment (s) */ long time_adjust; long time_next_adjust; +long time_adjust_step; /* per tick time_adjust step */ /* * this routine handles the overflow of the microsecond field @@ -742,46 +743,46 @@ static void second_overflow(void) #endif } -/* in the NTP reference this is called "hardclock()" */ -static void update_wall_time_one_tick(void) + +static void ntp_advance(unsigned long interval_ns) { - long time_adjust_step, delta_nsec; + static unsigned long interval_sum; - if ( (time_adjust_step = time_adjust) != 0 ) { - /* We are doing an adjtime thing. - * - * Prepare time_adjust_step to be within bounds. - * Note that a positive time_adjust means we want the clock - * to run faster. - * - * Limit the amount of the step to be in the range - * -tickadj .. +tickadj - */ - time_adjust_step = min(time_adjust_step, (long)tickadj); - time_adjust_step = max(time_adjust_step, (long)-tickadj); + /* increment the interval sum */ + interval_sum += interval_ns; - /* Reduce by this step the amount of time left */ - time_adjust -= time_adjust_step; - } - delta_nsec = tick_nsec + time_adjust_step * 1000; - /* - * Advance the phase, once it gets to one microsecond, then - * advance the tick more. - */ - time_phase += time_adj; - if ((time_phase >= FINENSEC) || (time_phase <= -FINENSEC)) { - long ltemp = shift_right(time_phase, (SHIFT_SCALE - 10)); - time_phase -= ltemp << (SHIFT_SCALE - 10); - delta_nsec += ltemp; + /* calculate the per tick singleshot adjtime adjustment step */ + while (interval_ns >= tick_nsec) { + time_adjust_step = time_adjust; + if (time_adjust_step) { + /* We are doing an adjtime thing. + * + * Prepare time_adjust_step to be within bounds. + * Note that a positive time_adjust means we want the clock + * to run faster. + * + * Limit the amount of the step to be in the range + * -tickadj .. +tickadj + */ + time_adjust_step = min(time_adjust_step, (long)tickadj); + time_adjust_step = max(time_adjust_step, (long)-tickadj); + + /* Reduce by this step the amount of time left */ + time_adjust -= time_adjust_step; + } + interval_ns -= tick_nsec; } - xtime.tv_nsec += delta_nsec; - time_interpolator_update(delta_nsec); /* Changes by adjtime() do not take effect till next tick. */ - if (time_next_adjust != 0) { + if (time_next_adjust) { time_adjust = time_next_adjust; time_next_adjust = 0; } + + while (interval_sum > NSEC_PER_SEC) { + interval_sum -= NSEC_PER_SEC; + second_overflow(); + } } /* @@ -793,14 +794,35 @@ static void update_wall_time_one_tick(vo */ static void update_wall_time(unsigned long ticks) { + long delta_nsec; + do { ticks--; - update_wall_time_one_tick(); + + /* Calculate the nsec delta using the + * precomputed NTP adjustments: + * tick_nsec, time_adjust_step, time_adj + */ + delta_nsec = tick_nsec + time_adjust_step * 1000; + /* + * Advance the phase, once it gets to one microsecond, then + * advance the tick more. + */ + time_phase += time_adj; + if ((time_phase >= FINENSEC) || (time_phase <= -FINENSEC)) { + long ltemp = shift_right(time_phase, (SHIFT_SCALE - 10)); + time_phase -= ltemp << (SHIFT_SCALE - 10); + delta_nsec += ltemp; + } + + xtime.tv_nsec += delta_nsec; if (xtime.tv_nsec >= 1000000000) { xtime.tv_nsec -= 1000000000; xtime.tv_sec++; - second_overflow(); } + ntp_advance(tick_nsec); + time_interpolator_update(delta_nsec); + } while (ticks); } ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 2/12] Reduced NTP rework (part 2) 2005-10-14 2:09 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz @ 2005-10-14 2:10 ` john stultz 2005-10-14 2:11 ` [RFC][PATCH 3/12] clocksource management code john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:10 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, Here is the second of two patches which try to minimize my ntp rework patches. This patch further changes the interrupt time NTP code, breaking out the leapsecond processing and introduces an accessor to a shifted ppm adjustment value. For correctness, I've also introduced a new lock, the ntp_lock, which protects the NTP state machine when accessing it from my timekeeping code (which does not use the xtime_lock). Again, this patch should not affect the existing behavior, but just separate the logical functionality so it can be re-used by my timeofday patches. thanks -john include/linux/timex.h | 24 ++++++ kernel/time.c | 25 ++++--- kernel/timer.c | 176 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 160 insertions(+), 65 deletions(-) linux-2.6.14-rc4_timeofday-ntp-part2_B7.patch ============================================ diff --git a/include/linux/timex.h b/include/linux/timex.h --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -260,6 +260,7 @@ extern long pps_calcnt; /* calibration extern long pps_errcnt; /* calibration errors */ extern long pps_stbcnt; /* stability limit exceeded */ +extern seqlock_t ntp_lock; /** * ntp_clear - Clears the NTP state variables * @@ -267,10 +268,14 @@ extern long pps_stbcnt; /* stability li */ static inline void ntp_clear(void) { + unsigned long flags; + write_seqlock_irqsave(&ntp_lock, flags); time_adjust = 0; /* stop active adjtime() */ time_status |= STA_UNSYNC; time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; + write_sequnlock_irqrestore(&ntp_lock, flags); + } /** @@ -282,6 +287,25 @@ static inline int ntp_synced(void) return !(time_status & STA_UNSYNC); } +/** + * ntp_get_ppm_adjustment - Returns Shifted PPM adjustment + * + */ +long ntp_get_ppm_adjustment(void); + +/** + * ntp_advance - Advances the NTP state machine by interval_ns + * + */ +void ntp_advance(unsigned long interval_ns); + +/** + * ntp_leapsecond - NTP leapsecond processing code. + * + */ +int ntp_leapsecond(struct timespec now); + + /* Required to safely shift negative values */ #define shift_right(x, s) ({ \ __typeof__(x) __x = (x); \ diff --git a/kernel/time.c b/kernel/time.c --- a/kernel/time.c +++ b/kernel/time.c @@ -231,7 +231,9 @@ int do_adjtimex(struct timex *txc) { long ltemp, mtemp, save_adjust; int result; - + unsigned long flags; + struct timespec now_ts; + unsigned long seq; /* In order to modify anything, you gotta be super-user! */ if (txc->modes && !capable(CAP_SYS_TIME)) return -EPERM; @@ -254,7 +256,13 @@ int do_adjtimex(struct timex *txc) txc->tick > 1100000/USER_HZ) return -EINVAL; - write_seqlock_irq(&xtime_lock); + do { /* save off current xtime */ + seq = read_seqbegin(&xtime_lock); + now_ts = xtime; + } while (read_seqretry(&xtime_lock, seq)); + + write_seqlock_irqsave(&ntp_lock, flags); + result = time_state; /* mostly `TIME_OK' */ /* Save for later - semantics of adjtime is to return old value */ @@ -331,9 +339,9 @@ int do_adjtimex(struct timex *txc) */ if (time_status & STA_FREQHOLD || time_reftime == 0) - time_reftime = xtime.tv_sec; - mtemp = xtime.tv_sec - time_reftime; - time_reftime = xtime.tv_sec; + time_reftime = now_ts.tv_sec; + mtemp = now_ts.tv_sec - time_reftime; + time_reftime = now_ts.tv_sec; if (time_status & STA_FLL) { if (mtemp >= MINSEC) { ltemp = (time_offset / mtemp) << (SHIFT_USEC - @@ -392,7 +400,7 @@ leave: if ((time_status & (STA_UNSYNC|ST txc->calcnt = pps_calcnt; txc->errcnt = pps_errcnt; txc->stbcnt = pps_stbcnt; - write_sequnlock_irq(&xtime_lock); + write_sequnlock_irqrestore(&ntp_lock, flags); do_gettimeofday(&txc->time); notify_arch_cmos_timer(); return(result); @@ -509,10 +517,7 @@ int do_settimeofday (struct timespec *tv set_normalized_timespec(&xtime, sec, nsec); set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - time_adjust = 0; /* stop active adjtime() */ - time_status |= STA_UNSYNC; - time_maxerror = NTP_PHASE_LIMIT; - time_esterror = NTP_PHASE_LIMIT; + ntp_clear(); time_interpolator_reset(); } write_sequnlock_irq(&xtime_lock); diff --git a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c +++ b/kernel/timer.c @@ -613,7 +613,6 @@ long time_tolerance = MAXFREQ; /* frequ long time_precision = 1; /* clock precision (us) */ long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us) */ long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */ -static long time_phase; /* phase offset (scaled us) */ long time_freq = (((NSEC_PER_SEC + HZ/2) % HZ - HZ/2) << SHIFT_USEC) / NSEC_PER_USEC; /* frequency offset (scaled ppm)*/ static long time_adj; /* tick adjust (scaled 1 / HZ) */ @@ -622,6 +621,87 @@ long time_adjust; long time_next_adjust; long time_adjust_step; /* per tick time_adjust step */ +long total_sppm; /* shifted ppm sum of all NTP adjustments */ +long offset_adj_ppm; +long tick_adj_ppm; +long singleshot_adj_ppm; + +#define MAX_SINGLESHOT_ADJ 500 /* (ppm) */ +#define SEC_PER_DAY 86400 +#define END_OF_DAY(x) (x + SEC_PER_DAY - (x % SEC_PER_DAY) - 1) + +/* NTP lock, protects NTP state machine */ +seqlock_t ntp_lock = SEQLOCK_UNLOCKED; + +/** + * ntp_leapsecond - NTP leapsecond processing code. + * now: the current time + * + * Returns the number of seconds (-1, 0, or 1) that + * should be added to the current time to properly + * adjust for leapseconds. + */ + +int ntp_leapsecond(struct timespec now) +{ + unsigned long flags; + /* + * Leap second processing. If in leap-insert state at + * the end of the day, the system clock is set back one + * second; if in leap-delete state, the system clock is + * set ahead one second. + */ + static time_t leaptime = 0; + int ret = 0; + + write_seqlock_irqsave(&ntp_lock, flags); + switch (time_state) { + + case TIME_OK: + if (time_status & STA_INS) { + time_state = TIME_INS; + leaptime = END_OF_DAY(now.tv_sec); + } else if (time_status & STA_DEL) { + time_state = TIME_DEL; + leaptime = END_OF_DAY(now.tv_sec); + } + break; + + case TIME_INS: + /* Once we are at (or past) leaptime, insert the second */ + if (now.tv_sec >= leaptime) { + time_state = TIME_OOP; + printk(KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n"); + ret = -1; + } + break; + + case TIME_DEL: + /* Once we are at (or past) leaptime, delete the second */ + if (now.tv_sec >= leaptime) { + time_state = TIME_WAIT; + printk(KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n"); + ret = 1; + } + break; + + case TIME_OOP: + /* Wait for the end of the leap second*/ + if (now.tv_sec > (leaptime + 1)) + time_state = TIME_WAIT; + time_state = TIME_WAIT; + break; + + case TIME_WAIT: + if (!(time_status & (STA_INS | STA_DEL))) + time_state = TIME_OK; + break; + } + + write_sequnlock_irqrestore(&ntp_lock, flags); + return 0; +} + /* * this routine handles the overflow of the microsecond field * @@ -643,59 +723,6 @@ static void second_overflow(void) } /* - * Leap second processing. If in leap-insert state at - * the end of the day, the system clock is set back one - * second; if in leap-delete state, the system clock is - * set ahead one second. The microtime() routine or - * external clock driver will insure that reported time - * is always monotonic. The ugly divides should be - * replaced. - */ - switch (time_state) { - - case TIME_OK: - if (time_status & STA_INS) - time_state = TIME_INS; - else if (time_status & STA_DEL) - time_state = TIME_DEL; - break; - - case TIME_INS: - if (xtime.tv_sec % 86400 == 0) { - xtime.tv_sec--; - wall_to_monotonic.tv_sec++; - /* The timer interpolator will make time change gradually instead - * of an immediate jump by one second. - */ - time_interpolator_update(-NSEC_PER_SEC); - time_state = TIME_OOP; - clock_was_set(); - printk(KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n"); - } - break; - - case TIME_DEL: - if ((xtime.tv_sec + 1) % 86400 == 0) { - xtime.tv_sec++; - wall_to_monotonic.tv_sec--; - /* Use of time interpolator for a gradual change of time */ - time_interpolator_update(NSEC_PER_SEC); - time_state = TIME_WAIT; - clock_was_set(); - printk(KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n"); - } - break; - - case TIME_OOP: - time_state = TIME_WAIT; - break; - - case TIME_WAIT: - if (!(time_status & (STA_INS | STA_DEL))) - time_state = TIME_OK; - } - - /* * Compute the phase adjustment for the next second. In * PLL mode, the offset is reduced by a fixed factor * times the time constant. In FLL mode the offset is @@ -712,6 +739,13 @@ static void second_overflow(void) time_offset -= ltemp; time_adj = ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE); + offset_adj_ppm = shift_right(ltemp, SHIFT_UPDATE); /* ppm */ + + /* first calculate usec/user_tick offset */ + tick_adj_ppm = ((USEC_PER_SEC + USER_HZ/2)/USER_HZ) - tick_usec; + /* multiply by user_hz to get usec/sec => ppm */ + tick_adj_ppm *= USER_HZ; + /* * Compute the frequency estimate and additional phase * adjustment due to frequency error for the next @@ -744,9 +778,20 @@ static void second_overflow(void) } -static void ntp_advance(unsigned long interval_ns) +/** + * ntp_get_ppm_adjustment - Returns Shifted PPM adjustment + * + */ +long ntp_get_ppm_adjustment(void) +{ + return total_sppm; +} + +void ntp_advance(unsigned long interval_ns) { static unsigned long interval_sum; + unsigned long flags; + write_seqlock_irqsave(&ntp_lock, flags); /* increment the interval sum */ interval_sum += interval_ns; @@ -772,6 +817,7 @@ static void ntp_advance(unsigned long in } interval_ns -= tick_nsec; } + singleshot_adj_ppm = time_adjust_step*(1000000/HZ); /* usec/tick => ppm */ /* Changes by adjtime() do not take effect till next tick. */ if (time_next_adjust) { @@ -783,6 +829,15 @@ static void ntp_advance(unsigned long in interval_sum -= NSEC_PER_SEC; second_overflow(); } + + /* calculate the total continuous ppm adjustment */ + total_sppm = time_freq; /* already shifted by SHIFT_USEC */ + total_sppm += offset_adj_ppm << SHIFT_USEC; + total_sppm += tick_adj_ppm << SHIFT_USEC; + total_sppm += singleshot_adj_ppm << SHIFT_USEC; + + write_sequnlock_irqrestore(&ntp_lock, flags); + } /* @@ -795,6 +850,7 @@ static void ntp_advance(unsigned long in static void update_wall_time(unsigned long ticks) { long delta_nsec; + static long time_phase; /* phase offset (scaled us) */ do { ticks--; @@ -817,8 +873,18 @@ static void update_wall_time(unsigned lo xtime.tv_nsec += delta_nsec; if (xtime.tv_nsec >= 1000000000) { + int leapsecond; xtime.tv_nsec -= 1000000000; xtime.tv_sec++; + /* process leapsecond */ + leapsecond = ntp_leapsecond(xtime); + if (leapsecond) { + xtime.tv_sec += leapsecond; + wall_to_monotonic.tv_sec -= leapsecond; + /* Use of time interpolator for a gradual change of time */ + time_interpolator_update(leapsecond*NSEC_PER_SEC); + clock_was_set(); + } } ntp_advance(tick_nsec); time_interpolator_update(delta_nsec); ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 3/12] clocksource management code 2005-10-14 2:10 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz @ 2005-10-14 2:11 ` john stultz 2005-10-14 2:12 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:11 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, This patch introduces the clocksource management infrastructure. A clocksource is a driver-like architecture generic abstraction of a freerunning counter. This patch defines the clocksource structure, and provides management code for registering, selecting, accessing and scaling clocksources. The clocksource structure is influenced by the time_interpolator code, although I feel it has a cleaner interface and avoids preserving system state in the clocksource structure. Additionally, this patch includes the trivial jiffies clocksource, a lowest common denominator clocksource, provided mainly for use as an example. This patch applies ontop of my part 2 of my ntp changes. Since this patch provides the groundwork for the generic timeofday core, it will not function without the generic timeofday patches to follow. thanks -john Documentation/kernel-parameters.txt | 11 + drivers/Makefile | 1 drivers/clocksource/Makefile | 1 drivers/clocksource/jiffies.c | 74 +++++++++ include/linux/clocksource.h | 269 ++++++++++++++++++++++++++++++++++ kernel/clocksource.c | 279 ++++++++++++++++++++++++++++++++++++ 6 files changed, 632 insertions(+), 3 deletions(-) linux-2.6.14-rc4_timeofday-clocksource-core_B7.patch ============================================ diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -52,6 +52,7 @@ restrictions referred to are that the re MTD MTD support is enabled. NET Appropriate network support is enabled. NUMA NUMA support is enabled. + GENERIC_TOD The generic timeofday code is enabled. NFS Appropriate NFS support is enabled. OSS OSS sound support is enabled. PARIDE The ParIDE subsystem is enabled. @@ -323,9 +324,9 @@ running once the system is up. Default value is set via a kernel config option. Value can be changed at runtime via /selinux/checkreqprot. - clock= [BUGS=IA-32, HW] gettimeofday timesource override. - Forces specified timesource (if avaliable) to be used - when calculating gettimeofday(). If specicified timesource + clock= [BUGS=IA-32, HW] gettimeofday clocksource override. [Deprecated] + Forces specified clocksource (if avaliable) to be used + when calculating gettimeofday(). If specicified clocksource is not avalible, it defaults to PIT. Format: { pit | tsc | cyclone | pmtmr } @@ -1462,6 +1463,10 @@ running once the system is up. time Show timing data prefixed to each printk message line + clocksource= [GENERIC_TOD] Override the default clocksource + Override the default clocksource and use the clocksource + with the name specified. + tipar.timeout= [HW,PPT] Set communications timeout in tenths of a second (default 15). diff --git a/drivers/Makefile b/drivers/Makefile --- a/drivers/Makefile +++ b/drivers/Makefile @@ -67,3 +67,4 @@ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_IOC4) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ +obj-$(CONFIG_GENERICTOD) += clocksource/ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile new file mode 100644 --- /dev/null +++ b/drivers/clocksource/Makefile @@ -0,0 +1 @@ +obj-y += jiffies.o diff --git a/drivers/clocksource/jiffies.c b/drivers/clocksource/jiffies.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/jiffies.c @@ -0,0 +1,74 @@ +/*********************************************************************** +* linux/drivers/clocksource/jiffies.c +* +* This file contains the jiffies based clocksource. +* +* Copyright (C) 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* +************************************************************************/ +#include <linux/clocksource.h> +#include <linux/jiffies.h> +#include <linux/init.h> + +/* The Jiffies based clocksource is the lowest common + * denominator clock source which should function on + * all systems. It has the same coarse resolution as + * the timer interrupt frequency HZ and it suffers + * inaccuracies caused by missed or lost timer + * interrupts and the inability for the timer + * interrupt hardware to accuratly tick at the + * requested HZ value. It is also not reccomended + * for "tick-less" systems. + */ +#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/ACTHZ)) + +/* Since jiffies uses a simple NSEC_PER_JIFFY multiplier + * conversion, the .shift value could be zero. However + * this would make NTP adjustments impossible as they are + * in units of 1/2^.shift. Thus we use JIFFIES_SHIFT to + * shift both the nominator and denominator the same + * amount, and give ntp adjustments in units of 1/2^8 + * + * The value 8 is somewhat carefully chosen, as anything + * larger can result in overflows. NSEC_PER_JIFFY grows as + * HZ shrinks, so values greater then 8 overflow 32bits when + * HZ=100. + */ +#define JIFFIES_SHIFT 8 + +static cycle_t jiffies_read(void) +{ + cycle_t ret = get_jiffies_64(); + return ret; +} + +struct clocksource clocksource_jiffies = { + .name = "jiffies", + .rating = 0, /* lowest rating*/ + .type = CLOCKSOURCE_FUNCTION, + .read_fnct = jiffies_read, + .mask = (cycle_t)-1, + .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* See above for details */ + .shift = JIFFIES_SHIFT, +}; + +static int __init init_jiffies_clocksource(void) +{ + register_clocksource(&clocksource_jiffies); + return 0; +} +module_init(init_jiffies_clocksource); diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h new file mode 100644 --- /dev/null +++ b/include/linux/clocksource.h @@ -0,0 +1,269 @@ +/* linux/include/linux/clocksource.h + * + * This file contains the structure definitions for clocksources. + * + * If you are not a clocksource, or the time of day code, you should + * not be including this file! + */ +#ifndef _LINUX_CLOCKSOURCE_H +#define _LINUX_CLOCKSOURCE_H + +#include <linux/types.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/list.h> +#include <asm/io.h> +#include <asm/div64.h> + +/* struct clocksource: + * Provides mostly state-free accessors to the underlying hardware. + * + * name: ptr to clocksource name + * list: list head for registration + * rating: rating value for selection (higher is better) + * To avoid rating inflation the following + * list should give you a guide as to how + * to assign your clocksource a rating + * 1-99: Unfit for real use + * Only available for bootup and testing purposes. + * 100-199: Base level usability. + * Functional for real use, but not desired. + * 200-299: Good. + * A correct and usable clocksource. + * 300-399: Desired. + * A reasonably fast and accurate clocksource. + * 400-499: Perfect + * The ideal clocksource. A must-use where available. + * type: defines clocksource type + * @read_fnct: returns a cycle value + * ptr: ptr to MMIO'ed counter + * mask: bitmask for two's complement + * subtraction of non 64 bit counters + * mult: cycle to nanosecond multiplier + * shift: cycle to nanosecond divisor (power of two) + * @update_callback: called when safe to alter clocksource values + */ +struct clocksource { + char* name; + struct list_head list; + int rating; + enum { + CLOCKSOURCE_FUNCTION, + CLOCKSOURCE_CYCLES, + CLOCKSOURCE_MMIO_32, + CLOCKSOURCE_MMIO_64 + } type; + cycle_t (*read_fnct)(void); + void __iomem *mmio_ptr; + cycle_t mask; + u32 mult; + u32 shift; + int (*update_callback)(void); +}; + + +/* Helper functions that converts a khz counter + * frequency to a timsource multiplier, given the + * clocksource shift value + */ +static inline u32 clocksource_khz2mult(u32 khz, u32 shift_constant) +{ + /* khz = cyc/(Million ns) + * mult/2^shift = ns/cyc + * mult = ns/cyc * 2^shift + * mult = 1Million/khz * 2^shift + * mult = 1000000 * 2^shift / khz + * mult = (1000000<<shift) / khz + */ + u64 tmp = ((u64)1000000) << shift_constant; + tmp += khz/2; /* round for do_div */ + do_div(tmp, khz); + return (u32)tmp; +} + +/* Helper functions that converts a hz counter + * frequency to a timsource multiplier, given the + * clocksource shift value + */ +static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant) +{ + /* hz = cyc/(Billion ns) + * mult/2^shift = ns/cyc + * mult = ns/cyc * 2^shift + * mult = 1Billion/hz * 2^shift + * mult = 1000000000 * 2^shift / hz + * mult = (1000000000<<shift) / hz + */ + u64 tmp = ((u64)1000000000) << shift_constant; + tmp += hz/2; /* round for do_div */ + do_div(tmp, hz); + return (u32)tmp; +} + + +#ifndef readq +/* Provide an a way to atomically read a u64 on a 32bit arch */ +static inline unsigned long long clocksource_readq(void __iomem *addr) +{ + u32 low, high; + /* loop is required to make sure we get an atomic read */ + do { + high = readl(addr+4); + low = readl(addr); + } while (high != readl(addr+4)); + + return low | (((unsigned long long)high) << 32LL); +} +#else +#define clocksource_readq(x) readq(x) +#endif + + +/* read_clocksource(): + * Uses the clocksource to return the current cycle_t value + */ +static inline cycle_t read_clocksource(struct clocksource *cs) +{ + switch (cs->type) { + case CLOCKSOURCE_MMIO_32: + return (cycle_t)readl(cs->mmio_ptr); + case CLOCKSOURCE_MMIO_64: + return (cycle_t)clocksource_readq(cs->mmio_ptr); + case CLOCKSOURCE_CYCLES: + return (cycle_t)get_cycles(); + default:/* case: CLOCKSOURCE_FUNCTION */ + return cs->read_fnct(); + } +} + +/* ppm_to_mult_adj(): + * Helper which converts a shifted ppm value to + * clocksource mult_adj value, + * + * XXX - this could use some optimization + */ +static inline int ppm_to_mult_adj(struct clocksource *cs, int ppm) +{ + u64 mult_adj; + int ret_adj; + + /* The basic math is as follows: + * cyc * mult/2^shift * (1 + ppm/MILL) = scaled ns + * We want to precalculate the ppm factor so it can be added + * to the multiplyer saving the extra multiplication step. + * cyc * (mult/2^shift + (mult/2^shift) * (ppm/MILL)) = + * cyc * (mult/2^shift + (mult*ppm/MILL)/2^shift) = + * cyc * (mult + (mult*ppm/MILL))/2^shift = + * Thus we want to calculate the value of: + * mult*ppm/MILL + */ + mult_adj = abs(ppm); + mult_adj = (mult_adj * cs->mult)>>SHIFT_USEC; + mult_adj += 1000000/2; /* round for div*/ + do_div(mult_adj, 1000000); + if (ppm < 0) + ret_adj = -(int)mult_adj; + else + ret_adj = (int)mult_adj; + return ret_adj; +} + +/* cyc2ns(): + * Uses the clocksource and ntp ajdustment interval to + * convert cycle_ts to nanoseconds. + * + * XXX - This could use some mult_lxl_ll() asm optimization + */ +static inline nsec_t cyc2ns(struct clocksource *cs, int ntp_adj, cycle_t cycles) +{ + u64 ret; + ret = (u64)cycles; + ret *= (cs->mult + ntp_adj); + ret >>= cs->shift; + return (nsec_t)ret; +} + +/* cyc2ns_rem(): + * Uses the clocksource and ntp ajdustment interval to + * convert cycle_t to nanoseconds. Add in remainder portion + * which is stored in ns<<cs->shift units and save the new + * remainder off. + * + * XXX - This could use some mult_lxl_ll() asm optimization. + */ +static inline nsec_t cyc2ns_rem(struct clocksource *cs, int ntp_adj, cycle_t cycles, u64* rem) +{ + u64 ret; + ret = (u64)cycles; + ret *= (cs->mult + ntp_adj); + if (rem) { + ret += *rem; + *rem = ret & ((1<<cs->shift)-1); + } + ret >>= cs->shift; + return (nsec_t)ret; +} + +/* Used for fixed interval conversions + */ +struct clocksource_interval { + cycle_t cycles; + nsec_t nsecs; + u64 remainder; + u64 remainder_ns_overflow; +}; + +/* cyc2ns_fixed_rem(): + * Uses a precalculated fixed cycle/nsec interval to + * convert cycles to nanoseconds. Returns the unaccumulated + * cycles in the cycles pointer as well as uses and updates + * the value at the remainder pointer + * + */ +static inline nsec_t cyc2ns_fixed_rem(struct clocksource_interval interval, cycle_t *cycles, u64* rem) +{ + nsec_t delta_nsec = 0; + while(*cycles > interval.cycles) { + delta_nsec += interval.nsecs; + *cycles -= interval.cycles; + *rem += interval.remainder; + while(*rem > interval.remainder_ns_overflow) { + *rem -= interval.remainder_ns_overflow; + delta_nsec += 1; + } + } + return delta_nsec; +} + +/* calculate_clocksource_interval(): + * Calculates a fixed cycle/nsec interval for a given + * clocksource/adjustment pair and interval request. + */ +static inline struct clocksource_interval +calculate_clocksource_interval(struct clocksource *c, long adj, unsigned long length_nsec) +{ + struct clocksource_interval ret; + u64 tmp; + + /* XXX - All of this could use a whole lot of optimization */ + tmp = length_nsec; + tmp <<= c->shift; + do_div(tmp, c->mult+adj); + + ret.cycles = (cycle_t)tmp; + if(ret.cycles == 0) + ret.cycles = 1; + + ret.remainder = 0; + ret.remainder_ns_overflow = 1 << c->shift; + ret.nsecs = cyc2ns_rem(c, adj, ret.cycles, &ret.remainder); + + return ret; +} + + +/* used to install a new clocksource */ +void register_clocksource(struct clocksource*); +void reselect_clocksource(void); +struct clocksource* get_next_clocksource(void); +#endif diff --git a/kernel/clocksource.c b/kernel/clocksource.c new file mode 100644 --- /dev/null +++ b/kernel/clocksource.c @@ -0,0 +1,279 @@ +/********************************************************************* +* linux/kernel/clocksource.c +* +* This file contains the functions which manage clocksource drivers. +* +* Copyright (C) 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* +* TODO WishList: +* o Allow clocksource drivers to be unregistered +* o get rid of clocksource_jiffies extern +**********************************************************************/ + +#include <linux/clocksource.h> +#include <linux/sysdev.h> +#include <linux/init.h> +#include <linux/module.h> + +/* XXX - Would like a better way for initializing curr_clocksource */ +extern struct clocksource clocksource_jiffies; + +/*[Clocksource internal variables]--------- + * curr_clocksource: + * currently selected clocksource. Initialized to clocksource_jiffies. + * next_clocksource: + * pending next selected clocksource. + * clocksource_list: + * linked list with the registered clocksources + * clocksource_lock: + * protects manipulations to curr_clocksource and next_clocksource + * and the clocksource_list + */ +static struct clocksource *curr_clocksource = &clocksource_jiffies; +static struct clocksource *next_clocksource; +static LIST_HEAD(clocksource_list); +static seqlock_t clocksource_lock = SEQLOCK_UNLOCKED; + +static char override_name[32]; + + +/** + * get_next_clocksource - Returns the selected clocksource + * + */ +struct clocksource *get_next_clocksource(void) +{ + write_seqlock(&clocksource_lock); + if (next_clocksource) { + curr_clocksource = next_clocksource; + next_clocksource = NULL; + } + write_sequnlock(&clocksource_lock); + + return curr_clocksource; +} + + +/** + * select_clocksource - Finds the best registered clocksource. + * + * Private function. Must have a writelock on clocksource_lock + * when called. + */ +static struct clocksource *select_clocksource(void) +{ + struct clocksource *best = NULL; + struct list_head *tmp; + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + if (!best) + best = src; + + /* Check for override */ + if (strlen(src->name) == strlen(override_name) && + !strcmp(src->name, override_name)) { + best = src; + break; + } + /* Pick the highest rating */ + if (src->rating > best->rating) + best = src; + } + return best; +} + + +/* + * Check, if the clocksource is already registered + */ +static inline int is_registered_source(struct clocksource *c) +{ + struct list_head *tmp; + int len = strlen(c->name); + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + if (strlen(src->name) == len && !strcmp(src->name, c->name)) + return 1; + } + return 0; +} + + +/** + * register_clocksource - Used to install new clocksources + * @t: clocksource to be registered + * + */ +void register_clocksource(struct clocksource *c) +{ + write_seqlock(&clocksource_lock); + + /* check if clocksource is already registered */ + if (is_registered_source(c)) { + printk("register_clocksource: Cannot register %s. Already registered!", + c->name); + } else { + list_add(&c->list, &clocksource_list); + /* select next clocksource */ + next_clocksource = select_clocksource(); + } + write_sequnlock(&clocksource_lock); +} +EXPORT_SYMBOL(register_clocksource); + + +/** + * reselect_clocksource - Rescan list for next clocksource + * + * A quick helper function to be used if a clocksource + * changes its rating. Forces the clocksource list to + * be re-scaned for the best clocksource. + */ +void reselect_clocksource(void) +{ + write_seqlock(&clocksource_lock); + next_clocksource = select_clocksource(); + write_sequnlock(&clocksource_lock); +} + + +/** + * sysfs_show_clocksources - sysfs interface for listing clocksource + * @dev: unused + * @buf: char buffer to be filled with clocksource list + * + * Provides sysfs interface for listing registered clocksources + */ +static ssize_t sysfs_show_clocksources(struct sys_device *dev, char *buf) +{ + char* curr = buf; + struct list_head *tmp; + + write_seqlock(&clocksource_lock); + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + /* Mark current clocksource w/ a star */ + if (src == curr_clocksource) + curr += sprintf(curr, "*"); + curr += sprintf(curr, "%s ", src->name); + } + write_sequnlock(&clocksource_lock); + + curr += sprintf(curr, "\n"); + return curr - buf; +} + + +/** + * sysfs_override_clocksource - interface for manually overriding clocksource + * @dev: unused + * @buf: name of override clocksource + * + * + * Takes input from sysfs interface for manually overriding + * the default clocksource selction + */ +static ssize_t sysfs_override_clocksource(struct sys_device *dev, + const char *buf, size_t count) +{ + /* Strings from sysfs write are not 0 terminated ! */ + if (count >= sizeof(override_name)) + return -EINVAL; + /* Strip of \n */ + if (buf[count-1] == '\n') + count--; + if (count < 1) + return -EINVAL; + + write_seqlock(&clocksource_lock); + + /* copy the name given */ + memcpy(override_name, buf, count); + override_name[count] = 0; + + /* try to select it */ + next_clocksource = select_clocksource(); + + write_sequnlock(&clocksource_lock); + return count; +} + + +/* Sysfs setup bits: + */ +static SYSDEV_ATTR(clocksource, 0600, sysfs_show_clocksources, sysfs_override_clocksource); + +static struct sysdev_class clocksource_sysclass = { + set_kset_name("clocksource"), +}; + +static struct sys_device device_clocksource = { + .id = 0, + .cls = &clocksource_sysclass, +}; + +static int init_clocksource_sysfs(void) +{ + int error = sysdev_class_register(&clocksource_sysclass); + if (!error) { + error = sysdev_register(&device_clocksource); + if (!error) + error = sysdev_create_file(&device_clocksource, &attr_clocksource); + } + return error; +} +device_initcall(init_clocksource_sysfs); + + +/** + * boot_override_clocksource - boot clock override + * @str: override name + * + * Takes a clocksource= boot argument and uses it + * as the clocksource override name + */ +static int __init boot_override_clocksource(char* str) +{ + if (str) + strlcpy(override_name, str, sizeof(override_name)); + return 1; +} +__setup("clocksource=", boot_override_clocksource); + + +/** + * boot_override_clock - Compatibility layer for deprecated boot option + * @str: override name + * + * DEPRECATED! Takes a clock= boot argument and uses it + * as the clocksource override name + */ +static int __init boot_override_clock(char* str) +{ + printk("Warning! clock= boot option is deprecated.\n"); + return boot_override_clocksource(str); +} +__setup("clock=", boot_override_clock); ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 4/12] generic timeofday core subsystem 2005-10-14 2:11 ` [RFC][PATCH 3/12] clocksource management code john stultz @ 2005-10-14 2:12 ` john stultz 2005-10-14 2:14 ` [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:12 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, This patch implements my generic timeofday framework. This common infrastructure is intended to be used by any arch to reduce code duplication. Hopefully it will allow generic bugs to be fixed once. And with many architectures sharing the same time source, this allows drivers to be written once for multiple architectures. One major change with this code is that it delineate the lines between the soft-timer subsystem and the time-of-day subsystem, allowing for a 1:1 mapping between a hardware clocksource counter and the time of day. This allows for lost ticks or other software delays to not affect timekeeping. Included below is timeofday.c (which includes all the time of day management and accessor functions), and minimal hooks into arch independent code. This patch does not remove the current timekeeping code, allowing architectures to move over when they are ready. This patch applies on top of my clocksource managment patch. The patch does nothing without at least minimal architecture specific hooks (i386, x86-64 and other architecture examples to follow), and it should be able to be applied to a tree without affecting the existing code. thanks -john drivers/char/hangcheck-timer.c | 5 include/asm-generic/timeofday.h | 29 ++ include/linux/time.h | 4 include/linux/timeofday.h | 90 ++++++ include/linux/timex.h | 2 init/main.c | 2 kernel/Makefile | 1 kernel/time.c | 40 ++ kernel/timeofday.c | 558 ++++++++++++++++++++++++++++++++++++++++ kernel/timer.c | 4 10 files changed, 735 insertions(+) linux-2.6.14-rc4_timeofday-core_B7.patch ============================================ diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c @@ -49,6 +49,7 @@ #include <linux/delay.h> #include <asm/uaccess.h> #include <linux/sysrq.h> +#include <linux/timeofday.h> #define VERSION_STR "0.9.0" @@ -130,8 +131,12 @@ __setup("hcheck_dump_tasks", hangcheck_p #endif #ifdef HAVE_MONOTONIC +#ifndef CONFIG_GENERICTOD extern unsigned long long monotonic_clock(void); #else +#define monotonic_clock() do_monotonic_clock() +#endif +#else static inline unsigned long long monotonic_clock(void) { # ifdef __s390__ diff --git a/include/asm-generic/timeofday.h b/include/asm-generic/timeofday.h new file mode 100644 --- /dev/null +++ b/include/asm-generic/timeofday.h @@ -0,0 +1,29 @@ +/* linux/include/asm-generic/timeofday.h + * + * This file contains the asm-generic interface + * to the arch specific calls used by the time of day subsystem + */ +#ifndef _ASM_GENERIC_TIMEOFDAY_H +#define _ASM_GENERIC_TIMEOFDAY_H +#include <linux/types.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/timeofday.h> +#include <linux/clocksource.h> + +#include <asm/div64.h> +#ifdef CONFIG_GENERICTOD +/* Required externs */ +extern nsec_t read_persistent_clock(void); +extern void sync_persistent_clock(struct timespec ts); + +#ifdef CONFIG_GENERICTOD_VSYSCALL +extern void arch_update_vsyscall_gtod(struct timespec wall_time, + cycle_t offset_base, struct clocksource* clock, + int ntp_adj); +#else +#define arch_update_vsyscall_gtod(x,y,z,w) {} +#endif /* CONFIG_GENERICTOD_VSYSCALL */ + +#endif /* CONFIG_GENERICTOD */ +#endif diff --git a/include/linux/time.h b/include/linux/time.h --- a/include/linux/time.h +++ b/include/linux/time.h @@ -27,6 +27,10 @@ struct timezone { #ifdef __KERNEL__ +/* timeofday base types */ +typedef s64 nsec_t; +typedef unsigned long cycle_t; + /* Parameters used to convert the timespec values */ #define MSEC_PER_SEC (1000L) #define USEC_PER_SEC (1000000L) diff --git a/include/linux/timeofday.h b/include/linux/timeofday.h new file mode 100644 --- /dev/null +++ b/include/linux/timeofday.h @@ -0,0 +1,90 @@ +/* linux/include/linux/timeofday.h + * + * This file contains the interface to the time of day subsystem + */ +#ifndef _LINUX_TIMEOFDAY_H +#define _LINUX_TIMEOFDAY_H +#include <linux/types.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <asm/div64.h> + +#ifdef CONFIG_GENERICTOD +/* Public definitions */ +extern nsec_t do_monotonic_clock(void); +extern void do_gettimeofday(struct timeval *tv); +extern void getnstimeofday(struct timespec *ts); +extern int do_settimeofday(struct timespec *tv); +extern void timeofday_init(void); + +#ifndef div_long_long_rem +#define div_long_long_rem(dividend,divisor,remainder) ({ \ + u64 result = dividend; \ + *remainder = do_div(result,divisor); \ + result; }) + +#endif + +/* Inline helper functions */ +static inline struct timeval ns_to_timeval(nsec_t ns) +{ + struct timeval tv; + tv.tv_sec = div_long_long_rem(ns, NSEC_PER_SEC, &tv.tv_usec); + tv.tv_usec = (tv.tv_usec + NSEC_PER_USEC/2) / NSEC_PER_USEC; + return tv; +} + +static inline struct timespec ns_to_timespec(nsec_t ns) +{ + struct timespec ts; + ts.tv_sec = div_long_long_rem(ns, NSEC_PER_SEC, &ts.tv_nsec); + return ts; +} + +static inline nsec_t timespec_to_ns(struct timespec* ts) +{ + nsec_t ret; + ret = ((nsec_t)ts->tv_sec) * NSEC_PER_SEC; + ret += ts->tv_nsec; + return ret; +} + +static inline nsec_t timeval_to_ns(struct timeval* tv) +{ + nsec_t ret; + ret = ((nsec_t)tv->tv_sec) * NSEC_PER_SEC; + ret += tv->tv_usec * NSEC_PER_USEC; + return ret; +} + +static inline void normalize_timespec(struct timespec *ts) +{ + while ((unsigned long)ts->tv_nsec > NSEC_PER_SEC) { + ts->tv_nsec -= NSEC_PER_SEC; + ts->tv_sec++; + } +} + +static inline struct timespec timespec_add_ns(struct timespec a, nsec_t ns) +{ + while(ns > NSEC_PER_SEC) { + ns -= NSEC_PER_SEC; + a.tv_sec++; + } + a.tv_nsec += ns; + normalize_timespec(&a); + + return a; +} + + +#ifndef CONFIG_IS_TICK_BASED +#define arch_getoffset() (0) +#else +extern unsigned long arch_getoffset(void); +#endif + +#else /* CONFIG_GENERICTOD */ +#define timeofday_init() +#endif /* CONFIG_GENERICTOD */ +#endif /* _LINUX_TIMEOFDAY_H */ diff --git a/include/linux/timex.h b/include/linux/timex.h --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -313,6 +313,7 @@ int ntp_leapsecond(struct timespec now); __x < 0 ? -(-__x >> __s) : __x >> __s; \ }) +#ifndef CONFIG_GENERICTOD #ifdef CONFIG_TIME_INTERPOLATION @@ -368,6 +369,7 @@ time_interpolator_reset(void) } #endif /* !CONFIG_TIME_INTERPOLATION */ +#endif /* !CONFIG_GENERICTOD */ #endif /* KERNEL */ diff --git a/init/main.c b/init/main.c --- a/init/main.c +++ b/init/main.c @@ -47,6 +47,7 @@ #include <linux/rmap.h> #include <linux/mempolicy.h> #include <linux/key.h> +#include <linux/timeofday.h> #include <net/sock.h> #include <asm/io.h> @@ -486,6 +487,7 @@ asmlinkage void __init start_kernel(void pidhash_init(); init_timers(); softirq_init(); + timeofday_init(); time_init(); /* diff --git a/kernel/Makefile b/kernel/Makefile --- a/kernel/Makefile +++ b/kernel/Makefile @@ -9,6 +9,7 @@ obj-y = sched.o fork.o exec_domain.o rcupdate.o intermodule.o extable.o params.o posix-timers.o \ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o +obj-$(CONFIG_GENERICTOD) += timeofday.o clocksource.o obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o spinlock.o diff --git a/kernel/time.c b/kernel/time.c --- a/kernel/time.c +++ b/kernel/time.c @@ -38,6 +38,7 @@ #include <asm/uaccess.h> #include <asm/unistd.h> +#include <linux/timeofday.h> /* * The timezone where the local system is located. Used as a default by some @@ -128,6 +129,7 @@ asmlinkage long sys_gettimeofday(struct * as real UNIX machines always do it. This avoids all headaches about * daylight saving times and warping kernel clocks. */ +#ifndef CONFIG_GENERICTOD static inline void warp_clock(void) { write_seqlock_irq(&xtime_lock); @@ -137,6 +139,18 @@ static inline void warp_clock(void) write_sequnlock_irq(&xtime_lock); clock_was_set(); } +#else /* !CONFIG_GENERICTOD */ +/* XXX - this is somewhat cracked out and should + be checked -johnstul@us.ibm.com +*/ +static inline void warp_clock(void) +{ + struct timespec ts; + getnstimeofday(&ts); + ts.tv_sec += sys_tz.tz_minuteswest * 60; + do_settimeofday(&ts); +} +#endif /* !CONFIG_GENERICTOD */ /* * In case for some reason the CMOS clock has not already been running @@ -481,6 +495,7 @@ struct timespec timespec_trunc(struct ti } EXPORT_SYMBOL(timespec_trunc); +#ifndef CONFIG_GENERICTOD #ifdef CONFIG_TIME_INTERPOLATION void getnstimeofday (struct timespec *tv) { @@ -564,6 +579,31 @@ void getnstimeofday(struct timespec *tv) } #endif +/** + * do_monotonic_clock - Returns monotonically increasing nanoseconds + * + * Returns the monotonically increasing number of nanoseconds + * since the system booted. + */ +nsec_t do_monotonic_clock(void) +{ + struct timespec ts, mo; + unsigned int seq; + + do { + seq = read_seqbegin(&xtime_lock); + getnstimeofday(&ts); + mo = wall_to_monotonic; + } while(read_seqretry(&xtime_lock, seq)); + + ts.tv_sec += mo.tv_sec; + ts.tv_nsec += mo.tv_nsec; + + return ((u64)ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec; +} + +#endif /* !CONFIG_GENERICTOD */ + #if (BITS_PER_LONG < 64) u64 get_jiffies_64(void) { diff --git a/kernel/timeofday.c b/kernel/timeofday.c new file mode 100644 --- /dev/null +++ b/kernel/timeofday.c @@ -0,0 +1,558 @@ +/********************************************************************* +* linux/kernel/timeofday.c +* +* This file contains the functions which access and manage +* the system's time of day functionality. +* +* Copyright (C) 2003, 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* +* TODO WishList: +* o See XXX's below. +**********************************************************************/ + +#include <linux/timeofday.h> +#include <linux/clocksource.h> +#include <linux/timex.h> +#include <linux/timer.h> +#include <linux/module.h> +#include <linux/sched.h> /* Needed for capable() */ +#include <linux/sysdev.h> +#include <linux/jiffies.h> +#include <asm/timeofday.h> + +/* only run periodic_hook every 50ms */ +#define PERIODIC_INTERVAL_MS 50 + +/*[Nanosecond based variables] + * system_time: + * Monotonically increasing counter of the number of nanoseconds + * since boot. + * wall_time_offset: + * Offset added to system_time to provide accurate time-of-day + */ +static nsec_t system_time; +static nsec_t wall_time_offset; + +/*[timespec based variables] + * wall_time_ts: + * Timespec holding the current wall time. This is redundent + * but necessary because we have both nsec_t and timespec + * interfaces and the conversion between is costly. + * monotonic_time_offset_ts: + * Timespec used to keep wall_to_monotonic synced. Hopefully + * could be removed once wall_to_monotonic is killed. + */ +static struct timespec wall_time_ts; +static struct timespec monotonic_time_offset_ts; + +/*[Cycle based variables] + * cycle_last: + * Value of the clocksource at the last timeofday_periodic_hook() + * (adjusted only minorly to account for rounded off cycles) + */ +static cycle_t cycle_last; + +/* XXX this needs more comments */ +#define INTERVAL_LEN ((PERIODIC_INTERVAL_MS-1)*1000000) +struct clocksource_interval ts_interval; + +/*[Time source data] + * clocks: + * current clocksource pointer + */ +static struct clocksource *clock; + +/*[NTP adjustment] + * ntp_adj: + * value of the current ntp adjustment, + * stored in clocksource multiplier units. + */ +int ntp_adj; + +/*[Locks] + * system_time_lock: + * generic lock for all locally scoped time values + */ +static seqlock_t system_time_lock = SEQLOCK_UNLOCKED; + + +/*[Suspend/Resume info] + * time_suspend_state: + * variable that keeps track of suspend state + * suspend_start: + * start of the suspend call + */ +static enum { + TIME_RUNNING, + TIME_SUSPENDED +} time_suspend_state = TIME_RUNNING; + +static nsec_t suspend_start; + +/* [Soft-Timers] + * timeofday_timer: + * soft-timer used to call timeofday_periodic_hook() + */ +struct timer_list timeofday_timer; + + +/* [Functions] + */ + + +/** + * update_legacy_time_values - Used to sync legacy time values + * + * Private function. Used to sync legacy time values to + * current timeofday. Assumes we have the system_time_lock. + * Hopefully someday this function can be removed. + */ +static void update_legacy_time_values(void) +{ + unsigned long flags; + write_seqlock_irqsave(&xtime_lock, flags); + xtime = wall_time_ts; + wall_to_monotonic = monotonic_time_offset_ts; + write_sequnlock_irqrestore(&xtime_lock, flags); + + /* since time state has changed, notify vsyscall code */ + arch_update_vsyscall_gtod(wall_time_ts, cycle_last, + clock, ntp_adj); +} + + +/** + * __get_nsec_offset - Returns nanoseconds since last call to periodic_hook + * + * private function, must hold system_time_lock lock when being + * called. Returns the number of nanoseconds since the + * last call to timeofday_periodic_hook() (adjusted by NTP scaling) + */ +static inline nsec_t __get_nsec_offset(void) +{ + nsec_t ns_offset; + cycle_t cycle_now, cycle_delta; + + /* read clocksource */ + cycle_now = read_clocksource(clock); + + /* calculate the delta since the last timeofday_periodic_hook */ + cycle_delta = (cycle_now - cycle_last) & clock->mask; + + /* convert to nanoseconds */ + ns_offset = cyc2ns(clock, ntp_adj, cycle_delta); + + /* Special case for jiffies tick/offset based systems + * add arch specific offset + */ + ns_offset += arch_getoffset(); + + return ns_offset; +} + +/** + * __monotonic_clock - Returns monotonically increasing nanoseconds + * + * private function, must hold system_time_lock lock when being + * called. Returns the monotonically increasing number of + * nanoseconds since the system booted (adjusted by NTP scaling) + */ +static inline nsec_t __monotonic_clock(void) +{ + return system_time + __get_nsec_offset(); +} + + +/** + * do_monotonic_clock - Returns monotonically increasing nanoseconds + * + * Returns the monotonically increasing number of nanoseconds + * since the system booted via __monotonic_clock() + */ +nsec_t do_monotonic_clock(void) +{ + nsec_t ret; + unsigned long seq; + + /* atomically read __monotonic_clock() */ + do { + seq = read_seqbegin(&system_time_lock); + + ret = __monotonic_clock(); + + } while (read_seqretry(&system_time_lock, seq)); + + return ret; +} + + + +/** + * __getnstimeofday - Returns the time of day in a timespec + * @ts: pointer to the timespec to be set + * + * Returns the time of day in a timespec. Used by + * do_gettimeofday() and getnstimeofday(). + * + * XXX - For consistency should be renamed + * later to do_getnstimeofday() + */ +static inline void __getnstimeofday(struct timespec *ts) +{ + struct timespec now_ts; + nsec_t nsecs; + unsigned long seq; + + do { + seq = read_seqbegin(&system_time_lock); + + now_ts = wall_time_ts; + nsecs = __get_nsec_offset(); + + } while (read_seqretry(&system_time_lock, seq)); + + *ts = timespec_add_ns(now_ts, nsecs); +} + +/** + * getnstimeofday - Returns the time of day in a timespec + * @ts: pointer to the timespec to be set + * + * Returns the time of day in a timespec. + * + * XXX - For consistency should be renamed + * later to do_getnstimeofday() + */ +void getnstimeofday(struct timespec *ts) +{ + __getnstimeofday(ts); +} +EXPORT_SYMBOL(getnstimeofday); + + +/** + * do_gettimeofday - Returns the time of day in a timeval + * @tv: pointer to the timeval to be set + * + */ +void do_gettimeofday(struct timeval *tv) +{ + struct timespec now_ts; + __getnstimeofday(&now_ts); + tv->tv_sec = now_ts.tv_sec; + tv->tv_usec = now_ts.tv_nsec/1000; +} +EXPORT_SYMBOL(do_gettimeofday); + + +/** + * do_settimeofday - Sets the time of day + * @tv: pointer to the timespec that will be used to set the time + * + */ +int do_settimeofday(struct timespec *tv) +{ + unsigned long flags; + nsec_t newtime; + + newtime = timespec_to_ns(tv); + + write_seqlock_irqsave(&system_time_lock, flags); + + wall_time_offset = newtime - __monotonic_clock(); + + wall_time_ts = ns_to_timespec(system_time + wall_time_offset); + + monotonic_time_offset_ts = ns_to_timespec(wall_time_offset); + set_normalized_timespec(&monotonic_time_offset_ts, + -monotonic_time_offset_ts.tv_sec, -monotonic_time_offset_ts.tv_nsec); + + ntp_clear(); + + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* signal posix-timers about time change */ + clock_was_set(); + + return 0; +} +EXPORT_SYMBOL(do_settimeofday); + + +/** + * timeofday_suspend_hook - allows the timeofday subsystem to be shutdown + * @dev: unused + * state: unused + * + * This function allows the timeofday subsystem to + * be shutdown for a period of time. Usefull when + * going into suspend/hibernate mode. The code is + * very similar to the first half of + * timeofday_periodic_hook(). + */ +static int timeofday_suspend_hook(struct sys_device *dev, pm_message_t state) +{ + unsigned long flags; + + write_seqlock_irqsave(&system_time_lock, flags); + + BUG_ON(time_suspend_state != TIME_RUNNING); + + /* First off, save suspend start time + * then quickly call __monotonic_clock. + * These two calls hopefully occur quickly + * because the difference between reads will + * accumulate as time drift on resume. + */ + suspend_start = read_persistent_clock(); + system_time = __monotonic_clock(); + + time_suspend_state = TIME_SUSPENDED; + + write_sequnlock_irqrestore(&system_time_lock, flags); + return 0; +} + + +/** + * timeofday_resume_hook - Resumes the timeofday subsystem. + * @dev: unused + * + * This function resumes the timeofday subsystem + * from a previous call to timeofday_suspend_hook. + */ +static int timeofday_resume_hook(struct sys_device *dev) +{ + nsec_t suspend_end, suspend_time; + unsigned long flags; + + write_seqlock_irqsave(&system_time_lock, flags); + + BUG_ON(time_suspend_state != TIME_SUSPENDED); + + /* Read persistent clock to mark the end of + * the suspend interval then rebase the + * cycle_last to current clocksource value. + * Again, time between these two calls will + * not be accounted for and will show up as + * time drift. + */ + suspend_end = read_persistent_clock(); + cycle_last = read_clocksource(clock); + + suspend_time = suspend_end - suspend_start; + + system_time += suspend_time; + wall_time_ts = ns_to_timespec(system_time + wall_time_offset); + + ntp_clear(); + + time_suspend_state = TIME_RUNNING; + + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* signal posix-timers about time change */ + clock_was_set(); + + return 0; +} + +/* sysfs resume/suspend bits */ +static struct sysdev_class timeofday_sysclass = { + .resume = timeofday_resume_hook, + .suspend = timeofday_suspend_hook, + set_kset_name("timeofday"), +}; +static struct sys_device device_timer = { + .id = 0, + .cls = &timeofday_sysclass, +}; +static int timeofday_init_device(void) +{ + int error = sysdev_class_register(&timeofday_sysclass); + if (!error) + error = sysdev_register(&device_timer); + return error; +} +device_initcall(timeofday_init_device); + +/** + * timeofday_periodic_hook - Does periodic update of timekeeping values. + * unused: unused + * + * Calculates the delta since the last call, + * updates system time and clears the offset. + * + * Called via timeofday_timer. + */ +static void timeofday_periodic_hook(unsigned long unused) +{ + unsigned long flags; + + cycle_t cycle_now, cycle_delta; + nsec_t delta_nsec; + static u64 remainder; + + long leapsecond; + struct clocksource* next; + + int ppm; + static int ppm_last; + + int something_changed = 0; + struct clocksource old_clock; + static unsigned long second_check; + + write_seqlock_irqsave(&system_time_lock, flags); + + /* read time source & calc time since last call*/ + cycle_now = read_clocksource(clock); + cycle_delta = (cycle_now - cycle_last) & clock->mask; + + delta_nsec = cyc2ns_fixed_rem(ts_interval, &cycle_delta, &remainder); + cycle_last = (cycle_now - cycle_delta)&clock->mask; + + /* update system_time */ + system_time += delta_nsec; + wall_time_ts = timespec_add_ns(wall_time_ts, delta_nsec); + + /* advance the ntp state machine by ns interval*/ + ntp_advance(delta_nsec); + + /* Only call ntp_leapsecond and ntp_sync once a sec */ + second_check+= delta_nsec; + if(second_check > NSEC_PER_SEC) { + /* do ntp leap second processing*/ + leapsecond = ntp_leapsecond(wall_time_ts); + if (leapsecond) { + wall_time_offset += leapsecond * NSEC_PER_SEC; + wall_time_ts.tv_sec += leapsecond; + monotonic_time_offset_ts.tv_sec -= leapsecond; + } + /* sync the persistent clock */ + if (ntp_synced()) + sync_persistent_clock(wall_time_ts); + second_check -= NSEC_PER_SEC; + } + + /* if necessary, switch clocksources */ + next = get_next_clocksource(); + if (next != clock) { + /* immediately set new cycle_last */ + cycle_last = read_clocksource(next); + /* update cycle_now to avoid problems in accumulation later */ + cycle_now = cycle_last; + /* swap clocksources */ + old_clock = *clock; + clock = next; + printk(KERN_INFO "Time: %s clocksource has been installed.\n", + clock->name); + ntp_clear(); + ntp_adj = 0; + remainder = 0; + something_changed = 1; + } + + /* now is a safe time, so allow clocksource to adjust + * itself (for example: to make cpufreq changes). + */ + if(clock->update_callback) { + /* since clocksource state might change, keep a copy */ + old_clock = *clock; + if(clock->update_callback()) { + remainder = 0; + something_changed = 1; + } + } + + /* check for new PPM adjustment */ + ppm = ntp_get_ppm_adjustment(); + if (ppm_last != ppm) { + old_clock = *clock; + something_changed = 1; + } + + /* if something changed, recalculate the ntp adjustment value */ + if (something_changed) { + /* accumulate the current leftover cycles using old_timesoruce */ + if (cycle_delta) { + delta_nsec = cyc2ns_rem(&old_clock, ntp_adj, cycle_delta, &remainder); + system_time += delta_nsec; + wall_time_ts = timespec_add_ns(wall_time_ts, delta_nsec); + ntp_advance(delta_nsec); + cycle_last = cycle_now; + } + + /* recalculate the ntp adjustment and fixed interval values */ + ppm_last = ppm; + ntp_adj = ppm_to_mult_adj(clock, ppm); + ts_interval = calculate_clocksource_interval(clock, + ntp_adj, INTERVAL_LEN); + } + + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* Set us up to go off on the next interval */ + mod_timer(&timeofday_timer, + jiffies + msecs_to_jiffies(PERIODIC_INTERVAL_MS)); +} + + +/** + * timeofday_init - Initializes time variables + * + */ +void __init timeofday_init(void) +{ + unsigned long flags; + write_seqlock_irqsave(&system_time_lock, flags); + + /* initialize the clock variable */ + clock = get_next_clocksource(); + + /* clear and initialize offsets */ + cycle_last = read_clocksource(clock); + wall_time_offset = read_persistent_clock(); + wall_time_ts = ns_to_timespec(system_time + wall_time_offset); + monotonic_time_offset_ts = ns_to_timespec(wall_time_offset); + set_normalized_timespec(&monotonic_time_offset_ts, + -monotonic_time_offset_ts.tv_sec, -monotonic_time_offset_ts.tv_nsec); + + /* clear NTP scaling factor & state machine */ + ntp_adj = 0; + ntp_clear(); + ts_interval = calculate_clocksource_interval(clock, ntp_adj, INTERVAL_LEN); + + /* initialize legacy time values */ + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* Install timeofday_periodic_hook timer */ + init_timer(&timeofday_timer); + timeofday_timer.function = timeofday_periodic_hook; + timeofday_timer.expires = jiffies + 1; + add_timer(&timeofday_timer); + + return; +} diff --git a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c +++ b/kernel/timer.c @@ -840,6 +840,7 @@ void ntp_advance(unsigned long interval_ } +#ifndef CONFIG_GENERICTOD /* * Using a loop looks inefficient, but "ticks" is * usually just one (we shouldn't be losing ticks, @@ -891,6 +892,9 @@ static void update_wall_time(unsigned lo } while (ticks); } +#else /* !CONFIG_GENERICTOD */ +#define update_wall_time(x) +#endif /* !CONFIG_GENERICTOD */ /* * Called from the timer interrupt handler to charge one tick to the current ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 2005-10-14 2:12 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz @ 2005-10-14 2:14 ` john stultz 2005-10-14 2:15 ` [RFC][PATCH 6/12] generic timeofday i386 arch specific changes, part 2 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:14 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the first of six, is just a simple cleanup for the i386 arch in preperation of moving the the generic timeofday infrastructure. It simply moves some code from timer_pit.c to i8259.c. It applies on top of my timeofday-core patch. This patch is part the timeofday-arch-i386 patchset, so without the following parts it is not expected to compile (although just this one should). thanks -john i8259.c | 40 ++++++++++++++++++++++++++++++++++++++++ time.c | 1 - timers/timer_pit.c | 13 ------------- 3 files changed, 40 insertions(+), 14 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part1_B7.patch ============================================ diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c --- a/arch/i386/kernel/i8259.c +++ b/arch/i386/kernel/i8259.c @@ -23,6 +23,7 @@ #include <asm/apic.h> #include <asm/arch_hooks.h> #include <asm/i8259.h> +#include <asm/i8253.h> #include <io_ports.h> @@ -396,6 +397,45 @@ void __init init_ISA_irqs (void) } } +void setup_pit_timer(void) +{ + unsigned long flags; + + spin_lock_irqsave(&i8253_lock, flags); + outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + udelay(10); + outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ + udelay(10); + outb(LATCH >> 8 , PIT_CH0); /* MSB */ + spin_unlock_irqrestore(&i8253_lock, flags); +} + +static int timer_resume(struct sys_device *dev) +{ + setup_pit_timer(); + return 0; +} + +static struct sysdev_class timer_sysclass = { + set_kset_name("timer_pit"), + .resume = timer_resume, +}; + +static struct sys_device device_timer = { + .id = 0, + .cls = &timer_sysclass, +}; + +static int __init init_timer_sysfs(void) +{ + int error = sysdev_class_register(&timer_sysclass); + if (!error) + error = sysdev_register(&device_timer); + return error; +} + +device_initcall(init_timer_sysfs); + void __init init_IRQ(void) { int i; diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -404,7 +404,6 @@ static int timer_resume(struct sys_devic if (is_hpet_enabled()) hpet_reenable(); #endif - setup_pit_timer(); sec = get_cmos_time() + clock_cmos_diff; sleep_length = (get_cmos_time() - sleep_start) * HZ; write_seqlock_irqsave(&xtime_lock, flags); diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c --- a/arch/i386/kernel/timers/timer_pit.c +++ b/arch/i386/kernel/timers/timer_pit.c @@ -161,16 +161,3 @@ struct init_timer_opts __initdata timer_ .init = init_pit, .opts = &timer_pit, }; - -void setup_pit_timer(void) -{ - unsigned long flags; - - spin_lock_irqsave(&i8253_lock, flags); - outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ - udelay(10); - outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ - udelay(10); - outb(LATCH >> 8 , PIT_CH0); /* MSB */ - spin_unlock_irqrestore(&i8253_lock, flags); -} ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 6/12] generic timeofday i386 arch specific changes, part 2 2005-10-14 2:14 ` [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 john stultz @ 2005-10-14 2:15 ` john stultz 2005-10-14 2:16 ` [RFC][PATCH 7/12] generic timeofday i386 arch specific changes, part 3 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:15 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the second of six, is a cleanup patch for the i386 arch in preparation of moving the the generic timeofday infrastructure. It moves some code from timer_tsc.c to a new tsc.c file. It applies on top of my timeofday-arch-i386-part1 patch. This patch is part the timeofday-arch-i386 patchset, so without the following parts it is not expected to compile. thanks -john arch/i386/kernel/Makefile | 2 arch/i386/kernel/timers/common.c | 84 ---------- arch/i386/kernel/timers/timer_tsc.c | 207 ------------------------- arch/i386/kernel/tsc.c | 298 ++++++++++++++++++++++++++++++++++++ include/asm-i386/timex.h | 34 ---- include/asm-i386/tsc.h | 44 +++++ 6 files changed, 344 insertions(+), 325 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part2_B7.patch ============================================ diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ - doublefault.o quirks.o i8237.o + doublefault.o quirks.o i8237.o tsc.o obj-y += cpu/ obj-y += timers/ diff --git a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c --- a/arch/i386/kernel/timers/common.c +++ b/arch/i386/kernel/timers/common.c @@ -14,66 +14,6 @@ #include "mach_timer.h" -/* ------ Calibrate the TSC ------- - * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset(). - * Too much 64-bit arithmetic here to do this cleanly in C, and for - * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2) - * output busy loop as low as possible. We avoid reading the CTC registers - * directly because of the awkward 8-bit access mechanism of the 82C54 - * device. - */ - -#define CALIBRATE_TIME (5 * 1000020/HZ) - -unsigned long calibrate_tsc(void) -{ - mach_prepare_counter(); - - { - unsigned long startlow, starthigh; - unsigned long endlow, endhigh; - unsigned long count; - - rdtsc(startlow,starthigh); - mach_countup(&count); - rdtsc(endlow,endhigh); - - - /* Error: ECTCNEVERSET */ - if (count <= 1) - goto bad_ctc; - - /* 64-bit subtract - gcc just messes up with long longs */ - __asm__("subl %2,%0\n\t" - "sbbl %3,%1" - :"=a" (endlow), "=d" (endhigh) - :"g" (startlow), "g" (starthigh), - "0" (endlow), "1" (endhigh)); - - /* Error: ECPUTOOFAST */ - if (endhigh) - goto bad_ctc; - - /* Error: ECPUTOOSLOW */ - if (endlow <= CALIBRATE_TIME) - goto bad_ctc; - - __asm__("divl %2" - :"=a" (endlow), "=d" (endhigh) - :"r" (endlow), "0" (0), "1" (CALIBRATE_TIME)); - - return endlow; - } - - /* - * The CTC wasn't reliable: we got a hit on the very first read, - * or the CPU was so fast/slow that the quotient wouldn't fit in - * 32 bits.. - */ -bad_ctc: - return 0; -} - #ifdef CONFIG_HPET_TIMER /* ------ Calibrate the TSC using HPET ------- * Return 2^32 * (1 / (TSC clocks per usec)) for getting the CPU freq. @@ -146,27 +86,3 @@ unsigned long read_timer_tsc(void) rdtscl(retval); return retval; } - - -/* calculate cpu_khz */ -void init_cpu_khz(void) -{ - if (cpu_has_tsc) { - unsigned long tsc_quotient = calibrate_tsc(); - if (tsc_quotient) { - /* report CPU clock rate in Hz. - * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = - * clock/second. Our precision is about 100 ppm. - */ - { unsigned long eax=0, edx=1000; - __asm__("divl %2" - :"=a" (cpu_khz), "=d" (edx) - :"r" (tsc_quotient), - "0" (eax), "1" (edx)); - printk("Detected %u.%03u MHz processor.\n", - cpu_khz / 1000, cpu_khz % 1000); - } - } - } -} - diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c --- a/arch/i386/kernel/timers/timer_tsc.c +++ b/arch/i386/kernel/timers/timer_tsc.c @@ -32,10 +32,6 @@ static unsigned long hpet_last; static struct timer_opts timer_tsc; #endif -static inline void cpufreq_delayed_get(void); - -int tsc_disable __devinitdata = 0; - static int use_tsc; /* Number of usecs that the last interrupt was delayed */ static int delay_at_last_interrupt; @@ -45,34 +41,6 @@ static unsigned long last_tsc_high; /* m static unsigned long long monotonic_base; static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; -/* convert from cycles(64bits) => nanoseconds (64bits) - * basic equation: - * ns = cycles / (freq / ns_per_sec) - * ns = cycles * (ns_per_sec / freq) - * ns = cycles * (10^9 / (cpu_mhz * 10^6)) - * ns = cycles * (10^3 / cpu_mhz) - * - * Then we use scaling math (suggested by george@mvista.com) to get: - * ns = cycles * (10^3 * SC / cpu_mhz) / SC - * ns = cycles * cyc2ns_scale / SC - * - * And since SC is a constant power of two, we can convert the div - * into a shift. - * -johnstul@us.ibm.com "math is hard, lets go shopping!" - */ -static unsigned long cyc2ns_scale; -#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */ - -static inline void set_cyc2ns_scale(unsigned long cpu_mhz) -{ - cyc2ns_scale = (1000 << CYC2NS_SCALE_FACTOR)/cpu_mhz; -} - -static inline unsigned long long cycles_2_ns(unsigned long long cyc) -{ - return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR; -} - static int count2; /* counter for mark_offset_tsc() */ /* Cached *multiplier* to convert TSC counts to microseconds. @@ -130,29 +98,6 @@ static unsigned long long monotonic_cloc return base + cycles_2_ns(this_offset - last_offset); } -/* - * Scheduler clock - returns current time in nanosec units. - */ -unsigned long long sched_clock(void) -{ - unsigned long long this_offset; - - /* - * In the NUMA case we dont use the TSC as they are not - * synchronized across all CPUs. - */ -#ifndef CONFIG_NUMA - if (!use_tsc) -#endif - /* no locking but a rare wrong value is not a big deal */ - return jiffies_64 * (1000000000 / HZ); - - /* Read the Time Stamp Counter */ - rdtscll(this_offset); - - /* return the value in ns */ - return cycles_2_ns(this_offset); -} static void delay_tsc(unsigned long loops) { @@ -217,127 +162,6 @@ static void mark_offset_tsc_hpet(void) #endif -#ifdef CONFIG_CPU_FREQ -#include <linux/workqueue.h> - -static unsigned int cpufreq_delayed_issched = 0; -static unsigned int cpufreq_init = 0; -static struct work_struct cpufreq_delayed_get_work; - -static void handle_cpufreq_delayed_get(void *v) -{ - unsigned int cpu; - for_each_online_cpu(cpu) { - cpufreq_get(cpu); - } - cpufreq_delayed_issched = 0; -} - -/* if we notice lost ticks, schedule a call to cpufreq_get() as it tries - * to verify the CPU frequency the timing core thinks the CPU is running - * at is still correct. - */ -static inline void cpufreq_delayed_get(void) -{ - if (cpufreq_init && !cpufreq_delayed_issched) { - cpufreq_delayed_issched = 1; - printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n"); - schedule_work(&cpufreq_delayed_get_work); - } -} - -/* If the CPU frequency is scaled, TSC-based delays will need a different - * loops_per_jiffy value to function properly. - */ - -static unsigned int ref_freq = 0; -static unsigned long loops_per_jiffy_ref = 0; - -#ifndef CONFIG_SMP -static unsigned long fast_gettimeoffset_ref = 0; -static unsigned int cpu_khz_ref = 0; -#endif - -static int -time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, - void *data) -{ - struct cpufreq_freqs *freq = data; - - if (val != CPUFREQ_RESUMECHANGE) - write_seqlock_irq(&xtime_lock); - if (!ref_freq) { - ref_freq = freq->old; - loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy; -#ifndef CONFIG_SMP - fast_gettimeoffset_ref = fast_gettimeoffset_quotient; - cpu_khz_ref = cpu_khz; -#endif - } - - if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || - (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || - (val == CPUFREQ_RESUMECHANGE)) { - if (!(freq->flags & CPUFREQ_CONST_LOOPS)) - cpu_data[freq->cpu].loops_per_jiffy = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); -#ifndef CONFIG_SMP - if (cpu_khz) - cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq->new); - if (use_tsc) { - if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { - fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_ref, freq->new, ref_freq); - set_cyc2ns_scale(cpu_khz/1000); - } - } -#endif - } - - if (val != CPUFREQ_RESUMECHANGE) - write_sequnlock_irq(&xtime_lock); - - return 0; -} - -static struct notifier_block time_cpufreq_notifier_block = { - .notifier_call = time_cpufreq_notifier -}; - - -static int __init cpufreq_tsc(void) -{ - int ret; - INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL); - ret = cpufreq_register_notifier(&time_cpufreq_notifier_block, - CPUFREQ_TRANSITION_NOTIFIER); - if (!ret) - cpufreq_init = 1; - return ret; -} -core_initcall(cpufreq_tsc); - -#else /* CONFIG_CPU_FREQ */ -static inline void cpufreq_delayed_get(void) { return; } -#endif - -int recalibrate_cpu_khz(void) -{ -#ifndef CONFIG_SMP - unsigned int cpu_khz_old = cpu_khz; - - if (cpu_has_tsc) { - init_cpu_khz(); - cpu_data[0].loops_per_jiffy = - cpufreq_scale(cpu_data[0].loops_per_jiffy, - cpu_khz_old, - cpu_khz); - return 0; - } else - return -ENODEV; -#else - return -ENODEV; -#endif -} -EXPORT_SYMBOL(recalibrate_cpu_khz); static void mark_offset_tsc(void) { @@ -543,37 +367,6 @@ static int __init init_tsc(char* overrid return -ENODEV; } -static int tsc_resume(void) -{ - write_seqlock(&monotonic_lock); - /* Assume this is the last mark offset time */ - rdtsc(last_tsc_low, last_tsc_high); -#ifdef CONFIG_HPET_TIMER - if (is_hpet_enabled() && hpet_use_timer) - hpet_last = hpet_readl(HPET_COUNTER); -#endif - write_sequnlock(&monotonic_lock); - return 0; -} - -#ifndef CONFIG_X86_TSC -/* disable flag for tsc. Takes effect by clearing the TSC cpu flag - * in cpu/common.c */ -static int __init tsc_setup(char *str) -{ - tsc_disable = 1; - return 1; -} -#else -static int __init tsc_setup(char *str) -{ - printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " - "cannot disable TSC.\n"); - return 1; -} -#endif -__setup("notsc", tsc_setup); - /************************************************************/ diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c new file mode 100644 --- /dev/null +++ b/arch/i386/kernel/tsc.c @@ -0,0 +1,298 @@ +/* + * This code largely moved from arch/i386/kernel/timer/timer_tsc.c + * which was originally moved from arch/i386/kernel/time.c. + * See comments there for proper credits. + */ + +#include <linux/init.h> +#include <linux/timex.h> +#include <linux/cpufreq.h> +#include <asm/io.h> +#include "mach_timer.h" + +int tsc_disable __initdata = 0; +#ifndef CONFIG_X86_TSC +/* disable flag for tsc. Takes effect by clearing the TSC cpu flag + * in cpu/common.c */ +static int __init tsc_setup(char *str) +{ + tsc_disable = 1; + return 1; +} +#else +static int __init tsc_setup(char *str) +{ + printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, " + "cannot disable TSC.\n"); + return 1; +} +#endif +__setup("notsc", tsc_setup); + + +int read_current_timer(unsigned long *timer_val) +{ + if (cur_timer->read_timer) { + *timer_val = cur_timer->read_timer(); + return 0; + } + return -1; +} + + +/* convert from cycles(64bits) => nanoseconds (64bits) + * basic equation: + * ns = cycles / (freq / ns_per_sec) + * ns = cycles * (ns_per_sec / freq) + * ns = cycles * (10^9 / (cpu_mhz * 10^6)) + * ns = cycles * (10^3 / cpu_mhz) + * + * Then we use scaling math (suggested by george@mvista.com) to get: + * ns = cycles * (10^3 * SC / cpu_mhz) / SC + * ns = cycles * cyc2ns_scale / SC + * + * And since SC is a constant power of two, we can convert the div + * into a shift. + * -johnstul@us.ibm.com "math is hard, lets go shopping!" + */ +static unsigned long cyc2ns_scale; +#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */ + +static inline void set_cyc2ns_scale(unsigned long cpu_mhz) +{ + cyc2ns_scale = (1000 << CYC2NS_SCALE_FACTOR)/cpu_mhz; +} + +static inline unsigned long long cycles_2_ns(unsigned long long cyc) +{ + return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR; +} + +/* + * Scheduler clock - returns current time in nanosec units. + */ +unsigned long long sched_clock(void) +{ + unsigned long long this_offset; + + /* + * In the NUMA case we dont use the TSC as they are not + * synchronized across all CPUs. + */ +#ifndef CONFIG_NUMA + if (!use_tsc) +#endif + /* no locking but a rare wrong value is not a big deal */ + return jiffies_64 * (1000000000 / HZ); + + /* Read the Time Stamp Counter */ + rdtscll(this_offset); + + /* return the value in ns */ + return cycles_2_ns(this_offset); +} + +/* ------ Calibrate the TSC ------- + * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset(). + * Too much 64-bit arithmetic here to do this cleanly in C, and for + * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2) + * output busy loop as low as possible. We avoid reading the CTC registers + * directly because of the awkward 8-bit access mechanism of the 82C54 + * device. + */ + +#define CALIBRATE_TIME (5 * 1000020/HZ) + +unsigned long calibrate_tsc(void) +{ + mach_prepare_counter(); + + { + unsigned long startlow, starthigh; + unsigned long endlow, endhigh; + unsigned long count; + + rdtsc(startlow,starthigh); + mach_countup(&count); + rdtsc(endlow,endhigh); + + + /* Error: ECTCNEVERSET */ + if (count <= 1) + goto bad_ctc; + + /* 64-bit subtract - gcc just messes up with long longs */ + __asm__("subl %2,%0\n\t" + "sbbl %3,%1" + :"=a" (endlow), "=d" (endhigh) + :"g" (startlow), "g" (starthigh), + "0" (endlow), "1" (endhigh)); + + /* Error: ECPUTOOFAST */ + if (endhigh) + goto bad_ctc; + + /* Error: ECPUTOOSLOW */ + if (endlow <= CALIBRATE_TIME) + goto bad_ctc; + + __asm__("divl %2" + :"=a" (endlow), "=d" (endhigh) + :"r" (endlow), "0" (0), "1" (CALIBRATE_TIME)); + + return endlow; + } + + /* + * The CTC wasn't reliable: we got a hit on the very first read, + * or the CPU was so fast/slow that the quotient wouldn't fit in + * 32 bits.. + */ +bad_ctc: + return 0; +} + +int recalibrate_cpu_khz(void) +{ +#ifndef CONFIG_SMP + unsigned long cpu_khz_old = cpu_khz; + + if (cpu_has_tsc) { + init_cpu_khz(); + cpu_data[0].loops_per_jiffy = + cpufreq_scale(cpu_data[0].loops_per_jiffy, + cpu_khz_old, + cpu_khz); + return 0; + } else + return -ENODEV; +#else + return -ENODEV; +#endif +} +EXPORT_SYMBOL(recalibrate_cpu_khz); + + +/* calculate cpu_khz */ +void init_cpu_khz(void) +{ + if (cpu_has_tsc) { + unsigned long tsc_quotient = calibrate_tsc(); + if (tsc_quotient) { + /* report CPU clock rate in Hz. + * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = + * clock/second. Our precision is about 100 ppm. + */ + { unsigned long eax=0, edx=1000; + __asm__("divl %2" + :"=a" (cpu_khz), "=d" (edx) + :"r" (tsc_quotient), + "0" (eax), "1" (edx)); + printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); + } + } + } +} + + +#ifdef CONFIG_CPU_FREQ +#include <linux/workqueue.h> + +static unsigned int cpufreq_delayed_issched = 0; +static unsigned int cpufreq_init = 0; +static struct work_struct cpufreq_delayed_get_work; + +static void handle_cpufreq_delayed_get(void *v) +{ + unsigned int cpu; + for_each_online_cpu(cpu) { + cpufreq_get(cpu); + } + cpufreq_delayed_issched = 0; +} + +/* if we notice lost ticks, schedule a call to cpufreq_get() as it tries + * to verify the CPU frequency the timing core thinks the CPU is running + * at is still correct. + */ +void cpufreq_delayed_get(void) +{ + if (cpufreq_init && !cpufreq_delayed_issched) { + cpufreq_delayed_issched = 1; + printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n"); + schedule_work(&cpufreq_delayed_get_work); + } +} + +/* If the CPU frequency is scaled, TSC-based delays will need a different + * loops_per_jiffy value to function properly. + */ + +static unsigned int ref_freq = 0; +static unsigned long loops_per_jiffy_ref = 0; + +#ifndef CONFIG_SMP +static unsigned long fast_gettimeoffset_ref = 0; +static unsigned long cpu_khz_ref = 0; +#endif + +static int +time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, + void *data) +{ + struct cpufreq_freqs *freq = data; + + if (val != CPUFREQ_RESUMECHANGE) + write_seqlock_irq(&xtime_lock); + if (!ref_freq) { + ref_freq = freq->old; + loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy; +#ifndef CONFIG_SMP + fast_gettimeoffset_ref = fast_gettimeoffset_quotient; + cpu_khz_ref = cpu_khz; +#endif + } + + if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) || + (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || + (val == CPUFREQ_RESUMECHANGE)) { + if (!(freq->flags & CPUFREQ_CONST_LOOPS)) + cpu_data[freq->cpu].loops_per_jiffy = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); +#ifndef CONFIG_SMP + if (cpu_khz) + cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq->new); + if (use_tsc) { + if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { + fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_ref, freq->new, ref_freq); + set_cyc2ns_scale(cpu_khz/1000); + } + } +#endif + } + + if (val != CPUFREQ_RESUMECHANGE) + write_sequnlock_irq(&xtime_lock); + + return 0; +} + +static struct notifier_block time_cpufreq_notifier_block = { + .notifier_call = time_cpufreq_notifier +}; + + +static int __init cpufreq_tsc(void) +{ + int ret; + INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get, NULL); + ret = cpufreq_register_notifier(&time_cpufreq_notifier_block, + CPUFREQ_TRANSITION_NOTIFIER); + if (!ret) + cpufreq_init = 1; + return ret; +} +core_initcall(cpufreq_tsc); + +#else /* CONFIG_CPU_FREQ */ +void cpufreq_delayed_get(void) { return; } +#endif diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h --- a/include/asm-i386/timex.h +++ b/include/asm-i386/timex.h @@ -8,6 +8,7 @@ #include <linux/config.h> #include <asm/processor.h> +#include <asm/tsc.h> #ifdef CONFIG_X86_ELAN # define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */ @@ -16,39 +17,6 @@ #endif -/* - * Standard way to access the cycle counter on i586+ CPUs. - * Currently only used on SMP. - * - * If you really have a SMP machine with i486 chips or older, - * compile for that, and this will just always return zero. - * That's ok, it just means that the nicer scheduling heuristics - * won't work for you. - * - * We only use the low 32 bits, and we'd simply better make sure - * that we reschedule before that wraps. Scheduling at least every - * four billion cycles just basically sounds like a good idea, - * regardless of how fast the machine is. - */ -typedef unsigned long long cycles_t; - -static inline cycles_t get_cycles (void) -{ - unsigned long long ret=0; - -#ifndef CONFIG_X86_TSC - if (!cpu_has_tsc) - return 0; -#endif - -#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC) - rdtscll(ret); -#endif - return ret; -} - -extern unsigned int cpu_khz; - extern int read_current_timer(unsigned long *timer_value); #define ARCH_HAS_READ_CURRENT_TIMER 1 diff --git a/include/asm-i386/tsc.h b/include/asm-i386/tsc.h new file mode 100644 --- /dev/null +++ b/include/asm-i386/tsc.h @@ -0,0 +1,44 @@ +/* + * linux/include/asm-i386/tsc.h + * + * i386 TSC related functions + */ +#ifndef _ASM_i386_TSC_H +#define _ASM_i386_TSC_H + +#include <linux/config.h> +#include <asm/processor.h> + +/* + * Standard way to access the cycle counter on i586+ CPUs. + * Currently only used on SMP. + * + * If you really have a SMP machine with i486 chips or older, + * compile for that, and this will just always return zero. + * That's ok, it just means that the nicer scheduling heuristics + * won't work for you. + * + * We only use the low 32 bits, and we'd simply better make sure + * that we reschedule before that wraps. Scheduling at least every + * four billion cycles just basically sounds like a good idea, + * regardless of how fast the machine is. + */ +typedef unsigned long long cycles_t; + +static inline cycles_t get_cycles (void) +{ + unsigned long long ret=0; + +#ifndef CONFIG_X86_TSC + if (!cpu_has_tsc) + return 0; +#endif + +#if defined(CONFIG_X86_GENERIC) || defined(CONFIG_X86_TSC) + rdtscll(ret); +#endif + return ret; +} + +extern unsigned int cpu_khz; +#endif ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 7/12] generic timeofday i386 arch specific changes, part 3 2005-10-14 2:15 ` [RFC][PATCH 6/12] generic timeofday i386 arch specific changes, part 2 john stultz @ 2005-10-14 2:16 ` john stultz 2005-10-14 2:19 ` [RFC][PATCH 8/12] generic timeofday i386 arch specific changes, part 4 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:16 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the third of six, reworks some of the code in the new tsc.c file, adding some new interfaces and hooks to use these new interfaces appropriately. It applies on top of my timeofday-arch-i386-part2 patch. This patch is part the timeofday-arch-i386 patchset, so without the following parts it is not expected to compile. thanks -john arch/i386/kernel/setup.c | 1 arch/i386/kernel/tsc.c | 192 ++++++++++++++-------------- drivers/acpi/processor_idle.c | 6 include/asm-i386/mach-default/mach_timer.h | 4 include/asm-i386/mach-summit/mach_mpparse.h | 2 include/asm-i386/tsc.h | 6 6 files changed, 118 insertions(+), 93 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part3_B7.patch ============================================ diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -1612,6 +1612,7 @@ void __init setup_arch(char **cmdline_p) conswitchp = &dummy_con; #endif #endif + tsc_init(); } #include "setup_arch_post.h" diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c @@ -5,11 +5,17 @@ */ #include <linux/init.h> -#include <linux/timex.h> #include <linux/cpufreq.h> +#include <asm/tsc.h> #include <asm/io.h> #include "mach_timer.h" +/* On some systems the TSC frequency does not + * change with the cpu frequency. So we need + * an extra value to store the TSC freq + */ +unsigned int tsc_khz; + int tsc_disable __initdata = 0; #ifndef CONFIG_X86_TSC /* disable flag for tsc. Takes effect by clearing the TSC cpu flag @@ -32,15 +38,42 @@ __setup("notsc", tsc_setup); int read_current_timer(unsigned long *timer_val) { - if (cur_timer->read_timer) { - *timer_val = cur_timer->read_timer(); + if (!tsc_disable && cpu_khz) { + rdtscl(*timer_val); return 0; } return -1; } +/* Code to mark and check if the TSC is unstable + * due to cpufreq or due to unsynced TSCs + */ +static int tsc_unstable; +int check_tsc_unstable(void) +{ + return tsc_unstable; +} + +void mark_tsc_unstable(void) +{ + tsc_unstable = 1; +} + +/* Code to compensate for C3 stalls */ +static u64 tsc_c3_offset; +void tsc_c3_compensate(unsigned long usecs) +{ + u64 cycles = (usecs * tsc_khz)/1000; + tsc_c3_offset += cycles; +} + +u64 tsc_read_c3_time(void) +{ + return tsc_c3_offset; +} -/* convert from cycles(64bits) => nanoseconds (64bits) +/* Accellerators for sched_clock() + * convert from cycles(64bits) => nanoseconds (64bits) * basic equation: * ns = cycles / (freq / ns_per_sec) * ns = cycles * (ns_per_sec / freq) @@ -80,76 +113,54 @@ unsigned long long sched_clock(void) * synchronized across all CPUs. */ #ifndef CONFIG_NUMA - if (!use_tsc) + if (!cpu_khz || check_tsc_unstable()) #endif /* no locking but a rare wrong value is not a big deal */ - return jiffies_64 * (1000000000 / HZ); + return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); /* Read the Time Stamp Counter */ rdtscll(this_offset); + this_offset += tsc_read_c3_time(); /* return the value in ns */ return cycles_2_ns(this_offset); } -/* ------ Calibrate the TSC ------- - * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset(). - * Too much 64-bit arithmetic here to do this cleanly in C, and for - * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2) - * output busy loop as low as possible. We avoid reading the CTC registers - * directly because of the awkward 8-bit access mechanism of the 82C54 - * device. - */ - -#define CALIBRATE_TIME (5 * 1000020/HZ) -unsigned long calibrate_tsc(void) +static unsigned long calculate_cpu_khz(void) { - mach_prepare_counter(); - - { - unsigned long startlow, starthigh; - unsigned long endlow, endhigh; - unsigned long count; - - rdtsc(startlow,starthigh); + unsigned long long start, end; + unsigned long count; + u64 delta64; + int i; + /* run 3 times to ensure the cache is warm */ + for(i=0; i<3; i++) { + mach_prepare_counter(); + rdtscll(start); mach_countup(&count); - rdtsc(endlow,endhigh); - - - /* Error: ECTCNEVERSET */ - if (count <= 1) - goto bad_ctc; - - /* 64-bit subtract - gcc just messes up with long longs */ - __asm__("subl %2,%0\n\t" - "sbbl %3,%1" - :"=a" (endlow), "=d" (endhigh) - :"g" (startlow), "g" (starthigh), - "0" (endlow), "1" (endhigh)); - - /* Error: ECPUTOOFAST */ - if (endhigh) - goto bad_ctc; - - /* Error: ECPUTOOSLOW */ - if (endlow <= CALIBRATE_TIME) - goto bad_ctc; - - __asm__("divl %2" - :"=a" (endlow), "=d" (endhigh) - :"r" (endlow), "0" (0), "1" (CALIBRATE_TIME)); - - return endlow; + rdtscll(end); } - - /* + /* Error: ECTCNEVERSET * The CTC wasn't reliable: we got a hit on the very first read, * or the CPU was so fast/slow that the quotient wouldn't fit in * 32 bits.. */ -bad_ctc: - return 0; + if (count <= 1) + return 0; + + delta64 = end - start; + + /* cpu freq too fast */ + if(delta64 > (1ULL<<32)) + return 0; + /* cpu freq too slow */ + if (delta64 <= CALIBRATE_TIME_MSEC) + return 0; + + delta64 += CALIBRATE_TIME_MSEC/2; /* round for do_div */ + do_div(delta64,CALIBRATE_TIME_MSEC); + + return (unsigned long)delta64; } int recalibrate_cpu_khz(void) @@ -158,11 +169,11 @@ int recalibrate_cpu_khz(void) unsigned long cpu_khz_old = cpu_khz; if (cpu_has_tsc) { - init_cpu_khz(); + cpu_khz = calculate_cpu_khz(); + tsc_khz = cpu_khz; cpu_data[0].loops_per_jiffy = - cpufreq_scale(cpu_data[0].loops_per_jiffy, - cpu_khz_old, - cpu_khz); + cpufreq_scale(cpu_data[0].loops_per_jiffy, + cpu_khz_old, cpu_khz); return 0; } else return -ENODEV; @@ -173,25 +184,22 @@ int recalibrate_cpu_khz(void) EXPORT_SYMBOL(recalibrate_cpu_khz); -/* calculate cpu_khz */ -void init_cpu_khz(void) +void tsc_init(void) { - if (cpu_has_tsc) { - unsigned long tsc_quotient = calibrate_tsc(); - if (tsc_quotient) { - /* report CPU clock rate in Hz. - * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = - * clock/second. Our precision is about 100 ppm. - */ - { unsigned long eax=0, edx=1000; - __asm__("divl %2" - :"=a" (cpu_khz), "=d" (edx) - :"r" (tsc_quotient), - "0" (eax), "1" (edx)); - printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); - } - } - } + if(!cpu_has_tsc || tsc_disable) + return; + + cpu_khz = calculate_cpu_khz(); + tsc_khz = cpu_khz; + + if (!cpu_khz) + return; + + printk("Detected %lu.%03lu MHz processor.\n", + (unsigned long)cpu_khz / 1000, + (unsigned long)cpu_khz % 1000); + + set_cyc2ns_scale(cpu_khz/1000); } @@ -211,15 +219,15 @@ static void handle_cpufreq_delayed_get(v cpufreq_delayed_issched = 0; } -/* if we notice lost ticks, schedule a call to cpufreq_get() as it tries +/* if we notice cpufreq oddness, schedule a call to cpufreq_get() as it tries * to verify the CPU frequency the timing core thinks the CPU is running * at is still correct. */ -void cpufreq_delayed_get(void) +static inline void cpufreq_delayed_get(void) { if (cpufreq_init && !cpufreq_delayed_issched) { cpufreq_delayed_issched = 1; - printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n"); + printk(KERN_DEBUG "Checking if CPU frequency changed.\n"); schedule_work(&cpufreq_delayed_get_work); } } @@ -232,13 +240,11 @@ static unsigned int ref_freq = 0; static unsigned long loops_per_jiffy_ref = 0; #ifndef CONFIG_SMP -static unsigned long fast_gettimeoffset_ref = 0; static unsigned long cpu_khz_ref = 0; #endif -static int -time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, - void *data) +static int time_cpufreq_notifier(struct notifier_block *nb, + unsigned long val, void *data) { struct cpufreq_freqs *freq = data; @@ -248,7 +254,6 @@ time_cpufreq_notifier(struct notifier_bl ref_freq = freq->old; loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy; #ifndef CONFIG_SMP - fast_gettimeoffset_ref = fast_gettimeoffset_quotient; cpu_khz_ref = cpu_khz; #endif } @@ -258,16 +263,20 @@ time_cpufreq_notifier(struct notifier_bl (val == CPUFREQ_RESUMECHANGE)) { if (!(freq->flags & CPUFREQ_CONST_LOOPS)) cpu_data[freq->cpu].loops_per_jiffy = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); + + if (cpu_khz) { #ifndef CONFIG_SMP - if (cpu_khz) cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq->new); - if (use_tsc) { +#endif if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { - fast_gettimeoffset_quotient = cpufreq_scale(fast_gettimeoffset_ref, freq->new, ref_freq); + tsc_khz = cpu_khz; set_cyc2ns_scale(cpu_khz/1000); + /* TSC based sched_clock turns + * to junk w/ cpufreq + */ + mark_tsc_unstable(); } } -#endif } if (val != CPUFREQ_RESUMECHANGE) @@ -289,10 +298,9 @@ static int __init cpufreq_tsc(void) CPUFREQ_TRANSITION_NOTIFIER); if (!ret) cpufreq_init = 1; + return ret; } core_initcall(cpufreq_tsc); -#else /* CONFIG_CPU_FREQ */ -void cpufreq_delayed_get(void) { return; } #endif diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -166,6 +166,7 @@ acpi_processor_power_activate(struct acp return; } +extern void tsc_c3_compensate(unsigned long usecs); static atomic_t c3_cpu_count; static void acpi_processor_idle(void) @@ -334,6 +335,11 @@ static void acpi_processor_idle(void) ACPI_MTX_DO_NOT_LOCK); } +#ifdef CONFIG_GENERICTOD + /* compensate for TSC pause */ + tsc_c3_compensate((((t2-t1)&0xFFFFFF)*286)>>10); +#endif + /* Re-enable interrupts */ local_irq_enable(); /* Compute time (ticks) that we were actually asleep */ diff --git a/include/asm-i386/mach-default/mach_timer.h b/include/asm-i386/mach-default/mach_timer.h --- a/include/asm-i386/mach-default/mach_timer.h +++ b/include/asm-i386/mach-default/mach_timer.h @@ -15,7 +15,9 @@ #ifndef _MACH_TIMER_H #define _MACH_TIMER_H -#define CALIBRATE_LATCH (5 * LATCH) +#define CALIBRATE_TIME_MSEC 30 /* 30 msecs */ +#define CALIBRATE_LATCH \ + ((CLOCK_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000) static inline void mach_prepare_counter(void) { diff --git a/include/asm-i386/mach-summit/mach_mpparse.h b/include/asm-i386/mach-summit/mach_mpparse.h --- a/include/asm-i386/mach-summit/mach_mpparse.h +++ b/include/asm-i386/mach-summit/mach_mpparse.h @@ -30,6 +30,7 @@ static inline int mps_oem_check(struct m (!strncmp(productid, "VIGIL SMP", 9) || !strncmp(productid, "EXA", 3) || !strncmp(productid, "RUTHLESS SMP", 12))){ + mark_tsc_unstable(); use_cyclone = 1; /*enable cyclone-timer*/ setup_summit(); usb_early_handoff = 1; @@ -44,6 +45,7 @@ static inline int acpi_madt_oem_check(ch if (!strncmp(oem_id, "IBM", 3) && (!strncmp(oem_table_id, "SERVIGIL", 8) || !strncmp(oem_table_id, "EXA", 3))){ + mark_tsc_unstable(); use_cyclone = 1; /*enable cyclone-timer*/ setup_summit(); usb_early_handoff = 1; diff --git a/include/asm-i386/tsc.h b/include/asm-i386/tsc.h --- a/include/asm-i386/tsc.h +++ b/include/asm-i386/tsc.h @@ -41,4 +41,10 @@ static inline cycles_t get_cycles (void) } extern unsigned int cpu_khz; +extern unsigned int tsc_khz; +extern void tsc_init(void); +void tsc_c3_compensate(unsigned long usecs); +u64 tsc_read_c3_time(void); +extern int check_tsc_unstable(void); +extern void mark_tsc_unstable(void); #endif ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 8/12] generic timeofday i386 arch specific changes, part 4 2005-10-14 2:16 ` [RFC][PATCH 7/12] generic timeofday i386 arch specific changes, part 3 john stultz @ 2005-10-14 2:19 ` john stultz 2005-10-14 2:20 ` [RFC][PATCH 9/12] generic timeofday i386 arch specific changes, part 5 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:19 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the fourth of six, renames some ACPI PM variables. It applies on top of my timeofday-arch-i386-part3 patch. This patch is part the timeofday-arch-i386 patchset, so without the following parts it is not expected to compile. thanks -john boot.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part4_B7.patch ============================================ diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -612,7 +612,8 @@ static int __init acpi_parse_hpet(unsign #endif #ifdef CONFIG_X86_PM_TIMER -extern u32 pmtmr_ioport; +u32 acpi_pmtmr_ioport; +int acpi_pmtmr_buggy; #endif static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) @@ -640,14 +641,15 @@ static int __init acpi_parse_fadt(unsign ACPI_ADR_SPACE_SYSTEM_IO) return 0; - pmtmr_ioport = fadt->xpm_tmr_blk.address; + acpi_pmtmr_ioport = fadt->xpm_tmr_blk.address; } else { /* FADT rev. 1 */ - pmtmr_ioport = fadt->V1_pm_tmr_blk; + acpi_pmtmr_ioport = fadt->V1_pm_tmr_blk; } - if (pmtmr_ioport) - printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", - pmtmr_ioport); + + if (acpi_pmtmr_ioport) + printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", acpi_pmtmr_ioport); + #endif return 0; } ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 9/12] generic timeofday i386 arch specific changes, part 5 2005-10-14 2:19 ` [RFC][PATCH 8/12] generic timeofday i386 arch specific changes, part 4 john stultz @ 2005-10-14 2:20 ` john stultz 2005-10-14 2:21 ` [RFC][PATCH 10/12] generic timeofday i386 arch specific changes, part 6 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:20 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the fifth of six, converts the i386 arch to use the generic timeofday subsystem. It applies on top of my timeofday-arch-i386-part4 patch. This patch is the last in the the timeofday-arch-i386 patchset, so you should be able to build and boot a kernel after it has been applied. Note that this patch does not provide any i386 clocksource, so you will only have the jiffies clocksource. To get full replacements for the code being removed here, the following timeofday-clocks-i386 patch will need to be applied. thanks -john arch/i386/Kconfig | 4 arch/i386/kernel/Makefile | 1 arch/i386/kernel/time.c | 219 ++++++------------------------------------- arch/i386/lib/delay.c | 16 ++- include/asm-i386/timeofday.h | 4 include/asm-i386/timer.h | 57 ----------- 6 files changed, 55 insertions(+), 246 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part5_B7.patch ============================================ diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -14,6 +14,10 @@ config X86 486, 586, Pentiums, and various instruction-set-compatible chips by AMD, Cyrix, and others. +config GENERICTOD + bool + default y + config SEMAPHORE_SLEEPERS bool default y diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -10,7 +10,6 @@ obj-y := process.o semaphore.o signal.o doublefault.o quirks.o i8237.o tsc.o obj-y += cpu/ -obj-y += timers/ obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o obj-$(CONFIG_MCA) += mca.o diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -56,6 +56,7 @@ #include <asm/uaccess.h> #include <asm/processor.h> #include <asm/timer.h> +#include <asm/timeofday.h> #include "mach_time.h" @@ -91,8 +92,6 @@ EXPORT_SYMBOL(rtc_lock); DEFINE_SPINLOCK(i8253_lock); EXPORT_SYMBOL(i8253_lock); -struct timer_opts *cur_timer __read_mostly = &timer_none; - /* * This is a special lock that is owned by the CPU and holds the index * register we are working with. It is required for NMI access to the @@ -122,99 +121,19 @@ void rtc_cmos_write(unsigned char val, u } EXPORT_SYMBOL(rtc_cmos_write); -/* - * This version of gettimeofday has microsecond resolution - * and better than microsecond precision on fast x86 machines with TSC. - */ -void do_gettimeofday(struct timeval *tv) -{ - unsigned long seq; - unsigned long usec, sec; - unsigned long max_ntp_tick; - - do { - unsigned long lost; - - seq = read_seqbegin(&xtime_lock); - - usec = cur_timer->get_offset(); - lost = jiffies - wall_jiffies; - - /* - * If time_adjust is negative then NTP is slowing the clock - * so make sure not to go into next possible interval. - * Better to lose some accuracy than have time go backwards.. - */ - if (unlikely(time_adjust < 0)) { - max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj; - usec = min(usec, max_ntp_tick); - - if (lost) - usec += lost * max_ntp_tick; - } - else if (unlikely(lost)) - usec += lost * (USEC_PER_SEC / HZ); - - sec = xtime.tv_sec; - usec += (xtime.tv_nsec / 1000); - } while (read_seqretry(&xtime_lock, seq)); - - while (usec >= 1000000) { - usec -= 1000000; - sec++; - } - - tv->tv_sec = sec; - tv->tv_usec = usec; -} - -EXPORT_SYMBOL(do_gettimeofday); - -int do_settimeofday(struct timespec *tv) -{ - time_t wtm_sec, sec = tv->tv_sec; - long wtm_nsec, nsec = tv->tv_nsec; - - if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) - return -EINVAL; - - write_seqlock_irq(&xtime_lock); - /* - * This is revolting. We need to set "xtime" correctly. However, the - * value in this location is the value at the most recent update of - * wall time. Discover what correction gettimeofday() would have - * made, and then undo it! - */ - nsec -= cur_timer->get_offset() * NSEC_PER_USEC; - nsec -= (jiffies - wall_jiffies) * TICK_NSEC; - - wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); - wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); - - set_normalized_timespec(&xtime, sec, nsec); - set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - - ntp_clear(); - write_sequnlock_irq(&xtime_lock); - clock_was_set(); - return 0; -} - -EXPORT_SYMBOL(do_settimeofday); - static int set_rtc_mmss(unsigned long nowtime) { int retval; - - WARN_ON(irqs_disabled()); + unsigned long flags; /* gets recalled with irq locally disabled */ - spin_lock_irq(&rtc_lock); + /* XXX - does irqsave resolve this? -johnstul */ + spin_lock_irqsave(&rtc_lock, flags); if (efi_enabled) retval = efi_set_rtc_mmss(nowtime); else retval = mach_set_rtc_mmss(nowtime); - spin_unlock_irq(&rtc_lock); + spin_unlock_irqrestore(&rtc_lock, flags); return retval; } @@ -222,16 +141,6 @@ static int set_rtc_mmss(unsigned long no int timer_ack; -/* monotonic_clock(): returns # of nanoseconds passed since time_init() - * Note: This function is required to return accurate - * time even in the absence of multiple timer ticks. - */ -unsigned long long monotonic_clock(void) -{ - return cur_timer->monotonic_clock(); -} -EXPORT_SYMBOL(monotonic_clock); - #if defined(CONFIG_SMP) && defined(CONFIG_FRAME_POINTER) unsigned long profile_pc(struct pt_regs *regs) { @@ -246,11 +155,21 @@ EXPORT_SYMBOL(profile_pc); #endif /* - * timer_interrupt() needs to keep up the real-time clock, - * as well as call the "do_timer()" routine every clocktick + * This is the same as the above, except we _also_ save the current + * Time Stamp Counter value at the time of the timer interrupt, so that + * we later on can estimate the time of day more exactly. */ -static inline void do_timer_interrupt(int irq, struct pt_regs *regs) +irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) { + /* + * Here we are in the timer irq handler. We just have irqs locally + * disabled but we don't know if the timer_bh is running on the other + * CPU. We need to avoid to SMP race with it. NOTE: we don' t need + * the irq version of write_lock because as just said we have irq + * locally disabled. -arca + */ + write_seqlock(&xtime_lock); + #ifdef CONFIG_X86_IO_APIC if (timer_ack) { /* @@ -283,27 +202,6 @@ static inline void do_timer_interrupt(in irq = inb_p( 0x61 ); /* read the current state */ outb_p( irq|0x80, 0x61 ); /* reset the IRQ */ } -} - -/* - * This is the same as the above, except we _also_ save the current - * Time Stamp Counter value at the time of the timer interrupt, so that - * we later on can estimate the time of day more exactly. - */ -irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) -{ - /* - * Here we are in the timer irq handler. We just have irqs locally - * disabled but we don't know if the timer_bh is running on the other - * CPU. We need to avoid to SMP race with it. NOTE: we don' t need - * the irq version of write_lock because as just said we have irq - * locally disabled. -arca - */ - write_seqlock(&xtime_lock); - - cur_timer->mark_offset(); - - do_timer_interrupt(irq, regs); write_sequnlock(&xtime_lock); return IRQ_HANDLED; @@ -327,58 +225,37 @@ unsigned long get_cmos_time(void) } EXPORT_SYMBOL(get_cmos_time); -static void sync_cmos_clock(unsigned long dummy); - -static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0); - -static void sync_cmos_clock(unsigned long dummy) +/* arch specific timeofday hooks */ +nsec_t read_persistent_clock(void) { - struct timeval now, next; - int fail = 1; + return (nsec_t)get_cmos_time() * NSEC_PER_SEC; +} +void sync_persistent_clock(struct timespec ts) +{ + static unsigned long last_rtc_update; /* * If we have an externally synchronized Linux clock, then update * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be * called as close as possible to 500 ms before the new second starts. - * This code is run on a timer. If the clock is set, that timer - * may not expire at the correct time. Thus, we adjust... */ - if (!ntp_synced()) - /* - * Not synced, exit, do not restart a timer (if one is - * running, let it run out). - */ + if (ts.tv_sec <= last_rtc_update + 660) return; - do_gettimeofday(&now); - if (now.tv_usec >= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 && - now.tv_usec <= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2) - fail = set_rtc_mmss(now.tv_sec); - - next.tv_usec = USEC_AFTER - now.tv_usec; - if (next.tv_usec <= 0) - next.tv_usec += USEC_PER_SEC; - - if (!fail) - next.tv_sec = 659; - else - next.tv_sec = 0; - - if (next.tv_usec >= USEC_PER_SEC) { - next.tv_sec++; - next.tv_usec -= USEC_PER_SEC; + if((ts.tv_nsec / 1000) >= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 && + (ts.tv_nsec / 1000) <= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2) { + /* horrible...FIXME */ + if (set_rtc_mmss(ts.tv_sec) == 0) + last_rtc_update = ts.tv_sec; + else + last_rtc_update = ts.tv_sec - 600; /* do it again in 60 s */ } - mod_timer(&sync_cmos_timer, jiffies + timeval_to_jiffies(&next)); } -void notify_arch_cmos_timer(void) -{ - mod_timer(&sync_cmos_timer, jiffies + 1); -} + static long clock_cmos_diff, sleep_start; -static struct timer_opts *last_timer; static int timer_suspend(struct sys_device *dev, pm_message_t state) { /* @@ -387,16 +264,11 @@ static int timer_suspend(struct sys_devi clock_cmos_diff = -get_cmos_time(); clock_cmos_diff += get_seconds(); sleep_start = get_cmos_time(); - last_timer = cur_timer; - cur_timer = &timer_none; - if (last_timer->suspend) - last_timer->suspend(state); return 0; } static int timer_resume(struct sys_device *dev) { - unsigned long flags; unsigned long sec; unsigned long sleep_length; @@ -406,16 +278,8 @@ static int timer_resume(struct sys_devic #endif sec = get_cmos_time() + clock_cmos_diff; sleep_length = (get_cmos_time() - sleep_start) * HZ; - write_seqlock_irqsave(&xtime_lock, flags); - xtime.tv_sec = sec; - xtime.tv_nsec = 0; - write_sequnlock_irqrestore(&xtime_lock, flags); jiffies += sleep_length; wall_jiffies += sleep_length; - if (last_timer->resume) - last_timer->resume(); - cur_timer = last_timer; - last_timer = NULL; touch_softlockup_watchdog(); return 0; } @@ -448,17 +312,10 @@ extern void (*late_time_init)(void); /* Duplicate of time_init() below, with hpet_enable part added */ static void __init hpet_time_init(void) { - xtime.tv_sec = get_cmos_time(); - xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - if ((hpet_enable() >= 0) && hpet_use_timer) { printk("Using HPET for base-timer\n"); } - cur_timer = select_timer(); - printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); time_init_hook(); } @@ -476,13 +333,5 @@ void __init time_init(void) return; } #endif - xtime.tv_sec = get_cmos_time(); - xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); - set_normalized_timespec(&wall_to_monotonic, - -xtime.tv_sec, -xtime.tv_nsec); - - cur_timer = select_timer(); - printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); - time_init_hook(); } diff --git a/arch/i386/lib/delay.c b/arch/i386/lib/delay.c --- a/arch/i386/lib/delay.c +++ b/arch/i386/lib/delay.c @@ -13,6 +13,7 @@ #include <linux/config.h> #include <linux/sched.h> #include <linux/delay.h> +#include <linux/timeofday.h> #include <linux/module.h> #include <asm/processor.h> #include <asm/delay.h> @@ -22,11 +23,20 @@ #include <asm/smp.h> #endif -extern struct timer_opts* timer; - +/* XXX - For now just use a simple loop delay + * This has cpufreq issues, but so did the old method. + */ void __delay(unsigned long loops) { - cur_timer->delay(loops); + int d0; + __asm__ __volatile__( + "\tjmp 1f\n" + ".align 16\n" + "1:\tjmp 2f\n" + ".align 16\n" + "2:\tdecl %0\n\tjns 2b" + :"=&a" (d0) + :"0" (loops)); } inline void __const_udelay(unsigned long xloops) diff --git a/include/asm-i386/timeofday.h b/include/asm-i386/timeofday.h new file mode 100644 --- /dev/null +++ b/include/asm-i386/timeofday.h @@ -0,0 +1,4 @@ +#ifndef _ASM_I386_TIMEOFDAY_H +#define _ASM_I386_TIMEOFDAY_H +#include <asm-generic/timeofday.h> +#endif diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h --- a/include/asm-i386/timer.h +++ b/include/asm-i386/timer.h @@ -3,68 +3,11 @@ #include <linux/init.h> #include <linux/pm.h> -/** - * struct timer_ops - used to define a timer source - * - * @name: name of the timer. - * @init: Probes and initializes the timer. Takes clock= override - * string as an argument. Returns 0 on success, anything else - * on failure. - * @mark_offset: called by the timer interrupt. - * @get_offset: called by gettimeofday(). Returns the number of microseconds - * since the last timer interupt. - * @monotonic_clock: returns the number of nanoseconds since the init of the - * timer. - * @delay: delays this many clock cycles. - */ -struct timer_opts { - char* name; - void (*mark_offset)(void); - unsigned long (*get_offset)(void); - unsigned long long (*monotonic_clock)(void); - void (*delay)(unsigned long); - unsigned long (*read_timer)(void); - int (*suspend)(pm_message_t state); - int (*resume)(void); -}; - -struct init_timer_opts { - int (*init)(char *override); - struct timer_opts *opts; -}; - #define TICK_SIZE (tick_nsec / 1000) - -extern struct timer_opts* __init select_timer(void); -extern void clock_fallback(void); void setup_pit_timer(void); - /* Modifiers for buggy PIT handling */ - extern int pit_latch_buggy; - -extern struct timer_opts *cur_timer; extern int timer_ack; - -/* list of externed timers */ -extern struct timer_opts timer_none; -extern struct timer_opts timer_pit; -extern struct init_timer_opts timer_pit_init; -extern struct init_timer_opts timer_tsc_init; -#ifdef CONFIG_X86_CYCLONE_TIMER -extern struct init_timer_opts timer_cyclone_init; -#endif - -extern unsigned long calibrate_tsc(void); -extern unsigned long read_timer_tsc(void); -extern void init_cpu_khz(void); extern int recalibrate_cpu_khz(void); -#ifdef CONFIG_HPET_TIMER -extern struct init_timer_opts timer_hpet_init; -extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr); -#endif -#ifdef CONFIG_X86_PM_TIMER -extern struct init_timer_opts timer_pmtmr_init; -#endif #endif ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 10/12] generic timeofday i386 arch specific changes, part 6 2005-10-14 2:20 ` [RFC][PATCH 9/12] generic timeofday i386 arch specific changes, part 5 john stultz @ 2005-10-14 2:21 ` john stultz 2005-10-14 2:22 ` [RFC][PATCH 11/12] generic timeofday i386/x86-64 specific clocksources john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:21 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the final of four, removes the old timers/timer_opts infrastructure. It applies on top of my timeofday-arch-i386-part5 patch. This patch is the last in the the timeofday-arch-i386 patchset, so you should be able to build and boot a kernel after it has been applied. Note that this patch does not provide any i386 clocksources, so you will only have the jiffies clocksource. To get full replacements for the code being removed here, the following timeofday-clocks-i386 patch will need to be applied. thanks -john Makefile | 9 - common.c | 88 ------------ timer.c | 75 ---------- timer_cyclone.c | 259 ------------------------------------- timer_hpet.c | 212 ------------------------------ timer_none.c | 39 ----- timer_pit.c | 163 ----------------------- timer_pm.c | 268 -------------------------------------- timer_tsc.c | 388 -------------------------------------------------------- 9 files changed, 1501 deletions(-) linux-2.6.14-rc4_timeofday-arch-i386-part6_B7.patch ============================================ diff --git a/arch/i386/kernel/timers/Makefile b/arch/i386/kernel/timers/Makefile deleted file mode 100644 --- a/arch/i386/kernel/timers/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for x86 timers -# - -obj-y := timer.o timer_none.o timer_tsc.o timer_pit.o common.o - -obj-$(CONFIG_X86_CYCLONE_TIMER) += timer_cyclone.o -obj-$(CONFIG_HPET_TIMER) += timer_hpet.o -obj-$(CONFIG_X86_PM_TIMER) += timer_pm.o diff --git a/arch/i386/kernel/timers/common.c b/arch/i386/kernel/timers/common.c deleted file mode 100644 --- a/arch/i386/kernel/timers/common.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Common functions used across the timers go here - */ - -#include <linux/init.h> -#include <linux/timex.h> -#include <linux/errno.h> -#include <linux/jiffies.h> -#include <linux/module.h> - -#include <asm/io.h> -#include <asm/timer.h> -#include <asm/hpet.h> - -#include "mach_timer.h" - -#ifdef CONFIG_HPET_TIMER -/* ------ Calibrate the TSC using HPET ------- - * Return 2^32 * (1 / (TSC clocks per usec)) for getting the CPU freq. - * Second output is parameter 1 (when non NULL) - * Set 2^32 * (1 / (tsc per HPET clk)) for delay_hpet(). - * calibrate_tsc() calibrates the processor TSC by comparing - * it to the HPET timer of known frequency. - * Too much 64-bit arithmetic here to do this cleanly in C - */ -#define CALIBRATE_CNT_HPET (5 * hpet_tick) -#define CALIBRATE_TIME_HPET (5 * KERNEL_TICK_USEC) - -unsigned long __devinit calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr) -{ - unsigned long tsc_startlow, tsc_starthigh; - unsigned long tsc_endlow, tsc_endhigh; - unsigned long hpet_start, hpet_end; - unsigned long result, remain; - - hpet_start = hpet_readl(HPET_COUNTER); - rdtsc(tsc_startlow, tsc_starthigh); - do { - hpet_end = hpet_readl(HPET_COUNTER); - } while ((hpet_end - hpet_start) < CALIBRATE_CNT_HPET); - rdtsc(tsc_endlow, tsc_endhigh); - - /* 64-bit subtract - gcc just messes up with long longs */ - __asm__("subl %2,%0\n\t" - "sbbl %3,%1" - :"=a" (tsc_endlow), "=d" (tsc_endhigh) - :"g" (tsc_startlow), "g" (tsc_starthigh), - "0" (tsc_endlow), "1" (tsc_endhigh)); - - /* Error: ECPUTOOFAST */ - if (tsc_endhigh) - goto bad_calibration; - - /* Error: ECPUTOOSLOW */ - if (tsc_endlow <= CALIBRATE_TIME_HPET) - goto bad_calibration; - - ASM_DIV64_REG(result, remain, tsc_endlow, 0, CALIBRATE_TIME_HPET); - if (remain > (tsc_endlow >> 1)) - result++; /* rounding the result */ - - if (tsc_hpet_quotient_ptr) { - unsigned long tsc_hpet_quotient; - - ASM_DIV64_REG(tsc_hpet_quotient, remain, tsc_endlow, 0, - CALIBRATE_CNT_HPET); - if (remain > (tsc_endlow >> 1)) - tsc_hpet_quotient++; /* rounding the result */ - *tsc_hpet_quotient_ptr = tsc_hpet_quotient; - } - - return result; -bad_calibration: - /* - * the CPU was so fast/slow that the quotient wouldn't fit in - * 32 bits.. - */ - return 0; -} -#endif - - -unsigned long read_timer_tsc(void) -{ - unsigned long retval; - rdtscl(retval); - return retval; -} diff --git a/arch/i386/kernel/timers/timer.c b/arch/i386/kernel/timers/timer.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer.c +++ /dev/null @@ -1,75 +0,0 @@ -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/string.h> -#include <asm/timer.h> - -#ifdef CONFIG_HPET_TIMER -/* - * HPET memory read is slower than tsc reads, but is more dependable as it - * always runs at constant frequency and reduces complexity due to - * cpufreq. So, we prefer HPET timer to tsc based one. Also, we cannot use - * timer_pit when HPET is active. So, we default to timer_tsc. - */ -#endif -/* list of timers, ordered by preference, NULL terminated */ -static struct init_timer_opts* __initdata timers[] = { -#ifdef CONFIG_X86_CYCLONE_TIMER - &timer_cyclone_init, -#endif -#ifdef CONFIG_HPET_TIMER - &timer_hpet_init, -#endif -#ifdef CONFIG_X86_PM_TIMER - &timer_pmtmr_init, -#endif - &timer_tsc_init, - &timer_pit_init, - NULL, -}; - -static char clock_override[10] __initdata; - -static int __init clock_setup(char* str) -{ - if (str) - strlcpy(clock_override, str, sizeof(clock_override)); - return 1; -} -__setup("clock=", clock_setup); - - -/* The chosen timesource has been found to be bad. - * Fall back to a known good timesource (the PIT) - */ -void clock_fallback(void) -{ - cur_timer = &timer_pit; -} - -/* iterates through the list of timers, returning the first - * one that initializes successfully. - */ -struct timer_opts* __init select_timer(void) -{ - int i = 0; - - /* find most preferred working timer */ - while (timers[i]) { - if (timers[i]->init) - if (timers[i]->init(clock_override) == 0) - return timers[i]->opts; - ++i; - } - - panic("select_timer: Cannot find a suitable timer\n"); - return NULL; -} - -int read_current_timer(unsigned long *timer_val) -{ - if (cur_timer->read_timer) { - *timer_val = cur_timer->read_timer(); - return 0; - } - return -1; -} diff --git a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_cyclone.c +++ /dev/null @@ -1,259 +0,0 @@ -/* Cyclone-timer: - * This code implements timer_ops for the cyclone counter found - * on IBM x440, x360, and other Summit based systems. - * - * Copyright (C) 2002 IBM, John Stultz (johnstul@us.ibm.com) - */ - - -#include <linux/spinlock.h> -#include <linux/init.h> -#include <linux/timex.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/jiffies.h> - -#include <asm/timer.h> -#include <asm/io.h> -#include <asm/pgtable.h> -#include <asm/fixmap.h> -#include <asm/i8253.h> - -#include "io_ports.h" - -/* Number of usecs that the last interrupt was delayed */ -static int delay_at_last_interrupt; - -#define CYCLONE_CBAR_ADDR 0xFEB00CD0 -#define CYCLONE_PMCC_OFFSET 0x51A0 -#define CYCLONE_MPMC_OFFSET 0x51D0 -#define CYCLONE_MPCS_OFFSET 0x51A8 -#define CYCLONE_TIMER_FREQ 100000000 -#define CYCLONE_TIMER_MASK (((u64)1<<40)-1) /* 40 bit mask */ -int use_cyclone = 0; - -static u32* volatile cyclone_timer; /* Cyclone MPMC0 register */ -static u32 last_cyclone_low; -static u32 last_cyclone_high; -static unsigned long long monotonic_base; -static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; - -/* helper macro to atomically read both cyclone counter registers */ -#define read_cyclone_counter(low,high) \ - do{ \ - high = cyclone_timer[1]; low = cyclone_timer[0]; \ - } while (high != cyclone_timer[1]); - - -static void mark_offset_cyclone(void) -{ - unsigned long lost, delay; - unsigned long delta = last_cyclone_low; - int count; - unsigned long long this_offset, last_offset; - - write_seqlock(&monotonic_lock); - last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; - - spin_lock(&i8253_lock); - read_cyclone_counter(last_cyclone_low,last_cyclone_high); - - /* read values for delay_at_last_interrupt */ - outb_p(0x00, 0x43); /* latch the count ASAP */ - - count = inb_p(0x40); /* read the latched count */ - count |= inb(0x40) << 8; - - /* - * VIA686a test code... reset the latch if count > max + 1 - * from timer_pit.c - cjb - */ - if (count > LATCH) { - outb_p(0x34, PIT_MODE); - outb_p(LATCH & 0xff, PIT_CH0); - outb(LATCH >> 8, PIT_CH0); - count = LATCH - 1; - } - spin_unlock(&i8253_lock); - - /* lost tick compensation */ - delta = last_cyclone_low - delta; - delta /= (CYCLONE_TIMER_FREQ/1000000); - delta += delay_at_last_interrupt; - lost = delta/(1000000/HZ); - delay = delta%(1000000/HZ); - if (lost >= 2) - jiffies_64 += lost-1; - - /* update the monotonic base value */ - this_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; - monotonic_base += (this_offset - last_offset) & CYCLONE_TIMER_MASK; - write_sequnlock(&monotonic_lock); - - /* calculate delay_at_last_interrupt */ - count = ((LATCH-1) - count) * TICK_SIZE; - delay_at_last_interrupt = (count + LATCH/2) / LATCH; - - - /* catch corner case where tick rollover occured - * between cyclone and pit reads (as noted when - * usec delta is > 90% # of usecs/tick) - */ - if (lost && abs(delay - delay_at_last_interrupt) > (900000/HZ)) - jiffies_64++; -} - -static unsigned long get_offset_cyclone(void) -{ - u32 offset; - - if(!cyclone_timer) - return delay_at_last_interrupt; - - /* Read the cyclone timer */ - offset = cyclone_timer[0]; - - /* .. relative to previous jiffy */ - offset = offset - last_cyclone_low; - - /* convert cyclone ticks to microseconds */ - /* XXX slow, can we speed this up? */ - offset = offset/(CYCLONE_TIMER_FREQ/1000000); - - /* our adjusted time offset in microseconds */ - return delay_at_last_interrupt + offset; -} - -static unsigned long long monotonic_clock_cyclone(void) -{ - u32 now_low, now_high; - unsigned long long last_offset, this_offset, base; - unsigned long long ret; - unsigned seq; - - /* atomically read monotonic base & last_offset */ - do { - seq = read_seqbegin(&monotonic_lock); - last_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low; - base = monotonic_base; - } while (read_seqretry(&monotonic_lock, seq)); - - - /* Read the cyclone counter */ - read_cyclone_counter(now_low,now_high); - this_offset = ((unsigned long long)now_high<<32)|now_low; - - /* convert to nanoseconds */ - ret = base + ((this_offset - last_offset)&CYCLONE_TIMER_MASK); - return ret * (1000000000 / CYCLONE_TIMER_FREQ); -} - -static int __init init_cyclone(char* override) -{ - u32* reg; - u32 base; /* saved cyclone base address */ - u32 pageaddr; /* page that contains cyclone_timer register */ - u32 offset; /* offset from pageaddr to cyclone_timer register */ - int i; - - /* check clock override */ - if (override[0] && strncmp(override,"cyclone",7)) - return -ENODEV; - - /*make sure we're on a summit box*/ - if(!use_cyclone) return -ENODEV; - - printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n"); - - /* find base address */ - pageaddr = (CYCLONE_CBAR_ADDR)&PAGE_MASK; - offset = (CYCLONE_CBAR_ADDR)&(~PAGE_MASK); - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); - if(!reg){ - printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n"); - return -ENODEV; - } - base = *reg; - if(!base){ - printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n"); - return -ENODEV; - } - - /* setup PMCC */ - pageaddr = (base + CYCLONE_PMCC_OFFSET)&PAGE_MASK; - offset = (base + CYCLONE_PMCC_OFFSET)&(~PAGE_MASK); - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); - if(!reg){ - printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n"); - return -ENODEV; - } - reg[0] = 0x00000001; - - /* setup MPCS */ - pageaddr = (base + CYCLONE_MPCS_OFFSET)&PAGE_MASK; - offset = (base + CYCLONE_MPCS_OFFSET)&(~PAGE_MASK); - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); - if(!reg){ - printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n"); - return -ENODEV; - } - reg[0] = 0x00000001; - - /* map in cyclone_timer */ - pageaddr = (base + CYCLONE_MPMC_OFFSET)&PAGE_MASK; - offset = (base + CYCLONE_MPMC_OFFSET)&(~PAGE_MASK); - set_fixmap_nocache(FIX_CYCLONE_TIMER, pageaddr); - cyclone_timer = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset); - if(!cyclone_timer){ - printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n"); - return -ENODEV; - } - - /*quick test to make sure its ticking*/ - for(i=0; i<3; i++){ - u32 old = cyclone_timer[0]; - int stall = 100; - while(stall--) barrier(); - if(cyclone_timer[0] == old){ - printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n"); - cyclone_timer = 0; - return -ENODEV; - } - } - - init_cpu_khz(); - - /* Everything looks good! */ - return 0; -} - - -static void delay_cyclone(unsigned long loops) -{ - unsigned long bclock, now; - if(!cyclone_timer) - return; - bclock = cyclone_timer[0]; - do { - rep_nop(); - now = cyclone_timer[0]; - } while ((now-bclock) < loops); -} -/************************************************************/ - -/* cyclone timer_opts struct */ -static struct timer_opts timer_cyclone = { - .name = "cyclone", - .mark_offset = mark_offset_cyclone, - .get_offset = get_offset_cyclone, - .monotonic_clock = monotonic_clock_cyclone, - .delay = delay_cyclone, -}; - -struct init_timer_opts __initdata timer_cyclone_init = { - .init = init_cyclone, - .opts = &timer_cyclone, -}; diff --git a/arch/i386/kernel/timers/timer_hpet.c b/arch/i386/kernel/timers/timer_hpet.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_hpet.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * This code largely moved from arch/i386/kernel/time.c. - * See comments there for proper credits. - */ - -#include <linux/spinlock.h> -#include <linux/init.h> -#include <linux/timex.h> -#include <linux/errno.h> -#include <linux/string.h> -#include <linux/jiffies.h> - -#include <asm/timer.h> -#include <asm/io.h> -#include <asm/processor.h> - -#include "io_ports.h" -#include "mach_timer.h" -#include <asm/hpet.h> - -static unsigned long hpet_usec_quotient __read_mostly; /* convert hpet clks to usec */ -static unsigned long tsc_hpet_quotient __read_mostly; /* convert tsc to hpet clks */ -static unsigned long hpet_last; /* hpet counter value at last tick*/ -static unsigned long last_tsc_low; /* lsb 32 bits of Time Stamp Counter */ -static unsigned long last_tsc_high; /* msb 32 bits of Time Stamp Counter */ -static unsigned long long monotonic_base; -static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; - -/* convert from cycles(64bits) => nanoseconds (64bits) - * basic equation: - * ns = cycles / (freq / ns_per_sec) - * ns = cycles * (ns_per_sec / freq) - * ns = cycles * (10^9 / (cpu_mhz * 10^6)) - * ns = cycles * (10^3 / cpu_mhz) - * - * Then we use scaling math (suggested by george@mvista.com) to get: - * ns = cycles * (10^3 * SC / cpu_mhz) / SC - * ns = cycles * cyc2ns_scale / SC - * - * And since SC is a constant power of two, we can convert the div - * into a shift. - * -johnstul@us.ibm.com "math is hard, lets go shopping!" - */ -static unsigned long cyc2ns_scale; -#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */ - -static inline void set_cyc2ns_scale(unsigned long cpu_mhz) -{ - cyc2ns_scale = (1000 << CYC2NS_SCALE_FACTOR)/cpu_mhz; -} - -static inline unsigned long long cycles_2_ns(unsigned long long cyc) -{ - return (cyc * cyc2ns_scale) >> CYC2NS_SCALE_FACTOR; -} - -static unsigned long long monotonic_clock_hpet(void) -{ - unsigned long long last_offset, this_offset, base; - unsigned seq; - - /* atomically read monotonic base & last_offset */ - do { - seq = read_seqbegin(&monotonic_lock); - last_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - base = monotonic_base; - } while (read_seqretry(&monotonic_lock, seq)); - - /* Read the Time Stamp Counter */ - rdtscll(this_offset); - - /* return the value in ns */ - return base + cycles_2_ns(this_offset - last_offset); -} - -static unsigned long get_offset_hpet(void) -{ - register unsigned long eax, edx; - - eax = hpet_readl(HPET_COUNTER); - eax -= hpet_last; /* hpet delta */ - eax = min(hpet_tick, eax); - /* - * Time offset = (hpet delta) * ( usecs per HPET clock ) - * = (hpet delta) * ( usecs per tick / HPET clocks per tick) - * = (hpet delta) * ( hpet_usec_quotient ) / (2^32) - * - * Where, - * hpet_usec_quotient = (2^32 * usecs per tick)/HPET clocks per tick - * - * Using a mull instead of a divl saves some cycles in critical path. - */ - ASM_MUL64_REG(eax, edx, hpet_usec_quotient, eax); - - /* our adjusted time offset in microseconds */ - return edx; -} - -static void mark_offset_hpet(void) -{ - unsigned long long this_offset, last_offset; - unsigned long offset; - - write_seqlock(&monotonic_lock); - last_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - rdtsc(last_tsc_low, last_tsc_high); - - if (hpet_use_timer) - offset = hpet_readl(HPET_T0_CMP) - hpet_tick; - else - offset = hpet_readl(HPET_COUNTER); - if (unlikely(((offset - hpet_last) >= (2*hpet_tick)) && (hpet_last != 0))) { - int lost_ticks = ((offset - hpet_last) / hpet_tick) - 1; - jiffies_64 += lost_ticks; - } - hpet_last = offset; - - /* update the monotonic base value */ - this_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - monotonic_base += cycles_2_ns(this_offset - last_offset); - write_sequnlock(&monotonic_lock); -} - -static void delay_hpet(unsigned long loops) -{ - unsigned long hpet_start, hpet_end; - unsigned long eax; - - /* loops is the number of cpu cycles. Convert it to hpet clocks */ - ASM_MUL64_REG(eax, loops, tsc_hpet_quotient, loops); - - hpet_start = hpet_readl(HPET_COUNTER); - do { - rep_nop(); - hpet_end = hpet_readl(HPET_COUNTER); - } while ((hpet_end - hpet_start) < (loops)); -} - -static struct timer_opts timer_hpet; - -static int __init init_hpet(char* override) -{ - unsigned long result, remain; - - /* check clock override */ - if (override[0] && strncmp(override,"hpet",4)) - return -ENODEV; - - if (!is_hpet_enabled()) - return -ENODEV; - - printk("Using HPET for gettimeofday\n"); - if (cpu_has_tsc) { - unsigned long tsc_quotient = calibrate_tsc_hpet(&tsc_hpet_quotient); - if (tsc_quotient) { - /* report CPU clock rate in Hz. - * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = - * clock/second. Our precision is about 100 ppm. - */ - { unsigned long eax=0, edx=1000; - ASM_DIV64_REG(cpu_khz, edx, tsc_quotient, - eax, edx); - printk("Detected %u.%03u MHz processor.\n", - cpu_khz / 1000, cpu_khz % 1000); - } - set_cyc2ns_scale(cpu_khz/1000); - } - /* set this only when cpu_has_tsc */ - timer_hpet.read_timer = read_timer_tsc; - } - - /* - * Math to calculate hpet to usec multiplier - * Look for the comments at get_offset_hpet() - */ - ASM_DIV64_REG(result, remain, hpet_tick, 0, KERNEL_TICK_USEC); - if (remain > (hpet_tick >> 1)) - result++; /* rounding the result */ - hpet_usec_quotient = result; - - return 0; -} - -static int hpet_resume(void) -{ - write_seqlock(&monotonic_lock); - /* Assume this is the last mark offset time */ - rdtsc(last_tsc_low, last_tsc_high); - - if (hpet_use_timer) - hpet_last = hpet_readl(HPET_T0_CMP) - hpet_tick; - else - hpet_last = hpet_readl(HPET_COUNTER); - write_sequnlock(&monotonic_lock); - return 0; -} -/************************************************************/ - -/* tsc timer_opts struct */ -static struct timer_opts timer_hpet __read_mostly = { - .name = "hpet", - .mark_offset = mark_offset_hpet, - .get_offset = get_offset_hpet, - .monotonic_clock = monotonic_clock_hpet, - .delay = delay_hpet, - .resume = hpet_resume, -}; - -struct init_timer_opts __initdata timer_hpet_init = { - .init = init_hpet, - .opts = &timer_hpet, -}; diff --git a/arch/i386/kernel/timers/timer_none.c b/arch/i386/kernel/timers/timer_none.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_none.c +++ /dev/null @@ -1,39 +0,0 @@ -#include <linux/init.h> -#include <asm/timer.h> - -static void mark_offset_none(void) -{ - /* nothing needed */ -} - -static unsigned long get_offset_none(void) -{ - return 0; -} - -static unsigned long long monotonic_clock_none(void) -{ - return 0; -} - -static void delay_none(unsigned long loops) -{ - int d0; - __asm__ __volatile__( - "\tjmp 1f\n" - ".align 16\n" - "1:\tjmp 2f\n" - ".align 16\n" - "2:\tdecl %0\n\tjns 2b" - :"=&a" (d0) - :"0" (loops)); -} - -/* none timer_opts struct */ -struct timer_opts timer_none = { - .name = "none", - .mark_offset = mark_offset_none, - .get_offset = get_offset_none, - .monotonic_clock = monotonic_clock_none, - .delay = delay_none, -}; diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_pit.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * This code largely moved from arch/i386/kernel/time.c. - * See comments there for proper credits. - */ - -#include <linux/spinlock.h> -#include <linux/module.h> -#include <linux/device.h> -#include <linux/sysdev.h> -#include <linux/timex.h> -#include <asm/delay.h> -#include <asm/mpspec.h> -#include <asm/timer.h> -#include <asm/smp.h> -#include <asm/io.h> -#include <asm/arch_hooks.h> -#include <asm/i8253.h> - -#include "do_timer.h" -#include "io_ports.h" - -static int count_p; /* counter in get_offset_pit() */ - -static int __init init_pit(char* override) -{ - /* check clock override */ - if (override[0] && strncmp(override,"pit",3)) - printk(KERN_ERR "Warning: clock= override failed. Defaulting to PIT\n"); - - count_p = LATCH; - return 0; -} - -static void mark_offset_pit(void) -{ - /* nothing needed */ -} - -static unsigned long long monotonic_clock_pit(void) -{ - return 0; -} - -static void delay_pit(unsigned long loops) -{ - int d0; - __asm__ __volatile__( - "\tjmp 1f\n" - ".align 16\n" - "1:\tjmp 2f\n" - ".align 16\n" - "2:\tdecl %0\n\tjns 2b" - :"=&a" (d0) - :"0" (loops)); -} - - -/* This function must be called with xtime_lock held. - * It was inspired by Steve McCanne's microtime-i386 for BSD. -- jrs - * - * However, the pc-audio speaker driver changes the divisor so that - * it gets interrupted rather more often - it loads 64 into the - * counter rather than 11932! This has an adverse impact on - * do_gettimeoffset() -- it stops working! What is also not - * good is that the interval that our timer function gets called - * is no longer 10.0002 ms, but 9.9767 ms. To get around this - * would require using a different timing source. Maybe someone - * could use the RTC - I know that this can interrupt at frequencies - * ranging from 8192Hz to 2Hz. If I had the energy, I'd somehow fix - * it so that at startup, the timer code in sched.c would select - * using either the RTC or the 8253 timer. The decision would be - * based on whether there was any other device around that needed - * to trample on the 8253. I'd set up the RTC to interrupt at 1024 Hz, - * and then do some jiggery to have a version of do_timer that - * advanced the clock by 1/1024 s. Every time that reached over 1/100 - * of a second, then do all the old code. If the time was kept correct - * then do_gettimeoffset could just return 0 - there is no low order - * divider that can be accessed. - * - * Ideally, you would be able to use the RTC for the speaker driver, - * but it appears that the speaker driver really needs interrupt more - * often than every 120 us or so. - * - * Anyway, this needs more thought.... pjsg (1993-08-28) - * - * If you are really that interested, you should be reading - * comp.protocols.time.ntp! - */ - -static unsigned long get_offset_pit(void) -{ - int count; - unsigned long flags; - static unsigned long jiffies_p = 0; - - /* - * cache volatile jiffies temporarily; we have xtime_lock. - */ - unsigned long jiffies_t; - - spin_lock_irqsave(&i8253_lock, flags); - /* timer count may underflow right here */ - outb_p(0x00, PIT_MODE); /* latch the count ASAP */ - - count = inb_p(PIT_CH0); /* read the latched count */ - - /* - * We do this guaranteed double memory access instead of a _p - * postfix in the previous port access. Wheee, hackady hack - */ - jiffies_t = jiffies; - - count |= inb_p(PIT_CH0) << 8; - - /* VIA686a test code... reset the latch if count > max + 1 */ - if (count > LATCH) { - outb_p(0x34, PIT_MODE); - outb_p(LATCH & 0xff, PIT_CH0); - outb(LATCH >> 8, PIT_CH0); - count = LATCH - 1; - } - - /* - * avoiding timer inconsistencies (they are rare, but they happen)... - * there are two kinds of problems that must be avoided here: - * 1. the timer counter underflows - * 2. hardware problem with the timer, not giving us continuous time, - * the counter does small "jumps" upwards on some Pentium systems, - * (see c't 95/10 page 335 for Neptun bug.) - */ - - if( jiffies_t == jiffies_p ) { - if( count > count_p ) { - /* the nutcase */ - count = do_timer_overflow(count); - } - } else - jiffies_p = jiffies_t; - - count_p = count; - - spin_unlock_irqrestore(&i8253_lock, flags); - - count = ((LATCH-1) - count) * TICK_SIZE; - count = (count + LATCH/2) / LATCH; - - return count; -} - - -/* tsc timer_opts struct */ -struct timer_opts timer_pit = { - .name = "pit", - .mark_offset = mark_offset_pit, - .get_offset = get_offset_pit, - .monotonic_clock = monotonic_clock_pit, - .delay = delay_pit, -}; - -struct init_timer_opts __initdata timer_pit_init = { - .init = init_pit, - .opts = &timer_pit, -}; diff --git a/arch/i386/kernel/timers/timer_pm.c b/arch/i386/kernel/timers/timer_pm.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_pm.c +++ /dev/null @@ -1,268 +0,0 @@ -/* - * (C) Dominik Brodowski <linux@brodo.de> 2003 - * - * Driver to use the Power Management Timer (PMTMR) available in some - * southbridges as primary timing source for the Linux kernel. - * - * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c, - * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4. - * - * This file is licensed under the GPL v2. - */ - - -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/device.h> -#include <linux/init.h> -#include <asm/types.h> -#include <asm/timer.h> -#include <asm/smp.h> -#include <asm/io.h> -#include <asm/arch_hooks.h> - -#include <linux/timex.h> -#include "mach_timer.h" - -/* Number of PMTMR ticks expected during calibration run */ -#define PMTMR_TICKS_PER_SEC 3579545 -#define PMTMR_EXPECTED_RATE \ - ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10)) - - -/* The I/O port the PMTMR resides at. - * The location is detected during setup_arch(), - * in arch/i386/acpi/boot.c */ -u32 pmtmr_ioport = 0; - - -/* value of the Power timer at last timer interrupt */ -static u32 offset_tick; -static u32 offset_delay; - -static unsigned long long monotonic_base; -static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; - -#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ - -/*helper function to safely read acpi pm timesource*/ -static inline u32 read_pmtmr(void) -{ - u32 v1=0,v2=0,v3=0; - /* It has been reported that because of various broken - * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM time - * source is not latched, so you must read it multiple - * times to insure a safe value is read. - */ - do { - v1 = inl(pmtmr_ioport); - v2 = inl(pmtmr_ioport); - v3 = inl(pmtmr_ioport); - } while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) - || (v3 > v1 && v3 < v2)); - - /* mask the output to 24 bits */ - return v2 & ACPI_PM_MASK; -} - - -/* - * Some boards have the PMTMR running way too fast. We check - * the PMTMR rate against PIT channel 2 to catch these cases. - */ -static int verify_pmtmr_rate(void) -{ - u32 value1, value2; - unsigned long count, delta; - - mach_prepare_counter(); - value1 = read_pmtmr(); - mach_countup(&count); - value2 = read_pmtmr(); - delta = (value2 - value1) & ACPI_PM_MASK; - - /* Check that the PMTMR delta is within 5% of what we expect */ - if (delta < (PMTMR_EXPECTED_RATE * 19) / 20 || - delta > (PMTMR_EXPECTED_RATE * 21) / 20) { - printk(KERN_INFO "PM-Timer running at invalid rate: %lu%% of normal - aborting.\n", 100UL * delta / PMTMR_EXPECTED_RATE); - return -1; - } - - return 0; -} - - -static int init_pmtmr(char* override) -{ - u32 value1, value2; - unsigned int i; - - if (override[0] && strncmp(override,"pmtmr",5)) - return -ENODEV; - - if (!pmtmr_ioport) - return -ENODEV; - - /* we use the TSC for delay_pmtmr, so make sure it exists */ - if (!cpu_has_tsc) - return -ENODEV; - - /* "verify" this timing source */ - value1 = read_pmtmr(); - for (i = 0; i < 10000; i++) { - value2 = read_pmtmr(); - if (value2 == value1) - continue; - if (value2 > value1) - goto pm_good; - if ((value2 < value1) && ((value2) < 0xFFF)) - goto pm_good; - printk(KERN_INFO "PM-Timer had inconsistent results: 0x%#x, 0x%#x - aborting.\n", value1, value2); - return -EINVAL; - } - printk(KERN_INFO "PM-Timer had no reasonable result: 0x%#x - aborting.\n", value1); - return -ENODEV; - -pm_good: - if (verify_pmtmr_rate() != 0) - return -ENODEV; - - init_cpu_khz(); - return 0; -} - -static inline u32 cyc2us(u32 cycles) -{ - /* The Power Management Timer ticks at 3.579545 ticks per microsecond. - * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%] - * - * Even with HZ = 100, delta is at maximum 35796 ticks, so it can - * easily be multiplied with 286 (=0x11E) without having to fear - * u32 overflows. - */ - cycles *= 286; - return (cycles >> 10); -} - -/* - * this gets called during each timer interrupt - * - Called while holding the writer xtime_lock - */ -static void mark_offset_pmtmr(void) -{ - u32 lost, delta, last_offset; - static int first_run = 1; - last_offset = offset_tick; - - write_seqlock(&monotonic_lock); - - offset_tick = read_pmtmr(); - - /* calculate tick interval */ - delta = (offset_tick - last_offset) & ACPI_PM_MASK; - - /* convert to usecs */ - delta = cyc2us(delta); - - /* update the monotonic base value */ - monotonic_base += delta * NSEC_PER_USEC; - write_sequnlock(&monotonic_lock); - - /* convert to ticks */ - delta += offset_delay; - lost = delta / (USEC_PER_SEC / HZ); - offset_delay = delta % (USEC_PER_SEC / HZ); - - - /* compensate for lost ticks */ - if (lost >= 2) - jiffies_64 += lost - 1; - - /* don't calculate delay for first run, - or if we've got less then a tick */ - if (first_run || (lost < 1)) { - first_run = 0; - offset_delay = 0; - } -} - -static int pmtmr_resume(void) -{ - write_seqlock(&monotonic_lock); - /* Assume this is the last mark offset time */ - offset_tick = read_pmtmr(); - write_sequnlock(&monotonic_lock); - return 0; -} - -static unsigned long long monotonic_clock_pmtmr(void) -{ - u32 last_offset, this_offset; - unsigned long long base, ret; - unsigned seq; - - - /* atomically read monotonic base & last_offset */ - do { - seq = read_seqbegin(&monotonic_lock); - last_offset = offset_tick; - base = monotonic_base; - } while (read_seqretry(&monotonic_lock, seq)); - - /* Read the pmtmr */ - this_offset = read_pmtmr(); - - /* convert to nanoseconds */ - ret = (this_offset - last_offset) & ACPI_PM_MASK; - ret = base + (cyc2us(ret) * NSEC_PER_USEC); - return ret; -} - -static void delay_pmtmr(unsigned long loops) -{ - unsigned long bclock, now; - - rdtscl(bclock); - do - { - rep_nop(); - rdtscl(now); - } while ((now-bclock) < loops); -} - - -/* - * get the offset (in microseconds) from the last call to mark_offset() - * - Called holding a reader xtime_lock - */ -static unsigned long get_offset_pmtmr(void) -{ - u32 now, offset, delta = 0; - - offset = offset_tick; - now = read_pmtmr(); - delta = (now - offset)&ACPI_PM_MASK; - - return (unsigned long) offset_delay + cyc2us(delta); -} - - -/* acpi timer_opts struct */ -static struct timer_opts timer_pmtmr = { - .name = "pmtmr", - .mark_offset = mark_offset_pmtmr, - .get_offset = get_offset_pmtmr, - .monotonic_clock = monotonic_clock_pmtmr, - .delay = delay_pmtmr, - .read_timer = read_timer_tsc, - .resume = pmtmr_resume, -}; - -struct init_timer_opts __initdata timer_pmtmr_init = { - .init = init_pmtmr, - .opts = &timer_pmtmr, -}; - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>"); -MODULE_DESCRIPTION("Power Management Timer (PMTMR) as primary timing source for x86"); diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c deleted file mode 100644 --- a/arch/i386/kernel/timers/timer_tsc.c +++ /dev/null @@ -1,388 +0,0 @@ -/* - * This code largely moved from arch/i386/kernel/time.c. - * See comments there for proper credits. - * - * 2004-06-25 Jesper Juhl - * moved mark_offset_tsc below cpufreq_delayed_get to avoid gcc 3.4 - * failing to inline. - */ - -#include <linux/spinlock.h> -#include <linux/init.h> -#include <linux/timex.h> -#include <linux/errno.h> -#include <linux/cpufreq.h> -#include <linux/string.h> -#include <linux/jiffies.h> - -#include <asm/timer.h> -#include <asm/io.h> -/* processor.h for distable_tsc flag */ -#include <asm/processor.h> - -#include "io_ports.h" -#include "mach_timer.h" - -#include <asm/hpet.h> -#include <asm/i8253.h> - -#ifdef CONFIG_HPET_TIMER -static unsigned long hpet_usec_quotient; -static unsigned long hpet_last; -static struct timer_opts timer_tsc; -#endif - -static int use_tsc; -/* Number of usecs that the last interrupt was delayed */ -static int delay_at_last_interrupt; - -static unsigned long last_tsc_low; /* lsb 32 bits of Time Stamp Counter */ -static unsigned long last_tsc_high; /* msb 32 bits of Time Stamp Counter */ -static unsigned long long monotonic_base; -static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED; - -static int count2; /* counter for mark_offset_tsc() */ - -/* Cached *multiplier* to convert TSC counts to microseconds. - * (see the equation below). - * Equal to 2^32 * (1 / (clocks per usec) ). - * Initialized in time_init. - */ -static unsigned long fast_gettimeoffset_quotient; - -static unsigned long get_offset_tsc(void) -{ - register unsigned long eax, edx; - - /* Read the Time Stamp Counter */ - - rdtsc(eax,edx); - - /* .. relative to previous jiffy (32 bits is enough) */ - eax -= last_tsc_low; /* tsc_low delta */ - - /* - * Time offset = (tsc_low delta) * fast_gettimeoffset_quotient - * = (tsc_low delta) * (usecs_per_clock) - * = (tsc_low delta) * (usecs_per_jiffy / clocks_per_jiffy) - * - * Using a mull instead of a divl saves up to 31 clock cycles - * in the critical path. - */ - - __asm__("mull %2" - :"=a" (eax), "=d" (edx) - :"rm" (fast_gettimeoffset_quotient), - "0" (eax)); - - /* our adjusted time offset in microseconds */ - return delay_at_last_interrupt + edx; -} - -static unsigned long long monotonic_clock_tsc(void) -{ - unsigned long long last_offset, this_offset, base; - unsigned seq; - - /* atomically read monotonic base & last_offset */ - do { - seq = read_seqbegin(&monotonic_lock); - last_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - base = monotonic_base; - } while (read_seqretry(&monotonic_lock, seq)); - - /* Read the Time Stamp Counter */ - rdtscll(this_offset); - - /* return the value in ns */ - return base + cycles_2_ns(this_offset - last_offset); -} - - -static void delay_tsc(unsigned long loops) -{ - unsigned long bclock, now; - - rdtscl(bclock); - do - { - rep_nop(); - rdtscl(now); - } while ((now-bclock) < loops); -} - -#ifdef CONFIG_HPET_TIMER -static void mark_offset_tsc_hpet(void) -{ - unsigned long long this_offset, last_offset; - unsigned long offset, temp, hpet_current; - - write_seqlock(&monotonic_lock); - last_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - /* - * It is important that these two operations happen almost at - * the same time. We do the RDTSC stuff first, since it's - * faster. To avoid any inconsistencies, we need interrupts - * disabled locally. - */ - /* - * Interrupts are just disabled locally since the timer irq - * has the SA_INTERRUPT flag set. -arca - */ - /* read Pentium cycle counter */ - - hpet_current = hpet_readl(HPET_COUNTER); - rdtsc(last_tsc_low, last_tsc_high); - - /* lost tick compensation */ - offset = hpet_readl(HPET_T0_CMP) - hpet_tick; - if (unlikely(((offset - hpet_last) > hpet_tick) && (hpet_last != 0))) { - int lost_ticks = (offset - hpet_last) / hpet_tick; - jiffies_64 += lost_ticks; - } - hpet_last = hpet_current; - - /* update the monotonic base value */ - this_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - monotonic_base += cycles_2_ns(this_offset - last_offset); - write_sequnlock(&monotonic_lock); - - /* calculate delay_at_last_interrupt */ - /* - * Time offset = (hpet delta) * ( usecs per HPET clock ) - * = (hpet delta) * ( usecs per tick / HPET clocks per tick) - * = (hpet delta) * ( hpet_usec_quotient ) / (2^32) - * Where, - * hpet_usec_quotient = (2^32 * usecs per tick)/HPET clocks per tick - */ - delay_at_last_interrupt = hpet_current - offset; - ASM_MUL64_REG(temp, delay_at_last_interrupt, - hpet_usec_quotient, delay_at_last_interrupt); -} -#endif - - - -static void mark_offset_tsc(void) -{ - unsigned long lost,delay; - unsigned long delta = last_tsc_low; - int count; - int countmp; - static int count1 = 0; - unsigned long long this_offset, last_offset; - static int lost_count = 0; - - write_seqlock(&monotonic_lock); - last_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - /* - * It is important that these two operations happen almost at - * the same time. We do the RDTSC stuff first, since it's - * faster. To avoid any inconsistencies, we need interrupts - * disabled locally. - */ - - /* - * Interrupts are just disabled locally since the timer irq - * has the SA_INTERRUPT flag set. -arca - */ - - /* read Pentium cycle counter */ - - rdtsc(last_tsc_low, last_tsc_high); - - spin_lock(&i8253_lock); - outb_p(0x00, PIT_MODE); /* latch the count ASAP */ - - count = inb_p(PIT_CH0); /* read the latched count */ - count |= inb(PIT_CH0) << 8; - - /* - * VIA686a test code... reset the latch if count > max + 1 - * from timer_pit.c - cjb - */ - if (count > LATCH) { - outb_p(0x34, PIT_MODE); - outb_p(LATCH & 0xff, PIT_CH0); - outb(LATCH >> 8, PIT_CH0); - count = LATCH - 1; - } - - spin_unlock(&i8253_lock); - - if (pit_latch_buggy) { - /* get center value of last 3 time lutch */ - if ((count2 >= count && count >= count1) - || (count1 >= count && count >= count2)) { - count2 = count1; count1 = count; - } else if ((count1 >= count2 && count2 >= count) - || (count >= count2 && count2 >= count1)) { - countmp = count;count = count2; - count2 = count1;count1 = countmp; - } else { - count2 = count1; count1 = count; count = count1; - } - } - - /* lost tick compensation */ - delta = last_tsc_low - delta; - { - register unsigned long eax, edx; - eax = delta; - __asm__("mull %2" - :"=a" (eax), "=d" (edx) - :"rm" (fast_gettimeoffset_quotient), - "0" (eax)); - delta = edx; - } - delta += delay_at_last_interrupt; - lost = delta/(1000000/HZ); - delay = delta%(1000000/HZ); - if (lost >= 2) { - jiffies_64 += lost-1; - - /* sanity check to ensure we're not always losing ticks */ - if (lost_count++ > 100) { - printk(KERN_WARNING "Losing too many ticks!\n"); - printk(KERN_WARNING "TSC cannot be used as a timesource. \n"); - printk(KERN_WARNING "Possible reasons for this are:\n"); - printk(KERN_WARNING " You're running with Speedstep,\n"); - printk(KERN_WARNING " You don't have DMA enabled for your hard disk (see hdparm),\n"); - printk(KERN_WARNING " Incorrect TSC synchronization on an SMP system (see dmesg).\n"); - printk(KERN_WARNING "Falling back to a sane timesource now.\n"); - - clock_fallback(); - } - /* ... but give the TSC a fair chance */ - if (lost_count > 25) - cpufreq_delayed_get(); - } else - lost_count = 0; - /* update the monotonic base value */ - this_offset = ((unsigned long long)last_tsc_high<<32)|last_tsc_low; - monotonic_base += cycles_2_ns(this_offset - last_offset); - write_sequnlock(&monotonic_lock); - - /* calculate delay_at_last_interrupt */ - count = ((LATCH-1) - count) * TICK_SIZE; - delay_at_last_interrupt = (count + LATCH/2) / LATCH; - - /* catch corner case where tick rollover occured - * between tsc and pit reads (as noted when - * usec delta is > 90% # of usecs/tick) - */ - if (lost && abs(delay - delay_at_last_interrupt) > (900000/HZ)) - jiffies_64++; -} - -static int __init init_tsc(char* override) -{ - - /* check clock override */ - if (override[0] && strncmp(override,"tsc",3)) { -#ifdef CONFIG_HPET_TIMER - if (is_hpet_enabled()) { - printk(KERN_ERR "Warning: clock= override failed. Defaulting to tsc\n"); - } else -#endif - { - return -ENODEV; - } - } - - /* - * If we have APM enabled or the CPU clock speed is variable - * (CPU stops clock on HLT or slows clock to save power) - * then the TSC timestamps may diverge by up to 1 jiffy from - * 'real time' but nothing will break. - * The most frequent case is that the CPU is "woken" from a halt - * state by the timer interrupt itself, so we get 0 error. In the - * rare cases where a driver would "wake" the CPU and request a - * timestamp, the maximum error is < 1 jiffy. But timestamps are - * still perfectly ordered. - * Note that the TSC counter will be reset if APM suspends - * to disk; this won't break the kernel, though, 'cuz we're - * smart. See arch/i386/kernel/apm.c. - */ - /* - * Firstly we have to do a CPU check for chips with - * a potentially buggy TSC. At this point we haven't run - * the ident/bugs checks so we must run this hook as it - * may turn off the TSC flag. - * - * NOTE: this doesn't yet handle SMP 486 machines where only - * some CPU's have a TSC. Thats never worked and nobody has - * moaned if you have the only one in the world - you fix it! - */ - - count2 = LATCH; /* initialize counter for mark_offset_tsc() */ - - if (cpu_has_tsc) { - unsigned long tsc_quotient; -#ifdef CONFIG_HPET_TIMER - if (is_hpet_enabled() && hpet_use_timer) { - unsigned long result, remain; - printk("Using TSC for gettimeofday\n"); - tsc_quotient = calibrate_tsc_hpet(NULL); - timer_tsc.mark_offset = &mark_offset_tsc_hpet; - /* - * Math to calculate hpet to usec multiplier - * Look for the comments at get_offset_tsc_hpet() - */ - ASM_DIV64_REG(result, remain, hpet_tick, - 0, KERNEL_TICK_USEC); - if (remain > (hpet_tick >> 1)) - result++; /* rounding the result */ - - hpet_usec_quotient = result; - } else -#endif - { - tsc_quotient = calibrate_tsc(); - } - - if (tsc_quotient) { - fast_gettimeoffset_quotient = tsc_quotient; - use_tsc = 1; - /* - * We could be more selective here I suspect - * and just enable this for the next intel chips ? - */ - /* report CPU clock rate in Hz. - * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) = - * clock/second. Our precision is about 100 ppm. - */ - { unsigned long eax=0, edx=1000; - __asm__("divl %2" - :"=a" (cpu_khz), "=d" (edx) - :"r" (tsc_quotient), - "0" (eax), "1" (edx)); - printk("Detected %u.%03u MHz processor.\n", - cpu_khz / 1000, cpu_khz % 1000); - } - set_cyc2ns_scale(cpu_khz/1000); - return 0; - } - } - return -ENODEV; -} - - - -/************************************************************/ - -/* tsc timer_opts struct */ -static struct timer_opts timer_tsc = { - .name = "tsc", - .mark_offset = mark_offset_tsc, - .get_offset = get_offset_tsc, - .monotonic_clock = monotonic_clock_tsc, - .delay = delay_tsc, - .read_timer = read_timer_tsc, - .resume = tsc_resume, -}; - -struct init_timer_opts __initdata timer_tsc_init = { - .init = init_tsc, - .opts = &timer_tsc, -}; ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 11/12] generic timeofday i386/x86-64 specific clocksources 2005-10-14 2:21 ` [RFC][PATCH 10/12] generic timeofday i386 arch specific changes, part 6 john stultz @ 2005-10-14 2:22 ` john stultz 2005-10-14 2:25 ` [RFC][PATCH 12/12] generic timeofday x86-64 arch specific changes john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-10-14 2:22 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, This patch implements the time sources shared between i386 and x86-64 (acpi_pm, cyclone, hpet, pit, tsc and tsc-interp). The patch should apply on top of the timeofday-arch-i386-part6 patch. The patch should be fairly straight forward, only adding the new clocksources. thanks -john Makefile | 7 ++ acpi_pm.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ cyclone.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++ hpet.c | 59 ++++++++++++++++++++++ i386_pit.c | 63 ++++++++++++++++++++++++ tsc-interp.c | 112 +++++++++++++++++++++++++++++++++++++++++++ tsc.c | 79 ++++++++++++++++++++++++++++++ 7 files changed, 610 insertions(+) linux-2.6.14-rc4_timeofday-clocks-i386_B7.patch ============================================ diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1 +1,8 @@ obj-y += jiffies.o + +obj-$(CONFIG_X86) += tsc.o +obj-$(CONFIG_X86) += i386_pit.o +#XXX doesn't boot! obj-$(CONFIG_X86) += tsc-interp.o +obj-$(CONFIG_X86_CYCLONE_TIMER) += cyclone.o +obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o +obj-$(CONFIG_HPET_TIMER) += hpet.o diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/acpi_pm.c @@ -0,0 +1,152 @@ +/* + * linux/drivers/clocksource/acpi_pm.c + * + * This file contains the ACPI PM based clocksource. + * + * This code was largely moved from the i386 timer_pm.c file + * which was (C) Dominik Brodowski <linux@brodo.de> 2003 + * and contained the following comments: + * + * Driver to use the Power Management Timer (PMTMR) available in some + * southbridges as primary timing source for the Linux kernel. + * + * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c, + * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4. + * + * This file is licensed under the GPL v2. + */ + + +#include <linux/clocksource.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <asm/io.h> + +/* Number of PMTMR ticks expected during calibration run */ +#define PMTMR_TICKS_PER_SEC 3579545 + +#if (defined(CONFIG_X86) && (!defined(CONFIG_X86_64))) +#include "mach_timer.h" +#define PMTMR_EXPECTED_RATE ((PMTMR_TICKS_PER_SEC*CALIBRATE_TIME_MSEC)/1000) +#endif + +/* The I/O port the PMTMR resides at. + * The location is detected during setup_arch(), + * in arch/i386/acpi/boot.c */ +extern u32 acpi_pmtmr_ioport; +extern int acpi_pmtmr_buggy; + +#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ + + +static inline u32 read_pmtmr(void) +{ + /* mask the output to 24 bits */ + return inl(acpi_pmtmr_ioport) & ACPI_PM_MASK; +} + +static cycle_t acpi_pm_read_verified(void) +{ + u32 v1=0,v2=0,v3=0; + /* It has been reported that because of various broken + * chipsets (ICH4, PIIX4 and PIIX4E) where the ACPI PM clock + * source is not latched, so you must read it multiple + * times to insure a safe value is read. + */ + do { + v1 = read_pmtmr(); + v2 = read_pmtmr(); + v3 = read_pmtmr(); + } while ((v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) + || (v3 > v1 && v3 < v2)); + + return (cycle_t)v2; +} + + +static cycle_t acpi_pm_read(void) +{ + return (cycle_t)read_pmtmr(); +} + +struct clocksource clocksource_acpi_pm = { + .name = "acpi_pm", + .rating = 200, + .type = CLOCKSOURCE_FUNCTION, + .read_fnct = acpi_pm_read, + .mask = (cycle_t)ACPI_PM_MASK, + .mult = 0, /*to be caluclated*/ + .shift = 22, +}; + +#if (defined(CONFIG_X86) && (!defined(CONFIG_X86_64))) +/* + * Some boards have the PMTMR running way too fast. We check + * the PMTMR rate against PIT channel 2 to catch these cases. + */ +static int __init verify_pmtmr_rate(void) +{ + u32 value1, value2; + unsigned long count, delta; + + mach_prepare_counter(); + value1 = read_pmtmr(); + mach_countup(&count); + value2 = read_pmtmr(); + delta = (value2 - value1) & ACPI_PM_MASK; + + /* Check that the PMTMR delta is within 5% of what we expect */ + if (delta < (PMTMR_EXPECTED_RATE * 19) / 20 || + delta > (PMTMR_EXPECTED_RATE * 21) / 20) { + printk(KERN_INFO "PM-Timer running at invalid rate: %lu%% of normal - aborting.\n", 100UL * delta / PMTMR_EXPECTED_RATE); + return -1; + } + + return 0; +} +#else +#define verify_pmtmr_rate() (0) +#endif + +static int __init init_acpi_pm_clocksource(void) +{ + u32 value1, value2; + unsigned int i; + + if (!acpi_pmtmr_ioport) + return -ENODEV; + + clocksource_acpi_pm.mult = clocksource_hz2mult(PMTMR_TICKS_PER_SEC, + clocksource_acpi_pm.shift); + + /* "verify" this timing source */ + value1 = read_pmtmr(); + for (i = 0; i < 10000; i++) { + value2 = read_pmtmr(); + if (value2 == value1) + continue; + if (value2 > value1) + goto pm_good; + if ((value2 < value1) && ((value2) < 0xFFF)) + goto pm_good; + printk(KERN_INFO "PM-Timer had inconsistent results: 0x%#x, 0x%#x - aborting.\n", value1, value2); + return -EINVAL; + } + printk(KERN_INFO "PM-Timer had no reasonable result: 0x%#x - aborting.\n", value1); + return -ENODEV; + +pm_good: + if (verify_pmtmr_rate() != 0) + return -ENODEV; + + /* check to see if pmtmr is known buggy */ + if (acpi_pmtmr_buggy) { + clocksource_acpi_pm.read_fnct = acpi_pm_read_verified; + clocksource_acpi_pm.rating = 110; + } + + register_clocksource(&clocksource_acpi_pm); + return 0; +} + +module_init(init_acpi_pm_clocksource); diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/cyclone.c @@ -0,0 +1,138 @@ +#include <linux/clocksource.h> +#include <linux/errno.h> +#include <linux/string.h> +#include <linux/timex.h> +#include <linux/init.h> + +#include <asm/io.h> +#include <asm/pgtable.h> +#include "mach_timer.h" + +#define CYCLONE_CBAR_ADDR 0xFEB00CD0 /* base address ptr*/ +#define CYCLONE_PMCC_OFFSET 0x51A0 /* offset to control register */ +#define CYCLONE_MPCS_OFFSET 0x51A8 /* offset to select register */ +#define CYCLONE_MPMC_OFFSET 0x51D0 /* offset to count register */ +#define CYCLONE_TIMER_FREQ 100000000 +#define CYCLONE_TIMER_MASK (0xFFFFFFFF) /* 32 bit mask */ + +int use_cyclone = 0; + +struct clocksource clocksource_cyclone = { + .name = "cyclone", + .rating = 250, + .type = CLOCKSOURCE_MMIO_32, + .mmio_ptr = NULL, /* to be set */ + .mask = (cycle_t)CYCLONE_TIMER_MASK, + .mult = 10, + .shift = 0, +}; + +static unsigned long __init calibrate_cyclone(void) +{ + u64 delta64; + unsigned long start, end; + unsigned long i, count; + unsigned long cyclone_freq_khz; + + /* repeat 3 times to make sure the cache is warm */ + for(i=0; i < 3; i++) { + mach_prepare_counter(); + start = readl(clocksource_cyclone.mmio_ptr); + mach_countup(&count); + end = readl(clocksource_cyclone.mmio_ptr); + } + + delta64 = end - start; + + delta64 += CALIBRATE_TIME_MSEC/2; /* round for do_div */ + do_div(delta64,CALIBRATE_TIME_MSEC); + + cyclone_freq_khz = (unsigned long)delta64; + + printk("calculated cyclone_freq: %lu khz\n", cyclone_freq_khz); + return cyclone_freq_khz; +} + +static int __init init_cyclone_clocksource(void) +{ + unsigned long base; /* saved value from CBAR */ + unsigned long offset; + u32 __iomem* reg; + u32 __iomem* volatile cyclone_timer; /* Cyclone MPMC0 register */ + unsigned long khz; + int i; + + /*make sure we're on a summit box*/ + if (!use_cyclone) return -ENODEV; + + printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n"); + + /* find base address */ + offset = CYCLONE_CBAR_ADDR; + reg = ioremap_nocache(offset, sizeof(reg)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n"); + return -ENODEV; + } + /* even on 64bit systems, this is only 32bits */ + base = readl(reg); + if(!base){ + printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n"); + return -ENODEV; + } + iounmap(reg); + + /* setup PMCC */ + offset = base + CYCLONE_PMCC_OFFSET; + reg = ioremap_nocache(offset, sizeof(reg)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n"); + return -ENODEV; + } + writel(0x00000001,reg); + iounmap(reg); + + /* setup MPCS */ + offset = base + CYCLONE_MPCS_OFFSET; + reg = ioremap_nocache(offset, sizeof(reg)); + if(!reg){ + printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n"); + return -ENODEV; + } + writel(0x00000001,reg); + iounmap(reg); + + /* map in cyclone_timer */ + offset = base + CYCLONE_MPMC_OFFSET; + cyclone_timer = ioremap_nocache(offset, sizeof(u64)); + if(!cyclone_timer){ + printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n"); + return -ENODEV; + } + + /*quick test to make sure its ticking*/ + for(i=0; i<3; i++){ + u32 old = readl(cyclone_timer); + int stall = 100; + while(stall--) barrier(); + if(readl(cyclone_timer) == old){ + printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n"); + iounmap(cyclone_timer); + cyclone_timer = NULL; + return -ENODEV; + } + } + clocksource_cyclone.mmio_ptr = cyclone_timer; + + /* sort out mult/shift values */ + khz = calibrate_cyclone(); + clocksource_cyclone.shift = 22; + clocksource_cyclone.mult = clocksource_khz2mult(khz, + clocksource_cyclone.shift); + + register_clocksource(&clocksource_cyclone); + + return 0; +} + +module_init(init_cyclone_clocksource); diff --git a/drivers/clocksource/hpet.c b/drivers/clocksource/hpet.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/hpet.c @@ -0,0 +1,59 @@ +#include <linux/clocksource.h> +#include <linux/hpet.h> +#include <linux/errno.h> +#include <linux/init.h> +#include <asm/io.h> +#include <asm/hpet.h> + +#define HPET_MASK (0xFFFFFFFF) +#define HPET_SHIFT 22 + +/* FSEC = 10^-15 NSEC = 10^-9 */ +#define FSEC_PER_NSEC 1000000 + +struct clocksource clocksource_hpet = { + .name = "hpet", + .rating = 250, + .type = CLOCKSOURCE_MMIO_32, + .mmio_ptr = NULL, + .mask = (cycle_t)HPET_MASK, + .mult = 0, /* set below */ + .shift = HPET_SHIFT, +}; + +static int __init init_hpet_clocksource(void) +{ + unsigned long hpet_period; + void __iomem* hpet_base; + u64 tmp; + + if (!hpet_address) + return -ENODEV; + + /* calculate the hpet address */ + hpet_base = + (void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE); + clocksource_hpet.mmio_ptr = hpet_base + HPET_COUNTER; + + /* calculate the frequency */ + hpet_period = readl(hpet_base + HPET_PERIOD); + + + /* hpet period is in femto seconds per cycle + * so we need to convert this to ns/cyc units + * aproximated by mult/2^shift + * + * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift + * fsec/cyc * 1ns/1000000fsec * 2^shift = mult + * fsec/cyc * 2^shift * 1nsec/1000000fsec = mult + * (fsec/cyc << shift)/1000000 = mult + * (hpet_period << shift)/FSEC_PER_NSEC = mult + */ + tmp = (u64)hpet_period << HPET_SHIFT; + do_div(tmp, FSEC_PER_NSEC); + clocksource_hpet.mult = (u32)tmp; + + register_clocksource(&clocksource_hpet); + return 0; +} +module_init(init_hpet_clocksource); diff --git a/drivers/clocksource/i386_pit.c b/drivers/clocksource/i386_pit.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/i386_pit.c @@ -0,0 +1,63 @@ +#include <linux/clocksource.h> +#include <linux/jiffies.h> +#include <linux/init.h> +/* pit clocksource does not build on x86-64 */ +#ifndef CONFIG_X86_64 +#include <asm/io.h> +#include <asm/i8253.h> +#include "io_ports.h" + +/* Since the PIT overflows every tick, its not very useful + * to just read by itself. So use jiffies to emulate a free + * running counter. + */ + +static cycle_t pit_read(void) +{ + unsigned long flags, seq; + int count; + u64 jifs; + + do { + seq = read_seqbegin(&xtime_lock); + + spin_lock_irqsave(&i8253_lock, flags); + + outb_p(0x00, PIT_MODE); /* latch the count ASAP */ + count = inb_p(PIT_CH0); /* read the latched count */ + count |= inb_p(PIT_CH0) << 8; + + /* VIA686a test code... reset the latch if count > max + 1 */ + if (count > LATCH) { + outb_p(0x34, PIT_MODE); + outb_p(LATCH & 0xff, PIT_CH0); + outb(LATCH >> 8, PIT_CH0); + count = LATCH - 1; + } + spin_unlock_irqrestore(&i8253_lock, flags); + jifs = get_jiffies_64() - INITIAL_JIFFIES; + } while (read_seqretry(&xtime_lock, seq)); + + count = (LATCH-1) - count; + + return (cycle_t)(jifs * LATCH) + count; +} + +static struct clocksource clocksource_pit = { + .name = "pit", + .rating = 110, + .type = CLOCKSOURCE_FUNCTION, + .read_fnct = pit_read, + .mask = (cycle_t)-1, + .mult = 0, + .shift = 20, +}; + +static int __init init_pit_clocksource(void) +{ + clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20); + register_clocksource(&clocksource_pit); + return 0; +} +module_init(init_pit_clocksource); +#endif diff --git a/drivers/clocksource/tsc-interp.c b/drivers/clocksource/tsc-interp.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/tsc-interp.c @@ -0,0 +1,112 @@ +/* TSC-Jiffies Interpolation clocksource + Example interpolation clocksource. +TODO: + o per-cpu TSC offsets +*/ +#include <linux/clocksource.h> +#include <linux/timer.h> +#include <linux/timex.h> +#include <linux/init.h> +#include <linux/jiffies.h> +#include <linux/threads.h> +#include <linux/smp.h> + +static unsigned long current_tsc_khz = 0; + +static seqlock_t tsc_interp_lock = SEQLOCK_UNLOCKED; +static unsigned long tsc_then; +static unsigned long jiffies_then; +struct timer_list tsc_interp_timer; + +static unsigned long mult, shift; + +#define NSEC_PER_JIFFY ((((unsigned long long)NSEC_PER_SEC)<<8)/ACTHZ) +#define SHIFT_VAL 22 + +static cycle_t read_tsc_interp(void); +static void tsc_interp_update_callback(void); + +static struct clocksource clocksource_tsc_interp = { + .name = "tsc-interp", + .rating = 150, + .type = CLOCKSOURCE_FUNCTION, + .read_fnct = read_tsc_interp, + .mask = (cycle_t)((1ULL<<32)-1), + .mult = 1<<SHIFT_VAL, + .shift = SHIFT_VAL, + .update_callback = tsc_interp_update_callback, +}; + +static void tsc_interp_sync(unsigned long unused) +{ + cycle_t tsc_now; + unsigned long jiffies_now; + + do { + jiffies_now = jiffies; + rdtscll(tsc_now); + } while (jiffies_now != jiffies); + + write_seqlock(&tsc_interp_lock); + jiffies_then = jiffies_now; + tsc_then = tsc_now; + write_sequnlock(&tsc_interp_lock); + + mod_timer(&tsc_interp_timer, jiffies+1); +} + + +static cycle_t read_tsc_interp(void) +{ + cycle_t ret; + cycle_t now, then; + unsigned long jiffs_now, jiffs_then; + unsigned long seq; + + do { + seq = read_seqbegin(&tsc_interp_lock); + + jiffs_now = jiffies; + jiffs_then = jiffies_then; + then = tsc_then; + + } while (read_seqretry(&tsc_interp_lock, seq)); + + rdtscll(now); + ret = (cycle_t)jiffs_then * NSEC_PER_JIFFY; + if (jiffs_then == jiffs_now) + ret += min((cycle_t)NSEC_PER_JIFFY,(cycle_t)((now - then)*mult)>> shift); + else + ret += (cycle_t)(jiffs_now - jiffs_then)*NSEC_PER_JIFFY; + + return ret; +} + +static void tsc_interp_update_callback(void) +{ + /* only update if tsc_khz has changed */ + if (current_tsc_khz != tsc_khz){ + current_tsc_khz = tsc_khz; + mult = clocksource_khz2mult(current_tsc_khz, shift); + } +} + + +static int __init init_tsc_interp_clocksource(void) +{ + /* TSC initialization is done in arch/i386/kernel/tsc.c */ + if (cpu_has_tsc && tsc_khz) { + current_tsc_khz = tsc_khz; + shift = SHIFT_VAL; + mult = clocksource_khz2mult(current_tsc_khz, shift); + /* setup periodic soft-timer */ + init_timer(&tsc_interp_timer); + tsc_interp_timer.function = tsc_interp_sync; + tsc_interp_timer.expires = jiffies; + add_timer(&tsc_interp_timer); + + register_clocksource(&clocksource_tsc_interp); + } + return 0; +} +module_init(init_tsc_interp_clocksource); diff --git a/drivers/clocksource/tsc.c b/drivers/clocksource/tsc.c new file mode 100644 --- /dev/null +++ b/drivers/clocksource/tsc.c @@ -0,0 +1,79 @@ +/* TODO: + * o better calibration + */ + +#include <linux/clocksource.h> +#include <linux/string.h> +#include <linux/timex.h> +#include <linux/init.h> + +static unsigned long current_tsc_khz = 0; + +static cycle_t read_safe_tsc(void); +static int tsc_update_callback(void); + + +static struct clocksource clocksource_raw_tsc = { + .name = "tsc", + .rating = 300, + .type = CLOCKSOURCE_CYCLES, + .mask = (cycle_t)-1, + .mult = 0, /* to be set */ + .shift = 22, + .update_callback = tsc_update_callback, +}; + +static struct clocksource clocksource_tsc; + +static cycle_t read_safe_tsc(void) +{ + cycle_t ret; + rdtscll(ret); + return ret + tsc_read_c3_time(); +} + +static int tsc_update_callback(void) +{ + int change = 0; + /* check to see if we should switch to the safe clocksource */ + if (tsc_read_c3_time() && + strncmp(clocksource_tsc.name, "c3tsc", 5)) { + printk("Falling back to C3 safe TSC\n"); + clocksource_tsc.read_fnct = read_safe_tsc; + clocksource_tsc.type = CLOCKSOURCE_FUNCTION; + clocksource_tsc.name = "c3tsc"; + change = 1; + } + + if (clocksource_tsc.rating != 50 && check_tsc_unstable()) { + clocksource_tsc.rating = 50; + reselect_clocksource(); + change = 1; + } + /* only update if tsc_khz has changed */ + if (current_tsc_khz != tsc_khz){ + current_tsc_khz = tsc_khz; + clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, + clocksource_tsc.shift); + change = 1; + } + return change; +} + +static int __init init_tsc_clocksource(void) +{ + + clocksource_tsc = clocksource_raw_tsc; + + /* TSC initialization is done in arch/i386/kernel/tsc.c */ + if (cpu_has_tsc && tsc_khz) { + current_tsc_khz = tsc_khz; + clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, + clocksource_tsc.shift); + register_clocksource(&clocksource_tsc); + } + return 0; +} + +module_init(init_tsc_clocksource); + ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 12/12] generic timeofday x86-64 arch specific changes 2005-10-14 2:22 ` [RFC][PATCH 11/12] generic timeofday i386/x86-64 specific clocksources john stultz @ 2005-10-14 2:25 ` john stultz 0 siblings, 0 replies; 16+ messages in thread From: john stultz @ 2005-10-14 2:25 UTC (permalink / raw) To: lkml Cc: Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart All, This patch converts the x86-64 arch to use the generic timeofday infrastructure. It applies ontop of my timeofday-core patch (or ontop of my i386 cumulative patch). This is a full conversion, so most of this patch is subtractions removing the existing arch specific time keeping code. This patch does not provide any x86-64 clocksourcs, so using this patch alone on top of the timeofday-core patch will only give you the jiffies clocksource. To get full replacements for the code being removed here, the following timeofday-clocks-i386 patch (x86-64 shares the same clocksources as i386) will need to be applied as well. thanks -john arch/x86_64/kernel/pmtimer.c | 101 ---------- b/arch/i386/kernel/acpi/boot.c | 9 b/arch/x86_64/Kconfig | 8 b/arch/x86_64/kernel/Makefile | 1 b/arch/x86_64/kernel/time.c | 365 ++++--------------------------------- b/arch/x86_64/kernel/vmlinux.lds.S | 7 b/arch/x86_64/kernel/vsyscall.c | 133 ++++++++++--- b/include/asm-generic/div64.h | 9 b/include/asm-x86_64/hpet.h | 3 b/include/asm-x86_64/timeofday.h | 4 b/include/asm-x86_64/timex.h | 4 b/include/asm-x86_64/vsyscall.h | 2 12 files changed, 194 insertions(+), 452 deletions(-) linux-2.6.14-rc4_timeofday-arch-x86-64_B7.patch ============================================ diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -570,7 +570,7 @@ static int __init acpi_parse_sbf(unsigne } #ifdef CONFIG_HPET_TIMER - +#include <asm/hpet.h> static int __init acpi_parse_hpet(unsigned long phys, unsigned long size) { struct acpi_table_hpet *hpet_tbl; @@ -592,6 +592,7 @@ static int __init acpi_parse_hpet(unsign #ifdef CONFIG_X86_64 vxtime.hpet_address = hpet_tbl->addr.addrl | ((long)hpet_tbl->addr.addrh << 32); + hpet_address = vxtime.hpet_address; printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", hpet_tbl->id, vxtime.hpet_address); @@ -600,10 +601,10 @@ static int __init acpi_parse_hpet(unsign extern unsigned long hpet_address; hpet_address = hpet_tbl->addr.addrl; - printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", - hpet_tbl->id, hpet_address); } -#endif /* X86 */ +#endif /* X86 */ + printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n", + hpet_tbl->id, hpet_address); return 0; } diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -24,6 +24,14 @@ config X86 bool default y +config GENERICTOD + bool + default y + +config GENERICTOD_VSYSCALL + bool + default y + config SEMAPHORE_SLEEPERS bool default y diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -29,7 +29,6 @@ obj-$(CONFIG_GART_IOMMU) += pci-gart.o a obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_KPROBES) += kprobes.o -obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o obj-$(CONFIG_MODULES) += module.o diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86_64/kernel/pmtimer.c deleted file mode 100644 --- a/arch/x86_64/kernel/pmtimer.c +++ /dev/null @@ -1,101 +0,0 @@ -/* Ported over from i386 by AK, original copyright was: - * - * (C) Dominik Brodowski <linux@brodo.de> 2003 - * - * Driver to use the Power Management Timer (PMTMR) available in some - * southbridges as primary timing source for the Linux kernel. - * - * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c, - * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4. - * - * This file is licensed under the GPL v2. - * - * Dropped all the hardware bug workarounds for now. Hopefully they - * are not needed on 64bit chipsets. - */ - -#include <linux/jiffies.h> -#include <linux/kernel.h> -#include <linux/time.h> -#include <linux/init.h> -#include <linux/cpumask.h> -#include <asm/io.h> -#include <asm/proto.h> -#include <asm/msr.h> -#include <asm/vsyscall.h> - -/* The I/O port the PMTMR resides at. - * The location is detected during setup_arch(), - * in arch/i386/kernel/acpi/boot.c */ -u32 pmtmr_ioport; - -/* value of the Power timer at last timer interrupt */ -static u32 offset_delay; -static u32 last_pmtmr_tick; - -#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ - -static inline u32 cyc2us(u32 cycles) -{ - /* The Power Management Timer ticks at 3.579545 ticks per microsecond. - * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%] - * - * Even with HZ = 100, delta is at maximum 35796 ticks, so it can - * easily be multiplied with 286 (=0x11E) without having to fear - * u32 overflows. - */ - cycles *= 286; - return (cycles >> 10); -} - -int pmtimer_mark_offset(void) -{ - static int first_run = 1; - unsigned long tsc; - u32 lost; - - u32 tick = inl(pmtmr_ioport); - u32 delta; - - delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK); - - last_pmtmr_tick = tick; - monotonic_base += delta * NSEC_PER_USEC; - - delta += offset_delay; - - lost = delta / (USEC_PER_SEC / HZ); - offset_delay = delta % (USEC_PER_SEC / HZ); - - rdtscll(tsc); - vxtime.last_tsc = tsc - offset_delay * cpu_khz; - - /* don't calculate delay for first run, - or if we've got less then a tick */ - if (first_run || (lost < 1)) { - first_run = 0; - offset_delay = 0; - } - - return lost - 1; -} - -unsigned int do_gettimeoffset_pm(void) -{ - u32 now, offset, delta = 0; - - offset = last_pmtmr_tick; - now = inl(pmtmr_ioport); - delta = (now - offset) & ACPI_PM_MASK; - - return offset_delay + cyc2us(delta); -} - - -static int __init nopmtimer_setup(char *s) -{ - pmtmr_ioport = 0; - return 0; -} - -__setup("nopmtimer", nopmtimer_setup); diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -38,6 +38,7 @@ #include <asm/sections.h> #include <linux/cpufreq.h> #include <linux/hpet.h> +#include <linux/timeofday.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/apic.h> #endif @@ -46,9 +47,6 @@ u64 jiffies_64 = INITIAL_JIFFIES; EXPORT_SYMBOL(jiffies_64); -#ifdef CONFIG_CPU_FREQ -static void cpufreq_delayed_get(void); -#endif extern void i8254_timer_resume(void); extern int using_apic_timer; @@ -60,7 +58,9 @@ static int notsc __initdata = 0; #undef HPET_HACK_ENABLE_DANGEROUS -unsigned int cpu_khz; /* TSC clocks / usec, not used here */ +unsigned int cpu_khz; /* CPU clocks / usec, not used here */ +unsigned int tsc_khz; /* TSC clocks / usec, not used here */ +unsigned long hpet_address; static unsigned long hpet_period; /* fsecs / HPET clock */ unsigned long hpet_tick; /* HPET clocks / interrupt */ static int hpet_use_timer; @@ -83,107 +83,6 @@ static inline void rdtscll_sync(unsigned rdtscll(*tsc); } -/* - * do_gettimeoffset() returns microseconds since last timer interrupt was - * triggered by hardware. A memory read of HPET is slower than a register read - * of TSC, but much more reliable. It's also synchronized to the timer - * interrupt. Note that do_gettimeoffset() may return more than hpet_tick, if a - * timer interrupt has happened already, but vxtime.trigger wasn't updated yet. - * This is not a problem, because jiffies hasn't updated either. They are bound - * together by xtime_lock. - */ - -static inline unsigned int do_gettimeoffset_tsc(void) -{ - unsigned long t; - unsigned long x; - rdtscll_sync(&t); - if (t < vxtime.last_tsc) t = vxtime.last_tsc; /* hack */ - x = ((t - vxtime.last_tsc) * vxtime.tsc_quot) >> 32; - return x; -} - -static inline unsigned int do_gettimeoffset_hpet(void) -{ - /* cap counter read to one tick to avoid inconsistencies */ - unsigned long counter = hpet_readl(HPET_COUNTER) - vxtime.last; - return (min(counter,hpet_tick) * vxtime.quot) >> 32; -} - -unsigned int (*do_gettimeoffset)(void) = do_gettimeoffset_tsc; - -/* - * This version of gettimeofday() has microsecond resolution and better than - * microsecond precision, as we're using at least a 10 MHz (usually 14.31818 - * MHz) HPET timer. - */ - -void do_gettimeofday(struct timeval *tv) -{ - unsigned long seq, t; - unsigned int sec, usec; - - do { - seq = read_seqbegin(&xtime_lock); - - sec = xtime.tv_sec; - usec = xtime.tv_nsec / 1000; - - /* i386 does some correction here to keep the clock - monotonous even when ntpd is fixing drift. - But they didn't work for me, there is a non monotonic - clock anyways with ntp. - I dropped all corrections now until a real solution can - be found. Note when you fix it here you need to do the same - in arch/x86_64/kernel/vsyscall.c and export all needed - variables in vmlinux.lds. -AK */ - - t = (jiffies - wall_jiffies) * (1000000L / HZ) + - do_gettimeoffset(); - usec += t; - - } while (read_seqretry(&xtime_lock, seq)); - - tv->tv_sec = sec + usec / 1000000; - tv->tv_usec = usec % 1000000; -} - -EXPORT_SYMBOL(do_gettimeofday); - -/* - * settimeofday() first undoes the correction that gettimeofday would do - * on the time, and then saves it. This is ugly, but has been like this for - * ages already. - */ - -int do_settimeofday(struct timespec *tv) -{ - time_t wtm_sec, sec = tv->tv_sec; - long wtm_nsec, nsec = tv->tv_nsec; - - if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) - return -EINVAL; - - write_seqlock_irq(&xtime_lock); - - nsec -= do_gettimeoffset() * 1000 + - (jiffies - wall_jiffies) * (NSEC_PER_SEC/HZ); - - wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); - wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); - - set_normalized_timespec(&xtime, sec, nsec); - set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - - ntp_clear(); - - write_sequnlock_irq(&xtime_lock); - clock_was_set(); - return 0; -} - -EXPORT_SYMBOL(do_settimeofday); - unsigned long profile_pc(struct pt_regs *regs) { unsigned long pc = instruction_pointer(regs); @@ -283,90 +182,8 @@ static void set_rtc_mmss(unsigned long n spin_unlock(&rtc_lock); } - -/* monotonic_clock(): returns # of nanoseconds passed since time_init() - * Note: This function is required to return accurate - * time even in the absence of multiple timer ticks. - */ -unsigned long long monotonic_clock(void) -{ - unsigned long seq; - u32 last_offset, this_offset, offset; - unsigned long long base; - - if (vxtime.mode == VXTIME_HPET) { - do { - seq = read_seqbegin(&xtime_lock); - - last_offset = vxtime.last; - base = monotonic_base; - this_offset = hpet_readl(HPET_COUNTER); - - } while (read_seqretry(&xtime_lock, seq)); - offset = (this_offset - last_offset); - offset *=(NSEC_PER_SEC/HZ)/hpet_tick; - return base + offset; - }else{ - do { - seq = read_seqbegin(&xtime_lock); - - last_offset = vxtime.last_tsc; - base = monotonic_base; - } while (read_seqretry(&xtime_lock, seq)); - sync_core(); - rdtscll(this_offset); - offset = (this_offset - last_offset)*1000/cpu_khz; - return base + offset; - } - - -} -EXPORT_SYMBOL(monotonic_clock); - -static noinline void handle_lost_ticks(int lost, struct pt_regs *regs) -{ - static long lost_count; - static int warned; - - if (report_lost_ticks) { - printk(KERN_WARNING "time.c: Lost %d timer " - "tick(s)! ", lost); - print_symbol("rip %s)\n", regs->rip); - } - - if (lost_count == 1000 && !warned) { - printk(KERN_WARNING - "warning: many lost ticks.\n" - KERN_WARNING "Your time source seems to be instable or " - "some driver is hogging interupts\n"); - print_symbol("rip %s\n", regs->rip); - if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) { - printk(KERN_WARNING "Falling back to HPET\n"); - vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick; - vxtime.mode = VXTIME_HPET; - do_gettimeoffset = do_gettimeoffset_hpet; - } - /* else should fall back to PIT, but code missing. */ - warned = 1; - } else - lost_count++; - -#ifdef CONFIG_CPU_FREQ - /* In some cases the CPU can change frequency without us noticing - (like going into thermal throttle) - Give cpufreq a change to catch up. */ - if ((lost_count+1) % 25 == 0) { - cpufreq_delayed_get(); - } -#endif -} - static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - static unsigned long rtc_update = 0; - unsigned long tsc; - int delay, offset = 0, lost = 0; - /* * Here we are in the timer irq handler. We have irqs locally disabled (so we * don't need spin_lock_irqsave()) but we don't know if the timer_bh is running @@ -376,67 +193,6 @@ static irqreturn_t timer_interrupt(int i write_seqlock(&xtime_lock); - if (vxtime.hpet_address) - offset = hpet_readl(HPET_COUNTER); - - if (hpet_use_timer) { - /* if we're using the hpet timer functionality, - * we can more accurately know the counter value - * when the timer interrupt occured. - */ - offset = hpet_readl(HPET_T0_CMP) - hpet_tick; - delay = hpet_readl(HPET_COUNTER) - offset; - } else { - spin_lock(&i8253_lock); - outb_p(0x00, 0x43); - delay = inb_p(0x40); - delay |= inb(0x40) << 8; - spin_unlock(&i8253_lock); - delay = LATCH - 1 - delay; - } - - rdtscll_sync(&tsc); - - if (vxtime.mode == VXTIME_HPET) { - if (offset - vxtime.last > hpet_tick) { - lost = (offset - vxtime.last) / hpet_tick - 1; - } - - monotonic_base += - (offset - vxtime.last)*(NSEC_PER_SEC/HZ) / hpet_tick; - - vxtime.last = offset; -#ifdef CONFIG_X86_PM_TIMER - } else if (vxtime.mode == VXTIME_PMTMR) { - lost = pmtimer_mark_offset(); -#endif - } else { - offset = (((tsc - vxtime.last_tsc) * - vxtime.tsc_quot) >> 32) - (USEC_PER_SEC / HZ); - - if (offset < 0) - offset = 0; - - if (offset > (USEC_PER_SEC / HZ)) { - lost = offset / (USEC_PER_SEC / HZ); - offset %= (USEC_PER_SEC / HZ); - } - - monotonic_base += (tsc - vxtime.last_tsc)*1000000/cpu_khz ; - - vxtime.last_tsc = tsc - vxtime.quot * delay / vxtime.tsc_quot; - - if ((((tsc - vxtime.last_tsc) * - vxtime.tsc_quot) >> 32) < offset) - vxtime.last_tsc = tsc - - (((long) offset << 32) / vxtime.tsc_quot) - 1; - } - - if (lost > 0) { - handle_lost_ticks(lost, regs); - jiffies += lost; - } - /* * Do the timer stuff. */ @@ -459,25 +215,24 @@ static irqreturn_t timer_interrupt(int i smp_local_timer_interrupt(regs); #endif -/* - * If we have an externally synchronized Linux clock, then update CMOS clock - * accordingly every ~11 minutes. set_rtc_mmss() will be called in the jiffy - * closest to exactly 500 ms before the next second. If the update fails, we - * don't care, as it'll be updated on the next turn, and the problem (time way - * off) isn't likely to go away much sooner anyway. - */ - - if (ntp_synced() && xtime.tv_sec > rtc_update && - abs(xtime.tv_nsec - 500000000) <= tick_nsec / 2) { - set_rtc_mmss(xtime.tv_sec); - rtc_update = xtime.tv_sec + 660; - } - write_sequnlock(&xtime_lock); return IRQ_HANDLED; } +/* Code to compensate for C3 stalls */ +static u64 tsc_c3_offset; +void tsc_c3_compensate(unsigned long usecs) +{ + u64 cycles = (usecs * tsc_khz)/1000; + tsc_c3_offset += cycles; +} + +u64 tsc_read_c3_time(void) +{ + return tsc_c3_offset; +} + static unsigned int cyc2ns_scale; #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */ @@ -573,6 +328,30 @@ unsigned long get_cmos_time(void) return mktime(year, mon, day, hour, min, sec); } +/* arch specific timeofday hooks */ +u64 read_persistent_clock(void) +{ + return (u64)get_cmos_time() * NSEC_PER_SEC; +} + +void sync_persistent_clock(struct timespec ts) +{ + static unsigned long rtc_update = 0; + /* + * If we have an externally synchronized Linux clock, then update + * CMOS clock accordingly every ~11 minutes. set_rtc_mmss() will + * be called in the jiffy closest to exactly 500 ms before the + * next second. If the update fails, we don't care, as it'll be + * updated on the next turn, and the problem (time way off) isn't + * likely to go away much sooner anyway. + */ + if (ts.tv_sec > rtc_update && + abs(ts.tv_nsec - 500000000) <= tick_nsec / 2) { + set_rtc_mmss(xtime.tv_sec); + rtc_update = xtime.tv_sec + 660; + } +} + #ifdef CONFIG_CPU_FREQ /* Frequency scaling support. Adjust the TSC based timer when the cpu frequency @@ -600,23 +379,6 @@ static void handle_cpufreq_delayed_get(v cpufreq_delayed_issched = 0; } -/* if we notice lost ticks, schedule a call to cpufreq_get() as it tries - * to verify the CPU frequency the timing core thinks the CPU is running - * at is still correct. - */ -static void cpufreq_delayed_get(void) -{ - static int warned; - if (cpufreq_init && !cpufreq_delayed_issched) { - cpufreq_delayed_issched = 1; - if (!warned) { - warned = 1; - printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n"); - } - schedule_work(&cpufreq_delayed_get_work); - } -} - static unsigned int ref_freq = 0; static unsigned long loops_per_jiffy_ref = 0; @@ -651,8 +413,11 @@ static int time_cpufreq_notifier(struct cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new); cpu_khz = cpufreq_scale(cpu_khz_ref, ref_freq, freq->new); - if (!(freq->flags & CPUFREQ_CONST_LOOPS)) + if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { vxtime.tsc_quot = (1000L << 32) / cpu_khz; + tsc_khz = cpu_khz; + } + } set_cyc2ns_scale(cpu_khz_ref / 1000); @@ -916,18 +681,12 @@ void __init time_init(void) if (hpet_use_timer) { cpu_khz = hpet_calibrate_tsc(); timename = "HPET"; -#ifdef CONFIG_X86_PM_TIMER - } else if (pmtmr_ioport) { - vxtime_hz = PM_TIMER_FREQUENCY; - timename = "PM"; - pit_init(); - cpu_khz = pit_calibrate_tsc(); -#endif } else { pit_init(); cpu_khz = pit_calibrate_tsc(); timename = "PIT"; } + tsc_khz = cpu_khz; printk(KERN_INFO "time.c: Using %ld.%06ld MHz %s timer.\n", vxtime_hz / 1000000, vxtime_hz % 1000000, timename); @@ -950,7 +709,7 @@ void __init time_init(void) * Make an educated guess if the TSC is trustworthy and synchronized * over all CPUs. */ -static __init int unsynchronized_tsc(void) +int check_tsc_unstable(void) { #ifdef CONFIG_SMP if (oem_force_hpet_timer()) @@ -969,31 +728,8 @@ static __init int unsynchronized_tsc(voi */ void __init time_init_gtod(void) { - char *timetype; - - if (unsynchronized_tsc()) + if (check_tsc_unstable()) notsc = 1; - if (vxtime.hpet_address && notsc) { - timetype = hpet_use_timer ? "HPET" : "PIT/HPET"; - vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick; - vxtime.mode = VXTIME_HPET; - do_gettimeoffset = do_gettimeoffset_hpet; -#ifdef CONFIG_X86_PM_TIMER - /* Using PM for gettimeofday is quite slow, but we have no other - choice because the TSC is too unreliable on some systems. */ - } else if (pmtmr_ioport && !vxtime.hpet_address && notsc) { - timetype = "PM"; - do_gettimeoffset = do_gettimeoffset_pm; - vxtime.mode = VXTIME_PMTMR; - sysctl_vsyscall = 0; - printk(KERN_INFO "Disabling vsyscall due to use of PM timer\n"); -#endif - } else { - timetype = hpet_use_timer ? "HPET/TSC" : "PIT/TSC"; - vxtime.mode = VXTIME_TSC; - } - - printk(KERN_INFO "time.c: Using %s based timekeeping.\n", timetype); } __setup("report_lost_ticks", time_setup); @@ -1016,7 +752,6 @@ static int timer_suspend(struct sys_devi static int timer_resume(struct sys_device *dev) { - unsigned long flags; unsigned long sec; unsigned long ctime = get_cmos_time(); unsigned long sleep_length = (ctime - sleep_start) * HZ; @@ -1027,10 +762,6 @@ static int timer_resume(struct sys_devic i8254_timer_resume(); sec = ctime + clock_cmos_diff; - write_seqlock_irqsave(&xtime_lock,flags); - xtime.tv_sec = sec; - xtime.tv_nsec = 0; - write_sequnlock_irqrestore(&xtime_lock,flags); jiffies += sleep_length; wall_jiffies += sleep_length; touch_softlockup_watchdog(); diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S @@ -99,6 +99,13 @@ SECTIONS .jiffies : AT(VLOAD(.jiffies)) { *(.jiffies) } jiffies = VVIRT(.jiffies); + .vsyscall_gtod_data : AT(VLOAD(.vsyscall_gtod_data)) { *(.vsyscall_gtod_data) } + vsyscall_gtod_data = VVIRT(.vsyscall_gtod_data); + + .vsyscall_gtod_lock : AT(VLOAD(.vsyscall_gtod_lock)) { *(.vsyscall_gtod_lock) } + vsyscall_gtod_lock = VVIRT(.vsyscall_gtod_lock); + + .vsyscall_1 ADDR(.vsyscall_0) + 1024: AT(VLOAD(.vsyscall_1)) { *(.vsyscall_1) } .vsyscall_2 ADDR(.vsyscall_0) + 2048: AT(VLOAD(.vsyscall_2)) { *(.vsyscall_2) } .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { *(.vsyscall_3) } diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c --- a/arch/x86_64/kernel/vsyscall.c +++ b/arch/x86_64/kernel/vsyscall.c @@ -19,6 +19,8 @@ * want per guest time just set the kernel.vsyscall64 sysctl to 0. */ +#include <linux/timeofday.h> +#include <linux/clocksource.h> #include <linux/time.h> #include <linux/init.h> #include <linux/kernel.h> @@ -40,6 +42,21 @@ int __sysctl_vsyscall __section_sysctl_vsyscall = 1; seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED; + +struct vsyscall_gtod_data_t { + struct timeval wall_time_tv; + struct timezone sys_tz; + cycle_t offset_base; + struct clocksource clock; +}; + +extern struct vsyscall_gtod_data_t vsyscall_gtod_data; +struct vsyscall_gtod_data_t __vsyscall_gtod_data __section_vsyscall_gtod_data; + +extern seqlock_t vsyscall_gtod_lock; +seqlock_t __vsyscall_gtod_lock __section_vsyscall_gtod_lock = SEQLOCK_UNLOCKED; + + #include <asm/unistd.h> static force_inline void timeval_normalize(struct timeval * tv) @@ -53,40 +70,54 @@ static force_inline void timeval_normali } } -static force_inline void do_vgettimeofday(struct timeval * tv) +/* XXX - this is ugly. gettimeofday() has a label in it so we can't + call it twice. + */ +static force_inline int syscall_gtod(struct timeval *tv, struct timezone *tz) { - long sequence, t; - unsigned long sec, usec; - + int ret; + asm volatile("syscall" + : "=a" (ret) + : "0" (__NR_gettimeofday),"D" (tv),"S" (tz) : __syscall_clobber ); + return ret; +} +static force_inline void do_vgettimeofday(struct timeval* tv) +{ + cycle_t now, cycle_delta; + nsec_t nsec_delta; + unsigned long seq; do { - sequence = read_seqbegin(&__xtime_lock); - - sec = __xtime.tv_sec; - usec = (__xtime.tv_nsec / 1000) + - (__jiffies - __wall_jiffies) * (1000000 / HZ); - - if (__vxtime.mode != VXTIME_HPET) { - sync_core(); - rdtscll(t); - if (t < __vxtime.last_tsc) - t = __vxtime.last_tsc; - usec += ((t - __vxtime.last_tsc) * - __vxtime.tsc_quot) >> 32; - /* See comment in x86_64 do_gettimeofday. */ - } else { - usec += ((readl((void *)fix_to_virt(VSYSCALL_HPET) + 0xf0) - - __vxtime.last) * __vxtime.quot) >> 32; + seq = read_seqbegin(&__vsyscall_gtod_lock); + + if (__vsyscall_gtod_data.clock.type == CLOCKSOURCE_FUNCTION) { + syscall_gtod(tv, NULL); + return; } - } while (read_seqretry(&__xtime_lock, sequence)); - tv->tv_sec = sec + usec / 1000000; - tv->tv_usec = usec % 1000000; + /* read the timeosurce and calc cycle_delta */ + now = read_clocksource(&__vsyscall_gtod_data.clock); + cycle_delta = (now - __vsyscall_gtod_data.offset_base) + & __vsyscall_gtod_data.clock.mask; + + /* convert cycles to nsecs */ + nsec_delta = cycle_delta * __vsyscall_gtod_data.clock.mult; + nsec_delta = nsec_delta >> __vsyscall_gtod_data.clock.shift; + + /* add nsec offset to wall_time_tv */ + *tv = __vsyscall_gtod_data.wall_time_tv; + do_div(nsec_delta, NSEC_PER_USEC); + tv->tv_usec += (unsigned long) nsec_delta; + while (tv->tv_usec > USEC_PER_SEC) { + tv->tv_sec += 1; + tv->tv_usec -= USEC_PER_SEC; + } + } while (read_seqretry(&__vsyscall_gtod_lock, seq)); } /* RED-PEN may want to readd seq locking, but then the variable should be write-once. */ static force_inline void do_get_tz(struct timezone * tz) { - *tz = __sys_tz; + *tz = __vsyscall_gtod_data.sys_tz; } static force_inline int gettimeofday(struct timeval *tv, struct timezone *tz) @@ -122,11 +153,13 @@ int __vsyscall(0) vgettimeofday(struct t * unlikely */ time_t __vsyscall(1) vtime(time_t *t) { + struct timeval tv; if (unlikely(!__sysctl_vsyscall)) return time_syscall(t); - else if (t) - *t = __xtime.tv_sec; - return __xtime.tv_sec; + vgettimeofday(&tv, 0); + if (t) + *t = tv.tv_sec; + return tv.tv_sec; } long __vsyscall(2) venosys_0(void) @@ -139,6 +172,49 @@ long __vsyscall(3) venosys_1(void) return -ENOSYS; } +struct clocksource* curr_clock; + +void arch_update_vsyscall_gtod(struct timespec wall_time, cycle_t offset_base, + struct clocksource *clock, int ntp_adj) +{ + unsigned long flags; + + write_seqlock_irqsave(&vsyscall_gtod_lock, flags); + + /* XXX - hackitty hack hack. this is terrible! */ + if (curr_clock != clock) { + if ((clock->type == CLOCKSOURCE_MMIO_32) + || (clock->type == CLOCKSOURCE_MMIO_64)) { + unsigned long vaddr = (unsigned long)clock->mmio_ptr; + pgd_t *pgd = pgd_offset_k(vaddr); + pud_t *pud = pud_offset(pgd, vaddr); + pmd_t *pmd = pmd_offset(pud,vaddr); + pte_t *pte = pte_offset_kernel(pmd, vaddr); + *pte = pte_mkread(*pte); + } + curr_clock = clock; + } + + /* save off wall time as timeval */ + vsyscall_gtod_data.wall_time_tv.tv_sec = wall_time.tv_sec; + vsyscall_gtod_data.wall_time_tv.tv_usec = wall_time.tv_nsec/1000; + + /* save offset_base */ + vsyscall_gtod_data.offset_base = offset_base; + + /* copy current clocksource */ + vsyscall_gtod_data.clock = *clock; + + /* apply ntp adjustment to clocksource mult */ + vsyscall_gtod_data.clock.mult += ntp_adj; + + /* save off current timezone */ + vsyscall_gtod_data.sys_tz = sys_tz; + + write_sequnlock_irqrestore(&vsyscall_gtod_lock, flags); + +} + #ifdef CONFIG_SYSCTL #define SYSCALL 0x050f @@ -217,6 +293,7 @@ static int __init vsyscall_init(void) BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime)); BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE))); map_vsyscall(); + sysctl_vsyscall = 1; #ifdef CONFIG_SYSCTL register_sysctl_table(kernel_root_table2, 0); #endif diff --git a/include/asm-generic/div64.h b/include/asm-generic/div64.h --- a/include/asm-generic/div64.h +++ b/include/asm-generic/div64.h @@ -55,4 +55,13 @@ extern uint32_t __div64_32(uint64_t *div #endif /* BITS_PER_LONG */ +#ifndef div_long_long_rem +#define div_long_long_rem(dividend,divisor,remainder) \ +({ \ + u64 result = dividend; \ + *remainder = do_div(result,divisor); \ + result; \ +}) +#endif + #endif /* _ASM_GENERIC_DIV64_H */ diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h --- a/include/asm-x86_64/hpet.h +++ b/include/asm-x86_64/hpet.h @@ -1,6 +1,6 @@ #ifndef _ASM_X8664_HPET_H #define _ASM_X8664_HPET_H 1 - +#include <asm/fixmap.h> /* * Documentation on HPET can be found at: * http://www.intel.com/ial/home/sp/pcmmspec.htm @@ -44,6 +44,7 @@ #define HPET_TN_SETVAL 0x040 #define HPET_TN_32BIT 0x100 +extern unsigned long hpet_address; /* hpet memory map physical address */ extern int is_hpet_enabled(void); extern int hpet_rtc_timer_init(void); extern int oem_force_hpet_timer(void); diff --git a/include/asm-x86_64/timeofday.h b/include/asm-x86_64/timeofday.h new file mode 100644 --- /dev/null +++ b/include/asm-x86_64/timeofday.h @@ -0,0 +1,4 @@ +#ifndef _ASM_X86_64_TIMEOFDAY_H +#define _ASM_X86_64_TIMEOFDAY_H +#include <asm-generic/timeofday.h> +#endif diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h @@ -24,6 +24,10 @@ static inline cycles_t get_cycles (void) } extern unsigned int cpu_khz; +extern unsigned int tsc_khz; +extern int check_tsc_unstable(void); +extern void tsc_c3_compensate(unsigned long usecs); +extern u64 tsc_read_c3_time(void); extern int read_current_timer(unsigned long *timer_value); #define ARCH_HAS_READ_CURRENT_TIMER 1 diff --git a/include/asm-x86_64/vsyscall.h b/include/asm-x86_64/vsyscall.h --- a/include/asm-x86_64/vsyscall.h +++ b/include/asm-x86_64/vsyscall.h @@ -22,6 +22,8 @@ enum vsyscall_num { #define __section_sysctl_vsyscall __attribute__ ((unused, __section__ (".sysctl_vsyscall"), aligned(16))) #define __section_xtime __attribute__ ((unused, __section__ (".xtime"), aligned(16))) #define __section_xtime_lock __attribute__ ((unused, __section__ (".xtime_lock"), aligned(16))) +#define __section_vsyscall_gtod_data __attribute__ ((unused, __section__ (".vsyscall_gtod_data"),aligned(16))) +#define __section_vsyscall_gtod_lock __attribute__ ((unused, __section__ (".vsyscall_gtod_lock"),aligned(16))) #define VXTIME_TSC 1 #define VXTIME_HPET 2 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) 2005-10-14 1:59 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) john stultz 2005-10-14 2:08 ` [RFC] Generic Timeofday Subsystem Simulator (v1) john stultz 2005-10-14 2:09 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz @ 2005-10-14 4:01 ` Kyle Moffett 2 siblings, 0 replies; 16+ messages in thread From: Kyle Moffett @ 2005-10-14 4:01 UTC (permalink / raw) To: john stultz Cc: lkml, Roman Zippel, Ulrich Windl, George Anzinger, Thomas Gleixner, Frank Sorenson, Nishanth Aravamudan, Darren Hart On Oct 13, 2005, at 21:59:41, john stultz wrote: > <excellent patchset> Three cheers for John Stultz for plugging at this as long as he has! Despite the ugly code, the many requested changes and revisions, etc, he's made awesome progress. These are sorely needed changes and we should thank John (and all the rest of the participants) for their time on this particular project. Hurrah to you sirs! Cheers, Kyle Moffett -- Somone asked me why I work on this free (http://www.fsf.org/ philosophy/) software stuff and not get a real job. Charles Shultz had the best answer: "Why do musicians compose symphonies and poets write poems? They do it because life wouldn't have any meaning for them if they didn't. That's why I draw cartoons. It's my life." -- Charles Shultz ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B9) @ 2005-11-01 22:23 john stultz 2005-11-01 22:24 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-11-01 22:23 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, The following patchset applies against 2.6.14-rc5-mm1 (with a bit of offset/fuzz) and provides a generic timekeeping subsystem that is independent of the timer interrupt. The allows for robust and correct behavior in cases of late or lost ticks, avoids interpolation errors, and allows or assists future changes such as high-res timers, dynamic ticks, and real-time preemption. Additionally, since timekeeping is done with nanosecond granularity, it provides finer nanosecond resolution values to the clock_gettime and related functions. The patch set consists of the minimal NTP changes, the clocksource abstraction, the core timekeeping code as well as the code to convert the i386 and x86-64 archs. I have started on converting other arches, but for now I'm focusing on i386 and x86-64. Thomas Gleixner has been *very* helpful in reviewing and suggesting changes to the code, so many thanks to him for his help! New in this release: o CONFIG option name change o Added is_continuous flag to clocksource structure o Moved to a switchless clocksource_read() function o Reworked the vsyscall implementation to handle new read code o Rebased ontop of Thomas' ktimer work already in -mm o Transitioned to using primarily ktime_t units instead of nsec_t o Moved TSC and HPET clocksource implementations to be closer to related arch code o Many comment and minor code cleanups Still on the TODO list: o Further minor coding style cleanups (let me know if you see any!) o Further x86-64 arch cleanups. o Submit to -mm (planned for the next release) I'd like to thank the following people who have contributed ideas, criticism, testing and code that has helped shape this work: George Anzinger, Nish Aravamudan, Max Asbock, Dominik Brodowski, Thomas Gleixner, Darren Hart, Christoph Lameter, Matt Mackal, Keith Mannthey, Ingo Molnar, Martin Schwidefsky, Frank Sorenson, Ulrich Windl, Darrick Wong, Roman Zippel and any others whom I've accidentally forgotten. Please let me know if you have any comments or feedback. thanks -john ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 1/12] Reduced NTP rework (part 1) 2005-11-01 22:23 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B9) john stultz @ 2005-11-01 22:24 ` john stultz 2005-11-01 22:25 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-11-01 22:24 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, With Roman's suggestions, I've been working on reducing the footprint of my timeofday patches. This is the first of two patches that reworks some of the interrupt time NTP adjustments so that it could be re-used with the timeofday patches. The motivation of the change is to logically separate the code which adjusts xtime and the code that decides, based on the NTP state variables, how much per tick to adjust xtime. Thus this patch should not affect the existing behaviour, but just separate the logical functionality so it can be re-used. This patch applies ontop of my ntp-shift-right patch I posted awhile back. thanks -john timer.c | 96 ++++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 63 insertions(+), 33 deletions(-) linux-2.6.14-rc5-mm1_timeofday-ntp-part1_B9.patch ============================================ diff --git a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c +++ b/kernel/timer.c @@ -589,6 +589,7 @@ static long time_adj; /* tick adjust ( long time_reftime; /* time at last adjustment (s) */ long time_adjust; long time_next_adjust; +long time_adjust_step; /* per tick time_adjust step */ /* * this routine handles the overflow of the microsecond field @@ -716,45 +717,52 @@ static void second_overflow(void) #endif } -/* in the NTP reference this is called "hardclock()" */ -static void update_wall_time_one_tick(void) +/** + * ntp_advance() - increments the NTP state machine + * + * Must be holding the xtime writelock when calling. + * + */ +static void ntp_advance(unsigned long interval_ns) { - long time_adjust_step, delta_nsec; + static unsigned long interval_sum; - if ((time_adjust_step = time_adjust) != 0 ) { - /* - * We are doing an adjtime thing. Prepare time_adjust_step to - * be within bounds. Note that a positive time_adjust means we - * want the clock to run faster. - * - * Limit the amount of the step to be in the range - * -tickadj .. +tickadj - */ - time_adjust_step = min(time_adjust_step, (long)tickadj); - time_adjust_step = max(time_adjust_step, (long)-tickadj); + /* increment the interval sum */ + interval_sum += interval_ns; + + /* calculate the per tick singleshot adjtime adjustment step */ + while (interval_ns >= tick_nsec) { + time_adjust_step = time_adjust; + if (time_adjust_step) { + /* We are doing an adjtime thing. + * + * Prepare time_adjust_step to be within bounds. + * Note that a positive time_adjust means we want + * the clock to run faster. + * + * Limit the amount of the step to be in the range + * -tickadj .. +tickadj + */ + time_adjust_step = min(time_adjust_step, (long)tickadj); + time_adjust_step = max(time_adjust_step, + (long)-tickadj); - /* Reduce by this step the amount of time left */ - time_adjust -= time_adjust_step; - } - delta_nsec = tick_nsec + time_adjust_step * 1000; - /* - * Advance the phase, once it gets to one microsecond, then - * advance the tick more. - */ - time_phase += time_adj; - if ((time_phase >= FINENSEC) || (time_phase <= -FINENSEC)) { - long ltemp = shift_right(time_phase, (SHIFT_SCALE - 10)); - time_phase -= ltemp << (SHIFT_SCALE - 10); - delta_nsec += ltemp; + /* Reduce by this step the amount of time left */ + time_adjust -= time_adjust_step; + } + interval_ns -= tick_nsec; } - xtime.tv_nsec += delta_nsec; - time_interpolator_update(delta_nsec); /* Changes by adjtime() do not take effect till next tick. */ if (time_next_adjust != 0) { time_adjust = time_next_adjust; time_next_adjust = 0; } + + while (interval_sum >= NSEC_PER_SEC) { + interval_sum -= NSEC_PER_SEC; + second_overflow(); + } } /* @@ -766,14 +774,36 @@ static void update_wall_time_one_tick(vo */ static void update_wall_time(unsigned long ticks) { + long delta_nsec; + do { ticks--; - update_wall_time_one_tick(); - if (xtime.tv_nsec >= 1000000000) { - xtime.tv_nsec -= 1000000000; + + /* Calculate the nsec delta using the + * precomputed NTP adjustments: + * tick_nsec, time_adjust_step, time_adj + */ + delta_nsec = tick_nsec + time_adjust_step * 1000; + /* + * Advance the phase, once it gets to one microsecond, then + * advance the tick more. + */ + time_phase += time_adj; + if ((time_phase >= FINENSEC) || (time_phase <= -FINENSEC)) { + long ltemp = shift_right(time_phase, + (SHIFT_SCALE - 10)); + time_phase -= ltemp << (SHIFT_SCALE - 10); + delta_nsec += ltemp; + } + + xtime.tv_nsec += delta_nsec; + if (xtime.tv_nsec >= NSEC_PER_SEC) { + xtime.tv_nsec -= NSEC_PER_SEC; xtime.tv_sec++; - second_overflow(); } + ntp_advance(tick_nsec); + time_interpolator_update(delta_nsec); + } while (ticks); } ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 2/12] Reduced NTP rework (part 2) 2005-11-01 22:24 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz @ 2005-11-01 22:25 ` john stultz 2005-11-01 22:26 ` [RFC][PATCH 3/12] clocksource management code john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-11-01 22:25 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, Here is the second of two patches which try to minimize my ntp rework patches. This patch further changes the interrupt time NTP code, breaking out the leapsecond processing and introduces an accessor to a shifted ppm adjustment value. For correctness, I've also introduced a new lock, the ntp_lock, which protects the NTP state machine when accessing it from my timekeeping code (which does not use the xtime_lock). Again, this patch should not affect the existing behavior, but just separate the logical functionality so it can be re-used by my timeofday patches. thanks -john include/linux/timex.h | 24 +++++++++ kernel/time.c | 25 +++++---- kernel/timer.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 168 insertions(+), 14 deletions(-) linux-2.6.14-rc5-mm1_timeofday-ntp-part2_B9.patch ============================================ diff --git a/include/linux/timex.h b/include/linux/timex.h --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -260,6 +260,7 @@ extern long pps_calcnt; /* calibration extern long pps_errcnt; /* calibration errors */ extern long pps_stbcnt; /* stability limit exceeded */ +extern seqlock_t ntp_lock; /** * ntp_clear - Clears the NTP state variables * @@ -267,10 +268,14 @@ extern long pps_stbcnt; /* stability li */ static inline void ntp_clear(void) { + unsigned long flags; + write_seqlock_irqsave(&ntp_lock, flags); time_adjust = 0; /* stop active adjtime() */ time_status |= STA_UNSYNC; time_maxerror = NTP_PHASE_LIMIT; time_esterror = NTP_PHASE_LIMIT; + write_sequnlock_irqrestore(&ntp_lock, flags); + } /** @@ -282,6 +287,25 @@ static inline int ntp_synced(void) return !(time_status & STA_UNSYNC); } +/** + * ntp_get_ppm_adjustment - Returns Shifted PPM adjustment + * + */ +long ntp_get_ppm_adjustment(void); + +/** + * ntp_advance - Advances the NTP state machine by interval_ns + * + */ +void ntp_advance(unsigned long interval_ns); + +/** + * ntp_leapsecond - NTP leapsecond processing code. + * + */ +int ntp_leapsecond(struct timespec now); + + /* Required to safely shift negative values */ #define shift_right(x, s) ({ \ __typeof__(x) __x = (x); \ diff --git a/kernel/time.c b/kernel/time.c --- a/kernel/time.c +++ b/kernel/time.c @@ -234,7 +234,9 @@ int do_adjtimex(struct timex *txc) { long ltemp, mtemp, save_adjust; int result; - + unsigned long flags; + struct timespec now_ts; + unsigned long seq; /* In order to modify anything, you gotta be super-user! */ if (txc->modes && !capable(CAP_SYS_TIME)) return -EPERM; @@ -257,7 +259,13 @@ int do_adjtimex(struct timex *txc) txc->tick > 1100000/USER_HZ) return -EINVAL; - write_seqlock_irq(&xtime_lock); + do { /* save off current xtime */ + seq = read_seqbegin(&xtime_lock); + now_ts = xtime; + } while (read_seqretry(&xtime_lock, seq)); + + write_seqlock_irqsave(&ntp_lock, flags); + result = time_state; /* mostly `TIME_OK' */ /* Save for later - semantics of adjtime is to return old value */ @@ -334,9 +342,9 @@ int do_adjtimex(struct timex *txc) */ if (time_status & STA_FREQHOLD || time_reftime == 0) - time_reftime = xtime.tv_sec; - mtemp = xtime.tv_sec - time_reftime; - time_reftime = xtime.tv_sec; + time_reftime = now_ts.tv_sec; + mtemp = now_ts.tv_sec - time_reftime; + time_reftime = now_ts.tv_sec; if (time_status & STA_FLL) { if (mtemp >= MINSEC) { ltemp = (time_offset / mtemp) << (SHIFT_USEC - @@ -395,7 +403,7 @@ leave: if ((time_status & (STA_UNSYNC|ST txc->calcnt = pps_calcnt; txc->errcnt = pps_errcnt; txc->stbcnt = pps_stbcnt; - write_sequnlock_irq(&xtime_lock); + write_sequnlock_irqrestore(&ntp_lock, flags); do_gettimeofday(&txc->time); notify_arch_cmos_timer(); return(result); @@ -512,10 +520,7 @@ int do_settimeofday (struct timespec *tv set_normalized_timespec(&xtime, sec, nsec); set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - time_adjust = 0; /* stop active adjtime() */ - time_status |= STA_UNSYNC; - time_maxerror = NTP_PHASE_LIMIT; - time_esterror = NTP_PHASE_LIMIT; + ntp_clear(); time_interpolator_reset(); } write_sequnlock_irq(&xtime_lock); diff --git a/kernel/timer.c b/kernel/timer.c --- a/kernel/timer.c +++ b/kernel/timer.c @@ -582,7 +582,6 @@ long time_tolerance = MAXFREQ; /* frequ long time_precision = 1; /* clock precision (us) */ long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us) */ long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */ -static long time_phase; /* phase offset (scaled us) */ long time_freq = (((NSEC_PER_SEC + HZ/2) % HZ - HZ/2) << SHIFT_USEC) / NSEC_PER_USEC; /* frequency offset (scaled ppm)*/ static long time_adj; /* tick adjust (scaled 1 / HZ) */ @@ -591,6 +590,87 @@ long time_adjust; long time_next_adjust; long time_adjust_step; /* per tick time_adjust step */ +long total_sppm; /* shifted ppm sum of all NTP adjustments */ +long offset_adj_ppm; +long tick_adj_ppm; +long singleshot_adj_ppm; + +#define MAX_SINGLESHOT_ADJ 500 /* (ppm) */ +#define SEC_PER_DAY 86400 +#define END_OF_DAY(x) (x + SEC_PER_DAY - (x % SEC_PER_DAY) - 1) + +/* NTP lock, protects NTP state machine */ +seqlock_t ntp_lock = SEQLOCK_UNLOCKED; + +/** + * ntp_leapsecond - NTP leapsecond processing code. + * now: the current time + * + * Returns the number of seconds (-1, 0, or 1) that + * should be added to the current time to properly + * adjust for leapseconds. + */ + +int ntp_leapsecond(struct timespec now) +{ + unsigned long flags; + /* + * Leap second processing. If in leap-insert state at + * the end of the day, the system clock is set back one + * second; if in leap-delete state, the system clock is + * set ahead one second. + */ + static time_t leaptime = 0; + int ret = 0; + + write_seqlock_irqsave(&ntp_lock, flags); + switch (time_state) { + + case TIME_OK: + if (time_status & STA_INS) { + time_state = TIME_INS; + leaptime = END_OF_DAY(now.tv_sec); + } else if (time_status & STA_DEL) { + time_state = TIME_DEL; + leaptime = END_OF_DAY(now.tv_sec); + } + break; + + case TIME_INS: + /* Once we are at (or past) leaptime, insert the second */ + if (now.tv_sec >= leaptime) { + time_state = TIME_OOP; + printk(KERN_NOTICE "Clock: inserting leap second 23:59:60 UTC\n"); + ret = -1; + } + break; + + case TIME_DEL: + /* Once we are at (or past) leaptime, delete the second */ + if (now.tv_sec >= leaptime) { + time_state = TIME_WAIT; + printk(KERN_NOTICE "Clock: deleting leap second 23:59:59 UTC\n"); + ret = 1; + } + break; + + case TIME_OOP: + /* Wait for the end of the leap second*/ + if (now.tv_sec > (leaptime + 1)) + time_state = TIME_WAIT; + time_state = TIME_WAIT; + break; + + case TIME_WAIT: + if (!(time_status & (STA_INS | STA_DEL))) + time_state = TIME_OK; + break; + } + + write_sequnlock_irqrestore(&ntp_lock, flags); + return 0; +} + /* * this routine handles the overflow of the microsecond field * @@ -663,6 +743,13 @@ static void second_overflow(void) time_state = TIME_OK; } + /* Bump the maxerror field */ + time_maxerror += time_tolerance >> SHIFT_USEC; + if ( time_maxerror > NTP_PHASE_LIMIT ) { + time_maxerror = NTP_PHASE_LIMIT; + time_status |= STA_UNSYNC; + } + /* * Compute the phase adjustment for the next second. In PLL mode, the * offset is reduced by a fixed factor times the time constant. In FLL @@ -678,6 +765,13 @@ static void second_overflow(void) time_offset -= ltemp; time_adj = ltemp << (SHIFT_SCALE - SHIFT_HZ - SHIFT_UPDATE); + offset_adj_ppm = shift_right(ltemp, SHIFT_UPDATE); /* ppm */ + + /* first calculate usec/user_tick offset */ + tick_adj_ppm = ((USEC_PER_SEC + USER_HZ/2)/USER_HZ) - tick_usec; + /* multiply by user_hz to get usec/sec => ppm */ + tick_adj_ppm *= USER_HZ; + /* * Compute the frequency estimate and additional phase adjustment due * to frequency error for the next second. When the PPS signal is @@ -717,15 +811,25 @@ static void second_overflow(void) #endif } + /** - * ntp_advance() - increments the NTP state machine + * ntp_get_ppm_adjustment - Returns Shifted PPM adjustment * - * Must be holding the xtime writelock when calling. + */ +long ntp_get_ppm_adjustment(void) +{ + return total_sppm; +} + +/** + * ntp_advance() - increments the NTP state machine * */ -static void ntp_advance(unsigned long interval_ns) +void ntp_advance(unsigned long interval_ns) { static unsigned long interval_sum; + unsigned long flags; + write_seqlock_irqsave(&ntp_lock, flags); /* increment the interval sum */ interval_sum += interval_ns; @@ -752,6 +856,7 @@ static void ntp_advance(unsigned long in } interval_ns -= tick_nsec; } + singleshot_adj_ppm = time_adjust_step*(1000000/HZ); /* usec/tick => ppm */ /* Changes by adjtime() do not take effect till next tick. */ if (time_next_adjust != 0) { @@ -763,6 +868,15 @@ static void ntp_advance(unsigned long in interval_sum -= NSEC_PER_SEC; second_overflow(); } + + /* calculate the total continuous ppm adjustment */ + total_sppm = time_freq; /* already shifted by SHIFT_USEC */ + total_sppm += offset_adj_ppm << SHIFT_USEC; + total_sppm += tick_adj_ppm << SHIFT_USEC; + total_sppm += singleshot_adj_ppm << SHIFT_USEC; + + write_sequnlock_irqrestore(&ntp_lock, flags); + } /* @@ -775,6 +889,7 @@ static void ntp_advance(unsigned long in static void update_wall_time(unsigned long ticks) { long delta_nsec; + static long time_phase; /* phase offset (scaled us) */ do { ticks--; @@ -798,8 +913,18 @@ static void update_wall_time(unsigned lo xtime.tv_nsec += delta_nsec; if (xtime.tv_nsec >= NSEC_PER_SEC) { + int leapsecond; xtime.tv_nsec -= NSEC_PER_SEC; xtime.tv_sec++; + /* process leapsecond */ + leapsecond = ntp_leapsecond(xtime); + if (leapsecond) { + xtime.tv_sec += leapsecond; + wall_to_monotonic.tv_sec -= leapsecond; + /* Use of time interpolator for a gradual change of time */ + time_interpolator_update(leapsecond*NSEC_PER_SEC); + clock_was_set(); + } } ntp_advance(tick_nsec); time_interpolator_update(delta_nsec); ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 3/12] clocksource management code 2005-11-01 22:25 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz @ 2005-11-01 22:26 ` john stultz 2005-11-01 22:27 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-11-01 22:26 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, This patch introduces the clocksource management infrastructure. A clocksource is a driver-like architecture generic abstraction of a free running counter. This patch defines the clocksource structure, and provides management code for registering, selecting, accessing and scaling clocksources. The clocksource structure is influenced by the time_interpolator code, although I feel it has a cleaner interface and avoids preserving system state in the clocksource structure. Additionally, this patch includes the trivial jiffies clocksource, a lowest common denominator clocksource, provided mainly for use as an example. This patch applies ontop of my ntp cleanup patchset. Since this patch provides the groundwork for the generic timeofday core, it will not function without the generic timeofday patches to follow. thanks -john Documentation/kernel-parameters.txt | 14 + include/linux/clocksource.h | 293 ++++++++++++++++++++++++++++++++++++ kernel/Makefile | 1 kernel/time/Makefile | 1 kernel/time/clocksource.c | 286 +++++++++++++++++++++++++++++++++++ kernel/time/jiffies.c | 74 +++++++++ 6 files changed, 665 insertions(+), 4 deletions(-) linux-2.6.14-rc5-mm1_timeofday-clocksource-core_B9.patch ============================================ diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -52,6 +52,7 @@ restrictions referred to are that the re MTD MTD support is enabled. NET Appropriate network support is enabled. NUMA NUMA support is enabled. + GENERIC_TIME The generic timeofday code is enabled. NFS Appropriate NFS support is enabled. OSS OSS sound support is enabled. PARIDE The ParIDE subsystem is enabled. @@ -329,10 +330,11 @@ running once the system is up. Value can be changed at runtime via /selinux/checkreqprot. - clock= [BUGS=IA-32,HW] gettimeofday timesource override. - Forces specified timesource (if avaliable) to be used - when calculating gettimeofday(). If specicified - timesource is not avalible, it defaults to PIT. + clock= [BUGS=IA-32, HW] gettimeofday clocksource override. + [Deprecated] + Forces specified clocksource (if avaliable) to be used + when calculating gettimeofday(). If specified + clocksource is not avalible, it defaults to PIT. Format: { pit | tsc | cyclone | pmtmr } hpet= [IA-32,HPET] option to disable HPET and use PIT. @@ -1477,6 +1479,10 @@ running once the system is up. time Show timing data prefixed to each printk message line + clocksource= [GENERIC_TIME] Override the default clocksource + Override the default clocksource and use the clocksource + with the name specified. + tipar.timeout= [HW,PPT] Set communications timeout in tenths of a second (default 15). diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h new file mode 100644 --- /dev/null +++ b/include/linux/clocksource.h @@ -0,0 +1,293 @@ +/* linux/include/linux/clocksource.h + * + * This file contains the structure definitions for clocksources. + * + * If you are not a clocksource, or the time of day code, you should + * not be including this file! + */ +#ifndef _LINUX_CLOCKSOURCE_H +#define _LINUX_CLOCKSOURCE_H + +#include <linux/types.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/list.h> +#include <asm/io.h> +#include <asm/div64.h> + +/** + * struct clocksource - hardware abstraction for a free running counter + * Provides mostly state-free accessors to the underlying hardware. + * + * @name: ptr to clocksource name + * @list: list head for registration + * @rating: rating value for selection (higher is better) + * To avoid rating inflation the following + * list should give you a guide as to how + * to assign your clocksource a rating + * 1-99: Unfit for real use + * Only available for bootup and testing purposes. + * 100-199: Base level usability. + * Functional for real use, but not desired. + * 200-299: Good. + * A correct and usable clocksource. + * 300-399: Desired. + * A reasonably fast and accurate clocksource. + * 400-499: Perfect + * The ideal clocksource. A must-use where + * available. + * @read: returns a cycle value + * @mask: bitmask for two's complement + * subtraction of non 64 bit counters + * @mult: cycle to nanosecond multiplier + * @shift: cycle to nanosecond divisor (power of two) + * @update_callback: called when safe to alter clocksource values + * @is_continuous: defines if clocksource is free-running. + * @vread: vsyscall read function + * @vdata: vsyscall data value passed to read function + */ +struct clocksource { + char* name; + struct list_head list; + int rating; + cycle_t (*read)(void); + cycle_t mask; + u32 mult; + u32 shift; + int (*update_callback)(void); + int is_continuous; + cycle_t (*vread)(void*); + void* vdata; +}; + + +/** + * clocksource_khz2mult - calculates mult from khz and shift + * @khz: Clocksource frequency in KHz + * @shift_constant: Clocksource shift factor + * + * Helper functions that converts a khz counter frequency to a timsource + * multiplier, given the clocksource shift value + */ +static inline u32 clocksource_khz2mult(u32 khz, u32 shift_constant) +{ + /* khz = cyc/(Million ns) + * mult/2^shift = ns/cyc + * mult = ns/cyc * 2^shift + * mult = 1Million/khz * 2^shift + * mult = 1000000 * 2^shift / khz + * mult = (1000000<<shift) / khz + */ + u64 tmp = ((u64)1000000) << shift_constant; + tmp += khz/2; /* round for do_div */ + do_div(tmp, khz); + return (u32)tmp; +} + +/** + * clocksource_hz2mult - calculates mult from hz and shift + * @hz: Clocksource frequency in Hz + * @shift_constant: Clocksource shift factor + * + * Helper functions that converts a hz counter + * frequency to a timsource multiplier, given the + * clocksource shift value + */ +static inline u32 clocksource_hz2mult(u32 hz, u32 shift_constant) +{ + /* hz = cyc/(Billion ns) + * mult/2^shift = ns/cyc + * mult = ns/cyc * 2^shift + * mult = 1Billion/hz * 2^shift + * mult = 1000000000 * 2^shift / hz + * mult = (1000000000<<shift) / hz + */ + u64 tmp = ((u64)1000000000) << shift_constant; + tmp += hz/2; /* round for do_div */ + do_div(tmp, hz); + return (u32)tmp; +} + +/** + * read_clocksource: - Access the clocksource's current cycle value + * @cs: pointer to clocksource being read + * + * Uses the clocksource to return the current cycle_t value + */ +static inline cycle_t read_clocksource(struct clocksource *cs) +{ + return cs->read(); +} + +/** + * ppm_to_mult_adj - Converts shifted ppm values to mult adjustment + * @cs: Pointer to clocksource + * @ppm: Shifted PPM value + * + * Helper which converts a shifted ppm value to clocksource mult_adj value. + * + * XXX - this could use some optimization + */ +static inline int ppm_to_mult_adj(struct clocksource *cs, int ppm) +{ + u64 mult_adj; + int ret_adj; + + /* The basic math is as follows: + * cyc * mult/2^shift * (1 + ppm/MILL) = scaled ns + * We want to precalculate the ppm factor so it can be added + * to the multiplyer saving the extra multiplication step. + * cyc * (mult/2^shift + (mult/2^shift) * (ppm/MILL)) = + * cyc * (mult/2^shift + (mult*ppm/MILL)/2^shift) = + * cyc * (mult + (mult*ppm/MILL))/2^shift = + * Thus we want to calculate the value of: + * mult*ppm/MILL + */ + mult_adj = abs(ppm); + mult_adj = (mult_adj * cs->mult)>>SHIFT_USEC; + mult_adj += 1000000/2; /* round for div*/ + do_div(mult_adj, 1000000); + if (ppm < 0) + ret_adj = -(int)mult_adj; + else + ret_adj = (int)mult_adj; + return ret_adj; +} + +/** + * cyc2ns - converts clocksource cycles to nanoseconds + * @cs: Pointer to clocksource + * @ntp_adj: Multiplier adjustment value + * @cycles: Cycles + * + * Uses the clocksource and ntp ajdustment to convert cycle_ts to nanoseconds. + * + * XXX - This could use some mult_lxl_ll() asm optimization + */ +static inline nsec_t cyc2ns(struct clocksource *cs, int ntp_adj, cycle_t cycles) +{ + u64 ret; + ret = (u64)cycles; + ret *= (cs->mult + ntp_adj); + ret >>= cs->shift; + return (nsec_t)ret; +} + +/** + * cyc2ns_rem - converts clocksource cycles to nanoseconds w/ remainder + * @cs: Pointer to clocksource + * @ntp_adj: Multiplier adjustment value + * @cycles: Cycles + * @rem: Remainder + * + * Uses the clocksource and ntp ajdustment interval to convert cycle_t to + * nanoseconds. Add in remainder portion which is stored in (ns<<cs->shift) + * units and save the new remainder off. + * + * XXX - This could use some mult_lxl_ll() asm optimization. + */ +static inline nsec_t cyc2ns_rem(struct clocksource *cs, int ntp_adj, cycle_t cycles, u64* rem) +{ + u64 ret; + ret = (u64)cycles; + ret *= (cs->mult + ntp_adj); + if (rem) { + ret += *rem; + *rem = ret & ((1<<cs->shift)-1); + } + ret >>= cs->shift; + return (nsec_t)ret; +} + + +/** + * struct clocksource_interval - Fixed interval conversion structure + * + * @cycles: A specified number of cycles + * @nsecs: The number of nanoseconds equivalent to the cycles value + * @remainder: Non-integer nanosecond remainder stored in (ns<<cs->shift) units + * @remainder_ns_overflow: Value at which the remainder is equal to + * one second + * + * This is a optimization structure used by cyc2ns_fixed_rem() to avoid the + * multiply in cyc2ns(). + * + * Unless you're the timeofday_periodic_hook, you should not be using this! + */ +struct clocksource_interval { + cycle_t cycles; + nsec_t nsecs; + u64 remainder; + u64 remainder_ns_overflow; +}; + +/** + * calculate_clocksource_interval - Calculates a clocksource interval struct + * + * @c: Pointer to clocksource. + * @adj: Multiplyer adjustment. + * @length_nsec: Desired interval length in nanoseconds. + * + * Calculates a fixed cycle/nsec interval for a given clocksource/adjustment + * pair and interval request. + * + * Unless you're the timeofday_periodic_hook, you should not be using this! + */ +static inline struct clocksource_interval +calculate_clocksource_interval(struct clocksource *c, long adj, + unsigned long length_nsec) +{ + struct clocksource_interval ret; + u64 tmp; + + /* XXX - All of this could use a whole lot of optimization */ + tmp = length_nsec; + tmp <<= c->shift; + do_div(tmp, c->mult+adj); + + ret.cycles = (cycle_t)tmp; + if(ret.cycles == 0) + ret.cycles = 1; + + ret.remainder = 0; + ret.remainder_ns_overflow = 1 << c->shift; + ret.nsecs = cyc2ns_rem(c, adj, ret.cycles, &ret.remainder); + + return ret; +} + +/** + * cyc2ns_fixed_rem - + * converts clocksource cycles to nanoseconds using fixed intervals + * + * @interval: precalculated clocksource_interval structure + * @cycles: Number of clocksource cycles + * @rem: Remainder + * + * Uses a precalculated fixed cycle/nsec interval to convert cycles to + * nanoseconds. Returns the unaccumulated cycles in the cycles pointer as + * well as uses and updates the value at the remainder pointer + * + * Unless you're the timeofday_periodic_hook, you should not be using this! + */ +static inline nsec_t cyc2ns_fixed_rem(struct clocksource_interval interval, cycle_t *cycles, u64* rem) +{ + nsec_t delta_nsec = 0; + while(*cycles > interval.cycles) { + delta_nsec += interval.nsecs; + *cycles -= interval.cycles; + *rem += interval.remainder; + while(*rem > interval.remainder_ns_overflow) { + *rem -= interval.remainder_ns_overflow; + delta_nsec += 1; + } + } + return delta_nsec; +} + + +/* used to install a new clocksource */ +void register_clocksource(struct clocksource*); +void reselect_clocksource(void); +struct clocksource* get_next_clocksource(void); +#endif diff --git a/kernel/Makefile b/kernel/Makefile --- a/kernel/Makefile +++ b/kernel/Makefile @@ -10,6 +10,7 @@ obj-y = sched.o fork.o exec_domain.o kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o \ ktimers.o +obj-$(CONFIG_GENERIC_TIME) += time/ obj-$(CONFIG_FUTEX) += futex.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o obj-$(CONFIG_SMP) += cpu.o spinlock.o diff --git a/kernel/time/Makefile b/kernel/time/Makefile new file mode 100644 --- /dev/null +++ b/kernel/time/Makefile @@ -0,0 +1 @@ +obj-y += clocksource.o jiffies.o diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c new file mode 100644 --- /dev/null +++ b/kernel/time/clocksource.c @@ -0,0 +1,286 @@ +/* + * linux/kernel/time/clocksource.c + * + * This file contains the functions which manage clocksource drivers. + * + * Copyright (C) 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * TODO WishList: + * o Allow clocksource drivers to be unregistered + * o get rid of clocksource_jiffies extern + */ + +#include <linux/clocksource.h> +#include <linux/sysdev.h> +#include <linux/init.h> +#include <linux/module.h> + +/* XXX - Would like a better way for initializing curr_clocksource */ +extern struct clocksource clocksource_jiffies; + +/*[Clocksource internal variables]--------- + * curr_clocksource: + * currently selected clocksource. Initialized to clocksource_jiffies. + * next_clocksource: + * pending next selected clocksource. + * clocksource_list: + * linked list with the registered clocksources + * clocksource_lock: + * protects manipulations to curr_clocksource and next_clocksource + * and the clocksource_list + * override_name: + * Name of the user-specified clocksource. + */ +static struct clocksource *curr_clocksource = &clocksource_jiffies; +static struct clocksource *next_clocksource; +static LIST_HEAD(clocksource_list); +static seqlock_t clocksource_lock = SEQLOCK_UNLOCKED; + +static char override_name[32]; + + +/** + * get_next_clocksource - Returns the selected clocksource + * + */ +struct clocksource *get_next_clocksource(void) +{ + write_seqlock(&clocksource_lock); + if (next_clocksource) { + curr_clocksource = next_clocksource; + next_clocksource = NULL; + } + write_sequnlock(&clocksource_lock); + + return curr_clocksource; +} + + +/** + * select_clocksource - Finds the best registered clocksource. + * + * Private function. Must have a writelock on clocksource_lock + * when called. + */ +static struct clocksource *select_clocksource(void) +{ + struct clocksource *best = NULL; + struct list_head *tmp; + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + if (!best) + best = src; + + /* Check for override */ + if (strlen(src->name) == strlen(override_name) && + !strcmp(src->name, override_name)) { + best = src; + break; + } + /* Pick the highest rating */ + if (src->rating > best->rating) + best = src; + } + return best; +} + + +/** + * is_registered_source - Checks if clocksource is registered + * @c: pointer to a clocksource + * + * Private helper function, should not be used externally. + * + * Returns one if the clocksource is already registered, zero otherwise. + */ +static inline int is_registered_source(struct clocksource *c) +{ + struct list_head *tmp; + int len = strlen(c->name); + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + if (strlen(src->name) == len && !strcmp(src->name, c->name)) + return 1; + } + return 0; +} + + +/** + * register_clocksource - Used to install new clocksources + * @t: clocksource to be registered + * + */ +void register_clocksource(struct clocksource *c) +{ + write_seqlock(&clocksource_lock); + + /* check if clocksource is already registered */ + if (is_registered_source(c)) { + printk("register_clocksource: Cannot register %s. Already registered!", + c->name); + } else { + list_add(&c->list, &clocksource_list); + /* select next clocksource */ + next_clocksource = select_clocksource(); + } + write_sequnlock(&clocksource_lock); +} +EXPORT_SYMBOL(register_clocksource); + + +/** + * reselect_clocksource - Rescan list for next clocksource + * + * A quick helper function to be used if a clocksource changes its + * rating. Forces the clocksource list to be re-scaned for the best + * clocksource. + */ +void reselect_clocksource(void) +{ + write_seqlock(&clocksource_lock); + next_clocksource = select_clocksource(); + write_sequnlock(&clocksource_lock); +} + + +/** + * sysfs_show_clocksources - sysfs interface for listing clocksource + * @dev: unused + * @buf: char buffer to be filled with clocksource list + * + * Provides sysfs interface for listing registered clocksources + */ +static ssize_t sysfs_show_clocksources(struct sys_device *dev, char *buf) +{ + char* curr = buf; + struct list_head *tmp; + + write_seqlock(&clocksource_lock); + + list_for_each(tmp, &clocksource_list) { + struct clocksource *src; + + src = list_entry(tmp, struct clocksource, list); + /* Mark current clocksource w/ a star */ + if (src == curr_clocksource) + curr += sprintf(curr, "*"); + curr += sprintf(curr, "%s ", src->name); + } + write_sequnlock(&clocksource_lock); + + curr += sprintf(curr, "\n"); + return curr - buf; +} + + +/** + * sysfs_override_clocksource - interface for manually overriding clocksource + * @dev: unused + * @buf: name of override clocksource + * @count: length of buffer + * + * Takes input from sysfs interface for manually overriding the default + * clocksource selction + */ +static ssize_t sysfs_override_clocksource(struct sys_device *dev, + const char *buf, size_t count) +{ + /* Strings from sysfs write are not 0 terminated ! */ + if (count >= sizeof(override_name)) + return -EINVAL; + /* Strip of \n */ + if (buf[count-1] == '\n') + count--; + if (count < 1) + return -EINVAL; + + write_seqlock(&clocksource_lock); + + /* copy the name given */ + memcpy(override_name, buf, count); + override_name[count] = 0; + + /* try to select it */ + next_clocksource = select_clocksource(); + + write_sequnlock(&clocksource_lock); + return count; +} + + +/* Sysfs setup bits: + */ +static SYSDEV_ATTR(clocksource, 0600, sysfs_show_clocksources, sysfs_override_clocksource); + +static struct sysdev_class clocksource_sysclass = { + set_kset_name("clocksource"), +}; + +static struct sys_device device_clocksource = { + .id = 0, + .cls = &clocksource_sysclass, +}; + +static int init_clocksource_sysfs(void) +{ + int error = sysdev_class_register(&clocksource_sysclass); + if (!error) { + error = sysdev_register(&device_clocksource); + if (!error) + error = sysdev_create_file(&device_clocksource, &attr_clocksource); + } + return error; +} +device_initcall(init_clocksource_sysfs); + + +/** + * boot_override_clocksource - boot clock override + * @str: override name + * + * Takes a clocksource= boot argument and uses it + * as the clocksource override name + */ +static int __init boot_override_clocksource(char* str) +{ + if (str) + strlcpy(override_name, str, sizeof(override_name)); + return 1; +} +__setup("clocksource=", boot_override_clocksource); + + +/** + * boot_override_clock - Compatibility layer for deprecated boot option + * @str: override name + * + * DEPRECATED! Takes a clock= boot argument and uses it + * as the clocksource override name + */ +static int __init boot_override_clock(char* str) +{ + printk("Warning! clock= boot option is deprecated.\n"); + return boot_override_clocksource(str); +} +__setup("clock=", boot_override_clock); diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c new file mode 100644 --- /dev/null +++ b/kernel/time/jiffies.c @@ -0,0 +1,74 @@ +/*********************************************************************** +* linux/kernel/time/jiffies.c +* +* This file contains the jiffies based clocksource. +* +* Copyright (C) 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* +************************************************************************/ +#include <linux/clocksource.h> +#include <linux/jiffies.h> +#include <linux/init.h> + +/* The Jiffies based clocksource is the lowest common + * denominator clock source which should function on + * all systems. It has the same coarse resolution as + * the timer interrupt frequency HZ and it suffers + * inaccuracies caused by missed or lost timer + * interrupts and the inability for the timer + * interrupt hardware to accuratly tick at the + * requested HZ value. It is also not reccomended + * for "tick-less" systems. + */ +#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/ACTHZ)) + +/* Since jiffies uses a simple NSEC_PER_JIFFY multiplier + * conversion, the .shift value could be zero. However + * this would make NTP adjustments impossible as they are + * in units of 1/2^.shift. Thus we use JIFFIES_SHIFT to + * shift both the nominator and denominator the same + * amount, and give ntp adjustments in units of 1/2^8 + * + * The value 8 is somewhat carefully chosen, as anything + * larger can result in overflows. NSEC_PER_JIFFY grows as + * HZ shrinks, so values greater then 8 overflow 32bits when + * HZ=100. + */ +#define JIFFIES_SHIFT 8 + +static cycle_t jiffies_read(void) +{ + cycle_t ret = get_jiffies_64(); + return ret; +} + +struct clocksource clocksource_jiffies = { + .name = "jiffies", + .rating = 0, /* lowest rating*/ + .read = jiffies_read, + .mask = (cycle_t)-1, + .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* See above for details */ + .shift = JIFFIES_SHIFT, + .is_continuous = 0, /* tick based, not free running */ +}; + +static int __init init_jiffies_clocksource(void) +{ + register_clocksource(&clocksource_jiffies); + return 0; +} +module_init(init_jiffies_clocksource); ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 4/12] generic timeofday core subsystem 2005-11-01 22:26 ` [RFC][PATCH 3/12] clocksource management code john stultz @ 2005-11-01 22:27 ` john stultz 2005-11-01 22:29 ` [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 john stultz 0 siblings, 1 reply; 16+ messages in thread From: john stultz @ 2005-11-01 22:27 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, This patch implements my generic timeofday framework. This common infrastructure is intended to be used by any arch to reduce code duplication. Hopefully it will allow generic bugs to be fixed once. And with many architectures sharing the same time source, this allows drivers to be written once for multiple architectures. One major change with this code is that it delineate the lines between the soft-timer subsystem and the time-of-day subsystem, allowing for a 1:1 mapping between a hardware clocksource counter and the time of day. This allows for lost ticks or other software delays to not affect timekeeping. Included below is timeofday.c (which includes all the time of day management and accessor functions), and minimal hooks into arch independent code. This patch does not remove the current timekeeping code, allowing architectures to move over when they are ready. This patch applies on top of my clocksource management patch. The patch does nothing without at least minimal architecture specific hooks (i386, x86-64 and other architecture examples to follow), and it should be able to be applied to a tree without affecting the existing code. thanks -john drivers/char/hangcheck-timer.c | 5 include/asm-generic/timeofday.h | 29 + include/linux/time.h | 27 + include/linux/timeofday.h | 44 ++ include/linux/timex.h | 2 init/main.c | 2 kernel/ktimers.c | 1 kernel/posix-timers.c | 2 kernel/time.c | 17 + kernel/time/Makefile | 2 kernel/time/timeofday.c | 680 ++++++++++++++++++++++++++++++++++++++++ kernel/timer.c | 6 12 files changed, 811 insertions(+), 6 deletions(-) linux-2.6.14-rc5-mm1_timeofday-core_B9.patch ============================================ diff -ruN corefix1/drivers/char/hangcheck-timer.c corefix2/drivers/char/hangcheck-timer.c --- corefix1/drivers/char/hangcheck-timer.c 2005-10-31 18:49:50.000000000 -0800 +++ corefix2/drivers/char/hangcheck-timer.c 2005-10-31 18:50:44.000000000 -0800 @@ -49,6 +49,7 @@ #include <linux/delay.h> #include <asm/uaccess.h> #include <linux/sysrq.h> +#include <linux/timeofday.h> #define VERSION_STR "0.9.0" @@ -130,8 +131,12 @@ #endif #ifdef HAVE_MONOTONIC +#ifndef CONFIG_GENERIC_TIME extern unsigned long long monotonic_clock(void); #else +#define monotonic_clock() ktime_to_ns(get_monotonic_clock()) +#endif +#else static inline unsigned long long monotonic_clock(void) { # ifdef __s390__ diff -ruN corefix1/include/asm-generic/timeofday.h corefix2/include/asm-generic/timeofday.h --- corefix1/include/asm-generic/timeofday.h 1969-12-31 16:00:00.000000000 -0800 +++ corefix2/include/asm-generic/timeofday.h 2005-10-31 18:50:44.000000000 -0800 @@ -0,0 +1,29 @@ +/* linux/include/asm-generic/timeofday.h + * + * This file contains the asm-generic interface + * to the arch specific calls used by the time of day subsystem + */ +#ifndef _ASM_GENERIC_TIMEOFDAY_H +#define _ASM_GENERIC_TIMEOFDAY_H +#include <linux/types.h> +#include <linux/time.h> +#include <linux/timex.h> +#include <linux/timeofday.h> +#include <linux/clocksource.h> + +#include <asm/div64.h> +#ifdef CONFIG_GENERIC_TIME +/* Required externs */ +extern nsec_t read_persistent_clock(void); +extern void sync_persistent_clock(struct timespec ts); + +#ifdef CONFIG_GENERIC_TIME_VSYSCALL +extern void arch_update_vsyscall_gtod(struct timespec wall_time, + cycle_t offset_base, struct clocksource* clock, + int ntp_adj); +#else +#define arch_update_vsyscall_gtod(x,y,z,w) {} +#endif /* CONFIG_GENERIC_TIME_VSYSCALL */ + +#endif /* CONFIG_GENERIC_TIME */ +#endif diff -ruN corefix1/include/linux/time.h corefix2/include/linux/time.h --- corefix1/include/linux/time.h 2005-10-31 18:49:52.000000000 -0800 +++ corefix2/include/linux/time.h 2005-10-31 18:50:44.000000000 -0800 @@ -28,6 +28,10 @@ #ifdef __KERNEL__ +/* timeofday base types */ +typedef s64 nsec_t; +typedef u64 cycle_t; + /* Parameters used to convert the timespec values */ #define MSEC_PER_SEC (1000L) #define USEC_PER_SEC (1000000L) @@ -42,8 +46,6 @@ #define timespec_valid(ts) \ (((ts)->tv_sec >= 0) && (((unsigned) (ts)->tv_nsec) < NSEC_PER_SEC)) -typedef s64 nsec_t; - /* Converts Gregorian date to seconds since 1970-01-01 00:00:00. * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 * => year=1980, mon=12, day=31, hour=23, min=59, sec=59. @@ -99,7 +101,6 @@ struct itimerval; extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); extern int do_getitimer(int which, struct itimerval *value); -extern void getnstimeofday (struct timespec *tv); extern struct timespec timespec_trunc(struct timespec t, unsigned gran); @@ -183,6 +184,26 @@ return tv; } +static inline void normalize_timespec(struct timespec *ts) +{ + while ((unsigned long)ts->tv_nsec > NSEC_PER_SEC) { + ts->tv_nsec -= NSEC_PER_SEC; + ts->tv_sec++; + } +} + +static inline struct timespec timespec_add_ns(struct timespec a, nsec_t ns) +{ + while(ns > NSEC_PER_SEC) { + ns -= NSEC_PER_SEC; + a.tv_sec++; + } + a.tv_nsec += ns; + normalize_timespec(&a); + + return a; +} + #endif /* __KERNEL__ */ #define NFDBITS __NFDBITS diff -ruN corefix1/include/linux/timeofday.h corefix2/include/linux/timeofday.h --- corefix1/include/linux/timeofday.h 1969-12-31 16:00:00.000000000 -0800 +++ corefix2/include/linux/timeofday.h 2005-10-31 18:50:44.000000000 -0800 @@ -0,0 +1,44 @@ +/* linux/include/linux/timeofday.h + * + * This file contains the interface to the time of day subsystem + */ +#ifndef _LINUX_TIMEOFDAY_H +#define _LINUX_TIMEOFDAY_H +#include <linux/calc64.h> +#include <linux/types.h> +#include <linux/ktime.h> +#include <linux/time.h> +#include <linux/timex.h> + +#ifdef CONFIG_GENERIC_TIME + +/* Kernel internal interfaces */ +extern ktime_t get_monotonic_clock(void); +extern ktime_t get_realtime_clock(void); +extern ktime_t get_realtime_offset(void); + +/* Timepsec based interfaces for user space functionality */ +extern void get_realtime_clock_ts(struct timespec *ts); +extern void get_monotonic_clock_ts(struct timespec *ts); + +/* legacy timeofday interfaces*/ +#define getnstimeofday(ts) get_realtime_clock_ts(ts) +extern void getnstimeofday(struct timespec *ts); +extern void do_gettimeofday(struct timeval *tv); +extern int do_settimeofday(struct timespec *ts); + +/* Internal functions */ +extern int timeofday_is_continuous(void); +extern void timeofday_init(void); + +#ifndef CONFIG_IS_TICK_BASED +#define arch_getoffset() (0) +#else +extern unsigned long arch_getoffset(void); +#endif + +#else /* CONFIG_GENERIC_TIME */ +#define timeofday_init() +extern void getnstimeofday(struct timespec *ts); +#endif /* CONFIG_GENERIC_TIME */ +#endif /* _LINUX_TIMEOFDAY_H */ diff -ruN corefix1/include/linux/timex.h corefix2/include/linux/timex.h --- corefix1/include/linux/timex.h 2005-10-31 18:50:11.000000000 -0800 +++ corefix2/include/linux/timex.h 2005-10-31 18:50:44.000000000 -0800 @@ -313,6 +313,7 @@ __x < 0 ? -(-__x >> __s) : __x >> __s; \ }) +#ifndef CONFIG_GENERIC_TIME #ifdef CONFIG_TIME_INTERPOLATION @@ -368,6 +369,7 @@ } #endif /* !CONFIG_TIME_INTERPOLATION */ +#endif /* !CONFIG_GENERIC_TIME */ #endif /* KERNEL */ diff -ruN corefix1/init/main.c corefix2/init/main.c --- corefix1/init/main.c 2005-10-31 18:49:52.000000000 -0800 +++ corefix2/init/main.c 2005-10-31 18:50:44.000000000 -0800 @@ -47,6 +47,7 @@ #include <linux/rmap.h> #include <linux/mempolicy.h> #include <linux/key.h> +#include <linux/timeofday.h> #include <net/sock.h> #include <asm/io.h> @@ -478,6 +479,7 @@ init_timers(); ktimers_init(); softirq_init(); + timeofday_init(); time_init(); /* diff -ruN corefix1/kernel/ktimers.c corefix2/kernel/ktimers.c --- corefix1/kernel/ktimers.c 2005-10-31 18:49:52.000000000 -0800 +++ corefix2/kernel/ktimers.c 2005-10-31 18:50:44.000000000 -0800 @@ -30,6 +30,7 @@ #include <linux/percpu.h> #include <linux/notifier.h> #include <linux/syscalls.h> +#include <linux/timeofday.h> #include <linux/interrupt.h> #include <asm/uaccess.h> diff -ruN corefix1/kernel/posix-timers.c corefix2/kernel/posix-timers.c --- corefix1/kernel/posix-timers.c 2005-10-31 18:49:52.000000000 -0800 +++ corefix2/kernel/posix-timers.c 2005-10-31 18:50:44.000000000 -0800 @@ -34,7 +34,7 @@ #include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/slab.h> -#include <linux/time.h> +#include <linux/timeofday.h> #include <asm/uaccess.h> #include <asm/semaphore.h> diff -ruN corefix1/kernel/time/Makefile corefix2/kernel/time/Makefile --- corefix1/kernel/time/Makefile 2005-10-31 18:50:17.000000000 -0800 +++ corefix2/kernel/time/Makefile 2005-10-31 18:50:44.000000000 -0800 @@ -1 +1 @@ -obj-y += clocksource.o jiffies.o +obj-y += clocksource.o jiffies.o timeofday.o diff -ruN corefix1/kernel/time/timeofday.c corefix2/kernel/time/timeofday.c --- corefix1/kernel/time/timeofday.c 1969-12-31 16:00:00.000000000 -0800 +++ corefix2/kernel/time/timeofday.c 2005-10-31 18:51:46.000000000 -0800 @@ -0,0 +1,680 @@ +/* + * linux/kernel/time/timeofday.c + * + * This file contains the functions which access and manage + * the system's time of day functionality. + * + * Copyright (C) 2003, 2004, 2005 IBM, John Stultz (johnstul@us.ibm.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * TODO WishList: + * o See XXX's below. + */ + +#include <linux/timeofday.h> +#include <linux/clocksource.h> +#include <linux/ktime.h> +#include <linux/timex.h> +#include <linux/timer.h> +#include <linux/module.h> +#include <linux/sched.h> +#include <linux/sysdev.h> +#include <linux/jiffies.h> +#include <asm/timeofday.h> + +/* Periodic hook interval */ +#define PERIODIC_INTERVAL_MS 50 + +/* [ktime_t based variables] + * system_time: + * Monotonically increasing counter of the number of nanoseconds + * since boot. + * wall_time_offset: + * Offset added to system_time to provide accurate time-of-day + */ +static ktime_t system_time; +static ktime_t wall_time_offset; + +/* [timespec based variables] + * These variables mirror teh ktime_t based variables to avoid + * performance issues in the userspace syscall paths. + * + * wall_time_ts: + * timespec holding the current wall time. + * mono_time_ts: + * timespec holding the current monotonic time. + * monotonic_time_offset_ts: + * timespec holding the difference between wall and monotonic time. + */ +static struct timespec wall_time_ts; +static struct timespec mono_time_ts; +static struct timespec monotonic_time_offset_ts; + +/* [cycle based variables] + * cycle_last: + * Value of the clocksource at the last timeofday_periodic_hook() + * (adjusted only minorly to account for rounded off cycles) + */ +static cycle_t cycle_last; + +/* [clocksource_interval variables] + * ts_interval: + * This clocksource_interval is used in the fixed interval + * cycles to nanosecond calculation. + * INTERVAL_LEN: + * This constant is the requested fixed interval period + * in nanoseconds. + */ +struct clocksource_interval ts_interval; +#define INTERVAL_LEN ((PERIODIC_INTERVAL_MS-1)*1000000) + +/* [clocksource data] + * clock: + * current clocksource pointer + */ +static struct clocksource *clock; + +/* [NTP adjustment] + * ntp_adj: + * value of the current ntp adjustment, stored in + * clocksource multiplier units. + */ +int ntp_adj; + +/* [locks] + * system_time_lock: + * generic lock for all locally scoped time values + */ +static seqlock_t system_time_lock = SEQLOCK_UNLOCKED; + + +/* [suspend/resume info] + * time_suspend_state: + * variable that keeps track of suspend state + * suspend_start: + * start of the suspend call + */ +static enum { + TIME_RUNNING, + TIME_SUSPENDED +} time_suspend_state = TIME_RUNNING; + +static nsec_t suspend_start; + +/* [Soft-Timers] + * timeofday_timer: + * soft-timer used to call timeofday_periodic_hook() + */ +struct timer_list timeofday_timer; + +/** + * update_legacy_time_values - sync legacy time values + * + * This function is necessary for a smooth transition to the + * new timekeeping code. When all the xtime/wall_to_monotonic + * users are converted this function can be removed. + * + * system_time_lock must be held by the caller + */ +static void update_legacy_time_values(void) +{ + unsigned long flags; + + write_seqlock_irqsave(&xtime_lock, flags); + + xtime = wall_time_ts; + set_normalized_timespec(&wall_to_monotonic, + -monotonic_time_offset_ts.tv_sec, + -monotonic_time_offset_ts.tv_nsec); + + write_sequnlock_irqrestore(&xtime_lock, flags); + + /* since time state has changed, notify vsyscall code */ + arch_update_vsyscall_gtod(wall_time_ts, cycle_last, clock, ntp_adj); +} + +/** + * __get_nsec_offset - Returns nanoseconds since last call to periodic_hook + * + * private function, must hold system_time_lock lock when being + * called. Returns the number of nanoseconds since the + * last call to timeofday_periodic_hook() (adjusted by NTP scaling) + */ +static inline nsec_t __get_nsec_offset(void) +{ + cycle_t cycle_now, cycle_delta; + nsec_t ns_offset; + + /* read clocksource */ + cycle_now = read_clocksource(clock); + + /* calculate the delta since the last timeofday_periodic_hook */ + cycle_delta = (cycle_now - cycle_last) & clock->mask; + + /* convert to nanoseconds */ + ns_offset = cyc2ns(clock, ntp_adj, cycle_delta); + + /* Special case for jiffies tick/offset based systems + * add arch specific offset + */ + ns_offset += arch_getoffset(); + + return ns_offset; +} + +/** + * __get_monotonic_clock - Returns monotonically increasing nanoseconds + * + * private function, must hold system_time_lock lock when being + * called. Returns the monotonically increasing number of + * nanoseconds since the system booted (adjusted by NTP scaling) + */ +static inline ktime_t __get_monotonic_clock(void) +{ + nsec_t offset = __get_nsec_offset(); + return ktime_add_ns(system_time, offset); +} + +/** + * get_monotonic_clock - Returns monotonic time in ktime_t format + * + * Returns the monotonically increasing number of nanoseconds + * since the system booted via __monotonic_clock() + */ +ktime_t get_monotonic_clock(void) +{ + unsigned long seq; + ktime_t ret; + + /* atomically read __get_monotonic_clock() */ + do { + seq = read_seqbegin(&system_time_lock); + + ret = __get_monotonic_clock(); + + } while (read_seqretry(&system_time_lock, seq)); + + return ret; +} + +EXPORT_SYMBOL_GPL(get_monotonic_clock); + +/** + * get_realtime_clock - Returns the timeofday in ktime_t format + * + * Returns the wall time in ktime_t format. The resolution + * is nanoseconds + */ +ktime_t get_realtime_clock(void) +{ + unsigned long seq; + ktime_t ret; + + /* atomically read __get_monotonic_clock() */ + do { + seq = read_seqbegin(&system_time_lock); + + ret = __get_monotonic_clock(); + ret = ktime_add(ret, wall_time_offset); + + } while (read_seqretry(&system_time_lock, seq)); + + return ret; +} + +/** + * get_realtime_offset - Returns the offset of realtime clock + * + * Returns the number of nanoseconds in ktime_t storage format which + * represents the offset of the realtime clock to the the monotonic clock + */ +ktime_t get_realtime_offset(void) +{ + unsigned long seq; + ktime_t ret; + + /* atomically read wall_time_offset */ + do { + seq = read_seqbegin(&system_time_lock); + + ret = wall_time_offset; + + } while (read_seqretry(&system_time_lock, seq)); + + return ret; +} + +/** + * get_monotonic_clock_ts - Returns monotonic time in timespec format + * + * @ts: pointer to the timespec to be set + * + * Returns a timespec of nanoseconds since the system booted and + * store the result in the timespec variable pointed to by @ts + */ +void get_monotonic_clock_ts(struct timespec *ts) +{ + unsigned long seq; + struct timespec mono_ts; + nsec_t offset; + + do { + seq = read_seqbegin(&system_time_lock); + + mono_ts = mono_time_ts; + offset = __get_nsec_offset(); + } while (read_seqretry(&system_time_lock, seq)); + + *ts = timespec_add_ns(mono_ts, offset); +} + +/** + * __get_realtime_clock_ts - Returns the time of day in a timespec + * + * @ts: pointer to the timespec to be set + * + * Returns the time of day in a timespec. Used by + * do_gettimeofday() and get_realtime_clock_ts(). + * + */ +static inline void __get_realtime_clock_ts(struct timespec *ts) +{ + struct timespec now_ts; + unsigned long seq; + nsec_t nsecs; + + do { + seq = read_seqbegin(&system_time_lock); + + now_ts = wall_time_ts; + nsecs = __get_nsec_offset(); + + } while (read_seqretry(&system_time_lock, seq)); + + *ts = timespec_add_ns(now_ts, nsecs); +} + +/** + * get_realtime_clock_ts - Returns the time of day in a timespec + * @ts: pointer to the timespec to be set + * + * Returns the time of day in a timespec. + */ +void get_realtime_clock_ts(struct timespec *ts) +{ + __get_realtime_clock_ts(ts); +} + +EXPORT_SYMBOL(get_realtime_clock_ts); + + +/** + * do_gettimeofday - Returns the time of day in a timeval + * @tv: pointer to the timeval to be set + * + * NOTE: Users should be converted to using get_realtime_clock_ts() + */ +void do_gettimeofday(struct timeval *tv) +{ + struct timespec now_ts; + __get_realtime_clock_ts(&now_ts); + tv->tv_sec = now_ts.tv_sec; + tv->tv_usec = now_ts.tv_nsec/1000; +} + +EXPORT_SYMBOL(do_gettimeofday); + +/** + * do_settimeofday - Sets the time of day + * @tv: pointer to the timespec variable containing the new time + * + * Sets the time of day to the new time and update NTP and notify ktimers + */ +int do_settimeofday(struct timespec *tv) +{ + unsigned long flags; + ktime_t newtime; + + newtime = timespec_to_ktime(*tv); + + write_seqlock_irqsave(&system_time_lock, flags); + + /* calculate the new offset from the monotonic clock */ + wall_time_offset = ktime_sub(newtime, __get_monotonic_clock()); + + /* update the internal timespec variables */ + wall_time_ts = ktime_to_timespec( + ktime_add(system_time, wall_time_offset)); + monotonic_time_offset_ts = ktime_to_timespec(wall_time_offset); + + ntp_clear(); + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* signal ktimers about time change */ + clock_was_set(); + + return 0; +} + +EXPORT_SYMBOL(do_settimeofday); + +/** + * __increment_system_time - Increments system time + * @delta: nanosecond delta to add to the time variables + * + * Private helper that increments system_time and related + * timekeeping variables. + */ +static inline void __increment_system_time(nsec_t delta) +{ + system_time = ktime_add_ns(system_time, delta); + wall_time_ts = timespec_add_ns(wall_time_ts, delta); + mono_time_ts = timespec_add_ns(mono_time_ts, delta); +} + +/** + * timeofday_suspend_hook - allows the timeofday subsystem to be shutdown + * @dev: unused + * @state: unused + * + * This function allows the timeofday subsystem to be shutdown for a period + * of time. Called when going into suspend/hibernate mode. + */ +static int timeofday_suspend_hook(struct sys_device *dev, pm_message_t state) +{ + unsigned long flags; + + write_seqlock_irqsave(&system_time_lock, flags); + + BUG_ON(time_suspend_state != TIME_RUNNING); + + /* First off, save suspend start time + * then quickly accumulate the current nsec offset. + * These two calls hopefully occur quickly + * because the difference between reads will + * accumulate as time drift on resume. + */ + suspend_start = read_persistent_clock(); + __increment_system_time(__get_nsec_offset()); + + time_suspend_state = TIME_SUSPENDED; + + write_sequnlock_irqrestore(&system_time_lock, flags); + + return 0; +} + +/** + * timeofday_resume_hook - Resumes the timeofday subsystem. + * @dev: unused + * + * This function resumes the timeofday subsystem from a previous call + * to timeofday_suspend_hook. + */ +static int timeofday_resume_hook(struct sys_device *dev) +{ + nsec_t suspend_end, suspend_time; + unsigned long flags; + + write_seqlock_irqsave(&system_time_lock, flags); + + BUG_ON(time_suspend_state != TIME_SUSPENDED); + + /* Read persistent clock to mark the end of + * the suspend interval then rebase the + * cycle_last to current clocksource value. + * Again, time between these two calls will + * not be accounted for and will show up as + * time drift. + */ + suspend_end = read_persistent_clock(); + cycle_last = read_clocksource(clock); + + /* calculate suspend time and add it to system time */ + suspend_time = suspend_end - suspend_start; + __increment_system_time(suspend_time); + + ntp_clear(); + + time_suspend_state = TIME_RUNNING; + + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* inform ktimers about time change */ + clock_was_set(); + + return 0; +} + +/* sysfs resume/suspend bits */ +static struct sysdev_class timeofday_sysclass = { + .resume = timeofday_resume_hook, + .suspend = timeofday_suspend_hook, + set_kset_name("timeofday"), +}; + +static struct sys_device device_timer = { + .id = 0, + .cls = &timeofday_sysclass, +}; + +static int timeofday_init_device(void) +{ + int error = sysdev_class_register(&timeofday_sysclass); + + if (!error) + error = sysdev_register(&device_timer); + + return error; +} + +device_initcall(timeofday_init_device); + + +/** + * timeofday_periodic_hook - Does periodic update of timekeeping values. + * @unused: unused value + * + * Calculates the delta since the last call, updates system time and + * clears the offset. + * + * Called via timeofday_timer. + */ +static void timeofday_periodic_hook(unsigned long unused) +{ + unsigned long flags; + + cycle_t cycle_now, cycle_delta; + nsec_t delta_nsec; + static u64 remainder; + + long leapsecond; + struct clocksource* next; + + int ppm; + static int ppm_last; + + int something_changed = 0; + struct clocksource old_clock; + static nsec_t second_check; + + write_seqlock_irqsave(&system_time_lock, flags); + + /* read time source & calc time since last call*/ + cycle_now = read_clocksource(clock); + cycle_delta = (cycle_now - cycle_last) & clock->mask; + + delta_nsec = cyc2ns_fixed_rem(ts_interval, &cycle_delta, &remainder); + cycle_last = (cycle_now - cycle_delta)&clock->mask; + + /* update system_time */ + __increment_system_time(delta_nsec); + + /* advance the ntp state machine by ns interval*/ + ntp_advance(delta_nsec); + + /* Only call ntp_leapsecond and ntp_sync once a sec */ + second_check += delta_nsec; + if (second_check > NSEC_PER_SEC) { + /* do ntp leap second processing*/ + leapsecond = ntp_leapsecond(wall_time_ts); + if (leapsecond) { + wall_time_offset = ktime_add_ns(wall_time_offset, + leapsecond * NSEC_PER_SEC); + wall_time_ts.tv_sec += leapsecond; + monotonic_time_offset_ts.tv_sec += leapsecond; + } + /* sync the persistent clock */ + if (ntp_synced()) + sync_persistent_clock(wall_time_ts); + second_check -= NSEC_PER_SEC; + } + + /* if necessary, switch clocksources */ + next = get_next_clocksource(); + if (next != clock) { + /* immediately set new cycle_last */ + cycle_last = read_clocksource(next); + /* update cycle_now to avoid problems in accumulation later */ + cycle_now = cycle_last; + /* swap clocksources */ + old_clock = *clock; + clock = next; + printk(KERN_INFO "Time: %s clocksource has been installed.\n", + clock->name); + ntp_clear(); + ntp_adj = 0; + remainder = 0; + something_changed = 1; + } + + /* now is a safe time, so allow clocksource to adjust + * itself (for example: to make cpufreq changes). + */ + if (clock->update_callback) { + /* since clocksource state might change, + * keep a copy, but only if we've not + * already changed timesources + */ + if (!something_changed) + old_clock = *clock; + if (clock->update_callback()) { + remainder = 0; + something_changed = 1; + } + } + + /* check for new PPM adjustment */ + ppm = ntp_get_ppm_adjustment(); + if (ppm_last != ppm) { + /* make sure old_clock is set */ + if (!something_changed) + old_clock = *clock; + something_changed = 1; + } + + /* if something changed, recalculate the ntp adjustment value */ + if (something_changed) { + /* accumulate current leftover cycles using old_clock */ + if (cycle_delta) { + delta_nsec = cyc2ns_rem(&old_clock, ntp_adj, + cycle_delta, &remainder); + cycle_last = cycle_now; + __increment_system_time(delta_nsec); + ntp_advance(delta_nsec); + } + + /* recalculate the ntp adjustment and fixed interval values */ + ppm_last = ppm; + ntp_adj = ppm_to_mult_adj(clock, ppm); + ts_interval = calculate_clocksource_interval(clock, ntp_adj, + INTERVAL_LEN); + } + + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* Set us up to go off on the next interval */ + mod_timer(&timeofday_timer, + jiffies + msecs_to_jiffies(PERIODIC_INTERVAL_MS)); +} + +/** + * timeofday_is_continuous - check to see if timekeeping is free running + * + */ +int timeofday_is_continuous(void) +{ + unsigned long seq; + int ret; + do { + seq = read_seqbegin(&system_time_lock); + + ret = clock->is_continuous; + + } while (read_seqretry(&system_time_lock, seq)); + + return ret; +} + +/** + * timeofday_init - Initializes time variables + */ +void __init timeofday_init(void) +{ + unsigned long flags; + + write_seqlock_irqsave(&system_time_lock, flags); + + /* initialize the clock variable */ + clock = get_next_clocksource(); + + /* initialize cycle_last offset base */ + cycle_last = read_clocksource(clock); + + /* initialize wall_time_offset to now*/ + /* XXX - this should be something like ns_to_ktime() */ + wall_time_offset = ktime_add_ns(wall_time_offset, + read_persistent_clock()); + + /* initialize timespec values */ + wall_time_ts = ktime_to_timespec( + ktime_add(system_time, wall_time_offset)); + monotonic_time_offset_ts = ktime_to_timespec(wall_time_offset); + + + /* clear NTP scaling factor & state machine */ + ntp_adj = 0; + ntp_clear(); + ts_interval = calculate_clocksource_interval(clock, ntp_adj, + INTERVAL_LEN); + + /* initialize legacy time values */ + update_legacy_time_values(); + + write_sequnlock_irqrestore(&system_time_lock, flags); + + /* Install timeofday_periodic_hook timer */ + init_timer(&timeofday_timer); + timeofday_timer.function = timeofday_periodic_hook; + timeofday_timer.expires = jiffies + 1; + add_timer(&timeofday_timer); +} diff -ruN corefix1/kernel/time.c corefix2/kernel/time.c --- corefix1/kernel/time.c 2005-10-31 18:50:11.000000000 -0800 +++ corefix2/kernel/time.c 2005-10-31 18:50:44.000000000 -0800 @@ -38,6 +38,7 @@ #include <asm/uaccess.h> #include <asm/unistd.h> +#include <linux/timeofday.h> /* * The timezone where the local system is located. Used as a default by some @@ -128,6 +129,7 @@ * as real UNIX machines always do it. This avoids all headaches about * daylight saving times and warping kernel clocks. */ +#ifndef CONFIG_GENERIC_TIME static inline void warp_clock(void) { write_seqlock_irq(&xtime_lock); @@ -137,6 +139,18 @@ write_sequnlock_irq(&xtime_lock); clock_was_set(); } +#else /* !CONFIG_GENERIC_TIME */ +/* XXX - this is somewhat cracked out and should + be checked -johnstul@us.ibm.com +*/ +static inline void warp_clock(void) +{ + struct timespec ts; + getnstimeofday(&ts); + ts.tv_sec += sys_tz.tz_minuteswest * 60; + do_settimeofday(&ts); +} +#endif /* !CONFIG_GENERIC_TIME */ /* * In case for some reason the CMOS clock has not already been running @@ -481,6 +495,7 @@ } EXPORT_SYMBOL(timespec_trunc); +#ifndef CONFIG_GENERIC_TIME #ifdef CONFIG_TIME_INTERPOLATION void getnstimeofday (struct timespec *tv) { @@ -565,6 +580,8 @@ EXPORT_SYMBOL_GPL(getnstimeofday); #endif +#endif /* !CONFIG_GENERIC_TIME */ + #if (BITS_PER_LONG < 64) u64 get_jiffies_64(void) { diff -ruN corefix1/kernel/timer.c corefix2/kernel/timer.c --- corefix1/kernel/timer.c 2005-10-31 18:50:11.000000000 -0800 +++ corefix2/kernel/timer.c 2005-10-31 18:50:44.000000000 -0800 @@ -28,7 +28,7 @@ #include <linux/swap.h> #include <linux/notifier.h> #include <linux/thread_info.h> -#include <linux/time.h> +#include <linux/timeofday.h> #include <linux/jiffies.h> #include <linux/posix-timers.h> #include <linux/cpu.h> @@ -879,6 +879,7 @@ } +#ifndef CONFIG_GENERIC_TIME /* * Using a loop looks inefficient, but "ticks" is * usually just one (we shouldn't be losing ticks, @@ -931,6 +932,9 @@ } while (ticks); } +#else /* !CONFIG_GENERIC_TIME */ +#define update_wall_time(x) +#endif /* !CONFIG_GENERIC_TIME */ /* * Called from the timer interrupt handler to charge one tick to the current ^ permalink raw reply [flat|nested] 16+ messages in thread
* [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 2005-11-01 22:27 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz @ 2005-11-01 22:29 ` john stultz 0 siblings, 0 replies; 16+ messages in thread From: john stultz @ 2005-11-01 22:29 UTC (permalink / raw) To: lkml Cc: Ingo Molnar, Darren Hart, Nishanth Aravamudan, Frank Sorenson, George Anzinger, Roman Zippel, Ulrich Windl, Thomas Gleixner All, The conversion of i386 to use the generic timeofday subsystem has been split into 6 parts. This patch, the first of six, is just a simple cleanup for the i386 arch in preparation of moving the the generic timeofday infrastructure. It simply moves some code from timer_pit.c to i8253.c. It applies on top of my timeofday-core patch. This patch is part the timeofday-arch-i386 patchset, so without the following parts it is not expected to compile. thanks -john Makefile | 2 - i8253.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ time.c | 6 ----- timers/timer_pit.c | 13 ------------ 4 files changed, 58 insertions(+), 20 deletions(-) linux-2.6.14-rc5-mm1_timeofday-arch-i386-part1_B9.patch ============================================ diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ - doublefault.o quirks.o i8237.o + doublefault.o quirks.o i8237.o i8253.o obj-y += cpu/ obj-y += timers/ diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c new file mode 100644 --- /dev/null +++ b/arch/i386/kernel/i8253.c @@ -0,0 +1,57 @@ +/* + * i8253.c 8253/PIT functions + * + */ +#include <linux/init.h> +#include <linux/jiffies.h> +#include <linux/spinlock.h> +#include <linux/sysdev.h> +#include <linux/module.h> + +#include <asm/delay.h> +#include <asm/i8253.h> +#include <asm/io.h> + +#include "io_ports.h" + +DEFINE_SPINLOCK(i8253_lock); +EXPORT_SYMBOL(i8253_lock); + +void setup_pit_timer(void) +{ + unsigned long flags; + + spin_lock_irqsave(&i8253_lock, flags); + outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ + udelay(10); + outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ + udelay(10); + outb(LATCH >> 8 , PIT_CH0); /* MSB */ + spin_unlock_irqrestore(&i8253_lock, flags); +} + +static int timer_resume(struct sys_device *dev) +{ + setup_pit_timer(); + return 0; +} + +static struct sysdev_class timer_sysclass = { + set_kset_name("timer_pit"), + .resume = timer_resume, +}; + +static struct sys_device device_timer = { + .id = 0, + .cls = &timer_sysclass, +}; + +static int __init init_timer_sysfs(void) +{ + int error = sysdev_class_register(&timer_sysclass); + if (!error) + error = sysdev_register(&device_timer); + return error; +} + +device_initcall(init_timer_sysfs); diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -82,11 +82,6 @@ extern unsigned long wall_jiffies; DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); -#include <asm/i8253.h> - -DEFINE_SPINLOCK(i8253_lock); -EXPORT_SYMBOL(i8253_lock); - struct timer_opts *cur_timer __read_mostly = &timer_none; /* @@ -400,7 +395,6 @@ static int timer_resume(struct sys_devic if (is_hpet_enabled()) hpet_reenable(); #endif - setup_pit_timer(); sec = get_cmos_time() + clock_cmos_diff; sleep_length = (get_cmos_time() - sleep_start) * HZ; write_seqlock_irqsave(&xtime_lock, flags); diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c --- a/arch/i386/kernel/timers/timer_pit.c +++ b/arch/i386/kernel/timers/timer_pit.c @@ -161,16 +161,3 @@ struct init_timer_opts __initdata timer_ .init = init_pit, .opts = &timer_pit, }; - -void setup_pit_timer(void) -{ - unsigned long flags; - - spin_lock_irqsave(&i8253_lock, flags); - outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */ - udelay(10); - outb_p(LATCH & 0xff , PIT_CH0); /* LSB */ - udelay(10); - outb(LATCH >> 8 , PIT_CH0); /* MSB */ - spin_unlock_irqrestore(&i8253_lock, flags); -} ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2005-11-01 22:29 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2005-10-14 1:59 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) john stultz 2005-10-14 2:08 ` [RFC] Generic Timeofday Subsystem Simulator (v1) john stultz 2005-10-14 2:09 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz 2005-10-14 2:10 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz 2005-10-14 2:11 ` [RFC][PATCH 3/12] clocksource management code john stultz 2005-10-14 2:12 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz 2005-10-14 2:14 ` [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 john stultz 2005-10-14 2:15 ` [RFC][PATCH 6/12] generic timeofday i386 arch specific changes, part 2 john stultz 2005-10-14 2:16 ` [RFC][PATCH 7/12] generic timeofday i386 arch specific changes, part 3 john stultz 2005-10-14 2:19 ` [RFC][PATCH 8/12] generic timeofday i386 arch specific changes, part 4 john stultz 2005-10-14 2:20 ` [RFC][PATCH 9/12] generic timeofday i386 arch specific changes, part 5 john stultz 2005-10-14 2:21 ` [RFC][PATCH 10/12] generic timeofday i386 arch specific changes, part 6 john stultz 2005-10-14 2:22 ` [RFC][PATCH 11/12] generic timeofday i386/x86-64 specific clocksources john stultz 2005-10-14 2:25 ` [RFC][PATCH 12/12] generic timeofday x86-64 arch specific changes john stultz 2005-10-14 4:01 ` [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B7) (cumulative-i386) Kyle Moffett 2005-11-01 22:23 [RFC][PATCH 0/12] Generic Timeofday Subsystem (v B9) john stultz 2005-11-01 22:24 ` [RFC][PATCH 1/12] Reduced NTP rework (part 1) john stultz 2005-11-01 22:25 ` [RFC][PATCH 2/12] Reduced NTP rework (part 2) john stultz 2005-11-01 22:26 ` [RFC][PATCH 3/12] clocksource management code john stultz 2005-11-01 22:27 ` [RFC][PATCH 4/12] generic timeofday core subsystem john stultz 2005-11-01 22:29 ` [RFC][PATCH 5/12] generic timeofday i386 arch specific changes, part 1 john stultz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®