lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 087/246] PM / wakeup: Make s2idle_lock a RAW_SPINLOCK
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

    [ Upstream commit 62fc00a6611a0014c85763f9def1fc07c15d1302 ]

    The `s2idle_lock' is acquired during suspend while interrupts are
    disabled even on RT. The lock is acquired for short sections only.
    Make it a RAW lock which avoids "sleeping while atomic" warnings on RT.

    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/power/suspend.c | 14 +++++++-------
    1 file changed, 7 insertions(+), 7 deletions(-)

    --- a/kernel/power/suspend.c
    +++ b/kernel/power/suspend.c
    @@ -60,7 +60,7 @@ static const struct platform_s2idle_ops
    static DECLARE_WAIT_QUEUE_HEAD(s2idle_wait_head);

    enum s2idle_states __read_mostly s2idle_state;
    -static DEFINE_SPINLOCK(s2idle_lock);
    +static DEFINE_RAW_SPINLOCK(s2idle_lock);

    void s2idle_set_ops(const struct platform_s2idle_ops *ops)
    {
    @@ -78,12 +78,12 @@ static void s2idle_enter(void)
    {
    trace_suspend_resume(TPS("machine_suspend"), PM_SUSPEND_TO_IDLE, true);

    - spin_lock_irq(&s2idle_lock);
    + raw_spin_lock_irq(&s2idle_lock);
    if (pm_wakeup_pending())
    goto out;

    s2idle_state = S2IDLE_STATE_ENTER;
    - spin_unlock_irq(&s2idle_lock);
    + raw_spin_unlock_irq(&s2idle_lock);

    get_online_cpus();
    cpuidle_resume();
    @@ -97,11 +97,11 @@ static void s2idle_enter(void)
    cpuidle_pause();
    put_online_cpus();

    - spin_lock_irq(&s2idle_lock);
    + raw_spin_lock_irq(&s2idle_lock);

    out:
    s2idle_state = S2IDLE_STATE_NONE;
    - spin_unlock_irq(&s2idle_lock);
    + raw_spin_unlock_irq(&s2idle_lock);

    trace_suspend_resume(TPS("machine_suspend"), PM_SUSPEND_TO_IDLE, false);
    }
    @@ -156,12 +156,12 @@ void s2idle_wake(void)
    {
    unsigned long flags;

    - spin_lock_irqsave(&s2idle_lock, flags);
    + raw_spin_lock_irqsave(&s2idle_lock, flags);
    if (s2idle_state > S2IDLE_STATE_NONE) {
    s2idle_state = S2IDLE_STATE_WAKE;
    wake_up(&s2idle_wait_head);
    }
    - spin_unlock_irqrestore(&s2idle_lock, flags);
    + raw_spin_unlock_irqrestore(&s2idle_lock, flags);
    }
    EXPORT_SYMBOL_GPL(s2idle_wake);


    \
     
     \ /
      Last update: 2018-08-01 20:07    [W:4.058 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site