xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: meson: Fix usage of meson_mmc_post_req()

Browse Source 
commit f0d2f15362f02444c5d7ffd5a5eb03e4aa54b685 upstream.

Currently meson_mmc_post_req() is called in meson_mmc_request() right
after meson_mmc_start_cmd(). This could lead to DMA unmapping before the request
is actually finished.

To fix, don't call meson_mmc_post_req() until meson_mmc_request_done().

Signed-off-by: Rong Chen <rong.chen@amlogic.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Fixes: 79ed05e329 ("mmc: meson-gx: add support for descriptor chain mode")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220216124239.4007667-1-rong.chen@amlogic.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rong Chen
2022-02-16 20:42:39 +08:00
committed by Greg Kroah-Hartman
parent 0c6eeaf8c1
commit a69aa422b4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/host/meson-gx-mmc.c
View File

@@ -173,6 +173,8 @@ struct meson_host {
int irq; int irq;
bool vqmmc_enabled; bool vqmmc_enabled;
bool needs_pre_post_req;
}; };
#define CMD_CFG_LENGTH_MASK GENMASK(8, 0) #define CMD_CFG_LENGTH_MASK GENMASK(8, 0)
@@ -652,6 +654,8 @@ static void meson_mmc_request_done(struct mmc_host *mmc,
struct meson_host *host = mmc_priv(mmc); struct meson_host *host = mmc_priv(mmc);
host->cmd = NULL; host->cmd = NULL;
if (host->needs_pre_post_req)
meson_mmc_post_req(mmc, mrq, 0);
mmc_request_done(host->mmc, mrq); mmc_request_done(host->mmc, mrq);
} }
@@ -869,7 +873,7 @@ static int meson_mmc_validate_dram_access(struct mmc_host *mmc, struct mmc_data
static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
{ {
struct meson_host *host = mmc_priv(mmc); struct meson_host *host = mmc_priv(mmc);
bool needs_pre_post_req = mrq->data && host->needs_pre_post_req = mrq->data &&
!(mrq->data->host_cookie & SD_EMMC_PRE_REQ_DONE); !(mrq->data->host_cookie & SD_EMMC_PRE_REQ_DONE);
/* /*
@@ -885,22 +889,19 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
} }
} }
if (needs_pre_post_req) { if (host->needs_pre_post_req) {
meson_mmc_get_transfer_mode(mmc, mrq); meson_mmc_get_transfer_mode(mmc, mrq);
if (!meson_mmc_desc_chain_mode(mrq->data)) if (!meson_mmc_desc_chain_mode(mrq->data))
needs_pre_post_req = false; host->needs_pre_post_req = false;
} }
if (needs_pre_post_req) if (host->needs_pre_post_req)
meson_mmc_pre_req(mmc, mrq); meson_mmc_pre_req(mmc, mrq);
/* Stop execution */ /* Stop execution */
writel(0, host->regs + SD_EMMC_START); writel(0, host->regs + SD_EMMC_START);
meson_mmc_start_cmd(mmc, mrq->sbc ?: mrq->cmd); meson_mmc_start_cmd(mmc, mrq->sbc ?: mrq->cmd);
if (needs_pre_post_req)
meson_mmc_post_req(mmc, mrq, 0);
} }
static void meson_mmc_read_resp(struct mmc_host *mmc, struct mmc_command *cmd) static void meson_mmc_read_resp(struct mmc_host *mmc, struct mmc_command *cmd)