Revert "mmc: block: Don't do single-sector reads during recovery"
authorDom Cobley <popcornmix@gmail.com>
Tue, 23 Aug 2022 13:12:06 +0000 (14:12 +0100)
committerDom Cobley <popcornmix@gmail.com>
Tue, 23 Aug 2022 13:12:06 +0000 (14:12 +0100)
This reverts commit dff79e31c3b05a50f725442c1fc19a6194491523.

drivers/mmc/core/block.c

index 7818437..a992dd6 100644 (file)
@@ -1870,11 +1870,7 @@ static void mmc_blk_mq_rw_recovery(struct mmc_queue *mq, struct request *req)
        }
 
        /* FIXME: Missing single sector read for large sector size */
-       /*
-        * XXX: don't do single-sector reads, as it leaks a SG DMA
-        * mapping when reusing the still-pending req.
-        */
-       if (0 && !mmc_large_sector(card) && rq_data_dir(req) == READ &&
+       if (!mmc_large_sector(card) && rq_data_dir(req) == READ &&
            brq->data.blocks > 1) {
                /* Read one sector at a time */
                mmc_blk_read_single(mq, req);