[PATCH resend 0/3] sdhci-pltfm: Few additions and enhancements

[PATCH resend 0/3] sdhci-pltfm: Few additions and enhancements

[Anton Vorontsov]

On Fri, Feb 19, 2010 at 11:11:00PM +0300, Anton Vorontsov wrote:
> On Fri, Feb 19, 2010 at 07:55:30PM +0000, David Vrabel wrote:
> > Anton Vorontsov wrote:
> > > Some hosts (e.g. as found in CNS3xxx SOCs) report wrong value in
> > > CLOCK_BASE capability field, and currently there is no way to
> > > force the SDHCI core to use the platform-provided base clock value.
> > 
> > I don't think this needs a new quirk. Change the sdhci driver to check
> > if the platform provides a value before reading the standard register.
> 
> Well, Pierre once said that by default we should conform to the
> SDHCI spec, and any diviations from the spec should be handled by
> the quirks:
> 
> http://linux.derkeiler.com/Mailing-Lists/Kernel/2009-02/msg03385.html
> 
> Spec clearly states that base clock == 0 is the case when we should
> fall back to the platform-provided clocks.

No further comments, resending the patches...

Thanks,

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2

[PATCH 1/3] sdhci: Implement CAP_CLOCK_BASE_BROKEN quirk

[Anton Vorontsov]

Some hosts (e.g. as found in CNS3xxx SOCs) report wrong value in
CLOCK_BASE capability field, and currently there is no way to
force the SDHCI core to use the platform-provided base clock value.

