Re: [PATCH 3/4] sdhci-of: Fix high-speed cards recognition
Anton Vorontsov wrote: > eSDHC fails to recognize some SDHS cards, throwing timeout errors: > > mmc0: error -110 whilst initialising SD card > > That's because we calculate timeout value in a wrong way: on eSDHC > hosts the timeout clock is derivied from the SD clock, which is set > dynamically. I've seen an reference design for an SDHC controller do this also. > +/* Controller has dynamic timeout clock management */ > +#define SDHCI_QUIRK_DYNAMIC_TIMEOUT_CLOCK(1<<24) This comment and define would be better if it matched terms used in the spec. Suggest: /* Controller uses SDCLK instead of TMCLK for data timeouts. */ #define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK (1 << 24) David -- David Vrabel, Senior Software Engineer, Drivers CSR, Churchill House, Cambridge Business Park, Tel: +44 (0)1223 692562 Cowley Road, Cambridge, CB4 0WZ http://www.csr.com/ 'member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom' ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 3/4] sdhci-of: Fix high-speed cards recognition
On Fri, Aug 07, 2009 at 06:08:59PM +0100, David Vrabel wrote: > Anton Vorontsov wrote: > > eSDHC fails to recognize some SDHS cards, throwing timeout errors: > > > > mmc0: error -110 whilst initialising SD card > > > > That's because we calculate timeout value in a wrong way: on eSDHC > > hosts the timeout clock is derivied from the SD clock, which is set > > dynamically. > > I've seen an reference design for an SDHC controller do this also. Thanks for the information! > > +/* Controller has dynamic timeout clock management */ > > +#define SDHCI_QUIRK_DYNAMIC_TIMEOUT_CLOCK (1<<24) > > This comment and define would be better if it matched terms used in the > spec. Suggest: > > /* Controller uses SDCLK instead of TMCLK for data timeouts. */ > #define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK (1 << 24) Yeah, if it's somewhat common scheme, then it makes sense to name the quirk that way. Thanks, -- Anton Vorontsov email: cbouatmai...@gmail.com irc://irc.freenode.net/bd2 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 3/4] sdhci-of: Fix high-speed cards recognition
eSDHC fails to recognize some SDHS cards, throwing timeout errors:
mmc0: error -110 whilst initialising SD card
That's because we calculate timeout value in a wrong way: on eSDHC
hosts the timeout clock is derivied from the SD clock, which is set
dynamically.
This patch fixes the issue by introducing and implementing
DYNAMIC_TIMEOUT_CLOCK quirk for sdhci-of driver.
Signed-off-by: Anton Vorontsov
---
drivers/mmc/host/sdhci-of.c |5 ++---
drivers/mmc/host/sdhci.c|4
drivers/mmc/host/sdhci.h|2 ++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of.c b/drivers/mmc/host/sdhci-of.c
index 8440fd9..b6ff2e8 100644
--- a/drivers/mmc/host/sdhci-of.c
+++ b/drivers/mmc/host/sdhci-of.c
@@ -174,9 +174,7 @@ static unsigned int esdhc_get_min_clock(struct sdhci_host
*host)
static unsigned int esdhc_get_timeout_clock(struct sdhci_host *host)
{
- struct sdhci_of_host *of_host = sdhci_priv(host);
-
- return of_host->clock / 1000;
+ return host->clock / 1000;
}
static struct sdhci_of_data sdhci_esdhc = {
@@ -185,6 +183,7 @@ static struct sdhci_of_data sdhci_esdhc = {
SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
SDHCI_QUIRK_NO_BUSY_IRQ |
SDHCI_QUIRK_NONSTANDARD_CLOCK |
+ SDHCI_QUIRK_DYNAMIC_TIMEOUT_CLOCK |
SDHCI_QUIRK_PIO_NEEDS_DELAY |
SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET |
SDHCI_QUIRK_NO_CARD_NO_RESET,
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fc96f8c..0f273fe 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -591,6 +591,10 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host,
struct mmc_data *data)
target_timeout = data->timeout_ns / 1000 +
data->timeout_clks / host->clock;
+ if (host->quirks & SDHCI_QUIRK_DYNAMIC_TIMEOUT_CLOCK &&
+ host->ops->get_timeout_clock)
+ host->timeout_clk = host->ops->get_timeout_clock(host);
+
/*
* Figure out needed cycles.
* We do this in steps in order to fit inside a 32 bit int.
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index c77e9ff..44b1dcc 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -232,6 +232,8 @@ struct sdhci_host {
#define SDHCI_QUIRK_FORCE_1_BIT_DATA (1<<22)
/* Controller needs 10ms delay between applying power and clock */
#define SDHCI_QUIRK_DELAY_AFTER_POWER (1<<23)
+/* Controller has dynamic timeout clock management */
+#define SDHCI_QUIRK_DYNAMIC_TIMEOUT_CLOCK (1<<24)
int irq;/* Device IRQ */
void __iomem * ioaddr; /* Mapped address */
--
1.6.3.3
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
