Re: [PATCH] pm: runtime: fix timer_expires on 32bits arch

[Rafael J. Wysocki]

On Mon, Sep 21, 2020 at 8:51 AM Vincent Guittot
<vincent.guittot@xxxxxxxxxx> wrote:
>
> On Fri, 18 Sep 2020 at 18:55, Grygorii Strashko
> <grygorii.strashko@xxxxxx> wrote:
> >
> > The 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 update the struct
> > dev_pm_info->timer_expires to u64. This causes timer_expires value to be
> > truncated on 32bits architectures when assignment is done from u64 values:
> >
> > rpm_suspend()
> > |- dev->power.timer_expires = expires;
> >
> > Hence, fix it by changing timer_expires type to u64.
> >
> > Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
> > Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers")
> > Signed-off-by: Grygorii Strashko <grygorii.strashko@xxxxxx>
>
> Acked-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx>

Applied as 5.9-rc7 material with some edits in the subject and
changelog, thanks!

> > ---
> >  include/linux/pm.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/linux/pm.h b/include/linux/pm.h
> > index a30a4b54df52..47aca6bac1d6 100644
> > --- a/include/linux/pm.h
> > +++ b/include/linux/pm.h
> > @@ -590,7 +590,7 @@ struct dev_pm_info {
> >  #endif
> >  #ifdef CONFIG_PM
> >         struct hrtimer          suspend_timer;
> > -       unsigned long           timer_expires;
> > +       u64                     timer_expires;
> >         struct work_struct      work;
> >         wait_queue_head_t       wait_queue;
> >         struct wake_irq         *wakeirq;
> > --
> > 2.17.1
> >