Skip to content

Commit 88ea46b

Browse files
Wolfram Sangstorulf
authored andcommitted
mmc: sdio: fall back to SDIO 1.0 for broken 1.1 cards
I have two SDIO WLAN cards which specify being SDIO Rev. 1.1 cards but their FUNCE tuple reports the smaller size of a Rev 1.0 card. So, enforce 1.0 on these cards to avoid reading the not present registers. They are not really used anyhow. My cards initialize properly after this patch. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Ulf Hansson <[email protected]>
1 parent 5b5fe95 commit 88ea46b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/mmc/core/sdio_cis.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,13 @@ static int cistpl_funce_func(struct mmc_card *card, struct sdio_func *func,
177177
vsn = func->card->cccr.sdio_vsn;
178178
min_size = (vsn == SDIO_SDIO_REV_1_00) ? 28 : 42;
179179

180-
if (size < min_size)
180+
if (size == 28 && vsn == SDIO_SDIO_REV_1_10) {
181+
pr_warn("%s: card has broken SDIO 1.1 CIS, forcing SDIO 1.0\n",
182+
mmc_hostname(card->host));
183+
vsn = SDIO_SDIO_REV_1_00;
184+
} else if (size < min_size) {
181185
return -EINVAL;
186+
}
182187

183188
/* TPLFE_MAX_BLK_SIZE */
184189
func->max_blksize = buf[12] | (buf[13] << 8);

0 commit comments

Comments
 (0)