From: Greg Kroah-Hartman Date: Fri, 3 May 2013 21:49:36 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.0.77~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd2a44342d109eef0f83bb629aaf2dd935f29b7;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: asoc-max98088-fix-logging-of-hardware-revision.patch drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch --- diff --git a/queue-3.4/asoc-max98088-fix-logging-of-hardware-revision.patch b/queue-3.4/asoc-max98088-fix-logging-of-hardware-revision.patch new file mode 100644 index 00000000000..c1b927ed6aa --- /dev/null +++ b/queue-3.4/asoc-max98088-fix-logging-of-hardware-revision.patch @@ -0,0 +1,31 @@ +From 98682063549bedd6e2d2b6b7222f150c6fbce68c Mon Sep 17 00:00:00 2001 +From: Dylan Reid +Date: Tue, 16 Apr 2013 20:02:34 -0700 +Subject: ASoC: max98088: Fix logging of hardware revision. + +From: Dylan Reid + +commit 98682063549bedd6e2d2b6b7222f150c6fbce68c upstream. + +The hardware revision of the codec is based at 0x40. Subtract that +before convering to ASCII. The same as it is done for 98095. + +Signed-off-by: Dylan Reid +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/codecs/max98088.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/soc/codecs/max98088.c ++++ b/sound/soc/codecs/max98088.c +@@ -2006,7 +2006,7 @@ static int max98088_probe(struct snd_soc + ret); + goto err_access; + } +- dev_info(codec->dev, "revision %c\n", ret + 'A'); ++ dev_info(codec->dev, "revision %c\n", ret - 0x40 + 'A'); + + snd_soc_write(codec, M98088_REG_51_PWR_SYS, M98088_PWRSV); + diff --git a/queue-3.4/drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch b/queue-3.4/drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch new file mode 100644 index 00000000000..3f8d39fbc23 --- /dev/null +++ b/queue-3.4/drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch @@ -0,0 +1,53 @@ +From e005715efaf674660ae59af83b13822567e3a758 Mon Sep 17 00:00:00 2001 +From: Derek Basehore +Date: Mon, 29 Apr 2013 16:20:23 -0700 +Subject: drivers/rtc/rtc-cmos.c: don't disable hpet emulation on suspend + +From: Derek Basehore + +commit e005715efaf674660ae59af83b13822567e3a758 upstream. + +There's a bug where rtc alarms are ignored after the rtc cmos suspends +but before the system finishes suspend. Since hpet emulation is +disabled and it still handles the interrupts, a wake event is never +registered which is done from the rtc layer. + +This patch reverts commit d1b2efa83fbf ("rtc: disable hpet emulation on +suspend") which disabled hpet emulation. To fix the problem mentioned +in that commit, hpet_rtc_timer_init() is called directly on resume. + +Signed-off-by: Derek Basehore +Cc: Maxim Levitsky +Cc: "H. Peter Anvin" +Cc: Thomas Gleixner +Cc: Ingo Molnar +Cc: "Rafael J. Wysocki" +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/rtc/rtc-cmos.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/rtc/rtc-cmos.c ++++ b/drivers/rtc/rtc-cmos.c +@@ -805,9 +805,8 @@ static int cmos_suspend(struct device *d + mask = RTC_IRQMASK; + tmp &= ~mask; + CMOS_WRITE(tmp, RTC_CONTROL); ++ hpet_mask_rtc_irq_bit(mask); + +- /* shut down hpet emulation - we don't need it for alarm */ +- hpet_mask_rtc_irq_bit(RTC_PIE|RTC_AIE|RTC_UIE); + cmos_checkintr(cmos, tmp); + } + spin_unlock_irq(&rtc_lock); +@@ -872,6 +871,7 @@ static int cmos_resume(struct device *de + rtc_update_irq(cmos->rtc, 1, mask); + tmp &= ~RTC_AIE; + hpet_mask_rtc_irq_bit(RTC_AIE); ++ hpet_rtc_timer_init(); + } while (mask & RTC_AIE); + spin_unlock_irq(&rtc_lock); + } diff --git a/queue-3.4/hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch b/queue-3.4/hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch new file mode 100644 index 00000000000..998821f78e9 --- /dev/null +++ b/queue-3.4/hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch @@ -0,0 +1,82 @@ +From 8f294b5a139ee4b75e890ad5b443c93d1e558a8b Mon Sep 17 00:00:00 2001 +From: Prarit Bhargava +Date: Mon, 8 Apr 2013 08:47:15 -0400 +Subject: hrtimer: Add expiry time overflow check in hrtimer_interrupt + +From: Prarit Bhargava + +commit 8f294b5a139ee4b75e890ad5b443c93d1e558a8b upstream. + +The settimeofday01 test in the LTP testsuite effectively does + + gettimeofday(current time); + settimeofday(Jan 1, 1970 + 100 seconds); + settimeofday(current time); + +This test causes a stack trace to be displayed on the console during the +setting of timeofday to Jan 1, 1970 + 100 seconds: + +[ 131.066751] ------------[ cut here ]------------ +[ 131.096448] WARNING: at kernel/time/clockevents.c:209 clockevents_program_event+0x135/0x140() +[ 131.104935] Hardware name: Dinar +[ 131.108150] Modules linked in: sg nfsv3 nfs_acl nfsv4 auth_rpcgss nfs dns_resolver fscache lockd sunrpc nf_conntrack_netbios_ns nf_conntrack_broadcast ipt_MASQUERADE ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat nf_nat_ipv4 nf_nat iptable_mangle ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter ip_tables kvm_amd kvm sp5100_tco bnx2 i2c_piix4 crc32c_intel k10temp fam15h_power ghash_clmulni_intel amd64_edac_mod pcspkr serio_raw edac_mce_amd edac_core microcode xfs libcrc32c sr_mod sd_mod cdrom ata_generic crc_t10dif pata_acpi radeon i2c_algo_bit drm_kms_helper ttm drm ahci pata_atiixp libahci libata usb_storage i2c_core dm_mirror dm_region_hash dm_log dm_mod +[ 131.176784] Pid: 0, comm: swapper/28 Not tainted 3.8.0+ #6 +[ 131.182248] Call Trace: +[ 131.184684] [] warn_slowpath_common+0x7f/0xc0 +[ 131.191312] [] warn_slowpath_null+0x1a/0x20 +[ 131.197131] [] clockevents_program_event+0x135/0x140 +[ 131.203721] [] tick_program_event+0x24/0x30 +[ 131.209534] [] hrtimer_interrupt+0x131/0x230 +[ 131.215437] [] ? cpufreq_p4_target+0x130/0x130 +[ 131.221509] [] smp_apic_timer_interrupt+0x69/0x99 +[ 131.227839] [] apic_timer_interrupt+0x6d/0x80 +[ 131.233816] [] ? sched_clock_cpu+0xc5/0x120 +[ 131.240267] [] ? cpuidle_wrap_enter+0x50/0xa0 +[ 131.246252] [] ? cpuidle_wrap_enter+0x49/0xa0 +[ 131.252238] [] cpuidle_enter_tk+0x10/0x20 +[ 131.257877] [] cpuidle_idle_call+0xa9/0x260 +[ 131.263692] [] cpu_idle+0xaf/0x120 +[ 131.268727] [] start_secondary+0x255/0x257 +[ 131.274449] ---[ end trace 1151a50552231615 ]--- + +When we change the system time to a low value like this, the value of +timekeeper->offs_real will be a negative value. + +It seems that the WARN occurs because an hrtimer has been started in the time +between the releasing of the timekeeper lock and the IPI call (via a call to +on_each_cpu) in clock_was_set() in the do_settimeofday() code. The end result +is that a REALTIME_CLOCK timer has been added with softexpires = expires = +KTIME_MAX. The hrtimer_interrupt() fires/is called and the loop at +kernel/hrtimer.c:1289 is executed. In this loop the code subtracts the +clock base's offset (which was set to timekeeper->offs_real in +do_settimeofday()) from the current hrtimer_cpu_base->expiry value (which +was KTIME_MAX): + + KTIME_MAX - (a negative value) = overflow + +A simple check for an overflow can resolve this problem. Using KTIME_MAX +instead of the overflow value will result in the hrtimer function being run, +and the reprogramming of the timer after that. + +Reviewed-by: Rik van Riel +Cc: Thomas Gleixner +Signed-off-by: Prarit Bhargava +[jstultz: Tweaked commit subject] +Signed-off-by: John Stultz +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/hrtimer.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/kernel/hrtimer.c ++++ b/kernel/hrtimer.c +@@ -1312,6 +1312,8 @@ retry: + + expires = ktime_sub(hrtimer_get_expires(timer), + base->offset); ++ if (expires.tv64 < 0) ++ expires.tv64 = KTIME_MAX; + if (expires.tv64 < expires_next.tv64) + expires_next = expires; + break; diff --git a/queue-3.4/hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch b/queue-3.4/hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch new file mode 100644 index 00000000000..4145b69c991 --- /dev/null +++ b/queue-3.4/hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch @@ -0,0 +1,54 @@ +From 51fd36f3fad8447c487137ae26b9d0b3ce77bb25 Mon Sep 17 00:00:00 2001 +From: David Engraf +Date: Tue, 19 Mar 2013 13:29:55 +0100 +Subject: hrtimer: Fix ktime_add_ns() overflow on 32bit architectures + +From: David Engraf + +commit 51fd36f3fad8447c487137ae26b9d0b3ce77bb25 upstream. + +One can trigger an overflow when using ktime_add_ns() on a 32bit +architecture not supporting CONFIG_KTIME_SCALAR. + +When passing a very high value for u64 nsec, e.g. 7881299347898368000 +the do_div() function converts this value to seconds (7881299347) which +is still to high to pass to the ktime_set() function as long. The result +in is a negative value. + +The problem on my system occurs in the tick-sched.c, +tick_nohz_stop_sched_tick() when time_delta is set to +timekeeping_max_deferment(). The check for time_delta < KTIME_MAX is +valid, thus ktime_add_ns() is called with a too large value resulting in +a negative expire value. This leads to an endless loop in the ticker code: + +time_delta: 7881299347898368000 +expires = ktime_add_ns(last_update, time_delta) +expires: negative value + +This fix caps the value to KTIME_MAX. + +This error doesn't occurs on 64bit or architectures supporting +CONFIG_KTIME_SCALAR (e.g. ARM, x86-32). + +Signed-off-by: David Engraf +[jstultz: Minor tweaks to commit message & header] +Signed-off-by: John Stultz +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/hrtimer.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/kernel/hrtimer.c ++++ b/kernel/hrtimer.c +@@ -298,6 +298,10 @@ ktime_t ktime_sub_ns(const ktime_t kt, u + } else { + unsigned long rem = do_div(nsec, NSEC_PER_SEC); + ++ /* Make sure nsec fits into long */ ++ if (unlikely(nsec > KTIME_SEC_MAX)) ++ return (ktime_t){ .tv64 = KTIME_MAX }; ++ + tmp = ktime_set((long)nsec, rem); + } + diff --git a/queue-3.4/series b/queue-3.4/series index 1724e37a457..77d867881e8 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -36,3 +36,7 @@ alsa-snd-usb-try-harder-to-find-usb_dt_cs_endpoint.patch alsa-usb-audio-disable-autopm-for-midi-devices.patch alsa-usb-audio-fix-autopm-error-during-probing.patch arm-7702-1-set-the-page-table-freeing-ceiling-to-task_size.patch +asoc-max98088-fix-logging-of-hardware-revision.patch +hrtimer-fix-ktime_add_ns-overflow-on-32bit-architectures.patch +hrtimer-add-expiry-time-overflow-check-in-hrtimer_interrupt.patch +drivers-rtc-rtc-cmos.c-don-t-disable-hpet-emulation-on-suspend.patch