Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PM: runtime: Fix timer_expires data type on 32-bit arches

Commit 8234f6734c5d ("PM-runtime: Switch autosuspend over to using
hrtimers") switched PM runtime autosuspend to use hrtimers and all
related time accounting in ns, but missed to update the timer_expires
data type in struct dev_pm_info to u64.

This causes the timer_expires value to be truncated on 32-bit
architectures when assignment is done from u64 values:

rpm_suspend()
|- dev->power.timer_expires = expires;

Fix it by changing the timer_expires type to u64.

Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers")
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Vincent Guittot <vincent.guittot@linaro.org>
Cc: 5.0+ <stable@vger.kernel.org> # 5.0+
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Grygorii Strashko and committed by
Rafael J. Wysocki
6b61d49a d12544fb

+1 -1
+1 -1
include/linux/pm.h
··· 590 590 #endif 591 591 #ifdef CONFIG_PM 592 592 struct hrtimer suspend_timer; 593 - unsigned long timer_expires; 593 + u64 timer_expires; 594 594 struct work_struct work; 595 595 wait_queue_head_t wait_queue; 596 596 struct wake_irq *wakeirq;