This patch implements CAP_CLOCK_BASE_BROKEN quirk. When enabled,
the SDHCI core will always use base clock frequency provided by
the platform.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/mmc/host/sdhci.c |    3 ++-
 drivers/mmc/host/sdhci.h |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index d6ab62d..b03e875 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1743,7 +1743,8 @@ int sdhci_add_host(struct sdhci_host *host)
 	host->max_clk =
 		(caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;
 	host->max_clk *= 1000000;
-	if (host->max_clk == 0) {
+	if (host->max_clk == 0 || host->quirks &
+			SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) {
 		if (!host->ops->get_max_clock) {
 			printk(KERN_ERR
 			       "%s: Hardware doesn't specify base clock "
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 842f46f..831bf7f 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -236,6 +236,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK_DELAY_AFTER_POWER			(1<<23)
 /* Controller uses SDCLK instead of TMCLK for data timeouts */
 #define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK		(1<<24)
+/* Controller reports wrong base clock capability */
+#define SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN		(1<<25)
 
 	int			irq;		/* Device IRQ */
 	void __iomem *		ioaddr;		/* Mapped address */
-- 
1.7.0

[PATCH 2/3] sdhci-pltfm: Implement platform data passing

[Anton Vorontsov]

This includes platform ops, quirks and (de)initialization callbacks.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/mmc/host/sdhci-pltfm.c |   24 ++++++++++++++++++++----
 include/linux/sdhci-pltfm.h    |   27 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 include/linux/sdhci-pltfm.h

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 297f40a..217b911 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -29,6 +29,7 @@
 #include <linux/mmc/host.h>
 
 #include <linux/io.h>
+#include <linux/sdhci-pltfm.h>
 
 #include "sdhci.h"
 
@@ -49,12 +50,11 @@ static struct sdhci_ops sdhci_pltfm_ops = {
 
 static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 {
+	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
 	struct sdhci_host *host;
 	struct resource *iomem;
 	int ret;
 
-	BUG_ON(pdev == NULL);
-
 	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!iomem) {
 		ret = -ENOMEM;
@@ -76,7 +76,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 	}
 
 	host->hw_name = "platform";
-	host->ops = &sdhci_pltfm_ops;
+	if (pdata && pdata->ops)
+		host->ops = pdata->ops;
+	else
+		host->ops = &sdhci_pltfm_ops;
+	if (pdata)
+		host->quirks = pdata->quirks;
 	host->irq = platform_get_irq(pdev, 0);
 
 	if (!request_mem_region(iomem->start, resource_size(iomem),
@@ -93,6 +98,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 		goto err_remap;
 	}
 
+	if (pdata && pdata->init) {
+		ret = pdata->init(host);
+		if (ret)
+			goto err_plat_init;
+	}
+
 	ret = sdhci_add_host(host);
 	if (ret)
 		goto err_add_host;
@@ -102,6 +113,9 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 	return 0;
 
 err_add_host:
+	if (pdata && pdata->exit)
+		pdata->exit(host);
+err_plat_init:
 	iounmap(host->ioaddr);
 err_remap:
 	release_mem_region(iomem->start, resource_size(iomem));
@@ -114,6 +128,7 @@ err:
 
 static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
 {
+	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	int dead;
@@ -125,6 +140,8 @@ static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
 		dead = 1;
 
 	sdhci_remove_host(host, dead);
+	if (pdata && pdata->exit)
+		pdata->exit(host);
 	iounmap(host->ioaddr);
 	release_mem_region(iomem->start, resource_size(iomem));
 	sdhci_free_host(host);
@@ -165,4 +182,3 @@ MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
 MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:sdhci");
-
diff --git a/include/linux/sdhci-pltfm.h b/include/linux/sdhci-pltfm.h
new file mode 100644
index 0000000..0aaa334
--- /dev/null
+++ b/include/linux/sdhci-pltfm.h
@@ -0,0 +1,27 @@
+/*
+ * Platform data declarations for the sdhci-pltfm driver.
+ *
+ * Copyright (c) 2010 MontaVista Software, LLC.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ */
+
+#ifndef _SDHCI_PLTFM_H
+#define _SDHCI_PLTFM_H
+
+struct sdhci_ops;
+struct sdhci_host;
+
+struct sdhci_pltfm_data {
+	struct sdhci_ops *ops;
+	unsigned int quirks;
+	int (*init)(struct sdhci_host *host);
+	void (*exit)(struct sdhci_host *host);
+};
+
+#endif /* _SDHCI_PLTFM_H */
-- 
1.7.0

Re: [PATCH 2/3] sdhci-pltfm: Implement platform data passing

[Richard Röjfors]

On 3/16/10 7:34 PM, Anton Vorontsov wrote:
> This includes platform ops, quirks and (de)initialization callbacks.

Good idea, just a doc comment below.

> 
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>  drivers/mmc/host/sdhci-pltfm.c |   24 ++++++++++++++++++++----
>  include/linux/sdhci-pltfm.h    |   27 +++++++++++++++++++++++++++
>  2 files changed, 47 insertions(+), 4 deletions(-)
>  create mode 100644 include/linux/sdhci-pltfm.h
> 
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 297f40a..217b911 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -29,6 +29,7 @@
>  #include <linux/mmc/host.h>
>  
>  #include <linux/io.h>
> +#include <linux/sdhci-pltfm.h>
>  
>  #include "sdhci.h"
>  
> @@ -49,12 +50,11 @@ static struct sdhci_ops sdhci_pltfm_ops = {
>  
>  static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>  {
> +	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
>  	struct sdhci_host *host;
>  	struct resource *iomem;
>  	int ret;
>  
> -	BUG_ON(pdev == NULL);
> -
>  	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	if (!iomem) {
>  		ret = -ENOMEM;
> @@ -76,7 +76,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>  	}
>  
>  	host->hw_name = "platform";
> -	host->ops = &sdhci_pltfm_ops;
> +	if (pdata && pdata->ops)
> +		host->ops = pdata->ops;
> +	else
> +		host->ops = &sdhci_pltfm_ops;
> +	if (pdata)
> +		host->quirks = pdata->quirks;
>  	host->irq = platform_get_irq(pdev, 0);
>  
>  	if (!request_mem_region(iomem->start, resource_size(iomem),
> @@ -93,6 +98,12 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>  		goto err_remap;
>  	}
>  
> +	if (pdata && pdata->init) {
> +		ret = pdata->init(host);
> +		if (ret)
> +			goto err_plat_init;
> +	}
> +
>  	ret = sdhci_add_host(host);
>  	if (ret)
>  		goto err_add_host;
> @@ -102,6 +113,9 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>  	return 0;
>  
>  err_add_host:
> +	if (pdata && pdata->exit)
> +		pdata->exit(host);
> +err_plat_init:
>  	iounmap(host->ioaddr);
>  err_remap:
>  	release_mem_region(iomem->start, resource_size(iomem));
> @@ -114,6 +128,7 @@ err:
>  
>  static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
>  {
> +	struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
>  	struct sdhci_host *host = platform_get_drvdata(pdev);
>  	struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	int dead;
> @@ -125,6 +140,8 @@ static int __devexit sdhci_pltfm_remove(struct platform_device *pdev)
>  		dead = 1;
>  
>  	sdhci_remove_host(host, dead);
> +	if (pdata && pdata->exit)
> +		pdata->exit(host);
>  	iounmap(host->ioaddr);
>  	release_mem_region(iomem->start, resource_size(iomem));
>  	sdhci_free_host(host);
> @@ -165,4 +182,3 @@ MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
>  MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
>  MODULE_LICENSE("GPL v2");
>  MODULE_ALIAS("platform:sdhci");
> -
> diff --git a/include/linux/sdhci-pltfm.h b/include/linux/sdhci-pltfm.h
> new file mode 100644
> index 0000000..0aaa334
> --- /dev/null
> +++ b/include/linux/sdhci-pltfm.h
> @@ -0,0 +1,27 @@
> +/*
> + * Platform data declarations for the sdhci-pltfm driver.
> + *
> + * Copyright (c) 2010 MontaVista Software, LLC.
> + *
> + * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or (at
> + * your option) any later version.
> + */
> +
> +#ifndef _SDHCI_PLTFM_H
> +#define _SDHCI_PLTFM_H
> +
> +struct sdhci_ops;
> +struct sdhci_host;
> +
> +struct sdhci_pltfm_data {
> +	struct sdhci_ops *ops;
> +	unsigned int quirks;
> +	int (*init)(struct sdhci_host *host);
> +	void (*exit)(struct sdhci_host *host);
> +};

I would like to see this struct kernel-doc:ed.

> +
> +#endif /* _SDHCI_PLTFM_H */

[PATCH] sdhci-pltfm: Add kernel-doc for struct sdhci_pltfm_data

[Anton Vorontsov]

Suggested-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
---

On Wed, Mar 17, 2010 at 07:14:03AM +0100, Richard Röjfors wrote:
> On 3/16/10 7:34 PM, Anton Vorontsov wrote:
> > This includes platform ops, quirks and (de)initialization callbacks.
> 
> Good idea, just a doc comment below.
[....]
> > +struct sdhci_pltfm_data {
> > +	struct sdhci_ops *ops;
> > +	unsigned int quirks;
> > +	int (*init)(struct sdhci_host *host);
> > +	void (*exit)(struct sdhci_host *host);
> > +};
> 
> I would like to see this struct kernel-doc:ed.

Done, thanks!

Andrew,

Please fold this patch into
sdhci-pltfm-implement-platform-data-passing.patch

Thanks,

 include/linux/sdhci-pltfm.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/linux/sdhci-pltfm.h b/include/linux/sdhci-pltfm.h
index 0aaa334..0239bd7 100644
--- a/include/linux/sdhci-pltfm.h
+++ b/include/linux/sdhci-pltfm.h
@@ -17,6 +17,14 @@
 struct sdhci_ops;
 struct sdhci_host;
 
+/**
+ * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
+ * @ops: optional pointer to the platform-provided SDHCI ops
+ * @quirks: optional SDHCI quirks
+ * @init: optional hook that is called during device probe, before the
+ *        driver tries to access any SDHCI registers
+ * @exit: optional hook that is called during device removal
+ */
 struct sdhci_pltfm_data {
 	struct sdhci_ops *ops;
 	unsigned int quirks;
-- 
1.7.0.5

[PATCH 3/3] sdhci-pltfm: Do not print errors in case of an extended iomem size

[Anton Vorontsov]

Some hosts have an extended SDHCI iomem size, so the driver should
only print errors if the iomem size is less than 0x100.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/mmc/host/sdhci-pltfm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 217b911..b6ee0d7 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -61,7 +61,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	if (resource_size(iomem) != 0x100)
+	if (resource_size(iomem) < 0x100)
 		dev_err(&pdev->dev, "Invalid iomem size. You may "
 			"experience problems.\n");
 
-- 
1.7.0

Re: [PATCH 3/3] sdhci-pltfm: Do not print errors in case of an extended iomem size

[Richard Röjfors]

On 3/16/10 7:34 PM, Anton Vorontsov wrote:
> Some hosts have an extended SDHCI iomem size, so the driver should
> only print errors if the iomem size is less than 0x100.

With this change you allow a bigger resource than we really need.
I think you should also change request_mem_region and ioremap to only
request and map the actual needed size. (0x100)

> 
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>  drivers/mmc/host/sdhci-pltfm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 217b911..b6ee0d7 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -61,7 +61,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>  		goto err;
>  	}
>  
> -	if (resource_size(iomem) != 0x100)
> +	if (resource_size(iomem) < 0x100)
>  		dev_err(&pdev->dev, "Invalid iomem size. You may "
>  			"experience problems.\n");
>  

Re: [PATCH 3/3] sdhci-pltfm: Do not print errors in case of an extended iomem size

[Andrew Morton]

On Wed, 17 Mar 2010 07:02:52 +0100
Richard R__jfors <richard.rojfors@pelagicore.com> wrote:

> On 3/16/10 7:34 PM, Anton Vorontsov wrote:
> > Some hosts have an extended SDHCI iomem size, so the driver should
> > only print errors if the iomem size is less than 0x100.
> 
> With this change you allow a bigger resource than we really need.
> I think you should also change request_mem_region and ioremap to only
> request and map the actual needed size. (0x100)

I merged these three with a note-to-self that some updates are expected
(hint).

Re: [PATCH 3/3] sdhci-pltfm: Do not print errors in case of an extended iomem size

[Anton Vorontsov]

On Wed, Mar 17, 2010 at 07:02:52AM +0100, Richard Röjfors wrote:
> On 3/16/10 7:34 PM, Anton Vorontsov wrote:
> > Some hosts have an extended SDHCI iomem size, so the driver should
> > only print errors if the iomem size is less than 0x100.
> 
> With this change you allow a bigger resource than we really need.
> I think you should also change request_mem_region and ioremap to only
> request and map the actual needed size. (0x100)

Sorry for the delayed response.

Why do you think that mapping more than "needed" is a bad thing?
Looking into the PCI driver, it just maps the whole PCI BAR (which
makes sense, since later SDHCI spec might easily introduce an
extended address space, so hardcoding 0x100 isn't very good).

There is another case when mapping the whole SDHCI mem space
might be convenient: if the platform code will want to use
the ioremapped region inside the platform hooks.

Thanks!

> > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> > ---
> >  drivers/mmc/host/sdhci-pltfm.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> > index 217b911..b6ee0d7 100644
> > --- a/drivers/mmc/host/sdhci-pltfm.c
> > +++ b/drivers/mmc/host/sdhci-pltfm.c
> > @@ -61,7 +61,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
> >  		goto err;
> >  	}
> >  
> > -	if (resource_size(iomem) != 0x100)
> > +	if (resource_size(iomem) < 0x100)
> >  		dev_err(&pdev->dev, "Invalid iomem size. You may "
> >  			"experience problems.\n");
> >  
> 

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2

Re: [PATCH 3/3] sdhci-pltfm: Do not print errors in case of an extended iomem size

[Richard Röjfors]

On 04/23/2010 08:25 PM, Anton Vorontsov wrote:
> On Wed, Mar 17, 2010 at 07:02:52AM +0100, Richard Röjfors wrote:
>> On 3/16/10 7:34 PM, Anton Vorontsov wrote:
>>> Some hosts have an extended SDHCI iomem size, so the driver should
>>> only print errors if the iomem size is less than 0x100.
>>
>> With this change you allow a bigger resource than we really need.
>> I think you should also change request_mem_region and ioremap to only
>> request and map the actual needed size. (0x100)
>
> Sorry for the delayed response.
>
> Why do you think that mapping more than "needed" is a bad thing?
> Looking into the PCI driver, it just maps the whole PCI BAR (which
> makes sense, since later SDHCI spec might easily introduce an
> extended address space, so hardcoding 0x100 isn't very good).
>
> There is another case when mapping the whole SDHCI mem space
> might be convenient: if the platform code will want to use
> the ioremapped region inside the platform hooks.

That's a good reason.

Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com>

>
> Thanks!
>
>>> Signed-off-by: Anton Vorontsov<avorontsov@ru.mvista.com>
>>> ---
>>>   drivers/mmc/host/sdhci-pltfm.c |    2 +-
>>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
>>> index 217b911..b6ee0d7 100644
>>> --- a/drivers/mmc/host/sdhci-pltfm.c
>>> +++ b/drivers/mmc/host/sdhci-pltfm.c
>>> @@ -61,7 +61,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
>>>   		goto err;
>>>   	}
>>>
>>> -	if (resource_size(iomem) != 0x100)
>>> +	if (resource_size(iomem)<  0x100)
>>>   		dev_err(&pdev->dev, "Invalid iomem size. You may "
>>>   			"experience problems.\n");
>>>
>>
>