[PATCH 0/4] mmc: Add support for F_SDH30_E51

[PATCH 0/4] mmc: Add support for F_SDH30_E51

[Kunihiko Hayashi]

This series adds support for F_SDH30_E51 IP and some additional functions,
such as reset control, non-removable media, and quirks for broken timeout
clock.

Kunihiko Hayashi (4):
  mmc: f-sdh30: Add reset control support
  mmc: f-sdh30: Add support for non-removable media
  mmc: f-sdh30: Add quirks for broken timeout clock capability
  mmc: f-sdh30: Add compatible string for Socionext F_SDH30_E51

 drivers/mmc/host/sdhci_f_sdh30.c | 30 +++++++++++++++++++++++++++++-
 drivers/mmc/host/sdhci_f_sdh30.h |  3 +++
 2 files changed, 32 insertions(+), 1 deletion(-)

-- 
2.25.1

[PATCH 1/4] mmc: f-sdh30: Add reset control support

[Kunihiko Hayashi]

Add reset control support for F_SDH30 controller. This is optional.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index 3f5977979cf2..7f4553b28180 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -14,6 +14,7 @@
 #include <linux/of.h>
 #include <linux/property.h>
 #include <linux/clk.h>
+#include <linux/reset.h>
 
 #include "sdhci-pltfm.h"
 #include "sdhci_f_sdh30.h"
@@ -21,6 +22,7 @@
 struct f_sdhost_priv {
 	struct clk *clk_iface;
 	struct clk *clk;
+	struct reset_control *rst;
 	u32 vendor_hs200;
 	struct device *dev;
 	bool enable_cmd_dat_delay;
@@ -150,6 +152,16 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 		ret = clk_prepare_enable(priv->clk);
 		if (ret)
 			goto err_clk;
+
+		priv->rst = devm_reset_control_get_optional_shared(dev, NULL);
+		if (IS_ERR(priv->rst)) {
+			ret = PTR_ERR(priv->rst);
+			goto err_rst;
+		}
+
+		ret = reset_control_deassert(priv->rst);
+		if (ret)
+			goto err_rst;
 	}
 
 	/* init vendor specific regs */
@@ -175,6 +187,8 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 	return 0;
 
 err_add_host:
+	reset_control_assert(priv->rst);
+err_rst:
 	clk_disable_unprepare(priv->clk);
 err_clk:
 	clk_disable_unprepare(priv->clk_iface);
@@ -191,8 +205,9 @@ static int sdhci_f_sdh30_remove(struct platform_device *pdev)
 	sdhci_remove_host(host, readl(host->ioaddr + SDHCI_INT_STATUS) ==
 			  0xffffffff);
 
-	clk_disable_unprepare(priv->clk_iface);
+	reset_control_assert(priv->rst);
 	clk_disable_unprepare(priv->clk);
+	clk_disable_unprepare(priv->clk_iface);
 
 	sdhci_free_host(host);
 	platform_set_drvdata(pdev, NULL);
-- 
2.25.1

Re: [PATCH 1/4] mmc: f-sdh30: Add reset control support

[Ulf Hansson]

On Tue, 8 Nov 2022 at 09:25, Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> Add reset control support for F_SDH30 controller. This is optional.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

This needs an update to the DT doc too, which is also the case for patch4.

