Skip to contentSkip to conversation

Patch "mmc: core: add missing pm event in mmc_pm_notify to fix hib restore" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message May 15, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mmc: core: add missing pm event in mmc_pm_notify to fix hib restore

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mmc-core-add-missing-pm-event-in-mmc_pm_notify-to-fix-hib-restore.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 184af16b09360d6273fd6160e6ff7f8e2482ef23 Mon Sep 17 00:00:00 2001

From: Grygorii Strashko <[email protected]>
Date: Thu, 23 Apr 2015 13:43:43 +0300
Subject: mmc: core: add missing pm event in mmc_pm_notify to fix hib restore

From: Grygorii Strashko <[email protected]>

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...)
---
 drivers/mmc/core/core.c |    1 +
 1 file changed, 1 insertion(+)
drivers/mmc/core/core.c +1 -0
@@ -2648,6 +2648,7 @@ int mmc_pm_notify(struct notifier_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;
 		spin_unlock_irqrestore(&host->lock, flags);

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/mmc-core-add-missing-pm-event-in-mmc_pm_notify-to-fix-hib-restore.patch