Commit af4a32ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC fixes from Ulf Hansson:

 - meson-mx-sdio: Fix support for HW busy detection

 - sdhci-msm: Fix support for HW busy detection

 - cqhci: Fix polling loop by converting to readx_poll_timeout()

 - sdhci-xenon: Fix annoying 1.8V regulator warning

 - sdhci-pci: Fix eMMC driver strength for BYT-based controllers

* tag 'mmc-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers
  mmc: sdhci-xenon: fix annoying 1.8V regulator warning
  mmc: sdhci-msm: Enable host capabilities pertains to R1b response
  mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop
  mmc: meson-mx-sdio: remove the broken ->card_busy() op
  mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY
  mmc: core: make mmc_interrupt_hpi() static
parents 1d2cc5ac 1a8eb6b3

drivers/mmc/core/mmc_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ static int mmc_send_hpi_cmd(struct mmc_card *card) 
 *	Issued High Priority Interrupt, and check for card status

 *	until out-of prg-state.

 */

int mmc_interrupt_hpi(struct mmc_card *card)

static int mmc_interrupt_hpi(struct mmc_card *card)

{

	int err;

	u32 status;

drivers/mmc/host/cqhci.c

+10 −11
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/delay.h>

#include <linux/highmem.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>
@@ -349,12 +350,16 @@ static int cqhci_enable(struct mmc_host *mmc, struct mmc_card *card) 
/* CQHCI is idle and should halt immediately, so set a small timeout */

#define CQHCI_OFF_TIMEOUT 100



static u32 cqhci_read_ctl(struct cqhci_host *cq_host)

{

	return cqhci_readl(cq_host, CQHCI_CTL);

}



static void cqhci_off(struct mmc_host *mmc)

{

	struct cqhci_host *cq_host = mmc->cqe_private;

	ktime_t timeout;

	bool timed_out;

	u32 reg;

	int err;



	if (!cq_host->enabled || !mmc->cqe_on || cq_host->recovery_halt)

		return;
@@ -364,15 +369,9 @@ static void cqhci_off(struct mmc_host *mmc) 


	cqhci_writel(cq_host, CQHCI_HALT, CQHCI_CTL);



	timeout = ktime_add_us(ktime_get(), CQHCI_OFF_TIMEOUT);

	while (1) {

		timed_out = ktime_compare(ktime_get(), timeout) > 0;

		reg = cqhci_readl(cq_host, CQHCI_CTL);

		if ((reg & CQHCI_HALT) || timed_out)

			break;

	}



	if (timed_out)

	err = readx_poll_timeout(cqhci_read_ctl, cq_host, reg,

				 reg & CQHCI_HALT, 0, CQHCI_OFF_TIMEOUT);

	if (err < 0)

		pr_err("%s: cqhci: CQE stuck on\n", mmc_hostname(mmc));

	else

		pr_debug("%s: cqhci: CQE off\n", mmc_hostname(mmc));

drivers/mmc/host/meson-mx-sdio.c

+1 −10
Original line number Diff line number Diff line
@@ -357,14 +357,6 @@ static void meson_mx_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) 
		meson_mx_mmc_start_cmd(mmc, mrq->cmd);

}



static int meson_mx_mmc_card_busy(struct mmc_host *mmc)

{

	struct meson_mx_mmc_host *host = mmc_priv(mmc);

	u32 irqc = readl(host->base + MESON_MX_SDIO_IRQC);



	return !!(irqc & MESON_MX_SDIO_IRQC_FORCE_DATA_DAT_MASK);

}



static void meson_mx_mmc_read_response(struct mmc_host *mmc,

				       struct mmc_command *cmd)

{
@@ -506,7 +498,6 @@ static void meson_mx_mmc_timeout(struct timer_list *t) 
static struct mmc_host_ops meson_mx_mmc_ops = {

	.request		= meson_mx_mmc_request,

	.set_ios		= meson_mx_mmc_set_ios,

	.card_busy		= meson_mx_mmc_card_busy,

	.get_cd			= mmc_gpio_get_cd,

	.get_ro			= mmc_gpio_get_ro,

};
@@ -570,7 +561,7 @@ static int meson_mx_mmc_add_host(struct meson_mx_mmc_host *host) 
	mmc->f_max = clk_round_rate(host->cfg_div_clk,

				    clk_get_rate(host->parent_clk));



	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;

	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY;

	mmc->ops = &meson_mx_mmc_ops;



	ret = mmc_of_parse(mmc);

drivers/mmc/host/sdhci-msm.c

+2 −0
Original line number Diff line number Diff line
@@ -2087,6 +2087,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
		goto clk_disable;

	}



	msm_host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_NEED_RSP_BUSY;



	pm_runtime_get_noresume(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

drivers/mmc/host/sdhci-pci-core.c

+3 −0
Original line number Diff line number Diff line
@@ -601,6 +601,9 @@ static int intel_select_drive_strength(struct mmc_card *card, 
	struct sdhci_pci_slot *slot = sdhci_priv(host);

	struct intel_host *intel_host = sdhci_pci_priv(slot);



	if (!(mmc_driver_type_mask(intel_host->drv_strength) & card_drv))

		return 0;



	return intel_host->drv_strength;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE