Commit f410c3e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:

 - mtk-sd: Fix dma hang issues

 - sdhci-pci-o2micro: Fix card detect by dealing with debouncing

* tag 'mmc-v5.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mediatek: wait dma stop bit reset to 0
  mmc: sdhci-pci-o2micro: Fix card detect by dealing with debouncing
parents ddfe8031 89bcd9a6

drivers/mmc/host/mtk-sd.c

+12 −8
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ static void msdc_data_xfer_next(struct msdc_host *host, struct mmc_request *mrq) 
		msdc_request_done(host, mrq);

}



static bool msdc_data_xfer_done(struct msdc_host *host, u32 events,

static void msdc_data_xfer_done(struct msdc_host *host, u32 events,

				struct mmc_request *mrq, struct mmc_data *data)

{

	struct mmc_command *stop;
@@ -1376,7 +1376,7 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, 
	spin_unlock_irqrestore(&host->lock, flags);



	if (done)

		return true;

		return;

	stop = data->stop;



	if (check_data || (stop && stop->error)) {
@@ -1385,12 +1385,15 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, 
		sdr_set_field(host->base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_STOP,

				1);



		ret = readl_poll_timeout_atomic(host->base + MSDC_DMA_CTRL, val,

						!(val & MSDC_DMA_CTRL_STOP), 1, 20000);

		if (ret)

			dev_dbg(host->dev, "DMA stop timed out\n");



		ret = readl_poll_timeout_atomic(host->base + MSDC_DMA_CFG, val,

						!(val & MSDC_DMA_CFG_STS), 1, 20000);

		if (ret) {

			dev_dbg(host->dev, "DMA stop timed out\n");

			return false;

		}

		if (ret)

			dev_dbg(host->dev, "DMA inactive timed out\n");



		sdr_clr_bits(host->base + MSDC_INTEN, data_ints_mask);

		dev_dbg(host->dev, "DMA stop\n");
@@ -1415,9 +1418,7 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, 
		}



		msdc_data_xfer_next(host, mrq);

		done = true;

	}

	return done;

}



static void msdc_set_buswidth(struct msdc_host *host, u32 width)
@@ -2416,6 +2417,9 @@ static void msdc_cqe_disable(struct mmc_host *mmc, bool recovery) 
	if (recovery) {

		sdr_set_field(host->base + MSDC_DMA_CTRL,

			      MSDC_DMA_CTRL_STOP, 1);

		if (WARN_ON(readl_poll_timeout(host->base + MSDC_DMA_CTRL, val,

			!(val & MSDC_DMA_CTRL_STOP), 1, 3000)))

			return;

		if (WARN_ON(readl_poll_timeout(host->base + MSDC_DMA_CFG, val,

			!(val & MSDC_DMA_CFG_STS), 1, 3000)))

			return;

drivers/mmc/host/sdhci-pci-o2micro.c

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ static int sdhci_o2_get_cd(struct mmc_host *mmc) 


	if (!(sdhci_readw(host, O2_PLL_DLL_WDT_CONTROL1) & O2_PLL_LOCK_STATUS))

		sdhci_o2_enable_internal_clock(host);

	else

		sdhci_o2_wait_card_detect_stable(host);



	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);

}