Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull MMC fixes from Ulf Hansson:

  - sdhci-pci: Fix voltage switch for some Intel host controllers

  - tmio: remove broken and noisy debug macro

* tag 'mmc-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-pci: Fix voltage switch for some Intel host controllers
  mmc: tmio: remove broken and noisy debug macro
parents fc46820b 6ae03368

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

+15 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ static const struct sdhci_pci_fixes sdhci_intel_pch_sdio = { 


enum {

	INTEL_DSM_FNS		=  0,

	INTEL_DSM_V18_SWITCH	=  3,

	INTEL_DSM_DRV_STRENGTH	=  9,

	INTEL_DSM_D3_RETUNE	= 10,

};
@@ -557,6 +558,19 @@ static void intel_hs400_enhanced_strobe(struct mmc_host *mmc, 
	sdhci_writel(host, val, INTEL_HS400_ES_REG);

}



static void sdhci_intel_voltage_switch(struct sdhci_host *host)

{

	struct sdhci_pci_slot *slot = sdhci_priv(host);

	struct intel_host *intel_host = sdhci_pci_priv(slot);

	struct device *dev = &slot->chip->pdev->dev;

	u32 result = 0;

	int err;



	err = intel_dsm(intel_host, dev, INTEL_DSM_V18_SWITCH, &result);

	pr_debug("%s: %s DSM error %d result %u\n",

		 mmc_hostname(host->mmc), __func__, err, result);

}



static const struct sdhci_ops sdhci_intel_byt_ops = {

	.set_clock		= sdhci_set_clock,

	.set_power		= sdhci_intel_set_power,
@@ -565,6 +579,7 @@ static const struct sdhci_ops sdhci_intel_byt_ops = { 
	.reset			= sdhci_reset,

	.set_uhs_signaling	= sdhci_set_uhs_signaling,

	.hw_reset		= sdhci_pci_hw_reset,

	.voltage_switch		= sdhci_intel_voltage_switch,

};



static void byt_read_dsm(struct sdhci_pci_slot *slot)

drivers/mmc/host/tmio_mmc_core.c

+0 −47
Original line number Diff line number Diff line
@@ -129,50 +129,6 @@ static int tmio_mmc_next_sg(struct tmio_mmc_host *host) 


#define CMDREQ_TIMEOUT	5000



#ifdef CONFIG_MMC_DEBUG



#define STATUS_TO_TEXT(a, status, i) \

	do { \

		if ((status) & TMIO_STAT_##a) { \

			if ((i)++) \

				printk(KERN_DEBUG " | "); \

			printk(KERN_DEBUG #a); \

		} \

	} while (0)



static void pr_debug_status(u32 status)

{

	int i = 0;



	pr_debug("status: %08x = ", status);

	STATUS_TO_TEXT(CARD_REMOVE, status, i);

	STATUS_TO_TEXT(CARD_INSERT, status, i);

	STATUS_TO_TEXT(SIGSTATE, status, i);

	STATUS_TO_TEXT(WRPROTECT, status, i);

	STATUS_TO_TEXT(CARD_REMOVE_A, status, i);

	STATUS_TO_TEXT(CARD_INSERT_A, status, i);

	STATUS_TO_TEXT(SIGSTATE_A, status, i);

	STATUS_TO_TEXT(CMD_IDX_ERR, status, i);

	STATUS_TO_TEXT(STOPBIT_ERR, status, i);

	STATUS_TO_TEXT(ILL_FUNC, status, i);

	STATUS_TO_TEXT(CMD_BUSY, status, i);

	STATUS_TO_TEXT(CMDRESPEND, status, i);

	STATUS_TO_TEXT(DATAEND, status, i);

	STATUS_TO_TEXT(CRCFAIL, status, i);

	STATUS_TO_TEXT(DATATIMEOUT, status, i);

	STATUS_TO_TEXT(CMDTIMEOUT, status, i);

	STATUS_TO_TEXT(RXOVERFLOW, status, i);

	STATUS_TO_TEXT(TXUNDERRUN, status, i);

	STATUS_TO_TEXT(RXRDY, status, i);

	STATUS_TO_TEXT(TXRQ, status, i);

	STATUS_TO_TEXT(ILL_ACCESS, status, i);

	printk("\n");

}



#else

#define pr_debug_status(s)  do { } while (0)

#endif



static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);
@@ -762,9 +718,6 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid) 
	status = sd_ctrl_read16_and_16_as_32(host, CTL_STATUS);

	ireg = status & TMIO_MASK_IRQ & ~host->sdcard_irq_mask;



	pr_debug_status(status);

	pr_debug_status(ireg);



	/* Clear the status except the interrupt status */

	sd_ctrl_write32_as_16_and_16(host, CTL_STATUS, TMIO_MASK_IRQ);