From 3f645679804d6734c58a1d56d82c3436f9911ab0 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 23 Aug 2022 14:12:06 +0100 Subject: [PATCH] Revert "mmc: block: Don't do single-sector reads during recovery" This reverts commit dff79e31c3b05a50f725442c1fc19a6194491523. --- drivers/mmc/core/block.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 78184372..a992dd6 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -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); -- 2.7.4