That said, please convert the DT doc into the yaml based format as the
first step.

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci_f_sdh30.c | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
> index 3f5977979cf2..7f4553b28180 100644
> --- a/drivers/mmc/host/sdhci_f_sdh30.c
> +++ b/drivers/mmc/host/sdhci_f_sdh30.c
> @@ -14,6 +14,7 @@
>  #include <linux/of.h>
>  #include <linux/property.h>
>  #include <linux/clk.h>
> +#include <linux/reset.h>
>
>  #include "sdhci-pltfm.h"
>  #include "sdhci_f_sdh30.h"
> @@ -21,6 +22,7 @@
>  struct f_sdhost_priv {
>         struct clk *clk_iface;
>         struct clk *clk;
> +       struct reset_control *rst;
>         u32 vendor_hs200;
>         struct device *dev;
>         bool enable_cmd_dat_delay;
> @@ -150,6 +152,16 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
>                 ret = clk_prepare_enable(priv->clk);
>                 if (ret)
>                         goto err_clk;
> +
> +               priv->rst = devm_reset_control_get_optional_shared(dev, NULL);
> +               if (IS_ERR(priv->rst)) {
> +                       ret = PTR_ERR(priv->rst);
> +                       goto err_rst;
> +               }
> +
> +               ret = reset_control_deassert(priv->rst);
> +               if (ret)
> +                       goto err_rst;
>         }
>
>         /* init vendor specific regs */
> @@ -175,6 +187,8 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
>         return 0;
>
>  err_add_host:
> +       reset_control_assert(priv->rst);
> +err_rst:
>         clk_disable_unprepare(priv->clk);
>  err_clk:
>         clk_disable_unprepare(priv->clk_iface);
> @@ -191,8 +205,9 @@ static int sdhci_f_sdh30_remove(struct platform_device *pdev)
>         sdhci_remove_host(host, readl(host->ioaddr + SDHCI_INT_STATUS) ==
>                           0xffffffff);
>
> -       clk_disable_unprepare(priv->clk_iface);
> +       reset_control_assert(priv->rst);
>         clk_disable_unprepare(priv->clk);
> +       clk_disable_unprepare(priv->clk_iface);
>
>         sdhci_free_host(host);
>         platform_set_drvdata(pdev, NULL);
> --
> 2.25.1
>

Re: [PATCH 1/4] mmc: f-sdh30: Add reset control support

[Kunihiko Hayashi]

Hi Ulf,


On 2022/11/09 21:15, Ulf Hansson wrote:
> On Tue, 8 Nov 2022 at 09:25, Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
>>
>> Add reset control support for F_SDH30 controller. This is optional.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> 
> This needs an update to the DT doc too, which is also the case for patch4.
> 
> That said, please convert the DT doc into the yaml based format as the
> first step.

Yes, I also think the document to be converted in order to add new compatible.
I'm concerned about the maintainer and the filename.

I'll convert it anyway.

---
Best Regards
Kunihiko Hayashi

Re: [PATCH 1/4] mmc: f-sdh30: Add reset control support

[Ulf Hansson]

On Fri, 11 Nov 2022 at 07:15, Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> Hi Ulf,
>
>
> On 2022/11/09 21:15, Ulf Hansson wrote:
> > On Tue, 8 Nov 2022 at 09:25, Kunihiko Hayashi
> > <hayashi.kunihiko@socionext.com> wrote:
> >>
> >> Add reset control support for F_SDH30 controller. This is optional.
> >>
> >> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> >
> > This needs an update to the DT doc too, which is also the case for patch4.
> >
> > That said, please convert the DT doc into the yaml based format as the
> > first step.
>
> Yes, I also think the document to be converted in order to add new compatible.
> I'm concerned about the maintainer and the filename.

If you can't find a maintainer from Socionext, feel free to put my
name in there.

I don't know if there are any good rules to apply for the filename in
cases like this. Let's just try something and see what DT maintainers
think of it. Perhaps just repeating the name of the driver for the
filename? So something along the lines of:
Documentation/devicetree/bindings/mmc/sdhci-f-sdh30.yaml

>
> I'll convert it anyway.

Great, thanks for doing this!

Kind regards
Uffe

Re: [PATCH 1/4] mmc: f-sdh30: Add reset control support

[Kunihiko Hayashi]

On 2022/11/11 21:13, Ulf Hansson wrote:
> On Fri, 11 Nov 2022 at 07:15, Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
>>
>> Hi Ulf,
>>
>>
>> On 2022/11/09 21:15, Ulf Hansson wrote:
>>> On Tue, 8 Nov 2022 at 09:25, Kunihiko Hayashi
>>> <hayashi.kunihiko@socionext.com> wrote:
>>>>
>>>> Add reset control support for F_SDH30 controller. This is optional.
>>>>
>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>
>>> This needs an update to the DT doc too, which is also the case for
>>> patch4.
>>>
>>> That said, please convert the DT doc into the yaml based format as the
>>> first step.
>>
>> Yes, I also think the document to be converted in order to add new
>> compatible.
>> I'm concerned about the maintainer and the filename.
> 
> If you can't find a maintainer from Socionext, feel free to put my
> name in there.

