Merge tag 'mmc-v4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Ulf writes:
   "MMC core:
    - Avoid fragile multiblock reads for the last sector in SPI mode
    WIFI/SDIO:
    - libertas: Fixup suspend sequence for the SDIO card"

* tag 'mmc-v4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  libertas: call into generic suspend code before turning off power
  mmc: block: avoid multiblock reads for the last sector in SPI mode

2 files changed, 14 insertions, 0 deletions

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index a0b9102c4c6e..e201ccb3fda4 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1371,6 +1371,16 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq,
 
         if (brq->data.blocks > 1) {
                 /*
+                 * Some SD cards in SPI mode return a CRC error or even lock up
+                 * completely when trying to read the last block using a
+                 * multiblock read command.
+                 */
+                if (mmc_host_is_spi(card->host) && (rq_data_dir(req) == READ) &&
+                    (blk_rq_pos(req) + blk_rq_sectors(req) ==
+                     get_capacity(md->disk)))
+                        brq->data.blocks--;
+
+                /*
                  * After a read error, we redo the request one sector
                  * at a time in order to accurately determine which
                  * sectors can be read successfully.
diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index 43743c26c071..39bf85d0ade0 100644
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -1317,6 +1317,10 @@ static int if_sdio_suspend(struct device *dev)
         if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
                 dev_info(dev, "Suspend without wake params -- powering down card\n");
                 if (priv->fw_ready) {
+                        ret = lbs_suspend(priv);
+                        if (ret)
+                                return ret;
+
                         priv->power_up_on_resume = true;
                         if_sdio_power_off(card);
                 }