leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: sdhci: Define ADMA descriptor structure

Browse Source 
Define the ADMA descriptor structure instead of
using manual offsets and casts.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2014-11-04 12:42:45 +02:00 committed by Ulf Hansson
parent 739d46dcc2
commit 0545230f17
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/mmc/host/sdhci.c
View File

@ -448,23 +448,18 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
static void sdhci_adma_write_desc(void *desc, u32 addr, int len, unsigned cmd) static void sdhci_adma_write_desc(void *desc, u32 addr, int len, unsigned cmd)
{ {
__le32 *dataddr = (__le32 __force *)(desc + 4); struct sdhci_adma2_32_desc *dma_desc = desc;
__le16 *cmdlen = (__le16 __force *)desc;
/* SDHCI specification says ADMA descriptors should be 4 byte dma_desc->cmd = cpu_to_le16(cmd);
* aligned, so using 16 or 32bit operations should be safe. */ dma_desc->len = cpu_to_le16(len);
dma_desc->addr = cpu_to_le32(addr);
cmdlen[0] = cpu_to_le16(cmd);
cmdlen[1] = cpu_to_le16(len);
dataddr[0] = cpu_to_le32(addr);
} }
static void sdhci_adma_mark_end(void *desc) static void sdhci_adma_mark_end(void *desc)
{ {
u8 *dma_desc = desc; struct sdhci_adma2_32_desc *dma_desc = desc;
dma_desc[0] |= ADMA2_END; dma_desc->cmd |= cpu_to_le16(ADMA2_END);
} }
static int sdhci_adma_table_pre(struct sdhci_host *host, static int sdhci_adma_table_pre(struct sdhci_host *host,
@ -2297,23 +2292,20 @@ static void sdhci_adma_show_error(struct sdhci_host *host)
{ {
const char *name = mmc_hostname(host->mmc); const char *name = mmc_hostname(host->mmc);
void *desc = host->adma_table; void *desc = host->adma_table;
__le32 *dma;
__le16 *len;
u8 attr;
sdhci_dumpregs(host); sdhci_dumpregs(host);
while (true) { while (true) {
dma = (__le32 *)(desc + 4); struct sdhci_adma2_32_desc *dma_desc = desc;
len = (__le16 *)(desc + 2);
attr = *(u8 *)desc;
DBG("%s: %p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n", DBG("%s: %p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n",
name, desc, le32_to_cpu(*dma), le16_to_cpu(*len), attr); name, desc, le32_to_cpu(dma_desc->addr),
le16_to_cpu(dma_desc->len),
le16_to_cpu(dma_desc->cmd));
desc += host->desc_sz; desc += host->desc_sz;
if (attr & ADMA2_END) if (dma_desc->cmd & cpu_to_le16(ADMA2_END))
break; break;
} }
} }

7
drivers/mmc/host/sdhci.h
View File

@ -272,6 +272,13 @@
/* ADMA2 32-bit DMA alignment */ /* ADMA2 32-bit DMA alignment */
#define SDHCI_ADMA2_32_ALIGN 4 #define SDHCI_ADMA2_32_ALIGN 4
/* ADMA2 32-bit descriptor */
struct sdhci_adma2_32_desc {
__le16 cmd;
__le16 len;
__le32 addr;
} __packed __aligned(SDHCI_ADMA2_32_ALIGN);
#define ADMA2_TRAN_VALID 0x21 #define ADMA2_TRAN_VALID 0x21
#define ADMA2_NOP_END_VALID 0x3 #define ADMA2_NOP_END_VALID 0x3
#define ADMA2_END 0x2 #define ADMA2_END 0x2