git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 73ddacb555c5ef1f063f44b4ec3268da899ff8b5 Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.com>
   3 Date: Fri, 18 Oct 2024 13:11:11 +0100
   4 Subject: [PATCH 1334/1350] mmc: block: disable CQ on SD cards when doing
   5  non-Discard erase
   6
   7 Only CMD38 with Arg=0x1 (Discard) is supported when in CQ mode, so
   8 turn it off before issuing a non-discard erase op.
   9
  10 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  11 ---
  12  drivers/mmc/core/block.c | 19 +++++++++++++++++++
  13  1 file changed, 19 insertions(+)
  14
  15 --- a/drivers/mmc/core/block.c
  16 +++ b/drivers/mmc/core/block.c
  17 @@ -1177,12 +1177,26 @@ static void mmc_blk_issue_erase_rq(struc
  18         unsigned int from, nr;
  19         int err = 0;
  20         blk_status_t status = BLK_STS_OK;
  21 +       bool restart_cmdq = false;
  22
  23         if (!mmc_can_erase(card)) {
  24                 status = BLK_STS_NOTSUPP;
  25                 goto fail;
  26         }
  27
  28 +       /*
  29 +        * Only Discard ops are supported with SD cards in CQ mode
  30 +        * (SD Physical Spec v9.00 4.19.2)
  31 +        */
  32 +       if (mmc_card_sd(card) && card->ext_csd.cmdq_en && erase_arg != SD_DISCARD_ARG) {
  33 +               restart_cmdq = true;
  34 +               err = mmc_sd_cmdq_disable(card);
  35 +               if (err) {
  36 +                       status = BLK_STS_IOERR;
  37 +                       goto fail;
  38 +               }
  39 +       }
  40 +
  41         from = blk_rq_pos(req);
  42         nr = blk_rq_sectors(req);
  43
  44 @@ -1203,6 +1217,11 @@ static void mmc_blk_issue_erase_rq(struc
  45                 status = BLK_STS_IOERR;
  46         else
  47                 mmc_blk_reset_success(md, type);
  48 +
  49 +       if (restart_cmdq)
  50 +               err = mmc_sd_cmdq_enable(card);
  51 +       if (err)
  52 +               status = BLK_STS_IOERR;
  53  fail:
  54         blk_mq_end_request(req, status);
  55  }