Commit a36c3c66 authored by George Hilliard's avatar George Hilliard Committed by Greg Kroah-Hartman

staging: mt7621-mmc: Initialize completions a single time during probe

[ Upstream commit 7ca8c2c8 ]

The module was initializing completions whenever it was going to wait on
them, and not when the completion was allocated.  This is incorrect
according to the completion docs:

    Calling init_completion() on the same completion object twice is
    most likely a bug [...]

Re-initialization is also unnecessary because the module never uses
complete_all().  Fix this by only ever initializing the completion a
single time, and log if the completions are not consumed as intended
(this is not a fatal problem, but should not go unnoticed).
Signed-off-by: default avatarGeorge Hilliard <thirtythreeforty@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a04b2936
...@@ -468,7 +468,11 @@ static unsigned int msdc_command_start(struct msdc_host *host, ...@@ -468,7 +468,11 @@ static unsigned int msdc_command_start(struct msdc_host *host,
host->cmd = cmd; host->cmd = cmd;
host->cmd_rsp = resp; host->cmd_rsp = resp;
init_completion(&host->cmd_done); // The completion should have been consumed by the previous command
// response handler, because the mmc requests should be serialized
if (completion_done(&host->cmd_done))
dev_err(mmc_dev(host->mmc),
"previous command was not handled\n");
sdr_set_bits(host->base + MSDC_INTEN, wints); sdr_set_bits(host->base + MSDC_INTEN, wints);
sdc_send_cmd(rawcmd, cmd->arg); sdc_send_cmd(rawcmd, cmd->arg);
...@@ -490,7 +494,6 @@ static unsigned int msdc_command_resp(struct msdc_host *host, ...@@ -490,7 +494,6 @@ static unsigned int msdc_command_resp(struct msdc_host *host,
MSDC_INT_ACMD19_DONE; MSDC_INT_ACMD19_DONE;
BUG_ON(in_interrupt()); BUG_ON(in_interrupt());
//init_completion(&host->cmd_done);
//sdr_set_bits(host->base + MSDC_INTEN, wints); //sdr_set_bits(host->base + MSDC_INTEN, wints);
spin_unlock(&host->lock); spin_unlock(&host->lock);
...@@ -674,7 +677,13 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -674,7 +677,13 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)
//msdc_clr_fifo(host); /* no need */ //msdc_clr_fifo(host); /* no need */
msdc_dma_on(); /* enable DMA mode first!! */ msdc_dma_on(); /* enable DMA mode first!! */
init_completion(&host->xfer_done);
// The completion should have been consumed by the previous
// xfer response handler, because the mmc requests should be
// serialized
if (completion_done(&host->cmd_done))
dev_err(mmc_dev(host->mmc),
"previous transfer was not handled\n");
/* start the command first*/ /* start the command first*/
if (msdc_command_start(host, cmd, CMD_TIMEOUT) != 0) if (msdc_command_start(host, cmd, CMD_TIMEOUT) != 0)
...@@ -693,7 +702,6 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -693,7 +702,6 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq)
/* for read, the data coming too fast, then CRC error /* for read, the data coming too fast, then CRC error
* start DMA no business with CRC. * start DMA no business with CRC.
*/ */
//init_completion(&host->xfer_done);
msdc_dma_start(host); msdc_dma_start(host);
spin_unlock(&host->lock); spin_unlock(&host->lock);
...@@ -1688,6 +1696,8 @@ static int msdc_drv_probe(struct platform_device *pdev) ...@@ -1688,6 +1696,8 @@ static int msdc_drv_probe(struct platform_device *pdev)
} }
msdc_init_gpd_bd(host, &host->dma); msdc_init_gpd_bd(host, &host->dma);
init_completion(&host->cmd_done);
init_completion(&host->xfer_done);
INIT_DELAYED_WORK(&host->card_delaywork, msdc_tasklet_card); INIT_DELAYED_WORK(&host->card_delaywork, msdc_tasklet_card);
spin_lock_init(&host->lock); spin_lock_init(&host->lock);
msdc_init_hw(host); msdc_init_hw(host);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment