Commit 4630932a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC host fixes from Ulf Hansson:

 - moxart: Fix regression for sg_miter for PIO mode

 - sdhci-msm: Avoid hang by preventing access to suspended controller

 - sdhci-of-dwcmshc: Fix SD card tuning error for th1520

* tag 'mmc-v6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers
  mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128
  mmc: sdhci-msm: pervent access to suspended controller
parents c9e35b4a e027e72e

drivers/mmc/host/moxart-mmc.c

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ static void moxart_transfer_pio(struct moxart_host *host) 
	remain = sgm->length;

	if (remain > host->data_len)

		remain = host->data_len;

	sgm->consumed = 0;



	if (data->flags & MMC_DATA_WRITE) {

		while (remain > 0) {

drivers/mmc/host/sdhci-msm.c

+15 −1
Original line number Diff line number Diff line
@@ -2694,6 +2694,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);
@@ -2708,6 +2713,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),
@@ -2726,7 +2732,15 @@ static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev) 


	dev_pm_opp_set_rate(dev, msm_host->clk_rate);



	return sdhci_msm_ice_resume(msm_host);

	ret = sdhci_msm_ice_resume(msm_host);

	if (ret)

		return ret;



	spin_lock_irqsave(&host->lock, flags);

	host->runtime_suspended = false;

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

}



static const struct dev_pm_ops sdhci_msm_pm_ops = {

drivers/mmc/host/sdhci-of-dwcmshc.c

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ static int th1520_execute_tuning(struct sdhci_host *host, u32 opcode) 


	/* perform tuning */

	sdhci_start_tuning(host);

	host->tuning_loop_count = 128;

	host->tuning_err = __sdhci_execute_tuning(host, opcode);

	if (host->tuning_err) {

		/* disable auto-tuning upon tuning error */