mmc: tmio: enable odd number size access

Current tmio is using sd_ctrl_read16/write16_rep()
for data transfer.
It works if transfer size was even number,
but, last 1 byte will be ignored if
transfer size was odd number.
This patch adds new tmio_mmc_transfer_data()
and solve this issue.

Tested-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 35 insertions, 4 deletions

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index ff5ff0f725c9..692e578cf4d7 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -376,6 +376,40 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
         return 0;
 }
 
+static void tmio_mmc_transfer_data(struct tmio_mmc_host *host,
+                                   unsigned short *buf,
+                                   unsigned int count)
+{
+        int is_read = host->data->flags & MMC_DATA_READ;
+        u8  *buf8;
+
+        /*
+         * Transfer the data
+         */
+        if (is_read)
+                sd_ctrl_read16_rep(host, CTL_SD_DATA_PORT, buf, count >> 1);
+        else
+                sd_ctrl_write16_rep(host, CTL_SD_DATA_PORT, buf, count >> 1);
+
+        /* if count was even number */
+        if (!(count & 0x1))
+                return;
+
+        /* if count was odd number */
+        buf8 = (u8 *)(buf + (count >> 1));
+
+        /*
+         * FIXME
+         *
+         * driver and this function are assuming that
+         * it is used as little endian
+         */
+        if (is_read)
+                *buf8 = sd_ctrl_read16(host, CTL_SD_DATA_PORT) & 0xff;
+        else
+                sd_ctrl_write16(host, CTL_SD_DATA_PORT, *buf8);
+}
+
 /*
  * This chip always returns (at least?) as much data as you ask for.
  * I'm unsure what happens if you ask for less than a block. This should be
@@ -408,10 +442,7 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
                  count, host->sg_off, data->flags);
 
         /* Transfer the data */
-        if (data->flags & MMC_DATA_READ)
-                sd_ctrl_read16_rep(host, CTL_SD_DATA_PORT, buf, count >> 1);
-        else
-                sd_ctrl_write16_rep(host, CTL_SD_DATA_PORT, buf, count >> 1);
+        tmio_mmc_transfer_data(host, buf, count);
 
         host->sg_off += count;