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

Commit 8a4da143 authored by Pierre Ossman's avatar Pierre Ossman Committed by Linus Torvalds
Browse files

[PATCH] mmc: avoid some resets without card 



Some Ricoh controllers only respect a full reset when there is no card in the
slot.  As we wait for the reset to complete, we must avoid even requesting
those resets on the buggy controllers.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5f25a66f

drivers/mmc/sdhci.c

+13 −4
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ static unsigned int debug_quirks = 0; 


#define SDHCI_QUIRK_CLOCK_BEFORE_RESET			(1<<0)

#define SDHCI_QUIRK_FORCE_DMA				(1<<1)

/* Controller doesn't like some resets when there is no card inserted. */

#define SDHCI_QUIRK_NO_CARD_NO_RESET			(1<<2)



static const struct pci_device_id pci_ids[] __devinitdata = {

	{
@@ -51,7 +53,8 @@ static const struct pci_device_id pci_ids[] __devinitdata = { 
		.device		= PCI_DEVICE_ID_RICOH_R5C822,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= SDHCI_QUIRK_FORCE_DMA,

		.driver_data	= SDHCI_QUIRK_FORCE_DMA |

				  SDHCI_QUIRK_NO_CARD_NO_RESET,

	},



	{
@@ -125,6 +128,12 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) 
{

	unsigned long timeout;



	if (host->chip->quirks & SDHCI_QUIRK_NO_CARD_NO_RESET) {

		if (!(readl(host->ioaddr + SDHCI_PRESENT_STATE) &

			SDHCI_CARD_PRESENT))

			return;

	}



	writeb(mask, host->ioaddr + SDHCI_SOFTWARE_RESET);



	if (mask & SDHCI_RESET_ALL)
@@ -1174,6 +1183,9 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) 
	host = mmc_priv(mmc);

	host->mmc = mmc;



	host->chip = chip;

	chip->hosts[slot] = host;



	host->bar = first_bar + slot;



	host->addr = pci_resource_start(pdev, host->bar);
@@ -1330,9 +1342,6 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) 
	sdhci_dumpregs(host);

#endif



	host->chip = chip;

	chip->hosts[slot] = host;



	mmiowb();



	mmc_add_host(mmc);