diff options
Diffstat (limited to 'patches/0830-mmc-tmio-clear-force_pio-flag-before-starting-data-t.patch')
| -rw-r--r-- | patches/0830-mmc-tmio-clear-force_pio-flag-before-starting-data-t.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/patches/0830-mmc-tmio-clear-force_pio-flag-before-starting-data-t.patch b/patches/0830-mmc-tmio-clear-force_pio-flag-before-starting-data-t.patch new file mode 100644 index 00000000000000..ef37cc4ff11c13 --- /dev/null +++ b/patches/0830-mmc-tmio-clear-force_pio-flag-before-starting-data-t.patch @@ -0,0 +1,71 @@ +From 434c32ba0f265203705c3754f2b558a1bbb3cf49 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <yamada.masahiro@socionext.com> +Date: Thu, 18 Jan 2018 01:28:15 +0900 +Subject: [PATCH 0830/1795] mmc: tmio: clear force_pio flag before starting + data transfer + +Currently, force_pio is cleared when the driver exits. Then, it +resulted in clearing it in multiple places since MMC drivers in +general have multiple exit points. + + tmio_mmc_reset_work - bails out on timeout + tmio_process_mrq - error out when it cannot send a command + tmio_mmc_finish_request - successful exit + +This is error-prone since we may miss to cover all bail-out points. + +To simplify the code, the data structure should be initialized just +before used since we have a single entrance. force_pio is only used +for data transfer, so tmio_mmc_start_data() will be a suitable place +to clear this flag. + +Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> +Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> +Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +(cherry picked from commit 9b3ab55dbabd8bc8ac226a603f02ad39e6202521) +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +--- + drivers/mmc/host/tmio_mmc_core.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c +index 477fafa3094f..cbaea0fcba73 100644 +--- a/drivers/mmc/host/tmio_mmc_core.c ++++ b/drivers/mmc/host/tmio_mmc_core.c +@@ -278,7 +278,6 @@ static void tmio_mmc_reset_work(struct work_struct *work) + + host->cmd = NULL; + host->data = NULL; +- host->force_pio = false; + + spin_unlock_irqrestore(&host->lock, flags); + +@@ -759,6 +758,7 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host, + + tmio_mmc_init_sg(host, data); + host->data = data; ++ host->force_pio = false; + + /* Set transfer length / blocksize */ + sd_ctrl_write16(host, CTL_SD_XFER_LEN, data->blksz); +@@ -850,7 +850,6 @@ static void tmio_process_mrq(struct tmio_mmc_host *host, + return; + + fail: +- host->force_pio = false; + host->mrq = NULL; + mrq->cmd->error = ret; + mmc_request_done(host->mmc, mrq); +@@ -900,7 +899,6 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) + if (host->cmd != mrq->sbc) { + host->cmd = NULL; + host->data = NULL; +- host->force_pio = false; + host->mrq = NULL; + } + +-- +2.19.0 + |