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

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

Pull MMC fixes from Ulf Hansson:
 "MMC host fixes:

   - mxs: Fix flags passed to dmaengine_prep_slave_sg

   - cqhci: Add a missing memory barrier

   - sdhci-omap: Fix tuning procedure for temperatures < -20C"

* tag 'mmc-v5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mxs: fix flags passed to dmaengine_prep_slave_sg
  mmc: cqhci: Commit descriptors before setting the doorbell
  mmc: sdhci-omap: Fix Tuning procedure for temperatures < -20C
parents 39a38bcb 2bb9f756

drivers/mmc/host/cqhci.c

+2 −1
Original line number Diff line number Diff line
@@ -611,7 +611,8 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	cq_host->slot[tag].flags = 0;



	cq_host->qcnt += 1;



	/* Make sure descriptors are ready before ringing the doorbell */

	wmb();

	cqhci_writel(cq_host, 1 << tag, CQHCI_TDBR);

	if (!(cqhci_readl(cq_host, CQHCI_TDBR) & (1 << tag)))

		pr_debug("%s: cqhci: doorbell not set for tag %d\n",

drivers/mmc/host/mxs-mmc.c

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/interrupt.h>

#include <linux/dma-mapping.h>

#include <linux/dmaengine.h>

#include <linux/dma/mxs-dma.h>

#include <linux/highmem.h>

#include <linux/clk.h>

#include <linux/err.h>
@@ -266,7 +267,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host) 
	ssp->ssp_pio_words[2] = cmd1;

	ssp->dma_dir = DMA_NONE;

	ssp->slave_dirn = DMA_TRANS_NONE;

	desc = mxs_mmc_prep_dma(host, DMA_CTRL_ACK);

	desc = mxs_mmc_prep_dma(host, MXS_DMA_CTRL_WAIT4END);

	if (!desc)

		goto out;
@@ -311,7 +312,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host) 
	ssp->ssp_pio_words[2] = cmd1;

	ssp->dma_dir = DMA_NONE;

	ssp->slave_dirn = DMA_TRANS_NONE;

	desc = mxs_mmc_prep_dma(host, DMA_CTRL_ACK);

	desc = mxs_mmc_prep_dma(host, MXS_DMA_CTRL_WAIT4END);

	if (!desc)

		goto out;
@@ -441,7 +442,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host) 
	host->data = data;

	ssp->dma_dir = dma_data_dir;

	ssp->slave_dirn = slave_dirn;

	desc = mxs_mmc_prep_dma(host, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	desc = mxs_mmc_prep_dma(host, DMA_PREP_INTERRUPT | MXS_DMA_CTRL_WAIT4END);

	if (!desc)

		goto out;

drivers/mmc/host/sdhci-omap.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	 * on temperature

	 */

	if (temperature < -20000)

		phase_delay = min(max_window + 4 * max_len - 24,

		phase_delay = min(max_window + 4 * (max_len - 1) - 24,

				  max_window +

				  DIV_ROUND_UP(13 * max_len, 16) * 4);

	else if (temperature < 20000)

CRA Git | Maintained and supported by SUSTech CRA and CCSE