Commit 0deb3c2a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.8-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.9.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 2439e5bd 6b1ba3f9

drivers/mmc/host/mmci_stm32_sdmmc.c

+24 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ static int sdmmc_idma_start(struct mmci_host *host, unsigned int *datactrl) 
	struct scatterlist *sg;

	int i;



	host->dma_in_progress = true;



	if (!host->variant->dma_lli || data->sg_len == 1 ||

	    idma->use_bounce_buffer) {

		u32 dma_addr;
@@ -263,9 +265,30 @@ static int sdmmc_idma_start(struct mmci_host *host, unsigned int *datactrl) 
	return 0;

}



static void sdmmc_idma_error(struct mmci_host *host)

{

	struct mmc_data *data = host->data;

	struct sdmmc_idma *idma = host->dma_priv;



	if (!dma_inprogress(host))

		return;



	writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR);

	host->dma_in_progress = false;

	data->host_cookie = 0;



	if (!idma->use_bounce_buffer)

		dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,

			     mmc_get_dma_dir(data));

}



static void sdmmc_idma_finalize(struct mmci_host *host, struct mmc_data *data)

{

	if (!dma_inprogress(host))

		return;



	writel_relaxed(0, host->base + MMCI_STM32_IDMACTRLR);

	host->dma_in_progress = false;



	if (!data->host_cookie)

		sdmmc_idma_unprep_data(host, data, 0);
@@ -676,6 +699,7 @@ static struct mmci_host_ops sdmmc_variant_ops = { 
	.dma_setup = sdmmc_idma_setup,

	.dma_start = sdmmc_idma_start,

	.dma_finalize = sdmmc_idma_finalize,

	.dma_error = sdmmc_idma_error,

	.set_clkreg = mmci_sdmmc_set_clkreg,

	.set_pwrreg = mmci_sdmmc_set_pwrreg,

	.busy_complete = sdmmc_busy_complete,