Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c65b28 authored by David Vrabel's avatar David Vrabel Committed by Linus Torvalds
Browse files

mmc: avoid getting CID on SDIO-only cards 



The introduction of support for SD combo cards breaks the initialization
of all CSR SDIO chips.  The GO_IDLE (CMD0) in mmc_sd_get_cid() causes CSR
chips to be reset (this is non-standard behavior).

When initializing an SDIO card check for a combo card by using the memory
present bit in the R4 response to IO_SEND_OP_COND (CMD5).  This avoids the
call to mmc_sd_get_cid() on an SDIO-only card.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Acked-by: default avatarMichal Mirolaw <mirq-linux@rere.qmqm.pl>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 152831be

drivers/mmc/core/sdio.c

+2 −3
Original line number Diff line number Diff line
@@ -362,9 +362,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, 
		goto err;

	}



	err = mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid);



	if (!err) {

	if (ocr & R4_MEMORY_PRESENT

	    && mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid) == 0) {

		card->type = MMC_TYPE_SD_COMBO;



		if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||

include/linux/mmc/sdio.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
 *      [8:0] Byte/block count

 */



#define R4_MEMORY_PRESENT (1 << 27)



/*

  SDIO status in R5

  Type