Commit 88167e6c authored by Yann Gautier's avatar Yann Gautier Committed by Ulf Hansson
Browse files

mmc: mmci: add stm32_idmabsize_align parameter 



The alignment for the IDMA size depends on the peripheral version, it
should then be configurable. Add stm32_idmabsize_align in the variant
structure.
And remove now unused (and wrong) MMCI_STM32_IDMABNDT_* macros.

Signed-off-by: default avatarYann Gautier <yann.gautier@foss.st.com>
Link: https://lore.kernel.org/r/20230619115120.64474-3-yann.gautier@foss.st.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1f9f2cf3

drivers/mmc/host/mmci.c

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static struct variant_data variant_stm32_sdmmc = { 
	.datactrl_any_blocksz	= true,

	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,

	.stm32_idmabsize_mask	= GENMASK(12, 5),

	.stm32_idmabsize_align	= BIT(5),

	.busy_timeout		= true,

	.busy_detect		= true,

	.busy_detect_flag	= MCI_STM32_BUSYD0,
@@ -296,6 +297,7 @@ static struct variant_data variant_stm32_sdmmcv2 = { 
	.datactrl_any_blocksz	= true,

	.datactrl_mask_sdio	= MCI_DPSM_ST_SDIOEN,

	.stm32_idmabsize_mask	= GENMASK(16, 5),

	.stm32_idmabsize_align	= BIT(5),

	.dma_lli		= true,

	.busy_timeout		= true,

	.busy_detect		= true,

drivers/mmc/host/mmci.h

+1 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ 
#define MMCI_STM32_IDMALLIEN	BIT(1)



#define MMCI_STM32_IDMABSIZER		0x054

#define MMCI_STM32_IDMABNDT_SHIFT	5

#define MMCI_STM32_IDMABNDT_MASK	GENMASK(12, 5)



#define MMCI_STM32_IDMABASE0R	0x058
@@ -374,6 +372,7 @@ struct variant_data { 
	u32			opendrain;

	u8			dma_lli:1;

	u32			stm32_idmabsize_mask;

	u32			stm32_idmabsize_align;

	void (*init)(struct mmci_host *host);

};

drivers/mmc/host/mmci_stm32_sdmmc.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "mmci.h"



#define SDMMC_LLI_BUF_LEN	PAGE_SIZE

#define SDMMC_IDMA_BURST	BIT(MMCI_STM32_IDMABNDT_SHIFT)



#define DLYB_CR			0x0

#define DLYB_CR_DEN		BIT(0)
@@ -69,7 +68,8 @@ static int sdmmc_idma_validate_data(struct mmci_host *host, 
	idma->use_bounce_buffer = false;

	for_each_sg(data->sg, sg, data->sg_len - 1, i) {

		if (!IS_ALIGNED(sg->offset, sizeof(u32)) ||

		    !IS_ALIGNED(sg->length, SDMMC_IDMA_BURST)) {

		    !IS_ALIGNED(sg->length,

				host->variant->stm32_idmabsize_align)) {

			dev_dbg(mmc_dev(host->mmc),

				"unaligned scatterlist: ofst:%x length:%d\n",

				data->sg->offset, data->sg->length);