Commit 568099a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:
 "MMC core:

   - Fix partition switch time for eMMC

  MMC host:

   - mmci: Enforce R1B response to fix busy detection for
     the stm32 variants

   - cqhci: Fix crash when removing mmc module/card"

* tag 'mmc-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: cqhci: Fix random crash when remove mmc module/card
  mmc: core: Fix partition switch time for eMMC
  mmc: mmci: Add MMC_CAP_NEED_RSP_BUSY for the stm32 variants
parents 270c0551 f06391c4

drivers/mmc/core/bus.c

+5 −6
Original line number Diff line number Diff line
@@ -399,11 +399,6 @@ void mmc_remove_card(struct mmc_card *card) 
	mmc_remove_card_debugfs(card);

#endif



	if (host->cqe_enabled) {

		host->cqe_ops->cqe_disable(host);

		host->cqe_enabled = false;

	}



	if (mmc_card_present(card)) {

		if (mmc_host_is_spi(card->host)) {

			pr_info("%s: SPI card removed\n",
@@ -416,6 +411,10 @@ void mmc_remove_card(struct mmc_card *card) 
		of_node_put(card->dev.of_node);

	}



	put_device(&card->dev);

	if (host->cqe_enabled) {

		host->cqe_ops->cqe_disable(host);

		host->cqe_enabled = false;

	}



	put_device(&card->dev);

}

drivers/mmc/core/mmc.c

+11 −4
Original line number Diff line number Diff line
@@ -423,10 +423,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) 


		/* EXT_CSD value is in units of 10ms, but we store in ms */

		card->ext_csd.part_time = 10 * ext_csd[EXT_CSD_PART_SWITCH_TIME];

		/* Some eMMC set the value too low so set a minimum */

		if (card->ext_csd.part_time &&

		    card->ext_csd.part_time < MMC_MIN_PART_SWITCH_TIME)

			card->ext_csd.part_time = MMC_MIN_PART_SWITCH_TIME;



		/* Sleep / awake timeout in 100ns units */

		if (sa_shift > 0 && sa_shift <= 0x17)
@@ -616,6 +612,17 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) 
		card->ext_csd.data_sector_size = 512;

	}



	/*

	 * GENERIC_CMD6_TIME is to be used "unless a specific timeout is defined

	 * when accessing a specific field", so use it here if there is no

	 * PARTITION_SWITCH_TIME.

	 */

	if (!card->ext_csd.part_time)

		card->ext_csd.part_time = card->ext_csd.generic_cmd6_time;

	/* Some eMMC set the value too low so set a minimum */

	if (card->ext_csd.part_time < MMC_MIN_PART_SWITCH_TIME)

		card->ext_csd.part_time = MMC_MIN_PART_SWITCH_TIME;



	/* eMMC v5 or later */

	if (card->ext_csd.rev >= 7) {

		memcpy(card->ext_csd.fwrev, &ext_csd[EXT_CSD_FIRMWARE_VERSION],

drivers/mmc/host/mmci.c

+9 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,11 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c) 
		if (!cmd->busy_timeout)

			cmd->busy_timeout = 10 * MSEC_PER_SEC;



		if (cmd->busy_timeout > host->mmc->max_busy_timeout)

			clks = (unsigned long long)host->mmc->max_busy_timeout * host->cclk;

		else

			clks = (unsigned long long)cmd->busy_timeout * host->cclk;



		do_div(clks, MSEC_PER_SEC);

		writel_relaxed(clks, host->base + MMCIDATATIMER);

	}
@@ -2151,6 +2155,10 @@ static int mmci_probe(struct amba_device *dev, 
		mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;

	}



	/* Variants with mandatory busy timeout in HW needs R1B responses. */

	if (variant->busy_timeout)

		mmc->caps |= MMC_CAP_NEED_RSP_BUSY;



	/* Prepare a CMD12 - needed to clear the DPSM on some variants. */

	host->stop_abort.opcode = MMC_STOP_TRANSMISSION;

	host->stop_abort.arg = 0;