commit 1e72859e3ae16346d4007024b20d2d4ef387dcc3
author Pierre Ossman <drzeus@drzeus.cx> Wed Apr 16 19:13:13 2008 +0200
committer Pierre Ossman <drzeus@drzeus.cx> Tue Jul 15 14:14:40 2008 +0200
tree 5fc8319ce14b0770546bbbf9a72c90abaf019317
parent 4489428ab5a49a6f443d9aa17f1d891417787d7b

sdhci: handle hot-remove

Gracefully handle when the device is suddenly removed. Do a test read
and avoid any further access if that read returns -1.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

drivers/mmc/host/sdhci-pci.c

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 5dcb495..8554466 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -47,7 +47,7 @@
 	int			(*probe)(struct sdhci_pci_chip*);
 
 	int			(*probe_slot)(struct sdhci_pci_slot*);
-	void			(*remove_slot)(struct sdhci_pci_slot*);
+	void			(*remove_slot)(struct sdhci_pci_slot*, int);
 
 	int			(*suspend)(struct sdhci_pci_chip*,
 					pm_message_t);
@@ -209,8 +209,11 @@
 	return 0;
 }
 
-static void jmicron_remove_slot(struct sdhci_pci_slot *slot)
+static void jmicron_remove_slot(struct sdhci_pci_slot *slot, int dead)
 {
+	if (dead)
+		return;
+
 	if (slot->chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB38X_MMC)
 		jmicron_enable_mmc(slot->host, 0);
 }
@@ -540,7 +543,7 @@
 
 remove:
 	if (chip->fixes && chip->fixes->remove_slot)
-		chip->fixes->remove_slot(slot);
+		chip->fixes->remove_slot(slot, 0);
 
 unmap:
 	iounmap(host->ioaddr);
@@ -554,10 +557,18 @@
 
 static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)
 {
-	sdhci_remove_host(slot->host);
+	int dead;
+	u32 scratch;
+
+	dead = 0;
+	scratch = readl(slot->host->ioaddr + SDHCI_INT_STATUS);
+	if (scratch == (u32)-1)
+		dead = 1;
+
+	sdhci_remove_host(slot->host, dead);
 
 	if (slot->chip->fixes && slot->chip->fixes->remove_slot)
-		slot->chip->fixes->remove_slot(slot);
+		slot->chip->fixes->remove_slot(slot, dead);
 
 	pci_release_region(slot->chip->pdev, slot->pci_bar);