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

Commit 3550ccdb authored by Ian Chen's avatar Ian Chen Committed by Chris Ball
Browse files

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

For several MoviNAND eMMC parts, there are known issues with secure
erase and secure trim.  For these specific MoviNAND devices, we skip
these operations.

Specifically, there is a bug in the eMMC firmware that causes
unrecoverable corruption when the MMC is erased with MMC_CAP_ERASE
enabled.

References:

http://forum.xda-developers.com/showthread.php?t=1644364
https://plus.google.com/111398485184813224730/posts/21pTYfTsCkB#111398485184813224730/posts/21pTYfTsCkB



Signed-off-by: default avatarIan Chen <ian.cy.chen@samsung.com>
Reviewed-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: stable <stable@vger.kernel.org> [3.0+]
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9623b5b9

drivers/mmc/card/block.c

+25 −1
Original line number Original line Diff line number Diff line
@@ -1411,7 +1411,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
		/* complete ongoing async transfer before issuing discard */

		/* complete ongoing async transfer before issuing discard */

		if (card->host->areq)

		if (card->host->areq)

			mmc_blk_issue_rw_rq(mq, NULL);

			mmc_blk_issue_rw_rq(mq, NULL);

		if (req->cmd_flags & REQ_SECURE)

		if (req->cmd_flags & REQ_SECURE &&

			!(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN))

			ret = mmc_blk_issue_secdiscard_rq(mq, req);

			ret = mmc_blk_issue_secdiscard_rq(mq, req);

		else

		else

			ret = mmc_blk_issue_discard_rq(mq, req);

			ret = mmc_blk_issue_discard_rq(mq, req);
@@ -1716,6 +1717,7 @@ static int mmc_add_disk(struct mmc_blk_data *md) 
#define CID_MANFID_SANDISK	0x2

#define CID_MANFID_SANDISK	0x2

#define CID_MANFID_TOSHIBA	0x11

#define CID_MANFID_TOSHIBA	0x11

#define CID_MANFID_MICRON	0x13

#define CID_MANFID_MICRON	0x13

#define CID_MANFID_SAMSUNG	0x15





static const struct mmc_fixup blk_fixups[] =

static const struct mmc_fixup blk_fixups[] =

{

{
@@ -1752,6 +1754,28 @@ static const struct mmc_fixup blk_fixups[] = 
	MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,

	MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,

		  MMC_QUIRK_LONG_READ_TIME),

		  MMC_QUIRK_LONG_READ_TIME),





	/*

	 * 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

	END_FIXUP

};

};

include/linux/mmc/card.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -239,6 +239,7 @@ struct mmc_card { 
#define MMC_QUIRK_BLK_NO_CMD23	(1<<7)		/* Avoid CMD23 for regular multiblock */

#define MMC_QUIRK_BLK_NO_CMD23	(1<<7)		/* Avoid CMD23 for regular multiblock */

#define MMC_QUIRK_BROKEN_BYTE_MODE_512 (1<<8)	/* Avoid sending 512 bytes in */

#define MMC_QUIRK_BROKEN_BYTE_MODE_512 (1<<8)	/* Avoid sending 512 bytes in */

#define MMC_QUIRK_LONG_READ_TIME (1<<9)		/* Data read time > CSD says */

#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 */

						/* byte mode */

						/* byte mode */

	unsigned int    poweroff_notify_state;	/* eMMC4.5 notify feature */

	unsigned int    poweroff_notify_state;	/* eMMC4.5 notify feature */

#define MMC_NO_POWER_NOTIFICATION	0

#define MMC_NO_POWER_NOTIFICATION	0