Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"A couple of MMC fixes:
- fix use of uninitialized drv_typ variable
- apply NO_CMD23 quirk to some specific SD cards to make them work"
* tag 'mmc-v4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: core: apply NO_CMD23 quirk to some specific cards
mmc: core: properly init drv_type
+11
-1
+2
drivers/mmc/core/card.h
+2
drivers/mmc/core/card.h
···
75
75
#define EXT_CSD_REV_ANY (-1u)
76
76
77
77
#define CID_MANFID_SANDISK 0x2
78
+
#define CID_MANFID_ATP 0x9
78
79
#define CID_MANFID_TOSHIBA 0x11
79
80
#define CID_MANFID_MICRON 0x13
80
81
#define CID_MANFID_SAMSUNG 0x15
82
+
#define CID_MANFID_APACER 0x27
81
83
#define CID_MANFID_KINGSTON 0x70
82
84
#define CID_MANFID_HYNIX 0x90
83
85
+1
-1
drivers/mmc/core/mmc.c
+1
-1
drivers/mmc/core/mmc.c
···
1290
1290
1291
1291
static void mmc_select_driver_type(struct mmc_card *card)
1292
1292
{
1293
-
int card_drv_type, drive_strength, drv_type;
1293
+
int card_drv_type, drive_strength, drv_type = 0;
1294
1294
int fixed_drv_type = card->host->fixed_drv_type;
1295
1295
1296
1296
card_drv_type = card->ext_csd.raw_driver_strength |
+8
drivers/mmc/core/quirks.h
+8
drivers/mmc/core/quirks.h
···
53
53
MMC_QUIRK_BLK_NO_CMD23),
54
54
55
55
/*
56
+
* Some SD cards lockup while using CMD23 multiblock transfers.
57
+
*/
58
+
MMC_FIXUP("AF SD", CID_MANFID_ATP, CID_OEMID_ANY, add_quirk_sd,
59
+
MMC_QUIRK_BLK_NO_CMD23),
60
+
MMC_FIXUP("APUSD", CID_MANFID_APACER, 0x5048, add_quirk_sd,
61
+
MMC_QUIRK_BLK_NO_CMD23),
62
+
63
+
/*
56
64
* Some MMC cards need longer data read timeout than indicated in CSD.
57
65
*/
58
66
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,