[PATCH v3 0/2] mmc: sdhci: Add sdma_boundary to sdhci_host

[PATCH v3 0/2] mmc: sdhci: Add sdma_boundary to sdhci_host

[srinivas.kandagatla]

From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

This patchset adds fix to support sdhci controller which have issues
when sdma boundary buffer bits are programmed in Block Size Register (0x04)
when using ADMA.

First patch adds member to struct sdhci_host to allow drivers to
specify sdma_buffer_boundary value that it can support and second
one sets sdma_boundary to zero in msm sdhci driver.

Tested on DB410c with WLAN SDIO card.

thanks,
srini

Changes since v2:
	- Chanaged local variable to fix line wrap.
	- Changed sdma_buffer_boundary_arg to sdma_boundary suggested by Adrian

Srinivas Kandagatla (2):
  mmc: sdhci: add sdma_boundary member to struct sdhci_host
  mmc: sdhci-msm: set sdma_boundary to zero

 drivers/mmc/host/sdhci-msm.c |  1 +
 drivers/mmc/host/sdhci.c     | 13 ++++++++-----
 drivers/mmc/host/sdhci.h     |  3 +++
 3 files changed, 12 insertions(+), 5 deletions(-)

-- 
2.9.3

[PATCH v3 1/2] mmc: sdhci: add sdma_boundary member to struct sdhci_host

[srinivas.kandagatla]

From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

This patch adds sdma_boundary member to struct sdhci_host to give more
flexibility to drivers to control the sdma boundary buffer value and
also to fix issue on some sdhci controllers which are broken when
HOST SDMA Buffer Boundary is programmed in Block Size Register (0x04)
when using ADMA. Qualcomm sdhci controller is one of such type, writing
to this bits is un-supported.

Default value of sdma_boundary is set to SDHCI_DEFAULT_BOUNDARY_ARG.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/mmc/host/sdhci.c | 13 ++++++++-----
 drivers/mmc/host/sdhci.h |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ecd0d43..c6a6c52 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -897,8 +897,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
 	sdhci_set_transfer_irqs(host);
 
 	/* Set the DMA boundary value and block size */
-	sdhci_writew(host, SDHCI_MAKE_BLKSZ(SDHCI_DEFAULT_BOUNDARY_ARG,
-		data->blksz), SDHCI_BLOCK_SIZE);
+	sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, data->blksz),
+		     SDHCI_BLOCK_SIZE);
 	sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
 }
 
@@ -2037,6 +2037,7 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode)
 	struct mmc_command cmd = {};
 	struct mmc_request mrq = {};
 	unsigned long flags;
+	u32 b = host->sdma_boundary;
 
 	spin_lock_irqsave(&host->lock, flags);
 
@@ -2052,9 +2053,9 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode)
 	 */
 	if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200 &&
 	    mmc->ios.bus_width == MMC_BUS_WIDTH_8)
-		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128), SDHCI_BLOCK_SIZE);
+		sdhci_writew(host, SDHCI_MAKE_BLKSZ(b, 128), SDHCI_BLOCK_SIZE);
 	else
-		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);
+		sdhci_writew(host, SDHCI_MAKE_BLKSZ(b, 64), SDHCI_BLOCK_SIZE);
 
 	/*
 	 * The tuning block is sent by the card to the host controller.
@@ -2998,7 +2999,7 @@ void sdhci_cqe_enable(struct mmc_host *mmc)
 		ctrl |= SDHCI_CTRL_ADMA32;
 	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
 
-	sdhci_writew(host, SDHCI_MAKE_BLKSZ(SDHCI_DEFAULT_BOUNDARY_ARG, 512),
+	sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, 512),
 		     SDHCI_BLOCK_SIZE);
 
 	/* Set maximum timeout */
@@ -3119,6 +3120,8 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
 
 	host->tuning_delay = -1;
 
+	host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG;
+
 	return host;
 }
 
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 0469fa1..399edc6 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -541,6 +541,9 @@ struct sdhci_host {
 	/* Delay (ms) between tuning commands */
 	int			tuning_delay;
 
+	/* Host SDMA buffer boundary. */
+	u32			sdma_boundary;
+
 	unsigned long private[0] ____cacheline_aligned;
 };
 
-- 
2.9.3

[PATCH v3 2/2] mmc: sdhci-msm: set sdma_boundary to zero

[srinivas.kandagatla]

From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

Programming legacy HOST SDMA Buffer Boundary bits in Block Size Register
(0x04) is not supported in Qualcomm sdhci controllers. Writing to this
would cause the controller not to transfer last block in case block size
is 4 bytes or less.

This issue was noticed while testing sdio wlan card on Qcom DB410c board.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
 drivers/mmc/host/sdhci-msm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 9d601dc..adfe5bd 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -1133,6 +1133,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
 	if (IS_ERR(host))
 		return PTR_ERR(host);
 
+	host->sdma_boundary = 0;
 	pltfm_host = sdhci_priv(host);
 	msm_host = sdhci_pltfm_priv(pltfm_host);
 	msm_host->mmc = host->mmc;
-- 
2.9.3

Re: [PATCH v3 1/2] mmc: sdhci: add sdma_boundary member to struct sdhci_host

[Adrian Hunter]

