Commit 2dd110b2 authored by Michael Weiser's avatar Michael Weiser Committed by Ulf Hansson

mmc: sunxi-mmc: change idma descriptor to __le32

The sunxi-mmc driver does not take into account the processor may be big
endian when writing the DMA descriptors. This causes cards not to be
detected when running a big-endian kernel. Change the descriptors for
IDMA to use __le32 and ensure they are suitably swapped before writing.
Tested successfully on the Cubieboard2.
Signed-off-by: default avatarMichael Weiser <michael.weiser@gmx.de>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 63311bec
...@@ -223,10 +223,10 @@ struct sunxi_mmc_clk_delay { ...@@ -223,10 +223,10 @@ struct sunxi_mmc_clk_delay {
}; };
struct sunxi_idma_des { struct sunxi_idma_des {
u32 config; __le32 config;
u32 buf_size; __le32 buf_size;
u32 buf_addr_ptr1; __le32 buf_addr_ptr1;
u32 buf_addr_ptr2; __le32 buf_addr_ptr2;
}; };
struct sunxi_mmc_cfg { struct sunxi_mmc_cfg {
...@@ -329,22 +329,25 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, ...@@ -329,22 +329,25 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,
int i, max_len = (1 << host->cfg->idma_des_size_bits); int i, max_len = (1 << host->cfg->idma_des_size_bits);
for (i = 0; i < data->sg_len; i++) { for (i = 0; i < data->sg_len; i++) {
pdes[i].config = SDXC_IDMAC_DES0_CH | SDXC_IDMAC_DES0_OWN | pdes[i].config = cpu_to_le32(SDXC_IDMAC_DES0_CH |
SDXC_IDMAC_DES0_DIC; SDXC_IDMAC_DES0_OWN |
SDXC_IDMAC_DES0_DIC);
if (data->sg[i].length == max_len) if (data->sg[i].length == max_len)
pdes[i].buf_size = 0; /* 0 == max_len */ pdes[i].buf_size = 0; /* 0 == max_len */
else else
pdes[i].buf_size = data->sg[i].length; pdes[i].buf_size = cpu_to_le32(data->sg[i].length);
next_desc += sizeof(struct sunxi_idma_des); next_desc += sizeof(struct sunxi_idma_des);
pdes[i].buf_addr_ptr1 = sg_dma_address(&data->sg[i]); pdes[i].buf_addr_ptr1 =
pdes[i].buf_addr_ptr2 = (u32)next_desc; cpu_to_le32(sg_dma_address(&data->sg[i]));
pdes[i].buf_addr_ptr2 = cpu_to_le32((u32)next_desc);
} }
pdes[0].config |= SDXC_IDMAC_DES0_FD; pdes[0].config |= cpu_to_le32(SDXC_IDMAC_DES0_FD);
pdes[i - 1].config |= SDXC_IDMAC_DES0_LD | SDXC_IDMAC_DES0_ER; pdes[i - 1].config |= cpu_to_le32(SDXC_IDMAC_DES0_LD |
pdes[i - 1].config &= ~SDXC_IDMAC_DES0_DIC; SDXC_IDMAC_DES0_ER);
pdes[i - 1].config &= cpu_to_le32(~SDXC_IDMAC_DES0_DIC);
pdes[i - 1].buf_addr_ptr2 = 0; pdes[i - 1].buf_addr_ptr2 = 0;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment