mmc: dw_mmc: Improve 32-bit IDMAC descriptor namings

Prepare for adding 64-bit IDMAC descriptors by renaming current 32-bit
descriptor and its fields accordingly. While at it, make use of
virt_to_phys() to make it more obvious in which places the physical
addresses have to be used.

No functional change.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index d73d58bcf7d7df4aa63d1e4e5cb183894c7edb1e..3e7073f7de1bb55510016362990b9b45b9b412c1 100644 (file)
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -20,11 +20,12 @@
 
 #define PAGE_SIZE 4096
 
-struct dwmci_idmac {
-       u32 flags;
-       u32 cnt;
-       u32 addr;
-       u32 next_addr;
+/* Internal DMA Controller (IDMAC) descriptor for 32-bit addressing mode */
+struct dwmci_idmac32 {
+       u32 des0;       /* Control descriptor */
+       u32 des1;       /* Buffer size */
+       u32 des2;       /* Buffer physical address */
+       u32 des3;       /* Next descriptor physical address */
 } __aligned(ARCH_DMA_MINALIGN);
 
 static int dwmci_wait_reset(struct dwmci_host *host, u32 value)
@@ -42,22 +43,23 @@ static int dwmci_wait_reset(struct dwmci_host *host, u32 value)
        return 0;
 }
 
-static void dwmci_set_idma_desc(struct dwmci_idmac *idmac,
-               u32 desc0, u32 desc1, u32 desc2)
+static void dwmci_set_idma_desc32(struct dwmci_idmac32 *desc, u32 control,
+                                 u32 buf_size, u32 buf_addr)
 {
-       struct dwmci_idmac *desc = idmac;
+       phys_addr_t desc_phys = virt_to_phys(desc);
+       u32 next_desc_phys = desc_phys + sizeof(struct dwmci_idmac32);
 
-       desc->flags = desc0;
-       desc->cnt = desc1;
-       desc->addr = desc2;
-       desc->next_addr = (ulong)desc + sizeof(struct dwmci_idmac);
+       desc->des0 = control;
+       desc->des1 = buf_size;
+       desc->des2 = buf_addr;
+       desc->des3 = next_desc_phys;
 }
 
 static void dwmci_prepare_desc(struct mmc_data *data,
-                              struct dwmci_idmac *cur_idmac,
+                              struct dwmci_idmac32 *cur_idmac,
                               void *bounce_buffer)
 {
-       struct dwmci_idmac *desc = cur_idmac;
+       struct dwmci_idmac32 *desc32 = cur_idmac;
        ulong data_start, data_end;
        unsigned int blk_cnt, i;
 
@@ -65,6 +67,7 @@ static void dwmci_prepare_desc(struct mmc_data *data,
        blk_cnt = data->blocks;
 
        for (i = 0;; i++) {
+               phys_addr_t buf_phys = virt_to_phys(bounce_buffer);
                unsigned int flags, cnt;
 
                flags = DWMCI_IDMAC_OWN | DWMCI_IDMAC_CH;
@@ -76,22 +79,22 @@ static void dwmci_prepare_desc(struct mmc_data *data,
                } else
                        cnt = data->blocksize * 8;
 
-               dwmci_set_idma_desc(desc, flags, cnt,
-                                   (ulong)bounce_buffer + i * PAGE_SIZE);
-               desc++;
+               dwmci_set_idma_desc32(desc32, flags, cnt,
+                                     buf_phys + i * PAGE_SIZE);
+               desc32++;
 
                if (blk_cnt <= 8)
                        break;
                blk_cnt -= 8;
        }
 
-       data_end = (ulong)desc;
+       data_end = (ulong)desc32;
        flush_dcache_range(data_start, roundup(data_end, ARCH_DMA_MINALIGN));
 }
 
 static void dwmci_prepare_data(struct dwmci_host *host,
                               struct mmc_data *data,
-                              struct dwmci_idmac *cur_idmac,
+                              struct dwmci_idmac32 *cur_idmac,
                               void *bounce_buffer)
 {
        unsigned long ctrl;
@@ -308,7 +311,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 {
 #endif
        struct dwmci_host *host = mmc->priv;
-       ALLOC_CACHE_ALIGN_BUFFER(struct dwmci_idmac, cur_idmac,
+       ALLOC_CACHE_ALIGN_BUFFER(struct dwmci_idmac32, cur_idmac,
                                 data ? DIV_ROUND_UP(data->blocks, 8) : 0);
        int ret = 0, flags = 0, i;
        u32 retry = 100000;