Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ea07abb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 60bd7be7 4f666675

drivers/mmc/core/block.c

+10 −0
Original line number Diff line number Diff line
@@ -1370,6 +1370,16 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, 
		brq->data.blocks = card->host->max_blk_count;



	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

drivers/net/wireless/marvell/libertas/if_sdio.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

		}