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

Commit 5204d00f authored by Lukas Czerner's avatar Lukas Czerner Committed by Ulf Hansson
Browse files

mmc: Do not advertise secure discard if it is blacklisted 



Currently when the device secure discard implementation is
blacklisted (MMC_QUIRK_SEC_ERASE_TRIM_BROKEN quirk is set)
instead of secure discard we're going to do normal discard,
which is wrong.

When the secure discard is known to be broken we should just
disallow it entirely and not advertise this functionality to
the user. Fix it.

Also move mmc_fixup_device() in from of mmc_blk_alloc() so we
can get quirks set before we attempt to set queue information.

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6096d7a8

drivers/mmc/card/block.c

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

		if (card->host->areq)

			mmc_blk_issue_rw_rq(mq, NULL);

		if (req->cmd_flags & REQ_SECURE &&

			!(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN))

		if (req->cmd_flags & REQ_SECURE)

			ret = mmc_blk_issue_secdiscard_rq(mq, req);

		else

			ret = mmc_blk_issue_discard_rq(mq, req);
@@ -2432,6 +2431,8 @@ static int mmc_blk_probe(struct mmc_card *card) 
	if (!(card->csd.cmdclass & CCC_BLOCK_READ))

		return -ENODEV;



	mmc_fixup_device(card, blk_fixups);



	md = mmc_blk_alloc(card);

	if (IS_ERR(md))

		return PTR_ERR(md);
@@ -2446,7 +2447,6 @@ static int mmc_blk_probe(struct mmc_card *card) 
		goto out;



	mmc_set_drvdata(card, md);

	mmc_fixup_device(card, blk_fixups);



	if (mmc_add_disk(md))

		goto out;

drivers/mmc/core/core.c

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


int mmc_can_secure_erase_trim(struct mmc_card *card)

{

	if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN)

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

	    !(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN))

		return 1;

	return 0;

}