I see.
For now I describe my name in v2.

> 
> I don't know if there are any good rules to apply for the filename in
> cases like this. Let's just try something and see what DT maintainers
> think of it. Perhaps just repeating the name of the driver for the
> filename? So something along the lines of:
> Documentation/devicetree/bindings/mmc/sdhci-f-sdh30.yaml
> 
>>
>> I'll convert it anyway.
> 
> Great, thanks for doing this!

I sent v2 series and I'm waiting for the comment.

Thank you,

---
Best Regards
Kunihiko Hayashi

[PATCH 2/4] mmc: f-sdh30: Add support for non-removable media

[Kunihiko Hayashi]

To use F_SDH30 for non-removable meda like eMMC,
need to enable FORCE_CARD_INSERT bit to skip the delay for detection.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 7 +++++++
 drivers/mmc/host/sdhci_f_sdh30.h | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index 7f4553b28180..e7617a08276d 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -76,6 +76,13 @@ static void sdhci_f_sdh30_reset(struct sdhci_host *host, u8 mask)
 		ctl |= F_SDH30_CMD_DAT_DELAY;
 		sdhci_writel(host, ctl, F_SDH30_ESD_CONTROL);
 	}
+
+	if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) &&
+	    !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
+		ctl = sdhci_readl(host, F_SDH30_TEST);
+		ctl |= F_SDH30_FORCE_CARD_INSERT;
+		sdhci_writel(host, ctl, F_SDH30_TEST);
+	}
 }
 
 static const struct sdhci_ops sdhci_f_sdh30_ops = {
diff --git a/drivers/mmc/host/sdhci_f_sdh30.h b/drivers/mmc/host/sdhci_f_sdh30.h
index fc1ad28f7ca9..7c3c66291d42 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.h
+++ b/drivers/mmc/host/sdhci_f_sdh30.h
@@ -29,4 +29,7 @@
 #define  F_SDH30_CMD_DAT_DELAY	BIT(9)
 #define	 F_SDH30_EMMC_HS200		BIT(24)
 
+#define F_SDH30_TEST		0x158
+#define F_SDH30_FORCE_CARD_INSERT	BIT(6)
+
 #define F_SDH30_MIN_CLOCK		400000
-- 
2.25.1

[PATCH 3/4] mmc: f-sdh30: Add quirks for broken timeout clock capability

[Kunihiko Hayashi]

There is a case where the timeout clock is not supplied to the capability.
Add a quirk for that.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index e7617a08276d..af30343eaf33 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -187,6 +187,9 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev)
 	if (reg & SDHCI_CAN_DO_8BIT)
 		priv->vendor_hs200 = F_SDH30_EMMC_HS200;
 
+	if (!(reg & SDHCI_TIMEOUT_CLK_MASK))
+		host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;
+
 	ret = sdhci_add_host(host);
 	if (ret)
 		goto err_add_host;
-- 
2.25.1

[PATCH 4/4] mmc: f-sdh30: Add compatible string for Socionext F_SDH30_E51

[Kunihiko Hayashi]

Add compatible string for Socionext F_SDH30_E51. Currently there are
no new features for this IP, just add it.

And add missing Copyright and MODULE_AUTHOR.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 drivers/mmc/host/sdhci_f_sdh30.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index af30343eaf33..2643ae97b2e7 100644
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2013 - 2015 Fujitsu Semiconductor, Ltd
  *              Vincent Yang <vincent.yang@tw.fujitsu.com>
  * Copyright (C) 2015 Linaro Ltd  Andy Green <andy.green@linaro.org>
+ * Copyright (C) 2019 Socionext Inc.
  */
 
 #include <linux/acpi.h>
