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

Commit c4512f79 authored by Jerry Huang's avatar Jerry Huang Committed by Linus Torvalds
Browse files

sdhci: add auto CMD12 support for eSDHC driver 



Add auto CMD12 command support for eSDHC driver.  This is needed by P4080
and P1022 for block read/write.  Manual asynchronous CMD12 abort operation
causes protocol violations on these silicons.

Signed-off-by: default avatarJerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: default avatarRoy Zang <tie-fei.zang@freescale.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9bea3c85

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

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,10 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev, 
		host->ops = &sdhci_of_data->ops;

	}



	if (of_get_property(np, "sdhci,auto-cmd12", NULL))

		host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;





	if (of_get_property(np, "sdhci,1-bit-only", NULL))

		host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;

drivers/mmc/host/sdhci.c

+12 −2
Original line number Diff line number Diff line
@@ -818,8 +818,12 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, 
	WARN_ON(!host->data);



	mode = SDHCI_TRNS_BLK_CNT_EN;

	if (data->blocks > 1)

	if (data->blocks > 1) {

		if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)

			mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_ACMD12;

		else

			mode |= SDHCI_TRNS_MULTI;

	}

	if (data->flags & MMC_DATA_READ)

		mode |= SDHCI_TRNS_READ;

	if (host->flags & SDHCI_REQ_USE_DMA)
@@ -1109,6 +1113,12 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
#ifndef SDHCI_USE_LEDS_CLASS

	sdhci_activate_led(host);

#endif

	if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) {

		if (mrq->stop) {

			mrq->data->stop = NULL;

			mrq->stop = NULL;

		}

	}



	host->mrq = mrq;

drivers/mmc/host/sdhci.h

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

/* Controller is missing device caps. Use caps provided by host */

#define SDHCI_QUIRK_MISSING_CAPS			(1<<27)

/* Controller uses Auto CMD12 command to stop the transfer */

#define SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12		(1<<28)



	int			irq;		/* Device IRQ */

	void __iomem *		ioaddr;		/* Mapped address */