timekeeping updates for 2.6.36
Subsystems (23)
Linus,
Please pull the latest timers-timekeeping-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-timekeeping-for-linus
It contains two cherry-picks from the powerpc tree which have changes in the same area of code. John Stultz selected them with the powerpc folks to avoid complex fixups in next.
Thanks,
tglx
------------------>
John Stultz (11):
x86: Fix vtime/file timestamp inconsistencies
time: Implement timespec_add
time: Kill off CONFIG_GENERIC_TIME
powerpc: Simplify update_vsyscall
powerpc: Cleanup xtime usage
timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
um: Convert to use read_persistent_clock
hrtimer: Cleanup direct access to wall_to_monotonic
timekeeping: Make xtime and wall_to_monotonic static
x86: Convert common clocksources to use clocksource_register_hz/khz
clocksource: Add __clocksource_updatefreq_hz/khz methods
Paul Mackerras (2):
powerpc: Rework VDSO gettimeofday to prevent time going backwards
powerpc: Clean up obsolete code relating to decrementer and timebase
Thomas Gleixner (2):
kgdb: Do not access xtime directly
um: Fix read_persistent_clock fallout
Documentation/feature-removal-schedule.txt | 10 -- Documentation/kernel-parameters.txt | 3 +- arch/alpha/Kconfig | 4 - arch/arm/Kconfig | 4 - arch/avr32/Kconfig | 3 - arch/blackfin/Kconfig | 3 - arch/cris/Kconfig | 3 - arch/frv/Kconfig | 4 - arch/h8300/Kconfig | 4 - arch/ia64/Kconfig | 4 - arch/ia64/kernel/time.c | 7 +- arch/m32r/Kconfig | 3 - arch/m68k/Kconfig | 3 - arch/m68knommu/Kconfig | 4 - arch/microblaze/Kconfig | 3 - arch/mips/Kconfig | 4 - arch/mn10300/Kconfig | 3 - arch/parisc/Kconfig | 4 - arch/powerpc/Kconfig | 3 - arch/powerpc/include/asm/machdep.h | 3 - arch/powerpc/include/asm/time.h | 7 - arch/powerpc/include/asm/vdso_datapage.h | 2 + arch/powerpc/kernel/asm-offsets.c | 1 + arch/powerpc/kernel/smp.c | 2 - arch/powerpc/kernel/time.c | 201 +++++--------------------- arch/powerpc/kernel/vdso32/gettimeofday.S | 184 ++++++------------------ arch/powerpc/kernel/vdso64/gettimeofday.S | 88 +++--------- arch/powerpc/platforms/52xx/lite5200_pm.c | 3 - arch/powerpc/platforms/52xx/mpc52xx_pm.c | 3 - arch/powerpc/platforms/powermac/cpufreq_32.c | 8 +- arch/s390/Kconfig | 3 - arch/s390/kernel/time.c | 8 +- arch/score/Kconfig | 3 - arch/sh/Kconfig | 3 - arch/sparc/Kconfig | 3 - arch/um/Kconfig.common | 4 - arch/um/kernel/time.c | 16 +- arch/x86/Kconfig | 5 +- arch/x86/kernel/hpet.c | 13 ++- arch/x86/kernel/tsc.c | 5 +- arch/x86/kernel/vsyscall_64.c | 17 ++- arch/xtensa/Kconfig | 3 - drivers/Makefile | 4 +- drivers/acpi/acpi_pad.c | 2 +- drivers/acpi/processor_idle.c | 2 +- drivers/clocksource/acpi_pm.c | 9 +- drivers/misc/Kconfig | 4 +- include/linux/clocksource.h | 17 ++- include/linux/time.h | 21 +++- kernel/debug/kdb/kdb_main.c | 4 +- kernel/hrtimer.c | 9 +- kernel/time.c | 16 -- kernel/time/Kconfig | 4 +- kernel/time/clocksource.c | 33 ++++- kernel/time/timekeeping.c | 79 +++-------- kernel/trace/Kconfig | 4 +- 56 files changed, 245 insertions(+), 624 deletions(-)
Documentation/feature-removal-schedule.txt +0 -10
@@ -549,16 +549,6 @@ Who: Avi Kivity <[email protected]> ---------------------------- -What: xtime, wall_to_monotonic -When: 2.6.36+ -Files: kernel/time/timekeeping.c include/linux/time.h -Why: Cleaning up timekeeping internal values. Please use - existing timekeeping accessor functions to access - the equivalent functionality. -Who: John Stultz <[email protected]> - ----------------------------- - What: KVM kernel-allocated memory slots When: July 2010 Why: Since 2.6.25, kvm supports user-allocated memory slots, which are
Documentation/kernel-parameters.txt +1 -2
@@ -73,7 +73,6 @@ parameter is applicable: MTD MTD (Memory Technology Device) 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. PV_OPS A paravirtualized kernel is enabled.
@@ -468,7 +467,7 @@ and is between 256 and 4096 characters. It is defined in the file clocksource is not available, it defaults to PIT. Format: { pit | tsc | cyclone | pmtmr } - clocksource= [GENERIC_TIME] Override the default clocksource + clocksource= Override the default clocksource Format: <string> Override the default clocksource and use the clocksource with the name specified.
arch/alpha/Kconfig +0 -4
@@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_CMOS_UPDATE def_bool y
arch/arm/Kconfig +0 -4
@@ -41,10 +41,6 @@ config SYS_SUPPORTS_APM_EMULATION config GENERIC_GPIO bool -config GENERIC_TIME - bool - default y - config ARCH_USES_GETTIMEOFFSET bool default n
arch/avr32/Kconfig +0 -3
@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE config RWSEM_GENERIC_SPINLOCK def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS def_bool y
arch/blackfin/Kconfig +0 -3
@@ -614,9 +614,6 @@ comment "Kernel Timer/Scheduler" source kernel/Kconfig.hz -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS bool "Generic clock events" default y
arch/cris/Kconfig +0 -3
@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool -config GENERIC_TIME - def_bool y - config GENERIC_CMOS_UPDATE def_bool y
arch/frv/Kconfig +0 -4
@@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ bool default y -config GENERIC_TIME - bool - default y - config TIME_LOW_RES bool default y
arch/h8300/Kconfig +0 -4
@@ -62,10 +62,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_BUG bool depends on BUG
arch/ia64/Kconfig +0 -4
@@ -82,10 +82,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_TIME_VSYSCALL bool default y
arch/ia64/kernel/time.c +4 -3
@@ -471,7 +471,8 @@ void update_vsyscall_tz(void) { } -void update_vsyscall (struct timespec *wall,struct clocksource *c,u32 mult) +void update_vsyscall (struct timespec *wall,struct timespec *wtm, +struct clocksource *c,u32 mult) {unsigned long flags;
@@ -487,9 +488,9 @@ void update_vsyscall(struct timespec *wall, struct clocksource *c, u32 mult)/* copy kernel time structures */ fsyscall_gtod_data.wall_time.tv_sec = wall->tv_sec; fsyscall_gtod_data.wall_time.tv_nsec = wall->tv_nsec; - fsyscall_gtod_data.monotonic_time.tv_sec = wall_to_monotonic.tv_sec + fsyscall_gtod_data.monotonic_time.tv_sec = wtm->tv_sec + wall->tv_sec; - fsyscall_gtod_data.monotonic_time.tv_nsec = wall_to_monotonic.tv_nsec + fsyscall_gtod_data.monotonic_time.tv_nsec = wtm->tv_nsec + wall->tv_nsec;/* normalize */
arch/m32r/Kconfig +0 -3
@@ -44,9 +44,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
arch/m68k/Kconfig +0 -3
@@ -59,9 +59,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y
arch/m68knommu/Kconfig +0 -4
@@ -63,10 +63,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config GENERIC_CMOS_UPDATE bool default y
arch/microblaze/Kconfig +0 -3
@@ -48,9 +48,6 @@ config GENERIC_IRQ_PROBE config GENERIC_CALIBRATE_DELAY def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_TIME_VSYSCALL def_bool n
arch/mips/Kconfig +0 -4
@@ -733,10 +733,6 @@ config GENERIC_CLOCKEVENTS bool default y -config GENERIC_TIME - bool - default y - config GENERIC_CMOS_UPDATE bool default y
arch/mn10300/Kconfig +0 -3
@@ -46,9 +46,6 @@ config GENERIC_FIND_NEXT_BIT config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_BUG def_bool y
arch/parisc/Kconfig +0 -4
@@ -66,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY bool default y -config GENERIC_TIME - bool - default y - config TIME_LOW_RES bool depends on SMP
arch/powerpc/Kconfig +0 -3
@@ -29,9 +29,6 @@ config MMU config GENERIC_CMOS_UPDATE def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_TIME_VSYSCALL def_bool y
arch/powerpc/include/asm/machdep.h +0 -3
@@ -366,8 +366,5 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)#define machine_late_initcall (mach,fn) __define_machine_initcall(mach,"7",fn,7)#define machine_late_initcall_sync (mach,fn) __define_machine_initcall(mach,"7s",fn,7s) -void generic_suspend_disable_irqs (void ); -void generic_suspend_enable_irqs (void ); -#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_MACHDEP_H */
arch/powerpc/include/asm/time.h +0 -7
@@ -28,16 +28,12 @@extern unsigned long tb_ticks_per_jiffy;extern unsigned long tb_ticks_per_usec;extern unsigned long tb_ticks_per_sec; -extern u64 tb_to_xs; -extern unsigned tb_to_us;struct rtc_time ;extern void to_tm (int tim,struct rtc_time * tm);extern void GregorianDay (struct rtc_time *tm); -extern time_t last_rtc_update;extern void generic_calibrate_decr (void ); -extern void wakeup_decrementer (void );extern void snapshot_timebase (void );extern void set_dec_cpu6 (unsigned int val);
@@ -204,9 +200,6 @@ static inline unsigned long tb_ticks_since(unsigned long tstamp)extern u64 mulhdu (u64 ,u64 );#endif -extern void smp_space_timers (unsigned int ); - -extern unsigned mulhwu_scale_factor (unsigned ,unsigned );extern void div128_by_32 (u64 dividend_high,u64 dividend_low,unsigned divisor,struct div_result *dr);
arch/powerpc/include/asm/vdso_datapage.h +2 -0
@@ -85,6 +85,7 @@ struct vdso_data {__s32 wtom_clock_sec;/* Wall to monotonic clock */ __s32 wtom_clock_nsec;struct timespec stamp_xtime;/* xtime as at tb_orig_stamp */ +__u32 stamp_sec_fraction;/* fractional seconds of stamp_xtime */ __u32 syscall_map_64[SYSCALL_MAP_SIZE ];/* map of syscalls */ __u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ };
@@ -105,6 +106,7 @@ struct vdso_data {__s32 wtom_clock_sec;/* Wall to monotonic clock */ __s32 wtom_clock_nsec;struct timespec stamp_xtime;/* xtime as at tb_orig_stamp */ +__u32 stamp_sec_fraction;/* fractional seconds of stamp_xtime */ __u32 syscall_map_32[SYSCALL_MAP_SIZE ];/* map of syscalls */ __u32 dcache_block_size;/* L1 d-cache block size */ __u32 icache_block_size;/* L1 i-cache block size */
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -342,6 +342,7 @@ int main(void)DEFINE (WTOM_CLOCK_SEC , offsetof(struct vdso_data , wtom_clock_sec));DEFINE (WTOM_CLOCK_NSEC , offsetof(struct vdso_data , wtom_clock_nsec));DEFINE (STAMP_XTIME , offsetof(struct vdso_data , stamp_xtime)); +DEFINE (STAMP_SEC_FRAC , offsetof(struct vdso_data , stamp_sec_fraction));DEFINE (CFG_ICACHE_BLOCKSZ , offsetof(struct vdso_data , icache_block_size));DEFINE (CFG_DCACHE_BLOCKSZ , offsetof(struct vdso_data , dcache_block_size));DEFINE (CFG_ICACHE_LOGBLOCKSZ , offsetof(struct vdso_data , icache_log_block_size));
arch/powerpc/kernel/smp.c +0 -2
@@ -288,8 +288,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) max_cpus =NR_CPUS ; else max_cpus =1 ; - -smp_space_timers (max_cpus);for_each_possible_cpu (cpu)if (cpu != boot_cpuid)
arch/powerpc/kernel/time.c +36 -165
314 lines not on this page · raw message
arch/powerpc/kernel/vdso32/gettimeofday.S +42 -142
247 lines not on this page · raw message
arch/powerpc/kernel/vdso64/gettimeofday.S +20 -68
128 lines not on this page · raw message
arch/powerpc/platforms/52xx/lite5200_pm.c +0 -3
@@ -216,9 +216,6 @@ static int lite5200_pm_enter(suspend_state_t state)lite5200_restore_regs (); -/* restart jiffies */ -wakeup_decrementer (); -iounmap (mbar);return 0 ; }
arch/powerpc/platforms/52xx/mpc52xx_pm.c +0 -3
@@ -171,9 +171,6 @@ int mpc52xx_pm_enter(suspend_state_t state)/* restore SRAM */ memcpy (sram, saved_sram, sram_size); -/* restart jiffies */ -wakeup_decrementer (); -/* reenable interrupts in PIC */ out_be32 (&intr->main_mask, intr_main_mask);
arch/powerpc/platforms/powermac/cpufreq_32.c +6 -2
@@ -310,8 +310,12 @@ static int pmu_set_cpu_speed(int low_speed)/* Restore low level PMU operations */ pmu_unlock (); -/* Restore decrementer */ -wakeup_decrementer (); +/* +* Restore decrementer; we'll take a decrementer interrupt +* as soon as interrupts are re-enabled and the generic +* clockevents code will reprogram it with the right value. +*/ +set_dec (1 );/* Restore interrupts */ mpic_cpu_set_priority (pic_prio);
arch/s390/Kconfig +0 -3
@@ -40,9 +40,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - config GENERIC_TIME_VSYSCALL def_bool y
arch/s390/kernel/time.c +4 -4
@@ -207,8 +207,8 @@ struct clocksource * __init clocksource_default_clock(void)return &clocksource_tod; } -void update_vsyscall (struct timespec *wall_time,struct clocksource *clock, -u32 mult) +void update_vsyscall (struct timespec *wall_time,struct timespec *wtm, +struct clocksource *clock,u32 mult) {if (clock != &clocksource_tod)return ;
@@ -219,8 +219,8 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, vdso_data->xtime_tod_stamp = clock->cycle_last; vdso_data->xtime_clock_sec = wall_time->tv_sec; vdso_data->xtime_clock_nsec = wall_time->tv_nsec; - vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec; - vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec; + vdso_data->wtom_clock_sec = wtm->tv_sec; + vdso_data->wtom_clock_nsec = wtm->tv_nsec; vdso_data->ntp_mult = mult;smp_wmb (); ++vdso_data->tb_update_count;
arch/score/Kconfig +0 -3
@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_CLOCKEVENTS def_bool y -config GENERIC_TIME - def_bool y - config SCHED_NO_NO_OMIT_FRAME_POINTER def_bool y
arch/sh/Kconfig +0 -3
@@ -98,9 +98,6 @@ config GENERIC_CALIBRATE_DELAY config GENERIC_IOMAP bool -config GENERIC_TIME - def_bool y - config GENERIC_CLOCKEVENTS def_bool y
arch/sparc/Kconfig +0 -3
@@ -66,9 +66,6 @@ config BITS default 32 if SPARC32 default 64 if SPARC64 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET bool default y if SPARC32
arch/um/Kconfig.common +0 -4
@@ -55,10 +55,6 @@ config GENERIC_BUG default y depends on BUG -config GENERIC_TIME - bool - default y - config GENERIC_CLOCKEVENTS bool default y
arch/um/kernel/time.c +8 -8
@@ -102,16 +102,16 @@ static void __init setup_itimer(void)clockevents_register_device (&itimer_clockevent); } -void __init time_init (void ) +void read_persistent_clock (struct timespec *ts) { -long long nsecs; - -timer_init (); +long long nsecs =os_nsecs (); - nsecs =os_nsecs (); -set_normalized_timespec (&wall_to_monotonic, -nsecs /NSEC_PER_SEC , - -nsecs %NSEC_PER_SEC ); -set_normalized_timespec (&xtime, nsecs /NSEC_PER_SEC , +set_normalized_timespec (ts, nsecs /NSEC_PER_SEC , nsecs %NSEC_PER_SEC ); +} + +void __init time_init (void ) +{ +timer_init (); late_time_init = setup_itimer; }
arch/x86/Kconfig +1 -4
@@ -72,9 +72,6 @@ config ARCH_DEFCONFIG default "arch/x86/configs/i386_defconfig" if X86_32 default "arch/x86/configs/x86_64_defconfig" if X86_64 -config GENERIC_TIME - def_bool y - config GENERIC_CMOS_UPDATE def_bool y
@@ -2046,7 +2043,7 @@ config SCx200 config SCx200HR_TIMER tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" - depends on SCx200 && GENERIC_TIME + depends on SCx200 default y ---help--- This driver provides a clocksource built upon the on-chip
arch/x86/kernel/hpet.c +9 -4
@@ -16,7 +16,6 @@#include <asm/hpet.h> #define HPET_MASK CLOCKSOURCE_MASK(32) -#define HPET_SHIFT 22/* FSEC = 10^-15 NSEC = 10^-9 */
@@ -787,7 +786,6 @@ static struct clocksource clocksource_hpet = { .rating = 250, .read = read_hpet, .mask = HPET_MASK, - .shift = HPET_SHIFT, .flags = CLOCK_SOURCE_IS_CONTINUOUS, .resume = hpet_resume_counter,#ifdef CONFIG_X86_64
@@ -798,6 +796,7 @@ static struct clocksource clocksource_hpet = {static int hpet_clocksource_register (void ) {u64 start, now; +u64 hpet_freq;cycle_t t1;/* Start the counter */
@@ -832,9 +831,15 @@ static int hpet_clocksource_register(void)* mult = (hpet_period * 2^shift)/10^6 * mult = (hpet_period << shift)/FSEC_PER_NSEC */ - clocksource_hpet.mult =div_sc (hpet_period,FSEC_PER_NSEC ,HPET_SHIFT ); -clocksource_register (&clocksource_hpet); +/* Need to convert hpet_period (fsec/cyc) to cyc/sec: +* +* cyc/sec = FSEC_PER_SEC/hpet_period(fsec/cyc) +* cyc/sec = (FSEC_PER_NSEC * NSEC_PER_SEC)/hpet_period +*/ + hpet_freq =FSEC_PER_NSEC *NSEC_PER_SEC ; +do_div (hpet_freq, hpet_period); +clocksource_register_hz (&clocksource_hpet, (u32 )hpet_freq);return 0 ; }
arch/x86/kernel/tsc.c +1 -4
@@ -751,7 +751,6 @@ static struct clocksource clocksource_tsc = { .read = read_tsc, .resume = resume_tsc, .mask = CLOCKSOURCE_MASK(64), - .shift = 22, .flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_MUST_VERIFY,#ifdef CONFIG_X86_64
@@ -845,8 +844,6 @@ __cpuinit int unsynchronized_tsc(void)static void __init init_tsc_clocksource (void ) { - clocksource_tsc.mult =clocksource_khz2mult (tsc_khz, - clocksource_tsc.shift);if (tsc_clocksource_reliable) clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY ;/* lower the rating if we already know its unstable: */
@@ -854,7 +851,7 @@ static void __init init_tsc_clocksource(void) clocksource_tsc.rating =0 ; clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS ; } -clocksource_register (&clocksource_tsc); +clocksource_register_khz (&clocksource_tsc, tsc_khz); }#ifdef CONFIG_X86_64
arch/x86/kernel/vsyscall_64.c +11 -6
@@ -73,8 +73,8 @@ void update_vsyscall_tz(void)write_sequnlock_irqrestore (&vsyscall_gtod_data.lock, flags); } -void update_vsyscall (struct timespec *wall_time,struct clocksource *clock, -u32 mult) +void update_vsyscall (struct timespec *wall_time,struct timespec *wtm, +struct clocksource *clock,u32 mult) {unsigned long flags;
@@ -87,7 +87,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, vsyscall_gtod_data.clock.shift = clock->shift; vsyscall_gtod_data.wall_time_sec = wall_time->tv_sec; vsyscall_gtod_data.wall_time_nsec = wall_time->tv_nsec; - vsyscall_gtod_data.wall_to_monotonic = wall_to_monotonic; + vsyscall_gtod_data.wall_to_monotonic = *wtm; vsyscall_gtod_data.wall_time_coarse =__current_kernel_time ();write_sequnlock_irqrestore (&vsyscall_gtod_data.lock, flags); }
@@ -169,13 +169,18 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)* unlikely */ time_t __vsyscall(1) vtime(time_t *t) { -struct timeval tv; +unsigned seq;time_t result;if (unlikely (!__vsyscall_gtod_data.sysctl_enabled))return time_syscall (t); -vgettimeofday (&tv,NULL ); - result = tv.tv_sec; +do { + seq =read_seqbegin (&__vsyscall_gtod_data.lock); + + result = __vsyscall_gtod_data.wall_time_sec; + + }while (read_seqretry (&__vsyscall_gtod_data.lock, seq)); +if (t) *t = result;return result;
arch/xtensa/Kconfig +0 -3
@@ -48,9 +48,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer"
drivers/Makefile +3 -1
@@ -101,7 +101,9 @@ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ obj-$(CONFIG_ARCH_SHMOBILE) += sh/ -obj-$(CONFIG_GENERIC_TIME) += clocksource/ +ifndef CONFIG_ARCH_USES_GETTIMEOFFSET +obj-y += clocksource/ +endif obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_DCA) += dca/ obj-$(CONFIG_HID) += hid/
drivers/acpi/acpi_pad.c +1 -1
@@ -77,7 +77,7 @@ static void power_saving_mwait_init(void) power_saving_mwait_eax = (highest_cstate <<MWAIT_SUBSTATE_SIZE ) | (highest_subcstate -1 ); -#if defined(CONFIG_GENERIC_TIME ) && defined(CONFIG_X86 ) +#if defined(CONFIG_X86 )switch (boot_cpu_data.x86_vendor) {case X86_VENDOR_AMD :case X86_VENDOR_INTEL :
drivers/acpi/processor_idle.c +1 -1
@@ -264,7 +264,7 @@ int acpi_processor_resume(struct acpi_device * device)return 0 ; } -#if defined (CONFIG_GENERIC_TIME ) && defined (CONFIG_X86 ) +#if defined(CONFIG_X86 )static void tsc_check_state (int state) {switch (boot_cpu_data.x86_vendor) {
drivers/clocksource/acpi_pm.c +2 -7
@@ -68,10 +68,7 @@ static struct clocksource clocksource_acpi_pm = { .rating = 200, .read = acpi_pm_read, .mask = (cycle_t)ACPI_PM_MASK, - .mult = 0, /*to be calculated*/ - .shift = 22, .flags = CLOCK_SOURCE_IS_CONTINUOUS, - };
@@ -190,9 +187,6 @@ static int __init init_acpi_pm_clocksource(void)if (!pmtmr_ioport)return -ENODEV ; - clocksource_acpi_pm.mult =clocksource_hz2mult (PMTMR_TICKS_PER_SEC , - clocksource_acpi_pm.shift); -/* "verify" this timing source: */ for (j =0 ; j <ACPI_PM_MONOTONICITY_CHECKS ; j++) {udelay (100 * j);
@@ -220,7 +214,8 @@ static int __init init_acpi_pm_clocksource(void)if (verify_pmtmr_rate () !=0 )return -ENODEV ; -return clocksource_register (&clocksource_acpi_pm); +return clocksource_register_hz (&clocksource_acpi_pm, +PMTMR_TICKS_PER_SEC ); }/* We use fs_initcall because we want the PCI fixups to have run
drivers/misc/Kconfig +2 -2
@@ -72,7 +72,7 @@ config ATMEL_TCLIB config ATMEL_TCB_CLKSRC bool "TC Block Clocksource" - depends on ATMEL_TCLIB && GENERIC_TIME + depends on ATMEL_TCLIB default y help Select this to get a high precision clocksource based on a
@@ -240,7 +240,7 @@ config CS5535_MFGPT_DEFAULT_IRQ config CS5535_CLOCK_EVENT_SRC tristate "CS5535/CS5536 high-res timer (MFGPT) events" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT + depends on GENERIC_CLOCKEVENTS && CS5535_MFGPT help This driver provides a clock event source based on the MFGPT timer(s) in the CS5535 and CS5536 companion chips.
include/linux/clocksource.h +15 -2
@@ -292,6 +292,8 @@ clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);*/ extern int __clocksource_register_scale (struct clocksource *cs,u32 scale,u32 freq); +extern void +__clocksource_updatefreq_scale (struct clocksource *cs,u32 scale,u32 freq);static inline int clocksource_register_hz (struct clocksource *cs,u32 hz) {
@@ -303,6 +305,15 @@ static inline int clocksource_register_khz(struct clocksource *cs, u32 khz)return __clocksource_register_scale (cs,1000 , khz); } +static inline void __clocksource_updatefreq_hz (struct clocksource *cs,u32 hz) +{ +__clocksource_updatefreq_scale (cs,1 , hz); +} + +static inline void __clocksource_updatefreq_khz (struct clocksource *cs,u32 khz) +{ +__clocksource_updatefreq_scale (cs,1000 , khz); +}static inline void clocksource_calc_mult_shift (struct clocksource *cs,u32 freq,u32 minsec)
@@ -313,11 +324,13 @@ clocksource_calc_mult_shift(struct clocksource *cs, u32 freq, u32 minsec)#ifdef CONFIG_GENERIC_TIME_VSYSCALL extern void -update_vsyscall (struct timespec *ts,struct clocksource *c,u32 mult); +update_vsyscall (struct timespec *ts,struct timespec *wtm, +struct clocksource *c,u32 mult);extern void update_vsyscall_tz (void );#else static inline void -update_vsyscall (struct timespec *ts,struct clocksource *c,u32 mult) +update_vsyscall (struct timespec *ts,struct timespec *wtm, +struct clocksource *c,u32 mult) { }
include/linux/time.h +18 -3
@@ -76,9 +76,25 @@ extern unsigned long mktime(const unsigned int year, const unsigned int mon, const unsigned int min, const unsigned int sec);extern void set_normalized_timespec (struct timespec *ts,time_t sec,s64 nsec); + +/* +* timespec_add_safe assumes both values are positive and checks +* for overflow. It will return TIME_T_MAX if the reutrn would be +* smaller then either of the arguments. +*/ extern struct timespec timespec_add_safe (const struct timespec lhs,const struct timespec rhs); + +static inline struct timespec timespec_add (struct timespec lhs, +struct timespec rhs) +{ +struct timespec ts_delta; +set_normalized_timespec (&ts_delta, lhs.tv_sec + rhs.tv_sec, + lhs.tv_nsec + rhs.tv_nsec); +return ts_delta; +} +/* * sub = lhs - rhs, in normalized form */
@@ -97,8 +113,6 @@ static inline struct timespec timespec_sub(struct timespec lhs,#define timespec_valid (ts) \ (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC)) -extern struct timespec xtime; -extern struct timespec wall_to_monotonic;extern seqlock_t xtime_lock;extern void read_persistent_clock (struct timespec *ts);
@@ -110,7 +124,8 @@ extern int timekeeping_suspended;unsigned long get_seconds (void );struct timespec current_kernel_time (void ); -struct timespec __current_kernel_time (void );/* does not hold xtime_lock */ +struct timespec __current_kernel_time (void );/* does not take xtime_lock */ +struct timespec __get_wall_to_monotonic (void );/* does not take xtime_lock */ struct timespec get_monotonic_coarse (void );#define CURRENT_TIME (current_kernel_time())
kernel/debug/kdb/kdb_main.c +3 -1
@@ -2440,6 +2440,7 @@ static void kdb_sysinfo(struct sysinfo *val)*/ static int kdb_summary (int argc,const char **argv) { +struct timespec now;struct kdb_tm tm;struct sysinfo val;
@@ -2454,7 +2455,8 @@ static int kdb_summary(int argc, const char **argv)kdb_printf ("domainname %s\n" , init_uts_ns.name.domainname);kdb_printf ("ccversion %s\n" ,__stringify (CCVERSION )); -kdb_gmtime (&xtime, &tm); + now =__current_kernel_time (); +kdb_gmtime (&now, &tm); kdb_printf("date %04d-%02d-%02d %02d:%02d:%02d " "tz_minuteswest %d\n", 1900+tm.tm_year, tm.tm_mon+1, tm.tm_mday,
kernel/hrtimer.c +4 -5
@@ -90,7 +90,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)do { seq =read_seqbegin (&xtime_lock); xts =__current_kernel_time (); - tom = wall_to_monotonic; + tom =__get_wall_to_monotonic (); }while (read_seqretry (&xtime_lock, seq)); xtim =timespec_to_ktime (xts);
@@ -612,7 +612,7 @@ static int hrtimer_reprogram(struct hrtimer *timer,static void retrigger_next_event (void *arg) {struct hrtimer_cpu_base *base; -struct timespec realtime_offset; +struct timespec realtime_offset, wtm;unsigned long seq;if (!hrtimer_hres_active ())
@@ -620,10 +620,9 @@ static void retrigger_next_event(void *arg)do { seq =read_seqbegin (&xtime_lock); -set_normalized_timespec (&realtime_offset, - -wall_to_monotonic.tv_sec, - -wall_to_monotonic.tv_nsec); + wtm =__get_wall_to_monotonic (); }while (read_seqretry (&xtime_lock, seq)); +set_normalized_timespec (&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); base = &__get_cpu_var (hrtimer_bases);
kernel/time.c +0 -16
@@ -300,22 +300,6 @@ struct timespec timespec_trunc(struct timespec t, unsigned gran) }EXPORT_SYMBOL (timespec_trunc); -#ifndef CONFIG_GENERIC_TIME -/* -* Simulate gettimeofday using do_gettimeofday which only allows a timeval -* and therefore only yields usec accuracy -*/ -void getnstimeofday (struct timespec *tv) -{ -struct timeval x; - -do_gettimeofday (&x); - tv->tv_sec = x.tv_sec; - tv->tv_nsec = x.tv_usec *NSEC_PER_USEC ; -} -EXPORT_SYMBOL_GPL (getnstimeofday); -#endif -/* 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.
kernel/time/Kconfig +2 -2
@@ -6,7 +6,7 @@ config TICK_ONESHOT config NO_HZ bool "Tickless System (Dynamic Ticks)" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS + depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT help This option enables a tickless system: timer interrupts will
@@ -15,7 +15,7 @@ config NO_HZ config HIGH_RES_TIMERS bool "High Resolution Timer Support" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS + depends on !ARCH_USES_GETTIMEOFFSET && GENERIC_CLOCKEVENTS select TICK_ONESHOT help This option enables high resolution timer support. If your
kernel/time/clocksource.c +26 -7
@@ -531,7 +531,7 @@ static u64 clocksource_max_deferment(struct clocksource *cs)return max_nsecs - (max_nsecs >>5 ); } -#ifdef CONFIG_GENERIC_TIME +#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET /** * clocksource_select - Select the best clocksource available
@@ -577,7 +577,7 @@ static void clocksource_select(void) } } -#else /* CONFIG_GENERIC_TIME */ +#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ static inline void clocksource_select (void ) { }
@@ -639,19 +639,18 @@ static void clocksource_enqueue(struct clocksource *cs)#define MAX_UPDATE_LENGTH 5/* Seconds */ /** -* __clocksource_register_scale - Used to install new clocksources +* __clocksource_updatefreq_scale - Used update clocksource with new freq * @t: clocksource to be registered * @scale: Scale factor multiplied against freq to get clocksource hz * @freq: clocksource frequency (cycles per second) divided by scale * -* Returns -EBUSY if registration fails, zero otherwise. +* This should only be called from the clocksource->enable() method. * * This *SHOULD NOT* be called directly! Please use the -* clocksource_register_hz() or clocksource_register_khz helper functions. +* clocksource_updatefreq_hz() or clocksource_updatefreq_khz helper functions. */ -int __clocksource_register_scale (struct clocksource *cs,u32 scale,u32 freq) +void __clocksource_updatefreq_scale (struct clocksource *cs,u32 scale,u32 freq) { -/* * Ideally we want to use some of the limits used in * clocksource_max_deferment, to provide a more informed
@@ -662,7 +661,27 @@ int __clocksource_register_scale(struct clocksource *cs, u32 scale, u32 freq)NSEC_PER_SEC /scale, MAX_UPDATE_LENGTH*scale); cs->max_idle_ns =clocksource_max_deferment (cs); +} +EXPORT_SYMBOL_GPL (__clocksource_updatefreq_scale); + +/** +* __clocksource_register_scale - Used to install new clocksources +* @t: clocksource to be registered +* @scale: Scale factor multiplied against freq to get clocksource hz +* @freq: clocksource frequency (cycles per second) divided by scale +* +* Returns -EBUSY if registration fails, zero otherwise. +* +* This *SHOULD NOT* be called directly! Please use the +* clocksource_register_hz() or clocksource_register_khz helper functions. +*/ +int __clocksource_register_scale (struct clocksource *cs,u32 scale,u32 freq) +{ + +/* Intialize mult/shift and max_idle_ns */ +__clocksource_updatefreq_scale (cs, scale, freq); +/* Add clocksource to the clcoksource list */ mutex_lock (&clocksource_mutex);clocksource_enqueue (cs);clocksource_select ();
kernel/time/timekeeping.c +20 -59
137 lines not on this page · raw message
kernel/trace/Kconfig +2 -2
@@ -153,7 +153,7 @@ config IRQSOFF_TRACER bool "Interrupts-off Latency Tracer" default n depends on TRACE_IRQFLAGS_SUPPORT - depends on GENERIC_TIME + depends on !ARCH_USES_GETTIMEOFFSET select TRACE_IRQFLAGS select GENERIC_TRACER select TRACER_MAX_TRACE
@@ -175,7 +175,7 @@ config IRQSOFF_TRACER config PREEMPT_TRACER bool "Preemption-off Latency Tracer" default n - depends on GENERIC_TIME + depends on !ARCH_USES_GETTIMEOFFSET depends on PREEMPT select GENERIC_TRACER select TRACER_MAX_TRACE
Quoted 8 lines · Thomas Gleixner
Please pull the latest timers-timekeeping-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gittimers-timekeeping-for-linusIt contains two cherry-picks from the powerpc tree which have changes in the same area of code. John Stultz selected them with the powerpc folks to avoid complex fixups in next.
Well, it just resulted in another merge conflict, but I resolved it the same way you had resolved your cherry-picks. However, I wanted to let people know, so that the powerpc guys can re-verify that whole vsyscall timer change.
So Paul, Ben, please check out that I didn't screw something up in there.
Linus
Quoted 6 lines · Linus Torvalds
Well, it just resulted in another merge conflict, but I resolved it the same way you had resolved your cherry-picks. However, I wanted to let people know, so that the powerpc guys can re-verify that whole vsyscall timer change.
So Paul, Ben, please check out that I didn't screw something up in there.
Looks fine, thanks.
Paul.