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

Commit a6d3bdd5 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Factor out sdhci_finish_mrq() 



In order to support commands during data transfer, there will have to be up
to two active requests (mrqs) at a time, instead of just one. That means
the driver must identify which one to finish. Prepare for that by factoring
out sdhci_finish_mrq().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 43dea098

drivers/mmc/host/sdhci.c

+18 −12
Original line number Original line Diff line number Diff line
@@ -923,6 +923,11 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, 
	sdhci_writew(host, mode, SDHCI_TRANSFER_MODE);

	sdhci_writew(host, mode, SDHCI_TRANSFER_MODE);

}

}





static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)

{

	tasklet_schedule(&host->finish_tasklet);

}



static void sdhci_finish_data(struct sdhci_host *host)

static void sdhci_finish_data(struct sdhci_host *host)

{

{

	struct mmc_data *data;

	struct mmc_data *data;
@@ -966,8 +971,9 @@ static void sdhci_finish_data(struct sdhci_host *host) 
		}

		}





		sdhci_send_command(host, data->stop);

		sdhci_send_command(host, data->stop);

	} else

	} else {

		tasklet_schedule(&host->finish_tasklet);

		sdhci_finish_mrq(host, data->mrq);

	}

}

}





void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)

void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
@@ -999,7 +1005,7 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) 
			       mmc_hostname(host->mmc));

			       mmc_hostname(host->mmc));

			sdhci_dumpregs(host);

			sdhci_dumpregs(host);

			cmd->error = -EIO;

			cmd->error = -EIO;

			tasklet_schedule(&host->finish_tasklet);

			sdhci_finish_mrq(host, cmd->mrq);

			return;

			return;

		}

		}

		timeout--;

		timeout--;
@@ -1029,7 +1035,7 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) 
		pr_err("%s: Unsupported response type!\n",

		pr_err("%s: Unsupported response type!\n",

			mmc_hostname(host->mmc));

			mmc_hostname(host->mmc));

		cmd->error = -EINVAL;

		cmd->error = -EINVAL;

		tasklet_schedule(&host->finish_tasklet);

		sdhci_finish_mrq(host, cmd->mrq);

		return;

		return;

	}

	}
@@ -1109,7 +1115,7 @@ static void sdhci_finish_command(struct sdhci_host *host) 
			sdhci_finish_data(host);

			sdhci_finish_data(host);





		if (!cmd->data)

		if (!cmd->data)

			tasklet_schedule(&host->finish_tasklet);

			sdhci_finish_mrq(host, cmd->mrq);

	}

	}

}

}
@@ -1409,7 +1415,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) 




	if (!present || host->flags & SDHCI_DEVICE_DEAD) {

	if (!present || host->flags & SDHCI_DEVICE_DEAD) {

		mrq->cmd->error = -ENOMEDIUM;

		mrq->cmd->error = -ENOMEDIUM;

		tasklet_schedule(&host->finish_tasklet);

		sdhci_finish_mrq(host, mrq);

	} else {

	} else {

		if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23))

		if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23))

			sdhci_send_command(host, mrq->sbc);

			sdhci_send_command(host, mrq->sbc);
@@ -2134,7 +2140,7 @@ static void sdhci_card_event(struct mmc_host *mmc) 
		sdhci_do_reset(host, SDHCI_RESET_DATA);

		sdhci_do_reset(host, SDHCI_RESET_DATA);





		host->mrq->cmd->error = -ENOMEDIUM;

		host->mrq->cmd->error = -ENOMEDIUM;

		tasklet_schedule(&host->finish_tasklet);

		sdhci_finish_mrq(host, host->mrq);

	}

	}





	spin_unlock_irqrestore(&host->lock, flags);

	spin_unlock_irqrestore(&host->lock, flags);
@@ -2260,7 +2266,7 @@ static void sdhci_timeout_timer(unsigned long data) 
			else

			else

				host->mrq->cmd->error = -ETIMEDOUT;

				host->mrq->cmd->error = -ETIMEDOUT;





			tasklet_schedule(&host->finish_tasklet);

			sdhci_finish_mrq(host, host->mrq);

		}

		}

	}

	}
@@ -2307,7 +2313,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask) 
			return;

			return;

		}

		}





		tasklet_schedule(&host->finish_tasklet);

		sdhci_finish_mrq(host, host->cmd->mrq);

		return;

		return;

	}

	}
@@ -2382,7 +2388,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
		if (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {

		if (data_cmd && (data_cmd->flags & MMC_RSP_BUSY)) {

			if (intmask & SDHCI_INT_DATA_TIMEOUT) {

			if (intmask & SDHCI_INT_DATA_TIMEOUT) {

				data_cmd->error = -ETIMEDOUT;

				data_cmd->error = -ETIMEDOUT;

				tasklet_schedule(&host->finish_tasklet);

				sdhci_finish_mrq(host, data_cmd->mrq);

				return;

				return;

			}

			}

			if (intmask & SDHCI_INT_DATA_END) {

			if (intmask & SDHCI_INT_DATA_END) {
@@ -2394,7 +2400,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
				if (host->cmd == data_cmd)

				if (host->cmd == data_cmd)

					return;

					return;





				tasklet_schedule(&host->finish_tasklet);

				sdhci_finish_mrq(host, data_cmd->mrq);

				return;

				return;

			}

			}

		}

		}
@@ -3465,7 +3471,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) 
				" transfer!\n", mmc_hostname(mmc));

				" transfer!\n", mmc_hostname(mmc));





			host->mrq->cmd->error = -ENOMEDIUM;

			host->mrq->cmd->error = -ENOMEDIUM;

			tasklet_schedule(&host->finish_tasklet);

			sdhci_finish_mrq(host, host->mrq);

		}

		}





		spin_unlock_irqrestore(&host->lock, flags);

		spin_unlock_irqrestore(&host->lock, flags);