lkml.org 
[lkml]   [2009]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/11] PM: Change suspend code ordering
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Change the ordering of the suspend core code so that the platform
    "prepare" callback is executed and the nonboot CPUs are disabled
    after calling device drivers' "late suspend" methods.

    This change will allow us to rework the PCI PM core so that the power
    state of devices is changed in the "late" phase of suspend (and
    analogously in the "early" phase of resume), which in turn will allow
    us to avoid the race condition where a device using shared interrupts
    is put into a low power state with interrupts enabled and then an
    interrupt (for another device) comes in and confuses its driver.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    kernel/power/main.c | 38 ++++++++++++++++++++++----------------
    1 file changed, 22 insertions(+), 16 deletions(-)

    Index: linux-2.6/kernel/power/main.c
    ===================================================================
    --- linux-2.6.orig/kernel/power/main.c
    +++ linux-2.6/kernel/power/main.c
    @@ -297,6 +297,19 @@ static int suspend_enter(suspend_state_t
    goto Done;
    }

    + if (suspend_ops->prepare) {
    + error = suspend_ops->prepare();
    + if (error)
    + goto Power_up_devices;
    + }
    +
    + if (suspend_test(TEST_PLATFORM))
    + goto Platfrom_finish;
    +
    + error = disable_nonboot_cpus();
    + if (error || suspend_test(TEST_CPUS))
    + goto Enable_cpus;
    +
    arch_suspend_disable_irqs();
    BUG_ON(!irqs_disabled());

    @@ -310,6 +323,14 @@ static int suspend_enter(suspend_state_t
    arch_suspend_enable_irqs();
    BUG_ON(irqs_disabled());

    + Enable_cpus:
    + enable_nonboot_cpus();
    +
    + Platfrom_finish:
    + if (suspend_ops->finish)
    + suspend_ops->finish();
    +
    + Power_up_devices:
    device_power_up(PMSG_RESUME);

    Done:
    @@ -346,23 +367,8 @@ int suspend_devices_and_enter(suspend_st
    if (suspend_test(TEST_DEVICES))
    goto Recover_platform;

    - if (suspend_ops->prepare) {
    - error = suspend_ops->prepare();
    - if (error)
    - goto Resume_devices;
    - }
    -
    - if (suspend_test(TEST_PLATFORM))
    - goto Finish;
    + suspend_enter(state);

    - error = disable_nonboot_cpus();
    - if (!error && !suspend_test(TEST_CPUS))
    - suspend_enter(state);
    -
    - enable_nonboot_cpus();
    - Finish:
    - if (suspend_ops->finish)
    - suspend_ops->finish();
    Resume_devices:
    suspend_test_start();
    device_resume(PMSG_RESUME);

    \
     
     \ /
      Last update: 2009-03-14 12:39    [W:0.024 / U:118.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site