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

!8577 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/MD22B2GCBEXR3APRBWZ34YIZWYYJ5CKM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9TMCJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/8577

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents a52fc90c c45c6070

drivers/mmc/host/sdhci-msm.c

+16 −1
Original line number Diff line number Diff line
@@ -1970,6 +1970,11 @@ static 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);



	clk_bulk_disable_unprepare(ARRAY_SIZE(msm_host->bulk_clks),

				   msm_host->bulk_clks);
@@ -1982,9 +1987,19 @@ static 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;



	return clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks),

	ret = clk_bulk_prepare_enable(ARRAY_SIZE(msm_host->bulk_clks),

				       msm_host->bulk_clks);

	if (ret)

		return ret;



	spin_lock_irqsave(&host->lock, flags);

	host->runtime_suspended = false;

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

}

#endif