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

Commit b5b4ff0a authored by Shawn Lin's avatar Shawn Lin Committed by Ulf Hansson
Browse files

mmc: block: skip trim for some kingston eMMCs 



For some mass production of kingston eMMCs which adopt Phison's
firmware will meet an unrecoverable data conrruption occasionally
if performing trim due to a firmware bug confirmed by vendor. We
found it on Intel-C3230RK platform. So we add fixup of broken trim
for it.

Signed-off-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e31e67cf

drivers/mmc/card/block.c

+10 −0
Original line number Diff line number Diff line
@@ -2389,6 +2389,7 @@ static int mmc_add_disk(struct mmc_blk_data *md) 
#define CID_MANFID_TOSHIBA	0x11

#define CID_MANFID_MICRON	0x13

#define CID_MANFID_SAMSUNG	0x15

#define CID_MANFID_KINGSTON	0x70



static const struct mmc_fixup blk_fixups[] =

{
@@ -2451,6 +2452,15 @@ static const struct mmc_fixup blk_fixups[] = 
	MMC_FIXUP("VZL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),



	/*

	 *  On Some Kingston eMMCs, performing trim can result in

	 *  unrecoverable data conrruption occasionally due to a firmware bug.

	 */

	MMC_FIXUP("V10008", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_TRIM_BROKEN),

	MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_TRIM_BROKEN),



	END_FIXUP

};

drivers/mmc/core/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2250,7 +2250,8 @@ EXPORT_SYMBOL(mmc_can_erase); 


int mmc_can_trim(struct mmc_card *card)

{

	if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN)

	if ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN) &&

	    (!(card->quirks & MMC_QUIRK_TRIM_BROKEN)))

		return 1;

	return 0;

}

include/linux/mmc/card.h

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ struct mmc_card { 
#define MMC_QUIRK_LONG_READ_TIME (1<<9)		/* Data read time > CSD says */

#define MMC_QUIRK_SEC_ERASE_TRIM_BROKEN (1<<10)	/* Skip secure for erase/trim */

#define MMC_QUIRK_BROKEN_IRQ_POLLING	(1<<11)	/* Polling SDIO_CCCR_INTx could create a fake interrupt */

#define MMC_QUIRK_TRIM_BROKEN	(1<<12)		/* Skip trim */





	unsigned int		erase_size;	/* erase size in sectors */

 	unsigned int		erase_shift;	/* if erase unit is power 2 */