V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mmc: fix the condition for MMC version 4 

Fix the problem that if we use the chip of MMC version 4 and
the capacity is smaller than 2GB or equal, the mmc->capacity is
invalid. According to the JEDEC Standard, the value of ext_csd's
capacity is valid if the value is more than 2GB.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Yoshihiro Shimoda 2011-07-04 22:13:26 +00:00 committed by Andy Fleming
parent e75787d903
commit 639b7827d1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/mmc.c
View File

@ -853,7 +853,7 @@ int mmc_startup(struct mmc *mmc)
{ {
int err; int err;
uint mult, freq; uint mult, freq;
u64 cmult, csize; u64 cmult, csize, capacity;
struct mmc_cmd cmd; struct mmc_cmd cmd;
char ext_csd[512]; char ext_csd[512];
int timeout = 1000; int timeout = 1000;
@ -1002,9 +1002,16 @@ int mmc_startup(struct mmc *mmc)
/* check ext_csd version and capacity */ /* check ext_csd version and capacity */
err = mmc_send_ext_csd(mmc, ext_csd); err = mmc_send_ext_csd(mmc, ext_csd);
if (!err & (ext_csd[192] >= 2)) { if (!err & (ext_csd[192] >= 2)) {
mmc->capacity = ext_csd[212] << 0 | ext_csd[213] << 8 | /*
* According to the JEDEC Standard, the value of
* ext_csd's capacity is valid if the value is more
* than 2GB
*/
capacity = ext_csd[212] << 0 | ext_csd[213] << 8 |
ext_csd[214] << 16 | ext_csd[215] << 24; ext_csd[214] << 16 | ext_csd[215] << 24;
mmc->capacity *= 512; capacity *= 512;
if (capacity > 2 * 1024 * 1024 * 1024)
mmc->capacity = capacity;
} }
/* /*