Commit 203fc317 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "MMC core:

   - Fix error propagation for the non-block-device I/O paths

  MMC host:

   - sdhci-cadence: Fix an error path during probe

   - sdhci-esdhc-imx: Fix support for the 'no-mmc-hs400' DT property"

* tag 'mmc-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works
  mmc: sdhci-cadence: Fix an error handling path in sdhci_cdns_probe()
  mmc: block: ensure error propagation for non-blk
parents 9d646009 81dce149

drivers/mmc/core/block.c

+5 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ static ssize_t power_ro_lock_store(struct device *dev, 
		goto out_put;

	}

	req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_BOOT_WP;

	req_to_mmc_queue_req(req)->drv_op_result = -EIO;

	blk_execute_rq(req, false);

	ret = req_to_mmc_queue_req(req)->drv_op_result;

	blk_mq_free_request(req);
@@ -651,6 +652,7 @@ static int mmc_blk_ioctl_cmd(struct mmc_blk_data *md, 
	idatas[0] = idata;

	req_to_mmc_queue_req(req)->drv_op =

		rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL;

	req_to_mmc_queue_req(req)->drv_op_result = -EIO;

	req_to_mmc_queue_req(req)->drv_op_data = idatas;

	req_to_mmc_queue_req(req)->ioc_count = 1;

	blk_execute_rq(req, false);
@@ -722,6 +724,7 @@ static int mmc_blk_ioctl_multi_cmd(struct mmc_blk_data *md, 
	}

	req_to_mmc_queue_req(req)->drv_op =

		rpmb ? MMC_DRV_OP_IOCTL_RPMB : MMC_DRV_OP_IOCTL;

	req_to_mmc_queue_req(req)->drv_op_result = -EIO;

	req_to_mmc_queue_req(req)->drv_op_data = idata;

	req_to_mmc_queue_req(req)->ioc_count = n;

	blk_execute_rq(req, false);
@@ -2806,6 +2809,7 @@ static int mmc_dbg_card_status_get(void *data, u64 *val) 
	if (IS_ERR(req))

		return PTR_ERR(req);

	req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_CARD_STATUS;

	req_to_mmc_queue_req(req)->drv_op_result = -EIO;

	blk_execute_rq(req, false);

	ret = req_to_mmc_queue_req(req)->drv_op_result;

	if (ret >= 0) {
@@ -2844,6 +2848,7 @@ static int mmc_ext_csd_open(struct inode *inode, struct file *filp) 
		goto out_free;

	}

	req_to_mmc_queue_req(req)->drv_op = MMC_DRV_OP_GET_EXT_CSD;

	req_to_mmc_queue_req(req)->drv_op_result = -EIO;

	req_to_mmc_queue_req(req)->drv_op_data = &ext_csd;

	blk_execute_rq(req, false);

	err = req_to_mmc_queue_req(req)->drv_op_result;

drivers/mmc/host/sdhci-cadence.c

+5 −3
Original line number Diff line number Diff line
@@ -540,9 +540,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev) 


	if (host->mmc->caps & MMC_CAP_HW_RESET) {

		priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, NULL);

		if (IS_ERR(priv->rst_hw))

			return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),

		if (IS_ERR(priv->rst_hw)) {

			ret = dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),

					    "reset controller error\n");

			goto free;

		}

		if (priv->rst_hw)

			host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;

	}

drivers/mmc/host/sdhci-esdhc-imx.c

+10 −8
Original line number Diff line number Diff line
@@ -1634,6 +1634,10 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, 
	if (ret)

		return ret;



	/* HS400/HS400ES require 8 bit bus */

	if (!(host->mmc->caps & MMC_CAP_8_BIT_DATA))

		host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES);



	if (mmc_gpio_get_cd(host->mmc) >= 0)

		host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
@@ -1724,10 +1728,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
		host->mmc_host_ops.init_card = usdhc_init_card;

	}



	err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data);

	if (err)

		goto disable_ahb_clk;



	if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)

		sdhci_esdhc_ops.platform_execute_tuning =

					esdhc_executing_tuning;
@@ -1735,15 +1735,13 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	if (imx_data->socdata->flags & ESDHC_FLAG_ERR004536)

		host->quirks |= SDHCI_QUIRK_BROKEN_ADMA;



	if (host->mmc->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400)

	if (imx_data->socdata->flags & ESDHC_FLAG_HS400)

		host->mmc->caps2 |= MMC_CAP2_HS400;



	if (imx_data->socdata->flags & ESDHC_FLAG_BROKEN_AUTO_CMD23)

		host->quirks2 |= SDHCI_QUIRK2_ACMD23_BROKEN;



	if (host->mmc->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) {

	if (imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) {

		host->mmc->caps2 |= MMC_CAP2_HS400_ES;

		host->mmc_host_ops.hs400_enhanced_strobe =

					esdhc_hs400_enhanced_strobe;
@@ -1765,6 +1763,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
			goto disable_ahb_clk;

	}



	err = sdhci_esdhc_imx_probe_dt(pdev, host, imx_data);

	if (err)

		goto disable_ahb_clk;



	sdhci_esdhc_imx_hwinit(host);



	err = sdhci_add_host(host);