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

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

Pull MMC fixes from Ulf Hansson:
 "A couple of MMC fixes. This time there is also a fix for the ARM SCMI
  firmware driver, which has been acked by Sudeep Holla, the maintainer.

  MMC core:
   - Terminate infinite loop in SD-UHS voltage switch

  MMC host:
   - hsq: Fix kernel crash in the recovery path
   - moxart: Fix bus width configurations
   - sdhci: Fix kernel panic for cqe irq

  ARM_SCMI:
   - Fixup clock management by reverting 'firmware: arm_scmi: Add clock
     management to the SCMI power domain'"

* tag 'mmc-v6.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: hsq: Fix data stomping during mmc recovery
  Revert "firmware: arm_scmi: Add clock management to the SCMI power domain"
  mmc: core: Terminate infinite loop in SD-UHS voltage switch
  mmc: moxart: fix 4-bit bus width and remove 8-bit bus width
  mmc: sdhci: Fix host->cmd is null
parents b1cab78b e7afa79a

drivers/firmware/arm_scmi/scmi_pm_domain.c

+0 −26
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/pm_clock.h>

#include <linux/pm_domain.h>

#include <linux/scmi_protocol.h>
@@ -53,27 +52,6 @@ static int scmi_pd_power_off(struct generic_pm_domain *domain) 
	return scmi_pd_power(domain, false);

}



static int scmi_pd_attach_dev(struct generic_pm_domain *pd, struct device *dev)

{

	int ret;



	ret = pm_clk_create(dev);

	if (ret)

		return ret;



	ret = of_pm_clk_add_clks(dev);

	if (ret >= 0)

		return 0;



	pm_clk_destroy(dev);

	return ret;

}



static void scmi_pd_detach_dev(struct generic_pm_domain *pd, struct device *dev)

{

	pm_clk_destroy(dev);

}



static int scmi_pm_domain_probe(struct scmi_device *sdev)

{

	int num_domains, i;
@@ -124,10 +102,6 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) 
		scmi_pd->genpd.name = scmi_pd->name;

		scmi_pd->genpd.power_off = scmi_pd_power_off;

		scmi_pd->genpd.power_on = scmi_pd_power_on;

		scmi_pd->genpd.attach_dev = scmi_pd_attach_dev;

		scmi_pd->genpd.detach_dev = scmi_pd_detach_dev;

		scmi_pd->genpd.flags = GENPD_FLAG_PM_CLK |

				       GENPD_FLAG_ACTIVE_WAKEUP;



		pm_genpd_init(&scmi_pd->genpd, NULL,

			      state == SCMI_POWER_STATE_GENERIC_OFF);

drivers/mmc/core/sd.c

+2 −1
Original line number Diff line number Diff line
@@ -870,7 +870,8 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) 
	 * the CCS bit is set as well. We deliberately deviate from the spec in

	 * regards to this, which allows UHS-I to be supported for SDSC cards.

	 */

	if (!mmc_host_is_spi(host) && rocr && (*rocr & SD_ROCR_S18A)) {

	if (!mmc_host_is_spi(host) && (ocr & SD_OCR_S18R) &&

	    rocr && (*rocr & SD_ROCR_S18A)) {

		err = mmc_set_uhs_voltage(host, pocr);

		if (err == -EAGAIN) {

			retries--;

drivers/mmc/host/mmc_hsq.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct mmc_hsq *hsq) 
	spin_lock_irqsave(&hsq->lock, flags);



	/* Make sure we are not already running a request now */

	if (hsq->mrq) {

	if (hsq->mrq || hsq->recovery_halt) {

		spin_unlock_irqrestore(&hsq->lock, flags);

		return;

	}

drivers/mmc/host/moxart-mmc.c

+3 −14
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ 
#define CLK_DIV_MASK		0x7f



/* REG_BUS_WIDTH */

#define BUS_WIDTH_8		BIT(2)

#define BUS_WIDTH_4		BIT(1)

#define BUS_WIDTH_4_SUPPORT	BIT(3)

#define BUS_WIDTH_4		BIT(2)

#define BUS_WIDTH_1		BIT(0)



#define MMC_VDD_360		23
@@ -524,9 +524,6 @@ static void moxart_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	case MMC_BUS_WIDTH_4:

		writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH);

		break;

	case MMC_BUS_WIDTH_8:

		writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH);

		break;

	default:

		writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH);

		break;
@@ -651,16 +648,8 @@ static int moxart_probe(struct platform_device *pdev) 
		dmaengine_slave_config(host->dma_chan_rx, &cfg);

	}



	switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) {

	case 1:

	if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT)

		mmc->caps |= MMC_CAP_4_BIT_DATA;

		break;

	case 2:

		mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA;

		break;

	default:

		break;

	}



	writel(0, host->base + REG_INTERRUPT_MASK);

drivers/mmc/host/sdhci.c

+2 −2
Original line number Diff line number Diff line
@@ -3928,7 +3928,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error, 


	if (intmask & (SDHCI_INT_INDEX | SDHCI_INT_END_BIT | SDHCI_INT_CRC)) {

		*cmd_error = -EILSEQ;

		if (!mmc_op_tuning(host->cmd->opcode))

		if (!mmc_op_tuning(SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND))))

			sdhci_err_stats_inc(host, CMD_CRC);

	} else if (intmask & SDHCI_INT_TIMEOUT) {

		*cmd_error = -ETIMEDOUT;
@@ -3938,7 +3938,7 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error, 


	if (intmask & (SDHCI_INT_DATA_END_BIT | SDHCI_INT_DATA_CRC)) {

		*data_error = -EILSEQ;

		if (!mmc_op_tuning(host->cmd->opcode))

		if (!mmc_op_tuning(SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND))))

			sdhci_err_stats_inc(host, DAT_CRC);

	} else if (intmask & SDHCI_INT_DATA_TIMEOUT) {

		*data_error = -ETIMEDOUT;