2006-09-30 23:28:22 -07:00
|
|
|
/*
|
|
|
|
* linux/kernel/time/ntp.c
|
|
|
|
*
|
|
|
|
* NTP state machine interfaces and logic.
|
|
|
|
*
|
|
|
|
* This code was mainly moved from kernel/timer.c and kernel/time.c
|
|
|
|
* Please see those files for relevant copyright info and historical
|
|
|
|
* changelogs.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/time.h>
|
2007-07-21 04:37:37 -07:00
|
|
|
#include <linux/timer.h>
|
2006-09-30 23:28:22 -07:00
|
|
|
#include <linux/timex.h>
|
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-20 14:22:52 -07:00
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <linux/hrtimer.h>
|
2007-07-15 23:40:39 -07:00
|
|
|
#include <linux/capability.h>
|
2008-05-01 04:34:26 -07:00
|
|
|
#include <linux/math64.h>
|
2008-05-01 04:34:41 -07:00
|
|
|
#include <linux/clocksource.h>
|
2006-09-30 23:28:22 -07:00
|
|
|
#include <asm/timex.h>
|
|
|
|
|
2006-09-30 23:28:22 -07:00
|
|
|
/*
|
|
|
|
* Timekeeping variables
|
|
|
|
*/
|
|
|
|
unsigned long tick_usec = TICK_USEC; /* USER_HZ period (usec) */
|
|
|
|
unsigned long tick_nsec; /* ACTHZ period (nsec) */
|
2008-05-01 04:34:39 -07:00
|
|
|
u64 tick_length;
|
|
|
|
static u64 tick_length_base;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2008-05-01 04:34:41 -07:00
|
|
|
static struct hrtimer leap_timer;
|
|
|
|
|
2006-09-30 23:28:25 -07:00
|
|
|
#define MAX_TICKADJ 500 /* microsecs */
|
|
|
|
#define MAX_TICKADJ_SCALED (((u64)(MAX_TICKADJ * NSEC_PER_USEC) << \
|
2008-05-01 04:34:38 -07:00
|
|
|
NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ)
|
2006-09-30 23:28:22 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* phase-lock loop variables
|
|
|
|
*/
|
|
|
|
/* TIME_ERROR prevents overwriting the CMOS clock */
|
2006-09-30 23:28:29 -07:00
|
|
|
static int time_state = TIME_OK; /* clock synchronization status */
|
2006-09-30 23:28:22 -07:00
|
|
|
int time_status = STA_UNSYNC; /* clock status bits */
|
2008-05-01 04:34:37 -07:00
|
|
|
static long time_tai; /* TAI offset (s) */
|
2008-05-01 04:34:32 -07:00
|
|
|
static s64 time_offset; /* time adjustment (ns) */
|
2006-09-30 23:28:29 -07:00
|
|
|
static long time_constant = 2; /* pll time constant */
|
2006-09-30 23:28:22 -07:00
|
|
|
long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us) */
|
|
|
|
long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */
|
2008-05-01 04:34:34 -07:00
|
|
|
static s64 time_freq; /* frequency offset (scaled ns/s)*/
|
2006-09-30 23:28:29 -07:00
|
|
|
static long time_reftime; /* time at last adjustment (s) */
|
2006-09-30 23:28:22 -07:00
|
|
|
long time_adjust;
|
time: remove obsolete CLOCK_TICK_ADJUST
The first version of the ntp_interval/tick_length inconsistent usage patch was
recently merged as bbe4d18ac2e058c56adb0cd71f49d9ed3216a405
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bbe4d18ac2e058c56adb0cd71f49d9ed3216a405
While the fix did greatly improve the situation, it was correctly pointed out
by Roman that it does have a small bug: If the users change clocksources after
the system has been running and NTP has made corrections, the correctoins made
against the old clocksource will be applied against the new clocksource,
causing error.
The second attempt, which corrects the issue in the NTP_INTERVAL_LENGTH
definition has also made it up-stream as commit
e13a2e61dd5152f5499d2003470acf9c838eab84
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e13a2e61dd5152f5499d2003470acf9c838eab84
Roman has correctly pointed out that CLOCK_TICK_ADJUST is calculated
based on the PIT's frequency, and isn't really relevant to non-PIT
driven clocksources (that is, clocksources other then jiffies and pit).
This patch reverts both of those changes, and simply removes
CLOCK_TICK_ADJUST.
This does remove the granularity error correction for users of PIT and Jiffies
clocksource users, but the granularity error but for the majority of users, it
should be within the 500ppm range NTP can accommodate for.
For systems that have granularity errors greater then 500ppm, the
"ntp_tick_adj=" boot option can be used to compensate.
[johnstul@us.ibm.com: provided changelog]
[mattilinnanvuori@yahoo.com: maek ntp_tick_adj static]
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: john stultz <johnstul@us.ibm.com>
Signed-off-by: Matti Linnanvuori <mattilinnanvuori@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: mingo@elte.hu
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-03-04 16:14:26 -07:00
|
|
|
static long ntp_tick_adj;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2006-09-30 23:28:29 -07:00
|
|
|
static void ntp_update_frequency(void)
|
|
|
|
{
|
2007-02-16 02:27:26 -07:00
|
|
|
u64 second_length = (u64)(tick_usec * NSEC_PER_USEC * USER_HZ)
|
2008-05-01 04:34:38 -07:00
|
|
|
<< NTP_SCALE_SHIFT;
|
|
|
|
second_length += (s64)ntp_tick_adj << NTP_SCALE_SHIFT;
|
2008-05-01 04:34:34 -07:00
|
|
|
second_length += time_freq;
|
2006-09-30 23:28:29 -07:00
|
|
|
|
2007-02-16 02:27:26 -07:00
|
|
|
tick_length_base = second_length;
|
2006-09-30 23:28:29 -07:00
|
|
|
|
2008-05-01 04:34:38 -07:00
|
|
|
tick_nsec = div_u64(second_length, HZ) >> NTP_SCALE_SHIFT;
|
2008-05-01 04:34:26 -07:00
|
|
|
tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ);
|
2006-09-30 23:28:29 -07:00
|
|
|
}
|
|
|
|
|
2008-05-01 04:34:32 -07:00
|
|
|
static void ntp_update_offset(long offset)
|
|
|
|
{
|
|
|
|
long mtemp;
|
|
|
|
s64 freq_adj;
|
|
|
|
|
|
|
|
if (!(time_status & STA_PLL))
|
|
|
|
return;
|
|
|
|
|
2008-05-01 04:34:33 -07:00
|
|
|
if (!(time_status & STA_NANO))
|
2008-05-01 04:34:36 -07:00
|
|
|
offset *= NSEC_PER_USEC;
|
2008-05-01 04:34:32 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Scale the phase adjustment and
|
|
|
|
* clamp to the operating range.
|
|
|
|
*/
|
2008-05-01 04:34:36 -07:00
|
|
|
offset = min(offset, MAXPHASE);
|
|
|
|
offset = max(offset, -MAXPHASE);
|
2008-05-01 04:34:32 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Select how the frequency is to be controlled
|
|
|
|
* and in which mode (PLL or FLL).
|
|
|
|
*/
|
|
|
|
if (time_status & STA_FREQHOLD || time_reftime == 0)
|
|
|
|
time_reftime = xtime.tv_sec;
|
|
|
|
mtemp = xtime.tv_sec - time_reftime;
|
|
|
|
time_reftime = xtime.tv_sec;
|
|
|
|
|
2008-05-01 04:34:36 -07:00
|
|
|
freq_adj = (s64)offset * mtemp;
|
2008-05-01 04:34:38 -07:00
|
|
|
freq_adj <<= NTP_SCALE_SHIFT - 2 * (SHIFT_PLL + 2 + time_constant);
|
2008-05-01 04:34:33 -07:00
|
|
|
time_status &= ~STA_MODE;
|
|
|
|
if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
|
2008-05-01 04:34:38 -07:00
|
|
|
freq_adj += div_s64((s64)offset << (NTP_SCALE_SHIFT - SHIFT_FLL),
|
2008-05-01 04:34:34 -07:00
|
|
|
mtemp);
|
2008-05-01 04:34:33 -07:00
|
|
|
time_status |= STA_MODE;
|
|
|
|
}
|
2008-05-01 04:34:32 -07:00
|
|
|
freq_adj += time_freq;
|
2008-05-01 04:34:34 -07:00
|
|
|
freq_adj = min(freq_adj, MAXFREQ_SCALED);
|
|
|
|
time_freq = max(freq_adj, -MAXFREQ_SCALED);
|
2008-05-01 04:34:36 -07:00
|
|
|
|
2008-05-01 04:34:38 -07:00
|
|
|
time_offset = div_s64((s64)offset << NTP_SCALE_SHIFT, NTP_INTERVAL_FREQ);
|
2008-05-01 04:34:32 -07:00
|
|
|
}
|
|
|
|
|
2006-09-30 23:28:22 -07:00
|
|
|
/**
|
|
|
|
* ntp_clear - Clears the NTP state variables
|
|
|
|
*
|
|
|
|
* Must be called while holding a write on the xtime_lock
|
|
|
|
*/
|
|
|
|
void ntp_clear(void)
|
|
|
|
{
|
|
|
|
time_adjust = 0; /* stop active adjtime() */
|
|
|
|
time_status |= STA_UNSYNC;
|
|
|
|
time_maxerror = NTP_PHASE_LIMIT;
|
|
|
|
time_esterror = NTP_PHASE_LIMIT;
|
|
|
|
|
|
|
|
ntp_update_frequency();
|
|
|
|
|
|
|
|
tick_length = tick_length_base;
|
2006-09-30 23:28:25 -07:00
|
|
|
time_offset = 0;
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
|
|
|
|
2006-09-30 23:28:22 -07:00
|
|
|
/*
|
2008-05-01 04:34:41 -07:00
|
|
|
* 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.
|
2006-09-30 23:28:22 -07:00
|
|
|
*/
|
2008-05-01 04:34:41 -07:00
|
|
|
static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
|
2006-09-30 23:28:22 -07:00
|
|
|
{
|
2008-05-01 04:34:41 -07:00
|
|
|
enum hrtimer_restart res = HRTIMER_NORESTART;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2008-05-01 04:34:41 -07:00
|
|
|
write_seqlock_irq(&xtime_lock);
|
2006-09-30 23:28:22 -07:00
|
|
|
|
|
|
|
switch (time_state) {
|
|
|
|
case TIME_OK:
|
|
|
|
break;
|
|
|
|
case TIME_INS:
|
2008-05-01 04:34:41 -07:00
|
|
|
xtime.tv_sec--;
|
|
|
|
wall_to_monotonic.tv_sec++;
|
|
|
|
time_state = TIME_OOP;
|
|
|
|
printk(KERN_NOTICE "Clock: "
|
|
|
|
"inserting leap second 23:59:60 UTC\n");
|
|
|
|
leap_timer.expires = ktime_add_ns(leap_timer.expires,
|
|
|
|
NSEC_PER_SEC);
|
|
|
|
res = HRTIMER_RESTART;
|
2006-09-30 23:28:22 -07:00
|
|
|
break;
|
|
|
|
case TIME_DEL:
|
2008-05-01 04:34:41 -07:00
|
|
|
xtime.tv_sec++;
|
|
|
|
time_tai--;
|
|
|
|
wall_to_monotonic.tv_sec--;
|
|
|
|
time_state = TIME_WAIT;
|
|
|
|
printk(KERN_NOTICE "Clock: "
|
|
|
|
"deleting leap second 23:59:59 UTC\n");
|
2006-09-30 23:28:22 -07:00
|
|
|
break;
|
|
|
|
case TIME_OOP:
|
2008-05-01 04:34:37 -07:00
|
|
|
time_tai++;
|
2006-09-30 23:28:22 -07:00
|
|
|
time_state = TIME_WAIT;
|
2008-05-01 04:34:41 -07:00
|
|
|
/* fall through */
|
2006-09-30 23:28:22 -07:00
|
|
|
case TIME_WAIT:
|
|
|
|
if (!(time_status & (STA_INS | STA_DEL)))
|
2008-05-01 04:34:32 -07:00
|
|
|
time_state = TIME_OK;
|
2008-05-01 04:34:41 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
update_vsyscall(&xtime, clock);
|
|
|
|
|
|
|
|
write_sequnlock_irq(&xtime_lock);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* this routine handles the overflow of the microsecond field
|
|
|
|
*
|
|
|
|
* The tricky bits of code to handle the accurate clock support
|
|
|
|
* were provided by Dave Mills (Mills@UDEL.EDU) of NTP fame.
|
|
|
|
* They were originally developed for SUN and DEC kernels.
|
|
|
|
* All the kudos should go to Dave for this stuff.
|
|
|
|
*/
|
|
|
|
void second_overflow(void)
|
|
|
|
{
|
|
|
|
s64 time_adj;
|
|
|
|
|
|
|
|
/* Bump the maxerror field */
|
|
|
|
time_maxerror += MAXFREQ / NSEC_PER_USEC;
|
|
|
|
if (time_maxerror > NTP_PHASE_LIMIT) {
|
|
|
|
time_maxerror = NTP_PHASE_LIMIT;
|
|
|
|
time_status |= STA_UNSYNC;
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2006-09-30 23:28:28 -07:00
|
|
|
* Compute the phase adjustment for the next second. The offset is
|
|
|
|
* reduced by a fixed factor times the time constant.
|
2006-09-30 23:28:22 -07:00
|
|
|
*/
|
2006-09-30 23:28:22 -07:00
|
|
|
tick_length = tick_length_base;
|
2006-09-30 23:28:28 -07:00
|
|
|
time_adj = shift_right(time_offset, SHIFT_PLL + time_constant);
|
2006-09-30 23:28:25 -07:00
|
|
|
time_offset -= time_adj;
|
2008-05-01 04:34:36 -07:00
|
|
|
tick_length += time_adj;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2006-09-30 23:28:25 -07:00
|
|
|
if (unlikely(time_adjust)) {
|
|
|
|
if (time_adjust > MAX_TICKADJ) {
|
|
|
|
time_adjust -= MAX_TICKADJ;
|
|
|
|
tick_length += MAX_TICKADJ_SCALED;
|
|
|
|
} else if (time_adjust < -MAX_TICKADJ) {
|
|
|
|
time_adjust += MAX_TICKADJ;
|
|
|
|
tick_length -= MAX_TICKADJ_SCALED;
|
|
|
|
} else {
|
|
|
|
tick_length += (s64)(time_adjust * NSEC_PER_USEC /
|
2008-05-01 04:34:38 -07:00
|
|
|
NTP_INTERVAL_FREQ) << NTP_SCALE_SHIFT;
|
2006-10-28 10:38:56 -07:00
|
|
|
time_adjust = 0;
|
2006-09-30 23:28:25 -07:00
|
|
|
}
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-21 04:37:37 -07:00
|
|
|
#ifdef CONFIG_GENERIC_CMOS_UPDATE
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2007-07-21 04:37:37 -07:00
|
|
|
/* Disable the cmos update - used by virtualization and embedded */
|
|
|
|
int no_sync_cmos_clock __read_mostly;
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
struct timespec now, next;
|
|
|
|
int fail = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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).
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
|
|
|
|
getnstimeofday(&now);
|
ntp: fix typo that makes sync_cmos_clock erratic
Fix a typo in ntp.c that has caused updating of the persistent (RTC)
clock when synced to NTP to behave erratically.
When debugging a freeze that arises on my AMD64 machines when I
run the ntpd service, I added a number of printk's to monitor the
sync_cmos_clock procedure. I discovered that it was not syncing to
cmos RTC every 11 minutes as documented, but instead would keep trying
every second for hours at a time. The reason turned out to be a typo
in sync_cmos_clock, where it attempts to ensure that
update_persistent_clock is called very close to 500 msec. after a 1
second boundary (required by the PC RTC's spec). That typo referred to
"xtime" in one spot, rather than "now", which is derived from "xtime"
but not equal to it. This makes the test erratic, creating a
"coin-flip" that decides when update_persistent_clock is called - when
it is called, which is rarely, it may be at any time during the one
second period, rather than close to 500 msec, so the value written is
needlessly incorrect, too.
Signed-off-by: David P. Reed
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2007-11-14 15:49:21 -07:00
|
|
|
if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec / 2)
|
2007-07-21 04:37:37 -07:00
|
|
|
fail = update_persistent_clock(now);
|
|
|
|
|
|
|
|
next.tv_nsec = (NSEC_PER_SEC / 2) - now.tv_nsec;
|
|
|
|
if (next.tv_nsec <= 0)
|
|
|
|
next.tv_nsec += NSEC_PER_SEC;
|
|
|
|
|
|
|
|
if (!fail)
|
|
|
|
next.tv_sec = 659;
|
|
|
|
else
|
|
|
|
next.tv_sec = 0;
|
|
|
|
|
|
|
|
if (next.tv_nsec >= NSEC_PER_SEC) {
|
|
|
|
next.tv_sec++;
|
|
|
|
next.tv_nsec -= NSEC_PER_SEC;
|
|
|
|
}
|
|
|
|
mod_timer(&sync_cmos_timer, jiffies + timespec_to_jiffies(&next));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void notify_cmos_timer(void)
|
2006-09-30 23:28:22 -07:00
|
|
|
{
|
2007-09-11 15:24:03 -07:00
|
|
|
if (!no_sync_cmos_clock)
|
2007-07-21 04:37:37 -07:00
|
|
|
mod_timer(&sync_cmos_timer, jiffies + 1);
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
|
|
|
|
2007-07-21 04:37:37 -07:00
|
|
|
#else
|
|
|
|
static inline void notify_cmos_timer(void) { }
|
|
|
|
#endif
|
|
|
|
|
2006-09-30 23:28:22 -07:00
|
|
|
/* adjtimex mainly allows reading (and writing, if superuser) of
|
|
|
|
* kernel time-keeping variables. used by xntpd.
|
|
|
|
*/
|
|
|
|
int do_adjtimex(struct timex *txc)
|
|
|
|
{
|
2008-05-01 04:34:33 -07:00
|
|
|
struct timespec ts;
|
2006-09-30 23:28:22 -07:00
|
|
|
int result;
|
|
|
|
|
2008-08-20 16:46:08 -07:00
|
|
|
/* Validate the data before disabling interrupts */
|
|
|
|
if (txc->modes & ADJ_ADJTIME) {
|
2008-05-01 04:34:33 -07:00
|
|
|
/* singleshot must not be used with any other mode bits */
|
2008-08-20 16:46:08 -07:00
|
|
|
if (!(txc->modes & ADJ_OFFSET_SINGLESHOT))
|
2006-09-30 23:28:22 -07:00
|
|
|
return -EINVAL;
|
2008-08-20 16:46:08 -07:00
|
|
|
if (!(txc->modes & ADJ_OFFSET_READONLY) &&
|
|
|
|
!capable(CAP_SYS_TIME))
|
|
|
|
return -EPERM;
|
|
|
|
} else {
|
|
|
|
/* In order to modify anything, you gotta be super-user! */
|
|
|
|
if (txc->modes && !capable(CAP_SYS_TIME))
|
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
/* if the quartz is off by more than 10% something is VERY wrong! */
|
|
|
|
if (txc->modes & ADJ_TICK &&
|
|
|
|
(txc->tick < 900000/USER_HZ ||
|
|
|
|
txc->tick > 1100000/USER_HZ))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (txc->modes & ADJ_STATUS && time_state != TIME_OK)
|
|
|
|
hrtimer_cancel(&leap_timer);
|
2007-11-26 12:42:19 -07:00
|
|
|
}
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2008-05-01 04:34:41 -07:00
|
|
|
getnstimeofday(&ts);
|
|
|
|
|
2006-09-30 23:28:22 -07:00
|
|
|
write_seqlock_irq(&xtime_lock);
|
|
|
|
|
|
|
|
/* If there are input parameters, then process them */
|
2008-08-20 16:46:08 -07:00
|
|
|
if (txc->modes & ADJ_ADJTIME) {
|
|
|
|
long save_adjust = time_adjust;
|
|
|
|
|
|
|
|
if (!(txc->modes & ADJ_OFFSET_READONLY)) {
|
|
|
|
/* adjtime() is independent from ntp_adjtime() */
|
|
|
|
time_adjust = txc->offset;
|
|
|
|
ntp_update_frequency();
|
|
|
|
}
|
|
|
|
txc->offset = save_adjust;
|
|
|
|
goto adj_done;
|
|
|
|
}
|
2008-05-01 04:34:32 -07:00
|
|
|
if (txc->modes) {
|
2008-08-20 16:46:08 -07:00
|
|
|
long sec;
|
|
|
|
|
2008-05-01 04:34:33 -07:00
|
|
|
if (txc->modes & ADJ_STATUS) {
|
|
|
|
if ((time_status & STA_PLL) &&
|
|
|
|
!(txc->status & STA_PLL)) {
|
|
|
|
time_state = TIME_OK;
|
|
|
|
time_status = STA_UNSYNC;
|
|
|
|
}
|
|
|
|
/* only set allowed bits */
|
|
|
|
time_status &= STA_RONLY;
|
|
|
|
time_status |= txc->status & ~STA_RONLY;
|
2008-05-01 04:34:41 -07:00
|
|
|
|
|
|
|
switch (time_state) {
|
|
|
|
case TIME_OK:
|
|
|
|
start_timer:
|
|
|
|
sec = ts.tv_sec;
|
|
|
|
if (time_status & STA_INS) {
|
|
|
|
time_state = TIME_INS;
|
|
|
|
sec += 86400 - sec % 86400;
|
|
|
|
hrtimer_start(&leap_timer, ktime_set(sec, 0), HRTIMER_MODE_ABS);
|
|
|
|
} else if (time_status & STA_DEL) {
|
|
|
|
time_state = TIME_DEL;
|
|
|
|
sec += 86400 - (sec + 1) % 86400;
|
|
|
|
hrtimer_start(&leap_timer, ktime_set(sec, 0), HRTIMER_MODE_ABS);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case TIME_INS:
|
|
|
|
case TIME_DEL:
|
|
|
|
time_state = TIME_OK;
|
|
|
|
goto start_timer;
|
|
|
|
break;
|
|
|
|
case TIME_WAIT:
|
|
|
|
if (!(time_status & (STA_INS | STA_DEL)))
|
|
|
|
time_state = TIME_OK;
|
|
|
|
break;
|
|
|
|
case TIME_OOP:
|
|
|
|
hrtimer_restart(&leap_timer);
|
|
|
|
break;
|
|
|
|
}
|
2008-05-01 04:34:33 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (txc->modes & ADJ_NANO)
|
|
|
|
time_status |= STA_NANO;
|
|
|
|
if (txc->modes & ADJ_MICRO)
|
|
|
|
time_status &= ~STA_NANO;
|
2008-05-01 04:34:32 -07:00
|
|
|
|
|
|
|
if (txc->modes & ADJ_FREQUENCY) {
|
2008-05-01 04:34:34 -07:00
|
|
|
time_freq = (s64)txc->freq * PPM_SCALE;
|
|
|
|
time_freq = min(time_freq, MAXFREQ_SCALED);
|
|
|
|
time_freq = max(time_freq, -MAXFREQ_SCALED);
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
2008-05-01 04:34:32 -07:00
|
|
|
|
2008-05-01 04:34:33 -07:00
|
|
|
if (txc->modes & ADJ_MAXERROR)
|
2008-05-01 04:34:32 -07:00
|
|
|
time_maxerror = txc->maxerror;
|
2008-05-01 04:34:33 -07:00
|
|
|
if (txc->modes & ADJ_ESTERROR)
|
2008-05-01 04:34:32 -07:00
|
|
|
time_esterror = txc->esterror;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
2008-05-01 04:34:32 -07:00
|
|
|
if (txc->modes & ADJ_TIMECONST) {
|
2008-05-01 04:34:33 -07:00
|
|
|
time_constant = txc->constant;
|
|
|
|
if (!(time_status & STA_NANO))
|
|
|
|
time_constant += 4;
|
|
|
|
time_constant = min(time_constant, (long)MAXTC);
|
|
|
|
time_constant = max(time_constant, 0l);
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
|
|
|
|
2008-05-01 04:34:37 -07:00
|
|
|
if (txc->modes & ADJ_TAI && txc->constant > 0)
|
|
|
|
time_tai = txc->constant;
|
|
|
|
|
2008-08-20 16:46:08 -07:00
|
|
|
if (txc->modes & ADJ_OFFSET)
|
|
|
|
ntp_update_offset(txc->offset);
|
2008-05-01 04:34:32 -07:00
|
|
|
if (txc->modes & ADJ_TICK)
|
|
|
|
tick_usec = txc->tick;
|
|
|
|
|
|
|
|
if (txc->modes & (ADJ_TICK|ADJ_FREQUENCY|ADJ_OFFSET))
|
|
|
|
ntp_update_frequency();
|
|
|
|
}
|
2008-05-01 04:34:33 -07:00
|
|
|
|
2008-08-20 16:46:08 -07:00
|
|
|
txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,
|
|
|
|
NTP_SCALE_SHIFT);
|
|
|
|
if (!(time_status & STA_NANO))
|
|
|
|
txc->offset /= NSEC_PER_USEC;
|
|
|
|
|
|
|
|
adj_done:
|
2008-05-01 04:34:33 -07:00
|
|
|
result = time_state; /* mostly `TIME_OK' */
|
2008-05-01 04:34:32 -07:00
|
|
|
if (time_status & (STA_UNSYNC|STA_CLOCKERR))
|
2006-09-30 23:28:22 -07:00
|
|
|
result = TIME_ERROR;
|
|
|
|
|
2008-05-01 04:34:34 -07:00
|
|
|
txc->freq = shift_right((s32)(time_freq >> PPM_SCALE_INV_SHIFT) *
|
|
|
|
(s64)PPM_SCALE_INV,
|
2008-05-01 04:34:38 -07:00
|
|
|
NTP_SCALE_SHIFT);
|
2006-09-30 23:28:22 -07:00
|
|
|
txc->maxerror = time_maxerror;
|
|
|
|
txc->esterror = time_esterror;
|
|
|
|
txc->status = time_status;
|
|
|
|
txc->constant = time_constant;
|
2006-09-30 23:28:29 -07:00
|
|
|
txc->precision = 1;
|
2008-05-01 04:34:34 -07:00
|
|
|
txc->tolerance = MAXFREQ_SCALED / PPM_SCALE;
|
2006-09-30 23:28:22 -07:00
|
|
|
txc->tick = tick_usec;
|
2008-05-01 04:34:37 -07:00
|
|
|
txc->tai = time_tai;
|
2006-09-30 23:28:22 -07:00
|
|
|
|
|
|
|
/* PPS is not implemented, so these are zero */
|
|
|
|
txc->ppsfreq = 0;
|
|
|
|
txc->jitter = 0;
|
|
|
|
txc->shift = 0;
|
|
|
|
txc->stabil = 0;
|
|
|
|
txc->jitcnt = 0;
|
|
|
|
txc->calcnt = 0;
|
|
|
|
txc->errcnt = 0;
|
|
|
|
txc->stbcnt = 0;
|
|
|
|
write_sequnlock_irq(&xtime_lock);
|
2008-05-01 04:34:32 -07:00
|
|
|
|
2008-05-01 04:34:33 -07:00
|
|
|
txc->time.tv_sec = ts.tv_sec;
|
|
|
|
txc->time.tv_usec = ts.tv_nsec;
|
|
|
|
if (!(time_status & STA_NANO))
|
|
|
|
txc->time.tv_usec /= NSEC_PER_USEC;
|
2008-05-01 04:34:32 -07:00
|
|
|
|
2007-07-21 04:37:37 -07:00
|
|
|
notify_cmos_timer();
|
2008-05-01 04:34:32 -07:00
|
|
|
|
|
|
|
return result;
|
2006-09-30 23:28:22 -07:00
|
|
|
}
|
time: remove obsolete CLOCK_TICK_ADJUST
The first version of the ntp_interval/tick_length inconsistent usage patch was
recently merged as bbe4d18ac2e058c56adb0cd71f49d9ed3216a405
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bbe4d18ac2e058c56adb0cd71f49d9ed3216a405
While the fix did greatly improve the situation, it was correctly pointed out
by Roman that it does have a small bug: If the users change clocksources after
the system has been running and NTP has made corrections, the correctoins made
against the old clocksource will be applied against the new clocksource,
causing error.
The second attempt, which corrects the issue in the NTP_INTERVAL_LENGTH
definition has also made it up-stream as commit
e13a2e61dd5152f5499d2003470acf9c838eab84
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e13a2e61dd5152f5499d2003470acf9c838eab84
Roman has correctly pointed out that CLOCK_TICK_ADJUST is calculated
based on the PIT's frequency, and isn't really relevant to non-PIT
driven clocksources (that is, clocksources other then jiffies and pit).
This patch reverts both of those changes, and simply removes
CLOCK_TICK_ADJUST.
This does remove the granularity error correction for users of PIT and Jiffies
clocksource users, but the granularity error but for the majority of users, it
should be within the 500ppm range NTP can accommodate for.
For systems that have granularity errors greater then 500ppm, the
"ntp_tick_adj=" boot option can be used to compensate.
[johnstul@us.ibm.com: provided changelog]
[mattilinnanvuori@yahoo.com: maek ntp_tick_adj static]
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: john stultz <johnstul@us.ibm.com>
Signed-off-by: Matti Linnanvuori <mattilinnanvuori@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: mingo@elte.hu
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-03-04 16:14:26 -07:00
|
|
|
|
|
|
|
static int __init ntp_tick_adj_setup(char *str)
|
|
|
|
{
|
|
|
|
ntp_tick_adj = simple_strtol(str, NULL, 0);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
__setup("ntp_tick_adj=", ntp_tick_adj_setup);
|
2008-05-01 04:34:41 -07:00
|
|
|
|
|
|
|
void __init ntp_init(void)
|
|
|
|
{
|
|
|
|
ntp_clear();
|
|
|
|
hrtimer_init(&leap_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
|
|
|
|
leap_timer.function = ntp_leap_second;
|
|
|
|
}
|