Commit d3656129 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull MMC fixes from Ulf Hansson:
 "MMC core:

   - Fix HW busy detection support for host controllers requiring the
     MMC_RSP_BUSY response flag (R1B) to be set for the command. In
     particular for CMD6 (eMMC), erase/trim/discard (SD/eMMC) and CMD5
     (eMMC sleep).

  MMC host:

   - sdhci-omap|tegra: Fix support for HW busy detection"

* tag 'mmc-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command
  mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard
  mmc: core: Allow host controllers to require R1B for CMD6
parents ddd2b85f 18d20046
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -1732,8 +1732,11 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
	 * the erase operation does not exceed the max_busy_timeout, we should
	 * the erase operation does not exceed the max_busy_timeout, we should
	 * use R1B response. Or we need to prevent the host from doing hw busy
	 * use R1B response. Or we need to prevent the host from doing hw busy
	 * detection, which is done by converting to a R1 response instead.
	 * detection, which is done by converting to a R1 response instead.
	 * Note, some hosts requires R1B, which also means they are on their own
	 * when it comes to deal with the busy timeout.
	 */
	 */
	if (card->host->max_busy_timeout &&
	if (!(card->host->caps & MMC_CAP_NEED_RSP_BUSY) &&
	    card->host->max_busy_timeout &&
	    busy_timeout > card->host->max_busy_timeout) {
	    busy_timeout > card->host->max_busy_timeout) {
		cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
		cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
	} else {
	} else {
+5 −2
Original line number Original line Diff line number Diff line
@@ -1910,9 +1910,12 @@ static int mmc_sleep(struct mmc_host *host)
	 * If the max_busy_timeout of the host is specified, validate it against
	 * If the max_busy_timeout of the host is specified, validate it against
	 * the sleep cmd timeout. A failure means we need to prevent the host
	 * the sleep cmd timeout. A failure means we need to prevent the host
	 * from doing hw busy detection, which is done by converting to a R1
	 * from doing hw busy detection, which is done by converting to a R1
	 * response instead of a R1B.
	 * response instead of a R1B. Note, some hosts requires R1B, which also
	 * means they are on their own when it comes to deal with the busy
	 * timeout.
	 */
	 */
	if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout)) {
	if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) && host->max_busy_timeout &&
	    (timeout_ms > host->max_busy_timeout)) {
		cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
		cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
	} else {
	} else {
		cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
		cmd.flags = MMC_RSP_R1B | MMC_CMD_AC;
+4 −2
Original line number Original line Diff line number Diff line
@@ -542,9 +542,11 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
	 * If the max_busy_timeout of the host is specified, make sure it's
	 * If the max_busy_timeout of the host is specified, make sure it's
	 * enough to fit the used timeout_ms. In case it's not, let's instruct
	 * enough to fit the used timeout_ms. In case it's not, let's instruct
	 * the host to avoid HW busy detection, by converting to a R1 response
	 * the host to avoid HW busy detection, by converting to a R1 response
	 * instead of a R1B.
	 * instead of a R1B. Note, some hosts requires R1B, which also means
	 * they are on their own when it comes to deal with the busy timeout.
	 */
	 */
	if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout))
	if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) && host->max_busy_timeout &&
	    (timeout_ms > host->max_busy_timeout))
		use_r1b_resp = false;
		use_r1b_resp = false;


	cmd.opcode = MMC_SWITCH;
	cmd.opcode = MMC_SWITCH;
+3 −0
Original line number Original line Diff line number Diff line
@@ -1192,6 +1192,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)
	if (of_find_property(dev->of_node, "dmas", NULL))
	if (of_find_property(dev->of_node, "dmas", NULL))
		sdhci_switch_external_dma(host, true);
		sdhci_switch_external_dma(host, true);


	/* R1B responses is required to properly manage HW busy detection. */
	mmc->caps |= MMC_CAP_NEED_RSP_BUSY;

	ret = sdhci_setup_host(host);
	ret = sdhci_setup_host(host);
	if (ret)
	if (ret)
		goto err_put_sync;
		goto err_put_sync;
+3 −0
Original line number Original line Diff line number Diff line
@@ -1552,6 +1552,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
	if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50)
	if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50)
		host->mmc->caps |= MMC_CAP_1_8V_DDR;
		host->mmc->caps |= MMC_CAP_1_8V_DDR;


	/* R1B responses is required to properly manage HW busy detection. */
	host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY;

	tegra_sdhci_parse_dt(host);
	tegra_sdhci_parse_dt(host);


	tegra_host->power_gpio = devm_gpiod_get_optional(&pdev->dev, "power",
	tegra_host->power_gpio = devm_gpiod_get_optional(&pdev->dev, "power",
Loading