Commit 7f7e4129 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Fix hangs related to insert/remove of cards 



During a rescan operation mmc_attach(sd|mmc|sdio) functions are
called. The error handling in these function can trigger a detach
of the bus, which also meant a power off. This is not notified by
the rescan operation which then continues to the next attach function.

If a power off has been done, the framework must never send any
new commands to the host driver, without first doing a new power up.
This will most likely trigger any host driver to hang.

Moving power off out of detach and instead handle power off
separately when it is actually needed, solves the issue.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 46cbd56a

drivers/mmc/core/core.c

+5 −5
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static void mmc_power_up(struct mmc_host *host) 
	mmc_host_clk_release(host);

}



static void mmc_power_off(struct mmc_host *host)

void mmc_power_off(struct mmc_host *host)

{

	mmc_host_clk_hold(host);
@@ -1289,8 +1289,7 @@ void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops) 
}



/*

 * Remove the current bus handler from a host. Assumes that there are

 * no interesting cards left, so the bus is powered down.

 * Remove the current bus handler from a host.

 */

void mmc_detach_bus(struct mmc_host *host)

{
@@ -1307,8 +1306,6 @@ void mmc_detach_bus(struct mmc_host *host) 


	spin_unlock_irqrestore(&host->lock, flags);



	mmc_power_off(host);



	mmc_bus_put(host);

}
@@ -1893,6 +1890,7 @@ void mmc_stop_host(struct mmc_host *host) 


		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_power_off(host);

		mmc_release_host(host);

		mmc_bus_put(host);

		return;
@@ -2022,6 +2020,7 @@ int mmc_suspend_host(struct mmc_host *host) 
				host->bus_ops->remove(host);

			mmc_claim_host(host);

			mmc_detach_bus(host);

			mmc_power_off(host);

			mmc_release_host(host);

			host->pm_flags = 0;

			err = 0;
@@ -2109,6 +2108,7 @@ int mmc_pm_notify(struct notifier_block *notify_block, 
			host->bus_ops->remove(host);



		mmc_detach_bus(host);

		mmc_power_off(host);

		mmc_release_host(host);

		host->pm_flags = 0;

		break;

drivers/mmc/core/core.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, 
			   bool cmd11);

void mmc_set_timing(struct mmc_host *host, unsigned int timing);

void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);

void mmc_power_off(struct mmc_host *host);



static inline void mmc_delay(unsigned int ms)

{

drivers/mmc/core/mmc.c

+1 −0
Original line number Diff line number Diff line
@@ -892,6 +892,7 @@ static void mmc_detect(struct mmc_host *host) 


		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_power_off(host);

		mmc_release_host(host);

	}

}

drivers/mmc/core/sd.c

+1 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,7 @@ static void mmc_sd_detect(struct mmc_host *host) 


		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_power_off(host);

		mmc_release_host(host);

	}

}

drivers/mmc/core/sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ out: 


		mmc_claim_host(host);

		mmc_detach_bus(host);

		mmc_power_off(host);

		mmc_release_host(host);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE