mmc: core: Remove code no longer needed after the switch to blk-mq
Remove code no longer needed after the switch to blk-mq. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>hifive-unleashed-5.1
Adrian Hunter
Ulf Hansson
parent
0fbfd12518
commit
126b627003
|
|
@ -351,8 +351,6 @@ int mmc_add_card(struct mmc_card *card)
|
|||
#ifdef CONFIG_DEBUG_FS
|
||||
mmc_add_card_debugfs(card);
|
||||
#endif
|
||||
mmc_init_context_info(card->host);
|
||||
|
||||
card->dev.of_node = mmc_of_find_child_device(card->host, 0);
|
||||
|
||||
device_enable_async_suspend(&card->dev);
|
||||
|
|
|
|||
|
|
@ -363,20 +363,6 @@ int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
|
|||
}
|
||||
EXPORT_SYMBOL(mmc_start_request);
|
||||
|
||||
/*
|
||||
* mmc_wait_data_done() - done callback for data request
|
||||
* @mrq: done data request
|
||||
*
|
||||
* Wakes up mmc context, passed as a callback to host controller driver
|
||||
*/
|
||||
static void mmc_wait_data_done(struct mmc_request *mrq)
|
||||
{
|
||||
struct mmc_context_info *context_info = &mrq->host->context_info;
|
||||
|
||||
context_info->is_done_rcv = true;
|
||||
wake_up_interruptible(&context_info->wait);
|
||||
}
|
||||
|
||||
static void mmc_wait_done(struct mmc_request *mrq)
|
||||
{
|
||||
complete(&mrq->completion);
|
||||
|
|
@ -394,35 +380,6 @@ static inline void mmc_wait_ongoing_tfr_cmd(struct mmc_host *host)
|
|||
wait_for_completion(&ongoing_mrq->cmd_completion);
|
||||
}
|
||||
|
||||
/*
|
||||
*__mmc_start_data_req() - starts data request
|
||||
* @host: MMC host to start the request
|
||||
* @mrq: data request to start
|
||||
*
|
||||
* Sets the done callback to be called when request is completed by the card.
|
||||
* Starts data mmc request execution
|
||||
* If an ongoing transfer is already in progress, wait for the command line
|
||||
* to become available before sending another command.
|
||||
*/
|
||||
static int __mmc_start_data_req(struct mmc_host *host, struct mmc_request *mrq)
|
||||
{
|
||||
int err;
|
||||
|
||||
mmc_wait_ongoing_tfr_cmd(host);
|
||||
|
||||
mrq->done = mmc_wait_data_done;
|
||||
mrq->host = host;
|
||||
|
||||
err = mmc_start_request(host, mrq);
|
||||
if (err) {
|
||||
mrq->cmd->error = err;
|
||||
mmc_complete_cmd(mrq);
|
||||
mmc_wait_data_done(mrq);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __mmc_start_req(struct mmc_host *host, struct mmc_request *mrq)
|
||||
{
|
||||
int err;
|
||||
|
|
@ -648,132 +605,10 @@ EXPORT_SYMBOL(mmc_cqe_recovery);
|
|||
*/
|
||||
bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq)
|
||||
{
|
||||
if (host->areq)
|
||||
return host->context_info.is_done_rcv;
|
||||
else
|
||||
return completion_done(&mrq->completion);
|
||||
return completion_done(&mrq->completion);
|
||||
}
|
||||
EXPORT_SYMBOL(mmc_is_req_done);
|
||||
|
||||
/**
|
||||
* mmc_finalize_areq() - finalize an asynchronous request
|
||||
* @host: MMC host to finalize any ongoing request on
|
||||
*
|
||||
* Returns the status of the ongoing asynchronous request, but
|
||||
* MMC_BLK_SUCCESS if no request was going on.
|
||||
*/
|
||||
static enum mmc_blk_status mmc_finalize_areq(struct mmc_host *host)
|
||||
{
|
||||
struct mmc_context_info *context_info = &host->context_info;
|
||||
enum mmc_blk_status status;
|
||||
|
||||
if (!host->areq)
|
||||
return MMC_BLK_SUCCESS;
|
||||
|
||||
while (1) {
|
||||
wait_event_interruptible(context_info->wait,
|
||||
(context_info->is_done_rcv ||
|
||||
context_info->is_new_req));
|
||||
|
||||
if (context_info->is_done_rcv) {
|
||||
struct mmc_command *cmd;
|
||||
|
||||
context_info->is_done_rcv = false;
|
||||
cmd = host->areq->mrq->cmd;
|
||||
|
||||
if (!cmd->error || !cmd->retries ||
|
||||
mmc_card_removed(host->card)) {
|
||||
status = host->areq->err_check(host->card,
|
||||
host->areq);
|
||||
break; /* return status */
|
||||
} else {
|
||||
mmc_retune_recheck(host);
|
||||
pr_info("%s: req failed (CMD%u): %d, retrying...\n",
|
||||
mmc_hostname(host),
|
||||
cmd->opcode, cmd->error);
|
||||
cmd->retries--;
|
||||
cmd->error = 0;
|
||||
__mmc_start_request(host, host->areq->mrq);
|
||||
continue; /* wait for done/new event again */
|
||||
}
|
||||
}
|
||||
|
||||
return MMC_BLK_NEW_REQUEST;
|
||||
}
|
||||
|
||||
mmc_retune_release(host);
|
||||
|
||||
/*
|
||||
* Check BKOPS urgency for each R1 response
|
||||
*/
|
||||
if (host->card && mmc_card_mmc(host->card) &&
|
||||
((mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1) ||
|
||||
(mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1B)) &&
|
||||
(host->areq->mrq->cmd->resp[0] & R1_EXCEPTION_EVENT)) {
|
||||
mmc_start_bkops(host->card, true);
|
||||
}
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* mmc_start_areq - start an asynchronous request
|
||||
* @host: MMC host to start command
|
||||
* @areq: asynchronous request to start
|
||||
* @ret_stat: out parameter for status
|
||||
*
|
||||
* Start a new MMC custom command request for a host.
|
||||
* If there is on ongoing async request wait for completion
|
||||
* of that request and start the new one and return.
|
||||
* Does not wait for the new request to complete.
|
||||
*
|
||||
* Returns the completed request, NULL in case of none completed.
|
||||
* Wait for the an ongoing request (previoulsy started) to complete and
|
||||
* return the completed request. If there is no ongoing request, NULL
|
||||
* is returned without waiting. NULL is not an error condition.
|
||||
*/
|
||||
struct mmc_async_req *mmc_start_areq(struct mmc_host *host,
|
||||
struct mmc_async_req *areq,
|
||||
enum mmc_blk_status *ret_stat)
|
||||
{
|
||||
enum mmc_blk_status status;
|
||||
int start_err = 0;
|
||||
struct mmc_async_req *previous = host->areq;
|
||||
|
||||
/* Prepare a new request */
|
||||
if (areq)
|
||||
mmc_pre_req(host, areq->mrq);
|
||||
|
||||
/* Finalize previous request */
|
||||
status = mmc_finalize_areq(host);
|
||||
if (ret_stat)
|
||||
*ret_stat = status;
|
||||
|
||||
/* The previous request is still going on... */
|
||||
if (status == MMC_BLK_NEW_REQUEST)
|
||||
return NULL;
|
||||
|
||||
/* Fine so far, start the new request! */
|
||||
if (status == MMC_BLK_SUCCESS && areq)
|
||||
start_err = __mmc_start_data_req(host, areq->mrq);
|
||||
|
||||
/* Postprocess the old request at this point */
|
||||
if (host->areq)
|
||||
mmc_post_req(host, host->areq->mrq, 0);
|
||||
|
||||
/* Cancel a prepared request if it was not started. */
|
||||
if ((status != MMC_BLK_SUCCESS || start_err) && areq)
|
||||
mmc_post_req(host, areq->mrq, -EINVAL);
|
||||
|
||||
if (status != MMC_BLK_SUCCESS)
|
||||
host->areq = NULL;
|
||||
else
|
||||
host->areq = areq;
|
||||
|
||||
return previous;
|
||||
}
|
||||
EXPORT_SYMBOL(mmc_start_areq);
|
||||
|
||||
/**
|
||||
* mmc_wait_for_req - start a request and wait for completion
|
||||
* @host: MMC host to start command
|
||||
|
|
@ -2961,22 +2796,6 @@ void mmc_unregister_pm_notifier(struct mmc_host *host)
|
|||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* mmc_init_context_info() - init synchronization context
|
||||
* @host: mmc host
|
||||
*
|
||||
* Init struct context_info needed to implement asynchronous
|
||||
* request mechanism, used by mmc core, host driver and mmc requests
|
||||
* supplier.
|
||||
*/
|
||||
void mmc_init_context_info(struct mmc_host *host)
|
||||
{
|
||||
host->context_info.is_new_req = false;
|
||||
host->context_info.is_done_rcv = false;
|
||||
host->context_info.is_waiting_last_req = false;
|
||||
init_waitqueue_head(&host->context_info.wait);
|
||||
}
|
||||
|
||||
static int __init mmc_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -89,8 +89,6 @@ void mmc_remove_host_debugfs(struct mmc_host *host);
|
|||
void mmc_add_card_debugfs(struct mmc_card *card);
|
||||
void mmc_remove_card_debugfs(struct mmc_card *card);
|
||||
|
||||
void mmc_init_context_info(struct mmc_host *host);
|
||||
|
||||
int mmc_execute_tuning(struct mmc_card *card);
|
||||
int mmc_hs200_to_hs400(struct mmc_card *card);
|
||||
int mmc_hs400_to_hs200(struct mmc_card *card);
|
||||
|
|
@ -108,12 +106,6 @@ bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq);
|
|||
|
||||
int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq);
|
||||
|
||||
struct mmc_async_req;
|
||||
|
||||
struct mmc_async_req *mmc_start_areq(struct mmc_host *host,
|
||||
struct mmc_async_req *areq,
|
||||
enum mmc_blk_status *ret_stat);
|
||||
|
||||
int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
|
||||
unsigned int arg);
|
||||
int mmc_can_erase(struct mmc_card *card);
|
||||
|
|
|
|||
|
|
@ -79,10 +79,5 @@ static inline bool mmc_card_hs400es(struct mmc_card *card)
|
|||
return card->host->ios.enhanced_strobe;
|
||||
}
|
||||
|
||||
static inline bool mmc_host_use_blk_mq(struct mmc_host *host)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -424,9 +424,6 @@ struct mmc_host {
|
|||
|
||||
struct dentry *debugfs_root;
|
||||
|
||||
struct mmc_async_req *areq; /* active async req */
|
||||
struct mmc_context_info context_info; /* async synchronization info */
|
||||
|
||||
/* Ongoing data transfer that allows commands during transfer */
|
||||
struct mmc_request *ongoing_mrq;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue