Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200918165518.23246-1-grygorii.strashko@ti.com> <CAKfTPtApNLAYq-=UcD6bM8nhT3pp3DSp2bCxFsTF3AZKs6Qz3g@mail.gmail.com>
In-Reply-To: <CAKfTPtApNLAYq-=UcD6bM8nhT3pp3DSp2bCxFsTF3AZKs6Qz3g@mail.gmail.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Mon, 21 Sep 2020 16:15:00 +0200
Message-ID: <CAJZ5v0jcTkQe68zgrxgpZvghFMAbnfui5wc=t3mh87fr0gu6Hw@mail.gmail.com>
Subject: Re: [PATCH] pm: runtime: fix timer_expires on 32bits arch
To:     Vincent Guittot <vincent.guittot@linaro.org>,
        Grygorii Strashko <grygorii.strashko@ti.com>
Cc:     "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        "open list:THERMAL" <linux-pm@vger.kernel.org>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, Sep 21, 2020 at 8:51 AM Vincent Guittot
<vincent.guittot@linaro.org> wrote:
>
> On Fri, 18 Sep 2020 at 18:55, Grygorii Strashko
> <grygorii.strashko@ti.com> 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@linaro.org>
> > Fixes: 8234f6734c5d ("PM-runtime: Switch autosuspend over to using hrtimers")
> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
>
> Acked-by: Vincent Guittot <vincent.guittot@linaro.org>

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
> >