All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND PATCH 1/2] mmc: mmci: Fix incorrect handling of HW flow control for SDIO
@ 2012-10-10 16:03 ` Ulf Hansson
  0 siblings, 0 replies; 22+ messages in thread
From: Ulf Hansson @ 2012-10-10 16:03 UTC (permalink / raw)
  To: linux-mmc, Chris Ball
  Cc: linux-arm-kernel, Russell King, Linus Walleij, Ulf Hansson

From: Ulf Hansson <ulf.hansson@linaro.org>

For data writes <= 8 bytes, HW flow control was disabled but
never re-enabled when the transfer was completed. This meant
that a following read request would give buffer overrun errors.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/mmc/host/mmci.c |   38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index edc3e9b..877079e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -654,9 +654,29 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
 
 	/* The ST Micro variants has a special bit to enable SDIO */
 	if (variant->sdio && host->mmc->card)
-		if (mmc_card_sdio(host->mmc->card))
+		if (mmc_card_sdio(host->mmc->card)) {
+			/*
+			 * The ST Micro variants has a special bit
+			 * to enable SDIO.
+			 */
+			u32 clk;
+
 			datactrl |= MCI_ST_DPSM_SDIOEN;
 
+			/*
+			 * The ST Micro variant for SDIO transfer sizes
+			 * less then 8 bytes should have clock H/W flow
+			 * control disabled.
+			 */
+			if ((host->size < 8) &&
+			    (data->flags & MMC_DATA_WRITE))
+				clk = host->clk_reg & ~variant->clkreg_enable;
+			else
+				clk = host->clk_reg | variant->clkreg_enable;
+
+			mmci_write_clkreg(host, clk);
+		}
+
 	/*
 	 * Attempt to use DMA operation mode, if this
 	 * should fail, fall back to PIO mode
@@ -877,22 +897,6 @@ static int mmci_pio_write(struct mmci_host *host, char *buffer, unsigned int rem
 		count = min(remain, maxcnt);
 
 		/*
-		 * The ST Micro variant for SDIO transfer sizes
-		 * less then 8 bytes should have clock H/W flow
-		 * control disabled.
-		 */
-		if (variant->sdio &&
-		    mmc_card_sdio(host->mmc->card)) {
-			u32 clk;
-			if (count < 8)
-				clk = host->clk_reg & ~variant->clkreg_enable;
-			else
-				clk = host->clk_reg | variant->clkreg_enable;
-
-			mmci_write_clkreg(host, clk);
-		}
-
-		/*
 		 * SDIO especially may want to send something that is
 		 * not divisible by 4 (as opposed to card sectors
 		 * etc), and the FIFO only accept full 32-bit writes.
-- 
1.7.10


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2012-10-12 12:39 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-10 16:03 [RESEND PATCH 1/2] mmc: mmci: Fix incorrect handling of HW flow control for SDIO Ulf Hansson
2012-10-10 16:03 ` Ulf Hansson
2012-10-10 16:03 ` [RESEND PATCH 2/2] mmc: mmci: Switching off HWFC for SDIO depends on MCLK Ulf Hansson
2012-10-10 16:03   ` Ulf Hansson
2012-10-10 17:33   ` Linus Walleij
2012-10-10 17:33     ` Linus Walleij
2012-10-11  6:50     ` Johan Rudholm
2012-10-11  6:50       ` Johan Rudholm
2012-10-10 17:32 ` [RESEND PATCH 1/2] mmc: mmci: Fix incorrect handling of HW flow control for SDIO Linus Walleij
2012-10-10 17:32   ` Linus Walleij
2012-10-11  6:51   ` Johan Rudholm
2012-10-11  6:51     ` Johan Rudholm
2012-10-12  9:13 ` Russell King - ARM Linux
2012-10-12  9:13   ` Russell King - ARM Linux
2012-10-12 11:54   ` Russell King - ARM Linux
2012-10-12 11:54     ` Russell King - ARM Linux
2012-10-12 12:24     ` Ulf Hansson
2012-10-12 12:24       ` Ulf Hansson
2012-10-12 12:35       ` Russell King - ARM Linux
2012-10-12 12:35         ` Russell King - ARM Linux
2012-10-12 12:39         ` Ulf Hansson
2012-10-12 12:39           ` Ulf Hansson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.