[PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[Chris Brandt]

Basically the same HW block that was used in R-Car Gen 3 is used in
RZ/A2 (with only a couple small differences).

Not sure if you're going to like the Kconfig change or not.

Chris Brandt (3):
  clk: renesas: r7s9210: Add SDHI clocks
  mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
  dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210

 Documentation/devicetree/bindings/mmc/tmio_mmc.txt |  3 ++-
 drivers/clk/renesas/r7s9210-cpg-mssr.c             |  5 ++++
 drivers/mmc/host/Kconfig                           |  5 ++--
 drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 28 ++++++++++++++++++++--
 4 files changed, 36 insertions(+), 5 deletions(-)

-- 
2.16.1

[PATCH v4 1/3] clk: renesas: r7s9210: Add SDHI clocks

[Chris Brandt]

Add SDHI clocks for RZ/A2

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/clk/renesas/r7s9210-cpg-mssr.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/clk/renesas/r7s9210-cpg-mssr.c b/drivers/clk/renesas/r7s9210-cpg-mssr.c
index 5135f13ec628..9056da15dc72 100644
--- a/drivers/clk/renesas/r7s9210-cpg-mssr.c
+++ b/drivers/clk/renesas/r7s9210-cpg-mssr.c
@@ -98,6 +98,11 @@ static const struct mssr_mod_clk r7s9210_mod_clks[] __initconst = {
 	DEF_MOD_STB("spi2",	 95,	R7S9210_CLK_P1),
 	DEF_MOD_STB("spi1",	 96,	R7S9210_CLK_P1),
 	DEF_MOD_STB("spi0",	 97,	R7S9210_CLK_P1),
+
+	DEF_MOD_STB("sdhi11",	100,	R7S9210_CLK_B),
+	DEF_MOD_STB("sdhi10",	101,	R7S9210_CLK_B),
+	DEF_MOD_STB("sdhi01",	102,	R7S9210_CLK_B),
+	DEF_MOD_STB("sdhi00",	103,	R7S9210_CLK_B),
 };
 
 /* The clock dividers in the table vary based on DT and register settings */
-- 
2.16.1

[PATCH v4 2/3] mmc: renesas_sdhi_internal_dmac: Add R7S9210 support

[Chris Brandt]

The SDHI/MMC controller in the RZ/A2 is almost the same as R-Car gen3, but
with some minor differences.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
v4:
 * Fixed spelling in #define
v3:
 * Removed extra space in Kconfig
 * Removed unneeded parentheses
v2:
 * Made comment clearer
---
 drivers/mmc/host/Kconfig                      |  5 +++--
 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 28 +++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index cf984f0f0246..b69d5cd45d0f 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -636,13 +636,14 @@ config MMC_SDHI_SYS_DMAC
 
 config MMC_SDHI_INTERNAL_DMAC
 	tristate "DMA for SDHI SD/SDIO controllers using on-chip bus mastering"
-	depends on ARM64 || COMPILE_TEST
+	depends on ARM64 || ARCH_R7S9210 || COMPILE_TEST
 	depends on MMC_SDHI
 	default MMC_SDHI if ARM64
 	help
 	  This provides DMA support for SDHI SD/SDIO controllers
 	  using on-chip bus mastering. This supports the controllers
-	  found in arm64 based SoCs.
+	  found in arm64 based SoCs. This controller is also found in
+	  RZ/A2 series SoCs.
 
 config MMC_UNIPHIER
 	tristate "UniPhier SD/eMMC Host Controller support"
diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index e5e5015ca680..065dc527291c 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -34,7 +34,7 @@
 #define DTRAN_MODE_CH_NUM_CH0	0	/* "downstream" = for write commands */
 #define DTRAN_MODE_CH_NUM_CH1	BIT(16)	/* "upstream" = for read commands */
 #define DTRAN_MODE_BUS_WIDTH	(BIT(5) | BIT(4))
-#define DTRAN_MODE_ADDR_MODE	BIT(0)	/* 1 = Increment address */
+#define DTRAN_MODE_ADDR_MODE	BIT(0)	/* 1 = Increment address, 0 = Fixed */
 
 /* DM_CM_DTRAN_CTRL */
 #define DTRAN_CTRL_DM_START	BIT(0)
@@ -73,6 +73,9 @@ static unsigned long global_flags;
 #define SDHI_INTERNAL_DMAC_ONE_RX_ONLY	0
 #define SDHI_INTERNAL_DMAC_RX_IN_USE	1
 
+/* RZ/A2 does not have the ADRR_MODE bit */
+#define SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY 2
+
 /* Definitions for sampling clocks */
 static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
 	{
@@ -81,6 +84,21 @@ static struct renesas_sdhi_scc rcar_gen3_scc_taps[] = {
 	},
 };
 
+static const struct renesas_sdhi_of_data of_rza2_compatible = {
+	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
+			  TMIO_MMC_HAVE_CBSY,
+	.tmio_ocr_mask	= MMC_VDD_32_33,
+	.capabilities	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+			  MMC_CAP_CMD23,
+	.bus_shift	= 2,
+	.scc_offset	= 0 - 0x1000,
+	.taps		= rcar_gen3_scc_taps,
+	.taps_num	= ARRAY_SIZE(rcar_gen3_scc_taps),
+	/* DMAC can handle 0xffffffff blk count but only 1 segment */
+	.max_blk_count	= 0xffffffff,
+	.max_segs	= 1,
+};
+
 static const struct renesas_sdhi_of_data of_rcar_r8a7795_compatible = {
 	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_CLK_ACTUAL |
 			  TMIO_MMC_HAVE_CBSY | TMIO_MMC_MIN_RCAR2 |
@@ -113,6 +131,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {
 };
 
 static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = {
+	{ .compatible = "renesas,sdhi-r7s9210", .data = &of_rza2_compatible, },
 	{ .compatible = "renesas,sdhi-r8a7795", .data = &of_rcar_r8a7795_compatible, },
 	{ .compatible = "renesas,sdhi-r8a7796", .data = &of_rcar_r8a7795_compatible, },
 	{ .compatible = "renesas,rcar-gen3-sdhi", .data = &of_rcar_gen3_compatible, },
@@ -171,7 +190,10 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 				     struct mmc_data *data)
 {
 	struct scatterlist *sg = host->sg_ptr;
-	u32 dtran_mode = DTRAN_MODE_BUS_WIDTH | DTRAN_MODE_ADDR_MODE;
+	u32 dtran_mode = DTRAN_MODE_BUS_WIDTH;
+
+	if (!test_bit(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY, &global_flags))
+		dtran_mode |= DTRAN_MODE_ADDR_MODE;
 
 	if (!dma_map_sg(&host->pdev->dev, sg, host->sg_len,
 			mmc_get_dma_dir(data)))
@@ -290,6 +312,8 @@ static const struct tmio_mmc_dma_ops renesas_sdhi_internal_dmac_dma_ops = {
  */
 static const struct soc_device_attribute gen3_soc_whitelist[] = {
 	/* specific ones */
+	{ .soc_id = "r7s9210",
+	  .data = (void *)BIT(SDHI_INTERNAL_DMAC_ADDR_MODE_FIXED_ONLY) },
 	{ .soc_id = "r8a7795", .revision = "ES1.*",
 	  .data = (void *)BIT(SDHI_INTERNAL_DMAC_ONE_RX_ONLY) },
 	{ .soc_id = "r8a7796", .revision = "ES1.0",
-- 
2.16.1

[PATCH v4 3/3] dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210

[Chris Brandt]

Document support for the RZ/A2 (R7S9210) SoC.

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
 * Documented that R7S9210 has 2 clocks
---
 Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
index d39d5e46f7d2..cdfbcce34b97 100644
--- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
@@ -13,6 +13,7 @@ Required properties:
 - compatible: should contain one or more of the following:
 		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC
 		"renesas,sdhi-r7s72100" - SDHI IP on R7S72100 SoC
+		"renesas,sdhi-r7s9210" - SDHI IP on R7S9210 SoC
 		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC
 		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC
 		"renesas,sdhi-r8a7743" - SDHI IP on R8A7743 SoC
@@ -54,7 +55,7 @@ Required properties:
 	  "core" and "cd". If the controller only has 1 clock, naming is not
 	  required.
 	  Devices which have more than 1 clock are listed below:
-	  2: R7S72100
+	  2: R7S72100, R7S9210
 
 Optional properties:
 - pinctrl-names: should be "default", "state_uhs"
-- 
2.16.1

Re: [PATCH v4 3/3] dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210

[Rob Herring]

On Fri, 12 Oct 2018 07:29:24 -0500, Chris Brandt wrote:
> Document support for the RZ/A2 (R7S9210) SoC.
> 
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v2:
>  * Documented that R7S9210 has 2 clocks
> ---
>  Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v4 3/3] dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210

[Simon Horman]

On Fri, Oct 12, 2018 at 07:29:24AM -0500, Chris Brandt wrote:
> Document support for the RZ/A2 (R7S9210) SoC.
> 
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

> ---
> v2:
>  * Documented that R7S9210 has 2 clocks
> ---
>  Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> index d39d5e46f7d2..cdfbcce34b97 100644
> --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt
> @@ -13,6 +13,7 @@ Required properties:
>  - compatible: should contain one or more of the following:
>  		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC
>  		"renesas,sdhi-r7s72100" - SDHI IP on R7S72100 SoC
> +		"renesas,sdhi-r7s9210" - SDHI IP on R7S9210 SoC
>  		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC
>  		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC
>  		"renesas,sdhi-r8a7743" - SDHI IP on R8A7743 SoC
> @@ -54,7 +55,7 @@ Required properties:
>  	  "core" and "cd". If the controller only has 1 clock, naming is not
>  	  required.
>  	  Devices which have more than 1 clock are listed below:
> -	  2: R7S72100
> +	  2: R7S72100, R7S9210
>  
>  Optional properties:
>  - pinctrl-names: should be "default", "state_uhs"
> -- 
> 2.16.1
> 

Re: [PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[Ulf Hansson]

On 12 October 2018 at 14:29, Chris Brandt <chris.brandt@renesas.com> wrote:
> Basically the same HW block that was used in R-Car Gen 3 is used in
> RZ/A2 (with only a couple small differences).
>
> Not sure if you're going to like the Kconfig change or not.
>
> Chris Brandt (3):
>   clk: renesas: r7s9210: Add SDHI clocks
>   mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
>   dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210
>
>  Documentation/devicetree/bindings/mmc/tmio_mmc.txt |  3 ++-
>  drivers/clk/renesas/r7s9210-cpg-mssr.c             |  5 ++++
>  drivers/mmc/host/Kconfig                           |  5 ++--
>  drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 28 ++++++++++++++++++++--
>  4 files changed, 36 insertions(+), 5 deletions(-)
>
> --
> 2.16.1

This looks good to me. So unless someone objects I intend to queue
this up for 4.21, once 4.20 rc1 is out. Or perhaps the clock patch
should go via the clock tree?

Thanks!
Uffe

RE: [PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[Chris Brandt]

On Tuesday, October 23, 2018, Ulf Hansson wrote:
> On 12 October 2018 at 14:29, Chris Brandt <chris.brandt@renesas.com>
> wrote:
> > Basically the same HW block that was used in R-Car Gen 3 is used in
> > RZ/A2 (with only a couple small differences).
> >
> > Not sure if you're going to like the Kconfig change or not.
> >
> > Chris Brandt (3):
> >   clk: renesas: r7s9210: Add SDHI clocks
> >   mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
> >   dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210
> >
> >  Documentation/devicetree/bindings/mmc/tmio_mmc.txt |  3 ++-
> >  drivers/clk/renesas/r7s9210-cpg-mssr.c             |  5 ++++
> >  drivers/mmc/host/Kconfig                           |  5 ++--
> >  drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 28
> ++++++++++++++++++++--
> >  4 files changed, 36 insertions(+), 5 deletions(-)
> >
> > --
> > 2.16.1
> 
> This looks good to me. So unless someone objects I intend to queue
> this up for 4.21, once 4.20 rc1 is out. Or perhaps the clock patch
> should go via the clock tree?
> 
> Thanks!
> Uffe

FYI,

I just tried to apply my patches to what is in -next.
It looks likes Fabrizio beat me to it (RZ/G1C has the same controller), 
so there will be conflicts because we were both be modifying the same 
lines in Kconfig and in the driver (adding the compatible strings).

It also looks like Fabrizio started using the name 
"renesas,sdhi-mmc-xxxx" (as in, added the '-mmc'), but I'll probably
just keep mine the way it is (no '-mmc').


So if you don't feel like fixing it up, let me know and I'll send an update.


Chris

Re: [PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[Geert Uytterhoeven]

Hi Ulf,

On Tue, Oct 23, 2018 at 5:02 PM Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 12 October 2018 at 14:29, Chris Brandt <chris.brandt@renesas.com> wrote:
> > Basically the same HW block that was used in R-Car Gen 3 is used in
> > RZ/A2 (with only a couple small differences).
> >
> > Not sure if you're going to like the Kconfig change or not.
> >
> > Chris Brandt (3):
> >   clk: renesas: r7s9210: Add SDHI clocks
> >   mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
> >   dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210
> >
> >  Documentation/devicetree/bindings/mmc/tmio_mmc.txt |  3 ++-
> >  drivers/clk/renesas/r7s9210-cpg-mssr.c             |  5 ++++
> >  drivers/mmc/host/Kconfig                           |  5 ++--
> >  drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 28 ++++++++++++++++++++--
> >  4 files changed, 36 insertions(+), 5 deletions(-)
> >
> > --
> > 2.16.1
>
> This looks good to me. So unless someone objects I intend to queue
> this up for 4.21, once 4.20 rc1 is out. Or perhaps the clock patch
> should go via the clock tree?

Correct. Please do not take the clock patch.

Thanks!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v4 0/3] mmc: tmio_mmc: Add support for RZ/A2

[Ulf Hansson]

On 24 October 2018 at 00:28, Chris Brandt <Chris.Brandt@renesas.com> wrote:
> On Tuesday, October 23, 2018, Ulf Hansson wrote:
>> On 12 October 2018 at 14:29, Chris Brandt <chris.brandt@renesas.com>
>> wrote:
>> > Basically the same HW block that was used in R-Car Gen 3 is used in
>> > RZ/A2 (with only a couple small differences).
>> >
>> > Not sure if you're going to like the Kconfig change or not.
>> >
>> > Chris Brandt (3):
>> >   clk: renesas: r7s9210: Add SDHI clocks
>> >   mmc: renesas_sdhi_internal_dmac: Add R7S9210 support
>> >   dt-bindings: mmc: tmio_mmc: Document Renesas R7S9210
>> >
>> >  Documentation/devicetree/bindings/mmc/tmio_mmc.txt |  3 ++-
>> >  drivers/clk/renesas/r7s9210-cpg-mssr.c             |  5 ++++
>> >  drivers/mmc/host/Kconfig                           |  5 ++--
>> >  drivers/mmc/host/renesas_sdhi_internal_dmac.c      | 28
>> ++++++++++++++++++++--
>> >  4 files changed, 36 insertions(+), 5 deletions(-)
>> >
>> > --
>> > 2.16.1
>>
>> This looks good to me. So unless someone objects I intend to queue
>> this up for 4.21, once 4.20 rc1 is out. Or perhaps the clock patch
>> should go via the clock tree?
>>
>> Thanks!
>> Uffe
>
> FYI,
>
> I just tried to apply my patches to what is in -next.
> It looks likes Fabrizio beat me to it (RZ/G1C has the same controller),
> so there will be conflicts because we were both be modifying the same
> lines in Kconfig and in the driver (adding the compatible strings).
>
> It also looks like Fabrizio started using the name
> "renesas,sdhi-mmc-xxxx" (as in, added the '-mmc'), but I'll probably
> just keep mine the way it is (no '-mmc').
>
>
> So if you don't feel like fixing it up, let me know and I'll send an update.

Please send an update.

Kind regards
Uffe