[PATCHv2] mmc: core: Fix ambiguous TRIM and DISCARD arg

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

Fixes: b3bf915308ca ("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>
---
-v2: Avoid line break
Previously submitted as mmc: core: Do not require secure trim for discard
 drivers/mmc/core/core.c | 9 +++++++--
 include/linux/mmc/mmc.h | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

On Thu, 17 Nov 2022 at 15:42, Christian Löhle <CLoehle@hyperstone.com> wrote:
>
> Clean up the MMC_TRIM_ARGS define that became ambiguous with
> DISCARD introduction.
> While at it fix one usage where MMC_TRIM_ARGS falsely included
> DISCARD, too.
>
> Fixes: b3bf915308ca ("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>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
> -v2: Avoid line break
> Previously submitted as mmc: core: Do not require secure trim for discard
>  drivers/mmc/core/core.c | 9 +++++++--
>  include/linux/mmc/mmc.h | 2 +-
>  2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index 95fa8fb1d45f..77d4dba462a2 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1478,6 +1478,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)
>  {
> @@ -1760,7 +1765,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;
>
> @@ -1790,7 +1795,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 9c50bc40f8ff..6f7993803ee7 100644
> --- a/include/linux/mmc/mmc.h
> +++ b/include/linux/mmc/mmc.h
> @@ -451,7 +451,7 @@ static inline bool mmc_ready_for_data(u32 status)
>  #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))
>
> --
> 2.37.3
>
> Hyperstone GmbH | Reichenaustr. 39a  | 78467 Konstanz
> Managing Director: Dr. Jan Peter Berns.
> Commercial register of local courts: Freiburg HRB381782
>