On 03/08/17 15:46, srinivas.kandagatla@linaro.org wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> 
> This patch adds sdma_boundary member to struct sdhci_host to give more
> flexibility to drivers to control the sdma boundary buffer value and
> also to fix issue on some sdhci controllers which are broken when
> HOST SDMA Buffer Boundary is programmed in Block Size Register (0x04)
> when using ADMA. Qualcomm sdhci controller is one of such type, writing
> to this bits is un-supported.
> 
> Default value of sdma_boundary is set to SDHCI_DEFAULT_BOUNDARY_ARG.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci.c | 13 ++++++++-----
>  drivers/mmc/host/sdhci.h |  3 +++
>  2 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index ecd0d43..c6a6c52 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -897,8 +897,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
>  	sdhci_set_transfer_irqs(host);
>  
>  	/* Set the DMA boundary value and block size */
> -	sdhci_writew(host, SDHCI_MAKE_BLKSZ(SDHCI_DEFAULT_BOUNDARY_ARG,
> -		data->blksz), SDHCI_BLOCK_SIZE);
> +	sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, data->blksz),
> +		     SDHCI_BLOCK_SIZE);
>  	sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
>  }
>  
> @@ -2037,6 +2037,7 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode)
>  	struct mmc_command cmd = {};
>  	struct mmc_request mrq = {};
>  	unsigned long flags;
> +	u32 b = host->sdma_boundary;
>  
>  	spin_lock_irqsave(&host->lock, flags);
>  
> @@ -2052,9 +2053,9 @@ static void sdhci_send_tuning(struct sdhci_host *host, u32 opcode)
>  	 */
>  	if (cmd.opcode == MMC_SEND_TUNING_BLOCK_HS200 &&
>  	    mmc->ios.bus_width == MMC_BUS_WIDTH_8)
> -		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 128), SDHCI_BLOCK_SIZE);
> +		sdhci_writew(host, SDHCI_MAKE_BLKSZ(b, 128), SDHCI_BLOCK_SIZE);
>  	else
> -		sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, 64), SDHCI_BLOCK_SIZE);
> +		sdhci_writew(host, SDHCI_MAKE_BLKSZ(b, 64), SDHCI_BLOCK_SIZE);
>  
>  	/*
>  	 * The tuning block is sent by the card to the host controller.
> @@ -2998,7 +2999,7 @@ void sdhci_cqe_enable(struct mmc_host *mmc)
>  		ctrl |= SDHCI_CTRL_ADMA32;
>  	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
>  
> -	sdhci_writew(host, SDHCI_MAKE_BLKSZ(SDHCI_DEFAULT_BOUNDARY_ARG, 512),
> +	sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, 512),
>  		     SDHCI_BLOCK_SIZE);
>  
>  	/* Set maximum timeout */
> @@ -3119,6 +3120,8 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
>  
>  	host->tuning_delay = -1;
>  
> +	host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG;
> +
>  	return host;
>  }
>  
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index 0469fa1..399edc6 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -541,6 +541,9 @@ struct sdhci_host {
>  	/* Delay (ms) between tuning commands */
>  	int			tuning_delay;
>  
> +	/* Host SDMA buffer boundary. */
> +	u32			sdma_boundary;
> +
>  	unsigned long private[0] ____cacheline_aligned;
>  };
>  
> 

Re: [PATCH v3 2/2] mmc: sdhci-msm: set sdma_boundary to zero

[Adrian Hunter]

On 03/08/17 15:46, srinivas.kandagatla@linaro.org wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> 
> Programming legacy HOST SDMA Buffer Boundary bits in Block Size Register
> (0x04) is not supported in Qualcomm sdhci controllers. Writing to this
> would cause the controller not to transfer last block in case block size
> is 4 bytes or less.
> 
> This issue was noticed while testing sdio wlan card on Qcom DB410c board.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-msm.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index 9d601dc..adfe5bd 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -1133,6 +1133,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
>  	if (IS_ERR(host))
>  		return PTR_ERR(host);
>  
> +	host->sdma_boundary = 0;
>  	pltfm_host = sdhci_priv(host);
>  	msm_host = sdhci_pltfm_priv(pltfm_host);
>  	msm_host->mmc = host->mmc;
> 

Re: [PATCH v3 0/2] mmc: sdhci: Add sdma_boundary to sdhci_host

[Ulf Hansson]

On 3 August 2017 at 14:46,  <srinivas.kandagatla@linaro.org> wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>
> This patchset adds fix to support sdhci controller which have issues
> when sdma boundary buffer bits are programmed in Block Size Register (0x04)
> when using ADMA.
>
> First patch adds member to struct sdhci_host to allow drivers to
> specify sdma_buffer_boundary value that it can support and second
> one sets sdma_boundary to zero in msm sdhci driver.
>
> Tested on DB410c with WLAN SDIO card.
>
> thanks,
> srini
>
> Changes since v2:
>         - Chanaged local variable to fix line wrap.
>         - Changed sdma_buffer_boundary_arg to sdma_boundary suggested by Adrian
>
> Srinivas Kandagatla (2):
>   mmc: sdhci: add sdma_boundary member to struct sdhci_host
>   mmc: sdhci-msm: set sdma_boundary to zero
>
>  drivers/mmc/host/sdhci-msm.c |  1 +
>  drivers/mmc/host/sdhci.c     | 13 ++++++++-----
>  drivers/mmc/host/sdhci.h     |  3 +++
>  3 files changed, 12 insertions(+), 5 deletions(-)
>
> --
> 2.9.3
>

Thanks, applied for next!

Kind regards
Uffe