TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: core: Fix race between runtime PM suspend and block requests

Browse Source 
There is a possible race with mmc_claim_host() in mmc_sd_suspend()/
mmc_suspend() and mmc_claim_host() in mmc_blk_issue_rq() when runtime
pm is enabled. Fix this by blocking processing of requests until the
previous runtime suspend is processed and then resume as part of
msmsdcc_enable(). Previous fix has card detection failure as a side effect
during resume.

Change-Id: I9cb31269638d9db4e630eb22b973a5335af1bda4
Signed-off-by: Sujith Reddy Thumma <sthumma@codeaurora.org>
[sboyd: Dropped msm driver change]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Sujith Reddy Thumma
2011-02-17 21:37:48 +05:30
committed by Stephen Boyd
parent 7788228786
commit 4e5824f8ce
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/core/core.c
View File

@@ -27,6 +27,7 @@
#include <linux/fault-inject.h>
#include <linux/random.h>
#include <linux/wakelock.h>
#include <linux/pm.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
@@ -643,6 +644,14 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
might_sleep();
add_wait_queue(&host->wq, &wait);
#ifdef CONFIG_PM_RUNTIME
while (mmc_dev(host)->power.runtime_status == RPM_SUSPENDING) {
if (host->suspend_task == current)
break;
msleep(15);
}
#endif
spin_lock_irqsave(&host->lock, flags);
while (1) {
set_current_state(TASK_UNINTERRUPTIBLE);

1
include/linux/mmc/host.h
View File

@@ -287,6 +287,7 @@ struct mmc_host {
wait_queue_head_t wq;
struct task_struct *claimer; /* task that has host claimed */
struct task_struct *suspend_task;
int claim_cnt; /* "claim" nesting count */
struct delayed_work detect;