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

Commit d68b4a8f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2c9c6fd9 81a3a558

drivers/mmc/card/block.c

+0 −22
Original line number Diff line number Diff line
@@ -3155,28 +3155,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

};