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

Commit 3a8ed368 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "MMC core:
   - Fix NULL ptr crash for a special test case
   - Align max segment size with logical block size to prevent bugs in
     v5.1-rc1.

  MMC host:
   - cqhci: Minor fixes
   - tmio: Prevent interrupt storm
   - tmio: Fixup SD/MMC card initialization
   - spi: Allow card to be detected during probe
   - sdhci-esdhc-imx: Fixup fix for ERR004536"

* tag 'mmc-v5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-esdhc-imx: correct the fix of ERR004536
  mmc: core: align max segment size with logical block size
  mmc: cqhci: Fix a tiny potential memory leak on error condition
  mmc: cqhci: fix space allocated for transfer descriptor
  mmc: core: Fix NULL ptr crash from mmc_should_fail_request
  mmc: tmio: fix access width of Block Count Register
  mmc: tmio_mmc_core: don't claim spurious interrupts
  mmc: spi: Fix card detection during probe
parents 3f25a599 e30be063

drivers/mmc/core/block.c

+0 −6
Original line number Diff line number Diff line
@@ -2380,12 +2380,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
	snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),

		 "mmcblk%u%s", card->host->index, subname ? subname : "");



	if (mmc_card_mmc(card))

		blk_queue_logical_block_size(md->queue.queue,

					     card->ext_csd.data_sector_size);

	else

		blk_queue_logical_block_size(md->queue.queue, 512);



	set_capacity(md->disk, size);



	if (mmc_host_cmd23(card->host)) {

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void mmc_should_fail_request(struct mmc_host *host, 
	if (!data)

		return;



	if (cmd->error || data->error ||

	if ((cmd && cmd->error) || data->error ||

	    !should_fail(&host->fail_mmc_request, data->blksz * data->blocks))

		return;

drivers/mmc/core/queue.c

+8 −1
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card) 
{

	struct mmc_host *host = card->host;

	u64 limit = BLK_BOUNCE_HIGH;

	unsigned block_size = 512;



	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)

		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;
@@ -368,7 +369,13 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card) 
	blk_queue_max_hw_sectors(mq->queue,

		min(host->max_blk_count, host->max_req_size / 512));

	blk_queue_max_segments(mq->queue, host->max_segs);

	blk_queue_max_segment_size(mq->queue, host->max_seg_size);



	if (mmc_card_mmc(card))

		block_size = card->ext_csd.data_sector_size;



	blk_queue_logical_block_size(mq->queue, block_size);

	blk_queue_max_segment_size(mq->queue,

			round_down(host->max_seg_size, block_size));



	INIT_WORK(&mq->recovery_work, mmc_mq_recovery_handler);

	INIT_WORK(&mq->complete_work, mmc_blk_mq_complete_work);

drivers/mmc/host/cqhci.c

+11 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host) 
	cq_host->desc_size = cq_host->slot_sz * cq_host->num_slots;



	cq_host->data_size = cq_host->trans_desc_len * cq_host->mmc->max_segs *

		(cq_host->num_slots - 1);

		cq_host->mmc->cqe_qdepth;



	pr_debug("%s: cqhci: desc_size: %zu data_sz: %zu slot-sz: %d\n",

		 mmc_hostname(cq_host->mmc), cq_host->desc_size, cq_host->data_size,
@@ -217,12 +217,21 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host) 
						 cq_host->desc_size,

						 &cq_host->desc_dma_base,

						 GFP_KERNEL);

	if (!cq_host->desc_base)

		return -ENOMEM;



	cq_host->trans_desc_base = dmam_alloc_coherent(mmc_dev(cq_host->mmc),

					      cq_host->data_size,

					      &cq_host->trans_desc_dma_base,

					      GFP_KERNEL);

	if (!cq_host->desc_base || !cq_host->trans_desc_base)

	if (!cq_host->trans_desc_base) {

		dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->desc_size,

				   cq_host->desc_base,

				   cq_host->desc_dma_base);

		cq_host->desc_base = NULL;

		cq_host->desc_dma_base = 0;

		return -ENOMEM;

	}



	pr_debug("%s: cqhci: desc-base: 0x%p trans-base: 0x%p\n desc_dma 0x%llx trans_dma: 0x%llx\n",

		 mmc_hostname(cq_host->mmc), cq_host->desc_base, cq_host->trans_desc_base,

drivers/mmc/host/mmc_spi.c

+1 −0
Original line number Diff line number Diff line
@@ -1450,6 +1450,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
		mmc->caps &= ~MMC_CAP_NEEDS_POLL;

		mmc_gpiod_request_cd_irq(mmc);

	}

	mmc_detect_change(mmc, 0);



	/* Index 1 is write protect/read only */

	status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);