* [PATCH] mmc: mmci: Fix PIO read for small SDIO packets
@ 2011-10-26 8:45 Stefan Nilsson XK
2011-11-14 16:38 ` Stefan Nilsson XK
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Nilsson XK @ 2011-10-26 8:45 UTC (permalink / raw)
To: linux-arm-kernel
Corrects a bug in MMCI host driver which silently causes
small reads (< 4 bytes as only used in SDIO) from PL-18X to fail.
Signed-off-by: Stefan Nilsson XK <stefan.xk.nilsson@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mmc/host/mmci.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 56e9a41..5c3a517 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -776,7 +776,18 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
if (count <= 0)
break;
- readsl(base + MMCIFIFO, ptr, count >> 2);
+ /*
+ * SDIO especially may want to send something that is
+ * not divisible by 4 (as opposed to card sectors
+ * etc). Therefore make sure to to always read the last bytes
+ * while only doing full 32-bit reads towards the FIFO.
+ */
+ if (count < 4) {
+ unsigned char buf[4];
+ readsl(base + MMCIFIFO, buf, 1);
+ memcpy(ptr, buf, count);
+ } else
+ readsl(base + MMCIFIFO, ptr, count >> 2);
ptr += count;
remain -= count;
--
1.7.7
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] mmc: mmci: Fix PIO read for small SDIO packets
2011-10-26 8:45 [PATCH] mmc: mmci: Fix PIO read for small SDIO packets Stefan Nilsson XK
@ 2011-11-14 16:38 ` Stefan Nilsson XK
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Nilsson XK @ 2011-11-14 16:38 UTC (permalink / raw)
To: linux-arm-kernel
Any comments on this new version of this patch?
Can it be merged?
Best Regards
Stefan Nilsson
On 10/26/2011 10:45 AM, Stefan NILSSON9 wrote:
> Corrects a bug in MMCI host driver which silently causes
> small reads (< 4 bytes as only used in SDIO) from PL-18X to fail.
>
> Signed-off-by: Stefan Nilsson XK<stefan.xk.nilsson@stericsson.com>
> Signed-off-by: Ulf Hansson<ulf.hansson@stericsson.com>
> Acked-by: Linus Walleij<linus.walleij@linaro.org>
> ---
> drivers/mmc/host/mmci.c | 13 ++++++++++++-
> 1 files changed, 12 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> index 56e9a41..5c3a517 100644
> --- a/drivers/mmc/host/mmci.c
> +++ b/drivers/mmc/host/mmci.c
> @@ -776,7 +776,18 @@ static int mmci_pio_read(struct mmci_host *host, char *buffer, unsigned int rema
> if (count<= 0)
> break;
>
> - readsl(base + MMCIFIFO, ptr, count>> 2);
> + /*
> + * SDIO especially may want to send something that is
> + * not divisible by 4 (as opposed to card sectors
> + * etc). Therefore make sure to to always read the last bytes
> + * while only doing full 32-bit reads towards the FIFO.
> + */
> + if (count< 4) {
> + unsigned char buf[4];
> + readsl(base + MMCIFIFO, buf, 1);
> + memcpy(ptr, buf, count);
> + } else
> + readsl(base + MMCIFIFO, ptr, count>> 2);
>
> ptr += count;
> remain -= count;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-14 16:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-26 8:45 [PATCH] mmc: mmci: Fix PIO read for small SDIO packets Stefan Nilsson XK
2011-11-14 16:38 ` Stefan Nilsson XK
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).