bcm27xx: switch to kernel v6.1

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.15 / 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index da9c428efb3024dac0dbd187c2adedd2a7dbbf19..5e491a6f5a928a739c3746b91394e156637cf311 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,16 +23,16 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
-@@ -1871,7 +1871,11 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1883,7 +1883,11 @@ static void mmc_blk_mq_rw_recovery(struc
+               return;
        }
  
-       /* FIXME: Missing single sector read for large sector size */
--      if (!mmc_large_sector(card) && rq_data_dir(req) == READ &&
+-      if (rq_data_dir(req) == READ && brq->data.blocks >
 +      /*
 +       * 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 &&
-           brq->data.blocks > 1) {
-               /* Read one sector at a time */
++      if (0 && rq_data_dir(req) == READ && brq->data.blocks >
+                       queue_physical_block_size(mq->queue) >> 9) {
+               /* Read one (native) sector at a time */
                mmc_blk_read_single(mq, req);