AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mmc: recognize CSD structure

Browse Source 
The eMMC spec 4.4 and 4.3 + additional feature chips has CSD structure
version 3 and version 3 have to check the CSD_STRUCTURE byte in the
EXT_CSD register.

Also fix EXT_CSD revision message.

[akpm@linux-foundation.org: fix comment, per Chris Ball]
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kyungmin Park 2010-08-10 18:01:36 -07:00 committed by Linus Torvalds
parent a892e2d7dc
commit 6da24b786e
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/mmc/core/mmc.c
View File

@ -114,17 +114,18 @@ static int mmc_decode_cid(struct mmc_card *card)
static int mmc_decode_csd(struct mmc_card *card) static int mmc_decode_csd(struct mmc_card *card)
{ {
struct mmc_csd *csd = &card->csd; struct mmc_csd *csd = &card->csd;
unsigned int e, m, csd_struct; unsigned int e, m;
u32 *resp = card->raw_csd; u32 *resp = card->raw_csd;
/* /*
* We only understand CSD structure v1.1 and v1.2. * We only understand CSD structure v1.1 and v1.2.
* v1.2 has extra information in bits 15, 11 and 10. * v1.2 has extra information in bits 15, 11 and 10.
* We also support eMMC v4.4 & v4.41.
*/ */
csd_struct = UNSTUFF_BITS(resp, 126, 2); csd->structure = UNSTUFF_BITS(resp, 126, 2);
if (csd_struct != 1 && csd_struct != 2) { if (csd->structure == 0) {
printk(KERN_ERR "%s: unrecognised CSD structure version %d\n", printk(KERN_ERR "%s: unrecognised CSD structure version %d\n",
mmc_hostname(card->host), csd_struct); mmc_hostname(card->host), csd->structure);
return -EINVAL; return -EINVAL;
} }
@ -207,11 +208,22 @@ static int mmc_read_ext_csd(struct mmc_card *card)
goto out; goto out;
} }
/* Version is coded in the CSD_STRUCTURE byte in the EXT_CSD register */
if (card->csd.structure == 3) {
int ext_csd_struct = ext_csd[EXT_CSD_STRUCTURE];
if (ext_csd_struct > 2) {
printk(KERN_ERR "%s: unrecognised EXT_CSD structure "
"version %d\n", mmc_hostname(card->host),
ext_csd_struct);
err = -EINVAL;
goto out;
}
}
card->ext_csd.rev = ext_csd[EXT_CSD_REV]; card->ext_csd.rev = ext_csd[EXT_CSD_REV];
if (card->ext_csd.rev > 5) { if (card->ext_csd.rev > 5) {
printk(KERN_ERR "%s: unrecognised EXT_CSD structure " printk(KERN_ERR "%s: unrecognised EXT_CSD revision %d\n",
"version %d\n", mmc_hostname(card->host), mmc_hostname(card->host), card->ext_csd.rev);
card->ext_csd.rev);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }

1
include/linux/mmc/card.h
View File

@ -24,6 +24,7 @@ struct mmc_cid {
}; };
struct mmc_csd { struct mmc_csd {
unsigned char structure;
unsigned char mmca_vsn; unsigned char mmca_vsn;
unsigned short cmdclass; unsigned short cmdclass;
unsigned short tacc_clks; unsigned short tacc_clks;

1
include/linux/mmc/mmc.h
View File

@ -254,6 +254,7 @@ struct _mmc_csd {
#define EXT_CSD_BUS_WIDTH 183 /* R/W */ #define EXT_CSD_BUS_WIDTH 183 /* R/W */
#define EXT_CSD_HS_TIMING 185 /* R/W */ #define EXT_CSD_HS_TIMING 185 /* R/W */
#define EXT_CSD_CARD_TYPE 196 /* RO */ #define EXT_CSD_CARD_TYPE 196 /* RO */
#define EXT_CSD_STRUCTURE 194 /* RO */
#define EXT_CSD_REV 192 /* RO */ #define EXT_CSD_REV 192 /* RO */
#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
#define EXT_CSD_S_A_TIMEOUT 217 #define EXT_CSD_S_A_TIMEOUT 217