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

Commit 61541397 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Add quirk for always getting TC with stop cmd 



Add a quirk for a host controller that always sets
a Transfer Complete interrupt status for the stop
command even when a busy response is not indicated.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 89168b48

drivers/mmc/host/sdhci.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2225,7 +2225,7 @@ static void sdhci_tuning_timer(unsigned long data) 
 *                                                                           *

 *                                                                           *

\*****************************************************************************/

\*****************************************************************************/





static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask)

static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask)

{

{

	BUG_ON(intmask == 0);

	BUG_ON(intmask == 0);
@@ -2272,6 +2272,9 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) 




		/* The controller does not support the end-of-busy IRQ,

		/* The controller does not support the end-of-busy IRQ,

		 * fall through and take the SDHCI_INT_RESPONSE */

		 * fall through and take the SDHCI_INT_RESPONSE */

	} else if ((host->quirks2 & SDHCI_QUIRK2_STOP_WITH_TC) &&

		   host->cmd->opcode == MMC_STOP_TRANSMISSION && !host->data) {

		*mask &= ~SDHCI_INT_DATA_END;

	}

	}





	if (intmask & SDHCI_INT_RESPONSE)

	if (intmask & SDHCI_INT_RESPONSE)
@@ -2481,7 +2484,8 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) 
		}

		}





		if (intmask & SDHCI_INT_CMD_MASK)

		if (intmask & SDHCI_INT_CMD_MASK)

			sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK);

			sdhci_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK,

				      &intmask);





		if (intmask & SDHCI_INT_DATA_MASK)

		if (intmask & SDHCI_INT_DATA_MASK)

			sdhci_data_irq(host, intmask & SDHCI_INT_DATA_MASK);

			sdhci_data_irq(host, intmask & SDHCI_INT_DATA_MASK);

include/linux/mmc/sdhci.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,8 @@ struct sdhci_host { 
#define SDHCI_QUIRK2_BROKEN_HS200			(1<<6)

#define SDHCI_QUIRK2_BROKEN_HS200			(1<<6)

/* Controller does not support DDR50 */

/* Controller does not support DDR50 */

#define SDHCI_QUIRK2_BROKEN_DDR50			(1<<7)

#define SDHCI_QUIRK2_BROKEN_DDR50			(1<<7)

/* Stop command (CMD12) can set Transfer Complete when not using MMC_RSP_BUSY */

#define SDHCI_QUIRK2_STOP_WITH_TC			(1<<8)





	int irq;		/* Device IRQ */

	int irq;		/* Device IRQ */

	void __iomem *ioaddr;	/* Mapped address */

	void __iomem *ioaddr;	/* Mapped address */