sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/mci'

This commit is contained in:
Sascha Hauer 2012-12-07 16:43:15 +01:00
parent db5e43eade 63cfa83739
commit 0edc0a4678
2 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mci/imx-esdhc.c
View File

@ -279,7 +279,7 @@ esdhc_send_cmd(struct mci_host *mci, struct mci_cmd *cmd, struct mci_data *data)
ret = wait_on_timeout(100 * MSECOND,
esdhc_read32(&regs->irqstat) & IRQSTAT_CC);
if (ret) {
dev_err(host->dev, "timeout 1\n");
dev_dbg(host->dev, "timeout 1\n");
return -ETIMEDOUT;
}

63
drivers/mci/mci-core.c
View File

@ -37,6 +37,20 @@
#define MAX_BUFFER_NUMBER 0xffffffff
#define UNSTUFF_BITS(resp,start,size) \
({ \
const int __size = size; \
const u32 __mask = (__size < 32 ? 1 << __size : 0) - 1; \
const int __off = 3 - ((start) / 32); \
const int __shft = (start) & 31; \
u32 __res; \
\
__res = resp[__off] >> __shft; \
if (__size + __shft > 32) \
__res |= resp[__off-1] << ((32 - __shft) % 32); \
__res & __mask; \
})
/**
* @file
* @brief Memory Card framework
@ -724,7 +738,7 @@ static void mci_extract_max_tran_speed_from_csd(struct mci *mci)
*/
static void mci_extract_block_lengths_from_csd(struct mci *mci)
{
mci->read_bl_len = 1 << ((mci->csd[1] >> 16) & 0xf);
mci->read_bl_len = 1 << UNSTUFF_BITS(mci->csd, 80, 4);
if (IS_SD(mci))
mci->write_bl_len = mci->read_bl_len; /* FIXME why? */
@ -744,15 +758,22 @@ static void mci_extract_card_capacity_from_csd(struct mci *mci)
uint64_t csize, cmult;
if (mci->high_capacity) {
csize = (mci->csd[1] & 0x3f) << 16 | (mci->csd[2] & 0xffff0000) >> 16;
cmult = 8;
if (IS_SD(mci)) {
csize = UNSTUFF_BITS(mci->csd, 48, 22);
mci->capacity = (1 + csize) << 10;
} else {
mci->capacity = mci->ext_csd[EXT_CSD_SEC_CNT] << 0 |
mci->ext_csd[EXT_CSD_SEC_CNT + 1] << 8 |
mci->ext_csd[EXT_CSD_SEC_CNT + 2] << 16 |
mci->ext_csd[EXT_CSD_SEC_CNT + 3] << 24;
}
} else {
csize = (mci->csd[1] & 0x3ff) << 2 | (mci->csd[2] & 0xc0000000) >> 30;
cmult = (mci->csd[2] & 0x00038000) >> 15;
cmult = UNSTUFF_BITS(mci->csd, 47, 3);
csize = UNSTUFF_BITS(mci->csd, 62, 12);
mci->capacity = (csize + 1) << (cmult + 2);
}
mci->capacity = (csize + 1) << (cmult + 2);
mci->capacity *= mci->read_bl_len;
mci->capacity *= 1 << UNSTUFF_BITS(mci->csd, 80, 4);;
dev_dbg(mci->mci_dev, "Capacity: %u MiB\n", (unsigned)(mci->capacity >> 20));
}
@ -982,7 +1003,6 @@ static int mci_startup(struct mci *mci)
mci_detect_version_from_csd(mci);
mci_extract_max_tran_speed_from_csd(mci);
mci_extract_block_lengths_from_csd(mci);
mci_extract_card_capacity_from_csd(mci);
/* sanitiy? */
if (mci->read_bl_len > SECTOR_SIZE) {
@ -1018,6 +1038,8 @@ static int mci_startup(struct mci *mci)
if (err)
return err;
mci_extract_card_capacity_from_csd(mci);
/* Restrict card's capabilities by what the host can do */
mci->card_caps &= host->host_caps;
@ -1165,7 +1187,10 @@ static int mci_sd_read(struct block_device *blk, void *buffer, int block,
*/
static unsigned extract_mid(struct mci *mci)
{
return mci->cid[0] >> 24;
if (!IS_SD(mci) && mci->version <= MMC_VERSION_1_4)
return UNSTUFF_BITS(mci->cid, 104, 24);
else
return UNSTUFF_BITS(mci->cid, 120, 8);
}
/**
@ -1198,7 +1223,15 @@ static unsigned extract_prv(struct mci *mci)
*/
static unsigned extract_psn(struct mci *mci)
{
return (mci->cid[2] << 8) | (mci->cid[3] >> 24);
if (IS_SD(mci)) {
return UNSTUFF_BITS(mci->csd, 24, 32);
} else {
if (mci->version > MMC_VERSION_1_4)
return UNSTUFF_BITS(mci->cid, 16, 32);
else
return UNSTUFF_BITS(mci->cid, 16, 24);
}
}
/**
@ -1209,7 +1242,10 @@ static unsigned extract_psn(struct mci *mci)
*/
static unsigned extract_mtd_month(struct mci *mci)
{
return (mci->cid[3] >> 8) & 0xf;
if (IS_SD(mci))
return UNSTUFF_BITS(mci->cid, 8, 4);
else
return UNSTUFF_BITS(mci->cid, 12, 4);
}
/**
@ -1221,7 +1257,10 @@ static unsigned extract_mtd_month(struct mci *mci)
*/
static unsigned extract_mtd_year(struct mci *mci)
{
return ((mci->cid[3] >> 12) & 0xff) + 2000U;
if (IS_SD(mci))
return UNSTUFF_BITS(mci->cid, 12, 8) + 2000;
else
return UNSTUFF_BITS(mci->cid, 8, 4) + 1997;
}
/**