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

Commit 9d9f25c0 authored by Wolfgang Muees's avatar Wolfgang Muees Committed by Pierre Ossman
Browse files

mmc_spi: do not check CID and CSD blocks with CRC16 



Some cards are not able to calculate a valid CRC16 value
for CID and CSD reads (CRC for 512 byte data blocks is OK).
By moving the CRC enable after the read of CID and CSD, these
cards can be used. This patch was tested with a faulty 8 GByte
takeMS Class 6 SDHC card. This patch was suggested by
Pierre Ossman.

Signed-off-by: default avatarWolfgang Muees <wolfgang.mues@auerswald.de>
Signed-off-by: default avatarPierre Ossman <pierre@ossman.eu>
parent 00adadc1

drivers/mmc/core/sd.c

+12 −9
Original line number Diff line number Diff line
@@ -362,15 +362,6 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 
	if (err)

		goto err;



	/*

	 * For SPI, enable CRC as appropriate.

	 */

	if (mmc_host_is_spi(host)) {

		err = mmc_spi_set_crc(host, use_spi_crc);

		if (err)

			goto err;

	}



	/*

	 * Fetch CID from card.

	 */
@@ -457,6 +448,18 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 
			goto free_card;

	}



	/*

	 * For SPI, enable CRC as appropriate.

	 * This CRC enable is located AFTER the reading of the

	 * card registers because some SDHC cards are not able

	 * to provide valid CRCs for non-512-byte blocks.

	 */

	if (mmc_host_is_spi(host)) {

		err = mmc_spi_set_crc(host, use_spi_crc);

		if (err)

			goto free_card;

	}



	/*

	 * Attempt to change to high-speed (if supported)

	 */