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

Commit bfdfe86d authored by Christian Löhle's avatar Christian Löhle Committed by Greg Kroah-Hartman
Browse files

mmc: core: Fix ambiguous TRIM and DISCARD arg 



commit 489d144563f23911262a652234b80c70c89c978b upstream.

Clean up the MMC_TRIM_ARGS define that became ambiguous with DISCARD
introduction.  While at it, let's fix one usage where MMC_TRIM_ARGS falsely
included DISCARD too.

Fixes: b3bf9153 ("mmc: core: new discard feature support at eMMC v4.5")
Signed-off-by: default avatarChristian Loehle <cloehle@hyperstone.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/11376b5714964345908f3990f17e0701@hyperstone.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 040d08c9

drivers/mmc/core/core.c

+7 −2
Original line number Diff line number Diff line
@@ -1556,6 +1556,11 @@ void mmc_init_erase(struct mmc_card *card) 
		card->pref_erase = 0;

}



static bool is_trim_arg(unsigned int arg)

{

	return (arg & MMC_TRIM_OR_DISCARD_ARGS) && arg != MMC_DISCARD_ARG;

}



static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,

				          unsigned int arg, unsigned int qty)

{
@@ -1887,7 +1892,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, 
	    !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN))

		return -EOPNOTSUPP;



	if (mmc_card_mmc(card) && (arg & MMC_TRIM_ARGS) &&

	if (mmc_card_mmc(card) && is_trim_arg(arg) &&

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

		return -EOPNOTSUPP;
@@ -1917,7 +1922,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, 
	 * identified by the card->eg_boundary flag.

	 */

	rem = card->erase_size - (from % card->erase_size);

	if ((arg & MMC_TRIM_ARGS) && (card->eg_boundary) && (nr > rem)) {

	if ((arg & MMC_TRIM_OR_DISCARD_ARGS) && card->eg_boundary && nr > rem) {

		err = mmc_do_erase(card, from, from + rem - 1, arg);

		from += rem;

		if ((err) || (to <= from))

include/linux/mmc/mmc.h

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static inline bool mmc_op_multi(u32 opcode) 
#define MMC_SECURE_TRIM1_ARG		0x80000001

#define MMC_SECURE_TRIM2_ARG		0x80008000

#define MMC_SECURE_ARGS			0x80000000

#define MMC_TRIM_ARGS			0x00008001

#define MMC_TRIM_OR_DISCARD_ARGS	0x00008003



#define mmc_driver_type_mask(n)		(1 << (n))