1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c2db94dab711..2b4fc2205b53 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -231,6 +231,8 @@ static int mmc_read_ssr(struct mmc_card *card)
 {
         unsigned int au, es, et, eo;
         __be32 *raw_ssr;
+        u32 resp[4] = {};
+        u8 discard_support;
         int i;
 
         if (!(card->csd.cmdclass & CCC_APP_SPEC)) {
@@ -276,7 +278,13 @@ static int mmc_read_ssr(struct mmc_card *card)
                 }
         }
 
-        card->erase_arg = SD_ERASE_ARG;
+        /*
+         * starting SD5.1 discard is supported if DISCARD_SUPPORT (b313) is set
+         */
+        resp[3] = card->raw_ssr[6];
+        discard_support = UNSTUFF_BITS(resp, 313 - 288, 1);
+        card->erase_arg = (card->scr.sda_specx && discard_support) ?
+                            SD_DISCARD_ARG : SD_ERASE_ARG;
 
         return 0;
 }