Commit 2df2adc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.1-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "MMC core:
   - Fix ambiguous TRIM and DISCARD args
   - Fix removal of debugfs file for mmc_test

  MMC host:
   - mtk-sd: Add missing clk_disable_unprepare() in an error path
   - sdhci: Fix I/O voltage switch delay for UHS-I SD cards
   - sdhci-esdhc-imx: Fix CQHCI exit halt state check
   - sdhci-sprd: Fix voltage switch"

* tag 'mmc-v6.1-rc5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-sprd: Fix no reset data and command after voltage switch
  mmc: sdhci: Fix voltage switch delay
  mmc: mtk-sd: Fix missing clk_disable_unprepare in msdc_of_clock_parse()
  mmc: mmc_test: Fix removal of debugfs file
  mmc: sdhci-esdhc-imx: correct CQHCI exit halt state check
  mmc: core: Fix ambiguous TRIM and DISCARD arg
parents f66f62f8 dd30dcfa

drivers/mmc/core/core.c

+7 −2
Original line number Diff line number Diff line
@@ -1484,6 +1484,11 @@ void mmc_init_erase(struct mmc_card *card) 
		card->pref_erase = 0;

}



static bool is_trim_arg(unsigned int arg)

{

	return (arg & MMC_TRIM_OR_DISCARD_ARGS) && arg != MMC_DISCARD_ARG;

}



static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,

				          unsigned int arg, unsigned int qty)

{
@@ -1766,7 +1771,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, 
	    !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN))

		return -EOPNOTSUPP;



	if (mmc_card_mmc(card) && (arg & MMC_TRIM_ARGS) &&

	if (mmc_card_mmc(card) && is_trim_arg(arg) &&

	    !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN))

		return -EOPNOTSUPP;
@@ -1796,7 +1801,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, 
	 * identified by the card->eg_boundary flag.

	 */

	rem = card->erase_size - (from % card->erase_size);

	if ((arg & MMC_TRIM_ARGS) && (card->eg_boundary) && (nr > rem)) {

	if ((arg & MMC_TRIM_OR_DISCARD_ARGS) && card->eg_boundary && nr > rem) {

		err = mmc_do_erase(card, from, from + rem - 1, arg);

		from += rem;

		if ((err) || (to <= from))

drivers/mmc/core/mmc_test.c

+2 −1
Original line number Diff line number Diff line
@@ -3179,7 +3179,8 @@ static int __mmc_test_register_dbgfs_file(struct mmc_card *card, 
	struct mmc_test_dbgfs_file *df;



	if (card->debugfs_root)

		debugfs_create_file(name, mode, card->debugfs_root, card, fops);

		file = debugfs_create_file(name, mode, card->debugfs_root,

					   card, fops);



	df = kmalloc(sizeof(*df), GFP_KERNEL);

	if (!df) {

drivers/mmc/host/mtk-sd.c

+2 −4
Original line number Diff line number Diff line
@@ -2588,13 +2588,11 @@ static int msdc_of_clock_parse(struct platform_device *pdev, 
			return PTR_ERR(host->src_clk_cg);

	}



	host->sys_clk_cg = devm_clk_get_optional(&pdev->dev, "sys_cg");

	/* If present, always enable for this clock gate */

	host->sys_clk_cg = devm_clk_get_optional_enabled(&pdev->dev, "sys_cg");

	if (IS_ERR(host->sys_clk_cg))

		host->sys_clk_cg = NULL;



	/* If present, always enable for this clock gate */

	clk_prepare_enable(host->sys_clk_cg);



	host->bulk_clks[0].id = "pclk_cg";

	host->bulk_clks[1].id = "axi_cg";

	host->bulk_clks[2].id = "ahb_cg";

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

+1 −1
Original line number Diff line number Diff line
@@ -1512,7 +1512,7 @@ static void esdhc_cqe_enable(struct mmc_host *mmc) 
	 * system resume back.

	 */

	cqhci_writel(cq_host, 0, CQHCI_CTL);

	if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT)

	if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT)

		dev_err(mmc_dev(host->mmc),

			"failed to exit halt state when enable CQE\n");

drivers/mmc/host/sdhci-sprd.c

+3 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) 
	}



	if (IS_ERR(sprd_host->pinctrl))

		return 0;

		goto reset;



	switch (ios->signal_voltage) {

	case MMC_SIGNAL_VOLTAGE_180:
@@ -498,6 +498,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) 


	/* Wait for 300 ~ 500 us for pin state stable */

	usleep_range(300, 500);



reset:

	sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);



	return 0;