This patch fix the mmc driver suspend/resume conflict problems,
mmc workqueue will queue mmc_rescan(), and it will call some
pm_runtime_* functions, this will conflict with suspend path sometimes,
and will result in some strange behavior:

Suspend path:
        -000 |context_switch(inline)
        -000 |__schedule()
        -001 |schedule_preempt_disabled()
        -002 |spin_lock(inline)
        -002 |__mutex_lock_common(inline)
        -002 |__mutex_lock_slowpath(lock_count = 0xEDCD0F48)
        -003 |__mutex_fastpath_lock(inline)
        -003 |mutex_lock(lock = 0xEDCD0F48)
        -004 |sdhci_do_set_ios(host = 0xEDCD0CC0, ios = 0xEDCD0A70)
        -005 |sdhci_set_ios(?, ios = 0xEDCD0A70)
        -006 |mmc_set_ios(host = 0xEDCD0800)
        -007 |mmc_delay(inline)
        -007 |mmc_power_off(host = 0xEDCD0800)
        -008 |mmc_suspend_host(inline)
        -008 |mmc_suspend_host(host = 0xEDCD0800)
        -009 |mmc_host_suspend(dev = 0xEDCD0808)
        -010 |dpm_run_callback(cb = 0xC0627A88, dev = 0xEDCD0808, state = 
(event = 2), info = 0xC0B6EF9B)
        -011 |__device_suspend(dev = 0xEDCD0808, state = (event = 2), ?)
        -012 |device_suspend(inline)
        -012 |dpm_suspend(state = (event = 2))
        -013 |suspend_devices_and_enter(state = 3)
        -014 |enter_state(inline)
        -014 |pm_suspend(state = 3)
        -015 |try_to_suspend(?)
        -016 |static_key_false(inline)
        -016 |trace_workqueue_execute_end(inline)
        -016 |process_one_work(worker = 0xD5E87040, work = 0xC0E3FF54)
        -017 |worker_thread(__worker = 0xD5E87040)
        -018 |kthread(_create = 0xE9FFBF10)
        -019 |kernel_thread_exit(asm)
         --- |end of frame

mmc_rescan() resume path:
         -000 |context_switch(inline)
         -000 |__schedule()
         -001 |do_undefinstr(regs = 0xD12242F0)
         -002 |__und_svc(asm)
          --> |exception
          -003 |sdhci_set_power(host = 0xEDCD0CC0, power = 0)
          -004 |sdhci_do_set_ios(host = 0xEDCD0CC0, ios = 0xEDCD0A70)
          -005 |sdhci_set_ios(?, ios = 0xEDCD0A70)
          -006 |mmc_set_ios(host = 0xEDCD0800)
          -007 |mmc_delay(inline)
          -007 |mmc_power_up(host = 0xEDCD0800)
          -008 |mmc_resume_bus(inline)
          -008 |mmc_resume_bus(host = 0xEDCD0800)
          -009 |mmc_rpm_hold(host = 0xEDCD0800, ?)
          -010 |mmc_rescan(work = 0xEDCD0AB0)
          -011 |static_key_false(inline)
          -011 |trace_workqueue_execute_end(inline)
          -011 |process_one_work(worker = 0xE5F0BBC0, work = 0xEDCD0AB0)
          -012 |worker_thread(__worker = 0xE5F0BBC0)
          -013 |kthread(_create = 0xD03A5F10)
          -014 |kernel_thread_exit(asm)
           --- |end of frame

most mmc power callback function don't check this special case, and
will cause problems.

Signed-off-by: Yalin Wang <yalin.w...@sonymobile.com>
---
 drivers/mmc/core/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index a6c139d..ae8757f 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -3881,7 +3881,7 @@ static int __init mmc_init(void)
 {
        int ret;
 
-       workqueue = alloc_ordered_workqueue("kmmcd", 0);
+       workqueue = alloc_ordered_workqueue("kmmcd", WQ_FREEZABLE);
        if (!workqueue)
                return -ENOMEM;
 
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to