From: Dong Aisheng <b29396@freescale.com>
To: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, cjb@laptop.org,
shawn.guo@linaro.org, s.hauer@pengutronix.de,
b29396@freescale.com, ulf.hansson@linaro.org,
adrian.hunter@intel.com, vladimir_zapolskiy@mentor.com,
ed.sutter@alcatel-lucent.com
Subject: [PATCH 3/6] mmc: sdhci: add platform set_timeout hook
Date: Tue, 10 Dec 2013 20:56:05 +0800 [thread overview]
Message-ID: <1386680168-5227-4-git-send-email-b29396@freescale.com> (raw)
In-Reply-To: <1386680168-5227-1-git-send-email-b29396@freescale.com>
Currently the common code assume 0xE is the maximum timeout counter
value and use it to write into the timeout counter register.
However, it's fairly possible that the different SoCs may have
different register layout on the timeout counter register.
That means 0xE may not be the correct maximum timeout value, then
the 0xE becomes meaningless.
To be flexible, this patch provides another approach for platforms
to set the correct timeout on their way.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
---
drivers/mmc/host/sdhci.c | 19 ++++++++++++++-----
drivers/mmc/host/sdhci.h | 2 ++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 464d42c..4cc3bd6 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -726,19 +726,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host)
sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
}
-static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
+static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
{
u8 count;
+
+ if (host->ops->set_timeout) {
+ host->ops->set_timeout(host, cmd);
+ } else {
+ count = sdhci_calc_timeout(host, cmd);
+ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
+ }
+}
+
+static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
+{
u8 ctrl;
struct mmc_data *data = cmd->data;
int ret;
WARN_ON(host->data);
- if (data || (cmd->flags & MMC_RSP_BUSY)) {
- count = sdhci_calc_timeout(host, cmd);
- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
- }
+ if (data || (cmd->flags & MMC_RSP_BUSY))
+ sdhci_set_timeout(host, cmd);
if (!data)
return;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 1591cbb..a4851a0 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -282,6 +282,8 @@ struct sdhci_ops {
unsigned int (*get_min_clock)(struct sdhci_host *host);
unsigned int (*get_timeout_clock)(struct sdhci_host *host);
unsigned int (*get_max_timeout)(struct sdhci_host *host);
+ void (*set_timeout)(struct sdhci_host *host,
+ struct mmc_command *cmd);
int (*platform_bus_width)(struct sdhci_host *host,
int width);
void (*platform_send_init_74_clocks)(struct sdhci_host *host,
--
1.7.2.rc3
next prev parent reply other threads:[~2013-12-10 13:24 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 12:56 [PATCH 0/6] mmc: sdhci: a few fixes on timeout and max_discard_to Dong Aisheng
2013-12-10 12:56 ` [PATCH 1/6] mmc: sdhci: add platfrom get_max_timeout hook Dong Aisheng
2013-12-11 1:56 ` Shawn Guo
2013-12-11 3:00 ` Dong Aisheng
2013-12-11 3:12 ` Shawn Guo
2013-12-11 3:20 ` Dong Aisheng
2013-12-11 3:56 ` Shawn Guo
2013-12-11 4:59 ` Dong Aisheng
2013-12-11 5:55 ` Shawn Guo
2013-12-17 6:15 ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 2/6] mmc: sdhci-esdhc-imx: fix incorrect max_discard_to for uSDHC Dong Aisheng
2013-12-11 1:58 ` Shawn Guo
2013-12-10 12:56 ` Dong Aisheng [this message]
2013-12-11 2:16 ` [PATCH 3/6] mmc: sdhci: add platform set_timeout hook Shawn Guo
2013-12-11 3:03 ` Dong Aisheng
2013-12-11 3:18 ` Shawn Guo
2013-12-11 3:35 ` Dong Aisheng
2013-12-11 3:48 ` Shawn Guo
2013-12-11 5:03 ` Dong Aisheng
2013-12-11 6:04 ` Shawn Guo
2013-12-17 6:49 ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 4/6] mmc: sdhci-esdhc-imx: set the correct max timeout value for uSDHC Dong Aisheng
2013-12-11 2:17 ` Shawn Guo
2013-12-11 3:08 ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 5/6] mmc: sdhci: calculate max_discard_to dynamically for SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK Dong Aisheng
2013-12-11 3:01 ` Shawn Guo
2013-12-11 3:13 ` Dong Aisheng
2013-12-11 4:05 ` Shawn Guo
2013-12-11 5:06 ` Dong Aisheng
2013-12-10 12:56 ` [PATCH 6/6] mmc: sdhci-esdhc-imx: use actual_clock to calculate timeout Dong Aisheng
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=1386680168-5227-4-git-send-email-b29396@freescale.com \
--to=b29396@freescale.com \
--cc=adrian.hunter@intel.com \
--cc=cjb@laptop.org \
--cc=ed.sutter@alcatel-lucent.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.org \
--cc=ulf.hansson@linaro.org \
--cc=vladimir_zapolskiy@mentor.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox