2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 049445eb4f74..e85816e1634a 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -792,11 +792,18 @@ static int mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
         unsigned int from, nr, arg;
         int err = 0, type = MMC_BLK_SECDISCARD;
 
-        if (!mmc_can_secure_erase_trim(card)) {
+        if (!(mmc_can_secure_erase_trim(card) || mmc_can_sanitize(card))) {
                 err = -EOPNOTSUPP;
                 goto out;
         }
 
+        /* The sanitize operation is supported at v4.5 only */
+        if (mmc_can_sanitize(card)) {
+                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                                EXT_CSD_SANITIZE_START, 1, 0);
+                goto out;
+        }
+
         from = blk_rq_pos(req);
         nr = blk_rq_sectors(req);
 
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index fed290ecc242..dcad59cbfef1 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -140,7 +140,7 @@ static void mmc_queue_setup_discard(struct request_queue *q,
         /* granularity must not be greater than max. discard */
         if (card->pref_erase > max_discard)
                 q->limits.discard_granularity = 0;
-        if (mmc_can_secure_erase_trim(card))
+        if (mmc_can_secure_erase_trim(card) || mmc_can_sanitize(card))
                 queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, q);
 }