From: Yuvaraj Kumar C D <yuvaraj.cd@gmail.com> To: grundler@chromium.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jh80.chung@samsung.com, cjb@laptop.org, tgih.jun@samsung.com, linux-mmc@vger.kernel.org, sonnyrao@chromium.org, kgene.kim@samsung.com, joshi@samsung.com Cc: t.figa@samsung.com, Yuvaraj Kumar C D <yuvaraj.cd@samsung.org> Subject: [PATCH] mmc: dw_mmc: change to use recommended reset procedure Date: Wed, 26 Mar 2014 17:16:14 +0530 [thread overview] Message-ID: <1395834374-1988-1-git-send-email-yuvaraj.cd@samsung.com> (raw) From: Sonny Rao <sonnyrao@chromium.org> This patch changes the fifo reset code to follow the reset procedure outlined in the documentation of Synopsys Mobile storage host databook 7.2.13. Without this patch, we could able to see eMMC was not detected after multiple reboots due to driver hangs while eMMC tuning for HS200. Signed-off-by: Sonny Rao <sonnyrao@chromium.org> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.org> --- drivers/mmc/host/dw_mmc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- drivers/mmc/host/dw_mmc.h | 1 + 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 32dd81d..1d77431 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2220,7 +2220,53 @@ static inline bool dw_mci_fifo_reset(struct dw_mci *host) host->sg = NULL; } - return dw_mci_ctrl_reset(host, SDMMC_CTRL_FIFO_RESET); + /* + * The recommended method for resetting is to always reset the + * controller and the fifo, but differs slightly depending on the mode. + * Note that this doesn't handle the "generic DMA" (not IDMAC) case. + */ + if (dw_mci_ctrl_reset(host, SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET)) { + unsigned long timeout = jiffies + msecs_to_jiffies(500); + u32 status, rint; + + /* if using dma we wait for dma_req to clear */ + if (host->using_dma) { + do { + status = mci_readl(host, STATUS); + if (!(status & SDMMC_STATUS_DMA_REQ)) + break; + cpu_relax(); + } while (time_before(jiffies, timeout)); + + if (status & SDMMC_STATUS_DMA_REQ) + dev_err(host->dev, + "%s: Timeout waiting for dma_req to " + "clear during reset", __func__); + + /* when using DMA next we reset the fifo again */ + dw_mci_ctrl_reset(host, SDMMC_CTRL_FIFO_RESET); + } + /* + * In all cases we clear the RAWINTS register to clear any + * interrupts. + */ + rint = mci_readl(host, RINTSTS); + rint = rint & (~mci_readl(host, MINTSTS)); + if (rint) + mci_writel(host, RINTSTS, rint); + + } else + dev_err(host->dev, "%s: Reset bits didn't clear", __func__); + + #ifdef CONFIG_MMC_DW_IDMAC + /* It is also recommended that we reset and reprogram idmac */ + dw_mci_idmac_reset(host); + #endif + + /* After a CTRL reset we need to have CIU set clock registers */ + mci_send_cmd(host->cur_slot, SDMMC_CMD_UPD_CLK, 0); + + return true; } static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host) diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 738fa24..037e47a 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -129,6 +129,7 @@ #define SDMMC_CMD_INDX(n) ((n) & 0x1F) /* Status register defines */ #define SDMMC_GET_FCNT(x) (((x)>>17) & 0x1FFF) +#define SDMMC_STATUS_DMA_REQ BIT(31) /* FIFOTH register defines */ #define SDMMC_SET_FIFOTH(m, r, t) (((m) & 0x7) << 28 | \ ((r) & 0xFFF) << 16 | \ -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: yuvaraj.cd@gmail.com (Yuvaraj Kumar C D) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] mmc: dw_mmc: change to use recommended reset procedure Date: Wed, 26 Mar 2014 17:16:14 +0530 [thread overview] Message-ID: <1395834374-1988-1-git-send-email-yuvaraj.cd@samsung.com> (raw) From: Sonny Rao <sonnyrao@chromium.org> This patch changes the fifo reset code to follow the reset procedure outlined in the documentation of Synopsys Mobile storage host databook 7.2.13. Without this patch, we could able to see eMMC was not detected after multiple reboots due to driver hangs while eMMC tuning for HS200. Signed-off-by: Sonny Rao <sonnyrao@chromium.org> Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.org> --- drivers/mmc/host/dw_mmc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- drivers/mmc/host/dw_mmc.h | 1 + 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 32dd81d..1d77431 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2220,7 +2220,53 @@ static inline bool dw_mci_fifo_reset(struct dw_mci *host) host->sg = NULL; } - return dw_mci_ctrl_reset(host, SDMMC_CTRL_FIFO_RESET); + /* + * The recommended method for resetting is to always reset the + * controller and the fifo, but differs slightly depending on the mode. + * Note that this doesn't handle the "generic DMA" (not IDMAC) case. + */ + if (dw_mci_ctrl_reset(host, SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET)) { + unsigned long timeout = jiffies + msecs_to_jiffies(500); + u32 status, rint; + + /* if using dma we wait for dma_req to clear */ + if (host->using_dma) { + do { + status = mci_readl(host, STATUS); + if (!(status & SDMMC_STATUS_DMA_REQ)) + break; + cpu_relax(); + } while (time_before(jiffies, timeout)); + + if (status & SDMMC_STATUS_DMA_REQ) + dev_err(host->dev, + "%s: Timeout waiting for dma_req to " + "clear during reset", __func__); + + /* when using DMA next we reset the fifo again */ + dw_mci_ctrl_reset(host, SDMMC_CTRL_FIFO_RESET); + } + /* + * In all cases we clear the RAWINTS register to clear any + * interrupts. + */ + rint = mci_readl(host, RINTSTS); + rint = rint & (~mci_readl(host, MINTSTS)); + if (rint) + mci_writel(host, RINTSTS, rint); + + } else + dev_err(host->dev, "%s: Reset bits didn't clear", __func__); + + #ifdef CONFIG_MMC_DW_IDMAC + /* It is also recommended that we reset and reprogram idmac */ + dw_mci_idmac_reset(host); + #endif + + /* After a CTRL reset we need to have CIU set clock registers */ + mci_send_cmd(host->cur_slot, SDMMC_CMD_UPD_CLK, 0); + + return true; } static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host) diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 738fa24..037e47a 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -129,6 +129,7 @@ #define SDMMC_CMD_INDX(n) ((n) & 0x1F) /* Status register defines */ #define SDMMC_GET_FCNT(x) (((x)>>17) & 0x1FFF) +#define SDMMC_STATUS_DMA_REQ BIT(31) /* FIFOTH register defines */ #define SDMMC_SET_FIFOTH(m, r, t) (((m) & 0x7) << 28 | \ ((r) & 0xFFF) << 16 | \ -- 1.7.10.4
next reply other threads:[~2014-03-26 11:46 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-26 11:46 Yuvaraj Kumar C D [this message] 2014-03-26 11:46 ` [PATCH] mmc: dw_mmc: change to use recommended reset procedure Yuvaraj Kumar C D 2014-05-08 9:40 ` Yuvaraj Kumar 2014-05-08 9:40 ` Yuvaraj Kumar 2014-05-09 1:15 ` Jaehoon Chung 2014-05-09 1:15 ` Jaehoon Chung 2014-05-09 1:34 ` Sonny Rao 2014-05-09 1:34 ` Sonny Rao 2014-05-09 4:27 ` Jaehoon Chung 2014-05-09 4:27 ` Jaehoon Chung 2014-05-09 7:32 ` Jaehoon Chung 2014-05-09 7:32 ` Jaehoon Chung 2014-05-10 3:36 ` Sonny Rao 2014-05-10 3:36 ` Sonny Rao 2014-05-10 14:08 ` Seungwon Jeon 2014-05-10 14:08 ` Seungwon Jeon 2014-05-12 21:14 ` Sonny Rao 2014-05-12 21:14 ` Sonny Rao 2014-05-12 21:44 ` Sonny Rao 2014-05-12 21:44 ` Sonny Rao 2014-05-13 0:40 ` Sonny Rao 2014-05-13 0:40 ` Sonny Rao 2014-05-13 10:13 ` James Hogan 2014-05-13 10:13 ` James Hogan 2014-05-22 18:54 [PATCHv2] " Sonny Rao 2014-05-29 0:35 ` [PATCH] " Sonny Rao 2014-05-29 0:35 ` Sonny Rao 2014-05-29 5:17 ` Jaehoon Chung 2014-05-29 5:17 ` Jaehoon Chung 2014-06-09 21:35 ` Sonny Rao 2014-06-09 21:35 ` Sonny Rao 2014-06-09 22:00 ` Sonny Rao 2014-06-09 22:00 ` Sonny Rao 2014-07-10 12:28 ` Seungwon Jeon 2014-07-10 12:28 ` Seungwon Jeon 2014-07-10 22:35 ` Sonny Rao 2014-07-10 22:35 ` Sonny Rao 2014-07-11 10:20 ` Seungwon Jeon 2014-07-11 10:20 ` Seungwon Jeon 2014-07-11 19:48 ` Sonny Rao 2014-07-11 19:48 ` Sonny Rao 2014-08-04 13:44 linux-next: build failure after merge of the mmc-uh tree Ulf Hansson 2014-08-05 1:19 ` [PATCH] mmc: dw_mmc: change to use recommended reset procedure Sonny Rao 2014-08-05 1:19 ` Sonny Rao 2014-08-07 8:40 ` Jaehoon Chung 2014-08-07 8:40 ` Jaehoon Chung 2014-08-11 7:55 ` Ulf Hansson 2014-08-11 7:55 ` Ulf Hansson 2014-08-11 7:55 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1395834374-1988-1-git-send-email-yuvaraj.cd@samsung.com \ --to=yuvaraj.cd@gmail.com \ --cc=cjb@laptop.org \ --cc=grundler@chromium.org \ --cc=jh80.chung@samsung.com \ --cc=joshi@samsung.com \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=sonnyrao@chromium.org \ --cc=t.figa@samsung.com \ --cc=tgih.jun@samsung.com \ --cc=yuvaraj.cd@samsung.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.