lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 073/146] mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
    Date
    From: Grygorii Strashko <Grygorii.Strashko@linaro.org>

    3.4.109-rc1 review patch. If anyone has any objections, please let me know.

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


    commit 184af16b09360d6273fd6160e6ff7f8e2482ef23 upstream.

    The PM_RESTORE_PREPARE is not handled now in mmc_pm_notify(),
    as result mmc_rescan() could be scheduled and executed at
    late hibernation restore stages when MMC device is suspended
    already - which, in turn, will lead to system crash on TI dra7-evm board:

    WARNING: CPU: 0 PID: 3188 at drivers/bus/omap_l3_noc.c:148 l3_interrupt_handler+0x258/0x374()
    44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER1_P3 (Idle): Data Access in User mode during Functional access

    Hence, add missed PM_RESTORE_PREPARE PM event in mmc_pm_notify().

    Fixes: 4c2ef25fe0b8 (mmc: fix all hangs related to mmc/sd card...)
    Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    [lizf: Backported to 3.4: adjust context]
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    drivers/mmc/core/core.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
    index ba821fe..eef1261 100644
    --- a/drivers/mmc/core/core.c
    +++ b/drivers/mmc/core/core.c
    @@ -2370,6 +2370,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
    switch (mode) {
    case PM_HIBERNATION_PREPARE:
    case PM_SUSPEND_PREPARE:
    + case PM_RESTORE_PREPARE:

    spin_lock_irqsave(&host->lock, flags);
    host->rescan_disable = 1;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-15 12:01    [W:4.190 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site