timer fixes
Subsystems (4)
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
Thanks,
Ingo
------------------>
Arve Hjønnevåg (1):
rtc: Fix some bugs that allowed accumulating time drift in suspend/resume
Rabin Vincent (1):
rtc: Disable the alarm in the hardware
Thomas Gleixner (2):
tick-broadcast: Stop active broadcast device when replacing it
clockevents: Set noop handler in clockevents_exchange_device()
Yang Honggang (Joseph) (1):
clocksource: Fix bug with max_deferment margin calculation
drivers/rtc/class.c | 10 ++++---- drivers/rtc/interface.c | 44 ++++++++++++++++++++++++++++++++--------- kernel/time/clockevents.c | 1 + kernel/time/clocksource.c | 4 +- kernel/time/tick-broadcast.c | 2 +- 5 files changed, 43 insertions(+), 18 deletions(-)
drivers/rtc/class.c +5 -5
@@ -66,7 +66,7 @@ static int rtc_suspend(struct device *dev, pm_message_t mesg)*/ delta =timespec_sub (old_system, old_rtc); delta_delta =timespec_sub (delta, old_delta); -if (abs (delta_delta.tv_sec) >=2 ) { +if (delta_delta.tv_sec <-2 || delta_delta.tv_sec >=2 ) {/* * if delta_delta is too large, assume time correction * has occured and set old_delta to the current delta.
@@ -100,9 +100,8 @@ static int rtc_resume(struct device *dev)rtc_tm_to_time (&tm, &new_rtc.tv_sec); new_rtc.tv_nsec =0 ; -if (new_rtc.tv_sec <= old_rtc.tv_sec) { -if (new_rtc.tv_sec < old_rtc.tv_sec) -pr_debug ("%s: time travel!\n" ,dev_name (&rtc->dev)); +if (new_rtc.tv_sec < old_rtc.tv_sec) { +pr_debug ("%s: time travel!\n" ,dev_name (&rtc->dev));return 0 ; }
@@ -119,7 +118,8 @@ static int rtc_resume(struct device *dev) sleep_time =timespec_sub (sleep_time,timespec_sub (new_system, old_system)); -timekeeping_inject_sleeptime (&sleep_time); +if (sleep_time.tv_sec >=0 ) +timekeeping_inject_sleeptime (&sleep_time);return 0 ; }
drivers/rtc/interface.c +34 -10
75 lines not on this page · raw message
kernel/time/clockevents.c +1 -0
@@ -387,6 +387,7 @@ void clockevents_exchange_device(struct clock_event_device *old,* released list and do a notify add later. */ if (old) { + old->event_handler = clockevents_handle_noop;clockevents_set_mode (old,CLOCK_EVT_MODE_UNUSED );list_del (&old->list);list_add (&old->list, &clockevents_released);
kernel/time/clocksource.c +2 -2
@@ -548,7 +548,7 @@ static u64 clocksource_max_deferment(struct clocksource *cs)* note a margin of 12.5% is used because this can be computed with * a shift, versus say 10% which would require division. */ -return max_nsecs - (max_nsecs >>5 ); +return max_nsecs - (max_nsecs >>3 ); }#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
@@ -669,7 +669,7 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq)* ~ 0.06ppm granularity for NTP. We apply the same 12.5% * margin as we do in clocksource_max_deferment() */ - sec = (cs->mask - (cs->mask >>5 )); + sec = (cs->mask - (cs->mask >>3 ));do_div (sec, freq);do_div (sec, scale);if (!sec)
kernel/time/tick-broadcast.c +1 -1
@@ -71,7 +71,7 @@ int tick_check_broadcast_device(struct clock_event_device *dev) (dev->features & CLOCK_EVT_FEAT_C3STOP))return 0 ; -clockevents_exchange_device (NULL , dev); +clockevents_exchange_device (tick_broadcast_device.evtdev, dev); tick_broadcast_device.evtdev = dev;if (!cpumask_empty (tick_get_broadcast_mask ()))tick_broadcast_start_periodic (dev);