mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
MMC for PXA 27X (resubmit)
MMC support for X_Scale PXA is broken and does not work. Mainly, the mmc_init() function cannot recognize current SD/MMC cards. There were already some patches around the world but none of them was merged into the official u-boot tree. This patch makes order fixing this issue. Resubmit after code cleanup. Applied and tested on PXA 270 (TrizepsIV module). Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
stefano babic
Wolfgang Denk
parent
96bbfa1e66
commit
c95219fae2
3 changed files with 382 additions and 201 deletions
503
cpu/pxa/mmc.c
503
cpu/pxa/mmc.c
|
|
@ -30,14 +30,13 @@
|
|||
|
||||
#ifdef CONFIG_MMC
|
||||
|
||||
extern int
|
||||
fat_register_device(block_dev_desc_t *dev_desc, int part_no);
|
||||
extern int fat_register_device(block_dev_desc_t * dev_desc, int part_no);
|
||||
|
||||
static block_dev_desc_t mmc_dev;
|
||||
|
||||
block_dev_desc_t * mmc_get_dev(int dev)
|
||||
block_dev_desc_t *mmc_get_dev(int dev)
|
||||
{
|
||||
return (dev == 0) ? &mmc_dev : NULL;
|
||||
return ((block_dev_desc_t *) & mmc_dev);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -45,72 +44,59 @@ block_dev_desc_t * mmc_get_dev(int dev)
|
|||
* and other parameters
|
||||
*/
|
||||
static uchar mmc_buf[MMC_BLOCK_SIZE];
|
||||
static mmc_csd_t mmc_csd;
|
||||
static uchar spec_ver;
|
||||
static int mmc_ready = 0;
|
||||
static int wide = 0;
|
||||
|
||||
|
||||
static uchar *
|
||||
static uint32_t *
|
||||
/****************************************************/
|
||||
mmc_cmd(ushort cmd, ushort argh, ushort argl, ushort cmdat)
|
||||
/****************************************************/
|
||||
{
|
||||
static uchar resp[20];
|
||||
static uint32_t resp[4], a, b, c;
|
||||
ulong status;
|
||||
int words, i;
|
||||
int i;
|
||||
|
||||
debug("mmc_cmd %x %x %x %x\n", cmd, argh, argl, cmdat);
|
||||
debug("mmc_cmd %u 0x%04x 0x%04x 0x%04x\n", cmd, argh, argl,
|
||||
cmdat | wide);
|
||||
MMC_STRPCL = MMC_STRPCL_STOP_CLK;
|
||||
MMC_I_MASK = ~MMC_I_MASK_CLK_IS_OFF;
|
||||
while (!(MMC_I_REG & MMC_I_REG_CLK_IS_OFF));
|
||||
MMC_CMD = cmd;
|
||||
MMC_ARGH = argh;
|
||||
MMC_ARGL = argl;
|
||||
MMC_CMDAT = cmdat;
|
||||
while (!(MMC_I_REG & MMC_I_REG_CLK_IS_OFF)) ;
|
||||
MMC_CMD = cmd;
|
||||
MMC_ARGH = argh;
|
||||
MMC_ARGL = argl;
|
||||
MMC_CMDAT = cmdat | wide;
|
||||
MMC_I_MASK = ~MMC_I_MASK_END_CMD_RES;
|
||||
MMC_STRPCL = MMC_STRPCL_START_CLK;
|
||||
while (!(MMC_I_REG & MMC_I_REG_END_CMD_RES));
|
||||
while (!(MMC_I_REG & MMC_I_REG_END_CMD_RES)) ;
|
||||
|
||||
status = MMC_STAT;
|
||||
debug("MMC status %x\n", status);
|
||||
debug("MMC status 0x%08x\n", status);
|
||||
if (status & MMC_STAT_TIME_OUT_RESPONSE) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (cmdat & 0x3) {
|
||||
case MMC_CMDAT_R1:
|
||||
case MMC_CMDAT_R3:
|
||||
words = 3;
|
||||
break;
|
||||
|
||||
case MMC_CMDAT_R2:
|
||||
words = 8;
|
||||
break;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
/* Linux says:
|
||||
* Did I mention this is Sick. We always need to
|
||||
* discard the upper 8 bits of the first 16-bit word.
|
||||
*/
|
||||
a = (MMC_RES & 0xffff);
|
||||
for (i = 0; i < 4; i++) {
|
||||
b = (MMC_RES & 0xffff);
|
||||
c = (MMC_RES & 0xffff);
|
||||
resp[i] = (a << 24) | (b << 8) | (c >> 8);
|
||||
a = c;
|
||||
debug("MMC resp[%d] = %#08x\n", i, resp[i]);
|
||||
}
|
||||
for (i = words-1; i >= 0; i--) {
|
||||
ulong res_fifo = MMC_RES;
|
||||
int offset = i << 1;
|
||||
|
||||
resp[offset] = ((uchar *)&res_fifo)[0];
|
||||
resp[offset+1] = ((uchar *)&res_fifo)[1];
|
||||
}
|
||||
#ifdef MMC_DEBUG
|
||||
for (i=0; i<words*2; i += 2) {
|
||||
printf("MMC resp[%d] = %02x\n", i, resp[i]);
|
||||
printf("MMC resp[%d] = %02x\n", i+1, resp[i+1]);
|
||||
}
|
||||
#endif
|
||||
return resp;
|
||||
}
|
||||
|
||||
int
|
||||
/****************************************************/
|
||||
mmc_block_read(uchar *dst, ulong src, ulong len)
|
||||
mmc_block_read(uchar * dst, ulong src, ulong len)
|
||||
/****************************************************/
|
||||
{
|
||||
uchar *resp;
|
||||
ushort argh, argl;
|
||||
ulong status;
|
||||
|
||||
|
|
@ -118,13 +104,13 @@ mmc_block_read(uchar *dst, ulong src, ulong len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, len);
|
||||
debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong) dst, src, len);
|
||||
|
||||
argh = len >> 16;
|
||||
argl = len & 0xffff;
|
||||
|
||||
/* set block len */
|
||||
resp = mmc_cmd(MMC_CMD_SET_BLOCKLEN, argh, argl, MMC_CMDAT_R1);
|
||||
mmc_cmd(MMC_CMD_SET_BLOCKLEN, argh, argl, MMC_CMDAT_R1);
|
||||
|
||||
/* send read command */
|
||||
argh = src >> 16;
|
||||
|
|
@ -133,17 +119,17 @@ mmc_block_read(uchar *dst, ulong src, ulong len)
|
|||
MMC_RDTO = 0xffff;
|
||||
MMC_NOB = 1;
|
||||
MMC_BLKLEN = len;
|
||||
resp = mmc_cmd(MMC_CMD_READ_BLOCK, argh, argl,
|
||||
MMC_CMDAT_R1|MMC_CMDAT_READ|MMC_CMDAT_BLOCK|MMC_CMDAT_DATA_EN);
|
||||
|
||||
mmc_cmd(MMC_CMD_READ_BLOCK, argh, argl,
|
||||
MMC_CMDAT_R1 | MMC_CMDAT_READ | MMC_CMDAT_BLOCK |
|
||||
MMC_CMDAT_DATA_EN);
|
||||
|
||||
MMC_I_MASK = ~MMC_I_MASK_RXFIFO_RD_REQ;
|
||||
while (len) {
|
||||
if (MMC_I_REG & MMC_I_REG_RXFIFO_RD_REQ) {
|
||||
#ifdef CONFIG_PXA27X
|
||||
int i;
|
||||
for (i=min(len,32); i; i--) {
|
||||
*dst++ = * ((volatile uchar *) &MMC_RXFIFO);
|
||||
for (i = min(len, 32); i; i--) {
|
||||
*dst++ = *((volatile uchar *)&MMC_RXFIFO);
|
||||
len--;
|
||||
}
|
||||
#else
|
||||
|
|
@ -158,7 +144,7 @@ mmc_block_read(uchar *dst, ulong src, ulong len)
|
|||
}
|
||||
}
|
||||
MMC_I_MASK = ~MMC_I_MASK_DATA_TRAN_DONE;
|
||||
while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE));
|
||||
while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE)) ;
|
||||
status = MMC_STAT;
|
||||
if (status & MMC_STAT_ERRORS) {
|
||||
printf("MMC_STAT error %lx\n", status);
|
||||
|
|
@ -169,10 +155,9 @@ mmc_block_read(uchar *dst, ulong src, ulong len)
|
|||
|
||||
int
|
||||
/****************************************************/
|
||||
mmc_block_write(ulong dst, uchar *src, int len)
|
||||
mmc_block_write(ulong dst, uchar * src, int len)
|
||||
/****************************************************/
|
||||
{
|
||||
uchar *resp;
|
||||
ushort argh, argl;
|
||||
ulong status;
|
||||
|
||||
|
|
@ -180,13 +165,13 @@ mmc_block_write(ulong dst, uchar *src, int len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
debug("mmc_block_wr dst %lx src %lx len %d\n", dst, (ulong)src, len);
|
||||
debug("mmc_block_wr dst %lx src %lx len %d\n", dst, (ulong) src, len);
|
||||
|
||||
argh = len >> 16;
|
||||
argl = len & 0xffff;
|
||||
|
||||
/* set block len */
|
||||
resp = mmc_cmd(MMC_CMD_SET_BLOCKLEN, argh, argl, MMC_CMDAT_R1);
|
||||
mmc_cmd(MMC_CMD_SET_BLOCKLEN, argh, argl, MMC_CMDAT_R1);
|
||||
|
||||
/* send write command */
|
||||
argh = dst >> 16;
|
||||
|
|
@ -194,15 +179,16 @@ mmc_block_write(ulong dst, uchar *src, int len)
|
|||
MMC_STRPCL = MMC_STRPCL_STOP_CLK;
|
||||
MMC_NOB = 1;
|
||||
MMC_BLKLEN = len;
|
||||
resp = mmc_cmd(MMC_CMD_WRITE_BLOCK, argh, argl,
|
||||
MMC_CMDAT_R1|MMC_CMDAT_WRITE|MMC_CMDAT_BLOCK|MMC_CMDAT_DATA_EN);
|
||||
mmc_cmd(MMC_CMD_WRITE_BLOCK, argh, argl,
|
||||
MMC_CMDAT_R1 | MMC_CMDAT_WRITE | MMC_CMDAT_BLOCK |
|
||||
MMC_CMDAT_DATA_EN);
|
||||
|
||||
MMC_I_MASK = ~MMC_I_MASK_TXFIFO_WR_REQ;
|
||||
while (len) {
|
||||
if (MMC_I_REG & MMC_I_REG_TXFIFO_WR_REQ) {
|
||||
int i, bytes = min(32,len);
|
||||
int i, bytes = min(32, len);
|
||||
|
||||
for (i=0; i<bytes; i++) {
|
||||
for (i = 0; i < bytes; i++) {
|
||||
MMC_TXFIFO = *src++;
|
||||
}
|
||||
if (bytes < 32) {
|
||||
|
|
@ -217,9 +203,9 @@ mmc_block_write(ulong dst, uchar *src, int len)
|
|||
}
|
||||
}
|
||||
MMC_I_MASK = ~MMC_I_MASK_DATA_TRAN_DONE;
|
||||
while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE));
|
||||
while (!(MMC_I_REG & MMC_I_REG_DATA_TRAN_DONE)) ;
|
||||
MMC_I_MASK = ~MMC_I_MASK_PRG_DONE;
|
||||
while (!(MMC_I_REG & MMC_I_REG_PRG_DONE));
|
||||
while (!(MMC_I_REG & MMC_I_REG_PRG_DONE)) ;
|
||||
status = MMC_STAT;
|
||||
if (status & MMC_STAT_ERRORS) {
|
||||
printf("MMC_STAT error %lx\n", status);
|
||||
|
|
@ -228,10 +214,9 @@ mmc_block_write(ulong dst, uchar *src, int len)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
/****************************************************/
|
||||
mmc_read(ulong src, uchar *dst, int size)
|
||||
mmc_read(ulong src, uchar * dst, int size)
|
||||
/****************************************************/
|
||||
{
|
||||
ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
|
||||
|
|
@ -257,33 +242,46 @@ mmc_read(ulong src, uchar *dst, int size)
|
|||
aligned_end = mmc_block_address & end;
|
||||
|
||||
/* all block aligned accesses */
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if (part_start) {
|
||||
part_len = mmc_block_size - part_start;
|
||||
debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
|
||||
debug
|
||||
("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
|
||||
0) {
|
||||
return -1;
|
||||
}
|
||||
memcpy(dst, mmc_buf+part_start, part_len);
|
||||
memcpy(dst, mmc_buf + part_start, part_len);
|
||||
dst += part_len;
|
||||
src += part_len;
|
||||
}
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
for (; src < aligned_end; src += mmc_block_size, dst += mmc_block_size) {
|
||||
debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
if ((mmc_block_read((uchar *)(dst), src, mmc_block_size)) < 0) {
|
||||
debug
|
||||
("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_read((uchar *) (dst), src, mmc_block_size)) < 0) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if (part_end && src < end) {
|
||||
debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -294,7 +292,7 @@ mmc_read(ulong src, uchar *dst, int size)
|
|||
|
||||
int
|
||||
/****************************************************/
|
||||
mmc_write(uchar *src, ulong dst, int size)
|
||||
mmc_write(uchar * src, ulong dst, int size)
|
||||
/****************************************************/
|
||||
{
|
||||
ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
|
||||
|
|
@ -320,36 +318,50 @@ mmc_write(uchar *src, ulong dst, int size)
|
|||
aligned_end = mmc_block_address & end;
|
||||
|
||||
/* all block aligned accesses */
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if (part_start) {
|
||||
part_len = mmc_block_size - part_start;
|
||||
debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
(ulong)src, dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
|
||||
debug
|
||||
("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
(ulong) src, dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
|
||||
0) {
|
||||
return -1;
|
||||
}
|
||||
memcpy(mmc_buf+part_start, src, part_len);
|
||||
if ((mmc_block_write(aligned_start, mmc_buf, mmc_block_size)) < 0) {
|
||||
memcpy(mmc_buf + part_start, src, part_len);
|
||||
if ((mmc_block_write(aligned_start, mmc_buf, mmc_block_size)) <
|
||||
0) {
|
||||
return -1;
|
||||
}
|
||||
dst += part_len;
|
||||
src += part_len;
|
||||
}
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
for (; dst < aligned_end; src += mmc_block_size, dst += mmc_block_size) {
|
||||
debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
if ((mmc_block_write(dst, (uchar *)src, mmc_block_size)) < 0) {
|
||||
debug
|
||||
("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_write(dst, (uchar *) src, mmc_block_size)) < 0) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if (part_end && dst < end) {
|
||||
debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
|
||||
debug
|
||||
("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
|
||||
src, (ulong) dst, end, part_start, part_end, aligned_start,
|
||||
aligned_end);
|
||||
if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -363,127 +375,288 @@ mmc_write(uchar *src, ulong dst, int size)
|
|||
|
||||
ulong
|
||||
/****************************************************/
|
||||
mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
|
||||
mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong * dst)
|
||||
/****************************************************/
|
||||
{
|
||||
int mmc_block_size = MMC_BLOCK_SIZE;
|
||||
ulong src = blknr * mmc_block_size + CFG_MMC_BASE;
|
||||
|
||||
mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size);
|
||||
mmc_read(src, (uchar *) dst, blkcnt * mmc_block_size);
|
||||
return blkcnt;
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define likely(x) __builtin_expect(!!(x), 1)
|
||||
#define unlikely(x) __builtin_expect(!!(x), 0)
|
||||
#else
|
||||
#define likely(x) (x)
|
||||
#define unlikely(x) (x)
|
||||
#endif
|
||||
|
||||
#define UNSTUFF_BITS(resp,start,size) \
|
||||
({ \
|
||||
const int __size = size; \
|
||||
const uint32_t __mask = (__size < 32 ? 1 << __size : 0) - 1; \
|
||||
const int32_t __off = 3 - ((start) / 32); \
|
||||
const int32_t __shft = (start) & 31; \
|
||||
uint32_t __res; \
|
||||
\
|
||||
__res = resp[__off] >> __shft; \
|
||||
if (__size + __shft > 32) \
|
||||
__res |= resp[__off-1] << ((32 - __shft) % 32); \
|
||||
__res & __mask; \
|
||||
})
|
||||
|
||||
/*
|
||||
* Given the decoded CSD structure, decode the raw CID to our CID structure.
|
||||
*/
|
||||
static void mmc_decode_cid(uint32_t * resp)
|
||||
{
|
||||
if (IF_TYPE_SD == mmc_dev.if_type) {
|
||||
/*
|
||||
* SD doesn't currently have a version field so we will
|
||||
* have to assume we can parse this.
|
||||
*/
|
||||
sprintf((char *)mmc_dev.vendor,
|
||||
"Man %02x OEM %c%c \"%c%c%c%c%c\" Date %02u/%04u",
|
||||
UNSTUFF_BITS(resp, 120, 8), UNSTUFF_BITS(resp, 112, 8),
|
||||
UNSTUFF_BITS(resp, 104, 8), UNSTUFF_BITS(resp, 96, 8),
|
||||
UNSTUFF_BITS(resp, 88, 8), UNSTUFF_BITS(resp, 80, 8),
|
||||
UNSTUFF_BITS(resp, 72, 8), UNSTUFF_BITS(resp, 64, 8),
|
||||
UNSTUFF_BITS(resp, 8, 4), UNSTUFF_BITS(resp, 12,
|
||||
8) + 2000);
|
||||
sprintf((char *)mmc_dev.revision, "%d.%d",
|
||||
UNSTUFF_BITS(resp, 60, 4), UNSTUFF_BITS(resp, 56, 4));
|
||||
sprintf((char *)mmc_dev.product, "%u",
|
||||
UNSTUFF_BITS(resp, 24, 32));
|
||||
} else {
|
||||
/*
|
||||
* The selection of the format here is based upon published
|
||||
* specs from sandisk and from what people have reported.
|
||||
*/
|
||||
switch (spec_ver) {
|
||||
case 0: /* MMC v1.0 - v1.2 */
|
||||
case 1: /* MMC v1.4 */
|
||||
sprintf((char *)mmc_dev.vendor,
|
||||
"Man %02x%02x%02x \"%c%c%c%c%c%c%c\" Date %02u/%04u",
|
||||
UNSTUFF_BITS(resp, 120, 8), UNSTUFF_BITS(resp,
|
||||
112,
|
||||
8),
|
||||
UNSTUFF_BITS(resp, 104, 8), UNSTUFF_BITS(resp,
|
||||
96, 8),
|
||||
UNSTUFF_BITS(resp, 88, 8), UNSTUFF_BITS(resp,
|
||||
80, 8),
|
||||
UNSTUFF_BITS(resp, 72, 8), UNSTUFF_BITS(resp,
|
||||
64, 8),
|
||||
UNSTUFF_BITS(resp, 56, 8), UNSTUFF_BITS(resp,
|
||||
48, 8),
|
||||
UNSTUFF_BITS(resp, 12, 4), UNSTUFF_BITS(resp, 8,
|
||||
4) +
|
||||
1997);
|
||||
sprintf((char *)mmc_dev.revision, "%d.%d",
|
||||
UNSTUFF_BITS(resp, 44, 4), UNSTUFF_BITS(resp,
|
||||
40, 4));
|
||||
sprintf((char *)mmc_dev.product, "%u",
|
||||
UNSTUFF_BITS(resp, 16, 24));
|
||||
break;
|
||||
|
||||
case 2: /* MMC v2.0 - v2.2 */
|
||||
case 3: /* MMC v3.1 - v3.3 */
|
||||
case 4: /* MMC v4 */
|
||||
sprintf((char *)mmc_dev.vendor,
|
||||
"Man %02x OEM %04x \"%c%c%c%c%c%c\" Date %02u/%04u",
|
||||
UNSTUFF_BITS(resp, 120, 8), UNSTUFF_BITS(resp,
|
||||
104,
|
||||
16),
|
||||
UNSTUFF_BITS(resp, 96, 8), UNSTUFF_BITS(resp,
|
||||
88, 8),
|
||||
UNSTUFF_BITS(resp, 80, 8), UNSTUFF_BITS(resp,
|
||||
72, 8),
|
||||
UNSTUFF_BITS(resp, 64, 8), UNSTUFF_BITS(resp,
|
||||
56, 8),
|
||||
UNSTUFF_BITS(resp, 12, 4), UNSTUFF_BITS(resp, 8,
|
||||
4) +
|
||||
1997);
|
||||
sprintf((char *)mmc_dev.product, "%u",
|
||||
UNSTUFF_BITS(resp, 16, 32));
|
||||
sprintf((char *)mmc_dev.revision, "N/A");
|
||||
break;
|
||||
|
||||
default:
|
||||
printf("MMC card has unknown MMCA version %d\n",
|
||||
spec_ver);
|
||||
break;
|
||||
}
|
||||
}
|
||||
printf("%s card.\nVendor: %s\nProduct: %s\nRevision: %s\n",
|
||||
(IF_TYPE_SD == mmc_dev.if_type) ? "SD" : "MMC", mmc_dev.vendor,
|
||||
mmc_dev.product, mmc_dev.revision);
|
||||
}
|
||||
|
||||
/*
|
||||
* Given a 128-bit response, decode to our card CSD structure.
|
||||
*/
|
||||
static void mmc_decode_csd(uint32_t * resp)
|
||||
{
|
||||
unsigned int mult, csd_struct;
|
||||
|
||||
if (IF_TYPE_SD == mmc_dev.if_type) {
|
||||
csd_struct = UNSTUFF_BITS(resp, 126, 2);
|
||||
if (csd_struct != 0) {
|
||||
printf("SD: unrecognised CSD structure version %d\n",
|
||||
csd_struct);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
/*
|
||||
* We only understand CSD structure v1.1 and v1.2.
|
||||
* v1.2 has extra information in bits 15, 11 and 10.
|
||||
*/
|
||||
csd_struct = UNSTUFF_BITS(resp, 126, 2);
|
||||
if (csd_struct != 1 && csd_struct != 2) {
|
||||
printf("MMC: unrecognised CSD structure version %d\n",
|
||||
csd_struct);
|
||||
return;
|
||||
}
|
||||
|
||||
spec_ver = UNSTUFF_BITS(resp, 122, 4);
|
||||
mmc_dev.if_type = IF_TYPE_MMC;
|
||||
}
|
||||
|
||||
mult = 1 << (UNSTUFF_BITS(resp, 47, 3) + 2);
|
||||
mmc_dev.lba = (1 + UNSTUFF_BITS(resp, 62, 12)) * mult;
|
||||
mmc_dev.blksz = 1 << UNSTUFF_BITS(resp, 80, 4);
|
||||
|
||||
/* FIXME: The following just makes assumes that's the partition type -- should really read it */
|
||||
mmc_dev.part_type = PART_TYPE_DOS;
|
||||
mmc_dev.dev = 0;
|
||||
mmc_dev.lun = 0;
|
||||
mmc_dev.type = DEV_TYPE_HARDDISK;
|
||||
mmc_dev.removable = 0;
|
||||
mmc_dev.block_read = mmc_bread;
|
||||
|
||||
printf("Detected: %u blocks of %u bytes (%uMB) ", mmc_dev.lba,
|
||||
mmc_dev.blksz, mmc_dev.lba * mmc_dev.blksz / (1024 * 1024));
|
||||
}
|
||||
|
||||
int
|
||||
/****************************************************/
|
||||
mmc_init(int verbose)
|
||||
/****************************************************/
|
||||
{
|
||||
int retries, rc = -ENODEV;
|
||||
uchar *resp;
|
||||
int retries, rc = -ENODEV;
|
||||
uint32_t cid_resp[4];
|
||||
uint32_t *resp;
|
||||
uint16_t rca = 0;
|
||||
|
||||
#ifdef CONFIG_LUBBOCK
|
||||
set_GPIO_mode( GPIO6_MMCCLK_MD );
|
||||
set_GPIO_mode( GPIO8_MMCCS0_MD );
|
||||
/* Reset device interface type */
|
||||
mmc_dev.if_type = IF_TYPE_UNKNOWN;
|
||||
|
||||
#if defined (CONFIG_LUBBOCK) || (defined (CONFIG_GUMSTIX) && !defined(CONFIG_PXA27X))
|
||||
set_GPIO_mode(GPIO6_MMCCLK_MD);
|
||||
set_GPIO_mode(GPIO8_MMCCS0_MD);
|
||||
#endif
|
||||
CKEN |= CKEN12_MMC; /* enable MMC unit clock */
|
||||
CKEN |= CKEN12_MMC; /* enable MMC unit clock */
|
||||
#if defined(CONFIG_ADSVIX)
|
||||
/* turn on the power */
|
||||
GPCR(114) = GPIO_bit(114);
|
||||
udelay(1000);
|
||||
#endif
|
||||
|
||||
mmc_csd.c_size = 0;
|
||||
|
||||
MMC_CLKRT = MMC_CLKRT_0_3125MHZ;
|
||||
MMC_RESTO = MMC_RES_TO_MAX;
|
||||
MMC_SPI = MMC_SPI_DISABLE;
|
||||
MMC_CLKRT = MMC_CLKRT_0_3125MHZ;
|
||||
MMC_RESTO = MMC_RES_TO_MAX;
|
||||
MMC_SPI = MMC_SPI_DISABLE;
|
||||
|
||||
/* reset */
|
||||
retries = 10;
|
||||
resp = mmc_cmd(0, 0, 0, 0);
|
||||
resp = mmc_cmd(1, 0x00ff, 0xc000, MMC_CMDAT_INIT|MMC_CMDAT_BUSY|MMC_CMDAT_R3);
|
||||
while (retries-- && resp && !(resp[4] & 0x80)) {
|
||||
debug("resp %x %x\n", resp[0], resp[1]);
|
||||
mmc_cmd(MMC_CMD_RESET, 0, 0, MMC_CMDAT_INIT | MMC_CMDAT_R0);
|
||||
udelay(200000);
|
||||
retries = 3;
|
||||
while (retries--) {
|
||||
resp = mmc_cmd(MMC_CMD_APP_CMD, 0, 0, MMC_CMDAT_R1);
|
||||
if (!(resp[0] & 0x00000020)) { /* Card does not support APP_CMD */
|
||||
debug("Card does not support APP_CMD\n");
|
||||
break;
|
||||
}
|
||||
|
||||
resp = mmc_cmd(SD_CMD_APP_OP_COND, 0x0020, 0, MMC_CMDAT_R3 | (retries < 2 ? 0 : MMC_CMDAT_INIT)); /* Select 3.2-3.3 and 3.3-3.4V */
|
||||
if (resp[0] & 0x80000000) {
|
||||
mmc_dev.if_type = IF_TYPE_SD;
|
||||
debug("Detected SD card\n");
|
||||
break;
|
||||
}
|
||||
#ifdef CONFIG_PXA27X
|
||||
udelay(10000);
|
||||
#else
|
||||
udelay(50);
|
||||
udelay(200000);
|
||||
#endif
|
||||
resp = mmc_cmd(1, 0x00ff, 0xff00, MMC_CMDAT_BUSY|MMC_CMDAT_R3);
|
||||
}
|
||||
|
||||
if (retries <= 0 || !(IF_TYPE_SD == mmc_dev.if_type)) {
|
||||
debug("Failed to detect SD Card, trying MMC\n");
|
||||
resp =
|
||||
mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ff, 0x8000, MMC_CMDAT_R3);
|
||||
|
||||
retries = 10;
|
||||
while (retries-- && resp && !(resp[0] & 0x80000000)) {
|
||||
#ifdef CONFIG_PXA27X
|
||||
udelay(10000);
|
||||
#else
|
||||
udelay(200000);
|
||||
#endif
|
||||
resp =
|
||||
mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ff, 0x8000,
|
||||
MMC_CMDAT_R3);
|
||||
}
|
||||
}
|
||||
|
||||
/* try to get card id */
|
||||
resp = mmc_cmd(2, 0, 0, MMC_CMDAT_R2);
|
||||
resp =
|
||||
mmc_cmd(MMC_CMD_ALL_SEND_CID, 0, 0, MMC_CMDAT_R2 | MMC_CMDAT_BUSY);
|
||||
if (resp) {
|
||||
/* TODO configure mmc driver depending on card attributes */
|
||||
mmc_cid_t *cid = (mmc_cid_t *)resp;
|
||||
if (verbose) {
|
||||
printf("MMC found. Card desciption is:\n");
|
||||
printf("Manufacturer ID = %02x%02x%02x\n",
|
||||
cid->id[0], cid->id[1], cid->id[2]);
|
||||
printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
|
||||
cid->hwrev = cid->fwrev = 0; /* null terminate string */
|
||||
printf("Product Name = %s\n",cid->name);
|
||||
printf("Serial Number = %02x%02x%02x\n",
|
||||
cid->sn[0], cid->sn[1], cid->sn[2]);
|
||||
printf("Month = %d\n",cid->month);
|
||||
printf("Year = %d\n",1997 + cid->year);
|
||||
}
|
||||
/* fill in device description */
|
||||
mmc_dev.if_type = IF_TYPE_MMC;
|
||||
mmc_dev.part_type = PART_TYPE_DOS;
|
||||
mmc_dev.dev = 0;
|
||||
mmc_dev.lun = 0;
|
||||
mmc_dev.type = 0;
|
||||
/* FIXME fill in the correct size (is set to 32MByte) */
|
||||
mmc_dev.blksz = 512;
|
||||
mmc_dev.lba = 0x10000;
|
||||
sprintf((char*)mmc_dev.vendor,"Man %02x%02x%02x Snr %02x%02x%02x",
|
||||
cid->id[0], cid->id[1], cid->id[2],
|
||||
cid->sn[0], cid->sn[1], cid->sn[2]);
|
||||
sprintf((char*)mmc_dev.product,"%s",cid->name);
|
||||
sprintf((char*)mmc_dev.revision,"%x %x",cid->hwrev, cid->fwrev);
|
||||
mmc_dev.removable = 0;
|
||||
mmc_dev.block_read = mmc_bread;
|
||||
memcpy(cid_resp, resp, sizeof(cid_resp));
|
||||
|
||||
/* MMC exists, get CSD too */
|
||||
resp = mmc_cmd(MMC_CMD_SET_RCA, MMC_DEFAULT_RCA, 0, MMC_CMDAT_R1);
|
||||
resp = mmc_cmd(MMC_CMD_SEND_CSD, MMC_DEFAULT_RCA, 0, MMC_CMDAT_R2);
|
||||
resp = mmc_cmd(MMC_CMD_SET_RCA, 0, 0, MMC_CMDAT_R1);
|
||||
if (IF_TYPE_SD == mmc_dev.if_type)
|
||||
rca = ((resp[0] & 0xffff0000) >> 16);
|
||||
resp = mmc_cmd(MMC_CMD_SEND_CSD, rca, 0, MMC_CMDAT_R2);
|
||||
if (resp) {
|
||||
mmc_csd_t *csd = (mmc_csd_t *)resp;
|
||||
memcpy(&mmc_csd, csd, sizeof(csd));
|
||||
mmc_decode_csd(resp);
|
||||
rc = 0;
|
||||
mmc_ready = 1;
|
||||
/* FIXME add verbose printout for csd */
|
||||
}
|
||||
|
||||
mmc_decode_cid(cid_resp);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PXA27X
|
||||
MMC_CLKRT = 1; /* 10 MHz - see Intel errata */
|
||||
#else
|
||||
MMC_CLKRT = 0; /* 20 MHz */
|
||||
#endif
|
||||
resp = mmc_cmd(7, MMC_DEFAULT_RCA, 0, MMC_CMDAT_R1);
|
||||
MMC_CLKRT = 0; /* 20 MHz */
|
||||
resp = mmc_cmd(MMC_CMD_SELECT_CARD, rca, 0, MMC_CMDAT_R1);
|
||||
|
||||
fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
|
||||
#ifdef CONFIG_PXA27X
|
||||
if (IF_TYPE_SD == mmc_dev.if_type) {
|
||||
resp = mmc_cmd(MMC_CMD_APP_CMD, rca, 0, MMC_CMDAT_R1);
|
||||
resp = mmc_cmd(SD_CMD_APP_SET_BUS_WIDTH, 0, 2, MMC_CMDAT_R1);
|
||||
wide = MMC_CMDAT_SD_4DAT;
|
||||
}
|
||||
#endif
|
||||
|
||||
fat_register_device(&mmc_dev, 1); /* partitions start counting with 1 */
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int
|
||||
mmc_ident(block_dev_desc_t *dev)
|
||||
int mmc_ident(block_dev_desc_t * dev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
mmc2info(ulong addr)
|
||||
int mmc2info(ulong addr)
|
||||
{
|
||||
/* FIXME hard codes to 32 MB device */
|
||||
if (addr >= CFG_MMC_BASE && addr < CFG_MMC_BASE + 0x02000000) {
|
||||
if (addr >= CFG_MMC_BASE
|
||||
&& addr < CFG_MMC_BASE + (mmc_dev.lba * mmc_dev.blksz)) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MMC */
|
||||
#endif /* CONFIG_MMC */
|
||||
|
|
|
|||
|
|
@ -54,14 +54,17 @@
|
|||
#define MMC_SPI_CRC_ON (0x01UL << 1)
|
||||
|
||||
/* MMC_CMDAT */
|
||||
#define MMC_CMDAT_SD_4DAT (0x0001UL << 8)
|
||||
#define MMC_CMDAT_MMC_DMA_EN (0x0001UL << 7)
|
||||
#define MMC_CMDAT_INIT (0x0001UL << 6)
|
||||
#define MMC_CMDAT_BUSY (0x0001UL << 5)
|
||||
#define MMC_CMDAT_BCR (0x0003UL << 5)
|
||||
#define MMC_CMDAT_STREAM (0x0001UL << 4)
|
||||
#define MMC_CMDAT_BLOCK (0x0000UL << 4)
|
||||
#define MMC_CMDAT_WRITE (0x0001UL << 3)
|
||||
#define MMC_CMDAT_READ (0x0000UL << 3)
|
||||
#define MMC_CMDAT_DATA_EN (0x0001UL << 2)
|
||||
#define MMC_CMDAT_R0 (0)
|
||||
#define MMC_CMDAT_R1 (0x0001UL)
|
||||
#define MMC_CMDAT_R2 (0x0002UL)
|
||||
#define MMC_CMDAT_R3 (0x0003UL)
|
||||
|
|
@ -111,6 +114,7 @@
|
|||
#define MMC_CMD_SEND_OP_COND 1
|
||||
#define MMC_CMD_ALL_SEND_CID 2
|
||||
#define MMC_CMD_SET_RCA 3
|
||||
#define MMC_CMD_SELECT_CARD 7
|
||||
#define MMC_CMD_SEND_CSD 9
|
||||
#define MMC_CMD_SEND_CID 10
|
||||
#define MMC_CMD_SEND_STATUS 13
|
||||
|
|
@ -118,6 +122,10 @@
|
|||
#define MMC_CMD_READ_BLOCK 17
|
||||
#define MMC_CMD_RD_BLK_MULTI 18
|
||||
#define MMC_CMD_WRITE_BLOCK 24
|
||||
#define MMC_CMD_APP_CMD 55
|
||||
|
||||
#define SD_CMD_APP_SET_BUS_WIDTH 6
|
||||
#define SD_CMD_APP_OP_COND 41
|
||||
|
||||
#define MMC_MAX_BLOCK_SIZE 512
|
||||
|
||||
|
|
@ -158,42 +166,41 @@ typedef struct mmc_cid
|
|||
|
||||
typedef struct mmc_csd
|
||||
{
|
||||
uchar ecc:2,
|
||||
file_format:2,
|
||||
tmp_write_protect:1,
|
||||
perm_write_protect:1,
|
||||
copy:1,
|
||||
file_format_grp:1;
|
||||
uint64_t content_prot_app:1,
|
||||
rsvd3:4,
|
||||
write_bl_partial:1,
|
||||
write_bl_len:4,
|
||||
r2w_factor:3,
|
||||
default_ecc:2,
|
||||
wp_grp_enable:1,
|
||||
wp_grp_size:5,
|
||||
erase_grp_mult:5,
|
||||
erase_grp_size:5,
|
||||
c_size_mult1:3,
|
||||
vdd_w_curr_max:3,
|
||||
vdd_w_curr_min:3,
|
||||
vdd_r_curr_max:3,
|
||||
vdd_r_curr_min:3,
|
||||
c_size:12,
|
||||
rsvd2:2,
|
||||
dsr_imp:1,
|
||||
read_blk_misalign:1,
|
||||
write_blk_misalign:1,
|
||||
read_bl_partial:1;
|
||||
|
||||
ushort read_bl_len:4,
|
||||
ccc:12;
|
||||
uchar tran_speed;
|
||||
uchar nsac;
|
||||
uchar taac;
|
||||
uchar rsvd1:2,
|
||||
spec_vers:4,
|
||||
csd_structure:2;
|
||||
uint8_t csd_structure:2,
|
||||
spec_ver:4,
|
||||
rsvd1:2;
|
||||
uint8_t taac;
|
||||
uint8_t nsac;
|
||||
uint8_t tran_speed;
|
||||
uint16_t ccc:12,
|
||||
read_bl_len:4;
|
||||
uint64_t read_bl_partial:1,
|
||||
write_blk_misalign:1,
|
||||
read_blk_misalign:1,
|
||||
dsr_imp:1,
|
||||
rsvd2:2,
|
||||
c_size:12,
|
||||
vdd_r_curr_min:3,
|
||||
vdd_r_curr_max:3,
|
||||
vdd_w_curr_min:3,
|
||||
vdd_w_curr_max:3,
|
||||
c_size_mult:3,
|
||||
erase_blk_en:1,
|
||||
sector_size:7,
|
||||
wp_grp_size:7,
|
||||
wp_grp_enable:1,
|
||||
default_ecc:2,
|
||||
r2w_factor:3,
|
||||
write_bl_len:4,
|
||||
write_bl_partial:1,
|
||||
rsvd3:4,
|
||||
content_prot_app:1;
|
||||
uint8_t file_format_grp:1,
|
||||
copy:1,
|
||||
perm_write_protect:1,
|
||||
tmp_write_protect:1,
|
||||
file_format:2,
|
||||
ecc:2;
|
||||
} mmc_csd_t;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ typedef struct block_dev_desc {
|
|||
#define IF_TYPE_USB 4
|
||||
#define IF_TYPE_DOC 5
|
||||
#define IF_TYPE_MMC 6
|
||||
#define IF_TYPE_SD 7
|
||||
|
||||
/* Part types */
|
||||
#define PART_TYPE_UNKNOWN 0x00
|
||||
|
|
|
|||
Loading…
Reference in a new issue