Commit 0579ac48 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.11-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.12.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 1645e815 469e5e47

drivers/mmc/core/quirks.h

+13 −9
Original line number Diff line number Diff line
@@ -15,6 +15,19 @@ 


#include "card.h"



static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] = {

	/*

	 * Kingston Canvas Go! Plus microSD cards never finish SD cache flush.

	 * This has so far only been observed on cards from 11/2019, while new

	 * cards from 2023/05 do not exhibit this behavior.

	 */

	_FIXUP_EXT("SD64G", CID_MANFID_KINGSTON_SD, 0x5449, 2019, 11,

		   0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd,

		   MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY),



	END_FIXUP

};



static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {

#define INAND_CMD38_ARG_EXT_CSD  113

#define INAND_CMD38_ARG_ERASE    0x00
@@ -53,15 +66,6 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { 
	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_BLK_NO_CMD23),



	/*

	 * Kingston Canvas Go! Plus microSD cards never finish SD cache flush.

	 * This has so far only been observed on cards from 11/2019, while new

	 * cards from 2023/05 do not exhibit this behavior.

	 */

	_FIXUP_EXT("SD64G", CID_MANFID_KINGSTON_SD, 0x5449, 2019, 11,

		   0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd,

		   MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY),



	/*

	 * Some SD cards lockup while using CMD23 multiblock transfers.

	 */

drivers/mmc/core/sd.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "host.h"

#include "bus.h"

#include "mmc_ops.h"

#include "quirks.h"

#include "sd.h"

#include "sd_ops.h"
@@ -1475,6 +1476,9 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, 
			goto free_card;

	}



	/* Apply quirks prior to card setup */

	mmc_fixup_device(card, mmc_sd_fixups);



	err = mmc_sd_setup_card(host, card, oldcard != NULL);

	if (err)

		goto free_card;