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

Commit 81a3a558 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Revert "mmc: card: Skip secure erase on MoviNAND; causes unrecoverable corruption." 



This reverts commit 1cb34850.

This is a stable backport from a kernel before v3.10 so it
shouldn't be in 3.10 twice. Nothing is broken if we leave it
though because they're just duplicate entries.

Change-Id: If33c067fbcefbcd5a590ee579e0564c54ca792d6
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 0984d32e

drivers/mmc/card/block.c

+0 −22
Original line number Diff line number Diff line
@@ -3146,28 +3146,6 @@ static const struct mmc_fixup blk_fixups[] = 
	MMC_FIXUP("SEM04G", 0x45, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_INAND_DATA_TIMEOUT),



	/*

	 * On these Samsung MoviNAND parts, performing secure erase or

	 * secure trim can result in unrecoverable corruption due to a

	 * firmware bug.

	 */

	MMC_FIXUP("M8G2FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("MAG4FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("MBG8FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("MCGAFA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("VAL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("VYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("KYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),

	MMC_FIXUP("VZL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,

		  MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),



	END_FIXUP

};