Unverified Commit 845f2e4e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8583 mmc: sdhci-msm: pervent access to suspended controller 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cai Xinchen <caixinchen1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SHLM4WBPYHOYQO3MXOC7PQ2NPE3MALTM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9TMCJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/8583

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 83d34eae 4afcfff2

drivers/mmc/host/sdhci-msm.c

+10 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,11 @@ static __maybe_unused int sdhci_msm_runtime_suspend(struct device *dev) 
	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);

	unsigned long flags;



	spin_lock_irqsave(&host->lock, flags);

	host->runtime_suspended = true;

	spin_unlock_irqrestore(&host->lock, flags);



	/* Drop the performance vote */

	dev_pm_opp_set_rate(dev, 0);
@@ -2585,6 +2590,7 @@ static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev) 
	struct sdhci_host *host = dev_get_drvdata(dev);

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);

	unsigned long flags;

	int ret;



	ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks),
@@ -2600,6 +2606,10 @@ static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev) 


	dev_pm_opp_set_rate(dev, msm_host->clk_rate);



	spin_lock_irqsave(&host->lock, flags);

	host->runtime_suspended = false;

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

}