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: 91fc764d7059 ("mmc: core: new discard feature support at eMMC v4.5")
Signed-off-by: Christian Loehle <cloehle@hyperstone.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/11376b5714964345908f3990f17e0701@hyperstone.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 5ff4f179204a425fe9912617a38efa42846b53a6..7caf9ef27d227256e2c251320e9bf5c3adbd42a2 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -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))

diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 897a87c4c8275f7187a3e8dd0c1cd070435f0d73..77192c3fc544772a253c8a7c41caa400bf321dae 100644 (file)
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -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))