@@ -228,6 +229,7 @@ static int sdhci_f_sdh30_remove(struct platform_device *pdev)
 #ifdef CONFIG_OF
 static const struct of_device_id f_sdh30_dt_ids[] = {
 	{ .compatible = "fujitsu,mb86s70-sdhci-3.0" },
+	{ .compatible = "socionext,f-sdh30-e51-mmc" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, f_sdh30_dt_ids);
@@ -258,4 +260,5 @@ module_platform_driver(sdhci_f_sdh30_driver);
 MODULE_DESCRIPTION("F_SDH30 SD Card Controller driver");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("FUJITSU SEMICONDUCTOR LTD.");
+MODULE_AUTHOR("Socionext Inc.");
 MODULE_ALIAS("platform:f_sdh30");
-- 
2.25.1

Re: [PATCH 4/4] mmc: f-sdh30: Add compatible string for Socionext F_SDH30_E51

[Jassi Brar]

On Tue, 8 Nov 2022 at 02:25, Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
....
> @@ -228,6 +229,7 @@ static int sdhci_f_sdh30_remove(struct platform_device *pdev)
>  #ifdef CONFIG_OF
>  static const struct of_device_id f_sdh30_dt_ids[] = {
>         { .compatible = "fujitsu,mb86s70-sdhci-3.0" },
> +       { .compatible = "socionext,f-sdh30-e51-mmc" },
>
This also needs to be specified in the dt bindings, not just in the driver.
And if this patchset is for the "e51-mmc" type controller, introduce
the compatible first and apply the changes for that controller.


> @@ -258,4 +260,5 @@ module_platform_driver(sdhci_f_sdh30_driver);
>  MODULE_DESCRIPTION("F_SDH30 SD Card Controller driver");
>  MODULE_LICENSE("GPL v2");
>  MODULE_AUTHOR("FUJITSU SEMICONDUCTOR LTD.");
> +MODULE_AUTHOR("Socionext Inc.");
>
Socionext now is what Fujitsu was when this code was written, so this
addition seems ok.
So may be add it as
    MODULE_AUTHOR("FUJITSU SEMICONDUCTOR LTD., SOCIONEXT INC.");

cheers.

Re: [PATCH 4/4] mmc: f-sdh30: Add compatible string for Socionext F_SDH30_E51

[Kunihiko Hayashi]

Hi Jassi-san,

On 2022/11/09 1:03, Jassi Brar wrote:
> On Tue, 8 Nov 2022 at 02:25, Kunihiko Hayashi
> <hayashi.kunihiko@socionext.com> wrote:
> ....
>> @@ -228,6 +229,7 @@ static int sdhci_f_sdh30_remove(struct platform_device
>> *pdev)
>>   #ifdef CONFIG_OF
>>   static const struct of_device_id f_sdh30_dt_ids[] = {
>>          { .compatible = "fujitsu,mb86s70-sdhci-3.0" },
>> +       { .compatible = "socionext,f-sdh30-e51-mmc" },
>>
> This also needs to be specified in the dt bindings, not just in the driver.
> And if this patchset is for the "e51-mmc" type controller, introduce
> the compatible first and apply the changes for that controller.

I understand.
I need to confirm if the extend operations in this patch depend on
new F_SDH30_E51 or common with original F_SDH30.


>> @@ -258,4 +260,5 @@ module_platform_driver(sdhci_f_sdh30_driver);
>>   MODULE_DESCRIPTION("F_SDH30 SD Card Controller driver");
>>   MODULE_LICENSE("GPL v2");
>>   MODULE_AUTHOR("FUJITSU SEMICONDUCTOR LTD.");
>> +MODULE_AUTHOR("Socionext Inc.");
>>
> Socionext now is what Fujitsu was when this code was written, so this
> addition seems ok.
> So may be add it as
>      MODULE_AUTHOR("FUJITSU SEMICONDUCTOR LTD., SOCIONEXT INC.");
Although I'm confused how to write this, I'll write it that way.

Thank you,

---
Best Regards
Kunihiko Hayashi

Re: [PATCH 0/4] mmc: Add support for F_SDH30_E51

[Jassi Brar]

On Tue, 8 Nov 2022 at 02:25, Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> This series adds support for F_SDH30_E51 IP and some additional functions,
> such as reset control, non-removable media, and quirks for broken timeout
> clock.
>
> Kunihiko Hayashi (4):
>   mmc: f-sdh30: Add reset control support
>   mmc: f-sdh30: Add support for non-removable media
>   mmc: f-sdh30: Add quirks for broken timeout clock capability
>   mmc: f-sdh30: Add compatible string for Socionext F_SDH30_E51
>
For patches 1, 2 & 3
   Acked-by: Jassi Brar <jaswinder.singh@linaro.org>

Cheers.