Merge "mmc: cmdq: Add timeout in case of mmc_cmdq_halt_on_empty_queue()" (b044b1aa) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/card/block.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1214,7 +1214,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
		mmc_get_card(card);

		if (mmc_card_cmdq(card)) {
		err = mmc_cmdq_halt_on_empty_queue(card->host);
		err = mmc_cmdq_halt_on_empty_queue(card->host, 0);
		if (err) {
		pr_err("%s: halt failed while doing %s err (%d)\n",
		mmc_hostname(card->host),
		@@ -3236,9 +3236,10 @@ static int mmc_blk_cmdq_issue_rw_rq(struct mmc_queue mq, struct request req)
		struct mmc_cmdq_req *mc_rq;
		u8 active_small_sector_read = 0;
		int ret = 0;
		unsigned long timeout_ms = 10000; /* 10 sec safe timeout */

		mmc_cmdq_up_rwsem(host);
		mmc_deferred_scaling(host);
		mmc_deferred_scaling(host, timeout_ms);
		ret = mmc_cmdq_down_rwsem(host, req);
		if (ret)
		return ret;

drivers/mmc/core/core.c

+21 −9

Original line number	Diff line number	Diff line
		@@ -373,12 +373,23 @@ static bool mmc_is_valid_state_for_clk_scaling(struct mmc_host *host)
		return R1_CURRENT_STATE(status) == R1_STATE_TRAN;
		}

		int mmc_cmdq_halt_on_empty_queue(struct mmc_host *host)
		int mmc_cmdq_halt_on_empty_queue(struct mmc_host *host, unsigned long timeout)
		{
		int err = 0;

		if (!timeout) {
		err = wait_event_interruptible(host->cmdq_ctx.queue_empty_wq,
		(!host->cmdq_ctx.active_reqs));
		} else {
		err = wait_event_interruptible_timeout(
		host->cmdq_ctx.queue_empty_wq,
		(!host->cmdq_ctx.active_reqs),
		msecs_to_jiffies(timeout));
		if (!err)
		pr_err("%s: halt_on_empty_queue timeout case: err(%d)\n",
		__func__, err);
		}

		if (host->cmdq_ctx.active_reqs) {
		pr_err("%s: %s: unexpected active requests (%lu)\n",
		mmc_hostname(host), __func__,
		@@ -399,7 +410,8 @@ int mmc_cmdq_halt_on_empty_queue(struct mmc_host *host)
		EXPORT_SYMBOL(mmc_cmdq_halt_on_empty_queue);

		int mmc_clk_update_freq(struct mmc_host *host,
		unsigned long freq, enum mmc_load state)
		unsigned long freq, enum mmc_load state,
		unsigned long timeout)
		{
		int err = 0;
		bool cmdq_mode;
		@@ -441,7 +453,7 @@ int mmc_clk_update_freq(struct mmc_host *host,
		}

		if (cmdq_mode) {
		err = mmc_cmdq_halt_on_empty_queue(host);
		err = mmc_cmdq_halt_on_empty_queue(host, timeout);
		if (err) {
		pr_err("%s: %s: failed halting queue (%d)\n",
		mmc_hostname(host), __func__, err);
		@@ -570,7 +582,7 @@ static int mmc_devfreq_set_target(struct device *dev,
		clk_scaling->need_freq_change = false;

		mmc_host_clk_hold(host);
		err = mmc_clk_update_freq(host, *freq, clk_scaling->state);
		err = mmc_clk_update_freq(host, *freq, clk_scaling->state, 0);
		if (err && err != -EAGAIN) {
		pr_err("%s: clock scale to %lu failed with error %d\n",
		mmc_hostname(host), *freq, err);
		@@ -596,7 +608,7 @@ static int mmc_devfreq_set_target(struct device *dev,
		* This function does clock scaling in case "need_freq_change" flag was set
		* by the clock scaling logic.
		*/
		void mmc_deferred_scaling(struct mmc_host *host)
		void mmc_deferred_scaling(struct mmc_host *host, unsigned long timeout)
		{
		unsigned long target_freq;
		int err;
		@@ -631,7 +643,7 @@ void mmc_deferred_scaling(struct mmc_host *host)
		target_freq, current->comm);

		err = mmc_clk_update_freq(host, target_freq,
		clk_scaling.state);
		clk_scaling.state, timeout);
		if (err && err != -EAGAIN) {
		pr_err("%s: failed on deferred scale clocks (%d)\n",
		mmc_hostname(host), err);
		@@ -1233,7 +1245,7 @@ static int mmc_start_request(struct mmc_host host, struct mmc_request mrq)
		led_trigger_event(host->led, LED_FULL);

		if (mmc_is_data_request(mrq)) {
		mmc_deferred_scaling(host);
		mmc_deferred_scaling(host, 0);
		mmc_clk_scaling_start_busy(host, true);
		}

drivers/mmc/core/core.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,8 @@ void mmc_init_erase(struct mmc_card *card);
		void mmc_set_chip_select(struct mmc_host *host, int mode);
		void mmc_set_clock(struct mmc_host *host, unsigned int hz);
		int mmc_clk_update_freq(struct mmc_host *host,
		unsigned long freq, enum mmc_load state);
		unsigned long freq, enum mmc_load state,
		unsigned long timeout);
		void mmc_gate_clock(struct mmc_host *host);
		void mmc_ungate_clock(struct mmc_host *host);
		void mmc_set_ungated(struct mmc_host *host);

drivers/mmc/core/debugfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ static int mmc_scale_set(void *data, u64 val)
		mmc_host_clk_hold(host);

		/* change frequency from sysfs manually */
		err = mmc_clk_update_freq(host, val, host->clk_scaling.state);
		err = mmc_clk_update_freq(host, val, host->clk_scaling.state, 0);
		if (err == -EAGAIN)
		err = 0;
		else if (err)
		@@ -547,7 +547,7 @@ static int mmc_dbg_card_status_get(void data, u64 val)

		mmc_get_card(card);
		if (mmc_card_cmdq(card)) {
		ret = mmc_cmdq_halt_on_empty_queue(card->host);
		ret = mmc_cmdq_halt_on_empty_queue(card->host, 0);
		if (ret) {
		pr_err("%s: halt failed while doing %s err (%d)\n",
		mmc_hostname(card->host), __func__,
		@@ -589,7 +589,7 @@ static int mmc_ext_csd_open(struct inode inode, struct file filp)

		mmc_get_card(card);
		if (mmc_card_cmdq(card)) {
		err = mmc_cmdq_halt_on_empty_queue(card->host);
		err = mmc_cmdq_halt_on_empty_queue(card->host, 0);
		if (err) {
		pr_err("%s: halt failed while doing %s err (%d)\n",
		mmc_hostname(card->host), __func__,

drivers/mmc/core/host.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -768,7 +768,7 @@ static ssize_t store_enable(struct device *dev,
		host->clk_scaling.state = MMC_LOAD_HIGH;
		/* Set to max. frequency when disabling */
		mmc_clk_update_freq(host, host->card->clk_scaling_highest,
		host->clk_scaling.state);
		host->clk_scaling.state, 0);
		} else if (value) {
		/* Unmask host capability and resume scaling */
		host->caps2 \|= MMC_CAP2_CLK_SCALE;